openerp-dev-web team mailing list archive

["Ashvin Rathod \(OpenERP\)" <ara@xxxxxxxxxxx>]

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

Requested reviews:
  OpenERP R&D Team (openerp-dev)
Related bugs:
  #615522 Report Of Invoice  : Payment Term + Due date not printed
  https://bugs.launchpad.net/bugs/615522
  #649029 [sale] incoterm field poorly implemented [direct sql / not translatable]
  https://bugs.launchpad.net/bugs/649029
  #656378 [trunk] general ledger -
  https://bugs.launchpad.net/bugs/656378
  #672553 opening entries from chart of account doesn't use context
  https://bugs.launchpad.net/bugs/672553
  #674480 [6.0 RC2] incorrect creation of Accounting Journals is some localizations prevents multiple charts from being installed
  https://bugs.launchpad.net/bugs/674480
  #675494 [Trunk] - If you delete an invoice entry, invoice still exists
  https://bugs.launchpad.net/bugs/675494
  #681398 sale access right
  https://bugs.launchpad.net/bugs/681398
  #689536 [6.0] partner layout salesman/salesteam issue
  https://bugs.launchpad.net/bugs/689536
  #690326 [6.0RC1] View mode "tree,form,search" in several window actions
  https://bugs.launchpad.net/bugs/690326
  #690753 [6.0] and [5.x] account_analytic_line must not be deleted if the journal etc is deleted
  https://bugs.launchpad.net/bugs/690753
  #691072 [6.0RC1][TRUNK][account_voucher] Wrong definition of field 'company_id' in 'account_voucher_line' object
  https://bugs.launchpad.net/bugs/691072
  #692986 [6.0] hr_payroll_account hr_payroll_account_view.xml - required fields block opening form
  https://bugs.launchpad.net/bugs/692986
  #694833 Salary Structure deduction percentage limitation
  https://bugs.launchpad.net/bugs/694833
  #695960 [6.0RC1][hr_timesheet]Problems printing timesheet reports
  https://bugs.launchpad.net/bugs/695960
  #696914 [6.0 RC2] account bank statement - usability
  https://bugs.launchpad.net/bugs/696914
  #697673 Wrong column title in timesheet view
  https://bugs.launchpad.net/bugs/697673
  #697989 Failed to install module multi_company
  https://bugs.launchpad.net/bugs/697989
  #701410 shouldn't see employee's categories in simplify view
  https://bugs.launchpad.net/bugs/701410
  #701683 [6.0 rc2] Setup/upgrade/run fails for init:module account_analytic_plans
  https://bugs.launchpad.net/bugs/701683
  #702318 Default period and account in invoices line for multi-company doesn't work
  https://bugs.launchpad.net/bugs/702318
  #705675 Error creating a DTA
  https://bugs.launchpad.net/bugs/705675
  #707398 [6.0] Account_payment: "Select Invoices to Pay" button on payment order not working
  https://bugs.launchpad.net/bugs/707398
  #707404 [trunk][account] useless variable in button_confirm_bank
  https://bugs.launchpad.net/bugs/707404
  #711886 [6.0 trunk] account : period selection not working for BS and PL legal reports 
  https://bugs.launchpad.net/bugs/711886
  #713562 [6.0] account - demo data - all periods have "special = true"
  https://bugs.launchpad.net/bugs/713562
  #714860 analytic account - Wrong demo data and account type must be come in tree view
  https://bugs.launchpad.net/bugs/714860
  #715470 [PS] sale margin module :  wrong computation
  https://bugs.launchpad.net/bugs/715470
  #715695 Multi-Company Environment :Configuration of consolidated type of account is not possible due to the _check_type constraints.
  https://bugs.launchpad.net/bugs/715695

For more details, see:
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/49359

Hello,

[FIX]: [PS] sale margin module : wrong computation
       https://bugs.launchpad.net/openobject-addons/+bug/715470

Thanks,
ara
-- 
https://code.launchpad.net/~openerp-commiter/openobject-addons/trunk-dev-addons3-ara/+merge/49359
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-commiter/openobject-addons/trunk-dev-addons3-ara into lp:~openerp-dev/openobject-addons/trunk-dev-addons3.

=== modified file 'sale_margin/sale_margin.py'
--- sale_margin/sale_margin.py	2011-01-14 00:11:01 +0000
+++ sale_margin/sale_margin.py	2011-02-11 06:51:21 +0000
@@ -60,8 +60,13 @@
 
     def _product_margin(self, cr, uid, ids, field_name, arg, context=None):
         result = {}
+        obj_line = self.pool.get('sale.order.line')
         for sale in self.browse(cr, uid, ids, context=context):
             result[sale.id] = 0.0
+            line_ids = []
+            if sale.order_line:
+                map(lambda x: line_ids.append(x.id), sale.order_line)
+            obj_line.write(cr, uid, line_ids, {})
             for line in sale.order_line:
                 result[sale.id] += line.margin or 0.0
         return result