From 9f2ba157db429e4de8cfd01f5da32ecab232e6ec Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Fri, 5 Nov 2010 07:17:51 +0100 Subject: [PATCH] fix bzr revid: fp@tinyerp.com-20101105061751-z2ffuaxuqqqnvqsm --- addons/product_margin/product_margin.py | 8 ++++---- addons/stock/wizard/stock_invoice_onshipping.py | 8 +++++++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/addons/product_margin/product_margin.py b/addons/product_margin/product_margin.py index 132f6e27d55..d396501b8c0 100644 --- a/addons/product_margin/product_margin.py +++ b/addons/product_margin/product_margin.py @@ -83,13 +83,13 @@ class product_product(osv.osv): res[val.id]['purchase_gap'] = res[val.id]['normal_cost']-res[val.id]['total_cost'] if 'total_margin' in field_names: - res[val.id]['total_margin'] = val.turnover - val.standard_price + res[val.id]['total_margin'] = res[val.id].get('turnover', val.turnover) - res[val.id].get('total_cost', val.standard_price) if 'expected_margin' in field_names: - res[val.id]['expected_margin'] = val.sale_expected - val.normal_cost + res[val.id]['expected_margin'] = res[val.id].get('sale_expected',val.sale_expected) - res[val.id].get('normal_cost',val.normal_cost) if 'total_margin_rate' in field_names: - res[val.id]['total_margin_rate'] = val.turnover and val.total_margin * 100 / val.turnover or 0.0 + res[val.id]['total_margin_rate'] = res[val.id].get('turnover', val.turnover) and res[val.id]['total_margin'] * 100 / res[val.id].get('turnover', val.turnover) or 0.0 if 'expected_margin_rate' in field_names: - res[val.id]['expected_margin_rate'] = val.sale_expected and val.expected_margin * 100 / val.sale_expected or 0.0 + res[val.id]['expected_margin_rate'] = res[val.id].get('sale_expected',val.sale_expected) and res[val.id]['expected_margin'] * 100 / res[val.id].get('sale_expected',val.sale_expected) or 0.0 return res _columns = { diff --git a/addons/stock/wizard/stock_invoice_onshipping.py b/addons/stock/wizard/stock_invoice_onshipping.py index d841c7cb37a..37d3634a988 100644 --- a/addons/stock/wizard/stock_invoice_onshipping.py +++ b/addons/stock/wizard/stock_invoice_onshipping.py @@ -87,13 +87,19 @@ class stock_invoice_onshipping(osv.osv_memory): type=self._get_type(picking), context=context) invoice_ids.extend(res.values()) + context['journal_type'] = { + 'out_invoice': 'sale', + 'out_refund': 'sale_refund', + 'in_invoice': 'purchase', + 'in_refund': 'purchase_refund' + }.get(self._get_type(picking), 'sale') if not invoice_ids: raise osv.except_osv(_('Error'), _('No invoice were created')) return { 'domain': "[('id','in', ["+','.join(map(str,invoice_ids))+"])]", - 'name' : _('New picking invoices'), + 'name' : _('Invoices'), 'view_type': 'form', 'view_mode': 'tree,form', 'res_model': 'account.invoice',