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

[jftempo]

=== modified file 'bin/addons/account_mcdb/report/account_mcdb_export.py'
--- bin/addons/account_mcdb/report/account_mcdb_export.py	2014-11-04 13:40:45 +0000
+++ bin/addons/account_mcdb/report/account_mcdb_export.py	2016-05-23 13:16:38 +0000
@@ -134,10 +134,10 @@
                         else:
                             csv_line.append(abs(amount) or 0.0)
                             csv_line.append(0.0)
-                        #output currency
-                        csv_line.append(currency_name.encode('utf-8') or '')
-                    #reconcile_total_partial_id
-                    csv_line.append(ml.reconcile_total_partial_id and ml.reconcile_total_partial_id.name and ml.reconcile_total_partial_id.name.encode('utf-8') or '')
+                    #output currency
+                    csv_line.append(currency_name.encode('utf-8') or '')
+                    #reconcile
+                    csv_line.append(ml.reconcile_txt and ml.reconcile_txt.encode('utf-8') or '')
                     #state
                     csv_line.append(field_sel(cr, uid, ml, 'move_state', context).encode('utf-8'))
                     # Write line

=== modified file 'bin/addons/account_mcdb/report/mcdb_result.py'
--- bin/addons/account_mcdb/report/mcdb_result.py	2016-01-19 10:34:18 +0000
+++ bin/addons/account_mcdb/report/mcdb_result.py	2016-05-23 13:16:38 +0000
@@ -154,7 +154,6 @@
     def __init__(self, cr, uid, name, context=None):
         super(parser_account_move_line, self).__init__(cr, uid, name, context=context)
         self.localcontext.update({
-            'reconcile_name': self.reconcile_name,
             #'getSub': self.getSub,
         })
 
@@ -183,14 +182,6 @@
             context = {}
         return super(parser_account_move_line, self).create(cr, uid, ids, data, context=context)
 
-    def reconcile_name(self, r_id=None, context=None):
-        if not r_id:
-            return None
-        res = self.pool.get('account.move.reconcile').name_get(self.cr, self.uid, [r_id])
-        if res and res[0] and res[0][1]:
-            return res[0][1]
-        return None
-
 account_move_line_report_xls('report.account.move.line_xls','account.move.line','addons/account_mcdb/report/report_account_move_line_xls.mako', parser=parser_account_move_line)
 
 

=== modified file 'bin/addons/account_mcdb/report/report_account_move_line.rml'
--- bin/addons/account_mcdb/report/report_account_move_line.rml	2014-05-21 15:11:12 +0000
+++ bin/addons/account_mcdb/report/report_account_move_line.rml	2016-05-23 13:16:38 +0000
@@ -170,7 +170,7 @@
           <para style="P3">[[ o.output_currency and o.output_currency.name or '' ]]</para>
         </td>
         <td>
-          <para style="P3">[[ o.reconcile_total_partial_id and o.reconcile_total_partial_id.name or '' ]]</para>
+          <para style="P3">[[ o.reconcile_txt and o.reconcile_txt or '' ]]</para>
         </td>
         <td>
           <para style="P3">[[ o.move_state and getSel(o, 'move_state') or '' ]]</para>

=== modified file 'bin/addons/account_mcdb/report/report_account_move_line_xls.mako'
--- bin/addons/account_mcdb/report/report_account_move_line_xls.mako	2015-08-05 12:26:43 +0000
+++ bin/addons/account_mcdb/report/report_account_move_line_xls.mako	2016-05-23 13:16:38 +0000
@@ -122,7 +122,7 @@
         <Data ss:Type="String">${(o.output_currency and o.output_currency.name or '')|x}</Data>
 </Cell>
 <Cell ss:StyleID="ssBorder">
-        <Data ss:Type="String">${(o.reconcile_total_partial_id and reconcile_name(o.reconcile_total_partial_id.id) or '')|x}</Data>
+        <Data ss:Type="String">${(o.reconcile_txt or '')|x}</Data>
 </Cell>
 <Cell ss:StyleID="ssBorder">
         <Data ss:Type="String">${(o.move_state and getSel(o,'move_state') or '')|x}</Data>