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

[jftempo]

=== modified file 'bin/addons/register_accounting/account_bank_statement.py'
--- bin/addons/register_accounting/account_bank_statement.py	2016-04-04 07:54:49 +0000
+++ bin/addons/register_accounting/account_bank_statement.py	2016-05-02 07:55:26 +0000
@@ -1020,6 +1020,23 @@
             res[absl.id] = aal_obj.get_corrections_history(cr, uid, aal_ids, context=context)
         return res
 
+    def _get_free_analytic_lines(self, cr, uid, ids, field_name=None, args=None, context=None):
+        """
+        Get analytic lines Free 1 and Free 2 linked to the given register lines
+        """
+        if not context:
+            context = {}
+        res = {}
+        aal_obj = self.pool.get('account.analytic.line')
+        for absl in self.browse(cr, uid, ids, context=context):
+            # UTP-1055: In case of Cash Advance register line, we don't need to see all other advance lines allocation (analytic lines).
+            # So we keep only analytic lines with the same "name" than register line
+            aal_ids = self.pool.get('account.analytic.line').search(cr, uid, [('move_id.move_id', 'in', self._get_move_ids(cr, uid, [absl.id], context=context)),
+                                                                              ('account_id.category', 'in', ['FREE1', 'FREE2']), ('name', '=ilike', '%%%s' % absl.name)])
+            # Then retrieve all corrections/reversals from them
+            res[absl.id] = aal_obj.get_corrections_history(cr, uid, aal_ids, context=context)
+        return res
+
     def _check_red_on_supplier(self, cr, uid, ids, name, arg, context=None):
         result = {}
         for id in ids:
@@ -1076,6 +1093,7 @@
             ('transfer', 'Internal Transfer'), ('transfer_same', 'Internal Transfer (same currency)'), ('advance', 'Operational Advance'),
             ('payroll', 'Third party required - Payroll'), ('down_payment', 'Down payment'), ('donation', 'Donation')] , readonly=True),
         'fp_analytic_lines': fields.function(_get_fp_analytic_lines, type="one2many", obj="account.analytic.line", method=True, string="Analytic lines linked to the given register line(s). Correction(s) included."),
+        'free_analytic_lines': fields.function(_get_free_analytic_lines, type="one2many", obj="account.analytic.line", method=True, string="Analytic lines Free 1 and Free 2 linked to the given register line(s). Correction(s) included."),
         'red_on_supplier': fields.function(_check_red_on_supplier, method=True, type="boolean", string="Supplier flag", store=False, readonly=True, multi="m"),
         'journal_id': fields.related('statement_id','journal_id', string="Journal", type='many2one', relation='account.journal', readonly=True),
         'direct_invoice_move_id': fields.many2one('account.move', 'Direct Invoice Move', readonly=True, help="This field have been added to get the move that comes from the direct invoice because after synchronization some lines lost the direct invoice link. And so we can't see which move have been linked to the invoice in case the register line is temp posted."),

=== modified file 'bin/addons/register_accounting/report/fully_report_xls.mako'
--- bin/addons/register_accounting/report/fully_report_xls.mako	2015-08-28 15:38:30 +0000
+++ bin/addons/register_accounting/report/fully_report_xls.mako	2016-05-02 07:55:26 +0000
@@ -377,11 +377,12 @@
       <Column ss:Width="155"/>
       <Column ss:Width="135"/>
       <Column ss:Width="170"/>
+      <Column ss:Width="170"/>
       <Column ss:Width="55"/>
       <Column ss:Width="65"/>
       <Column ss:Width="60"/>
       <Column ss:Width="66"/>
-      <Column ss:Width="72" ss:Span="2"/>
+      <Column ss:Width="72" ss:Span="4"/>
       <Column ss:Width="36" ss:Span="1"/>
       <Row ss:Height="19.3039">
         <Cell ss:MergeAcross="3" ss:StyleID="title">
@@ -467,6 +468,9 @@
         <Cell ss:StyleID="column_headers">
           <Data ss:Type="String">Ref</Data>
         </Cell>
+        <Cell ss:StyleID="column_headers">
+          <Data ss:Type="String">Free Ref</Data>
+        </Cell>
         % if o.journal_id.type == 'cheque':
           <Cell ss:StyleID="column_headers">
             <Data ss:Type="String">Chk num</Data>
@@ -494,6 +498,12 @@
           <Data ss:Type="String">FP</Data>
         </Cell>
         <Cell ss:StyleID="column_headers">
+          <Data ss:Type="String">Free 1</Data>
+        </Cell>
+        <Cell ss:StyleID="column_headers">
+          <Data ss:Type="String">Free 2</Data>
+        </Cell>
+        <Cell ss:StyleID="column_headers">
           <Data ss:Type="String">Rec?</Data>
         </Cell>
         <Cell ss:StyleID="column_headers">
@@ -520,6 +530,9 @@
         <Cell ss:StyleID="centre">
           <Data ss:Type="String">${getRegRef(line) or ''|x}</Data>
         </Cell>
+        <Cell ss:StyleID="centre">
+          <Data ss:Type="String"></Data>
+        </Cell>
         % if o.journal_id.type == 'cheque':
           <Cell ss:StyleID="centre">
             <Data ss:Type="String">${line.cheque_number}</Data>
@@ -547,6 +560,12 @@
           <Data ss:Type="String"></Data>
         </Cell>
         <Cell ss:StyleID="centre">
+          <Data ss:Type="String"></Data>
+        </Cell>
+        <Cell ss:StyleID="centre">
+          <Data ss:Type="String"></Data>
+        </Cell>
+        <Cell ss:StyleID="centre">
           <Data ss:Type="String">${line.reconciled and 'X' or ''|x}</Data>
         </Cell>
         <Cell ss:StyleID="centre">
@@ -575,6 +594,9 @@
         <Cell ss:StyleID="left">
           <Data ss:Type="String">${inv_line.move_id and inv_line.move_id.name or hasattr(inv_line, 'reference') and inv_line.reference or ''|x}</Data>
         </Cell>
+        <Cell ss:StyleID="left">
+          <Data ss:Type="String">${getFreeRef(inv_line) or ''|x}</Data>
+        </Cell>
         % if o.journal_id.type == 'cheque':
         <Cell ss:StyleID="left">
           <Data ss:Type="String"></Data>
@@ -607,9 +629,9 @@
 %>
       <Row>
         % if o.journal_id.type == 'cheque':
+          <Cell ss:Index="9" ss:StyleID="${line_color}_ana_left">
+        % else:
           <Cell ss:Index="8" ss:StyleID="${line_color}_ana_left">
-        % else:
-          <Cell ss:Index="7" ss:StyleID="${line_color}_ana_left">
         % endif
           <Data ss:Type="String">${ana_line.general_account_id.code + ' ' + ana_line.general_account_id.name|x}</Data>
         </Cell>
@@ -629,7 +651,15 @@
           <Data ss:Type="String">${ana_line.cost_center_id and ana_line.cost_center_id.code or ''|x}</Data>
         </Cell>
         <Cell ss:StyleID="${line_color}_ana_left">
-          <Data ss:Type="String">${ana_line.account_id and ana_line.account_id.code or ''|x}</Data>
+          <Data ss:Type="String">${not ana_line.free_account and ana_line.account_id and ana_line.account_id.code or ''|x}</Data>
+        </Cell>
+        <Cell ss:StyleID="${line_color}_ana_left">
+          <Data ss:Type="String">${ana_line.distrib_line_id and ana_line.distrib_line_id._name == 'free.1.distribution.line' and \
+                                   ana_line.account_id and ana_line.account_id.code or ''|x}</Data>
+        </Cell>
+        <Cell ss:StyleID="${line_color}_ana_left">
+          <Data ss:Type="String">${ana_line.distrib_line_id and ana_line.distrib_line_id._name == 'free.2.distribution.line' and \
+                                   ana_line.account_id and ana_line.account_id.code or ''|x}</Data>
         </Cell>
         <Cell ss:StyleID="${line_color}_ana_left">
           <Data ss:Type="String">${(ana_line.is_reallocated and _('Corrected')) or (ana_line.is_reversal and _('Reversal')) or ''}</Data>
@@ -657,11 +687,12 @@
     line_color = 'red'
 endif
 %>
+% if not ana_line.free_account:
       <Row>
         % if o.journal_id.type == 'cheque':
+          <Cell ss:Index="9" ss:StyleID="${line_color}_ana_left">
+        % else:
           <Cell ss:Index="8" ss:StyleID="${line_color}_ana_left">
-        % else:
-          <Cell ss:Index="7" ss:StyleID="${line_color}_ana_left">
         % endif
           <Data ss:Type="String">${ana_line.general_account_id.code + ' ' + ana_line.general_account_id.name|x}</Data>
         </Cell>
@@ -684,12 +715,77 @@
           <Data ss:Type="String">${ana_line.account_id and ana_line.account_id.code or ''|x}</Data>
         </Cell>
         <Cell ss:StyleID="${line_color}_ana_left">
+          <Data ss:Type="String"></Data>
+        </Cell>
+        <Cell ss:StyleID="${line_color}_ana_left">
+          <Data ss:Type="String"></Data>
+        </Cell>
+        <Cell ss:StyleID="${line_color}_ana_left">
           <Data ss:Type="String">${(ana_line.is_reallocated and _('Corrected')) or (ana_line.is_reversal and _('Reversal')) or ''}</Data>
         </Cell>
       </Row>
+% endif
 % endfor
 % endif
 
+<!-- Display analytic lines Free 1 and Free 2 linked to this register line -->
+<%
+a_lines = False
+if line.free_analytic_lines and not line.invoice_id and not line.imported_invoice_line_ids:
+    a_lines = line.free_analytic_lines
+%>
+% if a_lines:
+% for ana_line in sorted(a_lines, key=lambda x: x.id):
+<%
+line_color = 'blue'
+if ana_line.is_reallocated:
+    line_color = 'darkblue'
+elif ana_line.is_reversal:
+    line_color = 'green'
+elif ana_line.last_corrected_id:
+    line_color = 'red'
+endif
+%>
+      <Row>
+        % if o.journal_id.type == 'cheque':
+          <Cell ss:Index="9" ss:StyleID="${line_color}_ana_left">
+        % else:
+          <Cell ss:Index="8" ss:StyleID="${line_color}_ana_left">
+        % endif
+          <Data ss:Type="String">${ana_line.general_account_id.code + ' ' + ana_line.general_account_id.name|x}</Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String"></Data>
+        </Cell>
+        <Cell>
+          <Data ss:Type="String"></Data>
+        </Cell>
+        <Cell ss:StyleID="${line_color}_ana_amount">
+          <Data ss:Type="Number">${ana_line.amount_currency}</Data>
+        </Cell>
+        <Cell ss:StyleID="${line_color}_ana_left">
+          <Data ss:Type="String"></Data>
+        </Cell>
+        <Cell ss:StyleID="${line_color}_ana_left">
+          <Data ss:Type="String"></Data>
+        </Cell>
+        <Cell ss:StyleID="${line_color}_ana_left">
+          <Data ss:Type="String"></Data>
+        </Cell>
+        <Cell ss:StyleID="${line_color}_ana_left">
+          <Data ss:Type="String">${ana_line.distrib_line_id and ana_line.distrib_line_id._name == 'free.1.distribution.line' and \
+                                   ana_line.account_id and ana_line.account_id.code or ''|x}</Data>
+        </Cell>
+        <Cell ss:StyleID="${line_color}_ana_left">
+          <Data ss:Type="String">${ana_line.distrib_line_id and ana_line.distrib_line_id._name == 'free.2.distribution.line' and \
+                                   ana_line.account_id and ana_line.account_id.code or ''|x}</Data>
+        </Cell>
+        <Cell ss:StyleID="${line_color}_ana_left">
+          <Data ss:Type="String">${(ana_line.is_reallocated and _('Corrected')) or (ana_line.is_reversal and _('Reversal')) or ''}</Data>
+        </Cell>
+      </Row>
+% endfor
+% endif
 
 % endfor
     </Table>

=== modified file 'bin/addons/register_accounting/report/report_fully_report.py'
--- bin/addons/register_accounting/report/report_fully_report.py	2015-08-24 08:38:51 +0000
+++ bin/addons/register_accounting/report/report_fully_report.py	2016-05-02 07:55:26 +0000
@@ -31,6 +31,7 @@
             'getAnalyticLines': self.getAnalyticLines,
             'getImportedMoveLines': self.getImportedMoveLines,
             'getRegRef': self.getRegRef,
+            'getFreeRef': self.getFreeRef,
         })
 
     def getRegRef(self, reg_line):
@@ -137,5 +138,27 @@
             res = al_obj.browse(self.cr, self.uid, al_ids)
         return res
 
+    def getFreeRef(self, acc_move_line):
+        '''
+        Return the "manual" invoice reference associated with the account move line if it exists
+        (field Reference in DI and Free Reference in SI)
+        Note: for Supplier Refund and SI with Source Doc that are synched from Project to Coordo,
+        the free ref will appear in Project only (US-970)
+        '''
+        db = pooler.get_pool(self.cr.dbname)
+        acc_inv = db.get('account.invoice')
+        free_ref = False
+        if acc_move_line:
+            acc_move = acc_move_line.move_id
+            inv_id = acc_inv.search(self.cr, self.uid, [('move_id', '=', acc_move.id)])
+            if inv_id:
+                inv = acc_inv.browse(self.cr, self.uid, inv_id)
+                free_ref = inv and inv[0].reference
+            if not free_ref:
+                # display the free ref if it is different from the "standard" ref
+                if acc_move.name != acc_move.ref:
+                    free_ref = acc_move.ref
+        return free_ref or ''
+
 SpreadsheetReport('report.fully.report','account.bank.statement','addons/register_accounting/report/fully_report_xls.mako', parser=report_fully_report)
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: