Add domain rule in account move and line

Rename account_move_line_rule patch to issue3932
This commit is contained in:
Raimon Esteve 2017-06-14 16:19:30 +02:00
parent 9090575f69
commit 0e671e6a69
3 changed files with 33 additions and 20 deletions

View File

@ -1,19 +0,0 @@
diff -r 3ca378e51e78 trytond/trytond/modules/account/move.xml
--- a/trytond/trytond/modules/account/move.xml Wed May 11 11:23:24 2016 +0200
+++ b/trytond/trytond/modules/account/move.xml Wed Jul 13 16:53:40 2016 +0200
@@ -285,6 +285,15 @@
<field name="perm_delete" eval="True"/>
</record>
+ <record model="ir.rule.group" id="rule_group_move_line">
+ <field name="model" search="[('model', '=', 'account.move.line')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_move_line1">
+ <field name="domain" eval="[('account.company', 'in', Eval('user', {}).get('companies', []))]" pyson="1"/>
+ <field name="rule_group" ref="rule_group_move_line"/>
+ </record>
+
<record model="ir.ui.view" id="reconcile_lines_writeoff_view_form">
<field name="model">account.move.reconcile_lines.writeoff</field>
<field name="type">form</field>

View File

@ -0,0 +1,32 @@
diff -r b6ae2b001525 trytond/trytond/modules/account/move.xml
--- a/trytond/trytond/modules/account/move.xml Wed Mar 08 09:39:24 2017 +0100
+++ b/trytond/trytond/modules/account/move.xml Wed Jun 14 16:16:45 2017 +0200
@@ -362,5 +362,28 @@
<field name="report_name">account.move.general_journal</field>
<field name="report">account/general_journal.odt</field>
</record>
+
+ <!-- ir rule account move and account move line by company -->
+ <record model="ir.rule.group" id="rule_group_account_move">
+ <field name="model" search="[('model', '=', 'account.move')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_account_move1">
+ <field name="domain"
+ eval="[('company', '=', Eval('user', {}).get('company', None))]"
+ pyson="1"/>
+ <field name="rule_group" ref="rule_group_account_move"/>
+ </record>
+
+ <record model="ir.rule.group" id="rule_group_account_move_line">
+ <field name="model" search="[('model', '=', 'account.move.line')]"/>
+ <field name="global_p" eval="True"/>
+ </record>
+ <record model="ir.rule" id="rule_account_move_line1">
+ <field name="domain"
+ eval="[('move.company', '=', Eval('user', {}).get('company', None))]"
+ pyson="1"/>
+ <field name="rule_group" ref="rule_group_account_move_line"/>
+ </record>
</data>
</tryton>

2
series
View File

@ -1,4 +1,4 @@
account_move_line_rule.diff
issue3932-account_move_rule.diff
analytic_account.diff
analytic_invoice.diff
analytic_purchase.diff