openerp-canada team mailing list archive

[David Cormier <david.cormier@xxxxxxxxxxxxxxxxxxxx>]

David Cormier has proposed merging lp:~openerp-canada/openerp-canada/7.0-fix-1190823 into lp:openerp-canada.

Requested reviews:
  Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903)
  Joao Alfredo Gama Batista (joao-gama)
  OpenERP Community Reviewer (openerp-community-reviewer)
Related bugs:
  Bug #1190823 in OpenERP Canada: "[7.0] KeyError: 'date_original'"
  https://bugs.launchpad.net/openerp-canada/+bug/1190823

For more details, see:
https://code.launchpad.net/~openerp-canada/openerp-canada/7.0-fix-1190823/+merge/169480

[FIX] KeyError 'date_original' in rml report
-- 
https://code.launchpad.net/~openerp-canada/openerp-canada/7.0-fix-1190823/+merge/169480
Your team OpenERP Canada Team is subscribed to branch lp:~openerp-canada/openerp-canada/7.0-fix-1190823.

=== modified file 'l10n_ca_account_check_writing/report/l10n_ca_check_print.py'
--- l10n_ca_account_check_writing/report/l10n_ca_check_print.py	2013-05-31 15:17:42 +0000
+++ l10n_ca_account_check_writing/report/l10n_ca_check_print.py	2013-06-14 16:09:36 +0000
@@ -59,7 +59,7 @@
                     'date_due' : False,
                     'name' : False,
                     'amount_original' : False,
-                    'amount_due' : False,
+                    'amount_unreconciled' : False,
                     'amount' : False,
                 }
             result.append(res)

=== modified file 'l10n_ca_account_check_writing/report/l10n_ca_check_print_middle.rml'
--- l10n_ca_account_check_writing/report/l10n_ca_check_print_middle.rml	2013-06-04 02:34:14 +0000
+++ l10n_ca_account_check_writing/report/l10n_ca_check_print_middle.rml	2013-06-14 16:09:36 +0000
@@ -144,7 +144,7 @@
             </tr>
             <tr>
               <td>
-                <para style="P19">[[ repeatIn(get_lines(voucher.line_dr_ids),'l') ]] [[ formatLang(l['date_original'] ,date=True) or '' ]]</para>
+                <para style="P19">[[ repeatIn(get_lines(voucher.line_dr_ids),'l') ]] [[ formatLang(l['date_due'] ,date=True) or '' ]]</para>
               </td>
               <td>
                 <para style="P19">[[ l['name'] ]]</para>
@@ -153,7 +153,7 @@
                 <para style="P19">[[ formatLang( l['amount_original']) ]]</para>
               </td>
               <td>
-                <para style="P19">[[ formatLang( l['amount_due']) ]]</para>
+                <para style="P19">[[ formatLang( l['amount_unreconciled']) ]]</para>
               </td>
               <td>
                 <para style="P19">
@@ -299,7 +299,7 @@
             </tr>
             <tr>
               <td>
-                <para style="P19">[[ repeatIn(get_lines(voucher.line_dr_ids),'l') ]] [[ formatLang(l['date_original'] ,date=True) or '' ]]</para>
+                <para style="P19">[[ repeatIn(get_lines(voucher.line_dr_ids),'l') ]] [[ formatLang(l['date_due'] ,date=True) or '' ]]</para>
               </td>
               <td>
                 <para style="P19">[[ l['name'] ]]</para>
@@ -308,7 +308,7 @@
                 <para style="P19">[[ formatLang (l['amount_original']) ]]</para>
               </td>
               <td>
-                <para style="P19">[[ formatLang (l['amount_due']) ]]</para>
+                <para style="P19">[[ formatLang (l['amount_unreconciled']) ]]</para>
               </td>
               <td>
                 <para style="P19">