openerp-dev-web team mailing list archive

[Jigar Amin - OpenERP <jam@xxxxxxxxxxx>]

Jigar Amin - OpenERP has proposed merging lp:~openerp-dev/openobject-addons/jam-dev-addons into lp:~openerp-dev/openobject-addons/trunk-dev-addons1.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  #695038 OpenOfficeReportDesigner Group to Remove in Trunk
  https://bugs.launchpad.net/bugs/695038
  #695596 Audit trail module does not creating an audit log for users.
  https://bugs.launchpad.net/bugs/695596

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons/+merge/46117

Hello,
   Issue in Merge Proposal
    + campaign_analysis : report : devision by Zero Error in field.function
    + campaign_analysis : While loading object : Attribute Error: 'None Type' object has no attribute 'precision_get
   Kindly review this
Thank You
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/jam-dev-addons/+merge/46117
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/jam-dev-addons.

=== modified file 'decimal_precision/decimal_precision.py'
--- decimal_precision/decimal_precision.py	2010-10-29 11:13:28 +0000
+++ decimal_precision/decimal_precision.py	2011-01-13 11:46:51 +0000
@@ -60,4 +60,4 @@
         return (16, res)
     return change_digit
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== modified file 'marketing_campaign/__openerp__.py'
--- marketing_campaign/__openerp__.py	2010-08-25 06:17:30 +0000
+++ marketing_campaign/__openerp__.py	2011-01-13 11:46:51 +0000
@@ -25,7 +25,8 @@
     "version" : "1.1",
     "depends" : ["marketing",
                  "document",
-                 "email_template"
+                 "email_template",
+                 "decimal_precision"
                 ],
     "author" : "OpenERP SA",
     "category": 'Generic Modules/Marketing',

=== modified file 'marketing_campaign/report/campaign_analysis.py'
--- marketing_campaign/report/campaign_analysis.py	2010-12-30 14:19:37 +0000
+++ marketing_campaign/report/campaign_analysis.py	2011-01-13 11:46:51 +0000
@@ -40,7 +40,7 @@
             wi_ids = self.pool.get('marketing.campaign.workitem').search(cr, uid,
                         [('segment_id.campaign_id', '=', ca_obj.campaign_id.id)])
             total_cost = ca_obj.activity_id.variable_cost + \
-                                ((ca_obj.campaign_id.fixed_cost or 0.00) / len(wi_ids))
+                                ((ca_obj.campaign_id.fixed_cost or 1.00) / len(wi_ids))
             result[ca_obj.id] = total_cost
         return result
     _columns = {