openerp-dev-web team mailing list archive

["mtr\(OpenERP\)" <mtr@xxxxxxxxxxx>]

mtr(OpenERP) has proposed merging lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #586706 [account_followup]sending date not propogated
  https://bugs.launchpad.net/bugs/586706
  #643552 The titles of the buttons for sales in exception are obscure
  https://bugs.launchpad.net/bugs/643552


[FIX] Account_followup: 'Date' in Report now prints the 'Follow-up Sending Date' from wizard instead of current-date --fixes lp:586706 
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr2/+merge/40929
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-mtr2 into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'account_followup/report/account_followup_print.rml'
--- account_followup/report/account_followup_print.rml	2010-10-15 05:51:35 +0000
+++ account_followup/report/account_followup_print.rml	2010-11-16 06:16:16 +0000
@@ -117,7 +117,7 @@
       <font color="white"> </font>
     </para>
     <para style="terp_default_9">Document : Customer account statement</para>
-    <para style="terp_default_9">Date : [[ formatLang(time.strftime('%Y-%m-%d'),date = True) ]]</para>
+    <para style="terp_default_9">Date : [[ formatLang(data['form']['date'],date=True) ]]</para>
     <para style="terp_default_9">Customer Ref : [[ o.ref or '' ]]</para>
     <para style="terp_default_8">
       <font color="white"> </font>

=== modified file 'account_followup/wizard/account_followup_print.py'
--- account_followup/wizard/account_followup_print.py	2010-11-10 08:20:11 +0000
+++ account_followup/wizard/account_followup_print.py	2010-11-16 06:16:16 +0000
@@ -319,13 +319,12 @@
                     "WHERE id=%s",
                     (to_update[id]['level'],
                     date, int(id),))
-
+        data.update({'date': context['date']})
         datas = {
              'ids': [],
              'model': 'account_followup.followup',
              'form': data
         }
-
         return {
             'type': 'ir.actions.report.xml',
             'report_name': 'account_followup.followup.print',