Merge lp:~openerp-dev/openobject-addons/trunk-wmsimplement-seduce-fp-service-product-sunil into lp:~openerp-dev/openobject-addons/trunk-wmsimplement-seduce-fp

[Sunil Sharma(OpenERP)]

Hello,

[FIX] sale_stock: bug#1167330
--> create a SO with one service and one stockable product. Invoice on delivery (second tab)
--> process the delivery. In the move you see only the product, it is ok.
--> create the invoice from the delivery.
--> right now, you see only the product. The service should be there.
[IMP] sale_stock: improved YML test case to cover this bug scenario.

Thanks
Sunil Sharma

[lp:~openerp-dev/openobject-addons/trunk-wmsimplement-seduce-fp-service-product-sunil]

9317. By Sunil Sharma(OpenERP) on 2013-10-04

[IMP]:sale_stock:remove button_compute

9318. By Sunil Sharma(OpenERP) on 2013-10-04

[IMP]:sale_stock:remove space

9319. By Sunil Sharma(OpenERP) on 2013-10-09

[Merge] lp:~openerp-dev/openobject-addons/trunk-wmsimplement-seduce-fp

9320. By Sunil Sharma(OpenERP) on 2013-10-09

[IMP]:sale_stock:add button_compute

9321. By Sunil Sharma(OpenERP) on 2013-10-15

[MRG] merge with parent branch

9322. By jke-openerp on 2013-10-17

[REF] add invoice_lines keeping potential historic and detail in test picking_order_policy.yml why len -1

9323. By jke-openerp on 2013-10-17

[FIX] bug due to my last commit (compare product with product.type)

9324. By jke-openerp on 2013-10-17

.

Unmerged revisions

9324. By jke-openerp on 2013-10-17

.

9323. By jke-openerp on 2013-10-17

[FIX] bug due to my last commit (compare product with product.type)

9322. By jke-openerp on 2013-10-17

[REF] add invoice_lines keeping potential historic and detail in test picking_order_policy.yml why len -1

9321. By Sunil Sharma(OpenERP) on 2013-10-15

[MRG] merge with parent branch

9320. By Sunil Sharma(OpenERP) on 2013-10-09

[IMP]:sale_stock:add button_compute

9319. By Sunil Sharma(OpenERP) on 2013-10-09

[Merge] lp:~openerp-dev/openobject-addons/trunk-wmsimplement-seduce-fp

9318. By Sunil Sharma(OpenERP) on 2013-10-04

[IMP]:sale_stock:remove space

9317. By Sunil Sharma(OpenERP) on 2013-10-04

[IMP]:sale_stock:remove button_compute

9316. By Sunil Sharma(OpenERP) on 2013-10-04

[IMP]:sale_stock:improve code

9315. By Sunil Sharma(OpenERP) on 2013-10-04

[IMP]:sale_stock:[FIX] issue when we add product which is service with another stockable in SO with invoice on delivery and when after delivery we create invoice service type produc is not there in invoice line

=== modified file 'sale_stock/sale_stock.py'
--- sale_stock/sale_stock.py	2013-10-16 10:03:18 +0000
+++ sale_stock/sale_stock.py	2013-10-17 12:03:30 +0000
@@ -437,6 +437,7 @@
             res['price_unit'] = sale_line.price_unit
             res['discount'] = sale_line.discount
         return res
+<<<<<<< TREE
 
 
 class stock_location_route(osv.osv):
@@ -444,3 +445,25 @@
     _columns = {
         'sale_selectable':fields.boolean("Selectable on Sales Order Line")
         }
+=======
+
+class stock_picking(osv.osv):
+    _inherit = 'stock.picking'
+
+    def _create_invoice_from_picking(self, cr, uid, picking, vals, context=None):
+        invoice_id = super(stock_picking, self)._create_invoice_from_picking(cr, uid, picking, vals, context=context)
+        order_line_obj = self.pool.get('sale.order.line')
+        invoice_obj = self.pool.get('account.invoice')
+        invoice_line_obj = self.pool.get('account.invoice.line')
+        service_line_ids = order_line_obj.search(cr, uid, [('product_id.type', '=' , 'service'), ('order_id.procurement_group_id', '=' , picking.group_id.id),('invoiced', '=' , False)], context=context)
+        for sale_line in order_line_obj.browse(cr, uid, service_line_ids, context=context):
+            vals = order_line_obj._prepare_order_line_invoice_line(cr, uid, sale_line, False, context=context)
+            vals['invoice_id'] = invoice_id
+            invoice_line_id = invoice_line_obj.create(cr, uid, vals, context=context)
+            order_line_obj.write(cr, uid, [sale_line.id], {
+                'invoice_lines': [(4, invoice_line_id)],
+            }, context=context)
+            invoice_obj.button_compute(cr, uid, [invoice_id], context=context)
+        return invoice_id
+
+>>>>>>> MERGE-SOURCE

=== modified file 'sale_stock/test/picking_order_policy.yml'
--- sale_stock/test/picking_order_policy.yml	2013-10-10 13:32:12 +0000
+++ sale_stock/test/picking_order_policy.yml	2013-10-17 12:03:30 +0000
@@ -4,6 +4,16 @@
   !context
     uid: 'res_sale_stock_salesman'
 -
+  Add SO line with service type product in SO to check flow which contain service type product in SO(BUG#1167330).
+-
+  !record {model: sale.order.line,id: sale_order_1}:
+    name: 'On Site Assistance'
+    product_id: product.product_product_2
+    product_uom_qty: 1.0
+    product_uom: 1
+    price_unit: 150.0
+    order_id: sale.sale_order_6
+-
   First I check the total amount of the Quotation before Approved.
 -
   !assert {model: sale.order, id: sale.sale_order_6, string: The amount of the Quotation is not correctly computed}:
@@ -34,13 +44,15 @@
     from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
     order = self.browse(cr, uid, ref("sale.sale_order_6"))
     for order_line in order.order_line:
-        procurement = order_line.procurement_ids[0]
-        date_planned = datetime.strptime(order.date_order, DEFAULT_SERVER_DATETIME_FORMAT) + relativedelta(days=order_line.delay or 0.0)
-        date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
-        assert procurement.date_planned == date_planned, "Scheduled date is not correspond."
-        assert procurement.product_id.id == order_line.product_id.id, "Product is not correspond."
-        assert procurement.product_qty == order_line.product_uom_qty, "Qty is not correspond."
-        assert procurement.product_uom.id == order_line.product_uom.id, "UOM is not correspond."
+        #For service type product we now create procurement in project_mrp module.
+        if order_line.procurement_ids:
+            procurement = order_line.procurement_ids[0]
+            date_planned = datetime.strptime(order.date_order, DEFAULT_SERVER_DATETIME_FORMAT) + relativedelta(days=order_line.delay or 0.0)
+            date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+            assert procurement.date_planned == date_planned, "Scheduled date is not correspond."
+            assert procurement.product_id.id == order_line.product_id.id, "Product is not correspond."
+            assert procurement.product_qty == order_line.product_uom_qty, "Qty is not correspond."
+            assert procurement.product_uom.id == order_line.product_uom.id, "UOM is not correspond."
 -
   Only stock user can change data related warehouse therefore test with that user which have stock user rights,
 -
@@ -73,7 +85,7 @@
       assert picking.partner_id.id == sale_order.partner_shipping_id.id,"Shipping Address is not correspond with sale order."
       assert picking.note == sale_order.note,"Note is not correspond with sale order."
       assert picking.invoice_state == (sale_order.order_policy=='picking' and '2binvoiced') or 'none',"Invoice policy is not correspond with sale order."
-      assert len(picking.move_lines) == len(sale_order.order_line), "Total move of delivery order are not corresposning with total sale order lines."
+      assert len(picking.move_lines) == len([ol for ol in sale_order.order_line if ol.product_id.type != 'service']), "Total move of delivery order are not corresposning with total sale order lines for product."
       location_id = sale_order.warehouse_id.lot_stock_id.id
       for move in picking.move_lines:
          order_line = move.procurement_id.sale_line_id