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

[jftempo]

=== modified file 'bin/addons/msf_doc_import/wizard/wiz_common_import.py'
--- bin/addons/msf_doc_import/wizard/wiz_common_import.py	2016-07-22 06:22:42 +0000
+++ bin/addons/msf_doc_import/wizard/wiz_common_import.py	2016-09-06 16:40:03 +0000
@@ -21,6 +21,9 @@
 
 from osv import osv
 from osv import fields
+
+from specific_rules.specific_rules import SHORT_SHELF_LIFE_MESS
+
 from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetCreator
 import base64
 from tools.translate import _
@@ -208,6 +211,18 @@
                                     res.get('warning', {}).get('message', ''),
                                     c_msg,
                                 )
+
+                            if product_obj.browse(cr, uid, product_id).is_ssl:
+                                res.setdefault('warning', {})
+                                if res['warning'].get('message', None):
+                                    res['warning']['message'] = '%s\n%s' % (res['warning'].get('message', ''), _(SHORT_SHELF_LIFE_MESS))
+                                else:
+                                    res['warning'] = {
+                                        'title': _('Short Shelf Life product'),
+                                        'message': _(SHORT_SHELF_LIFE_MESS),
+                                    }
+
+                            if res:
                                 return res
         except IndexError:
             return {}