Merge lp:~ressu/openobject-addons/project_mrp_invoicing into lp:openobject-addons/5.0

[Sami Haahtinen]

Add support for creating invoices based on service tasks generated from sales orders.

It modifies sale.order.line so that unit price calculations can be overridden and overrides quantity calculations from mrp module.

It can be tested by creating a sales order with a service. After completing the task and the project, the invoice will be generated based on the amount of work done with the task.

Price will be calculated based on the unit price of the sales order. Unlike with the default behaviour of mrp sales order, the total price can vary depending on the amount of hours put to the task.

Unmerged revisions

2765. By Sami Haahtinen on 2010-06-24

Make invoices respect the work done in tasks when invoice is generated based on shipped items

=== modified file 'project_mrp/project.py'
--- project_mrp/project.py	2009-01-04 22:12:50 +0000
+++ project_mrp/project.py	2010-06-24 09:43:24 +0000
@@ -47,5 +47,37 @@
                 wf_service.trg_validate(uid, 'mrp.procurement', task.procurement_id.id, 'subflow.cancel', cr)
         return True
 project_task()
+
+# Override mrp.procurement with quantity computations
+class project_procurement(osv.osv):
+    _name = "mrp.procurement"
+    _inherit = "mrp.procurement"
+
+    def _quantity_compute_get(self, cr, uid, proc, context={}):
+        if proc.product_id.type=='service':
+            taskids = self.pool.get('project.task').search(cr, uid, 
+                    [('procurement_id', 'in', [proc.id])])
+            if taskids:
+                task = self.pool.get('project.task').browse(cr, uid,
+                        taskids[0], context=context) 
+                return task.total_hours
+        return super(project_procurement, self)._quantity_compute_get(self, cr,
+                uid, proc, context)
+project_procurement()
+
+# Override sales order with calculations for line price
+class sale_order_line(osv.osv):
+    _name = 'sale.order.line'
+    _inherit = 'sale.order.line'
+
+    def _get_invoice_line_price(self, cr, uid, line, uosqty, context={}):
+        if line.procurement_id:
+            if ((line.product_id.type=='service') and
+                    (line.order_id.invoice_quantity=='procurement')):
+                return line.price_unit
+        return super(sale_order_line, self)._get_invoice_line_price(cr, uid,
+                line, uosqty, context)
+sale_order_line()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== modified file 'sale/sale.py'
--- sale/sale.py	2010-06-02 15:05:51 +0000
+++ sale/sale.py	2010-06-24 09:43:24 +0000
@@ -786,6 +786,12 @@
         'product_packaging': lambda *a: False
     }
 
+    def _get_invoice_line_price(self, cr, uid, line, uosqty, context={}):
+        """Calculate and return the price for a invoice line based on quantity """
+        return round(line.price_unit * line.product_uom_qty / uosqty,
+                int(config['price_accuracy']))
+
+
     def invoice_line_create(self, cr, uid, ids, context={}):
         def _get_line_qty(line):
             if (line.order_id.invoice_quantity=='order') or not line.procurement_id:
@@ -826,8 +832,8 @@
                 uos_id = _get_line_uom(line)
                 pu = 0.0
                 if uosqty:
-                    pu = round(line.price_unit * line.product_uom_qty / uosqty,
-                            int(config['price_accuracy']))
+                    pu = self._get_invoice_line_price(cr, uid, line, uosqty,
+                            context)
                 fpos = line.order_id.fiscal_position or False
                 a = self.pool.get('account.fiscal.position').map_account(cr, uid, fpos, a)
                 if not a: