[MERGE]: Merge with lp:openobject-trunk-dev-addons2

[odoo/odoo.git] / addons / sale_margin / sale_margin.py

diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py
index 37da229..fdf7eaf 100644 (file)
--- a/addons/sale_margin/sale_margin.py
+++ b/addons/sale_margin/sale_margin.py
@@ -18,12 +18,9 @@
 #
 ##############################################################################
 
-from osv import fields,osv
-import pooler
-from tools import config
+from osv import fields, osv
 
 class sale_order_line(osv.osv):
-    _name = "sale.order.line"
     _inherit = "sale.order.line"
 
     def product_id_change(self, cr, uid, ids, pricelist, product, qty=0,
@@ -32,23 +29,24 @@ class sale_order_line(osv.osv):
         res = super(sale_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty=qty,
             uom=uom, qty_uos=qty_uos, uos=uos, name=name, partner_id=partner_id,
             lang=lang, update_tax=update_tax, date_order=date_order, packaging=packaging, fiscal_position=fiscal_position, flag=flag)
-        purchase_price = self.pool.get('product.product').browse(cr, uid, product).standard_price
-        res['value'].update({'purchase_price':purchase_price})
+        if product:
+            purchase_price = self.pool.get('product.product').browse(cr, uid, product).standard_price
+            res['value'].update({'purchase_price': purchase_price})
         return res
 
     def _product_margin(self, cr, uid, ids, field_name, arg, context=None):
         res = {}
-        for line in self.browse(cr, uid, ids):
+        for line in self.browse(cr, uid, ids, context=context):
             res[line.id] = 0
             if line.product_id:
                 if line.purchase_price:
-                    res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.purchase_price*line.product_uos_qty),2)
+                    res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.purchase_price*line.product_uos_qty), 2)
                 else:
-                    res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.product_id.standard_price*line.product_uos_qty),2)
+                    res[line.id] = round((line.price_unit*line.product_uos_qty*(100.0-line.discount)/100.0) -(line.product_id.standard_price*line.product_uos_qty), 2)
         return res
 
     _columns = {
-        'margin': fields.function(_product_margin, method=True, string='Margin', store={}),
+        'margin': fields.function(_product_margin, method=True, string='Margin', store=True),
         'purchase_price': fields.float('Cost Price', digits=(16,2))
     }
 
@@ -66,7 +64,7 @@ class sale_order(osv.osv):
         return result
 
     _columns = {
-        'margin': fields.function(_product_margin, method=True, string='Margin', store=True),
+        'margin': fields.function(_product_margin, method=True, string='Margin', store=True, help="It gives profitability by calculating the difference between the Unit Price and Cost Price"),
     }
 
 sale_order()
@@ -75,7 +73,7 @@ class stock_picking(osv.osv):
     _inherit = 'stock.picking'
 
     _columns = {
-        'invoice_ids': fields.many2many('account.invoice', 'picking_invoice_rel', 'picking_id', 'invoice_id', 'Invoices', domain=[('type','=','in_invoice')]),
+        'invoice_ids': fields.many2many('account.invoice', 'picking_invoice_rel', 'picking_id', 'invoice_id', 'Invoices', domain=[('type', '=', 'out_invoice')]),
     }
 
     def create_invoice(self, cr, uid, ids, *args):
@@ -83,11 +81,31 @@ class stock_picking(osv.osv):
         invoice_ids = []
         margin_deduce = 0.0
         picking_obj = self.pool.get('stock.picking')
-        picking_obj.write(cr, uid, ids, {'invoice_state' : '2binvoiced'})
+        picking_obj.write(cr, uid, ids, {'invoice_state': '2binvoiced'})
         res = picking_obj.action_invoice_create(cr, uid, ids, type='out_invoice', context={})
         invoice_ids = res.values()
-        picking_obj.write(cr, uid, ids,{'invoice_ids': [[6,0,invoice_ids]]})
+        picking_obj.write(cr, uid, ids, {'invoice_ids': [[6, 0, invoice_ids]]})
         return True
 
 stock_picking()
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+
+class account_invoice_line(osv.osv):
+    _inherit = "account.invoice.line"
+    _columns = {
+        'cost_price': fields.float('Cost Price', digits=(16, 2)),
+    }
+    def write(self, cr, uid, ids, vals, context=None):
+        if vals.get('product_id', False):
+            res = self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price'])
+            vals['cost_price'] = res[0]['standard_price']
+        return super(account_invoice_line, self).write(cr, uid, ids, vals, context)
+
+    def create(self, cr, uid, vals, context=None):
+        if vals.get('product_id',False):
+            res = self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price'])
+            vals['cost_price'] = res[0]['standard_price']
+        return super(account_invoice_line, self).create(cr, uid, vals, context)
+
+account_invoice_line()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: