Unifield Server

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

  1. US-11515
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 6563
Proposed branch: lp:~mukunde/unifield-server/US-11515
Merge into: lp:unifield-server
Diff against target: 249 lines (+50/-16)
4 files modified
bin/addons/account/account_report.xml (+8/-0)
bin/addons/account/report/account_profit_horizontal.rml (+1/-1)
bin/addons/account/report/account_profit_loss_xls.mako (+9/-9)
bin/addons/msf_profile/i18n/fr_MF.po (+32/-6)
To merge this branch: bzr merge lp:~mukunde/unifield-server/US-11515
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+450128@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_report.xml'
2--- bin/addons/account/account_report.xml 2022-07-26 12:20:10 +0000
3+++ bin/addons/account/account_report.xml 2023-08-29 12:37:24 +0000
4@@ -209,5 +209,13 @@
5 auto="False"
6 menu="False"/>
7
8+ <report id="pl_account_horizontal"
9+ menu="False"
10+ model="account.account"
11+ name="pl.account.horizontal"
12+ rml="account/report/account_profit_horizontal.rml"
13+ string="Profit And Loss"
14+ auto="False" />
15+
16 </data>
17 </openerp>
18
19=== modified file 'bin/addons/account/report/account_profit_horizontal.rml'
20--- bin/addons/account/report/account_profit_horizontal.rml 2016-02-29 09:08:35 +0000
21+++ bin/addons/account/report/account_profit_horizontal.rml 2023-08-29 12:37:24 +0000
22@@ -150,7 +150,7 @@
23 <para style="P2">[[ get_data(data) or removeParentNode('para')]]</para>
24 <blockTable colWidths="128.0,128.0,128.0,128.0,128.0,128.0" style="Table2_header">
25 <tr>
26- <td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
27+ <td><para style="terp_tblheader_General_Centre">Chart of Account</para></td>
28 <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
29 <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter_name(data)!='No Filter' and get_filter_name(data) ]]</para></td>
30 <td><para style="terp_tblheader_General_Centre">Display</para></td>
31
32=== modified file 'bin/addons/account/report/account_profit_loss_xls.mako'
33--- bin/addons/account/report/account_profit_loss_xls.mako 2017-03-29 14:17:23 +0000
34+++ bin/addons/account/report/account_profit_loss_xls.mako 2023-08-29 12:37:24 +0000
35@@ -5,7 +5,7 @@
36 xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
37 xmlns:html="http://www.w3.org/TR/REC-html40">
38 <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
39-<Title>Profit And Loss</Title>
40+<Title>${_("Profit And Loss")}</Title>
41 </DocumentProperties>
42 <Styles>
43
44@@ -108,12 +108,12 @@
45 <Column ss:AutoFitWidth="1" ss:Width="190" />
46 <Column ss:AutoFitWidth="1" ss:Width="64" />
47 <Row>
48-<Cell ss:StyleID="ssH"><Data ss:Type="String">Chart of Account</Data></Cell>
49-<Cell ss:StyleID="ssH"><Data ss:Type="String">Fiscal Year</Data></Cell>
50-<Cell ss:StyleID="ssH"><Data ss:Type="String">Display</Data></Cell>
51-<Cell ss:StyleID="ssH"><Data ss:Type="String">Filter By ${(get_filter_name(data)!='No Filter' and get_filter_name(data) or '')|x}</Data></Cell>
52-<Cell ss:StyleID="ssH"><Data ss:Type="String">Proprietary Instances</Data></Cell>
53-<Cell ss:StyleID="ssH"><Data ss:Type="String">Target Moves</Data></Cell>
54+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Chart of Account")}</Data></Cell>
55+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Fiscal Year")}</Data></Cell>
56+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Display")}</Data></Cell>
57+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Filter By")} ${(get_filter_name(data)!=_('No Filter') and _(get_filter_name(data)) or '')|x}</Data></Cell>
58+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Proprietary Instances")}</Data></Cell>
59+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Target Moves")}</Data></Cell>
60 </Row>
61
62 <Row>
63@@ -145,10 +145,10 @@
64
65 <Row>
66 <Cell ss:StyleID="ssH"><Data ss:Type="String">Code</Data></Cell>
67-<Cell ss:StyleID="ssH"><Data ss:Type="String">Expense</Data></Cell>
68+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Expense")}</Data></Cell>
69 <Cell ss:StyleID="ssH"><Data ss:Type="String">Balance</Data></Cell>
70 <Cell ss:StyleID="ssH"><Data ss:Type="String">Code</Data></Cell>
71-<Cell ss:StyleID="ssH"><Data ss:Type="String">Income</Data></Cell>
72+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Income")}</Data></Cell>
73 <Cell ss:StyleID="ssH"><Data ss:Type="String">Balance</Data></Cell>
74 </Row>
75
76
77=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
78--- bin/addons/msf_profile/i18n/fr_MF.po 2023-08-16 09:21:58 +0000
79+++ bin/addons/msf_profile/i18n/fr_MF.po 2023-08-29 12:37:24 +0000
80@@ -3267,6 +3267,8 @@
81 #: report:account.employee_ledger_other:0
82 #: report:addons/account/report/account_employee_ledger.mako:240
83 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:287
84+#: report:addons/account/report/account_profit_loss_xls.mako:112
85+#: report:pl.account.horizontal:0
86 msgid "Fiscal Year"
87 msgstr "Exercice Comptable"
88
89@@ -9171,6 +9173,7 @@
90 #: view:account.employee.balance.tree:0
91 #: field:account.employee.balance.tree,balance:0
92 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:357
93+#: report:pl.account.horizontal:0
94 msgid "Balance"
95 msgstr "Solde de la balance"
96
97@@ -16379,7 +16382,7 @@
98 msgid "Salesman"
99 msgstr "Responsable"
100
101-#. modules: msf_instance, finance, register_accounting
102+#. modules: msf_instance, finance, register_accounting, account
103 #: field:cash.request,prop_instance_id:0
104 #: field:cash.request.liquidity,instance_id:0
105 #: field:cash.request.liquidity.bank,instance_id:0
106@@ -16388,6 +16391,7 @@
107 #: field:msf_instance.setup,instance_id:0
108 #: report:addons/register_accounting/report/liquidity_position_xls.mako:315
109 #: report:addons/register_accounting/report/liquidity_position_xls.mako:467
110+#: report:pl.account.horizontal:0
111 msgid "Proprietary instance"
112 msgstr "Instance propriétaire"
113
114@@ -20249,6 +20253,9 @@
115 #. module: account
116 #: view:account.pl.report:0
117 #: model:ir.ui.menu,name:account.menu_account_pl_report
118+#: report:addons/account/report/account_profit_loss_xls.mako:8
119+#: model:ir.actions.report.xml,name:account.pl_account_horizontal
120+#: report:pl.account.horizontal:0
121 msgid "Profit And Loss"
122 msgstr "Compte de Résultat"
123
124@@ -23706,6 +23713,8 @@
125 #: report:account.employee_ledger_other:0
126 #: report:addons/account/report/account_employee_ledger.mako:239
127 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:268
128+#: report:addons/account/report/account_profit_loss_xls.mako:111
129+#: report:pl.account.horizontal:0
130 msgid "Chart of Account"
131 msgstr "Plan comptable"
132
133@@ -27779,6 +27788,8 @@
134 #: report:account.employee_ledger_other:0
135 #: report:addons/account/report/account_employee_ledger.mako:244
136 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:291
137+#: report:addons/account/report/account_profit_loss_xls.mako:114
138+#: report:pl.account.horizontal:0
139 msgid "Filter By"
140 msgstr "Filtrer par"
141
142@@ -35384,6 +35395,7 @@
143 #: report:ship.loan.certificate:0
144 #: report:ship.loan.return.certificate:0
145 #: report:shipment.donation.certificate:0
146+#: report:pl.account.horizontal:0
147 #: field:product.product,default_code:0
148 #, python-format
149 msgid "Code"
150@@ -40941,6 +40953,7 @@
151 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:290
152 #: view:wizard.account.employee.balance.tree:0
153 #: field:wizard.account.employee.balance.tree,instance_ids:0
154+#: report:addons/account/report/account_profit_loss_xls.mako:115
155 msgid "Proprietary Instances"
156 msgstr "Instances Propriétaires"
157
158@@ -42874,6 +42887,7 @@
159 #: report:lot.stock.overview:0
160 #: report:lot.stock.overview_all:0
161 #: report:stock.inventory.move:0
162+#: report:pl.account.horizontal:0
163 msgid "Total:"
164 msgstr "Total :"
165
166@@ -66311,8 +66325,10 @@
167 #. module: account
168 #: selection:report.account.receivable,type:0
169 #: view:account.account:0
170+#: report:addons/account/report/account_profit_loss_xls.mako:151
171+#: report:pl.account.horizontal:0
172 msgid "Income"
173-msgstr "Income"
174+msgstr "Recettes"
175
176 #. module: account_reconciliation
177 #: help:account.move.line,unreconcile_txt:0
178@@ -67018,6 +67034,8 @@
179 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:317
180 #: field:wizard.account.employee.balance.tree,target_move:0
181 #: report:account.employee_ledger_other:0
182+#: report:addons/account/report/account_profit_loss_xls.mako:116
183+#: report:pl.account.horizontal:0
184 msgid "Target Moves"
185 msgstr "Transact. Cibles"
186
187@@ -76224,8 +76242,10 @@
188 #. module: account
189 #: selection:report.account.receivable,type:0
190 #: view:account.account:0
191+#: report:addons/account/report/account_profit_loss_xls.mako:148
192+#: report:pl.account.horizontal:0
193 msgid "Expense"
194-msgstr "Expense"
195+msgstr "Dépenses"
196
197 #. module: sale
198 #: model:ir.actions.act_window,name:sale.action_sale_installer
199@@ -77824,6 +77844,7 @@
200 #: report:account.employee_ledger_other:0
201 #: report:addons/account/report/account_employee_ledger.mako:244
202 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:291
203+#: report:addons/account/report/account_profit_loss_xls.mako:114
204 #, python-format
205 msgid "No Filter"
206 msgstr "Pas de filtre"
207@@ -91703,6 +91724,8 @@
208 #: report:account.employee_ledger_other:0
209 #: report:addons/account/report/account_employee_ledger.mako:245
210 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:292
211+#: report:addons/account/report/account_profit_loss_xls.mako:113
212+#: report:pl.account.horizontal:0
213 #, python-format
214 msgid "Display"
215 msgstr "Afficher"
216@@ -120590,8 +120613,9 @@
217 msgid "Are you sure you want to post <span style=\"font-weight: bold; color: red;\">ALL</span> the entries?"
218 msgstr "Voulez-vous comptabiliser <span style=\"font-weight: bold; color: red;\">TOUTES</span> les entrées ?"
219
220-#. module: register_accounting
221+#. module: register_accounting, account
222 #: field:account.move.line,counterpart_transfer_st_line_id:0
223+#: selection:account.journal.column,field:0
224 msgid "Conterpart transfert register line"
225 msgstr "Line de registre de la contrepartie de transfert"
226
227@@ -120647,9 +120671,10 @@
228 msgid "Do Not Post"
229 msgstr "Ne Pas comptabiliser"
230
231-#. module: register_accounting
232+#. module: register_accounting, account
233 #: field:account.bank.statement.line,has_a_counterpart_transfer:0
234 #: field:account.move.line,has_a_counterpart_transfer:0
235+#: selection:account.journal.column,field:0
236 msgid "Has a counterpart_transfer"
237 msgstr "A une contrepartie de transfert"
238
239@@ -120832,9 +120857,10 @@
240 msgid "Set Post on selection"
241 msgstr "Comptabiliser la sélection"
242
243-#. module: register_accounting
244+#. module: register_accounting, account
245 #: field:account.bank.statement.line,counterpart_transfer_st_line_sdref:0
246 #: field:account.move.line,counterpart_transfer_st_line_sdref:0
247+#: selection:account.journal.column,field:0
248 msgid "St couterpert line sdref"
249 msgstr "Sdref de le ligne de reg. de cp"
250

Subscribers

People subscribed via source and target branches