Unifield Server

Merge lp:~julie-w/unifield-server/US-6876 into lp:unifield-server

  1. US-6876
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5658
Proposed branch: lp:~julie-w/unifield-server/US-6876
Merge into: lp:unifield-server
Diff against target: 67 lines (+13/-4)
2 files modified
bin/addons/account/account_invoice_view.xml (+7/-2)
bin/addons/account_override/account_invoice_view.xml (+6/-2)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-6876
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+380503@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/account/account_invoice_view.xml'
2--- bin/addons/account/account_invoice_view.xml 2020-02-10 13:07:40 +0000
3+++ bin/addons/account/account_invoice_view.xml 2020-03-10 17:00:50 +0000
4@@ -372,8 +372,13 @@
5 <field name="is_corrected" invisible="1"/>
6 <button name="button_open_analytic_lines" string="Have been corrected" type="object"
7 icon="terp-mail-" attrs="{'invisible': [('is_corrected', '=', False)]}"/>
8- <field name="name"/>
9 <field name="inactive_product" invisible="1"/>
10+ <field name="product_id"
11+ on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"
12+ attrs="{'readonly': ['|',
13+ '&amp;', ('invoice_type', '=', 'in_invoice'), '|', ('line_synced', '=', True), ('from_supply', '=', True),
14+ '&amp;', '&amp;', ('invoice_type', '=', 'out_invoice'), ('from_supply', '=', True), ('partner_type', 'in', ('intermission', 'section'))]}"
15+ />
16 <field name="account_id"
17 domain="[('journal_id', '=', parent.journal_id), ('restricted_area', '=', 'invoice_lines')]"
18 context="{'type': parent.type, 'journal_type': parent.journal_type}"
19@@ -388,7 +393,6 @@
20 attrs="{'readonly': ['|',
21 '&amp;', ('invoice_type', '=', 'in_invoice'), '|', ('line_synced', '=', True), ('from_supply', '=', True),
22 '&amp;', '&amp;', ('invoice_type', '=', 'out_invoice'), ('from_supply', '=', True), ('partner_type', 'in', ('intermission', 'section'))]}"/>
23- <field name="product_id" invisible="1"/>
24 <field name="uos_id" string="UoM"
25 on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"
26 attrs="{'readonly': ['|',
27@@ -397,6 +401,7 @@
28 <field name="price_unit"
29 attrs="{'readonly': [('invoice_type', '=', 'in_invoice'), ('line_synced', '=', True)]}"/>
30 <field name="price_subtotal"/>
31+ <field name="name"/>
32 </tree>
33 </field>
34 <group col="1" colspan="2">
35
36=== modified file 'bin/addons/account_override/account_invoice_view.xml'
37--- bin/addons/account_override/account_invoice_view.xml 2020-02-10 13:07:40 +0000
38+++ bin/addons/account_override/account_invoice_view.xml 2020-03-10 17:00:50 +0000
39@@ -541,7 +541,11 @@
40 <field name="line_number" displayon="noteditable"/>
41 <field name="is_corrected" invisible="1"/>
42 <button name="button_open_analytic_lines" string="Have been corrected" type="object" icon="terp-mail-" attrs="{'invisible': [('is_corrected', '=', False)]}"/>
43- <field name="name"/>
44+ <field name="product_id"
45+ on_change="product_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"
46+ attrs="{'readonly': ['|',
47+ ('from_supply', '=', True),
48+ '&amp;', ('invoice_type', '=', 'in_invoice'), ('line_synced', '=', True)]}" />
49 <field name="account_id" domain="[('restricted_area', '=', 'intermission_lines')]"
50 context="{'type': parent.type, 'journal_type': parent.journal_type, 'intermission_type': parent.type == 'out_invoice' and 'out' or 'in'}"
51 />
52@@ -556,7 +560,6 @@
53 ('from_supply', '=', True),
54 '&amp;', ('invoice_type', '=', 'in_invoice'), ('line_synced', '=', True)]}"
55 />
56- <field name="product_id" invisible="1"/>
57 <field name="uos_id" string="UOM"
58 on_change="uos_id_change(product_id, uos_id, quantity, name, parent.type, parent.partner_id, parent.fiscal_position, price_unit, parent.address_invoice_id, parent.currency_id, {'company_id': parent.company_id})"
59 attrs="{'readonly': ['|',
60@@ -566,6 +569,7 @@
61 <field name="price_unit"
62 attrs="{'readonly': [('invoice_type', '=', 'in_invoice'), ('line_synced', '=', True)]}"/>
63 <field name="price_subtotal"/>
64+ <field name="name"/>
65 <field name="inactive_product" invisible="1" />
66 <field name="inactive_error" invisible="1" />
67 </tree>

Subscribers

People subscribed via source and target branches