Remove code from Fiscalyear and Period
issue4241 review29551002
This commit is contained in:
1 parent
1246600468
commit
18aa9c545d
7 files changed
+2
-32
No files matched your search
@@ -1,3 +1,4 @@
|
||||
* Remove code from Fiscalyear and Period
|
||||
* Remove journal option for updating posted moves
|
||||
* Replace Journal-Period name by function field
|
||||
* Manage readonly state on Move Line
|
||||
|
||||
@@ -23,7 +23,6 @@ class FiscalYear(ModelSQL, ModelView):
|
||||
'Fiscal Year'
|
||||
__name__ = 'account.fiscalyear'
|
||||
name = fields.Char('Name', size=None, required=True, depends=DEPENDS)
|
||||
code = fields.Char('Code', size=None)
|
||||
start_date = fields.Date('Starting Date', required=True, states=STATES,
|
||||
domain=[('start_date', '<=', Eval('end_date', None))],
|
||||
depends=DEPENDS + ['end_date'])
|
||||
@@ -318,17 +317,6 @@ class FiscalYear(ModelSQL, ModelView):
|
||||
'state': 'open',
|
||||
})
|
||||
|
||||
@classmethod
|
||||
def search_rec_name(cls, name, clause):
|
||||
if clause[1].startswith('!') or clause[1].startswith('not '):
|
||||
bool_op = 'AND'
|
||||
else:
|
||||
bool_op = 'OR'
|
||||
return [bool_op,
|
||||
('code',) + tuple(clause[1:]),
|
||||
(cls._rec_name,) + tuple(clause[1:]),
|
||||
]
|
||||
|
||||
|
||||
class BalanceNonDeferralStart(ModelView):
|
||||
'Balance Non-Deferral'
|
||||
|
||||
@@ -20,7 +20,6 @@ class Period(ModelSQL, ModelView):
|
||||
'Period'
|
||||
__name__ = 'account.period'
|
||||
name = fields.Char('Name', required=True)
|
||||
code = fields.Char('Code')
|
||||
start_date = fields.Date('Starting Date', required=True, states=_STATES,
|
||||
domain=[('start_date', '<=', Eval('end_date', None))],
|
||||
depends=_DEPENDS + ['end_date'], select=True)
|
||||
@@ -324,17 +323,6 @@ class Period(ModelSQL, ModelView):
|
||||
def post_move_sequence_used(self):
|
||||
return self.post_move_sequence or self.fiscalyear.post_move_sequence
|
||||
|
||||
@classmethod
|
||||
def search_rec_name(cls, name, clause):
|
||||
if clause[1].startswith('!') or clause[1].startswith('not '):
|
||||
bool_op = 'AND'
|
||||
else:
|
||||
bool_op = 'OR'
|
||||
return [bool_op,
|
||||
('code',) + tuple(clause[1:]),
|
||||
(cls._rec_name,) + tuple(clause[1:]),
|
||||
]
|
||||
|
||||
|
||||
class ClosePeriod(Wizard):
|
||||
'Close Period'
|
||||
|
||||
@@ -3,9 +3,7 @@
|
||||
this repository contains the full copyright notices and license terms. -->
|
||||
<form>
|
||||
<label name="name"/>
|
||||
<field name="name"/>
|
||||
<label name="code"/>
|
||||
<field name="code"/>
|
||||
<field name="name" colspan="3"/>
|
||||
<label name="start_date"/>
|
||||
<field name="start_date"/>
|
||||
<label name="end_date"/>
|
||||
|
||||
@@ -3,6 +3,5 @@
|
||||
this repository contains the full copyright notices and license terms. -->
|
||||
<tree>
|
||||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
@@ -4,11 +4,8 @@ this repository contains the full copyright notices and license terms. -->
|
||||
<form>
|
||||
<label name="name"/>
|
||||
<field name="name"/>
|
||||
<label name="code"/>
|
||||
<field name="code"/>
|
||||
<label name="fiscalyear"/>
|
||||
<field name="fiscalyear"/>
|
||||
<newline/>
|
||||
<label name="start_date"/>
|
||||
<field name="start_date"/>
|
||||
<label name="end_date"/>
|
||||
|
||||
@@ -4,7 +4,6 @@ this repository contains the full copyright notices and license terms. -->
|
||||
<tree>
|
||||
<field name="company"/>
|
||||
<field name="name"/>
|
||||
<field name="code"/>
|
||||
<field name="type"/>
|
||||
<field name="state"/>
|
||||
</tree>
|
||||
Reference in new issue
Block a user