Merge lp:~openerp-dev/openobject-addons/trunk-wms-salestockwkf-jco into lp:~openerp-dev/openobject-addons/trunk-wms

[Josse Colpaert (OpenERP)]

Change sale workflow to work as purchase workflow. The problem is that in the current workflow the sale order will not go to done when we invoice first and do the delivery afterwards.

Made also changes in procurement of cancel / split and last 2 commits make sure that the procurements of the sale order get cancelled also.

Unmerged revisions

9702. By Josse Colpaert (OpenERP) on 2014-04-29

[IMP] When cancelling a sale order, cancel its procurements

9701. By Josse Colpaert (OpenERP) on 2014-04-29

[IMP] In case of ignoring exception of sale order, cancel procurements

9700. By Josse Colpaert (OpenERP) on 2014-04-28

[IMP] Adjust workflow not to take into account procurements when having procurements for services and do not throw error trying to cancel or split moves

9699. By Josse Colpaert (OpenERP) on 2014-04-28

[IMP] Clean test_state

9698. By Josse Colpaert (OpenERP) on 2014-04-28

[IMP] Do with procurements in sale order the same thing as with moves and purchase orders

9697. By Quentin (OpenERP) <email address hidden> on 2014-04-25

[REF] stock_account: removal of TODO statements

9696. By Quentin (OpenERP) <email address hidden> on 2014-04-25

[REF] stock: removal of TODO statements

9695. By Quentin (OpenERP) <email address hidden> on 2014-04-25

[MERGE] branch of jco fixing shipping exception in mrp + cancellation in chained moves

9694. By Quentin (OpenERP) <email address hidden> on 2014-04-25

[MERGE] stock_landed_costs: better usability

9693. By Quentin (OpenERP) <email address hidden> on 2014-04-25

[REF] stock_account: refactoring of do_change_standard_price() + removal of TODO statements

=== modified file 'sale/sale.py'
--- sale/sale.py	2014-04-16 15:05:51 +0000
+++ sale/sale.py	2014-04-29 09:32:43 +0000
@@ -228,7 +228,7 @@
         'payment_term': fields.many2one('account.payment.term', 'Payment Term'),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position'),
         'company_id': fields.many2one('res.company', 'Company'),
-        'procurement_group_id': fields.many2one('procurement.group', 'Procurement group'),
+        'procurement_group_id': fields.many2one('procurement.group', 'Procurement group', readonly=True),
     }
     _defaults = {
         'date_order': fields.datetime.now,
@@ -465,10 +465,13 @@
             result['res_id'] = inv_ids and inv_ids[0] or False
         return result
 
+    def test_no_products(self, cr, uid, ids, context=None):
+        for order in self.browse(cr, uid, ids, context=context):
+            if not self.test_no_product(cr, uid, order, context=context):
+                return False
+        return True
+
     def test_no_product(self, cr, uid, order, context):
-        for line in order.order_line:
-            if line.product_id and (line.product_id.type<>'service'):
-                return False
         return True
 
     def action_invoice_create(self, cr, uid, ids, grouped=False, states=None, date_invoice = False, context=None):
@@ -663,6 +666,7 @@
             res.append(sale_line_obj.need_procurement(cr, uid, [line.id for line in order.order_line], context=context))
         return any(res)
 
+
     def action_ignore_delivery_exception(self, cr, uid, ids, context=None):
         for sale_order in self.browse(cr, uid, ids, context=context):
             self.write(cr, uid, ids, {'state': 'progress' if sale_order.invoice_exists else 'manual'}, context=context)
@@ -714,53 +718,11 @@
                 order.write(val)
         return True
 
-    # if mode == 'finished':
-    #   returns True if all lines are done, False otherwise
-    # if mode == 'canceled':
-    #   returns True if there is at least one canceled line, False otherwise
-    def test_state(self, cr, uid, ids, mode, *args):
-        assert mode in ('finished', 'canceled'), _("invalid mode for test_state")
-        finished = True
-        canceled = False
-        write_done_ids = []
-        write_cancel_ids = []
-        for order in self.browse(cr, uid, ids, context={}):
-
-            #TODO: Need to rethink what happens when cancelling
-            for line in order.order_line:
-                states =  [x.state for x in line.procurement_ids]
-                cancel = states and all([x == 'cancel' for x in states])
-                doneorcancel = all([x in ('done', 'cancel') for x in states])
-                if cancel:
-                    canceled = True
-                    if line.state != 'exception':
-                            write_cancel_ids.append(line.id)
-                if not doneorcancel:
-                    finished = False 
-                if doneorcancel and not cancel:
-                    write_done_ids.append(line.id)
-
-        if write_done_ids:
-            self.pool.get('sale.order.line').write(cr, uid, write_done_ids, {'state': 'done'})
-        if write_cancel_ids:
-            self.pool.get('sale.order.line').write(cr, uid, write_cancel_ids, {'state': 'exception'})
-            
-        if mode == 'finished':
-            return finished
-        elif mode == 'canceled':
-            return canceled
-
-
-    def procurement_lines_get(self, cr, uid, ids, *args):
-        res = []
-        for order in self.browse(cr, uid, ids, context={}):
-            for line in order.order_line:
-                res += [x.id for x in line.procurement_ids]
-        return res
-
-
-
-
+
+
+
+    def action_ship_end(self, cr, uid, ids, context=None):
+        return True
 
 # TODO add a field price_unit_uos
 # - update it on change product and unit price
 
=== modified file 'sale/sale_view.xml'
--- sale/sale_view.xml	2014-04-22 09:28:15 +0000
+++ sale/sale_view.xml	2014-04-29 09:32:43 +0000
@@ -202,6 +202,7 @@
                                 <group name="sales_person" groups="base.group_user">
                                     <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice', 'base.group_sale_salesman_all_leads']}"/>
                                     <field groups="base.group_no_one" name="origin"/>
+                                    <field name="procurement_group_id"/>
                                 </group>
                                 <group name="sale_pay">
                                     <field name="payment_term" options="{'no_create': True}"/>
 
=== modified file 'sale/sale_workflow.xml'
--- sale/sale_workflow.xml	2014-01-24 09:27:58 +0000
+++ sale/sale_workflow.xml	2014-04-29 09:32:43 +0000
@@ -198,9 +198,11 @@
         <record id="act_ship_end" model="workflow.activity">
             <field name="wkf_id" ref="sale.wkf_sale"/>
             <field name="name">ship_end</field>
-            <field name="kind">dummy</field>
+            <field name="kind">function</field>
+            <field name="action">action_ship_end()</field>
         </record>
         
+        
         <record id="act_ship_cancel" model="workflow.activity">
             <field name="wkf_id" ref="sale.wkf_sale"/>
             <field name="name">ship_cancel</field>
@@ -262,9 +264,13 @@
         <record id="trans_ship_ship_end" model="workflow.transition">
             <field name="act_from" ref="act_ship"/>
             <field name="act_to" ref="act_ship_end"/>
-            <field name="trigger_model">procurement.order</field>
-            <field name="trigger_expr_id">procurement_lines_get()</field>
-            <field name="condition">test_state('finished')</field>
+            <field name="signal">ship_end</field>
+        </record>
+        
+        <record id="trans_ship_ship_end2" model="workflow.transition">
+            <field name="act_from" ref="act_ship"/>
+            <field name="act_to" ref="act_ship_end"/>
+            <field name="condition">test_no_products()</field>
         </record>
         
         <record id="trans_ship_ship_except" model="workflow.transition">
 
=== modified file 'sale_stock/sale_stock.py'
--- sale_stock/sale_stock.py	2014-04-25 12:18:10 +0000
+++ sale_stock/sale_stock.py	2014-04-29 09:32:43 +0000
@@ -159,7 +159,6 @@
     def action_cancel(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
-        sale_order_line_obj = self.pool.get('sale.order.line')
         proc_obj = self.pool.get('procurement.order')
         stock_obj = self.pool.get('stock.picking')
         for sale in self.browse(cr, uid, ids, context=context):
@@ -168,6 +167,10 @@
                     raise osv.except_osv(
                         _('Cannot cancel sales order!'),
                         _('You must first cancel all delivery order(s) attached to this sales order.'))
+            procurements = []
+            for line in sale.order_line:
+                procurements += [x.id for x in line.procurement_ids if x.state not in ('cancel', 'done') and x.product_id.type != 'service']
+            proc_obj.cancel(cr, uid, procurements, context=context)
             stock_obj.signal_button_cancel(cr, uid, [p.id for p in sale.picking_ids])
         return super(sale_order, self).action_cancel(cr, uid, ids, context=context)
 
@@ -189,10 +192,11 @@
         res.update({'move_type': order.picking_policy})
         return res
 
+
     def action_ship_end(self, cr, uid, ids, context=None):
         super(sale_order, self).action_ship_end(cr, uid, ids, context=context)
         for order in self.browse(cr, uid, ids, context=context):
-            val = {'shipped': True}
+            val = {}
             if order.state == 'shipping_except':
                 val['state'] = 'progress'
                 if (order.order_policy == 'manual'):
@@ -203,8 +207,25 @@
             res = self.write(cr, uid, [order.id], val)
         return True
 
-
-
+    def test_no_product(self, cr, uid, order, context):
+        for line in order.order_line:
+            if line.product_id and (line.product_id.type<>'service'):
+                return False
+        return True
+
+    def test_procurements_done(self, cr, uid, ids, context=None):
+        for sale in self.browse(cr, uid, ids, context=context):
+            for line in sale.order_line:
+                if not all([x.state == 'done' for x in line.procurement_ids if x.product_id.type != 'service']):
+                    return False
+        return True
+
+    def test_procurements_except(self, cr, uid, ids, context=None):
+        for sale in self.browse(cr, uid, ids, context=context):
+            for line in sale.order_line:
+                if any([x.state in ('exception', 'cancel') and x.move_ids for x in line.procurement_ids]):
+                    return True
+        return False
 
     def has_stockable_products(self, cr, uid, ids, *args):
         for order in self.browse(cr, uid, ids):
@@ -213,6 +234,19 @@
                     return True
         return False
 
+    def action_ignore_delivery_exception(self, cr, uid, ids, context=None):
+        """
+            In case of ignoring the exception it should cancel the procurements
+        """
+        proc_obj = self.pool.get("procurement.order")
+        exceptions = []
+        for order in self.browse(cr, uid, ids, context=context):
+            for line in order.order_line:
+                exceptions += [x.id for x in line.procurement_ids if x.state == "exception"]
+        if exceptions:
+            proc_obj.cancel(cr, uid, exceptions, context=context)
+        return super(sale_order, self).action_ignore_delivery_exception(cr, uid, ids, context=context)
+
 
 class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
@@ -375,17 +409,28 @@
         res.update({'warning': warning})
         return res
 
+
+class procurement_order(osv.osv):
+    _inherit = 'procurement.order'
+    
+    def write(self, cr, uid, ids, vals, context=None):
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+        res = super(procurement_order, self).write(cr, uid, ids, vals, context=context)
+        from openerp import workflow
+        if vals.get('state') in ['done', 'cancel', 'exception']:
+            for proc in self.browse(cr, uid, ids, context=context):
+                if proc.sale_line_id and proc.sale_line_id.order_id and proc.move_ids:
+                    order_id = proc.sale_line_id.order_id.id
+                    if self.pool.get('sale.order').test_procurements_done(cr, uid, [order_id], context=context):
+                        workflow.trg_validate(uid, 'sale.order', order_id, 'ship_end', cr)
+                    if self.pool.get('sale.order').test_procurements_except(cr, uid, [order_id], context=context):
+                        workflow.trg_validate(uid, 'sale.order', order_id, 'ship_except', cr)
+        return res
+
 class stock_move(osv.osv):
     _inherit = 'stock.move'
 
-    def action_cancel(self, cr, uid, ids, context=None):
-        sale_ids = []
-        for move in self.browse(cr, uid, ids, context=context):
-            if move.procurement_id and move.procurement_id.sale_line_id:
-                sale_ids.append(move.procurement_id.sale_line_id.order_id.id)
-        if sale_ids:
-            self.pool.get('sale.order').signal_ship_except(cr, uid, sale_ids)
-        return super(stock_move, self).action_cancel(cr, uid, ids, context=context)
 
     def _create_invoice_line_from_vals(self, cr, uid, move, invoice_line_vals, context=None):
         invoice_line_id = self.pool.get('account.invoice.line').create(cr, uid, invoice_line_vals, context=context)
 
=== modified file 'stock/stock.py'
--- stock/stock.py	2014-04-28 14:55:36 +0000
+++ stock/stock.py	2014-04-29 09:32:43 +0000
@@ -2139,31 +2139,37 @@
         """
         procurement_obj = self.pool.get('procurement.order')
         context = context or {}
+        procurements = []
+        cancel_ids = []
         for move in self.browse(cr, uid, ids, context=context):
             if move.state == 'done':
-                raise osv.except_osv(_('Operation Forbidden!'),
-                        _('You cannot cancel a stock move that has been set to \'Done\'.'))
+                continue #Could have been propagated from a forced move
+            cancel_ids.append(move.id)
             if move.reserved_quant_ids:
                 self.pool.get("stock.quant").quants_unreserve(cr, uid, move, context=context)
             if context.get('cancel_procurement'):
                 if move.propagate:
                     procurement_ids = procurement_obj.search(cr, uid, [('move_dest_id', '=', move.id)], context=context)
                     procurement_obj.cancel(cr, uid, procurement_ids, context=context)
-            elif move.move_dest_id:
-                #cancel chained moves
-                if move.propagate:
-                    self.action_cancel(cr, uid, [move.move_dest_id.id], context=context)
-                    # If we have a long chain of moves to be cancelled, it is easier for the user to handle
-                    # only the last procurement which will go into exception, instead of all procurements
-                    # along the chain going into exception.  We need to check if there are no split moves not cancelled however
-                    if move.procurement_id:
-                        proc = move.procurement_id
-                        if all([x.state == 'cancel' for x in proc.move_ids if x.id != move.id]):
-                            procurement_obj.write(cr, uid, [proc.id], {'state': 'cancel'})
-
-                elif move.move_dest_id.state == 'waiting':
-                    self.write(cr, uid, [move.move_dest_id.id], {'state': 'confirmed'}, context=context)
-        return self.write(cr, uid, ids, {'state': 'cancel', 'move_dest_id': False}, context=context)
+            elif move.move_dest_id and move.propagate:
+                    #cancel chained moves
+                        self.action_cancel(cr, uid, [move.move_dest_id.id], context=context)
+                        # If we have a long chain of moves to be cancelled, it is easier for the user to handle
+                        # only the last procurement which will go into exception, instead of all procurements
+                        # along the chain going into exception.  We need to check if there are no split moves not cancelled however
+                        if move.procurement_id:
+                            proc = move.procurement_id
+                            if all([x.state == 'cancel' for x in proc.move_ids if x.id != move.id]):
+                                procurement_obj.write(cr, uid, [proc.id], {'state': 'cancel'})
+            elif move.procurement_id:
+                procurements.append(move.procurement_id.id)
+        if cancel_ids:
+            res = self.write(cr, uid, cancel_ids, {'state': 'cancel', 'move_dest_id': False}, context=context)
+        else:
+            res = False
+        if procurements:
+            procurement_obj.check(cr, uid, procurements, context=context)
+        return res
 
     def _check_package_from_moves(self, cr, uid, ids, context=None):
         pack_obj = self.pool.get("stock.quant.package")
@@ -2354,7 +2360,7 @@
         returns the ID of the backorder move created
         """
         if move.state in ('done', 'cancel'):
-            raise osv.except_osv(_('Error'), _('You cannot split a move done'))
+            return False #Could have been propagated to a forced move
         if move.state == 'draft':
             #we restrict the split of a draft move because if not confirmed yet, it may be replaced by several other moves in
             #case of phantom bom (with mrp module). And we don't want to deal with this complexity by copying the product that will explode.