Merge lp:~unifield-team/unifield-server/us-749 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py'
--- bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2015-11-03 12:55:51 +0000
+++ bin/addons/msf_doc_import/wizard/wizard_in_simulation_screen.py	2016-03-18 10:42:44 +0000
@@ -887,13 +887,15 @@
 
 
             product = line.imp_product_id or line.move_product_id
-            res[line.id] = {'lot_check': product.batch_management,
-                            'exp_check': product.perishable,
-                            'kc_check': product.heat_sensitive_item and True or False,
-                            'dg_check': product.dangerous_goods,
-                            'np_check': product.narcotic,
-                            'move_price_unit': price_unit,
-                            'move_currency_id': curr_id, }
+            res[line.id] = {
+                'lot_check': product.batch_management,
+                'exp_check': product.perishable,
+                'kc_check': product.kc_txt,
+                'dg_check': product.dg_txt,
+                'np_check': product.cs_txt,
+                'move_price_unit': price_unit,
+                'move_currency_id': curr_id,
+            }
 
         return res
 
@@ -975,17 +977,59 @@
         'message_esc1': fields.char(size=256, string='Message ESC 1', readonly=True),
         'message_esc2': fields.char(size=256, string='Message ESC 2', readonly=True),
         # Computed fields
-        'lot_check': fields.function(_get_values, method=True, type='boolean',
-                                     string='B.Num', readonly=True, store=False, multi='computed'),
-        'exp_check': fields.function(_get_values, method=True, type='boolean',
-                                     string='Exp', readonly=True, store=False, multi='computed'),
-        'kc_check': fields.function(_get_values, method=True, type='boolean',
-                                     string='KC', readonly=True, store=False, multi='computed'),
-        'dg_check': fields.function(_get_values, method=True, type='boolean',
-                                     string='DG', readonly=True, store=False, multi='computed'),
-        'np_check': fields.function(_get_values, method=True, type='boolean',
-                                     string='NP', readonly=True, store=False, multi='computed'),
-        'integrity_status': fields.selection(string=' ', selection=INTEGRITY_STATUS_SELECTION, readonly=True),
+        'lot_check': fields.function(
+            _get_values,
+            method=True,
+            type='boolean',
+            string='B.Num',
+            readonly=True,
+            store=False,
+            multi='computed',
+        ),
+        'exp_check': fields.function(
+            _get_values,
+            method=True,
+            type='boolean',
+            string='Exp',
+            readonly=True,
+            store=False,
+            multi='computed',
+        ),
+        'kc_check': fields.function(
+            _get_values,
+            method=True,
+            type='char',
+            size=8,
+            string='KC',
+            readonly=True,
+            store=False,
+            multi='computed',
+        ),
+        'dg_check': fields.function(
+            _get_values,
+            method=True,
+            type='char',
+            size=8,
+            string='DG',
+            readonly=True,
+            store=False,
+            multi='computed',
+        ),
+        'np_check': fields.function(
+            _get_values,
+            method=True,
+            type='char',
+            size=8,
+            string='CS',
+            readonly=True,
+            store=False,
+            multi='computed',
+        ),
+        'integrity_status': fields.selection(
+            selection=INTEGRITY_STATUS_SELECTION,
+            string=' ',
+            readonly=True,
+        ),
     }
 
     _defaults = {

=== modified file 'bin/addons/msf_outgoing/msf_outgoing.py'
--- bin/addons/msf_outgoing/msf_outgoing.py	2016-03-14 10:07:38 +0000
+++ bin/addons/msf_outgoing/msf_outgoing.py	2016-03-18 10:42:44 +0000
@@ -2023,16 +2023,17 @@
         result = {}
 
         for stock_picking in self.read(cr, uid, ids, ['pack_family_memory_ids', 'move_lines'], context=context):
-            values = {'total_amount': 0.0,
-                      'currency_id': False,
-                      'is_dangerous_good': False,
-                      'is_keep_cool': False,
-                      'is_narcotic': False,
-                      'num_of_packs': 0,
-                      'total_volume': 0.0,
-                      'total_weight': 0.0,
-                      # 'is_completed': False,
-                      }
+            values = {
+                'total_amount': 0.0,
+                'currency_id': False,
+                'is_dangerous_good': '',
+                'is_keep_cool': '',
+                'is_narcotic': '',
+                'num_of_packs': 0,
+                'total_volume': 0.0,
+                'total_weight': 0.0,
+                # 'is_completed': False,
+            }
             result[stock_picking['id']] = values
 
             if stock_picking['pack_family_memory_ids']:
@@ -2057,11 +2058,11 @@
                     # currency
                     values['currency_id'] = move['currency_id'] or False
                     # dangerous good
-                    values['is_dangerous_good'] = move['is_dangerous_good']
+                    values['is_dangerous_good'] = values['is_dangerous_good'] or move['is_dangerous_good']
                     # keep cool - if heat_sensitive_item is True
-                    values['is_keep_cool'] = move['is_keep_cool']
+                    values['is_keep_cool'] = values['is_dangerous_good'] or move['is_keep_cool']
                     # narcotic
-                    values['is_narcotic'] = move['is_narcotic']
+                    values['is_narcotic'] = values['is_dangerous_good'] or move['is_narcotic']
 
             # completed field - based on the previous_step_ids field, recursive call from picking to draft packing and packing
             # - picking checks that the corresponding ppl is completed
@@ -2244,9 +2245,9 @@
                 'total_weight': fields.function(_vals_get, method=True, type='float', string='Total Weight[kg]', multi='get_vals'),
                 'total_amount': fields.function(_vals_get, method=True, type='float', string='Total Amount', digits_compute=dp.get_precision('Picking Price'), multi='get_vals'),
                 'currency_id': fields.function(_vals_get, method=True, type='many2one', relation='res.currency', string='Currency', multi='get_vals'),
-                'is_dangerous_good': fields.function(_vals_get, method=True, type='boolean', string='Dangerous Good', multi='get_vals'),
-                'is_keep_cool': fields.function(_vals_get, method=True, type='boolean', string='Keep Cool', multi='get_vals'),
-                'is_narcotic': fields.function(_vals_get, method=True, type='boolean', string='Narcotic', multi='get_vals'),
+                'is_dangerous_good': fields.function(_vals_get, method=True, type='char', size=8, string='Dangerous Good', multi='get_vals'),
+                'is_keep_cool': fields.function(_vals_get, method=True, type='char', size=8, string='Keep Cool', multi='get_vals'),
+                'is_narcotic': fields.function(_vals_get, method=True, type='char', size=8, string='CS', multi='get_vals'),
                 'overall_qty': fields.function(_get_overall_qty, method=True, fnct_search=_qty_search, type='float', string='Overall Qty',
                                     store={'stock.move': (_get_picking_ids, ['product_qty', 'picking_id'], 10), }),
                 'line_state': fields.function(_get_lines_state, method=True, type='selection',
@@ -4462,34 +4463,6 @@
 wizard()
 
 
-class product_product(osv.osv):
-    '''
-    add a getter for keep cool notion
-    '''
-    _inherit = 'product.product'
-
-    def _vals_get(self, cr, uid, ids, fields, arg, context=None):
-        '''
-        get functional values
-        '''
-        result = {}
-        for product in self.browse(cr, uid, ids, context=context):
-            values = {'is_keep_cool': False,
-                      }
-            result[product.id] = values
-            # keep cool
-            is_keep_cool = bool(product.heat_sensitive_item)  # in ('*', '**', '***',)
-            values['is_keep_cool'] = is_keep_cool
-
-        return result
-
-    _columns = {'is_keep_cool': fields.function(_vals_get, method=True, type='boolean', string='Keep Cool', multi='get_vals',),
-                'prodlot_ids': fields.one2many('stock.production.lot', 'product_id', string='Batch Numbers',),
-                }
-
-product_product()
-
-
 class stock_move(osv.osv):
     '''
     stock move
@@ -4524,9 +4497,9 @@
                       'amount': 0.0,
                       'currency_id': False,
                       'num_of_packs': 0,
-                      'is_dangerous_good': False,
-                      'is_keep_cool': False,
-                      'is_narcotic': False,
+                      'is_dangerous_good': '',
+                      'is_keep_cool': '',
+                      'is_narcotic': '',
                       'sale_order_line_number': 0,
                       }
             result[move.id] = values
@@ -4555,11 +4528,11 @@
             # currency
             values['currency_id'] = move.sale_line_id and move.sale_line_id.currency_id and move.sale_line_id.currency_id.id or False
             # dangerous good
-            values['is_dangerous_good'] = move.product_id and move.product_id.dangerous_goods or False
+            values['is_dangerous_good'] = move.product_id and move.product_id.dg_txt or ''
             # keep cool - if heat_sensitive_item is True
-            values['is_keep_cool'] = bool(move.product_id and move.product_id.heat_sensitive_item or False)
+            values['is_keep_cool'] = move.product_id and move.product_id.kc_txt or ''
             # narcotic
-            values['is_narcotic'] = move.product_id and move.product_id.narcotic or False
+            values['is_narcotic'] = move.product_id and move.product_id.cs_txt or ''
             # sale_order_line_number
             values['sale_order_line_number'] = move.sale_line_id and move.sale_line_id.line_number or 0
 
@@ -4624,9 +4597,9 @@
                 'amount': fields.function(_vals_get, method=True, type='float', string='Pack Amount', digits_compute=dp.get_precision('Picking Price'), multi='get_vals',),
                 'num_of_packs': fields.function(_vals_get, method=True, type='integer', string='#Packs', multi='get_vals_X',),  # old_multi get_vals
                 'currency_id': fields.function(_vals_get, method=True, type='many2one', relation='res.currency', string='Currency', multi='get_vals',),
-                'is_dangerous_good': fields.function(_vals_get, method=True, type='boolean', string='Dangerous Good', multi='get_vals',),
-                'is_keep_cool': fields.function(_vals_get, method=True, type='boolean', string='Keep Cool', multi='get_vals',),
-                'is_narcotic': fields.function(_vals_get, method=True, type='boolean', string='Narcotic', multi='get_vals',),
+                'is_dangerous_good': fields.function(_vals_get, method=True, type='char', size=8, string='Dangerous Good', multi='get_vals',),
+                'is_keep_cool': fields.function(_vals_get, method=True, type='char', size=8, string='Keep Cool', multi='get_vals',),
+                'is_narcotic': fields.function(_vals_get, method=True, type='char', size=8, string='CS', multi='get_vals',),
                 'sale_order_line_number': fields.function(_vals_get, method=True, type='integer', string='Sale Order Line Number', multi='get_vals_X',),  # old_multi get_vals
                 # Fields used for domain
                 'location_virtual_id': fields.many2one('stock.location', string='Virtual location'),

=== modified file 'bin/addons/msf_outgoing/report/empty_picking_ticket.rml'
--- bin/addons/msf_outgoing/report/empty_picking_ticket.rml	2016-01-27 16:20:09 +0000
+++ bin/addons/msf_outgoing/report/empty_picking_ticket.rml	2016-03-18 10:42:44 +0000
@@ -371,13 +371,13 @@
                         <para style="LineValue">[[ m.prodlot_id and formatLang(m.prodlot_id.life_date, date=True) or '' ]]</para>
                     </td>
                     <td>
-                        <para style="LineValue">[[ m.kc_check and 'X' or ' ' ]]</para>
-                    </td>
-                    <td>
-                        <para style="LineValue">[[ m.dg_check and 'X' or ' ' ]]</para>
-                    </td>
-                    <td>
-                        <para style="LineValue">[[ m.np_check and 'X' or ' ' ]]</para>
+                        <para style="LineValue">[[ m.product_id.kc_txt or ' ' ]]</para>
+                    </td>
+                    <td>
+                        <para style="LineValue">[[ m.product_id.dg_txt or ' ' ]]</para>
+                    </td>
+                    <td>
+                        <para style="LineValue">[[ m.product_id.cs_txt or ' ' ]]</para>
                     </td>
                     <td>
                         <para style="LineValueGrey">[[ not m.no_product and removeParentNode('para') ]]</para>

=== modified file 'bin/addons/msf_outgoing/report/labels.rml'
--- bin/addons/msf_outgoing/report/labels.rml	2014-04-10 13:15:01 +0000
+++ bin/addons/msf_outgoing/report/labels.rml	2016-03-18 10:42:44 +0000
@@ -147,7 +147,7 @@
               <para style="P4">[[ stock_picking.ppl_customize_label.specific_information and translate('Specific Information:') or ' ' ]]</para>
             </td>
             <td>
-              <para style="P2">[[ stock_picking.ppl_customize_label.specific_information and stock_picking.is_keep_cool and translate('KC / ') or ' ' ]][[ stock_picking.ppl_customize_label.specific_information and stock_picking.is_dangerous_good and translate('DG / ') or ' ' ]][[ stock_picking.ppl_customize_label.specific_information and stock_picking.is_narcotic and translate('N') or ' ' ]]</para>
+              <para style="P2">[[ stock_picking.ppl_customize_label.specific_information and stock_picking.is_keep_cool and translate('KC / ') or ' ' ]][[ stock_picking.ppl_customize_label.specific_information and stock_picking.is_dangerous_good and translate('DG / ') or ' ' ]][[ stock_picking.ppl_customize_label.specific_information and stock_picking.is_narcotic and translate('CS') or ' ' ]]</para>
             </td>
           </tr>
         </blockTable>

=== modified file 'bin/addons/msf_outgoing/report/packing_list.rml'
--- bin/addons/msf_outgoing/report/packing_list.rml	2015-10-26 09:46:59 +0000
+++ bin/addons/msf_outgoing/report/packing_list.rml	2016-03-18 10:42:44 +0000
@@ -264,13 +264,13 @@
                                 <para style="ParcelLineValue">[[ formatLang(m.prodlot_id.life_date, date=True) ]]</para>
                             </td>
                             <td>
-                                <para style="ParcelLineValue">[[ m.kc_check and 'X' or ' ' ]]</para>
-                            </td>
-                            <td>
-                                <para style="ParcelLineValue">[[ m.dg_check and 'X' or ' ' ]]</para>
-                            </td>
-                            <td>
-                                <para style="ParcelLineValue">[[ m.np_check and 'X' or ' ' ]]</para>
+                                <para style="ParcelLineValue">[[ m.product_id.kc_txt or ' ' ]]</para>
+                            </td>
+                            <td>
+                                <para style="ParcelLineValue">[[ m.product_id.dg_txt or ' ' ]]</para>
+                            </td>
+                            <td>
+                                <para style="ParcelLineValue">[[ m.product_id.cs_txt or ' ' ]]</para>
                             </td>
                             <td>
                                 <para style="ParcelLineValue"></para>

=== modified file 'bin/addons/msf_outgoing/report/packing_list_xls.mako'
--- bin/addons/msf_outgoing/report/packing_list_xls.mako	2015-07-24 10:07:46 +0000
+++ bin/addons/msf_outgoing/report/packing_list_xls.mako	2016-03-18 10:42:44 +0000
@@ -449,9 +449,9 @@
        % else:
        <Cell ss:StyleID="s134"><Data ss:Type="String"></Data></Cell>
        % endif
-       <Cell ss:StyleID="s134"><Data ss:Type="String">${(m.kc_check and 'X' or '')|x}</Data></Cell>
-       <Cell ss:StyleID="s134"><Data ss:Type="String">${(m.dg_check and 'X' or '')|x}</Data></Cell>
-       <Cell ss:StyleID="s134"><Data ss:Type="String">${(m.np_check and 'X' or '')|x}</Data></Cell>
+       <Cell ss:StyleID="s134"><Data ss:Type="String">${(m.product_id.kc_txt or '')|x}</Data></Cell>
+       <Cell ss:StyleID="s134"><Data ss:Type="String">${(m.product_id.dg_txt or '')|x}</Data></Cell>
+       <Cell ss:StyleID="s134"><Data ss:Type="String">${(m.product_id.cs_txt or '')|x}</Data></Cell>
   </Row>
   % endfor
   <Row></Row>

=== modified file 'bin/addons/msf_outgoing/report/picking_ticket.py'
--- bin/addons/msf_outgoing/report/picking_ticket.py	2016-01-20 13:03:09 +0000
+++ bin/addons/msf_outgoing/report/picking_ticket.py	2016-03-18 10:42:44 +0000
@@ -143,9 +143,9 @@
             bm.product_uom = m.product_uom
             bm.product_qty = m.product_qty
             bm.prodlot_id = m.prodlot_id
-            bm.kc_check = m.kc_check
-            bm.dg_check = m.dg_check
-            bm.np_check = m.np_check
+            bm.kc_check = m.product_id and m.product_id.is_kc or False
+            bm.dg_check = m.product_id and m.product_id.is_dg or False
+            bm.np_check = m.product_id and m.product_id.is_cs or False
             if m.prodlot_id and dict_res[m.line_number]:
                 bm.no_product = True
                 dict_res[m.line_number][0].product_qty += pool.get('product.uom')._compute_qty(

=== modified file 'bin/addons/msf_outgoing/report/picking_ticket.rml'
--- bin/addons/msf_outgoing/report/picking_ticket.rml	2016-01-14 15:39:28 +0000
+++ bin/addons/msf_outgoing/report/picking_ticket.rml	2016-03-18 10:42:44 +0000
@@ -399,13 +399,13 @@
                         <para style="LineValue">[[ m.prodlot_id and formatLang(m.prodlot_id.life_date, date=True) or '' ]]</para>
                     </td>
                     <td>
-                        <para style="LineValue">[[ m.kc_check and 'X' or ' ' ]]</para>
-                    </td>
-                    <td>
-                        <para style="LineValue">[[ m.dg_check and 'X' or ' ' ]]</para>
-                    </td>
-                    <td>
-                        <para style="LineValue">[[ m.np_check and 'X' or ' ' ]]</para>
+                        <para style="LineValue">[[ m.product_id.kc_txt or ' ' ]]</para>
+                    </td>
+                    <td>
+                        <para style="LineValue">[[ m.product_id.dg_txt or ' ' ]]</para>
+                    </td>
+                    <td>
+                        <para style="LineValue">[[ m.product_id.cs_txt or ' ' ]]</para>
                     </td>
                 </tr>
                 <tr>

=== modified file 'bin/addons/msf_outgoing/wizard/create_picking_processor.py'
--- bin/addons/msf_outgoing/wizard/create_picking_processor.py	2014-07-22 12:11:45 +0000
+++ bin/addons/msf_outgoing/wizard/create_picking_processor.py	2016-03-18 10:42:44 +0000
@@ -235,7 +235,8 @@
             _get_product_info,
             method=True,
             string='KC',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'create.picking.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -247,7 +248,8 @@
             _get_product_info,
             method=True,
             string='SSL',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'create.picking.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -259,7 +261,8 @@
             _get_product_info,
             method=True,
             string='DG',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'create.picking.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -270,14 +273,15 @@
         'np_check': fields.function(
             _get_product_info,
             method=True,
-            string='NP',
-            type='boolean',
+            string='CS',
+            type='char',
+            size=8,
             store={
                 'create.picking.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
             readonly=True,
             multi='product_info',
-            help="Ticked if the product is a Narcotic",
+            help="Ticked if the product is a Controlled Substance",
         ),
     }
 

=== modified file 'bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py'
--- bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2015-11-16 08:28:07 +0000
+++ bin/addons/msf_outgoing/wizard/incoming_shipment_processor.py	2016-03-18 10:42:44 +0000
@@ -656,7 +656,8 @@
             _get_product_info,
             method=True,
             string='KC',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'stock.move.in.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -668,7 +669,8 @@
             _get_product_info,
             method=True,
             string='SSL',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'stock.move.in.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -680,7 +682,8 @@
             _get_product_info,
             method=True,
             string='DG',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'stock.move.in.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -691,14 +694,15 @@
         'np_check': fields.function(
             _get_product_info,
             method=True,
-            string='NP',
-            type='boolean',
+            string='CS',
+            type='char',
+            size=8,
             store={
                 'stock.move.in.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
             readonly=True,
             multi='product_info',
-            help="Ticked if the product is a Narcotic",
+            help="Ticked if the product is a Controlled Substance",
         ),
     }
 

=== modified file 'bin/addons/msf_outgoing/wizard/internal_move_processor.py'
--- bin/addons/msf_outgoing/wizard/internal_move_processor.py	2014-09-19 12:34:58 +0000
+++ bin/addons/msf_outgoing/wizard/internal_move_processor.py	2016-03-18 10:42:44 +0000
@@ -534,7 +534,8 @@
             _get_product_info,
             method=True,
             string='KC',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'internal.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -546,7 +547,8 @@
             _get_product_info,
             method=True,
             string='SSL',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'internal.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -558,7 +560,8 @@
             _get_product_info,
             method=True,
             string='DG',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'internal.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -569,14 +572,15 @@
         'np_check': fields.function(
             _get_product_info,
             method=True,
-            string='NP',
-            type='boolean',
+            sstring='CS',
+            type='char',
+            size=8,
             store={
                 'internal.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
             readonly=True,
             multi='product_info',
-            help="Ticked if the product is a Narcotic",
+            help="Ticked if the product is a Controlled Substance",
         ),
     }
 

=== modified file 'bin/addons/msf_outgoing/wizard/outgoing_delivery_processor.py'
--- bin/addons/msf_outgoing/wizard/outgoing_delivery_processor.py	2014-03-05 10:32:45 +0000
+++ bin/addons/msf_outgoing/wizard/outgoing_delivery_processor.py	2016-03-18 10:42:44 +0000
@@ -322,7 +322,8 @@
             _get_product_info,
             method=True,
             string='KC',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'outgoing.delivery.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -334,7 +335,8 @@
             _get_product_info,
             method=True,
             string='SSL',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'outgoing.delivery.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -346,7 +348,8 @@
             _get_product_info,
             method=True,
             string='DG',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'outgoing.delivery.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -357,14 +360,15 @@
         'np_check': fields.function(
             _get_product_info,
             method=True,
-            string='NP',
-            type='boolean',
+            string='CS',
+            type='char',
+            size=8,
             store={
                 'outgoing.delivery.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
             readonly=True,
             multi='product_info',
-            help="Ticked if the product is a Narcotic",
+            help="Ticked if the product is a Controlled Substance",
         ),
     }
 

=== modified file 'bin/addons/msf_outgoing/wizard/picking_processor.py'
--- bin/addons/msf_outgoing/wizard/picking_processor.py	2016-03-02 15:57:47 +0000
+++ bin/addons/msf_outgoing/wizard/picking_processor.py	2016-03-18 10:42:44 +0000
@@ -58,11 +58,17 @@
                 'contains_dg': False,
             }
             # KC
-            kc_lines = line_obj.search(cr, uid, [('wizard_id', '=', wizard_id), ('kc_check', '=', True)], context=context)
+            kc_lines = line_obj.search(cr, uid, [
+                ('wizard_id', '=', wizard_id),
+                ('kc_check', '!=', ''),
+            ], limit=1, order='NO_ORDER', context=context)
             if kc_lines:
                 res[wizard_id]['contains_kc'] = True
             # DG
-            dg_lines = line_obj.search(cr, uid, [('wizard_id', '=', wizard_id), ('dg_check', '=', True)], context=context)
+            dg_lines = line_obj.search(cr, uid, [
+                ('wizard_id', '=', wizard_id),
+                ('dg_check', '!=', ''),
+            ], limit=1, order='NO_ORDER', context=context)
             if dg_lines:
                 res[wizard_id]['contains_dg'] = True
 
@@ -284,10 +290,10 @@
                 'exp_check': False,
                 'asset_check': False,
                 'kit_check': False,
-                'kc_check': False,
-                'ssl_check': False,
-                'dg_check': False,
-                'np_check': False,
+                'kc_check': '',
+                'ssl_check': '',
+                'dg_check': '',
+                'np_check': '',
             }
 
             if line.product_id:
@@ -296,10 +302,10 @@
                     'exp_check': line.product_id.perishable,
                     'asset_check': line.product_id.type == 'product' and line.product_id.subtype == 'asset',
                     'kit_check': line.product_id.type == 'product' and line.product_id.subtype == 'kit' and not line.product_id.perishable,
-                    'kc_check': line.product_id.heat_sensitive_item and True or False,
-                    'ssl_check': line.product_id.short_shelf_life,
-                    'dg_check': line.product_id.dangerous_goods,
-                    'np_check': line.product_id.narcotic,
+                    'kc_check': line.product_id.kc_txt,
+                    'ssl_check': line.product_id.ssl_txt,
+                    'dg_check': line.product_id.dg_txt,
+                    'np_check': line.product_id.cs_txt,
                 }
 
         return res
@@ -576,7 +582,8 @@
             _get_product_info,
             method=True,
             string='KC',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'stock.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -588,7 +595,8 @@
             _get_product_info,
             method=True,
             string='SSL',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'stock.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -600,7 +608,8 @@
             _get_product_info,
             method=True,
             string='DG',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'stock.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -611,14 +620,15 @@
         'np_check': fields.function(
             _get_product_info,
             method=True,
-            string='NP',
-            type='boolean',
+            string='CS',
+            type='char',
+            size=8,
             store={
                 'stock.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
             readonly=True,
             multi='product_info',
-            help="Ticked if the product is a Narcotic",
+            help="Ticked if the product is a Controlled Substance",
         ),
         'prodlot_id': fields.many2one(
             'stock.production.lot',

=== modified file 'bin/addons/msf_outgoing/wizard/ppl_processor.py'
--- bin/addons/msf_outgoing/wizard/ppl_processor.py	2015-08-27 08:44:05 +0000
+++ bin/addons/msf_outgoing/wizard/ppl_processor.py	2016-03-18 10:42:44 +0000
@@ -554,7 +554,8 @@
             _get_product_info,
             method=True,
             string='KC',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'ppl.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -566,7 +567,8 @@
             _get_product_info,
             method=True,
             string='SSL',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'ppl.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -578,7 +580,8 @@
             _get_product_info,
             method=True,
             string='DG',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'ppl.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -589,14 +592,15 @@
         'np_check': fields.function(
             _get_product_info,
             method=True,
-            string='NP',
-            type='boolean',
+            string='CS',
+            type='char',
+            size=8,
             store={
                 'ppl.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
             readonly=True,
             multi='product_info',
-            help="Ticked if the product is a Narcotic",
+            help="Ticked if the product is a Controlled Substance",
         ),
     }
 

=== modified file 'bin/addons/msf_outgoing/wizard/return_ppl_processor.py'
--- bin/addons/msf_outgoing/wizard/return_ppl_processor.py	2014-03-05 16:51:14 +0000
+++ bin/addons/msf_outgoing/wizard/return_ppl_processor.py	2016-03-18 10:42:44 +0000
@@ -258,7 +258,8 @@
             _get_product_info,
             method=True,
             string='KC',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'return.ppl.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -270,7 +271,8 @@
             _get_product_info,
             method=True,
             string='SSL',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'return.ppl.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -282,7 +284,8 @@
             _get_product_info,
             method=True,
             string='DG',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'return.ppl.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -293,14 +296,15 @@
         'np_check': fields.function(
             _get_product_info,
             method=True,
-            string='NP',
-            type='boolean',
+            string='CS',
+            type='char',
+            size=8,
             store={
                 'return.ppl.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
             readonly=True,
             multi='product_info',
-            help="Ticked if the product is a Narcotic",
+            help="Ticked if the product is a Controlled Substance",
         ),
     }
 

=== modified file 'bin/addons/msf_outgoing/wizard/validate_picking_processor.py'
--- bin/addons/msf_outgoing/wizard/validate_picking_processor.py	2014-03-05 16:51:14 +0000
+++ bin/addons/msf_outgoing/wizard/validate_picking_processor.py	2016-03-18 10:42:44 +0000
@@ -329,7 +329,8 @@
             _get_product_info,
             method=True,
             string='KC',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'validate.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -341,7 +342,8 @@
             _get_product_info,
             method=True,
             string='SSL',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'validate.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -353,7 +355,8 @@
             _get_product_info,
             method=True,
             string='DG',
-            type='boolean',
+            type='char',
+            size=8,
             store={
                 'validate.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
@@ -364,14 +367,15 @@
         'np_check': fields.function(
             _get_product_info,
             method=True,
-            string='NP',
-            type='boolean',
+            string='CS',
+            type='char',
+            size=8,
             store={
                 'validate.move.processor': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 20),
             },
             readonly=True,
             multi='product_info',
-            help="Ticked if the product is a Narcotic",
+            help="Ticked if the product is a Controlled Substance",
         ),
     }
 

=== modified file 'bin/addons/msf_printed_documents/report/freight_manifest.py'
--- bin/addons/msf_printed_documents/report/freight_manifest.py	2015-10-26 09:42:39 +0000
+++ bin/addons/msf_printed_documents/report/freight_manifest.py	2016-03-18 10:42:44 +0000
@@ -95,11 +95,11 @@
             np = ""
             for x in line.move_lines:
                 if x.kc_check:
-                    kc = 'X'
+                    kc = x.kc_check
                 if x.dg_check:
-                    dg = 'X'
+                    dg = x.dg_check
                 if x.np_check:
-                    np = 'X'
+                    np = x.np_check
 
             if line_ref not in line_obj:
                 line_obj[line_ref] = {}

=== modified file 'bin/addons/msf_printed_documents/report/report_reception.py'
--- bin/addons/msf_printed_documents/report/report_reception.py	2015-05-22 08:34:02 +0000
+++ bin/addons/msf_printed_documents/report/report_reception.py	2016-03-18 10:42:44 +0000
@@ -180,8 +180,10 @@
             'ed': 'exp_check',
         }
 
-        if opt in options and hasattr(line, options[opt]) and getattr(line, options[opt]) == True:
+        if opt in options and hasattr(line, options[opt]) and getattr(line, options[opt]) is True:
             return 'X'
+        elif opt in options and hasattr(line, options[opt]):
+            return getattr(line, options[opt])
 
         return ' '
 

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2016-03-11 15:55:20 +0000
+++ bin/addons/msf_profile/data/patches.xml	2016-03-18 10:42:44 +0000
@@ -5,8 +5,59 @@
             <field name="method">update_us_963_negative_rule_seq</field>
         </record>
 
+<<<<<<< TREE
         <record id="another_translation_fix" model="patch.scripts">
             <field name="method">another_translation_fix</field>
+=======
+        <record id="us_133_patch" model="patch.scripts">
+            <field name="method">update_us_133</field>
+        </record>
+        <record id="us_489_patch" model="patch.scripts">
+            <field name="method">update_parent_budget_us_489</field>
+        </record>
+        <record id="us_435_patch_2" model="patch.scripts">
+            <field name="method">update_us_435_2</field>
+        </record>
+
+        <record id="us_394_2_patch" model="patch.scripts">
+            <field name="method">us_394_2_patch</field>
+        </record>
+
+        <record id="us_394_3_patch" model="patch.scripts">
+            <field name="method">us_394_3_patch</field>
+        </record>
+
+        <record id="us_651_patch" model="patch.scripts">
+            <field name="method">disable_crondoall</field>
+        </record>
+
+        <record id="us_332_patch" model="patch.scripts">
+            <field name="method">us_332_patch</field>
+        </record>
+
+        <record id="us_898_patch" model="patch.scripts">
+            <field name="method">us_898_patch</field>
+        </record>
+
+        <record id="us_822_patch" model="patch.scripts">
+            <field name="method">us_822_patch</field>
+        </record>
+
+        <record id="us_908_patch" model="patch.scripts">
+            <field name="method">us_908_patch</field>
+        </record>
+
+        <record id="us_750_patch" model="patch.scripts">
+            <field name="method">us_750_patch</field>
+        </record>
+
+        <record id="bar_action_patch" model="patch.scripts">
+            <field name="method">bar_action_patch</field>
+>>>>>>> MERGE-SOURCE
+        </record>
+
+        <record id="update_volume_patch" model="patch.scripts">
+            <field name="method">update_volume_patch</field>
         </record>
 
     </data>

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2016-03-11 15:55:20 +0000
+++ bin/addons/msf_profile/msf_profile.py	2016-03-18 10:42:44 +0000
@@ -305,6 +305,57 @@
         for view in view_to_gen:
             view_obj.generate_button_access_rules(cr, uid, view)
 
+    def update_volume_patch(self, cr, uid, *a, **b):
+        """
+        Update the volume from dm³ to m³ for OCB databases
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param a: Unnamed parameters
+        :param b: Named parameters
+        :return: True
+        """
+        instance = self.pool.get('res.users').browse(cr, uid, uid).company_id.instance_id
+        while instance.level != 'section':
+            instance = instance.parent_id
+
+        if instance.name != 'OCBHQ':
+            cr.execute("""
+                UPDATE product_template
+                SET volume_updated = True
+                WHERE volume_updated = False
+            """)
+        else:
+            cr.execute("""
+                UPDATE product_template
+                SET volume = volume*1000,
+                    volume_updated = True
+                WHERE volume_updated = False
+            """)
+
+    def us_750_patch(self, cr, uid, *a, **b):
+        """
+        Update the heat_sensitive_item field of product.product
+        to 'Yes' if there is a value already defined by de-activated.
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param a: Non-named parameters
+        :param b: Named parameters
+        :return: True
+        """
+        prd_obj = self.pool.get('product.product')
+        phs_obj = self.pool.get('product.heat_sensitive')
+        data_obj = self.pool.get('ir.model.data')
+
+        heat_id = data_obj.get_object_reference(cr, uid, 'product_attributes', 'heat_yes')[1]
+
+        phs_ids = phs_obj.search(cr, uid, [('active', '=', False)])
+        prd_ids = prd_obj.search(cr, uid, [('heat_sensitive_item', 'in', phs_ids)])
+        if prd_ids:
+            prd_obj.write(cr, uid, prd_ids, {
+                'heat_sensitive_item': heat_id,
+            })
+
+        return True
 
     def update_us_963_negative_rule_seq(self, cr, uid, *a, **b):
         if self.pool.get('sync.client.update_received'):

=== modified file 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2016-01-25 14:13:18 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2016-03-18 10:42:44 +0000
@@ -107,8 +107,8 @@
 msf_sync_data_server.price_list_version,FALSE,TRUE,FALSE,FALSE,bidirectional,Bidirectional,[],"['active', 'date_end', 'date_start', 'name', 'pricelist_id/id']",MISSION,product.pricelist.version,,Price List Version,Valid,,561
 msf_sync_data_server.country_restrictions,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],['name'],MISSION,res.country.restriction,,Country restrictions,Valid,,570
 msf_sync_data_server.country_code_mapping,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['instance_id/id', 'mapping_value']",COORDINATIONS,country.export.mapping,,Country Code Mapping,Valid,,571
-msf_sync_data_server.oc_product_creator_itc_esc_hq,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|','|',('international_status','=','ITC'),('international_status','=','ESC'),('international_status','=','HQ')]","['alert_time', 'batch_management', 'categ_id/id', 'closed_article', 'code', 'cold_chain', 'composed_kit', 'xmlid_code', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item', 'international_status', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'narcotic', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'asset_type_id', 'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'state', 'old_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume', 'soq_weight', 'soq_volume']",OC,product.product,,"OC Product (Creator = ITC, ESC or HQ)",Valid,,600
-msf_sync_data_server.mission_product_creator_local,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('international_status','=','Local')]","['alert_time', 'batch_management', 'categ_id/id', 'closed_article', 'code', 'xmlid_code','cold_chain', 'composed_kit', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item', 'international_status', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'narcotic', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'asset_type_id',  'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'state', 'old_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume','soq_weight','soq_volume']",MISSION,product.product,,Mission Product (Creator = local),Valid,,601
+msf_sync_data_server.oc_product_creator_itc_esc_hq,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|','|',('international_status','=','ITC'),('international_status','=','ESC'),('international_status','=','HQ')]","['alert_time', 'batch_management', 'categ_id/id', 'closed_article', 'manufacturer_txt', 'manufacturer_ref', 'code', 'cold_chain', 'composed_kit', 'xmlid_code', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item', 'international_status', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'asset_type_id', 'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'active', 'state', 'old_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume', 'volume_updated', 'soq_weight', 'soq_volume']",OC,product.product,,"OC Product (Creator = ITC, ESC or HQ)",Valid,,600
+msf_sync_data_server.mission_product_creator_local,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('international_status','=','Local')]","['alert_time', 'batch_management', 'categ_id/id', 'closed_article', 'manufacturer_txt', 'manufacturer_ref', 'code', 'xmlid_code','cold_chain', 'composed_kit', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item', 'international_status', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'asset_type_id',  'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'active', 'state', 'old_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume', 'volume_updated', 'soq_weight','soq_volume']",MISSION,product.product,,Mission Product (Creator = local),Valid,,601
 msf_sync_data_server.standard_product_list,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('standard_list_ok','=','True')]","['creation_date', 'creator', 'description', 'last_update_date', 'name', 'order_list_print_ok', 'ref', 'standard_list_ok', 'type']",OC,product.list,,Standard Product List,Valid,,605
 msf_sync_data_server.standard_product_list_line,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('list_id' , 'in', ('product.list', 'id', [('standard_list_ok','=','True')]))]","['comment','list_id/id','ref','name']",OC,product.list.line,,Standard Product List Line,Valid,,606
 msf_sync_data_server.tax_code,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['code', 'info', 'name', 'notprintable', 'sign']",OC,account.tax.code,,Tax Code,Valid,,610
@@ -199,7 +199,15 @@
 msf_usb_sync_data_server.cp_all_partners_address,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['active', 'city', 'country_id/id', 'email', 'fax', 'function', 'mobile', 'name', 'partner_id/id', 'phone', 'state_id/id', 'street', 'street2', 'title/id', 'type', 'zip']",USB,res.partner.address,,[MASTER] Partner Address,Valid,,1662
 msf_usb_sync_data_server.cp_product_price_list,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['active', 'company_id/id', 'currency_id/id', 'currency_name', 'name', 'type']",USB,product.pricelist,,[MASTER] Product_price_list,Valid,,1670
 msf_usb_sync_data_server.cp_country_restrictions,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],['name'],USB,res.country.restriction,,[MASTER] Country restrictions,Valid,,1680
-msf_usb_sync_data_server.cp_all_product,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['alert_time', 'batch_management', 'asset_type_id', 'categ_id/id', 'closed_article', 'code', 'cold_chain', 'composed_kit', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item', 'international_status', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'narcotic', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'xmlid_code', 'state', 'old_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume','soq_weight','soq_volume']",USB,product.product,,[MASTER] Products,Valid,,1810
+<<<<<<< TREE
+<<<<<<< TREE
+msf_usb_sync_data_server.cp_all_product,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['alert_time', 'batch_management', 'asset_type_id', 'categ_id/id', 'closed_article','manufacturer_txt', 'manufacturer_ref','code', 'cold_chain', 'composed_kit', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item', 'international_status', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'narcotic', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'xmlid_code', 'active', 'state', 'old_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume','soq_weight','soq_volume']",USB,product.product,,[MASTER] Products,Valid,,1810
+=======
+msf_usb_sync_data_server.cp_all_product,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['alert_time', 'batch_management', 'asset_type_id', 'categ_id/id', 'closed_article', 'code', 'cold_chain', 'composed_kit', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item', 'international_status', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'narcotic', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'xmlid_code', 'state', 'old_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume', 'volume_updated', 'soq_weight','soq_volume']",USB,product.product,,[MASTER] Products,Valid,,1810
+>>>>>>> MERGE-SOURCE
+=======
+msf_usb_sync_data_server.cp_all_product,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['alert_time', 'batch_management', 'asset_type_id', 'categ_id/id', 'closed_article', 'code', 'cold_chain', 'composed_kit', 'cost_method', 'country_restriction/id', 'dangerous_goods', 'default_code', 'description', 'description2', 'description_purchase', 'description_sale', 'gmdn_code', 'gmdn_description', 'heat_sensitive_item', 'international_status', 'justification_code_id/id', 'library', 'life_time', 'list_ids/id','med_device_class', 'name', 'name_template', 'controlled_substance', 'nomen_manda_0/id', 'nomen_manda_1/id', 'nomen_manda_2/id', 'nomen_manda_3/id', 'options_ids/id', 'perishable', 'procure_delay', 'procure_method', 'produce_delay', 'product_catalog_page', 'product_catalog_path', 'property_account_expense/id', 'property_account_income/id', 'property_stock_account_input/id', 'property_stock_account_output/id', 'restricted_country', 'short_shelf_life', 'single_use', 'sterilized', 'standard_price', 'sublist', 'subtype', 'supply_method', 'type', 'un_code', 'uom_id/id', 'uom_po_id/id','use_time', 'valuation', 'weight', 'weight_net', 'xmlid_code', 'state', 'old_code', 'function_value', 'form_value', 'fit_value', 'standard_ok','transport_ok','volume','soq_weight','soq_volume']",USB,product.product,,[MASTER] Products,Valid,,1810
+>>>>>>> MERGE-SOURCE
 msf_usb_sync_data_server.cp_standard_product_list,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,"[('standard_list_ok','=','True')]","['creation_date', 'creator', 'description', 'last_update_date', 'name', 'order_list_print_ok', 'ref', 'standard_list_ok', 'type']",USB,product.list,,[MASTER] Standard Product List,Valid,,1820
 msf_usb_sync_data_server.cp_standard_product_list_line,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,"[('list_id' , 'in', ('product.list', 'id', [('standard_list_ok','=','True')]))]","['comment','list_id/id','ref','name/id']",USB,product.list.line,,[MASTER] Standard Product List Line,Valid,,1821
 msf_usb_sync_data_server.cp_composition_kit,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,"[('state','=','completed'),('composition_type','=','theoretical')]","['active', 'composition_creation_date', 'composition_description', 'composition_product_id/id', 'composition_type', 'composition_version', 'composition_version_txt', 'name', 'state']",USB,composition.kit,,[MASTER] Theoretical Kit Composition List,Valid,,1830

=== modified file 'bin/addons/product_attributes/data/product_justification_code.xml'
--- bin/addons/product_attributes/data/product_justification_code.xml	2012-10-30 12:00:35 +0000
+++ bin/addons/product_attributes/data/product_justification_code.xml	2016-03-18 10:42:44 +0000
@@ -1,59 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-    <data noupdate="1">
-        
+    <data noupdate="0">
+
         <record id="justification_code_ja" model="product.justification.code">
-            <field name="code">18 J(A)</field>
+            <field name="code">A</field>
             <field name="description">This kind of article need a more detailed description of the context in which it will be used.</field>
         </record>
+        <record id="justification_code_jc" model="product.justification.code">
+            <field name="code">C</field>
+            <field name="description">The article is potentially subject to important modifications (supply sources, better alternatives).</field>
+        </record>
         <record id="justification_code_je" model="product.justification.code">
-            <field name="code">21 J(E)</field>
+            <field name="code">E</field>
             <field name="description">The article is expensive and its choice should be justified in relation to cheaper alternatives.</field>
         </record>
         <record id="justification_code_jf" model="product.justification.code">
-            <field name="code">22 J(F)</field>
+            <field name="code">F</field>
             <field name="description">Monitor the use, efficacy for at least one year after the introduction of new drugs.</field>
         </record>
         <record id="justification_code_jm" model="product.justification.code">
-            <field name="code">23 J(M)</field>
+            <field name="code">M</field>
             <field name="description">The article may imply medical risks if misused by persons with insufficient training or knowledge.</field>
         </record>
         <record id="justification_code_jme" model="product.justification.code">
-            <field name="code">24 J(ME)</field>
+            <field name="code">ME</field>
             <field name="description">The article may imply medical risks if misused by persons with insufficient training, Expensive.</field>
         </record>
         <record id="justification_code_jmf" model="product.justification.code">
-            <field name="code">25 J(MF)</field>
+            <field name="code">MF</field>
             <field name="description">The article may imply medical risks if misused + Monitor the use, efficacy at least one year.</field>
         </record>
         <record id="justification_code_jo" model="product.justification.code">
-            <field name="code">27 J(O)</field>
+            <field name="code">O</field>
             <field name="description">The article and its specifications are obsolete or are no longer the international standard.</field>
         </record>
+        <record id="justification_code_jom" model="product.justification.code">
+            <field name="code">OM</field>
+            <field name="description">The article and its specifications are obsolete , it may imply a medical risk if misused.</field>
+        </record>
+        <record id="justification_code_jop" model="product.justification.code">
+            <field name="code">OP</field>
+            <field name="description">The article and its specifications are obsolete , it has to be used only in a specific program.</field>
+        </record>
         <record id="justification_code_jp" model="product.justification.code">
-            <field name="code">30 J(P)</field>
+            <field name="code">P</field>
             <field name="description">The article must be used only in a properly designed programme.</field>
         </record>
         <record id="justification_code_jpa" model="product.justification.code">
-            <field name="code">31 J(PA)</field>
+            <field name="code">PA</field>
             <field name="description">Article must be used only in a properly designed programme, need a more detailed description.</field>
         </record>
+        <record id="justification_code_jpcme" model="product.justification.code">
+            <field name="code">PCME</field>
+            <field name="description">????</field>
+        </record>
         <record id="justification_code_jpe" model="product.justification.code">
-            <field name="code">35 J(PE)</field>
+            <field name="code">PE</field>
             <field name="description">Article must be used only in a properly designed programme, Expensive, cheaper alternatives exist.</field>
         </record>
         <record id="justification_code_jpf" model="product.justification.code">
-            <field name="code">36 J(PF)</field>
+            <field name="code">PF</field>
             <field name="description">The article must be used only in a properly designed programme + monitor the use, efficacy.</field>
         </record>
         <record id="justification_code_jpm" model="product.justification.code">
-            <field name="code">37 J(PM)</field>
+            <field name="code">PM</field>
             <field name="description">Article must be used only in a properly designed programme, it may imply a medical risk if misused.</field>
         </record>
         <record id="justification_code_jpme" model="product.justification.code">
-            <field name="code">38 J(PME)</field>
+            <field name="code">PME</field>
             <field name="description">Article only for a properly designed Programme, it may imply a Medical risk if misused, Expensive.</field>
         </record>
+        <record id="justification_code_js" model="product.justification.code">
+            <field name="code">S</field>
+            <field name="description">Second choice. Article must only be used if the first choice is not available or cannot be used in a specific context.</field>
+        </record>
+        <record id="justification_code_jsm" model="product.justification.code">
+            <field name="code">SM</field>
+            <field name="description">Second choice &amp; medical risk. Article must be only used if the first choice is not available or cannot be used in a specific context. The article may imply medical risks if misused by persons with insufficient training or knowledge.</field>
+        </record>
+        <record id="justification_code_jsp" model="product.justification.code">
+            <field name="code">SP</field>
+            <field name="description">Second Choice &amp; specific programme. The article must only be used if the first choice</field>
+        </record>
         
     </data>
-</openerp>
\ No newline at end of file
+</openerp>

=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2016-01-25 10:53:51 +0000
+++ bin/addons/product_attributes/product_attributes.py	2016-03-18 10:42:44 +0000
@@ -103,9 +103,24 @@
 
 class product_heat_sensitive(osv.osv):
     _name = "product.heat_sensitive"
+    _order = 'code desc'
     _columns = {
-        'code': fields.char('Code', size=256),
-        'name': fields.char('Name', size=256, required=True),
+        'code': fields.char(
+            string='Code',
+            size=256,
+        ),
+        'name': fields.char(
+            string='Name',
+            size=256,
+            required=True,
+        ),
+        'active': fields.boolean(
+            string='Active',
+        )
+    }
+
+    _defaults = {
+        'active': True,
     }
 
     def unlink(self, cr, uid, ids, context=None):
@@ -113,11 +128,14 @@
             context = {}
         if isinstance(ids, (int, long)):
             ids = [ids]
-        ids_p = self.pool.get('product.product').search(cr, uid,
-                [('heat_sensitive_item','in',ids)],
-                limit=1, order='NO_ORDER')
+        ids_p = self.pool.get('product.product').search(cr, uid, [
+            ('heat_sensitive_item', 'in', ids),
+        ], limit=1, order='NO_ORDER')
         if ids_p:
-            raise osv.except_osv(_('Error'), _('You cannot delete this heat sensitive because it\'s used at least in one product'))
+            raise osv.except_osv(
+                _('Error'),
+                _('You cannot delete this heat sensitive because it\'s used at least in one product'),
+            )
         return super(product_heat_sensitive, self).unlink(cr, uid, ids, context=context)
 
 product_heat_sensitive()
@@ -206,6 +224,7 @@
 
 product_template()
 
+
 class product_attributes(osv.osv):
     _inherit = "product.product"
 
@@ -213,12 +232,36 @@
         if hasattr(super(product_attributes, self), 'init'):
             super(product_attributes, self).init(cr)
         mod_obj = self.pool.get('ir.module.module')
-        mode = mod_obj.search(cr, 1, [('name', '=', 'product_attributes'), ('state', '=', 'to install')]) and 'init' or 'update'
+        mode = mod_obj.search(cr, 1, [('name', '=', 'product_attributes')])
         logging.getLogger('init').info('HOOK: module product_attributes: loading product_attributes_data.xml')
         pathname = path.join('product_attributes', 'product_attributes_data.xml')
         file = tools.file_open(pathname)
         tools.convert_xml_import(cr, 'product_attributes', file, {}, mode=mode, noupdate=True)
 
+    def execute_migration(self, cr, moved_column, new_column):
+        super(product_attributes, self).execute_migration(cr, moved_column, new_column)
+        if new_column == 'standard_ok':
+            request = 'UPDATE product_product SET standard_ok = \'True\' WHERE %s = True' % moved_column
+            cr.execute(request)
+
+        if new_column == 'dangerous_goods':
+            request = 'UPDATE product_product SET dangerous_goods = \'True\' WHERE %s = True' % moved_column
+            cr.execute(request)
+
+        if new_column == 'short_shelf_life':
+            request = 'UPDATE product_product SET short_shelf_life = \'True\' WHERE %s = True' % moved_column
+            cr.execute(request)
+
+        if new_column == 'controlled_substance':
+            # Update old ticked controlled substance but not narcotic
+            request = '''UPDATE product_product SET
+                              controlled_substance = 'True',
+                              is_cs = True,
+                              cs_txt = 'X'
+                            WHERE %s = True OR narcotic = True''' % moved_column
+
+        return
+
     def _get_nomen(self, cr, uid, ids, field_name, args, context=None):
         res = {}
 
@@ -352,19 +395,186 @@
 
         return []
 
+    def _compute_is_kc(self, cr, uid, product, context=None):
+        """
+        Return True if the product is considered as a Keep Cool product
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param product: browse_record of a product.product
+        :param context: Context of the call
+        :return: True or False
+        """
+        return product.heat_sensitive_item.code == 'yes'
+
+    def _compute_kc_txt(self, cr, uid, product, context=None):
+        """
+        Return the character to display on views or reports ('X' or '?' or '') for Keep Cool
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param product: browse_record of a product.product
+        :param context: Context of the call
+        :return: 'X' or '?' or ''
+        """
+        if product.heat_sensitive_item.code == 'no_know':
+            return '?'
+        elif product.heat_sensitive_item.code == 'no':
+            return ''
+        else:
+            return 'X'
+
+    def _compute_is_dg(self, cr, uid, product, context=None):
+        """
+        Return True if the product is considered as a Dangerous Goods product
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param product: browse_record of a product.product
+        :param context: Context of the call
+        :return: True or False
+        """
+        return product.dangerous_goods == 'True'
+
+    def _compute_dg_txt(self, cr, uid, product, context=None):
+        """
+        Return the character to display on views or reports ('X' or '?' or '') for Dangerous Goods
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param product: browse_record of a product.product
+        :param context: Context of the call
+        :return: 'X' or '?' or ''
+        """
+        if product.dangerous_goods == 'True':
+            return 'X'
+        elif product.dangerous_goods == 'no_know':
+            return '?'
+
+        return ''
+
+    def _compute_is_cs(self, cr, uid, product, context=None):
+        """
+        Return True if the product is considered as a Controlled Substance product
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param product: browse_record of a product.product
+        :param context: Context of the call
+        :return: True or False
+        """
+        return product.controlled_substance
+
+    def _compute_cs_txt(self, cr, uid, product, context=None):
+        """
+        Return the character to display on views or reports ('X' or '?' or '') for Controlled Substance
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param product: browse_record of a product.product
+        :param context: Context of the call
+        :return: 'X' or '?' or ''
+        """
+        return product.controlled_substance and 'X' or ''
+
+    def _compute_is_ssl(self, cr, uid, product, context=None):
+        """
+        Return True if the product is considered as a Short Shelf Life product
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param product: browse_record of a product.product
+        :param context: Context of the call
+        :return: True or False
+        """
+        return product.short_shelf_life == 'True'
+
+    def _compute_ssl_txt(self, cr, uid, product, context=None):
+        """
+        Return the character to display on views or reports ('X' or '?' or '') for Short Shelf Life
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param product: browse_record of a product.product
+        :param context: Context of the call
+        :return: 'X' or '?' or ''
+        """
+        if product.short_shelf_life == 'True':
+            return 'X'
+        elif product.short_shelf_life == 'no_know':
+            return '?'
+
+        return ''
+
+    def _compute_kc_dg_cs_ssl_values(self, cr, uid, ids, field_names, args, context=None):
+        """
+        Compute the character to display ('X' or '?' or '') according to product values
+        for Keep Cool, Dangerous Goods, Controlled Substance and Short Shelf Life.
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of ID of product.product to compute values
+        :param field_names: Name of the fields to compute
+        :param args: Additionnal arguments
+        :param context: Conetxt of the call
+        :return: A dictionary with the ID of product.product as keys and
+                 a dictionary with computed field values for each ID in ids.
+        """
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if not isinstance(field_names, list):
+            field_names = [field_names]
+
+        res = {}
+        for product in self.browse(cr, uid, ids, context=context):
+            res[product.id] = {}
+            for fld in field_names:
+                method_name = '_compute_%s' % fld
+                res[product.id][fld] = getattr(self, method_name)(cr, uid, product, context=context)
+
+        return res
+
     _columns = {
         'duplicate_ok': fields.boolean('Is a duplicate'),
         'loc_indic': fields.char('Indicative Location', size=64),
         'description2': fields.text('Description 2'),
-        'old_code' : fields.char('Old code', size=64),
+        'old_code' : fields.char(
+            string='Old code',
+            size=1024,
+        ),
         'new_code' : fields.char('New code', size=64),
-
         'international_status': fields.many2one('product.international.status', 'Product Creator', required=False),
         'perishable': fields.boolean('Expiry Date Mandatory'),
         'batch_management': fields.boolean('Batch Number Mandatory'),
         'product_catalog_page' : fields.char('Product Catalog Page', size=64),
-        'product_catalog_path' : fields.char('Product Catalog Path', size=64),
-        'short_shelf_life': fields.boolean('Short Shelf Life'),
+        'product_catalog_path' : fields.char('Product Catalog Path', size=1024),
+        'short_shelf_life': fields.selection(
+            selection=[
+                ('False', 'No'),
+                ('True', 'Yes'),
+                ('no_know', 'Don\'t know'),
+            ],
+            string='Short Shelf Life',
+            required=True,
+        ),
+        'is_ssl': fields.function(
+            _compute_kc_dg_cs_ssl_values,
+            method=True,
+            type='boolean',
+            string='Is Short Shelf Life ?',
+            multi='ssl',
+            readonly=True,
+            store={
+                'product.product': (lambda self, cr, uid, ids, c=None: ids, ['short_shelf_life'], 10),
+            }
+        ),
+        'ssl_txt': fields.function(
+            _compute_kc_dg_cs_ssl_values,
+            method=True,
+            type='char',
+            size=8,
+            string='Short Shelf Life icon',
+            multi='ssl',
+            readonly=True,
+            store={
+                'product.product': (lambda self, cr, uid, ids, c=None: ids, ['short_shelf_life'], 10),
+            }
+        ),
         'criticism': fields.selection([('',''),
             ('exceptional','1-Exceptional'),
             ('specific','2-Specific'),
@@ -390,22 +600,122 @@
         'composed_kit': fields.boolean('Kit Composed of Kits/Modules'),
         'options_ids': fields.many2many('product.product','product_options_rel','product_id','product_option_id','Options'),
 
-        'heat_sensitive_item': fields.many2one('product.heat_sensitive', 'Temperature sensitive item',),
+        'heat_sensitive_item': fields.many2one(
+            'product.heat_sensitive',
+            string='Temperature sensitive item',
+            required=True,
+        ),
+        'is_kc': fields.function(
+            _compute_kc_dg_cs_ssl_values,
+            method=True,
+            type='boolean',
+            string='Is Keep Cool ?',
+            multi='kc',
+            readonly=True,
+            store={
+                'product.product': (lambda self, cr, uid, ids, c=None: ids, ['heat_sensitive_item'], 10),
+            }
+        ),
+        'kc_txt': fields.function(
+            _compute_kc_dg_cs_ssl_values,
+            method=True,
+            type='char',
+            size=8,
+            string='Keep Cool icon',
+            multi='kc',
+            readonly=True,
+            store={
+                'product.product': (lambda self, cr, uid, ids, c=None: ids, ['heat_sensitive_item'], 10),
+            }
+        ),
         'cold_chain': fields.many2one('product.cold_chain', 'Cold Chain',),
         'show_cold_chain': fields.boolean('Show cold chain'),
         # Inverse of m2m options_ids
         'options_ids_inv': fields.many2many('product.product', 'product_options_rel', 'product_option_id', 'product_id', 'Options Inv.'),
-        'sterilized': fields.selection([('yes', 'Yes'), ('no', 'No')], string='Sterile'),
-        'single_use': fields.selection([('yes', 'Yes'),('no', 'No')], string='Single Use'),
+        'sterilized': fields.selection(
+            selection=[
+                ('yes', 'Yes'),
+                ('no', 'No'),
+                ('no_know', 'Don\'t know'),
+            ],
+            string='Sterile',
+            required=True,
+        ),
+        'single_use': fields.selection(
+            selection=[
+                ('yes', 'Yes'),
+                ('no', 'No'),
+                ('no_know', 'Don\'t know'),
+            ],
+            string='Single Use',
+            required=True,
+        ),
         'justification_code_id': fields.many2one('product.justification.code', 'Justification Code'),
         'med_device_class': fields.selection([('',''),
             ('I','Class I (General controls)'),
             ('II','Class II (General control with special controls)'),
             ('III','Class III (General controls and premarket)')], 'Medical Device Class'),
-        'closed_article': fields.selection([('yes', 'Yes'), ('no', 'No'),],string='Closed Article'),
-        'dangerous_goods': fields.boolean('Dangerous Goods'),
+        'manufacturer_txt': fields.text(
+            string='Manufacturer',
+        ),
+        'manufacturer_ref': fields.char(
+            size=1024,
+            string='Manufacturer Ref.'
+        ),
+        'closed_article': fields.selection(
+            selection=[
+                ('yes', 'Yes'),
+                ('no', 'No'),
+                ('recommanded', 'Recommanded'),
+            ],
+            string='Closed Article',
+            required=True,
+        ),
+        'dangerous_goods': fields.selection(
+            selection=[
+                ('False', 'No'),  # False is put as key for migration (see US-752)
+                ('True', 'Yes'),  # True is put as key for migration (see US-752)
+                ('no_know', 'Don\'t know'),
+            ],
+            string='Dangerous goods',
+            required=True,
+        ),
+        'is_dg': fields.function(
+            _compute_kc_dg_cs_ssl_values,
+            method=True,
+            type='boolean',
+            string='Is a Dangerous Goods ?',
+            multi='dg',
+            readonly=True,
+            store={
+                'product.product': (lambda self, cr, uid, ids, c=None: ids, ['dangerous_goods'], 10),
+            }
+        ),
+        'dg_txt': fields.function(
+            _compute_kc_dg_cs_ssl_values,
+            method=True,
+            type='char',
+            size=8,
+            string='Dangerous Goods icon',
+            multi='dg',
+            readonly=True,
+            store={
+                'product.product': (lambda self, cr, uid, ids, c=None: ids, ['dangerous_goods'], 10),
+            }
+        ),
         'restricted_country': fields.boolean('Restricted in the Country'),
         'country_restriction': fields.many2one('res.country.restriction', 'Country Restriction'),
+        'state_ud': fields.selection(
+            selection=[
+                ('valid', 'Valid'),
+                ('phase_out', 'Phase Out'),
+                ('stopped', 'Stopped'),
+                ('archived', 'Archived'),
+            ],
+            string='UniData Status',
+            readonly=True,
+            help="Automatically filled with UniData information.",
+        ),
         # TODO: validation on 'un_code' field
         'un_code': fields.char('UN Code', size=7),
         'gmdn_code' : fields.char('GMDN Code', size=5),
@@ -421,7 +731,42 @@
         'field_currency_id': fields.many2one('res.currency', string='Currency', readonly=True),
         'nomen_ids': fields.function(_get_nomen, fnct_search=_search_nomen,
                              type='many2many', relation='product.nomenclature', method=True, string='Nomenclatures'),
-        'controlled_substance': fields.boolean(string='Controlled substance'),
+        'controlled_substance': fields.selection(
+            selection=[
+                ('!', '! - Requires national export license'),
+                ('N1', 'N1 - Narcotic 1'),
+                ('N2', 'N2 - Narcotic 2'),
+                ('P1', 'P1 - Psychotrop 1'),
+                ('P3', 'P3 - Psychotrop 3'),
+                ('P4', 'P4 - Psychotrop 4'),
+                ('Y', 'Y - Kit or module with controlled substance'),
+                ('True', 'CS / NP - Controlled Substance / Narcotic / Psychotropic')
+            ],
+            string='Controlled substance',
+        ),
+        'is_cs': fields.function(
+            _compute_kc_dg_cs_ssl_values,
+            method=True,
+            type='boolean',
+            string='Is Controlled subst.',
+            multi='cs',
+            readonly=True,
+            store={
+                'product.product': (lambda self, cr, uid, ids, c=None: ids, ['controlled_substance'], 10),
+            }
+        ),
+        'cs_txt': fields.function(
+            _compute_kc_dg_cs_ssl_values,
+            method=True,
+            type='char',
+            size=8,
+            string='Controlled subst. icon',
+            multi='cs',
+            readonly=True,
+            store={
+                'product.product': (lambda self, cr, uid, ids, c=None: ids, ['controlled_substance'], 10),
+            }
+        ),
         'uom_category_id': fields.related('uom_id', 'category_id', string='Uom Category', type='many2one', relation='product.uom.categ'),
         'no_external': fields.function(_get_restriction, method=True, type='boolean', string='External partners orders', readonly=True, multi='restriction',
                                        store={'product.product': (lambda self, cr, uid, ids, c=None: ids, ['international_status', 'state'], 20),
@@ -448,10 +793,22 @@
         'form_value': fields.text(string='Form', translate=True),
         'fit_value': fields.text(string='Fit', translate=True),
         'function_value': fields.text(string='Function', translate=True),
-        'standard_ok': fields.boolean(string='Standard'),
+        'standard_ok': fields.selection(
+            selection=[
+                ('True', 'Standard'),
+                ('False', 'Non-standard'),
+            ],
+            string='Standardization Level',
+            required=True,
+        ),
         'soq_weight': fields.float(digits=(16,5), string='SoQ Weight'),
         'soq_volume': fields.float(digits=(16,5), string='SoQ Volume'),
         'vat_ok': fields.function(_get_vat_ok, method=True, type='boolean', string='VAT OK', store=False, readonly=True),
+        'prodlot_ids': fields.one2many(
+            'stock.production.lot',
+            'product_id',
+            string='Batch Numbers',
+        ),
     }
 
     # US-43: Remove the default_get that set value on Product Creator field. By removing the required = True value
@@ -463,15 +820,31 @@
     #    res.update({'international_status': id })
     #    return res
 
+    def _get_default_sensitive_item(self, cr, uid, context=None):
+        """
+        Return the ID of the product.heat_sensitive item with 'No' value.
+        :param cr: Cursor to the datase
+        :param uid: ID of the res.users that calls the method
+        :param context: Context of the call
+        :return: The ID of the product.heat_sensitive item with 'No' value.
+        """
+        return self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product_attributes', 'heat_no')[1]
+
     _defaults = {
+        'closed_article': 'no',
         'duplicate_ok': True,
         'perishable': False,
         'batch_management': False,
-        'short_shelf_life': False,
+        'short_shelf_life': 'False',
         'narcotic': False,
         'composed_kit': False,
-        'dangerous_goods': False,
+        'dangerous_goods': 'False',
+        'controlled_substance': 'False',
         'restricted_country': False,
+        'sterilized': 'no',
+        'single_use': 'no',
+        'standard_ok': 'False',
+        'heat_sensitive_item': _get_default_sensitive_item,
         'currency_id': lambda obj, cr, uid, c: obj.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id,
         'field_currency_id': lambda obj, cr, uid, c: obj.pool.get('res.users').browse(cr, uid, uid).company_id.currency_id.id,
         'vat_ok': lambda obj, cr, uid, c: obj.pool.get('unifield.setup.configuration').get_config(cr, uid).vat_ok,
@@ -661,12 +1034,26 @@
 
         return result, res
 
-
     def onchange_heat(self, cr, uid, ids, heat, context=None):
-        heat_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product_attributes', 'heat_1')[1]
-        if not heat or heat == heat_id:
-            return {'value': {'show_cold_chain':False}}
-        return {'value': {'show_cold_chain':True}}
+        """
+        Set the value for the field 'show_cold_chain' according to
+        selection Temperature sensitive value.
+        If the returned value is True, the field Cold Chain will be displayed
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls the method
+        :param ids: List of ID of product.product on which the field is computed
+        :param heat: ID of the selected product.heat_sensitive
+        :param context: Context of the call
+        :return: True of False in the 'show_cold_chain' field
+        """
+        heat1_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product_attributes', 'heat_1')[1]
+        heat2_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product_attributes', 'heat_no')[1]
+        heat3_id = self.pool.get('ir.model.data').get_object_reference(cr, uid, 'product_attributes', 'heat_no_know')[1]
+        return {
+            'value': {
+                'show_cold_chain': heat and heat not in [heat1_id, heat2_id, heat3_id]
+            }
+        }
 
     def _check_gmdn_code(self, cr, uid, ids, context=None):
         int_pattern = re.compile(r'^\d*$')
@@ -676,6 +1063,14 @@
         return True
 
     def write(self, cr, uid, ids, vals, context=None):
+        data_obj = self.pool.get('ir.model.data')
+
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
         if 'batch_management' in vals:
             vals['track_production'] = vals['batch_management']
             vals['track_incoming'] = vals['batch_management']
@@ -699,6 +1094,25 @@
                 if category_id not in product_uom_categ:
                     product_uom_categ.append(category_id)
 
+        if context.get('sync_update_execution') and not context.get('bypass_sync_update', False):
+            stopped_status = data_obj.get_object_reference(cr, uid, 'product_attributes', 'status_3')[1]
+            phase_out_status = data_obj.get_object_reference(cr, uid, 'product_attributes', 'status_2')[1]
+            if vals.get('active', None) is False:
+                if self.deactivate_product(cr, uid, ids, context=context) is not True:
+                    vals.update({
+                        'active': True,
+                        'state': stopped_status,
+                    })
+            elif vals.get('active', None) is True and vals.get('state') == stopped_status:
+                vals.update({
+                    'active': True,
+                    'state': phase_out_status,
+                })
+
+        if 'narcotic' in vals or 'controlled_substance' in vals:
+            if vals.get('narcotic') == True or tools.ustr(vals.get('controlled_substance', '')) == 'True':
+                vals['controlled_substance'] = 'True'
+
         res = super(product_attributes, self).write(cr, uid, ids, vals, context=context)
 
         if product_uom_categ:
@@ -733,6 +1147,7 @@
         if isinstance(ids, (int, long)):
             ids = [ids]
 
+        data_obj = self.pool.get('ir.model.data')
         location_obj = self.pool.get('stock.location')
         po_line_obj = self.pool.get('purchase.order.line')
         tender_line_obj = self.pool.get('tender.line')
@@ -966,6 +1381,13 @@
                                                         'doc_ref': invoice.invoice_id.number,
                                                         'doc_id': invoice.invoice_id.id}, context=context)
 
+                if context.get('sync_update_execution', False):
+                    context['bypass_sync_update'] = True
+                self.write(cr, uid, product.id, {
+                    'active': True,
+                    'state': data_obj.get_object_reference(cr, uid, 'product_attributes', 'status_3')[1],
+                }, context=context)
+
                 return {'type': 'ir.actions.act_window',
                         'res_model': 'product.deactivation.error',
                         'view_type': 'form',
@@ -1011,6 +1433,8 @@
                 orderpoint_line_obj.unlink(cr, uid, [orderpoint_line.id],
                     context=context)
 
+        if context.get('sync_update_execution', False):
+            context['bypass_sync_update'] = True
         self.write(cr, uid, ids, {'active': False}, context=context)
 
         return True
@@ -1074,6 +1498,10 @@
         """
         sptc_obj = self.pool.get('standard.price.track.changes')
 
+        if 'narcotic' in vals or 'controlled_substance' in vals:
+            if vals.get('narcotic') == True or tools.ustr(vals.get('controlled_substance', '')) == 'True':
+                vals['controlled_substance'] = 'True'
+
         res = super(product_attributes, self).create(cr, user, vals,
                                                      context=context)
 
@@ -1089,11 +1517,45 @@
     _inherit = 'product.template'
 
     _columns = {
-        'volume': fields.float('Volume', digits=(16,5), help="The volume in m3."),
+        'volume': fields.float(
+            string='Volume',
+            digits=(16, 5),
+            help="The volume in dm3.",
+        ),
+        'volume_updated': fields.boolean(
+            strinrg='Volume updated',
+            readonly=True,
+        ),
         'weight': fields.float('Gross weight', digits=(16,5), help="The gross weight in Kg."),
         'weight_net': fields.float('Net weight', digits=(16,5), help="The net weight in Kg."),
     }
 
+    _defaults = {
+        'volume_updated': False,
+    }
+
+    def write(self, cr, uid, ids, vals, context=None):
+        """
+        Update the volume from dm³ to m³ if the volume was not
+        yet updated.
+        :param cr: Cursor to the database
+        :param uid: ID of the res.users that calls this method
+        :param ids: List of ID of product.template to update
+        :param vals: Values to apply on list of ID
+        :param context: Context of the call
+        :return: super write() method.
+        """
+        if context is None:
+            context = {}
+
+        if isinstance(ids, (int, long)):
+            ids = [ids]
+
+        if 'volume' in vals and not vals.get('volume_updated', False):
+            del vals['volume']
+
+        return super(product_template, self).write(cr, uid, ids, vals, context=context)
+
 product_template()
 
 

=== modified file 'bin/addons/product_attributes/product_attributes_data.xml'
--- bin/addons/product_attributes/product_attributes_data.xml	2015-10-20 09:59:33 +0000
+++ bin/addons/product_attributes/product_attributes_data.xml	2016-03-18 10:42:44 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
-	<data noupdate="1">
+    <data noupdate="0">
 
 		<record model="product.status" id="status_1">
 			<field name="code">valid</field>
@@ -77,78 +77,77 @@
 			<field name="code">temp</field>
 			<field name="name">Temporary</field>
 		</record>
+		<record model="product.international.status" id="int_6">
+			<field name="code">unidata</field>
+            <field name="name">UniData</field>
+		</record>
+            
+        <record model="product.heat_sensitive" id="heat_yes">
+            <field name="code">yes</field>
+            <field name="name">Yes</field>
+        </record>
+        <record model="product.heat_sensitive" id="heat_no">
+            <field name="code">no</field>
+            <field name="name">No</field>
+        </record>
+        <record model="product.heat_sensitive" id="heat_no_know">
+            <field name="code">no_know</field>
+            <field name="name">Don't know</field>
+        </record>
 
-		<record model="product.heat_sensitive" id="heat_1">
-			<field name="code">KR</field>
-			<field name="name">Keep refrigerated but not cold chain (+2 to +8°C) for transport')</field>
-		</record>
-		<record model="product.heat_sensitive" id="heat_2">
+		<record model="product.cold_chain" id="cold_1">
 			<field name="code">*</field>
-			<field name="name">Keep Cool</field>
-		</record>
-		<record model="product.heat_sensitive" id="heat_3">
-			<field name="code">**</field>
-			<field name="name">Keep Cool, airfreight</field>
-		</record>
-		<record model="product.heat_sensitive" id="heat_4">
-			<field name="code">***</field>
-			<field name="name">Cold chain, 0° to 8°C strict</field>
-		</record>
-
-		<record model="product.cold_chain" id="cold_1">
-			<field name="code">3*</field>
-			<field name="name">3* Cold Chain * - Keep Cool: used for a kit containing cold chain module or item(s)</field>
+			<field name="name">* - Keep Cool: used for a kit or article containing cold chain module or item(s)</field>
 		</record>
 		<record model="product.cold_chain" id="cold_2">
-			<field name="code">6*0</field>
-			<field name="name">6*0 Cold Chain *0 - Problem if any window blue</field>
+			<field name="code">*0</field>
+			<field name="name">*0 - Problem if any window blue</field>
 		</record>
 		<record model="product.cold_chain" id="cold_3">
-			<field name="code">7*0F</field>
-			<field name="name">7*0F Cold Chain *0F - Problem if any window blue or Freeze-tag = ALARM</field>
+			<field name="code">*0F</field>
+			<field name="name">*0F - Problem if any window blue or Freeze-tag = ALARM</field>
 		</record>
 		<record model="product.cold_chain" id="cold_4">
-			<field name="code">8*A</field>
-			<field name="name">8*A Cold Chain *A - Problem if B, C and/or D totally blue</field>
+			<field name="code">*A</field>
+			<field name="name">*A - Problem if A, B, C and/or D blue = ALARM</field>
 		</record>
 		<record model="product.cold_chain" id="cold_5">
-			<field name="code">9*AF</field>
-			<field name="name">9*AF Cold Chain *AF - Problem if B, C and/or D totally blue or Freeze-tag = ALARM</field>
+			<field name="code">*AF</field>
+			<field name="name">*AF - Problem if A, B, C and/or D blue or Freeze-tag = ALARM</field>
 		</record>
 		<record model="product.cold_chain" id="cold_6">
-			<field name="code">10*B</field>
-			<field name="name">10*B Cold Chain *B - Problem if C and/or D totally blue</field>
+			<field name="code">*B</field>
+			<field name="name">*B - Problem if B, C and/or D blue</field>
 		</record>
 		<record model="product.cold_chain" id="cold_7">
-			<field name="code">11*BF</field>
-			<field name="name">11*BF Cold Chain *BF - Problem if C and/or D totally blue or Freeze-tag = ALARM</field>
+			<field name="code">*BF</field>
+			<field name="name">*BF - Problem if B, C and/or D blue or Freeze-tag = ALARM</field>
 		</record>
 		<record model="product.cold_chain" id="cold_8">
-			<field name="code">12*C</field>
-			<field name="name">12*C Cold Chain *C - Problem if D totally blue</field>
+			<field name="code">*C</field>
+			<field name="name">*C - Problem if C and D blue</field>
 		</record>
 		<record model="product.cold_chain" id="cold_9">
-			<field name="code">13*CF</field>
-			<field name="name">13*CF Cold Chain *CF - Problem if D totally blue or Freeze-tag = ALARM</field>
+			<field name="code">*CF</field>
+			<field name="name">*CF - Problem if C and/or D blue or Freeze-tag = ALARM</field>
 		</record>
 		<record model="product.cold_chain" id="cold_10">
-			<field name="code">14*D</field>
-			<field name="name">14*D Cold Chain *D - Store and transport at -25°C (store in deepfreezer, transport with dry-ice)</field>
+			<field name="code">*D</field>
+			<field name="name">*D - Store and transport at -25°C (store in deepfreezer, transport with dry-ice)</field>
 		</record>
 		<record model="product.cold_chain" id="cold_11">
-			<field name="code">15*F</field>
-			<field name="name">15*F Cold Chain *F - Cannot be frozen: check Freeze-tag</field>
+			<field name="code">*F</field>
+			<field name="name">*F - Cannot be frozen: check FreezeWatch</field>
 		</record>
 		<record model="product.cold_chain" id="cold_12">
-			<field name="code">16*25</field>
-			<field name="name">16*25 Cold Chain *25 - Must be kept below 25°C (but not necesseraly in cold chain)</field>
+			<field name="code">*25</field>
+			<field name="name">*25 - Must be kept below 25°C (but not necesseraly in cold chain)</field>
 		</record>
 		<record model="product.cold_chain" id="cold_13">
-			<field name="code">17*25F</field>
-			<field name="name">17*25F Cold Chain *25F - Must be kept below 25°C and cannot be frozen: check  Freeze-tag</field>
+			<field name="code">*25F</field>
+			<field name="name">*25F - Must be kept below 25°C and cannot be frozen: check FreezeWatch</field>
 		</record>
 
-
 	</data>
 </openerp>
 

=== modified file 'bin/addons/product_attributes/product_attributes_view.xml'
--- bin/addons/product_attributes/product_attributes_view.xml	2015-05-29 15:33:12 +0000
+++ bin/addons/product_attributes/product_attributes_view.xml	2016-03-18 10:42:44 +0000
@@ -61,13 +61,13 @@
                             <separator string="Codes" colspan="2"/>
                             <field name="default_code" required="1" string="Code"  on_change="onchange_code(default_code)" 
                             attrs="{'readonly':[('duplicate_ok','=',False)]}" />
-                            <field name="old_code"/>
+                            <field name="new_code"/>
                             <field name="duplicate_ok" invisible="1"/>
                         </group>
                         <group colspan="4" col="2">
                             <separator string="Description" colspan="2"/>
                             <field name="name" string="Description"/>
-                            <field name="new_code"/>
+                            <field name="old_code"/>
                             <field name="sale_ok" invisible="1" />
                             <field name="purchase_ok" invisible="1" />
                         </group>
@@ -94,6 +94,7 @@
                             <group colspan="2" col="2">
                                 <separator string="Weights" colspan="2"/>
                                 <field name="volume" attrs="{'readonly':[('type','=','service')]}"/>
+                                <field name="volume_updated" invisible="1" />
                                 <field name="soq_volume" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
                                 <field name="soq_weight" attrs="{'readonly':[('type','=','service')]}"/>
@@ -106,7 +107,9 @@
                                 <separator string="Status" colspan="3"/>
                                 <field name="categ_id" readonly="1" colspan="3"/>
                                 <field name="international_status" required="1" widget="selection" colspan="3" />
+                                <field name="standard_ok" colspan="3" />
                                 <field name="state" colspan="3" widget="selection" />
+                                <field name="state_ud" colspan="3" />
                                 <field name="active" readonly="1"/>
                                 <group colspan="1" col="1">
                                    <button name="deactivate_product" icon="gtk-execute" string="De-activate product" type="object" attrs="{'invisible': [('active', '=', False)]}" />
@@ -131,27 +134,26 @@
                                 <field name="cold_chain" colspan="2" attrs="{'invisible': [('show_cold_chain','=',False)]}"  widget="selection"/>
                                 <field name="sterilized" colspan="2"/>
                                 <field name="single_use" colspan="2"/>
-                                <field name="narcotic" colspan="2"/>
                                 <field name="controlled_substance" colspan="2"/>
+                                <separator string="Transport" colspan="2"/>
+                                <field name="dangerous_goods" colspan="2"/>
+                                <field name="un_code" colspan="2"/>
+                                <separator string="Import restrictions" colspan="4"/>
+                                <field name="restricted_country" colspan="2"/>
+                                <field name="country_restriction" colspan="2" widget="selection" attrs="{'readonly':[('restricted_country','=',False)]}"/>
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Diffusion" colspan="2"/>
                                 <field name="standard_ok" colspan="2" />
-                                <field name="justification_code_id" colspan="2" widget="selection" />
+                                <field name="justification_code_id" colspan="2" />
                                 <!-- uf-1544
                                 <field name="med_device_class" colspan="2" />
                                 <field name="gmdn_code" colspan="2" />
                                 <field name="gmdn_description" colspan="2" />
                                  -->
                                 <field name="closed_article" colspan="2"/>
-                                <separator string="Import restrictions" colspan="4"/>
-                                <field name="restricted_country" colspan="2"/>
-                                <field name="country_restriction" colspan="2" widget="selection" attrs="{'readonly':[('restricted_country','=',False)]}"/>
-                            </group>
-                            <group colspan="2" col="2">
-                                <separator string="Transport" colspan="2"/>
-                                <field name="dangerous_goods" colspan="2"/>
-                                <field name="un_code" colspan="2"/>
+                                <field name="manufacturer_ref" attrs="{'invisible': [('closed_article', '=', 'no')]}" />
+                                <field name="manufacturer_txt" attrs="{'invisible': [('closed_article', '=', 'no')]}" />
                             </group>
                             <group colspan="2" col="2">
                                 <separator string="Form" colspan="2" />
@@ -265,7 +267,7 @@
                             <separator string="Description"/>
                             <!-- uf-1544 invisible-->
                             <field name="product_catalog_page" invisible="1"/>
-                            <field name="product_catalog_path"/>
+                            <field name="product_catalog_path" widget="url"/>
                             <separator string="Description"/>
                             <field colspan="4" name="description" nolabel="1"/>
                             <field colspan="4" name="description2" nolabel="1"/>
@@ -752,6 +754,18 @@
                   action="product_cold_chain_action"
                   parent="purchase.menu_product_in_config_purchase" />
 
+        <record id="product_justification_code_form_view" model="ir.ui.view">
+            <field name="name">product.justification.code.form</field>
+            <field name="model">product.justification.code</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Justification Code">
+                    <field name="code" readonly="True"/>
+                    <field name="description" readonly="True"/>
+                </form>
+            </field>
+        </record>
+
         <record id="product_justification_code_tree_view" model="ir.ui.view">
             <field name="name">product.justification.code.tree</field>
             <field name="model">product.justification.code</field>

=== modified file 'bin/addons/specific_rules/specific_rules.py'
--- bin/addons/specific_rules/specific_rules.py	2016-02-08 10:00:07 +0000
+++ bin/addons/specific_rules/specific_rules.py	2016-03-18 10:42:44 +0000
@@ -55,10 +55,12 @@
 
         for sol in self.browse(cr, uid, ids, context=context):
             if sol.product_id:
-                if sol.product_id.heat_sensitive_item:
-                    result[sol.id] = 'KC'
-                elif sol.product_id.dangerous_goods:
-                    result[sol.id] = 'DG'
+                if sol.product_id.kc_txt:
+                    result[sol.id] += sol.product_id.is_kc and 'KC' or 'KC ?'
+                if sol.product_id.dg_txt:
+                    if result[sol.id]:
+                        result[sol.id] += ' / '
+                    result[sol.id] += sol.product_id.is_dg and 'DG' or 'DG ?'
 
         return result
 
@@ -77,7 +79,7 @@
         # if the product is short shelf life, display a warning
         if product:
             prod_obj = self.pool.get('product.product')
-            if prod_obj.browse(cr, uid, product).short_shelf_life:
+            if prod_obj.browse(cr, uid, product).is_ssl:
                 warning = {
                             'title': 'Short Shelf Life product',
                             'message': _(SHORT_SHELF_LIFE_MESS)
@@ -105,7 +107,7 @@
         for obj in self.browse(cr, uid, ids, context=context):
             for line in obj.order_line:
                 # log the message
-                if line.product_id.short_shelf_life:
+                if line.product_id.is_ssl:
                     # log the message
                     self.log(cr, uid, obj.id, _(SHORT_SHELF_LIFE_MESS))
 
@@ -130,30 +132,33 @@
 
         for pol in self.browse(cr, uid, ids, context=context):
             if pol.product_id:
-                if pol.product_id.heat_sensitive_item:
-                    result[pol.id] = 'KC'
-                elif pol.product_id.dangerous_goods:
-                    result[pol.id] = 'DG'
+                if pol.product_id.kc_txt:
+                    result[pol.id] += pol.product_id.is_kc and 'KC' or 'KC ?'
+                if pol.product_id.dg_txt:
+                    if result[pol.id]:
+                        result[pol.id] += ' / '
+                    result[pol.id] += pol.product_id.is_dg and 'DG' or 'DG ?'
 
         return result
 
     _columns = {'kc_dg': fields.function(_kc_dg, method=True, string='KC/DG', type='char'),}
 
-    def product_id_change(self, cr, uid, ids, pricelist, product, qty, uom,
+    def product_id_on_change(self, cr, uid, ids, pricelist, product, qty, uom,
             partner_id, date_order=False, fiscal_position=False, date_planned=False,
-            name=False, price_unit=False, notes=False):
+            name=False, price_unit=False, notes=False, state=False, old_price_unit=0.00, nomen_manda_0=False,
+            comment='', context=None):
         '''
         if the product is short shelf life we display a warning
         '''
         # call to super
-        result = super(purchase_order_line, self).product_id_change(cr, uid, ids, pricelist, product, qty, uom,
+        result = super(purchase_order_line, self).product_id_on_change(cr, uid, ids, pricelist, product, qty, uom,
             partner_id, date_order, fiscal_position, date_planned,
-            name, price_unit, notes)
+            name, price_unit, notes, state, old_price_unit, nomen_manda_0, comment, context)
 
         # if the product is short shelf life, display a warning
         if product:
             prod_obj = self.pool.get('product.product')
-            if prod_obj.browse(cr, uid, product).short_shelf_life:
+            if prod_obj.browse(cr, uid, product).is_ssl:
                 warning = {
                             'title': 'Short Shelf Life product',
                             'message': _(SHORT_SHELF_LIFE_MESS)
@@ -183,7 +188,7 @@
         for obj in self.browse(cr, uid, ids, context=context):
             for line in obj.order_line:
                 # log the message
-                if line.product_id.short_shelf_life:
+                if line.product_id.is_ssl:
                     # log the message
                     self.log(cr, uid, obj.id, _(SHORT_SHELF_LIFE_MESS))
 
@@ -276,7 +281,7 @@
         product_obj = self.pool.get('product.product')
         product_id = vals.get('product_id', False)
         if product_id:
-            if product_obj.browse(cr, uid, product_id, context=context).short_shelf_life:
+            if product_obj.browse(cr, uid, product_id, context=context).is_ssl:
                 self.log(cr, uid, new_id, _(SHORT_SHELF_LIFE_MESS))
 
         return new_id
@@ -293,7 +298,7 @@
         product_obj = self.pool.get('product.product')
         product_id = vals.get('product_id', False)
         if product_id:
-            if product_obj.browse(cr, uid, product_id, context=context).short_shelf_life:
+            if product_obj.browse(cr, uid, product_id, context=context).is_ssl:
                 for obj in self.browse(cr, uid, ids, context=context):
                     self.log(cr, uid, obj.id, _(SHORT_SHELF_LIFE_MESS))
 
@@ -525,7 +530,7 @@
         product_obj = self.pool.get('product.product')
         product_id = vals.get('product_id', False)
         if product_id:
-            if product_obj.browse(cr, uid, product_id, context=context).short_shelf_life:
+            if product_obj.browse(cr, uid, product_id, context=context).is_ssl:
                 self.log(cr, uid, new_id, _(SHORT_SHELF_LIFE_MESS))
 
         return new_id
@@ -542,7 +547,7 @@
         product_obj = self.pool.get('product.product')
         product_id = vals.get('product_id', False)
         if product_id:
-            if product_obj.browse(cr, uid, product_id, context=context).short_shelf_life:
+            if product_obj.browse(cr, uid, product_id, context=context).is_ssl:
                 for obj in self.browse(cr, uid, ids, context=context):
                     self.log(cr, uid, obj.id, _(SHORT_SHELF_LIFE_MESS))
 
@@ -566,7 +571,7 @@
         product_obj = self.pool.get('product.product')
         product_id = vals.get('product_id', False)
         if product_id:
-            if product_obj.browse(cr, uid, product_id, context=context).short_shelf_life:
+            if product_obj.browse(cr, uid, product_id, context=context).is_ssl:
                 self.log(cr, uid, new_id, _(SHORT_SHELF_LIFE_MESS))
 
         return new_id
@@ -586,7 +591,7 @@
         product_obj = self.pool.get('product.product')
         product_id = vals.get('product_id', False)
         if product_id:
-            if product_obj.browse(cr, uid, product_id, context=context).short_shelf_life:
+            if product_obj.browse(cr, uid, product_id, context=context).is_ssl:
                 for obj in self.browse(cr, uid, ids, context=context):
                     self.log(cr, uid, obj.id, _(SHORT_SHELF_LIFE_MESS))
 
@@ -640,10 +645,12 @@
 
         for move in self.browse(cr, uid, ids, context=context):
             if move.product_id:
-                if move.product_id.heat_sensitive_item:
-                    result[move.id] = 'KC'
-                elif move.product_id.dangerous_goods:
-                    result[move.id] = 'DG'
+                if move.product_id.kc_txt:
+                    result[move.id] += move.product_id.is_kc and 'KC' or 'KC ?'
+                if move.product_id.dg_txt:
+                    if result[move.id]:
+                        result[move.id] += ' / '
+                    result[move.id] += move.product_id.is_dg and 'DG' or 'DG ?'
 
         return result
 
@@ -751,17 +758,13 @@
 
         for obj in self.browse(cr, uid, ids, context=context):
             # keep cool
-            if obj.product_id.heat_sensitive_item:
-                result[obj.id]['kc_check'] = True
+            result[obj.id]['kc_check'] = obj.product_id.kc_txt
             # ssl
-            if obj.product_id.short_shelf_life:
-                result[obj.id]['ssl_check'] = True
+            result[obj.id]['ssl_check'] = obj.product_id.ssl_txt
             # dangerous goods
-            if obj.product_id.dangerous_goods:
-                result[obj.id]['dg_check'] = True
+            result[obj.id]['dg_check'] = obj.product_id.dg_txt
             # narcotic
-            if obj.product_id.narcotic:
-                result[obj.id]['np_check'] = True
+            result[obj.id]['np_check'] = obj.product_id.cs_txt
             # lot management
             if obj.product_id.batch_management:
                 result[obj.id]['lot_check'] = True
@@ -788,14 +791,75 @@
         # if prodlot needs to be mandatory, add 'required': ['|', ('hidden_batch_management_mandatory','=',True), ('hidden_perishable_mandatory','=',True)] in attrs
         'hidden_batch_management_mandatory': fields.boolean(string='Hidden Flag for Batch Management product',),
         'hidden_perishable_mandatory': fields.boolean(string='Hidden Flag for Perishable product',),
-        'kc_check': fields.function(_get_checks_all, method=True, string='KC', type='boolean', readonly=True, multi="m"),
-        'ssl_check': fields.function(_get_checks_all, method=True, string='SSL', type='boolean', readonly=True, multi="m"),
-        'dg_check': fields.function(_get_checks_all, method=True, string='DG', type='boolean', readonly=True, multi="m"),
-        'np_check': fields.function(_get_checks_all, method=True, string='NP', type='boolean', readonly=True, multi="m"),
-        'lot_check': fields.function(_get_checks_all, method=True, string='B.Num', type='boolean', readonly=True, multi="m"),
-        'exp_check': fields.function(_get_checks_all, method=True, string='Exp', type='boolean', readonly=True, multi="m"),
-        'kit_check': fields.function(_get_checks_all, method=True, string='Kit', type='boolean', readonly=True, multi="m"),
-        'prodlot_id': fields.many2one('stock.production.lot', 'Batch', states={'done': [('readonly', True)]}, help="Batch number is used to put a serial number on the production", select=True),
+        'kc_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='KC',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'ssl_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='SSL',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'dg_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='DG',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'np_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='CS',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'lot_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='B.Num',
+            type='boolean',
+            readonly=True,
+            multi="m",
+        ),
+        'exp_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='Exp',
+            type='boolean',
+            readonly=True,
+            multi="m",
+        ),
+        'kit_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='Kit',
+            type='boolean',
+            readonly=True,
+            multi="m",
+        ),
+        'prodlot_id': fields.many2one(
+            'stock.production.lot',
+            'Batch',
+            states={
+                'done': [('readonly', True)],
+            },
+            help="Batch number is used to put a serial number on the production",
+            select=True,
+        ),
     }
 
     _constraints = [
@@ -1074,17 +1138,13 @@
 
         for obj in self.browse(cr, uid, ids, context=context):
             # keep cool
-            if obj.product_id.heat_sensitive_item:
-                result[obj.id]['kc_check'] = True
+            result[obj.id]['kc_check'] = obj.product_id.kc_txt
             # ssl
-            if obj.product_id.short_shelf_life:
-                result[obj.id]['ssl_check'] = True
+            result[obj.id]['ssl_check'] = obj.product_id.ssl_txt
             # dangerous goods
-            if obj.product_id.dangerous_goods:
-                result[obj.id]['dg_check'] = True
+            result[obj.id]['dg_check'] = obj.product_id.dg_txt
             # narcotic
-            if obj.product_id.narcotic:
-                result[obj.id]['np_check'] = True
+            result[obj.id]['np_check'] = obj.product_id.cs_txt
             # lot management
             if obj.product_id.batch_management:
                 result[obj.id]['lot_check'] = True
@@ -1163,30 +1223,90 @@
 
         return res
 
-    _columns = {'check_type': fields.function(_get_false, fnct_search=search_check_type, string='Check Type', type="boolean", readonly=True, method=True),
-                # readonly is True, the user is only allowed to create standard lots - internal lots are system-created
-                'type': fields.selection([('standard', 'Standard'),('internal', 'Internal'),], string="Type", readonly=True),
-                #'expiry_date': fields.date('Expiry Date'),
-                'name': fields.char('Batch Number', size=1024, required=True, help="Unique batch number, will be displayed as: PREFIX/SERIAL [INT_REF]"),
-                'date': fields.datetime('Auto Creation Date', required=True),
-                'sequence_id': fields.many2one('ir.sequence', 'Batch Sequence', required=True,),
-                'stock_virtual': fields.function(_get_stock_virtual, method=True, type="float", string="Available Stock", select=True,
-                                                 help="Current available quantity of products with this Batch Numbre Number in company warehouses",
-                                                 digits_compute=dp.get_precision('Product UoM'), readonly=True,
-                                                 fnct_search=_stock_search_virtual,),
-                'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Real Stock", select=True,
-                                                   help="Current real quantity of products with this Batch Number in company warehouses",
-                                                   digits_compute=dp.get_precision('Product UoM')),
-                'src_product_id': fields.function(_get_dummy, fnct_search=_src_product, method=True, type="boolean", string="By product"),
-                'kc_check': fields.function(_get_checks_all, method=True, string='KC', type='boolean', readonly=True, multi="m"),
-                'ssl_check': fields.function(_get_checks_all, method=True, string='SSL', type='boolean', readonly=True, multi="m"),
-                'dg_check': fields.function(_get_checks_all, method=True, string='DG', type='boolean', readonly=True, multi="m"),
-                'np_check': fields.function(_get_checks_all, method=True, string='NP', type='boolean', readonly=True, multi="m"),
-                'lot_check': fields.function(_get_checks_all, method=True, string='B.Num', type='boolean', readonly=True, multi="m"),
-                'exp_check': fields.function(_get_checks_all, method=True, string='Exp', type='boolean', readonly=True, multi="m"),
-                'delete_ok': fields.function(_get_delete_ok, method=True, string='Possible deletion ?', type='boolean', readonly=True),
-                'is_expired': fields.function(_is_expired, method=True, string='Expired ?', type='boolean', store=False, readonly=True),
-                }
+    _columns = {
+        'check_type': fields.function(_get_false, fnct_search=search_check_type, string='Check Type', type="boolean", readonly=True, method=True),
+        # readonly is True, the user is only allowed to create standard lots - internal lots are system-created
+        'type': fields.selection([('standard', 'Standard'),('internal', 'Internal'),], string="Type", readonly=True),
+        #'expiry_date': fields.date('Expiry Date'),
+        'name': fields.char('Batch Number', size=1024, required=True, help="Unique batch number, will be displayed as: PREFIX/SERIAL [INT_REF]"),
+        'date': fields.datetime('Auto Creation Date', required=True),
+        'sequence_id': fields.many2one('ir.sequence', 'Batch Sequence', required=True,),
+        'stock_virtual': fields.function(_get_stock_virtual, method=True, type="float", string="Available Stock", select=True,
+                                         help="Current available quantity of products with this Batch Numbre Number in company warehouses",
+                                         digits_compute=dp.get_precision('Product UoM'), readonly=True,
+                                         fnct_search=_stock_search_virtual,),
+        'stock_available': fields.function(_get_stock, fnct_search=_stock_search, method=True, type="float", string="Real Stock", select=True,
+                                           help="Current real quantity of products with this Batch Number in company warehouses",
+                                           digits_compute=dp.get_precision('Product UoM')),
+        'src_product_id': fields.function(_get_dummy, fnct_search=_src_product, method=True, type="boolean", string="By product"),
+        'kc_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='KC',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'ssl_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='SSL',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'dg_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='DG',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'np_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='CS',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'lot_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='B.Num',
+            type='boolean',
+            readonly=True,
+            multi="m",
+        ),
+        'exp_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='Exp',
+            type='boolean',
+            readonly=True,
+            multi="m",
+        ),
+        'delete_ok': fields.function(
+            _get_delete_ok,
+            method=True,
+            string='Possible deletion ?',
+            type='boolean',
+            readonly=True,
+        ),
+        'is_expired': fields.function(
+            _is_expired,
+            method=True,
+            string='Expired ?',
+            type='boolean',
+            store=False,
+            readonly=True,
+        ),
+    }
 
     _defaults = {'type': 'standard',
                  'company_id': lambda s,cr,uid,c: s.pool.get('res.company')._company_default_get(cr, uid, 'stock.production.lot', context=c),
@@ -1705,9 +1825,9 @@
         result.setdefault('value', {})['expiry_date'] = False
         result.setdefault('value', {})['lot_check'] = False
         result.setdefault('value', {})['exp_check'] = False
-        result.setdefault('value', {})['dg_check'] = False
-        result.setdefault('value', {})['kc_check'] = False
-        result.setdefault('value', {})['np_check'] = False
+        result.setdefault('value', {})['dg_check'] = ''
+        result.setdefault('value', {})['kc_check'] = ''
+        result.setdefault('value', {})['np_check'] = ''
         # reset the hidden flags
         result.setdefault('value', {})['hidden_batch_management_mandatory'] = False
         result.setdefault('value', {})['hidden_perishable_mandatory'] = False
@@ -1725,17 +1845,13 @@
                 result.setdefault('value', {})['hidden_perishable_mandatory'] = True
                 result.setdefault('value', {})['exp_check'] = True
             # keep cool
-            if product_obj.heat_sensitive_item:
-                result.setdefault('value', {})['kc_check'] = True
+            result.setdefault('value', {})['kc_check'] = product_obj.kc_txt
             # ssl
-            if product_obj.short_shelf_life:
-                result.setdefault('value', {})['ssl_check'] = True
+            result.setdefault('value', {})['ssl_check'] = product_obj.ssl_txt
             # dangerous goods
-            if product_obj.dangerous_goods:
-                result.setdefault('value', {})['dg_check'] = True
+            result.setdefault('value', {})['dg_check'] = product_obj.dg_txt
             # narcotic
-            if product_obj.narcotic:
-                result.setdefault('value', {})['np_check'] = True
+            result.setdefault('value', {})['np_check'] = product_obj.cs_txt
             # if not product, result is 0.0 by super
             # compute qty
             result = self.common_on_change(cr, uid, ids, location_id, product, prod_lot_id, uom, to_date, result=result)
@@ -1802,17 +1918,13 @@
 
         for obj in self.browse(cr, uid, ids, context=context):
             # keep cool
-            if obj.product_id.heat_sensitive_item:
-                result[obj.id]['kc_check'] = True
+            result[obj.id]['kc_check'] = obj.product_id.kc_txt
             # ssl
-            if obj.product_id.short_shelf_life:
-                result[obj.id]['ssl_check'] = True
+            result[obj.id]['ssl_check'] = obj.product_id.ssl_txt
             # dangerous goods
-            if obj.product_id.dangerous_goods:
-                result[obj.id]['dg_check'] = True
+            result[obj.id]['dg_check'] = obj.product_id.dg_txt
             # narcotic
-            if obj.product_id.narcotic:
-                result[obj.id]['np_check'] = True
+            result[obj.id]['np_check'] = obj.product_id.cs_txt
             # lot management
             if obj.product_id.batch_management:
                 result[obj.id]['lot_check'] = True
@@ -1924,15 +2036,77 @@
         'prod_lot_id': fields.many2one('stock.production.lot', 'Batch', domain="[('product_id','=',product_id)]"),
         'expiry_date': fields.date(string='Expiry Date'),
         'type_check': fields.char(string='Type Check', size=1024,),
-        'kc_check': fields.function(_get_checks_all, method=True, string='KC', type='boolean', readonly=True, multi="m"),
-        'ssl_check': fields.function(_get_checks_all, method=True, string='SSL', type='boolean', readonly=True, multi="m"),
-        'dg_check': fields.function(_get_checks_all, method=True, string='DG', type='boolean', readonly=True, multi="m"),
-        'np_check': fields.function(_get_checks_all, method=True, string='NP', type='boolean', readonly=True, multi="m"),
-        'lot_check': fields.function(_get_checks_all, method=True, string='B.Num', type='boolean', readonly=True, multi="m"),
-        'exp_check': fields.function(_get_checks_all, method=True, string='Exp', type='boolean', readonly=True, multi="m"),
-        'has_problem': fields.function(_get_checks_all, method=True, string='Has problem', type='boolean', readonly=True, multi="m"),
-        'duplicate_line': fields.function(_get_checks_all, method=True, string='Duplicate line', type='boolean', readonly=True, multi="m"),
-        'dont_move': fields.boolean(string='Don\'t create stock.move for this line'),
+        'kc_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='KC',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'ssl_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='SSL',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'dg_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='DG',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'np_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='CS',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'lot_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='B.Num',
+            type='boolean',
+            readonly=True,
+            multi="m",
+        ),
+        'exp_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='Exp',
+            type='boolean',
+            readonly=True,
+            multi="m",
+        ),
+        'has_problem': fields.function(
+            _get_checks_all,
+            method=True,
+            string='Has problem',
+            type='boolean',
+            readonly=True,
+            multi="m",
+        ),
+        'duplicate_line': fields.function(
+            _get_checks_all,
+            method=True,
+            string='Duplicate line',
+            type='boolean',
+            readonly=True,
+            multi="m",
+        ),
+        'dont_move': fields.boolean(
+            string='Don\'t create stock.move for this line',
+        ),
     }
 
     _defaults = {# in is used, meaning a new prod lot will be created if the specified expiry date does not exist

=== modified file 'bin/addons/specific_rules/specific_rules_view.xml'
--- bin/addons/specific_rules/specific_rules_view.xml	2015-10-13 12:25:48 +0000
+++ bin/addons/specific_rules/specific_rules_view.xml	2016-03-18 10:42:44 +0000
@@ -55,7 +55,7 @@
                 <data>
 
                 <field name="life_time" position="replace">
-                    <field name="life_time" attrs="{'required':[('short_shelf_life', '=', True)]}" />
+                    <field name="life_time" attrs="{'required':[('short_shelf_life', '=', 'True')]}" />
                 </field>
             </data>
             </field>

=== modified file 'bin/addons/specific_rules/wizard/stock_partial_move.py'
--- bin/addons/specific_rules/wizard/stock_partial_move.py	2013-11-22 15:06:16 +0000
+++ bin/addons/specific_rules/wizard/stock_partial_move.py	2016-03-18 10:42:44 +0000
@@ -84,17 +84,13 @@
                 result[obj.id]['batch_number_check'] = obj.product_id.batch_management
                 result[obj.id]['expiry_date_check'] = obj.product_id.perishable
             # keep cool
-            if obj.product_id.heat_sensitive_item:
-                result[obj.id]['kc_check'] = True
+            result[obj.id]['kc_check'] = obj.product_id.kc_txt
             # ssl
-            if obj.product_id.short_shelf_life:
-                result[obj.id]['ssl_check'] = True
+            result[obj.id]['ssl_check'] = obj.product_id.ssl_txt
             # dangerous goods
-            if obj.product_id.dangerous_goods:
-                result[obj.id]['dg_check'] = True
+            result[obj.id]['dg_check'] = obj.product_id.dg_txt
             # narcotic
-            if obj.product_id.narcotic:
-                result[obj.id]['np_check'] = True
+            result[obj.id]['np_check'] = obj.product_id.cs_txt
             # type of picking
             result[obj.id]['type_check'] = obj.move_id.type
             # lot management
@@ -188,16 +184,80 @@
         'expiry_date_check': fields.function(_get_checks_all, method=True, string='Expiry Date Check', type='boolean', readonly=True, multi="m"),
         'type_check': fields.function(_get_checks_all, method=True, string='Picking Type Check', type='char', readonly=True, multi="m"),
         'expiry_date': fields.date('Expiry Date'),
-        'kc_check': fields.function(_get_checks_all, method=True, string='KC', type='boolean', readonly=True, multi="m"),
-        'ssl_check': fields.function(_get_checks_all, method=True, string='SSL', type='boolean', readonly=True, multi="m"),
-        'dg_check': fields.function(_get_checks_all, method=True, string='DG', type='boolean', readonly=True, multi="m"),
-        'np_check': fields.function(_get_checks_all, method=True, string='NP', type='boolean', readonly=True, multi="m"),
-        'lot_check': fields.function(_get_checks_all, method=True, string='B.Num', type='boolean', readonly=True, multi="m"),
-        'exp_check': fields.function(_get_checks_all, method=True, string='Exp', type='boolean', readonly=True, multi="m"),
-        'location_id': fields.related('move_id', 'location_id', type='many2one', relation='stock.location', string='Source Location', readonly=True),
-        'quantity_ordered': fields.float('Quantity ordered'),
-        'uom_ordered': fields.many2one('product.uom', string='UoM ordered', readonly=True),
-        'uom_category': fields.related('uom_ordered', 'category_id', type='many2one', relation='product.uom.categ'),
+        'kc_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='KC',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'ssl_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='SSL',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'dg_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='DG',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'np_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='CS',
+            type='char',
+            size=8,
+            readonly=True,
+            multi="m",
+        ),
+        'lot_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='B.Num',
+            type='boolean',
+            readonly=True,
+            multi="m",
+        ),
+        'exp_check': fields.function(
+            _get_checks_all,
+            method=True,
+            string='Exp',
+            type='boolean',
+            readonly=True,
+            multi="m",
+        ),
+        'location_id': fields.related(
+            'move_id',
+            'location_id',
+            type='many2one',
+            relation='stock.location',
+            string='Source Location',
+            readonly=True,
+        ),
+        'quantity_ordered': fields.float(
+            'Quantity ordered',
+        ),
+        'uom_ordered': fields.many2one(
+            'product.uom',
+            string='UoM ordered',
+            readonly=True,
+        ),
+        'uom_category': fields.related(
+            'uom_ordered',
+            'category_id',
+            type='many2one',
+            relation='product.uom.categ',
+        ),
     }
 
 stock_partial_move_memory_out()

=== modified file 'bin/addons/specific_rules/wizard/stock_partial_picking.py'
--- bin/addons/specific_rules/wizard/stock_partial_picking.py	2014-02-24 15:41:57 +0000
+++ bin/addons/specific_rules/wizard/stock_partial_picking.py	2016-03-18 10:42:44 +0000
@@ -48,13 +48,13 @@
         type = False
         contains_kc = False
         contains_dg = False
-        
+
         for pick in pick_obj.browse(cr, uid, picking_ids, context=context):
             type = pick.type
             for m in pick.move_lines:
-                if m.product_id.heat_sensitive_item:
+                if m.product_id.is_kc:
                     contains_kc = True
-                if m.product_id.dangerous_goods:
+                if m.product_id.is_dg:
                     contains_dg = True
             
         if contains_kc and contains_dg:

=== modified file 'bin/addons/stock_forecast/wizard/stock_forecast.py'
--- bin/addons/stock_forecast/wizard/stock_forecast.py	2015-02-05 16:24:37 +0000
+++ bin/addons/stock_forecast/wizard/stock_forecast.py	2016-03-18 10:42:44 +0000
@@ -130,10 +130,9 @@
                 values['product_family_info_id'] = wiz.product_id.nomen_manda_2.id
                 values['procurement_method'] = wiz.product_id.procure_method
                 values['supply_method'] = wiz.product_id.supply_method
-                if wiz.product_id.heat_sensitive_item:
-                    values['keep_cool'] = True
-                values['short_shelf_life'] = wiz.product_id.short_shelf_life
-                values['dangerous_goods'] = wiz.product_id.dangerous_goods
+                values['keep_cool'] = wiz.product_id.is_kc
+                values['short_shelf_life'] = wiz.product_id.is_ssl
+                values['dangerous_goods'] = wiz.product_id.is_dg
                 values['justification_code_id'] = wiz.product_id.justification_code_id.id
         return result
 

=== modified file 'bin/addons/stock_override/stock.py'
--- bin/addons/stock_override/stock.py	2016-03-14 10:07:38 +0000
+++ bin/addons/stock_override/stock.py	2016-03-18 10:42:44 +0000
@@ -2154,13 +2154,6 @@
         result = []
         for move in self.browse(cr, uid, ids, context=context):
             # add this move into the list of result
-            dg_check_flag = ''
-            if move.dg_check:
-                dg_check_flag = 'x'
-
-            np_check_flag = ''
-            if move.np_check:
-                np_check_flag = 'x'
             sub_total = move.product_qty * move.product_id.standard_price
 
             currency = ''
@@ -2178,8 +2171,8 @@
                 'origin': move.origin,
                 'expired_date': move.expired_date,
                 'prodlot_id': move.prodlot_id.name,
-                'dg_check': dg_check_flag,
-                'np_check': np_check_flag,
+                'dg_check': move.product_id and move.product_id.dg_txt or '',
+                'np_check': move.product_id and move.product_id.cs_txt or '',
                 'uom': move.product_uom.name,
                 'prod_qty': move.product_qty,
             })

=== modified file 'bin/addons/sync_so/sale.py'
--- bin/addons/sync_so/sale.py	2016-03-03 11:05:04 +0000
+++ bin/addons/sync_so/sale.py	2016-03-18 10:42:44 +0000
@@ -382,6 +382,7 @@
 
         if original_id:
             orig_partner_name = self.browse(cr, uid, original_id, context=context).partner_id.name
+<<<<<<< TREE
 
             # Generate messages for cancel lines
             available_solc_ids = solc_obj.search(cr, uid, eval(solccl_rule.domain),
@@ -398,6 +399,13 @@
                     order='NO_ORDER', context=context)
             if nfo_model_obj and nfo_rule and original_id in available_nfo_ids:
                 generate_msg_to_send(nfo_rule, nfo_model_obj, original_id, orig_partner_name)
+=======
+            if nfo_model_obj and nfo_rule:
+                available_nfo_ids = self.search(cr, uid, eval(nfo_rule.domain),
+                        order='NO_ORDER', context=context)
+                if original_id in available_nfo_ids:
+                    generate_msg_to_send(nfo_rule, nfo_model_obj, original_id, orig_partner_name)
+>>>>>>> MERGE-SOURCE
             if vfo_model_obj and vfo_rule:
                 generate_msg_to_send(vfo_rule, vfo_model_obj, original_id, orig_partner_name)
 

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2016-02-24 10:21:02 +0000
+++ bin/osv/orm.py	2016-03-18 10:42:44 +0000
@@ -912,7 +912,8 @@
                     res = value and float(value.replace(',','.')) or 0.0
                 elif field_type == 'selection':
                     for key, val in fields_def[field[len(prefix)]]['selection']:
-                        if value in [tools.ustr(key), tools.ustr(val)]:
+                        if value in [tools.ustr(key), tools.ustr(val)] or \
+                           tools.ustr(value) in [tools.ustr(key), tools.ustr(val)]:
                             res = key
                             break
                     if not value:
@@ -2663,6 +2664,18 @@
                 self.__schema.debug("Table '%s': column '%s': dropped NOT NULL constraint",
                                     self._table, column['attname'])
 
+    def execute_migration(self, cr, moved_column, new_column):
+        """
+        On change type of column, make a migration of data. The old values
+        are moved to a new column suffixed by _movedX.
+        This method must be overriden on needed objects.
+        :param cr: Cursor to the database
+        :param moved_column: The renamed old column
+        :param new_column: The column with the new type
+        :return: Nothing
+        """
+        pass
+
     def _auto_init(self, cr, context=None):
         if context is None:
             context = {}
@@ -2867,6 +2880,7 @@
                                     cr.execute("COMMENT ON COLUMN %s.%s IS '%s'" % (self._table, k, f.string.replace("'", "''")))
                                     self.__schema.debug("Table '%s': column '%s' has changed type (DB=%s, def=%s), data moved to column %s !",
                                         self._table, k, f_pg_type, f._type, newname)
+                                    self.execute_migration(cr, newname, k)
 
                             # if the field is required and hasn't got a NOT NULL constraint
                             if f.required and f_pg_notnull == 0: