Reviewers: ,
Please review this at http://codereview.tryton.org/35007/
Affected files:
M fiscalyear.xml
M period.py
M period.xml
Index: fiscalyear.xml
===================================================================
--- a/fiscalyear.xml
+++ b/fiscalyear.xml
@@ -128,12 +128,6 @@
<field name="operand">User/Current Company</field>
<field name="rule_group" ref="rule_group_fiscalyear"/>
</record>
- <record model="ir.rule" id="rule_fiscalyear2">
- <field name="field" search="[('name', '=', 'company'),
('model.model', '=', 'account.fiscalyear')]"/>
- <field name="operator">=</field>
- <field name="operand">False</field>
- <field name="rule_group" ref="rule_group_fiscalyear"/>
- </record>
<record model="ir.ui.view"
id="fiscalyear_close_fiscalyear_init_view_form">
<field
name="model">account.fiscalyear.close_fiscalyear.init</field>
Index: period.py
===================================================================
--- a/period.py
+++ b/period.py
@@ -36,6 +36,8 @@
('standard', 'Standard'),
('adjustment', 'Adjustment'),
], 'Type', required=True, states=_STATES, select=1)
+ company =
fields.Function(fields.Many2One('company.company', 'Company',),
+ 'get_company', searcher='search_company')
def __init__(self):
super(Period, self).__init__()
@@ -72,6 +74,15 @@
def default_type(self):
return 'standard'
+ def get_company(self, ids, name):
+ result = {}
+ for period in self.browse(ids):
+ result[period.id] = period.fiscalyear.company.id
+ return result
+
+ def search_company(self, name, clause):
+ return [('fiscalyear.%s' % name,) + tuple(clause[1:])]
+
def check_dates(self, ids):
cursor = Transaction().cursor
for period in self.browse(ids):
Index: period.xml
===================================================================
--- a/period.xml
+++ b/period.xml
@@ -137,5 +137,16 @@
</record>
<menuitem parent="menu_processing" action="act_period_form2"
id="menu_period_form2" name="Close Periods"/>
+
+ <record model="ir.rule.group" id="rule_group_period">
+ <field name="model"
search="[('model', '=', 'account.period')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_period1">
+ <field name="field" search="[('name', '=', 'company'),
('model.model', '=', 'account.period')]"/>
+ <field name="operator">=</field>
+ <field name="operand">User/Current Company</field>
+ <field name="rule_group" ref="rule_group_period"/>
+ </record>
</data>
</tryton>
--
[email protected] mailing list
