Merge lp:~unifield-team/unifield-wm/sync-us_484_rules into lp:unifield-wm/sync

[Quentin THEURET @Amaris]

=== modified file 'msf_sync_data_server/data/sync_server.sync_rule.csv'
--- msf_sync_data_server/data/sync_server.sync_rule.csv	2015-09-11 09:35:17 +0000
+++ msf_sync_data_server/data/sync_server.sync_rule.csv	2015-10-09 08:08:50 +0000
@@ -27,7 +27,7 @@
 msf_sync_data_server.fp_tree0,TRUE,TRUE,TRUE,bidirectional,Down,"[('category', 'in', ['FREE1', 'FREE2', 'DEST']),('parent_id', '!=', '')]","['parent_id/id', 'instance_id/id']",OC,account.analytic.account,instance_id,"DestF1F2 tree (only F1, F2 and Dest)",Valid,,126
 msf_sync_data_server.fp_tree,FALSE,TRUE,TRUE,bidirectional,Bidirectional,"[('category', 'in', ['FREE1', 'FREE2', 'DEST']),('parent_id', '!=', '')]",['parent_id/id'],MISSION,account.analytic.account,,"Analytic account tree (only F1, F2 and Dest) – Coordo/Projects only",Valid,,127
 msf_sync_data_server.currency_rate,TRUE,TRUE,TRUE,bidirectional,Down,"[('rate' , '!=' , ''),('currency_id', '!=', ''), ('currency_id', 'in', ('res.currency', 'id', [('active', 'in', ['t', 'f']), ('currency_table_id', '=', '')]))]","['currency_id/id', 'name', 'rate']",OC,res.currency.rate,,Currency Rate,Valid,,128
-msf_sync_data_server.periods_state,TRUE,TRUE,TRUE,bidirectional,Bidirectional,[],"['state', 'period_id', 'instance_id']",OC,account.period.state,,Periods states,Valid,,129
+msf_sync_data_server.periods_state,TRUE,TRUE,TRUE,bidirectional,Bidirectional,[],"['state', 'period_id/id', 'instance_id/id']",OC,account.period.state,,Periods states,Valid,,129
 msf_sync_data_server.analytic_distribution,TRUE,TRUE,FALSE,bidirectional,Bidirectional,[],['name'],OC,analytic.distribution,,Analytic Distribution,Valid,,200
 msf_sync_data_server.cost_center_distribution_line,TRUE,TRUE,TRUE,bidirectional,Bidirectional,"[('analytic_id' , 'in' , ('account.analytic.account' , 'id' , [('code','!=','cc-intermission')])), ('partner_type','=','internal')]","['amount', 'analytic_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distribution_id/id', 'name', 'percentage', 'partner_type', 'source_date']",OC,cost.center.distribution.line,analytic_id,Cost Center Distribution Line - Internal partner,Valid,,201
 msf_sync_data_server.cost_center_distribution_line_non_internal,TRUE,TRUE,TRUE,bidirectional,Bidirectional-Private,"[('analytic_id' , 'in' , ('account.analytic.account' , 'id' , [('code','!=','cc-intermission')])), ('partner_type','!=','internal')]","['amount', 'analytic_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distribution_id/id', 'name', 'percentage', 'partner_type',  'source_date']",OC,cost.center.distribution.line,analytic_id,Cost Center Distribution Line - Non internal partner,Valid,,202
@@ -108,8 +108,8 @@
 msf_sync_data_server.country_code_mapping,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,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,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.standard_product_list,TRUE,TRUE,FALSE,bidirectional,Down,"[('standard_list_ok','=','True')]","['creation_date', '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,FALSE,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.standard_product_list,TRUE,TRUE,TRUE,bidirectional,Down,"[('standard_list_ok','=','True')]","['creation_date', '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,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,bidirectional,Down,[],"['code', 'info', 'name', 'notprintable', 'sign']",OC,account.tax.code,,Tax Code,Valid,,610
 msf_sync_data_server.tax_code_tree,TRUE,TRUE,FALSE,bidirectional,Down,"[('parent_id','!=','')]",['parent_id/id'],OC,account.tax.code,,Tax Code Tree,Valid,,611
 msf_sync_data_server.account_tax,TRUE,TRUE,FALSE,bidirectional,Down,[],"['account_collected_id/id', 'account_paid_id/id', 'active', 'amount', 'applicable_type', 'base_code_id/id', 'base_sign', 'child_depend', 'description', 'domain', 'include_base_amount', 'name', 'price_include', 'python_applicable', 'python_compute', 'python_compute_inv', 'ref_base_code_id/id', 'ref_base_sign', 'ref_tax_code_id/id', 'ref_tax_sign', 'sequence', 'tax_code_id/id', 'tax_sign', 'type', 'type_tax_use']",OC,account.tax,,Account Tax,Valid,,612
@@ -198,8 +198,8 @@
 msf_usb_sync_data_server.cp_product_price_list,TRUE,TRUE,FALSE,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,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,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
-msf_usb_sync_data_server.cp_standard_product_list,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,"[('standard_list_ok','=','True')]","['creation_date', '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,FALSE,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_standard_product_list,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,"[('standard_list_ok','=','True')]","['creation_date', '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,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,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
 msf_usb_sync_data_server.cp_composition_item,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,"[('item_kit_id' , 'in' , ('composition.kit' , 'id' , [('state','=','completed'),('composition_type','=','theoretical')]))]","['item_asset_id/id', 'item_kit_id/id', 'item_module', 'item_product_id/id', 'item_qty', 'item_uom_id/id']",USB,composition.item,,[MASTER] Theoretical Kit Composition List Line,Valid,,1831
 msf_usb_sync_data_server.cp_company,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['currency_id/id', 'name', 'partner_id/id', 'po_lead', 'rml_header', 'rml_header2', 'rml_header3', 'schedule_range', 'security_lead']",USB,res.company,,[MASTER] Company,Valid,,1890

=== modified file 'sync_client/message.py'
--- sync_client/message.py	2015-03-16 17:06:06 +0000
+++ sync_client/message.py	2015-10-09 08:08:50 +0000
@@ -356,8 +356,7 @@
             #UTP-682: double check to make sure if the message has been executed, then skip it
             if message.run:
                 continue
-            cr.execute("SAVEPOINT exec_message")
-
+            cr.commit()
             try:
                 model, method = self.get_model_and_method(message.remote_call)
                 arg = self.get_arg(message.arguments)
@@ -368,7 +367,8 @@
                 except BaseException, e:
                     error = e # Keep this message for the exception below
                     self._logger.exception("Message execution %d failed!" % message.id)
-                    cr.execute("ROLLBACK TO SAVEPOINT exec_message")
+                    cr.rollback()
+
                     if isinstance(e, osv.except_osv):
                         error_msg = e.value
                     else:
@@ -379,7 +379,6 @@
                         'log' : e.__class__.__name__+": "+tools.ustr(error_msg)+"\n\n--\n"+tools.ustr(traceback.format_exc()),
                     }, context=context)
                 else:
-                    cr.execute("RELEASE SAVEPOINT exec_message")
                     self.write(cr, uid, message.id, {
                         'execution_date' : execution_date,
                         'run' : True,

=== modified file 'sync_so/purchase.py'
--- sync_so/purchase.py	2015-07-22 13:03:42 +0000
+++ sync_so/purchase.py	2015-10-09 08:08:50 +0000
@@ -495,9 +495,6 @@
 
         so_po_common = self.pool.get('so.po.common')
         line_obj = self.pool.get('purchase.order.line')
-        partner_type = so_po_common.get_partner_type(cr, uid, source, context)
-        if partner_type == 'section':
-            raise Exception, "Sorry, the push low is not available for intersection partner! " + source
 
         # UF-1830: TODO: DO NOT CREATE ANYTHING FROM A RESTORE CASE!
         if context.get('restore_flag'):
@@ -516,6 +513,14 @@
         header_result['push_fo'] = True
         header_result['origin'] = so_dict.get('name', False)
 
+        partner_type = so_po_common.get_partner_type(cr, uid, source, context)  
+        if partner_type == 'section':
+            #US-620: If the FO type is donation or loan, then remove the analytic distribution
+            if so_info.order_type in ('loan', 'donation_st', 'donation_exp'):
+                del header_result['analytic_distribution_id']
+            else:
+                raise Exception, "Sorry, Push Flow for intersection partner is only available for Donation or Loan FOs! " + source
+
         # the case of intermission, the AD will be updated below, after creating the PO
         if partner_type == 'intermission':
             del header_result['analytic_distribution_id']