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

[jftempo]

=== modified file 'bin/addons/account/report/account_general_ledger.py'
--- bin/addons/account/report/account_general_ledger.py	2020-02-03 14:46:06 +0000
+++ bin/addons/account/report/account_general_ledger.py	2020-06-10 07:55:32 +0000
@@ -225,7 +225,6 @@
             'get_start_period': self.get_start_period,
             'get_end_period': self.get_end_period,
             'get_filter': self._get_filter,
-            'get_sortby': self._get_sortby,
             'get_start_date':self._get_start_date,
             'get_end_date':self._get_end_date,
             'get_target_move': self._get_target_move,
@@ -337,10 +336,14 @@
             del counterpart_res'''
             # Then select all account_move_line of this account
 
-            if self.sortby == 'sort_journal_partner':
-                sql_sort='j.code, p.name, l.move_id'
-            else:
-                sql_sort='l.date, l.move_id'
+            if self.sortby == 'sort_third_party':
+                sql_sort = 'l.partner_txt NULLS first, l.move_id'
+            elif self.sortby == 'sort_currency':
+                sql_sort = 'c.name, l.move_id'
+            elif self.sortby == 'sort_reconcile':
+                sql_sort = 'l.reconcile_txt NULLS first, l.move_id'
+            else:  # sort_date by default
+                sql_sort = 'l.date, l.move_id'
             sql = """
                 SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.currency_id,
                 l.amount_currency,l.ref AS lref, l.name AS lname,
@@ -352,7 +355,7 @@
                 c.symbol AS currency_code,
                 i.id AS invoice_id, i.type AS invoice_type,
                 i.number AS invoice_number,
-                p.name AS partner_name, c.name as currency_name, l.partner_txt as third_party
+                p.name AS partner_name, c.name as currency_name, l.partner_txt as third_party, l.reconcile_txt
                 FROM account_move_line l
                 JOIN account_move m on (l.move_id=m.id)
                 LEFT JOIN res_currency c on (l.currency_id=c.id)
@@ -370,6 +373,8 @@
             if self.init_balance:
                 # US-822: move lines for period 0 IB journal
                 sql_sort = 'l.move_id'
+                if self.sortby == 'sort_currency':  # also sort by currency in case the related option is selected
+                    sql_sort = 'c.name, l.move_id'
                 sql = """
                     SELECT l.id AS lid, l.date AS ldate, j.code AS lcode, l.currency_id,
                     l.amount_currency,l.ref AS lref, l.name AS lname,
@@ -381,7 +386,7 @@
                     per.code as period_code, c.symbol AS currency_code,
                     '' AS invoice_id, '' invoice_type,
                     '' AS invoice_number,
-                    '' AS partner_name, c.name as currency_name
+                    '' AS partner_name, c.name as currency_name, l.reconcile_txt
                     FROM account_move_line l
                     JOIN account_move m on (l.move_id=m.id)
                     LEFT JOIN res_currency c on (l.currency_id=c.id)
@@ -416,13 +421,6 @@
             return self.pool.get('account.account').browse(self.cr, self.uid, data['form']['id'], context=self.context).company_id.name
         return super(general_ledger ,self)._get_account(data)
 
-    def _get_sortby(self, data):
-        if self.sortby == 'sort_date':
-            return 'Date'
-        elif self.sortby == 'sort_journal_partner':
-            return 'Journal & Partner'
-        return 'Date'
-
     def _get_output_currency_code(self, data):
         return self.output_currency_code or self.currency_name
 

=== modified file 'bin/addons/account/report/account_general_ledger_xls.mako'
--- bin/addons/account/report/account_general_ledger_xls.mako	2019-07-31 15:26:10 +0000
+++ bin/addons/account/report/account_general_ledger_xls.mako	2020-06-10 07:55:32 +0000
@@ -132,6 +132,16 @@
   <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
 </Borders>
 </Style>
+<Style ss:ID="ssAccountLineRight">
+<Alignment ss:Bottom="Top" ss:WrapText="1" ss:Vertical="Center" ss:Horizontal="Right"/>
+<Font ss:Size="8"/>
+<Borders>
+  <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+  <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+</Borders>
+</Style>
 <Style ss:ID="ssAccountLineColored1">
 <Alignment ss:Bottom="Top" ss:WrapText="1"/>
 <Font ss:Size="8"/>
@@ -201,10 +211,7 @@
 <Column ss:AutoFitWidth="1" ss:Width="55" />
 <Column ss:AutoFitWidth="1" ss:Width="100" ss:Span="1" />
 <Column ss:AutoFitWidth="1" ss:Width="55" />
-<Column ss:Width="90" />
-<Column ss:Width="90" />
-<Column ss:Width="90" />
-<Column ss:Width="90" />
+<Column ss:Width="90" ss:Span="4" />
 <Row>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">${header_company_or_chart_of_account}</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Fiscal Year</Data></Cell>
@@ -213,7 +220,12 @@
 <Cell ss:StyleID="ssH"><Data ss:Type="String">${_('Open Items at')}</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Filter By ${(get_filter(data)!='No Filter' and get_filter(data) or '')|x}</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Target Moves</Data></Cell>
-<Cell ss:StyleID="ssH" ss:MergeAcross="1"><Data ss:Type="String">Proprietary Instances</Data></Cell>
+% if get_show_move_lines():
+    <Cell ss:StyleID="ssH" ss:MergeAcross="2">
+% else:
+    <Cell ss:StyleID="ssH" ss:MergeAcross="1">
+% endif
+<Data ss:Type="String">Proprietary Instances</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Currency</Data></Cell>
 </Row>
 % for a in objects:
@@ -239,8 +251,12 @@
 <Cell ss:StyleID="ssHeader">
     <Data ss:Type="String">${(get_target_move(data) or '')|x}</Data>
 </Cell>
-<Cell ss:StyleID="ssHeader" ss:MergeAcross="1">
-    <Data ss:Type="String">${(get_prop_instances() or '')|x}</Data>
+% if get_show_move_lines():
+    <Cell ss:StyleID="ssHeader" ss:MergeAcross="2">
+% else:
+    <Cell ss:StyleID="ssHeader" ss:MergeAcross="1">
+% endif
+<Data ss:Type="String">${(get_prop_instances() or '')|x}</Data>
 </Cell>
 <Cell ss:StyleID="ssHeader">
     <Data ss:Type="String">${get_output_currency_code(data)}</Data>
@@ -269,6 +285,9 @@
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Credit</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Booking Balance</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Balance ${get_output_currency_code(data)}</Data></Cell>
+% if get_show_move_lines():
+    <Cell ss:StyleID="ssH"><Data ss:Type="String">${_('Reconcile Number')}</Data></Cell>
+% endif
 <Cell><Data ss:Type="String"></Data></Cell>
 % if not get_show_move_lines():
 <Cell><Data ss:Type="String"></Data></Cell>
@@ -305,6 +324,9 @@
 <Cell ss:StyleID="ssNumber${ac_style_suffix}">
     <Data ss:Type="Number">${o.data['*']['debit'] - o.data['*']['credit']}</Data>
 </Cell>
+% if get_show_move_lines():
+    <Cell ss:StyleID="ssBorder${ac_style_suffix}"><Data ss:Type="String"></Data></Cell>
+% endif
 </Row>
 % endif
 
@@ -333,6 +355,9 @@
     <Cell ss:StyleID="ssNumber${ccy_sub_total_style_suffix}">
         <Data ss:Type="Number">${o.data[ccy]['debit'] - o.data[ccy]['credit']}</Data>
     </Cell>
+    % if get_show_move_lines():
+        <Cell ss:StyleID="ssAccountLine${ccy_sub_total_style_suffix}"><Data ss:Type="String"></Data></Cell>
+    % endif
 </Row>
 % endfor
 % endif
@@ -360,13 +385,18 @@
 <Cell ss:StyleID="ssNumber${ccy_sub_total_style_suffix}">
     <Data ss:Type="Number">${get_line_balance(line, booking=False)}</Data>
 </Cell>
+% if get_show_move_lines():
+    <Cell ss:StyleID="ssAccountLine${ccy_sub_total_style_suffix}">
+        <Data ss:Type="String">${(line.get('reconcile_txt') or '')|x}</Data>
+    </Cell>
+% endif
 </Row>
 % endfor
 
 % for line in lines(o, initial_balance_mode=False):
 <Row>
-<Cell ss:StyleID="ssAccountLine">
-    <Data ss:Type="String"></Data>
+<Cell ss:StyleID="ssAccountLineRight">
+    <Data ss:Type="String">${(o.code or '')|x}</Data>
 </Cell>
 <Cell ss:StyleID="ssAccountLine">
     <Data ss:Type="String">${(line['move'] or '' or '')|x}</Data>
@@ -395,6 +425,9 @@
 <Cell ss:StyleID="ssAccountLineNumber">
     <Data ss:Type="Number">${get_line_balance(line, booking=False)}</Data>
 </Cell>
+<Cell ss:StyleID="ssAccountLine">
+    <Data ss:Type="String">${(line.get('reconcile_txt') or '')|x}</Data>
+</Cell>
 </Row>
 % endfor
 

=== modified file 'bin/addons/account/wizard/account_report_general_ledger.py'
--- bin/addons/account/wizard/account_report_general_ledger.py	2017-08-18 09:55:08 +0000
+++ bin/addons/account/wizard/account_report_general_ledger.py	2020-06-10 07:55:32 +0000
@@ -41,7 +41,10 @@
                                           help='It adds initial balance row on report which display previous sum amount of debit/credit/balance'),
         'is_initial_balance_available': fields.function(_get_fake, method=True, type='boolean', string="Is initial balance filter available ?"),
         'amount_currency': fields.boolean("With Currency", help="It adds the currency column if the currency is different then the company currency"),
-        'sortby': fields.selection([('sort_date', 'Date'), ('sort_journal_partner', 'Journal & Partner')], 'Sort By', required=True),
+        'sortby': fields.selection([('sort_date', 'Posting Date'),
+                                    ('sort_third_party', 'Third Party'),
+                                    ('sort_currency', 'Currency'),
+                                    ('sort_reconcile', 'Reconcile Number')], 'Sort by', required=True),
         'output_currency': fields.many2one('res.currency', 'Output Currency', required=True),
         'instance_ids': fields.many2many('msf.instance', 'account_report_general_ledger_instance_rel', 'instance_id', 'argl_id', 'Proprietary Instances'),
         #'export_format': fields.selection([('xls', 'Excel'), ('csv', 'CSV'), ('pdf', 'PDF')], string="Export format", required=True),

=== modified file 'bin/addons/account/wizard/account_report_general_ledger_view.xml'
--- bin/addons/account/wizard/account_report_general_ledger_view.xml	2017-08-10 14:19:58 +0000
+++ bin/addons/account/wizard/account_report_general_ledger_view.xml	2020-06-10 07:55:32 +0000
@@ -16,7 +16,6 @@
             <xpath expr="//field[@name='target_move']" position="after">
                 <field name="is_initial_balance_available" invisible="1"/>
                 <field name="display_account"/>
-                <field name="sortby" invisible="1" />
                 <field name="initial_balance" attrs="{'readonly':[('is_initial_balance_available', '=', False)]}" />
                 <field name="export_format"/>
                 <newline/>   
@@ -24,7 +23,7 @@
                 <field name="amount_currency" invisible="1" />
                 <newline/>
                 <field name="account_type" />
-                <newline/>
+                <field name="sortby" />
                 <field name="reconciled" />
                 <field name="reconcile_date" />
                 <field name="open_items"/>

=== modified file 'bin/addons/finance/account_drill.py'
--- bin/addons/finance/account_drill.py	2017-07-06 10:27:39 +0000
+++ bin/addons/finance/account_drill.py	2020-06-10 07:55:32 +0000
@@ -54,7 +54,7 @@
     def get_currencies(self):
         if not self.data:
             return []
-        return [ c for c in self.data.keys() if c != '*' ]
+        return sorted([ c for c in self.data.keys() if c != '*' ])
 
     def output(self):
         """

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2020-06-02 14:41:41 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2020-06-10 07:55:32 +0000
@@ -11816,11 +11816,6 @@
 msgid "Group By"
 msgstr "Grouper par"
 
-#. module: account
-#: selection:account.report.general.ledger,sortby:0
-msgid "Journal & Partner"
-msgstr "Journal et Partenaire"
-
 #. module: account_mcdb
 #: selection:account.mcdb,currency_choice:0
 msgid "Functional"
@@ -12112,7 +12107,7 @@
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
-msgid "Sort By"
+msgid "Sort by"
 msgstr "Trier par"
 
 #. module: product
@@ -37163,7 +37158,6 @@
 #: selection:account.pl.report,filter:0
 #: selection:account.print.journal,filter:0
 #: selection:account.print.journal,sort_selection:0
-#: selection:account.report.general.ledger,sortby:0
 #: field:account.subscription.generate,date:0
 #: field:account.subscription.line,date:0
 #: report:account.tax.code.entries:0
@@ -65008,6 +65002,7 @@
 #: selection:integrity.finance.wizard,filter:0
 #: code:addons/account_override/res_company.py:40
 #: report:addons/account/report/export_invoice.mako:108
+#: selection:account.report.general.ledger,sortby:0
 #, python-format
 msgid "Posting Date"
 msgstr "Date de Comptabilisation"
@@ -78028,6 +78023,7 @@
 #: report:account.general.ledger_landscape:0
 #: report:account.general.ledger_landscape_tb:0
 #: report:addons/account/report/account_general_ledger_xls.mako:247
+#: selection:account.report.general.ledger,sortby:0
 #, python-format
 msgid "Third Party"
 msgstr "Tiers"
@@ -92901,6 +92897,7 @@
 #: report:addons/stock/report/stock_delivery_report_xls.mako:221
 #: report:addons/account/report/export_invoice.mako:96
 #: report:msf.purchase.quotation:0
+#: selection:account.report.general.ledger,sortby:0
 #, python-format
 msgid "Currency"
 msgstr "Devise"
@@ -100630,6 +100627,8 @@
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 #: report:addons/account/report/account_partner_ledger.mako:310
+#: selection:account.report.general.ledger,sortby:0
+#: report:addons/account/report/account_general_ledger_xls.mako:289
 msgid "Reconcile Number"
 msgstr "Numéro de lettrage"