=== modified file 'bin/addons/base/i18n/fr.po' --- bin/addons/base/i18n/fr.po 2014-06-18 08:12:33 +0000 +++ bin/addons/base/i18n/fr.po 2017-01-16 10:07:56 +0000 @@ -6517,7 +6517,7 @@ #: model:ir.ui.menu,name:base.menu_sale_config_sales #: model:ir.ui.menu,name:base.menu_sales msgid "Sales" -msgstr "Ventes" +msgstr "Commandes" #. module: base #: field:ir.actions.server,child_ids:0 === modified file 'bin/addons/msf_outgoing/msf_outgoing.py' --- bin/addons/msf_outgoing/msf_outgoing.py 2016-12-19 14:10:19 +0000 +++ bin/addons/msf_outgoing/msf_outgoing.py 2017-01-16 10:07:56 +0000 @@ -656,7 +656,7 @@ 'backorder_id': picking.id, 'shipment_id': False, 'move_lines': [], - 'description_ppl': description_ppl, # US-803: added the description + 'description_ppl': description_ppl or picking.description_ppl, # US-803: added the description } # Update context for copy context.update({ === modified file 'bin/addons/msf_outgoing/wizard/ppl_processor.py' --- bin/addons/msf_outgoing/wizard/ppl_processor.py 2016-11-09 09:07:38 +0000 +++ bin/addons/msf_outgoing/wizard/ppl_processor.py 2017-01-16 10:07:56 +0000 @@ -48,7 +48,18 @@ ), } - def do_ppl_step1(self, cr, uid, ids, context=None): + def do_check_ppl(self, cr, uid, ids, context=None): + """ + Run a check of the integrity of lines + """ + if context is None: + context = {} + + res = self.do_ppl_step1(cr, uid, ids, context=context, just_check=True) + + return res + + def do_ppl_step1(self, cr, uid, ids, context=None, just_check=False): """ Make some integrity checks and call the do_ppl_step1 method of the stock.picking object """ @@ -73,6 +84,7 @@ to_smaller_ids = [] overlap_ids = [] gap_ids = [] + ok_ids = [] for wizard in self.browse(cr, uid, ids, context=context): # List of sequences @@ -80,6 +92,7 @@ for line in wizard.move_ids: sequences.append((line.from_pack, line.to_pack, line.id)) + ok_ids.append(line.id) # If no data, we return False if not sequences: @@ -124,7 +137,10 @@ if gap_ids: ppl_move_obj.write(cr, uid, gap_ids, {'integrity_status': 'gap'}, context=context) - if missing_ids or to_smaller_ids or overlap_ids or gap_ids: + if not (missing_ids or to_smaller_ids or overlap_ids or gap_ids) and just_check: + ppl_move_obj.write(cr, uid, ok_ids, {'integrity_status': 'empty'}, context=context) + + if missing_ids or to_smaller_ids or overlap_ids or gap_ids or just_check: view_id = data_obj.get_object_reference(cr, uid, 'msf_outgoing', 'ppl_processor_step1_form_view')[1] return { 'type': 'ir.actions.act_window', @@ -643,6 +659,15 @@ return super(ppl_move_processor, self).create(cr, uid, vals, context=context) + def write(self, cr, uid, ids, vals, context=None): + """ + Remove the integrity status value if from_pack or to_pack is changed. + """ + if vals.get('from_pack') or vals.get('to_pack'): + vals['integrity_status'] = 'empty' + + return super(ppl_move_processor, self).write(cr, uid, ids, vals, context=context) + def _get_line_data(self, cr, uid, wizard=False, move=False, context=None): """ Just put the stock move product quantity into the ppl.move.processor @@ -727,6 +752,18 @@ return pick_wiz_id + # View methods + def from_to_pack_change(self, cr, uid, ids, from_pack, to_pack): + """ + Remove the integrity status when from/to pack value is changed + """ + if from_pack or to_pack: + return { + 'value': {'integrity_status': 'empty',}, + } + + return {} + ppl_move_processor() # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'bin/addons/msf_outgoing/wizard/ppl_processor_view.xml' --- bin/addons/msf_outgoing/wizard/ppl_processor_view.xml 2016-10-28 15:31:38 +0000 +++ bin/addons/msf_outgoing/wizard/ppl_processor_view.xml 2017-01-16 10:07:56 +0000 @@ -15,8 +15,9 @@ colspan="4" nolabel="1" /> - + + @@ -79,8 +80,8 @@ /> - - + + >>>>>> MERGE-SOURCE +>>>>>>> MERGE-SOURCE === modified file 'bin/addons/procurement_cycle/procurement.py' --- bin/addons/procurement_cycle/procurement.py 2016-08-18 08:32:03 +0000 +++ bin/addons/procurement_cycle/procurement.py 2017-01-16 10:07:56 +0000 @@ -479,6 +479,10 @@ 'supplier_id': fields.function(_get_data, method=True, type='many2one', relation='res.partner', string='Supplier', multi='data', readonly=True), 'required_date': fields.function(_get_data, method=True, type='date', string='Required by date', multi='data', readonly=True), } + + _defaults = { + 'safety_stock': 0.00, + } def _check_uniqueness(self, cr, uid, ids, context=None): ''' === modified file 'bin/addons/procurement_report/wizard/schedulers_all_view.xml' --- bin/addons/procurement_report/wizard/schedulers_all_view.xml 2012-12-05 10:06:57 +0000 +++ bin/addons/procurement_report/wizard/schedulers_all_view.xml 2017-01-16 10:07:56 +0000 @@ -46,15 +46,15 @@ - + id="procurement.action_compute_schedulers" /> - + === modified file 'bin/addons/purchase_override/report/rfq.rml' --- bin/addons/purchase_override/report/rfq.rml 2016-11-09 15:33:58 +0000 +++ bin/addons/purchase_override/report/rfq.rml 2017-01-16 10:07:56 +0000 @@ -96,7 +96,7 @@ - Origin ref. : [[ encode_origin(objects[0].origin) ]] + Source Document : [[ encode_origin(objects[0].origin) ]] === modified file 'bin/addons/sale_override/sale.py' --- bin/addons/sale_override/sale.py 2016-11-09 09:07:38 +0000 +++ bin/addons/sale_override/sale.py 2017-01-16 10:07:56 +0000 @@ -638,7 +638,7 @@ res = super(sale_order, self).action_cancel(cr, uid, ids, context=context) for order in self.read(cr, uid, ids, ['procurement_request', 'name'], context=context): self.infolog(cr, uid, "The %s id:%s (%s) has been canceled." % ( - order['procurement_request'] and 'Internal request' or 'Field order', + order['procurement_request'] and _('Internal request') or _('Field order'), order['id'], order['name'], )) return res @@ -1518,9 +1518,14 @@ 'fo_to_resource': True}, context=context) - order_name = self.read(cr, uid, order_id, ['name'], context=context)['name'] + order_data = self.read(cr, uid, [order_id], ['name', 'procurement_request'], context=context)[0] + order_name = order_data['name'] + order_type = order_data['procurement_request'] and _('Internal request') or _('Field order') - self.log(cr, uid, order_id, _('The Field order %s has been created to re-source the canceled needs') % order_name, context=dict(context, procurement_request=order.procurement_request)) + self.log(cr, uid, order_id, _('The %s %s has been created to re-source the canceled needs') % ( + order_name, + order_type, + ), context=dict(context, procurement_request=order.procurement_request)) return order_id @@ -2045,7 +2050,7 @@ msg_type.get('out', {}).get(picking_data.get('subtype', ''), '') or \ msg_type.get(picking_data.get('type', ''), ''), picking_id, picking_data.get('name', ''), - order.procurement_request and 'Internal request' or 'Field order', + order.procurement_request and _('Internal request') or _('Field order'), order.id, order.name, )) @@ -3116,7 +3121,10 @@ form was opened with 'Enter a Reason for Incoming cancellation' name we just keep the view id (2 distincts ids for FO/IR)""" self.pool.get('sale.order').log(cr, uid, order_id, - _('A line was added to the Field Order %s to re-source the canceled line.') % (order_name), + _('A line was added to the %s %s to re-source the canceled line.') % ( + line.order_id and line.order_id.procurement_request and _('Internal Request') or _('Field Order'), + order_name + ), context={'view_id': context.get('view_id', False)}) return line_id === modified file 'bin/addons/specific_rules/report/report_stock_inventory_view.xml' --- bin/addons/specific_rules/report/report_stock_inventory_view.xml 2016-10-10 09:10:27 +0000 +++ bin/addons/specific_rules/report/report_stock_inventory_view.xml 2017-01-16 10:07:56 +0000 @@ -7,7 +7,7 @@ export.report.stock.inventory tree - + === modified file 'bin/addons/stock_batch_recall/__openerp__.py' --- bin/addons/stock_batch_recall/__openerp__.py 2011-12-14 16:34:10 +0000 +++ bin/addons/stock_batch_recall/__openerp__.py 2017-01-16 10:07:56 +0000 @@ -20,7 +20,7 @@ ############################################################################## { - "name": "Batch Recall", + "name": "Batch Location", "version": "1.0", "depends": ["base", "stock_move_tracking", "product_expiry", "specific_rules"], "author": "TeMPO Consulting, MSF", @@ -44,4 +44,4 @@ # 'certificate': 'certificate', } -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: \ No newline at end of file +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: === modified file 'bin/addons/stock_batch_recall/stock.py' --- bin/addons/stock_batch_recall/stock.py 2015-05-26 14:25:23 +0000 +++ bin/addons/stock_batch_recall/stock.py 2017-01-16 10:07:56 +0000 @@ -29,7 +29,7 @@ class stock_batch_recall(osv.osv_memory): _name = 'stock.batch.recall' - _description = 'Batch Recall' + _description = 'Batch Location' _columns = { 'product_id': fields.many2one('product.product', string='Product'), @@ -87,7 +87,7 @@ class report_batch_recall(osv.osv): _name = 'report.batch.recall' _rec_name = 'product_id' - _description = 'Batch Recall' + _description = 'Batch Location' _auto = False _columns = { 'product_id':fields.many2one('product.product', 'Product', readonly=True), === modified file 'bin/addons/stock_batch_recall/stock_view.xml' --- bin/addons/stock_batch_recall/stock_view.xml 2012-10-30 16:05:53 +0000 +++ bin/addons/stock_batch_recall/stock_view.xml 2017-01-16 10:07:56 +0000 @@ -7,7 +7,7 @@ report.batch.recall search - + @@ -28,7 +28,7 @@ report.batch.recall tree - + @@ -46,7 +46,7 @@ stock.batch.recall form - + @@ -57,7 +57,7 @@ - Batch Recall + Batch Location stock.batch.recall form form @@ -70,7 +70,7 @@ parent="stock.menu_traceability" /> - Batch Recall + Batch Location report.batch.recall form tree === modified file 'bin/addons/stock_override/report/report_stock_move_view.xml' --- bin/addons/stock_override/report/report_stock_move_view.xml 2015-05-22 12:23:21 +0000 +++ bin/addons/stock_override/report/report_stock_move_view.xml 2017-01-16 10:07:56 +0000 @@ -120,7 +120,7 @@ export.report.stock.move tree - + === modified file 'bin/addons/stock_schedule/scheduler_view.xml' --- bin/addons/stock_schedule/scheduler_view.xml 2012-11-06 14:18:56 +0000 +++ bin/addons/stock_schedule/scheduler_view.xml 2017-01-16 10:07:56 +0000 @@ -175,7 +175,7 @@ - +