Unifield Server

Merge lp:~jfb-tempo-consulting/unifield-server/US-11289 into lp:unifield-server

  1. US-11289
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6496
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/US-11289
Merge into: lp:unifield-server
Diff against target: 195 lines (+41/-24)
6 files modified
bin/addons/account/account_invoice_view.xml (+13/-13)
bin/addons/account_override/account_invoice_view.xml (+7/-6)
bin/addons/analytic_distribution/account_commitment_view.xml (+1/-1)
bin/addons/base/rng/view.rng (+1/-0)
bin/addons/msf_profile/i18n/fr_MF.po (+16/-1)
bin/addons/register_accounting/account_invoice_view.xml (+3/-3)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/US-11289
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+444173@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 2023-04-26 13:58:43 +0000
3+++ bin/addons/account/account_invoice_view.xml 2023-06-06 13:04:03 +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" sum_selected="1"/>
11+ <field name="amount_total" sum="Total Amount" sum_selected="1"/>
12 <field name="state"/>
13 <button name="invoice_open" states="draft,proforma2" type="object" string="Approve" icon="terp-camera_test"/>
14 </tree>
15@@ -653,8 +653,8 @@
16
17 <newline/>
18 <group col="10" colspan="4">
19- <field name="journal_id" select='1' context="{'search_default_filter_is_active': 1}"/>
20- <field name="period_id" select='1' string="Period" domain="[('state', 'not in', ['done', 'created'])]"/>
21+ <field name="currency_id" string="Booking Currency" />
22+ <field name="period_id" string="Period" domain="[('state', 'not in', ['done', 'created'])]"/>
23 <field name="supplier_reference"/>
24 <field name="name"/>
25 <field name="amount_total"/>
26@@ -699,8 +699,8 @@
27
28 <newline/>
29 <group col="10" colspan="4">
30- <field name="journal_id" select='1' context="{'search_default_filter_is_active': 1}"/>
31- <field name="period_id" select='1' string="Period" domain="[('state', 'not in', ['done', 'created'])]"/>
32+ <field name="currency_id" string="Booking Currency" />
33+ <field name="period_id" string="Period" domain="[('state', 'not in', ['done', 'created'])]"/>
34 <field name="supplier_reference"/>
35 <field name="name"/>
36 <field name="amount_total"/>
37@@ -749,8 +749,8 @@
38
39 <newline/>
40 <group col="10" colspan="4">
41- <field name="journal_id" select='1' context="{'search_default_filter_is_active': 1}"/>
42- <field name="period_id" select='1' string="Period" domain="[('state', 'not in', ['done', 'created'])]"/>
43+ <field name="currency_id" string="Booking Currency" />
44+ <field name="period_id" string="Period" domain="[('state', 'not in', ['done', 'created'])]"/>
45 <field name="supplier_reference"/>
46 <field name="name"/>
47 <field name="amount_total"/>
48@@ -793,8 +793,8 @@
49 <field name="counterpart_inv_number"/>
50 <field name="line_count"/>
51 <field name="currency_id"/>
52- <field name="residual" />
53- <field name="amount_total"/>
54+ <field name="residual" sum="1" sum_selected="1"/>
55+ <field name="amount_total" sum="1" sum_selected="1"/>
56 <field name="state"/>
57 <button name="invoice_open" states="draft,proforma2" type="object" string="Approve" icon="terp-camera_test"/>
58 </tree>
59@@ -942,9 +942,9 @@
60 <field name="origin"/>
61 <field name="line_count"/>
62 <field name="currency_id"/>
63- <field name="residual" sum="Residual Amount"/>
64- <field name="amount_untaxed" sum="Untaxed Amount"/>
65- <field name="amount_total" sum="Total Amount"/>
66+ <field name="residual" sum="Residual Amount" sum_selected="1"/>
67+ <field name="amount_untaxed" sum="Untaxed Amount" sum_selected="1"/>
68+ <field name="amount_total" sum="Total Amount" sum_selected="1"/>
69 <field name="state"/>
70 </tree>
71 </field>
72
73=== modified file 'bin/addons/account_override/account_invoice_view.xml'
74--- bin/addons/account_override/account_invoice_view.xml 2023-04-26 13:58:43 +0000
75+++ bin/addons/account_override/account_invoice_view.xml 2023-06-06 13:04:03 +0000
76@@ -50,8 +50,8 @@
77 <field name="origin"/>
78 <field name="line_count"/>
79 <field name="currency_id"/>
80- <field name="residual"/>
81- <field name="amount_total"/>
82+ <field name="residual" sum="Total Residual" sum_selected="1"/>
83+ <field name="amount_total" sum="Total Amount" sum_selected="1"/>
84 <field name="state"/>
85 </tree>
86 </field>
87@@ -150,7 +150,7 @@
88 <field name="origin"/>
89 <field name="line_count"/>
90 <field name="currency_id"/>
91- <field name="amount_total"/>
92+ <field name="amount_total" sum="Total Amount" sum_selected="1"/>
93 <field name="state"/>
94 </tree>
95 </field>
96@@ -315,7 +315,7 @@
97 <field name="counterpart_inv_number"/>
98 <field name="line_count"/>
99 <field name="currency_id"/>
100- <field name="amount_total"/>
101+ <field name="amount_total" sum="Total Amount" sum_selected="1"/>
102 <field name="state"/>
103 </tree>
104 </field>
105@@ -621,8 +621,9 @@
106 </group>
107 <newline/>
108 <group col="8" colspan="4">
109- <field name="fiscalyear_id" select='1'/>
110- <field name="period_id" select='1' string="Period" domain="[('state', 'not in', ['done', 'created'])]"/>
111+ <field name="currency_id" string="Booking Currency" />
112+ <field name="fiscalyear_id" />
113+ <field name="period_id" string="Period" domain="[('state', 'not in', ['done', 'created'])]"/>
114 <field name="name"/>
115 <field name="amount_total"/>
116 </group>
117
118=== modified file 'bin/addons/analytic_distribution/account_commitment_view.xml'
119--- bin/addons/analytic_distribution/account_commitment_view.xml 2022-11-08 10:40:11 +0000
120+++ bin/addons/analytic_distribution/account_commitment_view.xml 2023-06-06 13:04:03 +0000
121@@ -87,7 +87,7 @@
122 <field name="purchase_id" />
123 <field name="line_count"/>
124 <field name="currency_id"/>
125- <field name="total" digits="(16,2)"/>
126+ <field name="total" digits="(16,2)" sum="Total" sum_selected="1"/>
127 <field name="type"/>
128 <field name="state"/>
129 <button name="commitment_open" string="Validate" icon="terp-camera_test" states="draft"/>
130
131=== modified file 'bin/addons/base/rng/view.rng'
132--- bin/addons/base/rng/view.rng 2022-10-31 15:13:09 +0000
133+++ bin/addons/base/rng/view.rng 2023-06-06 13:04:03 +0000
134@@ -460,6 +460,7 @@
135 <rng:optional><rng:attribute name="password"/></rng:optional>
136 <rng:optional><rng:attribute name="comparator"/></rng:optional>
137 <rng:optional><rng:attribute name="sum"/></rng:optional>
138+ <rng:optional><rng:attribute name="sum_selected"/></rng:optional>
139 <rng:optional><rng:attribute name="real_sum"/></rng:optional>
140 <rng:optional><rng:attribute name="bold"/></rng:optional>
141 <rng:optional><rng:attribute name="italic"/></rng:optional>
142
143=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
144--- bin/addons/msf_profile/i18n/fr_MF.po 2023-05-15 08:42:05 +0000
145+++ bin/addons/msf_profile/i18n/fr_MF.po 2023-06-06 13:04:03 +0000
146@@ -23056,12 +23056,13 @@
147 msgid "America/Monterrey"
148 msgstr "America/Monterrey"
149
150-#. modules: account_override, financing_contract, register_accounting, finance, msf_accrual
151+#. modules: account_override, financing_contract, register_accounting, finance, msf_accrual, account
152 #: report:addons/account_override/report/open_invoices_xls.mako:346
153 #: field:cash.request.liquidity.total,booking_currency_id:0
154 #: report:addons/financing_contract/report/project_expenses_xls.mako:503
155 #: report:addons/register_accounting/report/open_advances_xls.mako:155
156 #: view:msf.accrual.line:0
157+#: view:account.invoice:0
158 msgid "Booking Currency"
159 msgstr "Devise d'Enregistrement"
160
161@@ -120284,3 +120285,17 @@
162 msgid "Popup Date"
163 msgstr "Date d'affichage"
164
165+#. module: account
166+#: field:account.journal,inactivation_date:0
167+msgid "Inactivation date"
168+msgstr "Date d'Inactivation"
169+
170+#. module: account
171+#: field:account.invoice,is_draft:0
172+msgid "Is draft"
173+msgstr "Est brouillon"
174+
175+#. module: account
176+#: help:account.invoice,is_draft:0
177+msgid "used to sort invoices (draft on top)"
178+msgstr "utilisé pour trier les factures (brouillon en premier)"
179
180=== modified file 'bin/addons/register_accounting/account_invoice_view.xml'
181--- bin/addons/register_accounting/account_invoice_view.xml 2022-10-05 08:37:21 +0000
182+++ bin/addons/register_accounting/account_invoice_view.xml 2023-06-06 13:04:03 +0000
183@@ -254,9 +254,9 @@
184 <field name="origin"/>
185 <field name="line_count"/>
186 <field name="currency_id"/>
187- <field name="residual" sum="Residual Amount"/>
188- <field name="amount_untaxed" sum="Untaxed Amount" invisible="1"/>
189- <field name="amount_total" sum="Total Amount"/>
190+ <field name="residual" sum="Residual Amount" sum_selected="1"/>
191+ <field name="amount_untaxed" sum="Untaxed Amount" invisible="1" sum_selected="1"/>
192+ <field name="amount_total" sum="Total Amount" sum_selected="1"/>
193 <field name="state"/>
194 </tree>
195 </field>

Subscribers

People subscribed via source and target branches