Merge lp:~unifield-team/unifield-server/qt-fix-210616 into lp:unifield-server

[jftempo]

Unmerged revisions

3836. By Quentin THEURET @Amaris on 2016-07-13

US-1066 [FIX] Fix bad statement

3835. By Quentin THEURET @Amaris on 2016-07-13

US-1066 [FIX] Fix bad statement

3834. By Quentin THEURET @Amaris on 2016-07-13

US-1066 [FIX] Don't display the res.log message for Short shelf life product if the order is not an non-split FO

3833. By Quentin THEURET @Amaris on 2016-07-13

US-1066 [MERGE] Merge latest modifications on US-1066

3832. By Quentin THEURET @Amaris on 2016-06-22

US-633 [FIX]Fix not run messages at coordo

3831. By Quentin THEURET @Amaris on 2016-06-21

US-633 [MERGE] Merge lp:~unifield-team/unifield-server/us-633

3830. By Quentin THEURET @Amaris on 2016-06-21

US-768 [MERGE] Merge lp:~unifield-team/unifield-server/us-768

=== modified file 'bin/addons/analytic_distribution_supply/purchase.py'
--- bin/addons/analytic_distribution_supply/purchase.py	2016-03-02 15:57:47 +0000
+++ bin/addons/analytic_distribution_supply/purchase.py	2016-07-21 08:22:24 +0000
@@ -444,12 +444,6 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
-        if not context.get('partner_type'):
-            raise osv.except_osv(
-                _('Error'),
-                _('You need to select a partner before add the analytic distribution'),
-            )
-
         # Prepare some values
         purchase_line = self.browse(cr, uid, ids[0], context=context)
         amount = purchase_line.price_subtotal or 0.0
 
=== modified file 'bin/addons/consumption_calculation/consumption_calculation.py'
--- bin/addons/consumption_calculation/consumption_calculation.py	2016-06-16 12:40:01 +0000
+++ bin/addons/consumption_calculation/consumption_calculation.py	2016-07-21 08:22:24 +0000
@@ -775,14 +775,14 @@
         'date_mandatory': fields.boolean(string='DM'),
         'asset_id': fields.integer(string='Asset'),
         'asset_mandatory': fields.boolean('AM'),
-        'remark': fields.char(size=256, string='Remark'),
+        'remark': fields.char(size=256, string='Comment'),
         'move_id': fields.many2one('stock.move', string='Move'),
         'rac_id': fields.many2one('real.average.consumption', string='RAC', ondelete='cascade'),
         'text_error': fields.text('Errors', readonly=True),
         'to_correct_ok': fields.function(_get_checks_all, method=True, type="boolean", string="To correct", store=False, readonly=True, multi="m"),
         'just_info_ok': fields.boolean(string='Just for info'),
         'inactive_product': fields.function(_get_inactive_product, method=True, type='boolean', string='Product is inactive', store=False, multi='inactive'),
-        'inactive_error': fields.function(_get_inactive_product, method=True, type='char', string='Comment', store=False, multi='inactive'),
+        'inactive_error': fields.function(_get_inactive_product, method=True, type='char', string='System message', store=False, multi='inactive'),
         }
 
     _defaults = {
 
=== modified file 'bin/addons/consumption_calculation/consumption_view.xml'
--- bin/addons/consumption_calculation/consumption_view.xml	2015-12-09 11:34:08 +0000
+++ bin/addons/consumption_calculation/consumption_view.xml	2016-07-21 08:22:24 +0000
@@ -58,7 +58,7 @@
                             <field name="consumed_qty" on_change="change_qty(consumed_qty, product_id, prodlot_id, parent.cons_location_id, uom_id)"/>
                             <field name="move_id" invisible="1" />
                             <button string="Duplicate line" icon="terp-stock_effects-object-colorize" name="copy" type="object" attrs="{'invisible': [('move_id', '!=', False)]}" />
-                            <field name="remark" invisible="1" />
+                            <field name="remark" />
                             <field name="batch_mandatory" invisible="0" string="B.Num" readonly="1" />
                             <field name="date_mandatory" invisible="0" string="Exp" readonly="1" />
                             <field name="asset_mandatory" invisible="0" string="Asset" readonly="1" />
 
=== modified file 'bin/addons/msf_button_access_rights/res_log.py'
--- bin/addons/msf_button_access_rights/res_log.py	2015-12-10 16:03:40 +0000
+++ bin/addons/msf_button_access_rights/res_log.py	2016-07-21 08:22:24 +0000
@@ -150,7 +150,7 @@
 
         for r in res:
            r['read_ok'] = self._check_read_rights(cr, uid, r['res_model'], read_rights, context=context)
-           t = (r['res_model'], r['res_id'])
+           t = (r['name'], r['res_model'], r['res_id'])
            if t not in res_dict:
                res_dict[t] = True
                result.insert(0,r)
 
=== modified file 'bin/addons/order_nomenclature/order_nomenclature.py'
--- bin/addons/order_nomenclature/order_nomenclature.py	2014-03-25 13:21:26 +0000
+++ bin/addons/order_nomenclature/order_nomenclature.py	2016-07-21 08:22:24 +0000
@@ -137,6 +137,9 @@
             partner_id, date_order, fiscal_position, date_planned,
             name, price_unit, notes, state, old_unit_price,nomen_manda_0,comment,context=prod_context)
 
+        if result.get('warning') and result['warning'].get('title') == 'Short Shelf Life product':
+            del result['warning']
+
         # drop modification to name attribute
         if 'name' in result['value']:
             del result['value']['name']
@@ -375,6 +378,9 @@
                                         uom, qty_uos, uos, name, partner_id,
                                         lang, update_tax, date_order, packaging, fiscal_position, flag)
 
+        if result.get('warning') and result['warning'].get('title') == 'Short Shelf Life product':
+            del result['warning']
+
         # drop modification to name attribute
         if 'name' in result['value']:
             del result['value']['name']
 
=== modified file 'bin/addons/procurement_request/procurement_request.py'
--- bin/addons/procurement_request/procurement_request.py	2016-05-31 08:51:54 +0000
+++ bin/addons/procurement_request/procurement_request.py	2016-07-21 08:22:24 +0000
@@ -397,6 +397,9 @@
         '''
         Update date_planned of lines
         '''
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
         res = True
         for req in self.browse(cr, uid, ids, context=context):
             # Only in case of Internal request
@@ -546,6 +549,8 @@
         line_obj.write(cr, uid, reset_soq, {'soq_updated': False,}, context=context)
         self.write(cr, uid, ids, {'state': 'validated'}, context=context)
 
+        self.ssl_products_in_line(cr, uid, ids, context=context)
+
         return True
 
     def confirm_procurement(self, cr, uid, ids, context=None):
 
=== modified file 'bin/addons/purchase_override/purchase.py'
--- bin/addons/purchase_override/purchase.py	2016-06-01 08:29:43 +0000
+++ bin/addons/purchase_override/purchase.py	2016-07-21 08:22:24 +0000
@@ -1118,6 +1118,7 @@
                                   'validator' : uid,
                                   'date_confirm': strftime('%Y-%m-%d')}, context=context)
 
+        self.ssl_products_in_line(cr, uid, ids, context=context)
         self.check_analytic_distribution(cr, uid, ids, context=context)
 
         return True
@@ -1320,8 +1321,9 @@
             if exp_sol.po_id and exp_sol.po_id.id not in all_po_ids:
                 all_po_ids.append(exp_sol.po_id.id)
         list_po_name = ', '.join([linked_po.name for linked_po in self.browse(cr, uid, all_po_ids, context) if linked_po.id != ids[0]])
-        self.log(cr, uid, ids[0], _("The order %s is in confirmed (waiting) state and will be confirmed once the related orders [%s] would have been confirmed"
-                                 ) % (self.read(cr, uid, ids, ['name'])[0]['name'], list_po_name))
+        if list_po_name:
+            self.log(cr, uid, ids[0], _("The order %s is in confirmed (waiting) state and will be confirmed once the related orders [%s] would have been confirmed"
+                    ) % (self.read(cr, uid, ids, ['name'])[0]['name'], list_po_name))
         # sale order lines with modified state
         if sol_ids:
             sol_obj.write(cr, uid, sol_ids, {'state': 'confirmed'}, context=context)
 
=== modified file 'bin/addons/sale_override/sale.py'
--- bin/addons/sale_override/sale.py	2016-05-27 12:38:18 +0000
+++ bin/addons/sale_override/sale.py	2016-07-21 08:22:24 +0000
@@ -1326,13 +1326,17 @@
             'validated_date': time.strftime('%Y-%m-%d %H:%M:%S'),
         }, context=context)
 
+        self.ssl_products_in_line(cr, uid, ids, context=context)
+
         # Display validation message to the user
         for order in order_brw_list:
             if not order.procurement_request:
-                self.log(cr, uid, order.id, 'The Field order \'%s\' has been validated (nb lines: %s).' % (order.name, len(order.order_line)), context=context)
+                if order.split_type_sale_order == 'original_sale_order':
+                    self.log(cr, uid, order.id, 'The Field order \'%s\' has been validated (nb lines: %s).' % (order.name, len(order.order_line)), context=context)
                 self.infolog(cr, uid, "The Field order id:%s (%s) has been validated." % (order.id, order.name))
             else:
-                self.log(cr, uid, order.id, 'The Internal Request \'%s\' has been validated (nb lines: %s).' % (order.name, len(order.order_line)), context=context)
+                if order.split_type_sale_order == 'original_sale_order':
+                    self.log(cr, uid, order.id, 'The Internal Request \'%s\' has been validated (nb lines: %s).' % (order.name, len(order.order_line)), context=context)
                 self.infolog(cr, uid, "The Internal request id:%s (%s) has been validated." % (order.id, order.name))
 
         return True
 
=== modified file 'bin/addons/specific_rules/specific_rules.py'
--- bin/addons/specific_rules/specific_rules.py	2016-05-26 15:56:48 +0000
+++ bin/addons/specific_rules/specific_rules.py	2016-07-21 08:22:24 +0000
@@ -88,6 +88,15 @@
 
         return result
 
+    def requested_product_id_change(self, cr, uid, ids, product_id, comment=False, context=None):
+        result = super(sale_order_line, self).requested_product_id_change(cr, uid, ids, product_id, comment, context)
+        if product_id:
+            prod_obj = self.pool.get('product.product')
+            if prod_obj.browse(cr, uid, product_id).is_ssl:
+                warning = {'title': 'Short Shelf Life product', 'message': _(SHORT_SHELF_LIFE_MESS)}
+                result.update(warning=warning)
+        return result
+
 sale_order_line()
 
 
@@ -97,21 +106,26 @@
     '''
     _inherit = 'sale.order'
 
-    def write(self, cr, uid, ids, vals, context=None):
+    def ssl_products_in_line(self, cr, uid, ids, context=None):
         '''
         display message if contains short shelf life
         '''
         if isinstance(ids, (int, long)):
             ids = [ids]
 
+        can_break = False
         for obj in self.browse(cr, uid, ids, context=context):
+            if obj.split_type_sale_order != 'original_sale_order' or can_break:
+                break
             for line in obj.order_line:
                 # log the message
                 if line.product_id.is_ssl:
                     # log the message
                     self.log(cr, uid, obj.id, _(SHORT_SHELF_LIFE_MESS))
+                    can_break = True
+                    break
 
-        return super(sale_order, self).write(cr, uid, ids, vals, context=context)
+        return True
 
 sale_order()
 
@@ -178,21 +192,26 @@
     '''
     _inherit = 'purchase.order'
 
-    def write(self, cr, uid, ids, vals, context=None):
+    def ssl_products_in_line(self, cr, uid, ids, context=None):
         '''
         display message if contains short shelf life
         '''
         if isinstance(ids, (int, long)):
             ids = [ids]
 
+        can_break = False
         for obj in self.browse(cr, uid, ids, context=context):
+            if can_break:
+                break
             for line in obj.order_line:
                 # log the message
                 if line.product_id.is_ssl:
                     # log the message
                     self.log(cr, uid, obj.id, _(SHORT_SHELF_LIFE_MESS))
+                    can_break = True
+                    break
 
-        return super(purchase_order, self).write(cr, uid, ids, vals, context=context)
+        return True
 
 purchase_order()