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

[jftempo]

=== modified file 'bin/addons/account/account_report.xml'
--- bin/addons/account/account_report.xml	2022-07-26 12:20:10 +0000
+++ bin/addons/account/account_report.xml	2023-08-29 12:37:24 +0000
@@ -209,5 +209,13 @@
                  auto="False"
                  menu="False"/>
 
+        <report id="pl_account_horizontal"
+                menu="False"
+                model="account.account"
+                name="pl.account.horizontal"
+                rml="account/report/account_profit_horizontal.rml"
+                string="Profit And Loss"
+                auto="False" />
+
     </data>
 </openerp>
 
=== modified file 'bin/addons/account/report/account_profit_horizontal.rml'
--- bin/addons/account/report/account_profit_horizontal.rml	2016-02-29 09:08:35 +0000
+++ bin/addons/account/report/account_profit_horizontal.rml	2023-08-29 12:37:24 +0000
@@ -150,7 +150,7 @@
 	 	<para style="P2">[[ get_data(data) or removeParentNode('para')]]</para>
       <blockTable colWidths="128.0,128.0,128.0,128.0,128.0,128.0" style="Table2_header">
       <tr>
-      	<td><para style="terp_tblheader_General_Centre">Chart of Account </para></td>
+      	<td><para style="terp_tblheader_General_Centre">Chart of Account</para></td>
         <td><para style="terp_tblheader_General_Centre">Fiscal Year</para></td>
         <td><para style="terp_tblheader_General_Centre">Filter By [[ get_filter_name(data)!='No Filter' and get_filter_name(data) ]]</para></td>
 		<td><para style="terp_tblheader_General_Centre">Display</para></td>
 
=== modified file 'bin/addons/account/report/account_profit_loss_xls.mako'
--- bin/addons/account/report/account_profit_loss_xls.mako	2017-03-29 14:17:23 +0000
+++ bin/addons/account/report/account_profit_loss_xls.mako	2023-08-29 12:37:24 +0000
@@ -5,7 +5,7 @@
 xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
 xmlns:html="http://www.w3.org/TR/REC-html40">
 <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
-<Title>Profit And Loss</Title>
+<Title>${_("Profit And Loss")}</Title>
 </DocumentProperties>
 <Styles>
 
@@ -108,12 +108,12 @@
 <Column ss:AutoFitWidth="1" ss:Width="190" />
 <Column ss:AutoFitWidth="1" ss:Width="64" />
 <Row>
-<Cell ss:StyleID="ssH"><Data ss:Type="String">Chart of Account</Data></Cell>
-<Cell ss:StyleID="ssH"><Data ss:Type="String">Fiscal Year</Data></Cell>
-<Cell ss:StyleID="ssH"><Data ss:Type="String">Display</Data></Cell>
-<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>
-<Cell ss:StyleID="ssH"><Data ss:Type="String">Proprietary Instances</Data></Cell>
-<Cell ss:StyleID="ssH"><Data ss:Type="String">Target Moves</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Chart of Account")}</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Fiscal Year")}</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Display")}</Data></Cell>
+<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>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Proprietary Instances")}</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Target Moves")}</Data></Cell>
 </Row>
 
 <Row>
@@ -145,10 +145,10 @@
 
 <Row>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Code</Data></Cell>
-<Cell ss:StyleID="ssH"><Data ss:Type="String">Expense</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Expense")}</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Balance</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Code</Data></Cell>
-<Cell ss:StyleID="ssH"><Data ss:Type="String">Income</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">${_("Income")}</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Balance</Data></Cell>
 </Row>
 
 
=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2023-08-16 09:21:58 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2023-08-29 12:37:24 +0000
@@ -3267,6 +3267,8 @@
 #: report:account.employee_ledger_other:0
 #: report:addons/account/report/account_employee_ledger.mako:240
 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:287
+#: report:addons/account/report/account_profit_loss_xls.mako:112
+#: report:pl.account.horizontal:0
 msgid "Fiscal Year"
 msgstr "Exercice Comptable"
 
@@ -9171,6 +9173,7 @@
 #: view:account.employee.balance.tree:0
 #: field:account.employee.balance.tree,balance:0
 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:357
+#: report:pl.account.horizontal:0
 msgid "Balance"
 msgstr "Solde de la balance"
 
@@ -16379,7 +16382,7 @@
 msgid "Salesman"
 msgstr "Responsable"
 
-#. modules: msf_instance, finance, register_accounting
+#. modules: msf_instance, finance, register_accounting, account
 #: field:cash.request,prop_instance_id:0
 #: field:cash.request.liquidity,instance_id:0
 #: field:cash.request.liquidity.bank,instance_id:0
@@ -16388,6 +16391,7 @@
 #: field:msf_instance.setup,instance_id:0
 #: report:addons/register_accounting/report/liquidity_position_xls.mako:315
 #: report:addons/register_accounting/report/liquidity_position_xls.mako:467
+#: report:pl.account.horizontal:0
 msgid "Proprietary instance"
 msgstr "Instance propriétaire"
 
@@ -20249,6 +20253,9 @@
 #. module: account
 #: view:account.pl.report:0
 #: model:ir.ui.menu,name:account.menu_account_pl_report
+#: report:addons/account/report/account_profit_loss_xls.mako:8
+#: model:ir.actions.report.xml,name:account.pl_account_horizontal
+#: report:pl.account.horizontal:0
 msgid "Profit And Loss"
 msgstr "Compte de Résultat"
 
@@ -23706,6 +23713,8 @@
 #: report:account.employee_ledger_other:0
 #: report:addons/account/report/account_employee_ledger.mako:239
 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:268
+#: report:addons/account/report/account_profit_loss_xls.mako:111
+#: report:pl.account.horizontal:0
 msgid "Chart of Account"
 msgstr "Plan comptable"
 
@@ -27779,6 +27788,8 @@
 #: report:account.employee_ledger_other:0
 #: report:addons/account/report/account_employee_ledger.mako:244
 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:291
+#: report:addons/account/report/account_profit_loss_xls.mako:114
+#: report:pl.account.horizontal:0
 msgid "Filter By"
 msgstr "Filtrer par"
 
@@ -35384,6 +35395,7 @@
 #: report:ship.loan.certificate:0
 #: report:ship.loan.return.certificate:0
 #: report:shipment.donation.certificate:0
+#: report:pl.account.horizontal:0
 #: field:product.product,default_code:0
 #, python-format
 msgid "Code"
@@ -40941,6 +40953,7 @@
 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:290
 #: view:wizard.account.employee.balance.tree:0
 #: field:wizard.account.employee.balance.tree,instance_ids:0
+#: report:addons/account/report/account_profit_loss_xls.mako:115
 msgid "Proprietary Instances"
 msgstr "Instances Propriétaires"
 
@@ -42874,6 +42887,7 @@
 #: report:lot.stock.overview:0
 #: report:lot.stock.overview_all:0
 #: report:stock.inventory.move:0
+#: report:pl.account.horizontal:0
 msgid "Total:"
 msgstr "Total :"
 
@@ -66311,8 +66325,10 @@
 #. module: account
 #: selection:report.account.receivable,type:0
 #: view:account.account:0
+#: report:addons/account/report/account_profit_loss_xls.mako:151
+#: report:pl.account.horizontal:0
 msgid "Income"
-msgstr "Income"
+msgstr "Recettes"
 
 #. module: account_reconciliation
 #: help:account.move.line,unreconcile_txt:0
@@ -67018,6 +67034,8 @@
 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:317
 #: field:wizard.account.employee.balance.tree,target_move:0
 #: report:account.employee_ledger_other:0
+#: report:addons/account/report/account_profit_loss_xls.mako:116
+#: report:pl.account.horizontal:0
 msgid "Target Moves"
 msgstr "Transact. Cibles"
 
@@ -76224,8 +76242,10 @@
 #. module: account
 #: selection:report.account.receivable,type:0
 #: view:account.account:0
+#: report:addons/account/report/account_profit_loss_xls.mako:148
+#: report:pl.account.horizontal:0
 msgid "Expense"
-msgstr "Expense"
+msgstr "Dépenses"
 
 #. module: sale
 #: model:ir.actions.act_window,name:sale.action_sale_installer
@@ -77824,6 +77844,7 @@
 #: report:account.employee_ledger_other:0
 #: report:addons/account/report/account_employee_ledger.mako:244
 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:291
+#: report:addons/account/report/account_profit_loss_xls.mako:114
 #, python-format
 msgid "No Filter"
 msgstr "Pas de filtre"
@@ -91703,6 +91724,8 @@
 #: report:account.employee_ledger_other:0
 #: report:addons/account/report/account_employee_ledger.mako:245
 #: report:addons/finance/report/account_employee_balance_tree_xls.mako:292
+#: report:addons/account/report/account_profit_loss_xls.mako:113
+#: report:pl.account.horizontal:0
 #, python-format
 msgid "Display"
 msgstr "Afficher"
@@ -120590,8 +120613,9 @@
 msgid "Are you sure you want to post <span style=\"font-weight: bold; color: red;\">ALL</span> the entries?"
 msgstr "Voulez-vous comptabiliser <span style=\"font-weight: bold; color: red;\">TOUTES</span> les entrées ?"
 
-#. module: register_accounting
+#. module: register_accounting, account
 #: field:account.move.line,counterpart_transfer_st_line_id:0
+#: selection:account.journal.column,field:0
 msgid "Conterpart transfert register line"
 msgstr "Line de registre de la contrepartie de transfert"
 
@@ -120647,9 +120671,10 @@
 msgid "Do Not Post"
 msgstr "Ne Pas comptabiliser"
 
-#. module: register_accounting
+#. module: register_accounting, account
 #: field:account.bank.statement.line,has_a_counterpart_transfer:0
 #: field:account.move.line,has_a_counterpart_transfer:0
+#: selection:account.journal.column,field:0
 msgid "Has a counterpart_transfer"
 msgstr "A une contrepartie de transfert"
 
@@ -120832,9 +120857,10 @@
 msgid "Set Post on selection"
 msgstr "Comptabiliser la sélection"
 
-#. module: register_accounting
+#. module: register_accounting, account
 #: field:account.bank.statement.line,counterpart_transfer_st_line_sdref:0
 #: field:account.move.line,counterpart_transfer_st_line_sdref:0
+#: selection:account.journal.column,field:0
 msgid "St couterpert line sdref"
 msgstr "Sdref de le ligne de reg. de cp"