Replace starting/ending date by start/end date
These are the most frequent terms used.
This commit is contained in:
@@ -31,9 +31,11 @@ STATES = {
|
||||
class FiscalYear(Workflow, ModelSQL, ModelView):
|
||||
__name__ = 'account.fiscalyear'
|
||||
name = fields.Char('Name', size=None, required=True)
|
||||
start_date = fields.Date('Starting Date', required=True, states=STATES,
|
||||
start_date = fields.Date(
|
||||
"Start Date", required=True, states=STATES,
|
||||
domain=[('start_date', '<=', Eval('end_date', None))])
|
||||
end_date = fields.Date('Ending Date', required=True, states=STATES,
|
||||
end_date = fields.Date(
|
||||
"End Date", required=True, states=STATES,
|
||||
domain=[('end_date', '>=', Eval('start_date', None))])
|
||||
periods = fields.One2Many('account.period', 'fiscalyear', 'Periods',
|
||||
states=STATES,
|
||||
|
||||
@@ -26,9 +26,11 @@ _STATES = {
|
||||
class Period(Workflow, ModelSQL, ModelView):
|
||||
__name__ = 'account.period'
|
||||
name = fields.Char('Name', required=True)
|
||||
start_date = fields.Date('Starting Date', required=True, states=_STATES,
|
||||
start_date = fields.Date(
|
||||
"Start Date", required=True, states=_STATES,
|
||||
domain=[('start_date', '<=', Eval('end_date', None))])
|
||||
end_date = fields.Date('Ending Date', required=True, states=_STATES,
|
||||
end_date = fields.Date(
|
||||
"End Date", required=True, states=_STATES,
|
||||
domain=[('end_date', '>=', Eval('start_date', None))])
|
||||
fiscalyear = fields.Many2One(
|
||||
'account.fiscalyear', "Fiscal Year", required=True, ondelete='CASCADE',
|
||||
|
||||
@@ -588,8 +588,8 @@ class TaxTemplate(sequence_ordered(), ModelSQL, ModelView, DeactivableMixin):
|
||||
states={
|
||||
'invisible': Bool(Eval('parent')),
|
||||
})
|
||||
start_date = fields.Date('Starting Date')
|
||||
end_date = fields.Date('Ending Date')
|
||||
start_date = fields.Date("Start Date")
|
||||
end_date = fields.Date("End Date")
|
||||
amount = fields.Numeric(
|
||||
"Amount", digits=(None, 8),
|
||||
states={
|
||||
@@ -758,8 +758,8 @@ class Tax(sequence_ordered(), ModelSQL, ModelView, DeactivableMixin):
|
||||
'invisible': Bool(Eval('parent')),
|
||||
'readonly': _states['readonly'],
|
||||
})
|
||||
start_date = fields.Date('Starting Date', states=_states)
|
||||
end_date = fields.Date('Ending Date', states=_states)
|
||||
start_date = fields.Date("Start Date", states=_states)
|
||||
end_date = fields.Date("End Date", states=_states)
|
||||
amount = fields.Numeric(
|
||||
"Amount", digits=(None, 8),
|
||||
states={
|
||||
@@ -1572,8 +1572,8 @@ class TaxRuleLineTemplate(sequence_ordered(), ModelSQL, ModelView):
|
||||
__name__ = 'account.tax.rule.line.template'
|
||||
rule = fields.Many2One('account.tax.rule.template', 'Rule', required=True,
|
||||
ondelete='CASCADE')
|
||||
start_date = fields.Date("Starting Date")
|
||||
end_date = fields.Date("Ending Date")
|
||||
start_date = fields.Date("Start Date")
|
||||
end_date = fields.Date("End Date")
|
||||
group = fields.Many2One('account.tax.group', 'Tax Group',
|
||||
ondelete='RESTRICT')
|
||||
origin_tax = fields.Many2One('account.tax.template', 'Original Tax',
|
||||
@@ -1693,8 +1693,8 @@ class TaxRuleLine(sequence_ordered(), ModelSQL, ModelView, MatchMixin):
|
||||
rule = fields.Many2One(
|
||||
'account.tax.rule', "Rule",
|
||||
required=True, ondelete='CASCADE', states=_states)
|
||||
start_date = fields.Date("Starting Date")
|
||||
end_date = fields.Date("Ending Date")
|
||||
start_date = fields.Date("Start Date")
|
||||
end_date = fields.Date("End Date")
|
||||
group = fields.Many2One('account.tax.group', 'Tax Group',
|
||||
ondelete='RESTRICT', states=_states)
|
||||
origin_tax = fields.Many2One('account.tax', 'Original Tax',
|
||||
|
||||
@@ -36,8 +36,8 @@ class AccountRule(sequence_ordered(), MatchMixin, ModelSQL, ModelView):
|
||||
__name__ = 'account.account.rule'
|
||||
|
||||
company = fields.Many2One('company.company', "Company", required=True)
|
||||
start_date = fields.Date("Starting Date")
|
||||
end_date = fields.Date("Ending Date")
|
||||
start_date = fields.Date("Start Date")
|
||||
end_date = fields.Date("End Date")
|
||||
type = fields.Selection([
|
||||
('receivable', "Receivable"),
|
||||
('stock', "Stock"),
|
||||
|
||||
Reference in New Issue
Block a user