Merge lp:~jfb-tempo-consulting/unifield-wm/sync-us-178 into lp:unifield-wm/sync

[jftempo]

=== modified file 'msf_sync_data_server/data/sync_server.sync_rule.csv'
--- msf_sync_data_server/data/sync_server.sync_rule.csv	2015-03-26 10:27:20 +0000
+++ msf_sync_data_server/data/sync_server.sync_rule.csv	2015-04-02 13:48:37 +0000
@@ -81,7 +81,7 @@
 msf_sync_data_server.budget_line,TRUE,TRUE,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,bidirectional,Up,"[('type','=','normal'), ('state', '!=', 'draft')]",['state'],OC,msf.budget,,Budget status,Valid,,432
 msf_sync_data_server.mission_stock_report,TRUE,TRUE,FALSE,bidirectional,Up,"[('full_view', '=', False)]","['full_view', 'instance_id/id', 'last_update', 'name']",MISSION,stock.mission.report,,Mission Stock Report,Valid,,440
-msf_sync_data_server.mission_stock_report_line,TRUE,TRUE,FALSE,bidirectional,Up,"[('mission_report_id.full_view', '=', False)]","['categ_id/id', 'central_qty', 'central_val', 'cross_qty', 'cross_val', 'cu_qty', 'currency_id/id', 'cu_val', 'default_code', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'name', 'old_code', 'product_amc', 'product_id/id', 'reviewed_consumption', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'subtype', 'type', 'uom_id/id']",MISSION,stock.mission.report.line,,Mission Stock Report Line,Valid,,441
+msf_sync_data_server.mission_stock_report_line,TRUE,TRUE,FALSE,bidirectional,Up,"[('mission_report_id.full_view', '=', False)]","['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']",MISSION,stock.mission.report.line,,Mission Stock Report Line,Valid,,441
 msf_sync_data_server.financing_contract_formats,TRUE,TRUE,FALSE,bidirectional,Bidirectional,[],"['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,,450
 msf_sync_data_server.financing_contract_format_lines,TRUE,TRUE,TRUE,bidirectional,Bidirectional,[],"['account_destination_ids/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,,451
 msf_sync_data_server.financing_contract_format_lines_tree,TRUE,TRUE,FALSE,bidirectional,Bidirectional,"[('parent_id', '!=', '')]",['parent_id/id'],HQ + MISSION,financing.contract.format.line,,Financing Contract Format Lines Tree,Valid,,452
@@ -171,7 +171,7 @@
 msf_usb_sync_data_server.cp_account_move_state,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['instance_id/id', 'state']",USB,account.move,,[MASTER] Account Move State,Valid,,1540
 msf_usb_sync_data_server.cp_analytical_line,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['account_id/id', 'amount', 'amount_currency', 'code', 'cost_center_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distrib_line_id', 'document_date', 'general_account_id/id', 'instance_id/id', 'is_reallocated', 'is_reversal', 'journal_id/id', 'last_corrected_id/id', 'move_id/id', 'name', 'partner_txt', 'ref', 'reversal_origin/id', 'source_date', 'entry_sequence']",USB,account.analytic.line,,[MASTER] Analytical Line,Valid,,1550
 msf_usb_sync_data_server.cp_mission_stock_report,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,"[('full_view', '=', False)]","['full_view', 'instance_id/id', 'last_update', 'name']",USB,stock.mission.report,,[MASTER] Mission Stock Report,Valid,,1580
-msf_usb_sync_data_server.cp_mission_stock_report_line,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,"[('full_view', '=', False)]","['categ_id/id', 'central_qty', 'central_val', 'cross_qty', 'cross_val', 'cu_qty', 'currency_id/id', 'cu_val', 'default_code', 'in_pipe_coor_qty', 'in_pipe_coor_val', 'in_pipe_qty', 'in_pipe_val', 'internal_qty', 'internal_val', 'mission_report_id/id', 'name', 'old_code', 'product_amc', 'product_id/id', 'reviewed_consumption', 'secondary_qty', 'secondary_val', 'stock_qty', 'stock_val', 'subtype', 'type', 'uom_id/id']",USB,stock.mission.report.line,,[MASTER] Mission Stock Report Line,Valid,,1581
+msf_usb_sync_data_server.cp_mission_stock_report_line,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,"[('full_view', '=', False)]","['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']",USB,stock.mission.report.line,,[MASTER] Mission Stock Report Line,Valid,,1581
 msf_usb_sync_data_server.cp_country,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['code', 'name']",USB,res.country,,[MASTER] Country,Valid,,1600
 msf_usb_sync_data_server.cp_state,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['code', 'country_id/id', 'name']",USB,res.country.state,,[MASTER] State,Valid,,1601
 msf_usb_sync_data_server.cp_uom_categories,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],['name'],USB,product.uom.categ,,[MASTER] UoM Categories,Valid,,1610