Merge lp:~unifield-team/unifield-wm/pilot-27-supply-bugs into lp:unifield-wm

[jftempo]

Unmerged revisions

1859. By Quentin THEURET @Amaris on 2013-11-20

UF-2207 [FIX] Picking Ticket : Display the good actions report

1858. By Quentin THEURET @Amaris on 2013-11-20

UF-2207 [MERGE] Merge UF-2207 branch
lp:~unifield-team/unifield-wm/uf-2207

1857. By Quentin THEURET @Amaris on 2013-11-20

UF-2210 [MERGE] Merge UF-2210 branch
lp:~unifield-team/unifield-wm/uf-2210

1856. By Quentin THEURET @Amaris on 2013-11-20

UF-2209 [MERGE] Merge UF-2209 branch
lp:~unifield-team/unifield-wm/uf-2209

1855. By Quentin THEURET @Amaris on 2013-11-20

UF-2206 [MERGE] Merge UF-2206 branch
lp:~unifield-team/unifield-wm/uf-2206

1854. By Quentin THEURET @Amaris on 2013-11-20

UF-2204 [MERGE] Merge UF-2204 branch
lp:~unifield-team/unifield-wm/uf-2204

1853. By Quentin THEURET @Amaris on 2013-11-20

UF-2191 [MERGE] Merge UF-2191 branch
lp:~unifield-team/unifield-wm/uf-2191

=== modified file 'consumption_calculation/history_consumption.py'
--- consumption_calculation/history_consumption.py	2013-11-05 15:44:32 +0000
+++ consumption_calculation/history_consumption.py	2013-11-21 13:07:07 +0000
@@ -66,7 +66,7 @@
     _defaults = {
         'date_to': lambda *a: (DateFrom(time.strftime('%Y-%m-%d')) + RelativeDateTime(months=1, day=1, days=-1)).strftime('%Y-%m-%d'),
         'requestor_id': lambda obj, cr, uid, c: uid,
-        'requestor_date': time.strftime('%Y-%m-%d %H:%M:%S'),
+        'requestor_date': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
         'status': 'draft',
     }
 
@@ -222,6 +222,7 @@
 
         import threading
         self.write(cr, uid, ids, {'status': 'in_progress'}, context=context)
+        cr.commit()
         new_thread = threading.Thread(target=self._create_lines, args=(cr, uid, ids, product_ids, new_context))
         new_thread.start()
         new_thread.join(10.0)

=== modified file 'kit/kit_creation.py'
--- kit/kit_creation.py	2013-10-07 14:53:32 +0000
+++ kit/kit_creation.py	2013-11-21 13:07:07 +0000
@@ -473,10 +473,11 @@
         data = {}
         # moves consolidated
         move_list = []
+        move_manual = []
         
         for move in obj.consumed_ids_kit_creation:
             # the stock move should not be canceled, but... we recycle them in case.
-            if move.state in ['confirmed', 'cancel']:
+            if move.state in ['confirmed', 'cancel'] and not move.kol_lot_manual:
                 move_list.append(move.id)
                 # consolidate the moves qty
                 qty = data.setdefault(move.product_id.id, {}).setdefault('uoms', {}).setdefault(move.product_uom.id, {}).setdefault('qty', 0.0)
@@ -489,8 +490,10 @@
                 data.setdefault(move.product_id.id, {}).setdefault('uoms', {})[move.product_uom.id]['qty'] = qty
                 # save object for efficiency
                 data.setdefault(move.product_id.id, {}).setdefault('object', move.product_id)
+            elif move.kol_lot_manual:
+                move_manual.append(move.id)
         
-        return data, move_list
+        return data, move_list, move_manual
     
     def consolidate_lines(self, cr, uid, ids, context=None):
         '''
@@ -510,7 +513,7 @@
         
         for obj in self.browse(cr, uid, ids, context=context):
             # consolidate data
-            data, move_list = self._consolidate_data(cr, uid, obj.id, context=context)
+            data, move_list, move_manual = self._consolidate_data(cr, uid, obj.id, context=context)
             # delete stock moves
             move_obj.unlink(cr, uid, move_list, context=dict(context, call_unlink=True))
             # default location
@@ -561,16 +564,41 @@
         loc_obj = self.pool.get('stock.location')
         prodlot_obj = self.pool.get('stock.production.lot')
         data_tools_obj = self.pool.get('data.tools')
+        uom_obj = self.pool.get('product.uom')
         # load data into the context
         data_tools_obj.load_common_data(cr, uid, ids, context=context)
         
         for obj in self.browse(cr, uid, ids, context=context):
             # consolidate data
-            data, move_list = self._consolidate_data(cr, uid, obj.id, context=context)
+            data, move_list, move_manual = self._consolidate_data(cr, uid, obj.id, context=context)
+            # default location
+            default_location_id = obj.default_location_src_id_kit_creation.id
+
+            # Check availability of manual moves
+            for move in move_obj.browse(cr, uid, move_manual, context=context):
+                if move.state != 'confirmed' or not move.prodlot_id:
+                    continue
+
+                location_ids = loc_obj.search(cr, uid, [('location_id', 'child_of', move.location_id.id)], context=context)
+                needed_qty = move.product_qty
+                for loc in location_ids:
+                    available_qty = prodlot_obj.browse(cr, uid, move.prodlot_id.id, context=dict(context, location_id=loc)).stock_virtual
+                    diff_qty = available_qty - uom_obj._compute_qty(cr, uid, move.product_uom.id, needed_qty, move.product_id.uom_id.id)
+                    if diff_qty >= 0:
+                        move_obj.write(cr, uid, [move.id], {'state': 'assigned'}, context=context)
+                        break
+                    else:
+                        if available_qty:
+                            move_obj.copy(cr, uid, move.id, {'product_qty': available_qty, 'state': 'assigned'}, context=context)
+                        needed_qty -= available_qty
+                        move_obj.write(cr, uid, [move.id], {'product_qty': needed_qty}, context=context)
+                else:
+                    move_obj.write(cr, uid, [move.id], {'prodlot_id': False, 'kol_lot_manual': False}, context=context)
+
+            data, move_list, move_manual = self._consolidate_data(cr, uid, obj.id, context=context)
             # delete stock moves
             move_obj.unlink(cr, uid, move_list, context=dict(context, call_unlink=True))
-            # default location
-            default_location_id = obj.default_location_src_id_kit_creation.id
+
             # create consolidated stock moves
             for product_id in data.keys():
                 for uom_id in data[product_id]['uoms'].keys():
@@ -1250,6 +1278,7 @@
                 'hidden_creation_state': fields.function(_vals_get_kit_creation, method=True, type='selection', selection=KIT_CREATION_STATE, string='Hidden Creation State', multi='get_vals_kit_creation', store=False, readonly=True),
                 'assigned_qty_stock_move': fields.function(_vals_get_kit_creation, method=True, type='float', string='Assigned Qty', multi='get_vals_kit_creation', store=False, readonly=True),
                 'hidden_creation_qty_stock_move': fields.function(_vals_get_kit_creation, method=True, type='integer', string='Hidden Creation Qty', multi='get_vals_kit_creation', store=False, readonly=True),
+                'kol_lot_manual': fields.boolean(string='The batch is set manually'),
                 }
     
     _defaults = {'to_consume_id_stock_move': False,
@@ -1273,6 +1302,15 @@
         # open the selected wizard
         res = wiz_obj.open_wizard(cr, uid, ids, name=name, model=model, step=step, context=dict(context))
         return res
+
+    def kol_prodlot_change(self, cr, uid, ids, prodlot_id, context=None):
+        '''
+        Set a new attribute on stock move if the prodolt is change manually in the Kit order creation
+        '''
+        if prodlot_id:
+            return {'value': {'kol_lot_manual': True}}
+
+        return {'value': {'kol_lot_manual': False}}
     
     def automatic_assignment(self, cr, uid, ids, context=None):
         '''

=== modified file 'kit/kit_creation_view.xml'
--- kit/kit_creation_view.xml	2013-10-07 14:53:32 +0000
+++ kit/kit_creation_view.xml	2013-11-21 13:07:07 +0000
@@ -77,7 +77,8 @@
                     					attrs="{'readonly': ['|', ('hidden_state', '!=', 'confirmed'), ('hidden_asset_check', '=', False)]}" />
                     				<field name="prodlot_id"
                     					context="{'location_id':location_id, 'product_id':product_id, 'hidden_perishable_mandatory': hidden_perishable_mandatory,
-	                    			  		'search_default_real': True}"
+                                                  'search_default_real': True}"
+                                        on_change="kol_prodlot_change(prodlot_id)"
                     					domain="[('product_id', '=', product_id),('check_type','=', True)]"
                     					attrs="{'readonly': ['|', ('hidden_state', '!=', 'confirmed'), ('hidden_exp_check', '=', False)],
                     							'required': [('hidden_exp_check', '=', True)]}" />
@@ -88,7 +89,8 @@
                     					domain="[('usage', '=', 'internal')]" />
                     				<field name="state" />
                     				<field name="lot_check" />
-	                   				<field name="exp_check" />
+                                    <field name="exp_check" />
+                                    <field name="kol_lot_manual" invisible="True" />
 	                   				<field name="hidden_perishable_mandatory" invisible="True" />
 	                   				<field name="hidden_exp_check" invisible="True" />
                     				<field name="hidden_state" invisible="True" />

=== modified file 'msf_doc_import/initial_stock_inventory.py'
--- msf_doc_import/initial_stock_inventory.py	2013-10-04 14:01:53 +0000
+++ msf_doc_import/initial_stock_inventory.py	2013-11-21 13:07:07 +0000
@@ -250,7 +250,7 @@
                 product = product_obj.browse(cr, uid, product_id)
                 product_uom = product.uom_id.id
                 hidden_batch_management_mandatory = product.batch_management
-                hidden_perishable_mandatory = product.perishable
+                hidden_perishable_mandatory = product.perishable and not product.batch_management
                 if hidden_batch_management_mandatory and not batch:
                     comment += _('Batch is missing.\n')
                 if hidden_perishable_mandatory and not expiry:

=== modified file 'msf_outgoing/msf_outgoing.py'
--- msf_outgoing/msf_outgoing.py	2013-11-07 17:06:54 +0000
+++ msf_outgoing/msf_outgoing.py	2013-11-21 13:07:07 +0000
@@ -497,7 +497,8 @@
                     self.log(cr, uid, draft_shipment_id, _("Packs from the draft Shipment (%s) have been returned to stock.")%(draft_shipment_name,))
                     log_flag = True
                 res = obj_data.get_object_reference(cr, uid, 'msf_outgoing', 'view_picking_ticket_form')[1]
-                self.pool.get('stock.picking').log(cr, uid, draft_picking_id, _("The corresponding Draft Picking Ticket (%s) has been updated.")%(draft_picking.name,), context={'view_id': res,})
+                context.update({'view_id': res, 'picking_type': 'picking.ticket'})
+                self.pool.get('stock.picking').log(cr, uid, draft_picking_id, _("The corresponding Draft Picking Ticket (%s) has been updated.")%(draft_picking.name,), context=context)
             
         # call complete_finished on the shipment object
         # if everything is alright (all draft packing are finished) the shipment is done also 
@@ -517,6 +518,7 @@
             'res_id': draft_picking_id ,
             'type': 'ir.actions.act_window',
             'target': 'crush',
+            'context': context
         }
     
     def return_packs_from_shipment(self, cr, uid, ids, context=None):
@@ -2849,7 +2851,8 @@
             res = obj_data.get_object_reference(cr, uid, 'msf_outgoing', 'view_ppl_form')[1]
             self.log(cr, uid, picking.id, _("Products from Pre-Packing List (%s) have been returned to stock.")%(picking.name,), context={'view_id': res,})
             res = obj_data.get_object_reference(cr, uid, 'msf_outgoing', 'view_picking_ticket_form')[1]
-            self.log(cr, uid, draft_picking_id, _("The corresponding Draft Picking Ticket (%s) has been updated.")%(picking.previous_step_id.backorder_id.name,), context={'view_id': res,})
+            context.update({'view_id': res, 'picking_type': 'picking_ticket'})
+            self.log(cr, uid, draft_picking_id, _("The corresponding Draft Picking Ticket (%s) has been updated.")%(picking.previous_step_id.backorder_id.name,), context=context)
             # if all moves are done or canceled, the ppl is canceled
             cancel_ppl = True
             for move in picking.move_lines:
@@ -2935,7 +2938,8 @@
                     # TODO refactoring needed
                     obj_data = self.pool.get('ir.model.data')
                     res = obj_data.get_object_reference(cr, uid, 'msf_outgoing', 'view_picking_ticket_form')[1]
-                    self.log(cr, uid, draft_picking_id, _("The corresponding Draft Picking Ticket (%s) has been updated.")%(picking.backorder_id.name,), context={'view_id': res,})
+                    context.update({'view_id': res, 'picking_type': 'picking_ticket'})
+                    self.log(cr, uid, draft_picking_id, _("The corresponding Draft Picking Ticket (%s) has been updated.")%(picking.backorder_id.name,), context=context)
                     
             if picking.subtype == 'packing':
                 # for each packing we get the draft packing

=== modified file 'msf_supply_doc_export/msf_supply_doc_export.py'
--- msf_supply_doc_export/msf_supply_doc_export.py	2013-10-30 16:03:55 +0000
+++ msf_supply_doc_export/msf_supply_doc_export.py	2013-11-21 13:07:07 +0000
@@ -299,11 +299,11 @@
             Delivery_Order = trans_obj.tr_view(cr, 'Delivery Order', context)
             Internal_Moves = trans_obj.tr_view(cr, 'Internal Moves', context)
             for v in values:
-                if '_terp_view_name' in context and v[2]['report_name'] == 'picking.ticket' and context['_terp_view_name'] in (Picking_Tickets, Picking_Ticket) and context.get('picking_screen', False)\
-                or '_terp_view_name' in context and v[2]['report_name'] == 'pre.packing.list' and context['_terp_view_name'] in (Pre_Packing_Lists, Pre_Packing_List) and context.get('ppl_screen', False)\
-                or '_terp_view_name' in context and v[2]['report_name'] == 'labels' and context['_terp_view_name'] in [Picking_Ticket, Picking_Tickets, Pre_Packing_List, Pre_Packing_Lists, Delivery_Orders, Delivery_Order]\
+                if v[2]['report_name'] == 'picking.ticket' and (context.get('_terp_view_name') in (Picking_Tickets, Picking_Ticket) or context.get('picking_type') == 'picking_ticket') and context.get('picking_screen', False)\
+                or v[2]['report_name'] == 'pre.packing.list' and context.get('_terp_view_name') in (Pre_Packing_Lists, Pre_Packing_List) and context.get('ppl_screen', False)\
+                or v[2]['report_name'] == 'labels' and (context.get('_terp_view_name') in [Picking_Ticket, Picking_Tickets, Pre_Packing_List, Pre_Packing_Lists, Delivery_Orders, Delivery_Order] or context.get('picking_type', False) in ('delivery_order', 'picking_ticket'))\
                 or v[2]['report_name'] in ('internal.move.xls', 'internal.move') and (('_terp_view_name' in context and context['_terp_view_name'] in [Internal_Moves]) or context.get('picking_type') == 'internal_move') \
-                or v[2]['report_name'] == 'delivery.order' and context.get('_terp_view_name') in [Delivery_Orders, Delivery_Order]:
+                or v[2]['report_name'] == 'delivery.order' and (context.get('_terp_view_name') in [Delivery_Orders, Delivery_Order] or context.get('picking_type', False) == 'delivery_order'):
                     new_act.append(v)
                 values = new_act
         elif context.get('_terp_view_name') and key == 'action' and key2 == 'client_print_multi' and 'shipment' in [x[0] for x in models]:

=== modified file 'specific_rules/specific_rules_view.xml'
--- specific_rules/specific_rules_view.xml	2013-10-04 15:24:12 +0000
+++ specific_rules/specific_rules_view.xml	2013-11-21 13:07:07 +0000
@@ -144,7 +144,7 @@
             <field name="type">tree</field>
             <field name="priority" eval="200" />
             <field name="arch" type="xml">
-                <tree string="Expiry Dates" hide_new_button="True" hide_delete_button="True">
+                <tree string="Expiry Dates" hide_new_button="True" hide_delete_button="True" colors="red:life_date &lt; current_date">
                     <field name="prefix" invisible="True" />
                     <field name="type" invisible="True" />
                     <field name="life_date" />

=== modified file 'stock_override/report/report_stock_move.py'
--- stock_override/report/report_stock_move.py	2013-09-03 08:27:31 +0000
+++ stock_override/report/report_stock_move.py	2013-11-21 13:07:07 +0000
@@ -163,7 +163,13 @@
                         sm.prodlot_id as prodlot_id,
                         sm.comment as comment,
                         sm.tracking_id as tracking_id,
-                        sum((sm.product_qty / pu.factor) * u.factor) as product_qty,
+                        CASE 
+                          WHEN sp.type in ('out') THEN
+                            sum((-sm.product_qty / pu.factor) * u.factor)
+                          WHEN sp.type in ('in') THEN
+                            sum((sm.product_qty / pu.factor) * u.factor)
+                          ELSE 0.0
+                          END AS product_qty,
                         pt.nomen_manda_2 as categ_id,
                         sp.partner_id2 as partner_id,
                         sm.product_id as product_id,