Merge lp:~openerp-dev/openobject-addons/6.1-opw-579441-dhs into lp:openobject-addons/6.1

[Dhruti Shastri(OpenERP)]

To reproduce:

 Install account_analytic_analysis

 Schceduler Generate Mail if the account is in Open state after Due date

 Report "Analytic Account Report for Sales" print False value if Partner has no value defined for
 - contact name
 - phone
 - Email

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

review: Approve

[Naresh(OpenERP) (nch-openerp)]

Hello,

This bug was qualified as Confirmed on Trunk (means still existing and reproducible). A Merge Proposal for trunk was created to fix it. Here is the link to follow the MP on Launchpad https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-opw-579441-port-mma/+merge/135148 and be informed once it's been merged in trunk: ... If this Merge Proposal could not be merged in v6.1 at the release of v7.0, it will be closed.

Thanks,
Naresh Soni

Unmerged revisions

7013. By Dhruti Shastri(OpenERP) on 2012-10-04

[FIX]: Analytic Account Report for Sales Print False if the value is not specified in respective fields(case :579441)

=== modified file 'account_analytic_analysis/cron_account_analytic_account.py'
--- account_analytic_analysis/cron_account_analytic_account.py	2012-09-13 11:54:46 +0000
+++ account_analytic_analysis/cron_account_analytic_account.py	2012-10-04 10:03:28 +0000
@@ -33,7 +33,9 @@
       - Dates: ${account.date_start} to ${account.date and account.date or '???'}
       - Contacts:
         % for address in account.partner_id.address:
-        . ${address.name}, ${address.phone}, ${address.email}
+            % if address.name:
+                . ${address.name}, ${address.phone or ''}, ${address.email or ''}
+            % endif
         % endfor
 
   % endfor