Merge lp:~unifield-team/unifield-server/us-1197 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/account/report/account_general_ledger.py'
--- bin/addons/account/report/account_general_ledger.py	2016-04-06 14:00:48 +0000
+++ bin/addons/account/report/account_general_ledger.py	2016-04-14 13:25:24 +0000
@@ -66,6 +66,18 @@
                 'show_period_0': 1,
                 'state_agnostic': 1,
             })
+            # US-1197/4: IB entries for yearly closing always in 1th Jan
+            # => get rid of regular period/dates filters for _query_get
+            # => if self.init_balance is True, note that filtering is OK
+            # validated at wizard report level
+            ib_local_context.update({
+                'date_from': False,
+                'date_to': False,
+                'date_fromto_docdate': False,
+                'period_from': False,
+                'period_to': False,
+                'periods': False,
+            })
             self.init_query = obj_move._query_get(self.cr, self.uid, obj='l',
                 context=ib_local_context)
         else:
@@ -226,12 +238,18 @@
 
     def _show_node_in_report(self, node):
         res = True
-        if self.account_ids or self.unreconciled_filter:
-            # hide if zero bal and any by account or unreconciled filter on
-            bal = node.data.get('*', {}).get('debit', 0.) \
-                - node.data.get('*', {}).get('credit', 0.)
-            if bal == 0.:
-                res = False
+        if node.parent is None:
+            return res  # always show root account MSF
+        if self.account_ids or self.account_report_types \
+            or self.unreconciled_filter:
+            res = not node.skip
+            if res:
+                # hide if zero bal and any by account or unreconciled filter on
+                bal = node.data.get('*', {}).get('debit', 0.) \
+                    - node.data.get('*', {}).get('credit', 0.)
+                if bal == 0.:
+                    res = False
+
         return res
 
     def _get_journals_str(self, data):
@@ -393,6 +411,7 @@
                 line = self.get_start_period(data) + ' - ' + self.get_end_period(data)
             if line:
                 infos.append(line)
+
         return infos and ", \n".join(infos) or _('No Filter')
         
     def _get_line_debit(self, line, booking=False):
@@ -479,6 +498,15 @@
                 display_account = _('With balance is not equal to 0')
         info_data.append((_('Accounts'), display_account, ))
 
+        account_ids = list(set(self._get_data_form(data, 'account_ids')))
+        if account_ids:
+            # US-1197/2: display filtered accounts
+            account_obj = self.pool.get('account.account')
+            info_data.append((_('Selected Accounts'), ', '.join(
+                    [ a.code for a in account_obj.browse(
+                        self.cr, self.uid, account_ids) \
+                        if a.type != 'view' ], )))
+
         res = [ "%s: %s" % (label, val, ) for label, val in info_data ]
         return ', \n'.join(res)
 

=== modified file 'bin/addons/account/report/account_general_ledger_landscape.rml'
--- bin/addons/account/report/account_general_ledger_landscape.rml	2016-03-31 09:45:40 +0000
+++ bin/addons/account/report/account_general_ledger_landscape.rml	2016-04-14 13:25:24 +0000
@@ -248,7 +248,7 @@
       [[ get_show_move_lines() or removeParentNode('blockTable') ]]
       <tr>
         <td>
-          <para style="terp_tblheader_Details">Entry Seq</para>
+          <para style="terp_tblheader_Details">Account/Entry Seq</para>
         </td>
         <td>
           <para style="terp_tblheader_Details">Posting Date</para>
@@ -330,14 +330,17 @@
 
       <section>
         <para style="terp_default_8">[[ repeatIn(lines(o, initial_balance_mode=True), 'line') ]]</para>
-        <blockTable colWidths="286.0,60.0,110.0,110.0,110.0,110.0" style="Table9">
+        <blockTable colWidths="40.0,246.0,60.0,110.0,110.0,110.0,110.0" style="Table9">
           [[ show_node_in_report(o) or removeParentNode('blockTable') ]]
           <tr>
             <td>
+              <para style="terp_default_9_Right">[[ o.code or '' ]]</para>
+            </td>
+            <td>
               <para style="terp_default_9_Right">[[ line['move'] or '' ]]</para>
             </td>
             <td>
-                <para style="terp_def114.0,80.0,92.0,60.0,110.0,110.0,110.0,110.0ault_9_Right">[[ line['currency_name'] or '' ]]</para>
+                <para style="terp_default_9_Right">[[ line['currency_name'] or '' ]]</para>
             </td>
             <td>
               <para style="terp_default_9_Right">[[ formatLang(get_line_debit(line, booking=True), digits=get_digits(dp='Account')) ]]</para>
@@ -390,11 +393,14 @@
 
       <section>
       <para style="terp_default_8">[[ repeatIn(o.get_currencies(), 'ccy') ]]</para>
-      <blockTable colWidths="286.0,60.0,110.0,110.0,110.0,110.0" style="Table8_subtotal_ccy">
+      <blockTable colWidths="40.0,246.0,60.0,110.0,110.0,110.0,110.0" style="Table8_subtotal_ccy">
         [[ show_node_in_report(o) or removeParentNode('blockTable') ]]
         <tr>
           <td>
-            <para style="terp_default_9_Right">[[ o.code ]]</para>
+              <para style="terp_default_9_Right">[[ o.code or '' ]]</para>
+          </td>
+          <td>
+            <para style="terp_default_9_Right">Sub Total</para>
           </td>
           <td>
               <para style="terp_default_9_Right">[[ ccy ]]</para>

=== modified file 'bin/addons/account/report/account_general_ledger_xls.mako'
--- bin/addons/account/report/account_general_ledger_xls.mako	2016-03-23 14:52:23 +0000
+++ bin/addons/account/report/account_general_ledger_xls.mako	2016-04-14 13:25:24 +0000
@@ -187,21 +187,15 @@
     display_account = (data['form']['display_account']=='bal_all' and 'All') or (data['form']['display_account']=='bal_movement' and 'With movements') or 'With balance is not equal to 0'
 %>
 <Table x:FullColumns="1" x:FullRows="1">
-<Column ss:AutoFitWidth="1" ss:Width="64" />
-<Column ss:AutoFitWidth="1" ss:Width="120" />
-<Column ss:AutoFitWidth="1" ss:Width="64" />
-% if get_show_move_lines():
-<Column ss:AutoFitWidth="1" ss:Width="300" />
-% endif
-% if not get_show_move_lines():
-<Column ss:AutoFitWidth="1" ss:Width="150" />
-% endif
-<Column ss:AutoFitWidth="1" ss:Width="50" />
-<Column ss:AutoFitWidth="1" ss:Width="64" />
-<Column ss:AutoFitWidth="1" ss:Width="64" />
-<Column ss:AutoFitWidth="1" ss:Width="64" />
-<Column ss:AutoFitWidth="1" ss:Width="64" />
-<Column ss:AutoFitWidth="1" ss:Width="64" />
+<Column ss:AutoFitWidth="1" ss:Width="50" />
+<Column ss:AutoFitWidth="1" ss:Width="80" />
+<Column ss:AutoFitWidth="1" ss:Width="55" />
+<Column ss:AutoFitWidth="1" ss:Width="80" />
+<Column ss:AutoFitWidth="1" ss:Width="50" />
+<Column ss:Width="90" />
+<Column ss:Width="90" />
+<Column ss:Width="90" />
+<Column ss:Width="90" />
 <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>
@@ -246,13 +240,14 @@
 </Row>
 <Row>
 % if get_show_move_lines():
-<Cell ss:StyleID="ssH" ss:MergeAcross="1"><Data ss:Type="String">Entry Seq</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Account</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Entry Seq</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Posting Date</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Description</Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Currency</Data></Cell>
 % endif
 % if not get_show_move_lines():
-<Cell ss:StyleID="ssH"><Data ss:Type="String">Account / CCY</Data></Cell>
+<Cell ss:StyleID="ssH"><Data ss:Type="String">Account</Data></Cell>
 <Cell ss:StyleID="ssH" ss:MergeAcross="2"><Data ss:Type="String"></Data></Cell>
 <Cell ss:StyleID="ssH"><Data ss:Type="String">Currency</Data></Cell>
 % endif
@@ -301,7 +296,10 @@
 
 % for line in lines(o, initial_balance_mode=True):
 <Row>
-<Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}" ss:MergeAcross="3">
+<Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}">
+    <Data ss:Type="String">${(o.code or '')|x}</Data>
+</Cell>
+<Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}" ss:MergeAcross="2">
     <Data ss:Type="String">${(line['move'] or '' or '')|x}</Data>
 </Cell>
 <Cell ss:StyleID="ssAccountLine${ccy_sub_total_style_suffix}">
@@ -333,7 +331,7 @@
 <Cell ss:StyleID="ssAccountLine">
     <Data ss:Type="String">${(formatLang(line['ldate'],date=True)) or ''}</Data>
 </Cell>
-<Cell ss:StyleID="ssAccountLineNoWrap">
+<Cell ss:StyleID="ssAccountLine">
     <Data ss:Type="String">${(line['lname'] or '')|x}</Data>
 </Cell>
 <Cell ss:StyleID="ssAccountLine">
@@ -356,9 +354,12 @@
 
 % for ccy in o.get_currencies():
 <Row>
-<Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}" ss:MergeAcross="3">
+<Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}">
     <Data ss:Type="String">${(o.code or '')|x}</Data>
 </Cell>
+<Cell ss:StyleID="ssBorder${ccy_sub_total_style_suffix}${ccy_sub_total_style_right_suffix}" ss:MergeAcross="2">
+    <Data ss:Type="String">Sub Total</Data>
+</Cell>
 <Cell ss:StyleID="ssAccountLine${ccy_sub_total_style_suffix}">
     <Data ss:Type="String">${(ccy or '')|x}</Data>
 </Cell>
@@ -383,7 +384,12 @@
 <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
    <PageSetup>
     <Layout x:Orientation="Landscape"/>
-    <Header x:Data="&amp;C&amp;&quot;Arial,Bold&quot;&amp;14General Ledger"/>
+% if get_show_move_lines():
+    <Header x:Data="&amp;C&amp;&quot;Arial,Bold&quot;&amp;14General Ledger"/>0
+% endif
+% if not get_show_move_lines():
+    <Header x:Data="&amp;C&amp;&quot;Arial,Bold&quot;&amp;14Trial Balance"/>0
+% endif
     <Footer x:Data="Page &amp;P of &amp;N"/>
    </PageSetup>
    <Print>

=== modified file 'bin/addons/account/wizard/account_report_general_ledger.py'
--- bin/addons/account/wizard/account_report_general_ledger.py	2016-03-23 14:52:23 +0000
+++ bin/addons/account/wizard/account_report_general_ledger.py	2016-04-14 13:25:24 +0000
@@ -128,9 +128,7 @@
             fy_rec = self.pool.get('account.fiscalyear').browse(cr, uid,
                 fiscalyear_id, context=context)
             if filter in ('filter_date_doc', 'filter_date', ):
-                ib_available = date_from and date_to \
-                    and date_from == fy_rec.date_start \
-                    and date_to <= fy_rec.date_stop
+                ib_available = date_from and date_from == fy_rec.date_start
             elif filter in 'filter_period':
                 if not period_from or not period_to:
                     ib_available = False

=== modified file 'bin/addons/finance/account_drill.py'
--- bin/addons/finance/account_drill.py	2016-03-17 08:07:51 +0000
+++ bin/addons/finance/account_drill.py	2016-04-14 13:25:24 +0000
@@ -41,6 +41,7 @@
         # set during map/reduce
         self.data = {}
         self.zero_bal = False
+        self.skip = False
 
         # set during next_node() calls
         self.code = ''
@@ -80,12 +81,11 @@
         JOIN res_currency c ON (c.id = l.currency_id)
         JOIN account_journal j on (l.journal_id=j.id)
         JOIN account_account a on (a.id=l.account_id)
-        JOIN account_account_type at on (at.id=a.user_type)
-        WHERE l.account_id = %s{reconcile}{options}{query}
+        WHERE l.account_id = %s{reconcile}{query}
         GROUP BY l.currency_id'''
 
     # initial balance move lines base query (from IB journal period 0)
-    _sql_ib = '''SELECT  sum(debit), sum(credit),
+    _sql_ib = '''SELECT sum(debit), sum(credit),
         sum(debit_currency), sum(credit_currency),
         max(c.name)
         FROM account_move_line l
@@ -112,8 +112,28 @@
         self.query_ib = query_ib or ''
         self.move_states = move_states or [ 'draft', 'posted', ]
         self.include_accounts = include_accounts
+        self.account_report_types = account_report_types
         self.with_balance_only = with_balance_only
         self.reconcile_filter = reconcile_filter
+        if self.account_report_types and not self.include_accounts:
+            # deduce included accounts from report type filter
+            domain = [
+                ('report_type', 'in' , self.account_report_types),
+            ]
+            if 'asset' in self.account_report_types \
+                or 'liability' in self.account_report_types:
+                # US-227 include tax account for BS accounts selection
+                domain = [ '|', ('code', '=', 'tax') ] + domain
+            account_types_ids = self.pool.get('account.account.type').search(
+                self.cr, self.uid, domain, context=self.context)
+
+            if account_types_ids:
+                domain = [
+                    ('type', '!=', 'view'),
+                    ('user_type', 'in' , account_types_ids),
+                ]
+                self.include_accounts = self.pool.get('account.account').search(
+                    self.cr, self.uid, domain, context=self.context) or []
 
         # nodes
         self.root = None
@@ -125,18 +145,6 @@
         # JI base query: constructed via _sql
         self.sql = self._sql
         self.sql = self.sql.replace('{reconcile}', self.reconcile_filter)
-        if account_report_types:
-            report_types = [ "'%s'" % (rt, ) for rt in account_report_types ]
-            options = " AND (at.report_type in (%s)" % (
-                ','.join(report_types), )
-            if 'asset' in account_report_types \
-                or 'liability' in account_report_types:
-                # US-227 include tax account for BS accounts selection
-                options += " OR at.code = 'tax'"
-            options += ')'
-        else:
-            options = ''
-        self.sql = self.sql.replace('{options}', options)
 
     def output(self):
         """
@@ -169,28 +177,31 @@
 
         level = self._move_level
         while level > 0:
-            nodes = self.nodes_by_level[level]
-            for n in nodes:
-                if level == self._move_level:
-                    if self.with_balance_only:
-                        bal = n.data.get('*', {}).get('debit', 0.) \
-                            - n.data.get('*', {}).get('credit', 0.)
-                        if bal == 0.:
-                            # JI level:
-                            # with only balance filter: do not agregate account
-                            # debit/credit with a zero balance
-                            n.zero_bal = True
-                            continue
+            nodes = self.nodes_by_level.get(level)
+            if nodes:
+                for n in nodes:
+                    if level == self._move_level:
+                        if self.with_balance_only:
+                            bal = n.data.get('*', {}).get('debit', 0.) \
+                                - n.data.get('*', {}).get('credit', 0.)
+                            if bal == 0.:
+                                # JI level:
+                                # with only balance filter: do not agregate account
+                                # debit/credit with a zero balance
+                                n.zero_bal = True
+                                continue
+                    elif level == self._move_level - 1:
+                        n.skip = not n.childs  # no entries due to filtering
 
-                parent = n.parent
-                if parent:
-                    for ccy in n.data:
-                        if not ccy in parent.data:
-                            parent.data[ccy] = {}
+                    parent = n.parent
+                    if parent:
+                        for ccy in n.data:
+                            if not ccy in parent.data:
+                                parent.data[ccy] = {}
+                                for f in fields:
+                                    parent.data[ccy][f] = 0.
                             for f in fields:
-                                parent.data[ccy][f] = 0.
-                        for f in fields:
-                            parent.data[ccy][f] += n.data[ccy].get(f, 0.)
+                                parent.data[ccy][f] += n.data[ccy].get(f, 0.)
             level -= 1  # upper level (upper level by uper level)
 
         # uncomment to explore reduced nodes
@@ -211,10 +222,13 @@
         child_ids = self._search(domain)
         if child_ids:
             for id in child_ids:
-                if not self.include_accounts or id in self.include_accounts:
+                create = level < self._move_level \
+                    or not self.include_accounts or id in self.include_accounts
+                if create:
                     node = self._create_node(parent=parent, level=level,
                         account_id=id)
-                    self._map_dive(node, level + 1)
+                    if node:
+                        self._map_dive(node, level + 1)
 
     def _create_node(self, parent=None, level=0, account_id=False):
         """