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

[Quentin THEURET @Amaris]

=== modified file 'bin/addons/mission_stock/mission_stock.py'
--- bin/addons/mission_stock/mission_stock.py	2016-12-05 14:26:00 +0000
+++ bin/addons/mission_stock/mission_stock.py	2017-02-03 13:54:39 +0000
@@ -547,20 +547,25 @@
         line_obj = self.pool.get('stock.mission.report.line')
         for report in self.read(cr, uid, report_ids, ['local_report', 'full_view'], context=context):
             # Create one line by product
-            cr.execute('''SELECT p.id, ps.code
-                          FROM product_product p, product_template pt
-                              LEFT JOIN product_status ps ON pt.state = ps.id
+            cr.execute('''SELECT p.id, ps.code, p.active, p.state_ud, pis.code
+                          FROM product_product p, product_template pt, product_status ps, product_international_status pis
                           WHERE p.product_tmpl_id = pt.id
+                          AND pt.state = ps.id
+                          AND p.international_status = pis.id
                           AND NOT EXISTS (
                             SELECT product_id
                             FROM
                             stock_mission_report_line smrl WHERE mission_report_id = %s
                             AND p.id = smrl.product_id)
                         ''' % report['id'])
-            for product, prod_state in cr.fetchall():
+            for product, prod_state, prod_active, prod_state_ud, prod_creator in cr.fetchall():
                 line_obj.create(cr, uid, {
-                    'product_id': product,
+                    'product_id': product, 
                     'mission_report_id': report['id'],
+                    'product_state': prod_state,
+                    'product_active': prod_active,
+                    'state_ud': prod_state_ud,
+                    'international_status_code': prod_creator,
                     'product_state': prod_state or '',
                 }, context=context)
 
@@ -957,6 +962,9 @@
                                      'stock.mission.report.line': (lambda self, cr, uid, ids, c=None: ids, ['product_id'], 10),
                                  },
                                  write_relate=False),
+        'product_active': fields.boolean(string='Active'),
+        'state_ud': fields.char(size=128, string='UniData status'),
+        'international_status_code': fields.char(size=128, string='Product Creator'),
         'mission_report_id': fields.many2one('stock.mission.report', string='Mission Report', required=True),
         'internal_qty': fields.float(digits=(16,2), string='Instance Stock'),
         'internal_val': fields.function(_get_internal_val, method=True, type='float', string='Instance Stock Val.'),
@@ -985,6 +993,7 @@
             string='HQ Instance',
             required=True,
         ),
+
     }
 
     @tools.cache(skiparg=2)
@@ -1019,6 +1028,8 @@
         'in_pipe_coor_val': 0.00,
         'instance_id': _get_default_destination_instance_id,
         'product_state': '',
+        'state_ud': '',
+        'international_status_code': '',
     }
 
     def update_full_view_line(self, cr, uid, context=None):

=== modified file 'bin/addons/msf_profile/data/patches.xml'
--- bin/addons/msf_profile/data/patches.xml	2017-01-31 16:17:06 +0000
+++ bin/addons/msf_profile/data/patches.xml	2017-02-03 13:54:39 +0000
@@ -150,7 +150,11 @@
         <record id="us_1671_stopped_products" model="patch.scripts">
             <field name="method">us_1671_stopped_products</field>
         </record>
-
+        
+        <record id="us_1167_status_inconsistencies" model="patch.scripts">
+            <field name="method">us_1167_status_inconsistencies</field>
+        </record>
+        
         <record id="us_2075_partner_locally_created" model="patch.scripts">
             <field name="method">us_2075_partner_locally_created</field>
         </record>

=== modified file 'bin/addons/msf_profile/i18n/fr_MF.po'
--- bin/addons/msf_profile/i18n/fr_MF.po	2017-01-31 16:17:06 +0000
+++ bin/addons/msf_profile/i18n/fr_MF.po	2017-02-03 13:54:39 +0000
@@ -4658,7 +4658,7 @@
 msgid "Search Real Kit Composition Item"
 msgstr "Rechercher l'Article de la Composition Réelle du Kit"
 
-#. modules: process, financing_contract, account_voucher, account_hq_entries, account_override, product_attributes, base_report_designer, msf_accrual, return_claim, account_mcdb, analytic, msf_doc_import, stock, product, msf_homere_interface, hr, register_accounting, base, procurement_report, account_invoice_split, account, msf_outgoing, msf_audittrail, sale, procurement, purchase, product_list
+#. modules: process, financing_contract, account_voucher, account_hq_entries, account_override, product_attributes, base_report_designer, msf_accrual, return_claim, account_mcdb, analytic, msf_doc_import, stock, product, msf_homere_interface, hr, register_accounting, base, procurement_report, account_invoice_split, account, msf_outgoing, msf_audittrail, sale, procurement, purchase, product_list, msf_tools
 #: view:account.account.type:0
 #: field:account.account.type,note:0
 #: view:account.analytic.account:0
@@ -4735,6 +4735,7 @@
 #: report:msf.report_reception_in:0
 #: view:stock.production.lot.revision:0
 #: field:stock.production.lot.revision,description:0
+#: report:addons/msf_tools/report/report_inconsistencies_xls.mako:81
 #, python-format
 msgid "Description"
 msgstr "Description"
@@ -6421,6 +6422,7 @@
 #: view:automated.import.job:0
 #: selection:automated.import.job,state:0
 #: selection:export.report.stopped.products,state:0
+#: selection:export.report.inconsistencies,state:0
 #: view:account.bank.statement:0
 #: selection:account.bank.statement,state:0
 #: view:account.invoice:0
@@ -6526,6 +6528,7 @@
 #: selection:tender,internal_state:0
 #: selection:tender,state:0
 #: selection:tender.line,state:0
+#: view:automated.import.job:0
 #, python-format
 msgid "Draft"
 msgstr "Brouillon"
@@ -7368,12 +7371,13 @@
 msgid "Earmarked"
 msgstr "Réservé"
 
-#. modules: mission_stock, base, msf_instance
+#. modules: mission_stock, base, msf_instance, msf_tools
 #: field:workflow.workitem,inst_id:0
 #: field:stock.mission.report,instance_id:0
 #: field:account.target.costcenter,instance_id:0
 #: model:ir.actions.act_window,name:msf_instance.action_msf_instance_setup
 #: field:msf.instance,instance:0
+#: report:addons/msf_tools/report/report_inconsistencies_xls.mako:79
 msgid "Instance"
 msgstr "Instance"
 
@@ -8393,10 +8397,11 @@
 msgid "Budget Import"
 msgstr "Budget - Importation"
 
-#. modules: supplier_catalogue, resource, msf_instance
+#. modules: supplier_catalogue, resource, msf_instance, msf_tools
 #: selection:msf.instance,state:0
 #: view:resource.resource:0
 #: view:supplier.catalogue:0
+#: report:addons/msf_tools/report/report_inconsistencies_xls.mako:106
 msgid "Inactive"
 msgstr "Inactif"
 
@@ -10646,7 +10651,7 @@
 msgid "The new %s Event %s has been created."
 msgstr "Le nouveau %s Evénement %s a été créé."
 
-#. modules: msf_budget, account, reason_types_moves, resource, product_attributes, financing_contract, res_currency_tables, msf_instance, product, sale, analytic, base, stock, analytic_distribution
+#. modules: msf_budget, account, reason_types_moves, resource, product_attributes, financing_contract, res_currency_tables, msf_instance, product, sale, analytic, base, stock, analytic_distribution, msf_tools
 #: field:account.account,code:0
 #: report:account.account.balance:0
 #: field:account.account.template,code:0
@@ -10683,6 +10688,7 @@
 #: field:resource.resource,code:0
 #: report:msf.report_reception_in:0
 #: field:stock.incoterms,code:0
+#: report:addons/msf_tools/report/report_inconsistencies_xls.mako:80
 msgid "Code"
 msgstr "Code"
 
@@ -11658,6 +11664,8 @@
 #: selection:stock.forecast.line,state:0
 #: view:stock.move:0
 #: selection:sync.client.entity_manager,state:0
+#: selection:export.report.inconsistencies,state:0
+#: selection:export.report.stopped.products,state:0
 msgid "Ready"
 msgstr "Prêt"
 
@@ -23526,7 +23534,7 @@
 msgid "Send SMS"
 msgstr "Envoyer SMS"
 
-#. modules: msf_partner, stock_override, kit, account_override, product_attributes, msf_doc_import, purchase_msf, msf_profile
+#. modules: msf_partner, stock_override, kit, account_override, product_attributes, msf_doc_import, purchase_msf, msf_profile, msf_tools
 #: code:addons/account_override/wizard/wizard_import_mapping.py:59
 #: code:addons/kit/kit.py:835
 #: code:addons/kit/kit.py:840
@@ -23604,9 +23612,22 @@
 #: selection:wizard.import.po.simulation.screen,state:0
 #: selection:wizard.import.po.simulation.screen.line,type_change:0
 #: selection:wizard.simu.import.po.line,change_type:0
+#: code:addons/msf_tools/automated_import.py:57
+#: code:addons/msf_tools/automated_import.py:62
+#: code:addons/msf_tools/automated_import.py:67
+#: code:addons/msf_tools/automated_import.py:196
+#: code:addons/msf_tools/automated_import.py:227
+#: code:addons/msf_tools/automated_import.py:386
+#: code:addons/msf_tools/automated_import.py:407
+#: code:addons/msf_tools/automated_import_function.py:65
+#: code:addons/msf_tools/automated_import_job.py:324
+#: code:addons/msf_tools/msf_tools.py:875
+#: code:addons/msf_tools/msf_tools.py:888
+#: code:addons/msf_tools/report/report_inconsistencies.py:106
+#: code:addons/msf_tools/report/report_stopped_products.py:106
 #, python-format
 msgid "Error"
-msgstr "Error"
+msgstr "Erreur"
 
 #. modules: account_activable, analytic_distribution
 #: code:addons/account_activable/account_activable.py:51
@@ -32054,6 +32075,8 @@
 #: selection:wizard.import.po,state:0
 #: view:sourcing.line:0
 #: selection:wizard.register.import,state:0
+#: selection::export.report.inconsistencies,state:0
+#: selection:export.report.stopped.products,state:0
 #, python-format
 msgid "In Progress"
 msgstr "En Cours"
@@ -42472,8 +42495,10 @@
 msgid "Asia/Phnom_Penh"
 msgstr "Asia/Phnom_Penh"
 
-#. module: product_attributes
+#. modules: product_attributes, mission_stock, msf_tools
 #: field:product.product,international_status:0
+#: field:stock.mission.report.line,international_status_code:0
+#: report:addons/msf_tools/report/report_inconsistencies_xls.mako:82
 msgid "Product Creator"
 msgstr "Créateur produit"
 
@@ -43961,6 +43986,9 @@
 #: field:wizard.import.stock.warehouse.orderpoint.line,state:0
 #: field:wizard.import.supplier.catalogue,state:0
 #: field:wizard.import.threshold.value.line,state:0
+#: field:automated.import.job,state:0
+#: field:export.report.inconsistencies,state:0
+#: field:export.report.stopped.products,state:0
 msgid "State"
 msgstr "État"
 
@@ -49776,13 +49804,14 @@
 msgid "RWANDAN FRANC"
 msgstr "RWANDAN FRANC"
 
-#. modules: product_attributes, purchase_override, account_hq_entries, sale
+#. modules: product_attributes, purchase_override, account_hq_entries, sale, msf_tools
 #: model:ir.ui.menu,name:account_hq_entries.menu_hq
 #: selection:product.product,international_status:0
 #: report:msf.purchase.order:0
 #: report:msf.purchase.quotation:0
 #: report:purchase.order.merged:0
 #: report:msf.sale.order:0
+#: report:addons/msf_tools/report/report_inconsistencies_xls.mako:90
 msgid "HQ"
 msgstr "HQ / Siège"
 
@@ -53592,7 +53621,7 @@
 msgid "Navajo"
 msgstr "Navajo"
 
-#. modules: product_nomenclature, process, financing_contract, account_override, procurement_cycle, supplier_catalogue, unifield_setup, stock, product, msf_homere_interface, hr, msf_instance, purchase_override, kit, sale_override, base, res_currency_functional, procurement_report, threshold_value, account, resource, msf_partner, procurement_auto, procurement, analytic_distribution
+#. modules: product_nomenclature, process, financing_contract, account_override, procurement_cycle, supplier_catalogue, unifield_setup, stock, product, msf_homere_interface, hr, msf_instance, purchase_override, kit, sale_override, base, res_currency_functional, procurement_report, threshold_value, account, resource, msf_partner, procurement_auto, procurement, analytic_distribution, mission_stock, msf_tools
 #: field:account.account,active:0
 #: field:account.analytic.journal,active:0
 #: field:account.journal.period,active:0
@@ -53647,6 +53676,9 @@
 #: field:supplier.catalogue,current:0
 #: field:threshold.value,active:0
 #: field:ir.ui.menu,active:0
+#: field:stock.mission.report.line,product_active:0
+#: field:automated.import,active:0
+#: report:addons/msf_tools/report/report_inconsistencies_xls.mako:106
 msgid "Active"
 msgstr "Actif"
 
@@ -54315,6 +54347,8 @@
 #: code:addons/kit/wizard/substitute.py:687
 #: code:addons/kit/wizard/substitute.py:1024
 #: code:addons/mission_stock/mission_stock.py:71
+#: code:addons/mission_stock/report/stock_mission_report.py:66
+#: code:addons/mission_stock/report/stock_mission_report.py:77
 #: code:addons/mission_stock/wizard/mission_stock_wizard.py:54
 #: code:addons/mission_stock/wizard/mission_stock_wizard.py:88
 #: code:addons/mission_stock/wizard/mission_stock_wizard.py:92
@@ -76100,6 +76134,93 @@
 msgid "A line was added to the %s %s to re-source the canceled line."
 msgstr "Une ligne a été ajoutée a la %s %s pour 're-sourcer' la ligne annulée."
 
+#. module: mission_stock
+#: field:stock.mission.report.line,state_ud:0
+msgid "UniData status"
+msgstr "Statut UniData"
+
+#. module: msf_tools
+#: field:export.report.inconsistencies,name:0
+#: field:export.report.stopped.products,name:0
+msgid "Generated On"
+msgstr "Généré le"
+
+#. module: msf_tools
+#: code:addons/msf_tools/report/report_inconsistencies.py:107
+#: code:addons/msf_tools/report/report_stopped_products.py:107
+#, python-format
+msgid "Nothing to generate"
+msgstr "Rien à générer"
+
+#. module: msf_tools
+#: model:ir.actions.report.xml,name:msf_tools.report_inconsistencies_xls
+msgid "Inconsistencies with HQ"
+msgstr "Incohérences avec le HQ"
+
+#. module: msf_tools
+#: model:ir.actions.act_window,name:msf_tools.export_report_inconsistencies_action
+#: model:ir.ui.menu,name:msf_tools.export_report_inconsistencies_menu
+msgid "Product Status Inconsistencies"
+msgstr "Incohérences du statut des produits"
+
+#. module: msf_tools
+#: view:export.report.inconsistencies:0
+msgid "Export inconsistencies"
+msgstr "Exporter les incohérences"
+
+#. module: msf_tools
+#: view:export.report.inconsistencies:0
+#: view:export.report.stopped.products:0
+msgid "Request information"
+msgstr "Demande d'informations"
+
+#. module: msf_tools
+#: view:export.report.inconsistencies:0
+#: view:export.report.stopped.products:0
+msgid "Generate report"
+msgstr "Générer le rapport"
+
+#. module: msf_tools
+#: view:export.report.inconsistencies:0
+#: view:export.report.stopped.products:0
+msgid "Status of the report"
+msgstr "État du rapport"
+
+#. module: msf_tools
+#: view:export.report.inconsistencies:0
+msgid "Your export inconsistent products demand will be treated quickly."
+msgstr "Votre export des produits incohérents sera traité rapidement."
+
+#. module: msf_tools
+#: view:export.report.inconsistencies:0
+msgid "Due to the volume of data, your report cannot be shown immediatly"
+msgstr "À cause du volume des données, le rapport ne peut pas être affiché immédiatement"
+
+#. module: msf_tools
+#: view:export.report.inconsistencies:0
+msgid "When the report will be ready, you can access to it by the menu Tools / Inconsistencies report"
+msgstr "Quand le rapport sera prêt, vous pourrez y accéder depuis le menu Outils / Rapport d'incohérences"
+
+#. module: msf_tools
+#: report:addons/msf_tools/report/report_inconsistencies_xls.mako:75
+msgid "There is no inconsistencies to report"
+msgstr "Il n'y a pas d'incohérence à reporter"
+
+#. module: msf_tools
+#: report:addons/msf_tools/report/report_inconsistencies_xls.mako:85
+msgid "Active/Inactive"
+msgstr "Actif/Inactif"
+
+#. module: msf_tools
+#: report:addons/msf_tools/report/report_inconsistencies_xls.mako:83
+msgid "UniField Status"
+msgstr "Statut UniField"
+
+#. module: msf_tools
+#: report:addons/msf_tools/report/report_inconsistencies_xls.mako:84
+msgid "Unidata Status"
+msgstr "Statut UniData"
+
 #. modules: sale, msf_printed_documents
 #: report:msf.consumption_report:0
 msgid "Source Location :"

=== modified file 'bin/addons/msf_profile/msf_profile.py'
--- bin/addons/msf_profile/msf_profile.py	2017-01-31 16:17:06 +0000
+++ bin/addons/msf_profile/msf_profile.py	2017-02-03 13:54:39 +0000
@@ -1117,9 +1117,58 @@
         return True
 
 
+    def us_1167_status_inconsistencies(self, cr, uid, *a, **b):
+        '''
+        fill fields of stock.mission.report.line:
+            - state_ud
+            - product_active
+            - international_status_code
+        '''
+        prod_obj = self.pool.get('product.product')
+        smrl_obj = self.pool.get('stock.mission.report.line')
+        context = {}
+
+        prod_ids = prod_obj.search(cr, uid, [('active', 'in', ['t', 'f'])], context=context)
+        smrl_to_update = smrl_obj.search(cr, uid, [('product_id', 'in', prod_ids), ('mission_report_id.local_report', '=', True)], context=context)        
+
+        for smrl in smrl_obj.browse(cr, uid, smrl_to_update, context=context):
+            smrl_obj.write(cr, uid, smrl.id, {
+                'state_ud': smrl.product_id.state_ud,
+                'product_active': smrl.product_id.active,
+                'international_status_code': smrl.product_id.international_status.code if smrl.product_id.international_status else '',
+            }, context=context)
+
+        return True
+
+
+    def us_1167_status_inconsistencies(self, cr, uid, *a, **b):
+        '''
+        fill fields of stock.mission.report.line:
+            - state_ud
+            - product_active
+            - international_status_code
+        '''
+        prod_obj = self.pool.get('product.product')
+        smrl_obj = self.pool.get('stock.mission.report.line')
+        context = {}
+
+        prod_ids = prod_obj.search(cr, uid, [('active', 'in', ['t', 'f'])], context=context)
+        smrl_to_update = smrl_obj.search(cr, uid, [('product_id', 'in', prod_ids), ('mission_report_id.local_report', '=', True)], context=context)        
+
+        for smrl in smrl_obj.browse(cr, uid, smrl_to_update, context=context):
+            smrl_obj.write(cr, uid, smrl.id, {
+                'state_ud': smrl.product_id.state_ud,
+                'product_active': smrl.product_id.active,
+                'international_status_code': smrl.product_id.international_status.code if smrl.product_id.international_status else '',
+            }, context=context)
+
+        return True
+
+
 patch_scripts()
 
 
+
 class ir_model_data(osv.osv):
     _inherit = 'ir.model.data'
     _name = 'ir.model.data'

=== 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	2017-01-25 14:57:37 +0000
+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv	2017-02-03 13:54:39 +0000
@@ -87,8 +87,8 @@
 msf_sync_data_server.budget_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('budget_id','in',('msf.budget','id',[('type','=','normal'), ('state', '!=', 'draft')]))]","['account_id/id', 'budget_id/id', 'month1', 'month2', 'month3', 'month4', 'month5', 'month6', 'month7', 'month8', 'month9', 'month10', 'month11', 'month12', 'destination_id/id', 'line_type']",OC,msf.budget.line,,Budget line,Valid,,431
 msf_sync_data_server.budget_status,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('type','=','normal'), ('state', '!=', 'draft')]",['state'],OC,msf.budget,,Budget status,Valid,,432
 msf_sync_data_server.mission_stock_report,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('full_view', '=', False), ('local_report', '=', True)]","['full_view', 'instance_id/id', 'last_update', 'name']",OC,stock.mission.report,,Mission Stock Report,Valid,,440
-msf_sync_data_server.mission_stock_report_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('mission_report_id.full_view', '=', False), ('mission_report_id.local_report', '=', True), ('international_status','in',['Local', 'Temporary'])]","['central_qty', 'central_val', 'cross_qty', 'cross_val', 'cu_qty', 'cu_val', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'product_id/id', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'xmlid_code', 'product_state']",MISSION,stock.mission.report.line,,Mission Stock Report Line,Valid,,441
-msf_sync_data_server.mission_stock_report_line_OC,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('mission_report_id.full_view', '=', False), ('mission_report_id.local_report', '=', True), ('international_status','in',['ITC', 'UniData', 'ESC', 'HQ'])]","['central_qty', 'central_val', 'cross_qty', 'cross_val', 'cu_qty', 'cu_val', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'product_id/id', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'xmlid_code', 'product_state']",OC,stock.mission.report.line,,Mission Stock Report Line OC,Valid,,442
+msf_sync_data_server.mission_stock_report_line,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('mission_report_id.full_view', '=', False), ('mission_report_id.local_report', '=', True), ('international_status','in',['Local', 'Temporary'])]","['central_qty', 'central_val', 'cross_qty', 'cross_val', 'cu_qty', 'cu_val', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'product_id/id', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'xmlid_code', 'product_state', 'product_active', 'state_ud', 'international_status_code']",MISSION,stock.mission.report.line,,Mission Stock Report Line,Valid,,441
+msf_sync_data_server.mission_stock_report_line_OC,TRUE,TRUE,FALSE,FALSE,bidirectional,Up,"[('mission_report_id.full_view', '=', False), ('mission_report_id.local_report', '=', True), ('international_status','in',['ITC', 'UniData', 'ESC', 'HQ'])]","['central_qty', 'central_val', 'cross_qty', 'cross_val', 'cu_qty', 'cu_val', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'product_id/id', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'xmlid_code', 'product_state', 'product_active', 'state_ud', 'international_status_code']",OC,stock.mission.report.line,,Mission Stock Report Line OC,Valid,,442
 msf_sync_data_server.financing_contract_formats_fc,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional-Private,[],"['cost_center_ids/id', 'eligibility_from_date', 'eligibility_to_date', 'format_name', 'overhead_percentage', 'overhead_type', 'reporting_type', 'hidden_instance_id/id']",HQ + MISSION,financing.contract.format,hidden_instance_id,Financing Contract Formats FC,Valid,,450
 msf_sync_data_server.financing_contract_formats,TRUE,TRUE,TRUE,TRUE,bidirectional,Bidirectional,"[('hidden_instance_id','=',False)]","['hidden_instance_id/id','cost_center_ids/id', 'eligibility_from_date', 'eligibility_to_date', 'format_name', 'overhead_percentage', 'overhead_type', 'reporting_type']",HQ + MISSION,financing.contract.format,,Financing Contract Formats,Valid,,451
 msf_sync_data_server.financing_contract_format_lines,TRUE,TRUE,TRUE,TRUE,bidirectional,Bidirectional,"[('instance_id', '=', False)]","['account_destination_ids/id', 'instance_id/id','allocated_budget_value', 'allocated_real_value', 'code', 'format_id/id', 'line_type', 'name', 'overhead_percentage', 'overhead_type', 'project_budget_value', 'project_real_value',  'is_quadruplet','quadruplet_update']",HQ + MISSION,financing.contract.format.line,,Financing Contract Format Lines,Valid,,452

=== modified file 'bin/addons/msf_tools/__openerp__.py'
--- bin/addons/msf_tools/__openerp__.py	2016-10-26 16:06:31 +0000
+++ bin/addons/msf_tools/__openerp__.py	2017-02-03 13:54:39 +0000
@@ -41,6 +41,8 @@
         'security/ir.model.access.csv',
         'report/report_stopped_products_view.xml',
         'report/report_stopped_products_report.xml',
+        'report/report_inconsistencies_view.xml',
+        'report/report_inconsistencies_report.xml',
         'automated_import_data.xml',
     ],
     'demo_xml': [

=== modified file 'bin/addons/msf_tools/report/__init__.py'
--- bin/addons/msf_tools/report/__init__.py	2016-10-26 16:06:31 +0000
+++ bin/addons/msf_tools/report/__init__.py	2017-02-03 13:54:39 +0000
@@ -20,3 +20,4 @@
 ##############################################################################
 
 import report_stopped_products
+import report_inconsistencies

=== added file 'bin/addons/msf_tools/report/report_inconsistencies.py'
--- bin/addons/msf_tools/report/report_inconsistencies.py	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_tools/report/report_inconsistencies.py	2017-02-03 13:54:39 +0000
@@ -0,0 +1,433 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+
+import time
+import threading
+from osv import fields
+from osv import osv
+from report import report_sxw
+from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetReport
+from service.web_services import report_spool
+from tools.translate import _
+
+
+
+class export_report_inconsistencies(osv.osv):
+
+    _name = 'export.report.inconsistencies'
+    _order = 'name desc'
+
+    _columns = {
+        'name': fields.datetime(string='Generated On', readonly=True),
+        'state': fields.selection(
+            [('draft', 'Draft'),
+             ('in_progress', 'In Progress'),
+             ('ready', 'Ready')],
+            string='State',
+            readonly=True,
+        ),
+    }
+
+    _defaults = {
+        'state': lambda *a: 'draft',
+    }
+
+
+    def generate_report(self, cr, uid, ids, context=None):
+        '''
+        Generate a report
+        Method is called by button on XML view (form)
+        '''
+        prod_obj = self.pool.get('product.product')
+        data_obj = self.pool.get('ir.model.data')
+
+        res = {}
+        for report in self.browse(cr, uid, ids, context=context):
+            # get ids of all non-local products :
+            status_local_id = data_obj.get_object_reference(cr, uid, 'product_attributes', 'int_4')[1]
+            product_ids = prod_obj.search(cr, uid, [('international_status', '!=', status_local_id)], context=context)
+            if not product_ids:
+                continue
+
+            # state of report is in progress :
+            self.write(cr, uid, [report.id], {
+                'name': time.strftime('%Y-%m-%d %H:%M:%S'), 
+                'state': 'in_progress'
+            }, context=context)
+
+            datas = {
+                'ids': [report.id],
+                'lines': product_ids,
+            }
+
+            cr.commit()
+            new_thread = threading.Thread(target=self.generate_report_bkg, args=(cr, uid, report.id, datas, context))
+            new_thread.start()
+            new_thread.join(timeout=25.0) # join = wait until new_thread is finished but if it last more then timeout value, you can continue to work
+
+            res = {
+                'type': 'ir.actions.act_window',
+                'res_model': self._name,
+                'view_type': 'form',
+                'view_mode': 'form,tree',
+                'res_id': report.id,
+                'context': context,
+                'target': 'same',
+            }
+
+            if new_thread.isAlive():
+                view_id = data_obj.get_object_reference(
+                    cr, uid,
+                    'msf_tools',
+                    'report_inconsistencies_info_view')[1]
+                res['view_id'] = [view_id]
+
+        if not res:
+            raise osv.except_osv(
+                _('Error'),
+                _("Nothing to generate")
+            )
+
+        return res
+
+
+    def generate_report_bkg(self, cr, uid, report_ids, datas, context=None):
+        '''
+        Generate the report in background (thread)
+        '''
+        attachment_obj = self.pool.get('ir.attachment')
+
+        if context is None:
+            context ={}
+
+        if isinstance(report_ids, (int, long)):
+            report_ids = [report_ids]
+
+        import pooler
+        new_cr = pooler.get_db(cr.dbname).cursor()
+
+        # export datas :
+        report_name = "inconsistencies.xls"
+        attachment_name = "inconsistencies_report_%s.xls" % time.strftime('%d-%m-%Y_%Hh%M')
+        rp_spool = report_spool()
+        res_export = rp_spool.exp_report(cr.dbname, uid, report_name, report_ids, datas, context)
+        file_res = {'state': False}
+        while not file_res.get('state'):
+            file_res = rp_spool.exp_report_get(new_cr.dbname, uid, res_export)
+            time.sleep(0.5)
+
+        # attach report to the right panel :
+        attachment_obj.create(new_cr, uid, {
+            'name': attachment_name,
+            'datas_fname': attachment_name,
+            'description': "Inconsistencies with HQ",
+            'res_model': 'export.report.inconsistencies',
+            'res_id': report_ids[0],
+            'datas': file_res.get('result'),
+        }, context=context)
+
+        # state is now 'ready' :
+        self.write(new_cr, uid, report_ids, {'state': 'ready'}, context= context)
+
+        new_cr.commit()
+        new_cr.close(True)
+
+        return True
+
+
+export_report_inconsistencies()
+
+
+
+class parser_report_inconsistencies_xls(report_sxw.rml_parse):
+    '''
+    To parse our mako template for inconsistencies
+    '''
+    def __init__(self, cr, uid, name, context=None):
+        super(parser_report_inconsistencies_xls, self).__init__(cr, uid, name, context=context)
+
+        # localcontext allows you to call methods inside mako file :
+        self.localcontext.update({
+            'time': time,
+            'get_uf_status': self.get_uf_status,
+            'get_ud_status': self.get_ud_status,
+            'get_inconsistent_lines': self.get_inconsistent_lines,
+            'get_products_with_inconsistencies': self.get_products_with_inconsistencies,
+            'get_product_creator_name_from_code': self.get_product_creator_name_from_code,
+        })
+
+        # cached data
+        self.uf_status_cache = {}
+        self.prod_creator_cache = {}
+        self.inconsistent = {}
+
+
+    def get_inconsistent_lines(self, prod_id=None):
+        '''
+        Return stock mission report lines that are inconsistent with HQ
+        Based on the fields: product_active, state_ud and international_status_code
+
+        prod_id: You can get only SMRL with product_id, if you don't give this information you
+        will get all inconsistents SMRL 
+        '''
+        smrl_obj = self.pool.get('stock.mission.report.line')
+        product_creator_obj = self.pool.get('product.international.status')
+        inconsistent_id_list = []
+
+        intl_status_code_name = {}
+        intl_status_ids = product_creator_obj.search(self.cr, self.uid, [])
+        for intl_status in product_creator_obj.browse(self.cr, self.uid, intl_status_ids):
+            intl_status_code_name.setdefault(intl_status.code, intl_status.name)
+
+        if not self.inconsistent:
+            prod_obj = self.pool.get('product.product')
+            prod_status_obj = self.pool.get('product.status')
+
+            smrl_ids = smrl_obj.search(self.cr, self.uid, [('full_view', '=', False)], order='NO_ORDER', context=self.localcontext)
+
+            # check stock mission report line for inconsistencies with HQ (our instance):
+            self.inconsistent = {}
+            read_smrl_result = smrl_obj.read(self.cr, self.uid, smrl_ids,
+                    ['product_id', 'product_state', 'state_ud',
+                    'product_active', 'mission_report_id', 'default_code',
+                    'international_status_code'],
+                    context=self.localcontext)
+
+            read_smrl_result_dict = {}
+            all_product_ids = []
+            for read_smrl in read_smrl_result:
+                read_smrl_result_dict[read_smrl['id']] = read_smrl
+                all_product_ids.append(read_smrl['product_id'][0])
+            del read_smrl_result
+
+            # read all product informations
+            product_result = prod_obj.read(self.cr, self.uid, all_product_ids,
+                    ['state', 'state_ud', 'active', 'name_template',
+                     'international_status', 'default_code'],
+                     context=self.localcontext)
+            product_dict = dict((x['id'], x) for x in product_result)
+
+            # get all product_status
+            prod_status_ids = prod_status_obj.search(self.cr, self.uid, [], context=self.localcontext)
+            prod_status_result = prod_status_obj.read(self.cr, self.uid, prod_status_ids, ['code'], context=self.localcontext)
+            prod_status_dict = dict((x['id'], x['code']) for x in prod_status_result)
+
+            # get all instance id and build a level dict
+            instance_obj = self.pool.get('msf.instance')
+            instance_ids = instance_obj.search(self.cr, self.uid, [])
+            instance_read_result = instance_obj.read(self.cr, self.uid, instance_ids,
+                    ['level', 'name'], context=self.localcontext)
+            instance_level_dict = dict((x['id'], x) for x in
+                    instance_read_result)
+
+            # get all report id and build a instance dict
+            smr_obj = self.pool.get('stock.mission.report')
+            smr_ids = smr_obj.search(self.cr, self.uid, [])
+            smr_read_result = smr_obj.read(self.cr, self.uid, smr_ids,
+                    ['instance_id'], context=self.localcontext)
+            smr_instance_dict = dict((x['id'], x) for x in
+                    smr_read_result)
+
+            # get all uf_status codes
+            uf_status_obj = self.pool.get('product.status')
+            uf_status_code_ids = uf_status_obj.search(self.cr, self.uid, [], context=self.localcontext)
+            uf_status_code_read_result = uf_status_obj.read(self.cr, self.uid,
+                    uf_status_code_ids, ['code', 'name'], context=self.localcontext)
+            uf_status_code_dict = dict((x['code'], x) for x in
+                    uf_status_code_read_result)
+
+            product_result_dict = {}
+            state_ud_dict = {}
+            for product in product_result[0:100]:
+                inconsistent_id_list = []
+                # get the lines matching this product
+                smrl_ids = smrl_obj.search(self.cr, self.uid,
+                        [('full_view', '=', False),
+                         ('product_id', '=', product['id'])],
+                         order='NO_ORDER', context=self.localcontext)
+
+                # get the inconsistent related lines
+                for smrl_id in smrl_ids:
+                    smrl = read_smrl_result_dict[smrl_id] 
+                    product = product_dict[smrl['product_id'][0]]
+                    # in product_product state is False when empty
+                    # in smrl product_state is '' when empty:
+                    if not product['state'] and not smrl['product_state']:
+                        pass
+                    elif not product['state'] and smrl['product_state']:
+                        inconsistent_id_list.append(smrl['id'])
+                        continue
+                    elif product['state'] and not smrl['product_state']:
+                        inconsistent_id_list.append(smrl['id'])
+                        continue
+                    elif product['state'] and product['state'] in prod_status_dict:
+                        state_code = prod_status_dict[product['state'][0]]
+                        if state_code != smrl['product_state']:
+                            inconsistent_id_list.append(smrl['id'])
+                            continue
+
+                    if not product['state_ud'] and not smrl['state_ud']:
+                        pass
+                    elif product['state_ud'] != smrl['state_ud']:
+                        inconsistent_id_list.append(smrl['id'])
+                        continue
+
+                    if product['active'] != smrl['product_active']: # if null in DB smrl.product_active = False ....
+                        inconsistent_id_list.append(smrl['id'])
+                        continue
+
+                if inconsistent_id_list:
+                    product_result_dict[product['id']] = {}
+                    current_prod = product_result_dict[product['id']]
+                    current_prod['smrl_list'] = []
+                    prod_state_ud = ''
+                    if product['state_ud']:
+                        if product['state_ud'] not in state_ud_dict:
+                            product_browse_obj = prod_obj.browse(self.cr, self.uid, product['id'], context=self.localcontext)
+                            state_ud_name = self.pool.get('ir.model.fields').get_browse_selection(self.cr, self.uid, product_browse_obj, 'state_ud', self.localcontext)
+                            state_ud_dict[product['state_ud']] = state_ud_name
+                        prod_state_ud = state_ud_dict[product['state_ud']] 
+                    current_prod.update({
+                        'prod_default_code': product['default_code'],
+                        'prod_name_template': product['name_template'],
+                        'prod_international_status': product['international_status'] and product['international_status'][1] or '',
+                        'prod_state': product['state'] and product['state'][1] or '',
+                        'prod_state_ud': prod_state_ud,
+                        'prod_active': product['active'],
+                    })
+
+                    # build the result list dict
+                    for smrl_id in inconsistent_id_list:
+                        smrl = read_smrl_result_dict[smrl_id]
+                        instance_id = smr_instance_dict[smrl['mission_report_id'][0]]['instance_id'][0]
+                        
+                        smrl_dict = {
+                            'instance_name': instance_level_dict[instance_id]['name'],
+                            'smrl_default_code': smrl['default_code'],
+                            'smrl_name_template': product['name_template'],
+                            'internationnal_status_code_name': smrl['international_status_code'] and intl_status_code_name.get(smrl['international_status_code'], '') or '',
+                            'uf_status_code': smrl['product_state'] and uf_status_code_dict[smrl['product_state']]['name'] or '',
+                            'ud_status_code': self.get_ud_status(smrl['state_ud']),
+                            'active': smrl['product_active'],
+                            'instance_level': instance_level_dict[instance_id]['level'],
+                        }
+                        product_result_dict[product['id']]['smrl_list'].append(smrl_dict)
+                    product_result_dict[product['id']]['smrl_list'].sort(key=lambda smrl: smrl['instance_level']) 
+                    self.inconsistent[product['id']] = product_result_dict[product['id']]
+
+        if prod_id:
+            return self.inconsistent[prod_id]
+        else:
+            return self.inconsistent
+
+
+    def get_products_with_inconsistencies(self):
+        '''
+        return a browse record list of inconsistent product_product
+        '''
+        if not self.inconsistent:
+            self.inconsistent = self.get_inconsistent_lines()
+
+        prod_ids = self.inconsistent.keys()
+        
+        # order product id by default code
+        prod_obj = self.pool.get('product.product')
+        prod_result = prod_obj.read(self.cr, self.uid, prod_ids, ['default_code'], self.localcontext)
+        prod_result.sort(key=lambda prod: prod['default_code'])
+        ordered_ids = [x['id'] for x in prod_result]
+
+        # order self.inconsistent according with this ids
+        final_result = [self.inconsistent[x] for x in ordered_ids] 
+        return final_result
+
+
+    def get_uf_status(self, code):
+        '''
+        Return the name of the unifield status with the given code
+        '''
+        if code in self.uf_status_cache:
+            return self.uf_status_cache[code]
+
+        status_obj = self.pool.get('product.status')
+        code_ids = status_obj.search(self.cr, self.uid, [('code', '=', code)], context=self.localcontext)
+        res = ""
+        if code_ids:
+            res = status_obj.read(self.cr, self.uid, code_ids, ['name'])[0]['name']
+
+        self.uf_status_cache[code] = res
+
+        return res
+
+
+    def get_ud_status(self, code):
+        '''
+        Return the name of the unidata status with the given code
+        '''
+        if not code or not isinstance(code, (str, unicode)):
+            return ''
+        return code.capitalize().replace('_', ' ')
+
+
+    def get_product_creator_name_from_code(self, code):
+        '''
+        return the name of the product creator with the given code
+        '''
+        if code in self.prod_creator_cache:
+            return self.prod_creator_cache[code]
+
+        prodstat_obj = self.pool.get('product.international.status')
+        prodstat_ids = prodstat_obj.search(self.cr, self.uid, [('code', '=', code)], context=self.localcontext)
+        if not prodstat_ids:
+            return code
+
+        name = prodstat_obj.read(self.cr, self.uid, prodstat_ids, ['name'], context=self.localcontext)[0]['name']
+        self.prod_creator_cache[code] = name
+
+        return name
+
+
+
+class report_inconsistencies_xls(SpreadsheetReport):
+
+    def __init(self, name, table, rml=False, parser=report_sxw.rml_parse, header='external', store=False):
+        super(report_inconsistencies_xls, self).__init__(
+            name,
+            table,
+            rml=rml,
+            parser=parser,
+            header=header,
+            store=store
+        )
+
+    def create(self, cr, uid, ids, data, context=None):
+        a = super(report_inconsistencies_xls, self).create(cr, uid, ids, data, context=context)
+        return (a[0], 'xls')
+
+
+
+report_inconsistencies_xls(
+    'report.inconsistencies.xls',
+    'export.report.inconsistencies',
+    'addons/msf_tools/report/report_inconsistencies_xls.mako',
+    parser=parser_report_inconsistencies_xls,
+    header='internal',
+)

=== added file 'bin/addons/msf_tools/report/report_inconsistencies_report.xml'
--- bin/addons/msf_tools/report/report_inconsistencies_report.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_tools/report/report_inconsistencies_report.xml	2017-02-03 13:54:39 +0000
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+
+        <report
+            id="report_inconsistencies_xls"
+            string="Inconsistencies with HQ"
+            model="export.report.inconsistencies"
+            name="inconsistencies.xls"
+            file="msf_tools/report/report_inconsistencies_xls.mako"
+            report_type="webkit"
+            header="False"
+            auto="False"
+            menu="False"
+            />
+
+
+    </data>
+</openerp>
\ No newline at end of file

=== added file 'bin/addons/msf_tools/report/report_inconsistencies_view.xml'
--- bin/addons/msf_tools/report/report_inconsistencies_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_tools/report/report_inconsistencies_view.xml	2017-02-03 13:54:39 +0000
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+
+        <record id="export_report_inconsistencies_form_view" model="ir.ui.view">
+            <field name="name">export.report.inconsistencies.form.view</field>
+            <field name="model">export.report.inconsistencies</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Export inconsistencies">
+                    <separator colspan="4" string="Request information" />
+                    <field name="name" />
+                    <field name="state" />
+                    <button name="generate_report" type="object" string="Generate report" 
+                        icon="gtk-execute" states='draft' />
+                </form>
+            </field>
+        </record>
+
+
+        <record id="export_report_inconsistencies_tree_view" model="ir.ui.view">
+            <field name="name">export.report.inconsistencies.tree.view</field>
+            <field name="model">export.report.inconsistencies</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Export inconsistencies">
+                    <field name="name" />
+                    <field name="state" />
+                </tree>
+            </field>
+        </record>
+
+
+        <record id="report_inconsistencies_search_view" model="ir.ui.view">
+            <field name="name">export.report.inconsistencies.search.view</field>
+            <field name="model">export.report.inconsistencies</field> <!-- _name of openERP object -->
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Export inconsistencies">
+                    <field name="name" />
+                    <field name="state" />
+                </search>
+            </field>
+        </record>
+
+
+        <record id="report_inconsistencies_info_view" model="ir.ui.view">
+            <field name="name">export.report.inconsistencies.info.view</field>
+            <field name="model">export.report.inconsistencies</field>
+            <field name="type">form</field>
+            <field name="priority" eval="99" />
+            <field name="arch" type="xml">
+                <form string="Status of the report" hide_new_button="1" hide_delete_button="1">
+                    <label> </label>                                                
+                    <group colspan="2" col="2">                                     
+                        <html>                                                      
+                            <div style="align: center">                             
+                                <p style="font-size:14px;align:center">             
+                                    Your export inconsistent products demand will be treated quickly.<br />
+                                </p>                                                
+                                <p style="font-size:14px;align:center">             
+                                    Due to the volume of data, your report cannot be shown immediatly.<br />
+                                </p>                                                
+                                <p style="font-size:14px;align:center">             
+                                    When the report will be ready, you can access to it by the menu Tools / Inconsistencies report<br />
+                                </p>                                                
+                            </div>                                                  
+                        </html>                                                     
+                    </group>                                                        
+                    <label> </label>                                                
+                </form>
+            </field>
+        </record>
+
+
+        <record id="export_report_inconsistencies_action" model="ir.actions.act_window">
+            <field name="name">Product Status Inconsistencies</field>
+            <field name="res_model">export.report.inconsistencies</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+        </record>
+
+        
+        <menuitem
+            id="export_report_inconsistencies_menu"
+            action="export_report_inconsistencies_action"
+            parent="object_query.menu_preferences"
+            sequence="51" />
+
+    </data>
+</openerp>

=== added file 'bin/addons/msf_tools/report/report_inconsistencies_xls.mako'
--- bin/addons/msf_tools/report/report_inconsistencies_xls.mako	1970-01-01 00:00:00 +0000
+++ bin/addons/msf_tools/report/report_inconsistencies_xls.mako	2017-02-03 13:54:39 +0000
@@ -0,0 +1,139 @@
+<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <Author>MSFUser</Author>
+  <LastAuthor>MSFUser</LastAuthor>
+  <Created>2012-06-18T15:46:09Z</Created>
+  <Company>Medecins Sans Frontieres</Company>
+  <Version>11.9999</Version>
+</DocumentProperties>
+<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>13170</WindowHeight>
+  <WindowWidth>19020</WindowWidth>
+  <WindowTopX>120</WindowTopX>
+  <WindowTopY>60</WindowTopY>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+</ExcelWorkbook>
+
+<Styles>
+  <Style ss:ID="tab_header_orange">
+    <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+    <Interior ss:Color="#ffcc99" ss:Pattern="Solid"/>
+    <Borders>
+      <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+      <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+      <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+      <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+    </Borders>
+  </Style>
+  <Style ss:ID="tab_header_gray">
+    <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+    <Interior ss:Color="#dbdbdb" ss:Pattern="Solid"/>
+    <Borders>
+      <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+      <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+      <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+      <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+    </Borders>
+  </Style>
+  <Style ss:ID="tab_content">
+    <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+    <Borders>
+      <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1" />
+      <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1" />
+      <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1" />
+      <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1" />
+    </Borders>
+  </Style>
+</Styles>
+
+
+<ss:Worksheet ss:Name="Stopped products">
+
+  <Table x:FullColumns="1" x:FullRows="1">
+
+    <Columns ss:AutoFitWidth="1" ss:Width="90" /> # instance
+    <Columns ss:AutoFitWidth="1" ss:Width="90" /> # code
+    <Columns ss:AutoFitWidth="1" ss:Width="200" /> # product description
+    <Columns ss:AutoFitWidth="1" ss:Width="90" /> # product creator
+    <Columns ss:AutoFitWidth="1" ss:Width="90" /> # unifield status
+    <Columns ss:AutoFitWidth="1" ss:Width="90" /> # unidata status
+    <Columns ss:AutoFitWidth="1" ss:Width="90" /> # active
+
+    ##### Table with all stopped products #####
+
+    % if not get_inconsistent_lines():
+        <Row ss:AutoFitHeight="1">
+          <Cell ss:StyleID="tab_content"><Data ss:Type="String"></Data></Cell>
+          <Cell ss:StyleID="tab_content"><Data ss:Type="String"></Data></Cell>
+          <Cell ss:StyleID="tab_content"><Data ss:Type="String">${_('There is no inconsistencies to report')|x}</Data></Cell>
+        </Row>
+    % else:
+        <Row ss:AutoFitHeight="1">
+          <Cell ss:StyleID="tab_header_orange"><Data ss:Type="String">${_('Instance')|x}</Data></Cell>
+          <Cell ss:StyleID="tab_header_orange"><Data ss:Type="String">${_('Code')|x}</Data></Cell>
+          <Cell ss:StyleID="tab_header_orange"><Data ss:Type="String">${_('Description')|x}</Data></Cell>
+          <Cell ss:StyleID="tab_header_orange"><Data ss:Type="String">${_('Product Creator')|x}</Data></Cell>
+          <Cell ss:StyleID="tab_header_orange"><Data ss:Type="String">${_('UniField Status')|x}</Data></Cell>
+          <Cell ss:StyleID="tab_header_orange"><Data ss:Type="String">${_('Unidata Status')|x}</Data></Cell>
+          <Cell ss:StyleID="tab_header_orange"><Data ss:Type="String">${_('Active/Inactive')|x}</Data></Cell>
+        </Row>
+        % for prod in get_products_with_inconsistencies():
+                # HQ data:
+                <Row ss:AutoFitHeight="1">
+                  <Cell ss:StyleID="tab_header_gray"><Data ss:Type="String">${_('HQ')|x}</Data></Cell>
+                  <Cell ss:StyleID="tab_header_gray"><Data ss:Type="String">${(prod['prod_default_code'])|x}</Data></Cell>
+                  <Cell ss:StyleID="tab_header_gray"><Data ss:Type="String">${(prod['prod_name_template'])|x}</Data></Cell>
+                  <Cell ss:StyleID="tab_header_gray"><Data ss:Type="String">${(prod['prod_international_status'] or '')|x}</Data></Cell>
+                  <Cell ss:StyleID="tab_header_gray"><Data ss:Type="String">${(prod['prod_state'] or '')|x}</Data></Cell>
+                  <Cell ss:StyleID="tab_header_gray"><Data ss:Type="String">${(prod['prod_state_ud']  or '')|x}</Data></Cell>
+                  <Cell ss:StyleID="tab_header_gray"><Data ss:Type="String">${(_('Active') if prod['prod_active'] else _('Inactive'))|x}</Data></Cell>
+                </Row>
+            % for smrl in prod['smrl_list']:
+                    <Row ss:AutoFitHeight="1">
+                      <Cell ss:StyleID="tab_content"><Data ss:Type="String">${(smrl['instance_name'])|x}</Data></Cell>
+                      <Cell ss:StyleID="tab_content"><Data ss:Type="String">${(smrl['smrl_default_code'])|x}</Data></Cell>
+                      <Cell ss:StyleID="tab_content"><Data ss:Type="String">${(smrl['smrl_name_template'])|x}</Data></Cell>
+                      <Cell ss:StyleID="tab_content"><Data ss:Type="String">${(smrl['internationnal_status_code_name'] or '')|x}</Data></Cell>
+                      <Cell ss:StyleID="tab_content"><Data ss:Type="String">${(smrl['uf_status_code'])|x}</Data></Cell>
+                      <Cell ss:StyleID="tab_content"><Data ss:Type="String">${(smrl['ud_status_code'] or '')|x}</Data></Cell>
+                      <Cell ss:StyleID="tab_content"><Data ss:Type="String">${(_('Active') if smrl['active'] else _('Inactive'))|x}</Data></Cell>
+                    </Row>
+            % endfor
+        % endfor
+    % endif
+
+
+  </Table>
+
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Layout x:Orientation="Landscape"/>
+    <Header x:Data="&amp;C&amp;&quot;Arial,Bold&quot;&amp;14"/>
+    <Footer x:Data="Page &amp;P of &amp;N"/>
+  </PageSetup>
+  <Print>
+    <ValidPrinterInfo/>
+    <PaperSizeIndex>9</PaperSizeIndex>
+    <HorizontalResolution>600</HorizontalResolution>
+    <VerticalResolution>600</VerticalResolution>
+  </Print>
+  <Selected/>
+  <Panes>
+    <Pane>
+     <Number>3</Number>
+     <ActiveRow>17</ActiveRow>
+   </Pane>
+ </Panes>
+ <ProtectObjects>False</ProtectObjects>
+ <ProtectScenarios>False</ProtectScenarios>
+</WorksheetOptions>
+</ss:Worksheet>
+
+</Workbook>

=== modified file 'bin/addons/product_attributes/product_attributes.py'
--- bin/addons/product_attributes/product_attributes.py	2017-01-17 13:31:02 +0000
+++ bin/addons/product_attributes/product_attributes.py	2017-02-03 13:54:39 +0000
@@ -1294,6 +1294,7 @@
             return True
         smrl_obj = self.pool.get('stock.mission.report.line')
         prod_status_obj = self.pool.get('product.status')
+        int_stat_obj = self.pool.get('product.international.status')
 
         if context is None:
             context = {}
@@ -1335,6 +1336,33 @@
             if local_smrl_ids:
                 smrl_obj.write(cr, uid, local_smrl_ids, {'product_state': prod_state}, context=context)
 
+        if 'international_status' in vals:
+            intstat_code = ''
+            if vals['international_status']:
+                intstat_id = vals['international_status']
+                if isinstance(intstat_id, (int,long)):
+                    intstat_id = [intstat_id]
+                intstat_code = int_stat_obj.read(cr, uid, intstat_id, ['code'], context=context)[0]['code']
+            # just update SMRL that belongs to our instance:
+            local_smrl_ids = smrl_obj.search(cr, uid, [
+                    ('international_status_code', '!=', intstat_code),
+                    ('product_id', 'in', ids),
+                    ('full_view', '=', False),
+                    ('mission_report_id.local_report', '=', True)
+                ], context=context)
+            if local_smrl_ids:
+                smrl_obj.write(cr, uid, local_smrl_ids, {'international_status_code': intstat_code or ''}, context=context)
+
+        if 'state_ud' in vals:
+            # just update SMRL that belongs to our instance:
+            local_smrl_ids = smrl_obj.search(cr, uid, [
+                    ('product_id', 'in', ids),
+                    ('full_view', '=', False),
+                    ('mission_report_id.local_report', '=', True)
+                ], context=context)
+            if local_smrl_ids:
+                smrl_obj.write(cr, uid, local_smrl_ids, {'state_ud': vals['state_ud'] or ''}, context=context)
+
         product_uom_categ = []
         if 'uom_id' in vals or 'uom_po_id' in vals:
             if isinstance(ids, (int, long)):
@@ -1368,6 +1396,15 @@
                     #                    'state': phase_out_status,
                 })
 
+        if 'active' in vals:
+            local_smrl_ids = smrl_obj.search(cr, uid, [
+                    ('product_id', 'in', ids),
+                    ('full_view', '=', False),
+                    ('mission_report_id.local_report', '=', True)
+                ], context=context)
+            if local_smrl_ids:
+                smrl_obj.write(cr, uid, local_smrl_ids, {'product_active': vals['active']}, context=context)
+
         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'
@@ -1389,6 +1426,7 @@
 
         return res
 
+
     def reactivate_product(self, cr, uid, ids, context=None):
         '''
         Re-activate product.