fix patch to allow party_comulate

This commit is contained in:
?ngel ?lvarez 2017-07-07 11:13:15 +02:00
parent 1616d31807
commit 5c6047c873

View file

@ -1,6 +1,6 @@
diff -r c0450db8b71a account.py
--- a/modules/account/account.py Tue Jul 04 09:41:23 2017 +0200
+++ b/modules/account/account.py Tue Jul 04 09:43:13 2017 +0200
diff -r 62f81d7eb78b account.py
--- a/trytond/trytond/modules/account/account.py Fri Jul 07 10:04:01 2017 +0200
+++ b/trytond/trytond/modules/account/account.py Fri Jul 07 10:30:29 2017 +0200
@@ -1261,7 +1261,7 @@
@classmethod
def __setup__(cls):
@ -19,15 +19,19 @@ diff -r c0450db8b71a account.py
def get_party_required(self, name):
return self.account.party_required
diff -r c0450db8b71a account.xml
--- a/modules/account/account.xml Tue Jul 04 09:41:23 2017 +0200
+++ b/modules/account/account.xml Tue Jul 04 09:43:13 2017 +0200
@@ -510,7 +510,7 @@
<record model="ir.action.act_window" id="act_general_ledger_line_form">
<field name="name">General Ledger - Lines</field>
<field name="res_model">account.general_ledger.line</field>
- <field name="context_model">account.general_ledger.line.context</field>
+ <field name="context_model"></field>
<field name="domain" eval="[('account', 'in', Eval('active_ids', []))]"
pyson="1"/>
</record>
diff -r 62f81d7eb78b view/general_ledger_line_context_form.xml
--- a/trytond/trytond/modules/account/view/general_ledger_line_context_form.xml Fri Jul 07 10:04:01 2017 +0200
+++ b/trytond/trytond/modules/account/view/general_ledger_line_context_form.xml Fri Jul 07 10:30:29 2017 +0200
@@ -6,4 +6,12 @@
<label name="party_cumulate"/>
<field name="party_cumulate"/>
</xpath>
+ <xpath expr="/form/field[@name='fiscalyear']" position="replace"/>
+ <xpath expr="/form/label[@name='fiscalyear']" position="replace"/>
+ <xpath expr="/form/field[@name='company']" position="replace"/>
+ <xpath expr="/form/label[@name='company']" position="replace"/>
+ <xpath expr="/form/field[@name='start_period']" position="replace"/>
+ <xpath expr="/form/label[@name='start_period']" position="replace"/>
+ <xpath expr="/form/field[@name='end_period']" position="replace"/>
+ <xpath expr="/form/label[@name='end_period']" position="replace"/>
</data>