Unifield Server

Merge lp:~mukunde/unifield-server/US-11007 into lp:unifield-server

  1. US-11007
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6496
Proposed branch: lp:~mukunde/unifield-server/US-11007
Merge into: lp:unifield-server
Diff against target: 60 lines (+7/-7)
3 files modified
bin/addons/account/account_invoice_view.xml (+2/-2)
bin/addons/account_override/account_invoice_view.xml (+4/-4)
bin/addons/analytic_distribution/account_commitment_view.xml (+1/-1)
To merge this branch: bzr merge lp:~mukunde/unifield-server/US-11007
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+440709@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 2022-10-26 12:38:04 +0000
3+++ bin/addons/account/account_invoice_view.xml 2023-04-11 07:52:39 +0000
4@@ -162,8 +162,8 @@
5 <field name="origin"/>
6 <field name="line_count"/>
7 <field name="currency_id"/>
8- <field name="residual" />
9- <field name="amount_total"/>
10+ <field name="residual" sum="Total Residual"/>
11+ <field name="amount_total" sum="Total Amount"/>
12 <field name="state"/>
13 <button name="invoice_open" states="draft,proforma2" type="object" string="Approve" icon="terp-camera_test"/>
14 </tree>
15
16=== modified file 'bin/addons/account_override/account_invoice_view.xml'
17--- bin/addons/account_override/account_invoice_view.xml 2022-12-30 12:22:33 +0000
18+++ bin/addons/account_override/account_invoice_view.xml 2023-04-11 07:52:39 +0000
19@@ -50,8 +50,8 @@
20 <field name="origin"/>
21 <field name="line_count"/>
22 <field name="currency_id"/>
23- <field name="residual"/>
24- <field name="amount_total"/>
25+ <field name="residual" sum="Total Residual"/>
26+ <field name="amount_total" sum="Total Amount"/>
27 <field name="state"/>
28 </tree>
29 </field>
30@@ -150,7 +150,7 @@
31 <field name="origin"/>
32 <field name="line_count"/>
33 <field name="currency_id"/>
34- <field name="amount_total"/>
35+ <field name="amount_total" sum="Total Amount"/>
36 <field name="state"/>
37 </tree>
38 </field>
39@@ -314,7 +314,7 @@
40 <field name="origin"/>
41 <field name="line_count"/>
42 <field name="currency_id"/>
43- <field name="amount_total"/>
44+ <field name="amount_total" sum="Total Amount"/>
45 <field name="state"/>
46 </tree>
47 </field>
48
49=== modified file 'bin/addons/analytic_distribution/account_commitment_view.xml'
50--- bin/addons/analytic_distribution/account_commitment_view.xml 2022-11-08 10:40:11 +0000
51+++ bin/addons/analytic_distribution/account_commitment_view.xml 2023-04-11 07:52:39 +0000
52@@ -87,7 +87,7 @@
53 <field name="purchase_id" />
54 <field name="line_count"/>
55 <field name="currency_id"/>
56- <field name="total" digits="(16,2)"/>
57+ <field name="total" digits="(16,2)" sum="Total"/>
58 <field name="type"/>
59 <field name="state"/>
60 <button name="commitment_open" string="Validate" icon="terp-camera_test" states="draft"/>

Subscribers

People subscribed via source and target branches