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

[jftempo]

Unmerged revisions

371. By Olivier DOSSMANN on 2013-11-29

UTP-752 [ADD] 2 new field to synchronize from account.move.reconcile object:

  * instance_id
  * is_multi_instance

This is to make a difference between 2 or more - reconciled - lines that comes from multiple instance and from another instance.

The goal is to avoid problems of FX adjustment creation lines that create problems in accountancy

=== modified file 'msf_sync_data_server/data/sync_server.sync_rule.csv'
--- msf_sync_data_server/data/sync_server.sync_rule.csv	2013-11-29 13:33:13 +0000
+++ msf_sync_data_server/data/sync_server.sync_rule.csv	2013-12-02 09:46:00 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 id,active,applies_to_type,can_delete,direction_usb,direction,domain,included_fields,type_id,model_id,owner_field,name,status,forced_values,sequence_number
 msf_sync_data_server.analytic_account,TRUE,TRUE,FALSE,bidirectional,Down,"[('category' , 'in' , ['FREE1', 'FREE2', 'DEST'])]","['category', 'code', 'date', 'date_start', 'description', 'for_fx_gain_loss', 'name', 'type']",OC,account.analytic.account,,Analytic Accounts (Free 1 & 2 & Destination),Valid,,100
 msf_sync_data_server.cost_center_hq,TRUE,TRUE,FALSE,bidirectional,Down,"[('category' , '=' , 'OC'), ('parent_id', '=', '')]","['category', 'code', 'date', 'date_start', 'description', 'for_fx_gain_loss', 'name', 'type']",OC,account.analytic.account,,Cost Center (HQ),Valid,,101
@@ -242,3 +243,111 @@
 msf_usb_sync_data_server.access_rights_header,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,[],"['active', 'comment', 'domain_id/id', 'domain_text', 'family_model_ids/id', 'group_ids/id', 'instance_level', 'model_id/id', 'model_name', 'name', 'status']",USB,msf_field_access_rights.field_access_rule,,[USER RIGHTS] Field Access Rules,Valid,,4403
 msf_usb_sync_data_server.access_rights_lines,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,[],"['field/id', 'field_access_rule/id', 'field_access_rule_model_id', 'field_name', 'value_not_synchronized_on_create', 'value_not_synchronized_on_write', 'write_access']",USB,msf_field_access_rights.field_access_rule_line,,[USER RIGHTS] Field Access Rule Lines,Valid,,4404
 msf_usb_sync_data_server.button_access_rules,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['active', 'comment', 'group_ids/id', 'group_names', 'label', 'model_id/id', 'name', 'type', 'view_id/id']",USB,msf_button_access_rights.button_access_rule,,[USER RIGHTS] Button Access Rules,Valid,,4405
+=======
+id,active,applies_to_type,can_delete,direction,domain,included_fields,type_id,model_id,owner_field,name,status,forced_values,sequence_number
+msf_sync_data_server.analytic_account,TRUE,TRUE,FALSE,Down,"[('category' , 'in' , ['FREE1', 'FREE2', 'DEST'])]","['category', 'code', 'date', 'date_start', 'description', 'for_fx_gain_loss', 'name', 'type']",OC,account.analytic.account,,Analytic Accounts (Free 1 & 2 & Destination),Valid,,100
+msf_sync_data_server.cost_center_hq,TRUE,TRUE,FALSE,Down,"[('category' , '=' , 'OC'), ('parent_id', '=', '')]","['category', 'code', 'date', 'date_start', 'description', 'for_fx_gain_loss', 'name', 'type']",OC,account.analytic.account,,Cost Center (HQ),Valid,,101
+msf_sync_data_server.cost_center,TRUE,TRUE,FALSE,Bidirectional-Private,"[('category' , '=' , 'OC'), ('parent_id', '!=', '')]","['category', 'code', 'date', 'date_start', 'description', 'for_fx_gain_loss', 'name', 'type']",OC,account.analytic.account,category,Cost Center,Valid,,102
+msf_sync_data_server.cc_tree,TRUE,TRUE,FALSE,Bidirectional-Private,"[('category' , '=' , 'OC'), ('parent_id', '!=', '')]","['category', 'parent_id/id']",OC,account.analytic.account,category,CC Tree,Valid,,103
+msf_sync_data_server.proprietary_instance,TRUE,TRUE,FALSE,Bidirectional,[],"['code', 'instance', 'level', 'mission', 'move_prefix', 'name', 'note', 'reconcile_prefix', 'state']",OC,msf.instance,,Proprietary Instance,Valid,,104
+msf_sync_data_server.proprietary_instance_tree,TRUE,TRUE,FALSE,Bidirectional,"[('parent_id','!=','')]",['parent_id/id'],OC,msf.instance,,Proprietary Instance Tree,Valid,,105
+msf_sync_data_server.account_target_costcenter,TRUE,TRUE,FALSE,Bidirectional-Private,"[('instance_id.state','=','active')]","['cost_center_id/id', 'instance_id/id', 'is_po_fo_cost_center', 'is_target', 'is_top_cost_center']",OC,account.target.costcenter,instance_id,Instance Cost Centers,Valid,,106
+msf_sync_data_server.account_target_costcenter_tree,TRUE,TRUE,FALSE,Bidirectional-Private,"[('instance_id.state','=','active'), ('parent_id','!=','')]","['instance_id/id', 'parent_id/id']",OC,account.target.costcenter,instance_id,Instance Cost Centers Tree,Valid,,107
+msf_sync_data_server.fiscal_year,TRUE,TRUE,FALSE,Down,[],"['code', 'date_start', 'date_stop', 'name']",OC,account.fiscalyear,,Fiscal Year,Valid,,108
+msf_sync_data_server.periods,TRUE,TRUE,FALSE,Down,[],"['code', 'date_start', 'date_stop', 'fiscalyear_id/id', 'name', 'number', 'special']",OC,account.period,,Periods,Valid,{'state': 'Draft'},109
+msf_sync_data_server.currency_table_header,TRUE,TRUE,FALSE,Down,"[('state','=','valid')]","['code', 'name']",OC,res.currency.table,,Currency Table Header,Valid,,110
+msf_sync_data_server.currency,TRUE,TRUE,FALSE,Down,"['|', ('active', '=', ''), ('active', '!=', ''),('currency_table_id', '=', '')]","['accuracy', 'currency_name', 'name', 'rounding', 'symbol']",OC,res.currency,,Currency,Valid,,111
+msf_sync_data_server.currency_with_ref_to_cur_table,TRUE,TRUE,FALSE,Down,"['|', ('active', '=', ''), ('active', '!=', ''),('currency_table_id', '!=', '')]","['accuracy', 'currency_name', 'currency_table_id/id', 'name', 'reference_currency_id/id', 'rounding', 'symbol']",OC,res.currency,,Currency (with ref to cur table),Valid,,112
+msf_sync_data_server.currency_rate,TRUE,TRUE,FALSE,Down,"[('rate' , '!=' , ''),('currency_id', '!=', '')]","['currency_id/id', 'name', 'rate']",OC,res.currency.rate,,Currency Rate,Valid,,113
+msf_sync_data_server.currency_activator,TRUE,TRUE,FALSE,Down,"[('active', '!=', ''),('currency_table_id', '!=', '')]",['active'],OC,res.currency,,Currency activator,Valid,,114
+msf_sync_data_server.currency_table_header_state,TRUE,TRUE,FALSE,Down,"[('state','=','valid')]",['state'],OC,res.currency.table,,Currency Table Header State,Valid,,115
+msf_sync_data_server.gl_account_type,TRUE,TRUE,FALSE,Down,[],"['close_method', 'code', 'name', 'note', 'not_correctible', 'report_type']",OC,account.account.type,,GL Account Type,Valid,,116
+msf_sync_data_server.gl_accounts,TRUE,TRUE,FALSE,Down,[],"['code', 'default_destination_id/id', 'is_not_hq_correctible', 'name', 'note', 'reconcile', 'type', 'type_for_register', 'user_type/id']",OC,account.account,,GL Accounts,Valid,,117
+msf_sync_data_server.gl_accounts_tree,TRUE,TRUE,FALSE,Down,"[('parent_id', '!=', '')]",['parent_id/id'],OC,account.account,,GL Accounts Tree,Valid,,118
+msf_sync_data_server.analytical_journal_hq,TRUE,TRUE,FALSE,Down,"[('instance_id.level', '=', 'section'),('code','!=','ENGI')]","['active', 'code', 'name', 'type','instance_id/id']",OC,account.analytic.journal,,Analytical Journal (HQ),Valid,,119
+msf_sync_data_server.analytical_journal_coordo,TRUE,TRUE,FALSE,Down,"[('instance_id.level', '=', 'coordo'),('code','!=','ENGI')]","['active', 'code', 'name', 'type','instance_id/id']",MISSION,account.analytic.journal,,Analytical Journal (Coordo),Valid,,120
+msf_sync_data_server.analytical_journal_project,TRUE,TRUE,FALSE,Bidirectional,"[('instance_id.level', '=', 'project'),('code','!=','ENGI')]","['active', 'code', 'name', 'type','instance_id/id']",MISSION,account.analytic.journal,,Analytical Journal (Project),Valid,,121
+msf_sync_data_server.analytical_journal,TRUE,TRUE,FALSE,Bidirectional-Private,[],"['active', 'code', 'name', 'type','instance_id/id']",OC,account.analytic.journal,instance_id,Analytical Journal,Valid,,122
+msf_sync_data_server.link_accounts_destination,TRUE,TRUE,TRUE,Down,[],"['account_id/id', 'destination_id/id']",OC,account.destination.link,,Link accounts Destination,Valid,,123
+msf_sync_data_server.funding_pool,TRUE,TRUE,FALSE,Bidirectional,"[('category' , '=' , 'FUNDING')]","['category', 'code', 'cost_center_ids/id', 'date', 'date_start', 'description', 'name', 'tuple_destination_account_ids/id', 'type']",OC,account.analytic.account,,Funding Pool,Valid,,124
+msf_sync_data_server.fp_tree,TRUE,TRUE,FALSE,Down,"[('category', '!=', 'OC'),('parent_id', '!=', '')]",['parent_id/id'],OC,account.analytic.account,,FP Tree,Valid,,125
+msf_sync_data_server.analytic_distribution,TRUE,TRUE,FALSE,Bidirectional,[],['name'],OC,analytic.distribution,,Analytic Distribution,Valid,,200
+msf_sync_data_server.cost_center_distribution_line,TRUE,TRUE,FALSE,Bidirectional-Private,"[('analytic_id' , 'in' , ('account.analytic.account' , 'id' , [('code','!=','cc-intermission')]))]","['amount', 'analytic_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distribution_id/id', 'name', 'percentage', 'source_date']",OC,cost.center.distribution.line,analytic_id,Cost Center Distribution Line,Valid,,201
+msf_sync_data_server.cost_center_distribution_line_intermission,TRUE,TRUE,FALSE,Bidirectional,"[('analytic_id' , 'in' , ('account.analytic.account' , 'id' , [('code','=','cc-intermission')]))]","['amount', 'analytic_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distribution_id/id', 'name', 'percentage', 'source_date']",COORDINATIONS,cost.center.distribution.line,,Cost Center Distribution Line - Intermission,Valid,,202
+msf_sync_data_server.fp_distribution_line,TRUE,TRUE,FALSE,Bidirectional-Private,"[('cost_center_id' , 'in' , ('account.analytic.account' , 'id' , [('code','!=','cc-intermission')]))]","['amount', 'analytic_id/id', 'cost_center_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distribution_id/id', 'name', 'percentage', 'source_date']",OC,funding.pool.distribution.line,cost_center_id,FP Distribution Line,Valid,,203
+msf_sync_data_server.fp_distribution_line_intermission,TRUE,TRUE,FALSE,Bidirectional,"[('cost_center_id' , 'in' , ('account.analytic.account' , 'id' , [('code','=','cc-intermission')]))]","['amount', 'analytic_id/id', 'cost_center_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distribution_id/id', 'name', 'percentage', 'source_date']",COORDINATIONS,funding.pool.distribution.line,,FP Distribution Line - Intermission ,Valid,,204
+msf_sync_data_server.free_1_distribution_line,TRUE,TRUE,FALSE,Bidirectional,[],"['amount', 'analytic_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distribution_id/id', 'name', 'percentage', 'source_date']",OC,free.1.distribution.line,,Free 1 Distribution Line,Valid,,205
+msf_sync_data_server.free_2_distribution_line,TRUE,TRUE,FALSE,Bidirectional,[],"['amount', 'analytic_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distribution_id/id', 'name', 'percentage', 'source_date']",OC,free.2.distribution.line,,Free 2 Distribution Line,Valid,,206
+msf_sync_data_server.hq_entries,TRUE,TRUE,FALSE,Bidirectional-Private,[],"['account_id/id', 'account_id_first_value/id', 'amount', 'analytic_id/id', 'analytic_id_first_value/id', 'analytic_state', 'cost_center_id/id', 'cost_center_id_first_value/id', 'currency_id/id', 'date', 'destination_id/id', 'destination_id_first_value/id', 'document_date', 'free_1_id/id', 'free_2_id/id', 'name', 'partner_txt', 'period_id/id', 'ref', 'user_validated']",OC,hq.entries,cost_center_id,HQ Entries,Valid,,250
+msf_sync_data_server.gl_journal_non_registers,TRUE,TRUE,FALSE,Up,"[('type', '!=', 'cash'),('type', '!=', 'cheque'),('type', '!=', 'bank')]","['analytic_journal_id/id', 'code', 'currency/id', 'default_credit_account_id/id', 'default_debit_account_id/id', 'name', 'type','instance_id/id']",OC,account.journal,,GL Journal (Non Registers),Valid,,260
+msf_sync_data_server.gl_journals_registers_hq,TRUE,TRUE,FALSE,Down,"['|','|',('type', '=', 'cash'),('type', '=', 'cheque'),('type', '=', 'bank'),('instance_id.level', '=', 'section')]","['analytic_journal_id/id', 'code', 'currency/id', 'default_credit_account_id/id', 'default_debit_account_id/id', 'name', 'type','instance_id/id']",OC,account.journal,,GL Journals - Registers (HQ),Valid,,261
+msf_sync_data_server.gl_journals_registers_coordo,TRUE,TRUE,FALSE,Down,"['|','|',('type', '=', 'cash'),('type', '=', 'cheque'),('type', '=', 'bank'),('instance_id.level', '=', 'coordo')]","['analytic_journal_id/id', 'code', 'currency/id', 'default_credit_account_id/id', 'default_debit_account_id/id', 'name', 'type','instance_id/id']",MISSION,account.journal,,GL Journals - Registers (Coordo),Valid,,262
+msf_sync_data_server.gl_journals_registers,TRUE,TRUE,FALSE,Bidirectional-Private,"['|','|',('type', '=', 'cash'),('type', '=', 'cheque'),('type', '=', 'bank')]","['analytic_journal_id/id', 'code', 'currency/id', 'default_credit_account_id/id', 'default_debit_account_id/id', 'name', 'type','instance_id/id']",OC,account.journal,instance_id,GL Journals - Registers,Valid,,263
+msf_sync_data_server.section_partner,TRUE,TRUE,FALSE,Down,"[('partner_type' , '=' , 'esc')]","['comment', 'credit_limit', 'customer', 'customer_lt', 'lang', 'manufacturer', 'name', 'partner_type', 'po_by_project', 'procurement_lt', 'property_account_payable/id', 'property_account_position/id', 'property_account_receivable/id', 'property_payment_term/id', 'property_product_pricelist/id', 'property_product_pricelist_purchase/id', 'property_stock_customer/id', 'property_stock_supplier/id', 'ref', 'supplier', 'supplier_lt', 'transport_0', 'transport_0_lt', 'transport_1', 'transport_1_lt', 'transport_2', 'transport_2_lt']",COORDINATIONS,res.partner,,Section Partner,Valid,,300
+msf_sync_data_server.section_partner_tree,TRUE,TRUE,FALSE,Down,"[('partner_type','=','esc') , ('parent_id', '!=', '')]",['parent_id/id'],COORDINATIONS,res.partner,,Section Partner Tree,Valid,,301
+msf_sync_data_server.section_partner_address,TRUE,TRUE,FALSE,Down,"[('partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type','=','esc')]))]","['active', 'city', 'country_id/id', 'email', 'fax', 'function', 'mobile', 'name', 'partner_id/id', 'phone', 'state_id/id', 'street', 'street2', 'title/id', 'type', 'zip']",COORDINATIONS,res.partner.address,,Section Partner Address,Valid,,302
+msf_sync_data_server.external_partner,TRUE,TRUE,FALSE,Bidirectional,"[('partner_type' , '=' , 'external'),('name','!=','Local Market')]","['name', 'partner_type', 'property_account_receivable/id', 'property_account_payable/id', 'customer','supplier','zone']",HQ + MISSION,res.partner,,External Partner,Valid,{'active':False},310
+msf_sync_data_server.external_partner_tree,TRUE,TRUE,FALSE,Bidirectional,"[('partner_type' , '=' , 'external'),('name','!=','Local Market'), ('parent_id', '!=', '')]",['parent_id/id'],HQ + MISSION,res.partner,,External Partner Tree,Valid,,311
+msf_sync_data_server.internal_partner,TRUE,TRUE,FALSE,Bidirectional,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_type' , '=' , 'internal')]","['comment', 'credit_limit', 'customer', 'customer_lt', 'lang', 'manufacturer', 'name', 'partner_type', 'po_by_project', 'procurement_lt', 'property_account_payable/id', 'property_account_position/id', 'property_account_receivable/id', 'property_payment_term/id', 'property_stock_customer/id', 'property_stock_supplier/id', 'ref', 'supplier', 'supplier_lt', 'transport_0', 'transport_0_lt', 'transport_1', 'transport_1_lt', 'transport_2', 'transport_2_lt']",MISSION,res.partner,,Internal Partner,Valid,"{'active': True, 'customer': True, 'supplier': True, 'partner_type': 'internal'}",312
+msf_sync_data_server.internal_partner_tree,TRUE,TRUE,FALSE,Bidirectional,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_type' , '=' , 'internal'), ('parent_id', '!=', '')]",['parent_id/id'],MISSION,res.partner,,Internal Partner Tree,Valid,,313
+msf_sync_data_server.internal_partner_address,TRUE,TRUE,FALSE,Bidirectional,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type' , '=' , 'internal')]))]","['active', 'city', 'country_id/id', 'email', 'fax', 'function', 'mobile', 'name', 'partner_id/id', 'phone', 'state_id/id', 'street', 'street2', 'title/id', 'type', 'zip']",MISSION,res.partner.address,,Internal Partner Address,Valid,,314
+msf_sync_data_server.intermission_partner,TRUE,TRUE,FALSE,Bidirectional,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_type' , '=' , 'intermission')]","['customer', 'manufacturer', 'name', 'partner_type', 'property_account_payable/id', 'property_account_receivable/id', 'ref', 'supplier']",COORDINATIONS,res.partner,,Intermission Partner,Valid,"{'customer': True, 'supplier': True}",320
+msf_sync_data_server.intermission_partner_tree,TRUE,TRUE,FALSE,Bidirectional,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_type' , '=' , 'intermission'), ('parent_id', '!=', '')]",['parent_id/id'],COORDINATIONS,res.partner,,Intermission Partner Tree,Valid,,321
+msf_sync_data_server.intermission_partner_address,TRUE,TRUE,FALSE,Bidirectional,"['|', ('active', '=', ''), ('active', '!=', ''),('partner_id' , 'in' , ('res.partner' , 'id' , [('partner_type' , '=' , 'intermission')]))]","['active', 'city', 'country_id/id', 'email', 'fax', 'function', 'mobile', 'name', 'partner_id/id', 'phone', 'state_id/id', 'street', 'street2', 'title/id', 'type', 'zip']",COORDINATIONS,res.partner.address,,Intermission Partner Address,Valid,,322
+msf_sync_data_server.job_description,TRUE,TRUE,FALSE,Bidirectional,[],"['code', 'description', 'expected_employees', 'name', 'requirements', 'state']",HQ + MISSION,hr.job,,Job Description,Valid,,330
+msf_sync_data_server.expatriate_employees,TRUE,TRUE,FALSE,Bidirectional,"[('employee_type','=','ex'),('name','!=','Administrator')]","['active', 'birthday', 'code', 'cost_center_id/id', 'country_id/id', 'destination_id/id','employee_type', 'filter_for_third_party', 'free1_id/id', 'free2_id/id', 'funding_pool_id/id', 'gender', 'homere_codeterrain', 'homere_id_staff', 'homere_id_unique', 'identification_id', 'job_id/id', 'marital/id', 'mobile_phone', 'name', 'name_resource', 'notes', 'passport_id', 'private_phone', 'resource_type', 'sinid', 'ssnid', 'work_email', 'work_location', 'work_phone']",HQ + MISSION,hr.employee,,Expatriate Employees,Valid,,331
+msf_sync_data_server.expatriate_employees_tree,FALSE,TRUE,FALSE,Bidirectional,"[('parent_id', '!=', '')]",['parent_id/id'],HQ + MISSION,hr.employee,,Expatriate Employees Tree,Valid,,332
+msf_sync_data_server.expatriate_employees_coach,FALSE,TRUE,FALSE,Bidirectional,"[('coach_id', '!=', '')]",['coach_id/id'],HQ + MISSION,hr.employee,,Expatriate Employees Coach,Valid,,333
+msf_sync_data_server.local_employees,TRUE,TRUE,FALSE,Up,"[('employee_type','=','local'),('name','!=','Administrator')]","['active', 'birthday', 'code', 'cost_center_id/id', 'employee_type', 'filter_for_third_party', 'free1_id/id', 'free2_id/id', 'funding_pool_id/id', 'gender', 'homere_codeterrain', 'homere_id_staff', 'homere_id_unique', 'identification_id', 'job_id/id', 'marital/id', 'mobile_phone', 'name', 'name_resource', 'notes', 'passport_id', 'private_phone', 'resource_type', 'sinid', 'ssnid', 'work_email', 'work_location', 'work_phone']",OC,hr.employee,,Local Employees,Valid,,334
+msf_sync_data_server.register,TRUE,TRUE,FALSE,Bidirectional-Private,"[('state','!=','draft'),('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')]))]","['balance_end_real', 'balance_start', 'closing_date', 'comments', 'date', 'instance_id/id', 'journal_id/id', 'name', 'notes', 'open_advance_amount', 'period_id/id','closing_balance_frozen','unrecorded_expenses_amount']",MISSION,account.bank.statement,instance_id,Register,Valid,,400
+msf_sync_data_server.register_line,TRUE,TRUE,TRUE,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['account_id/id', 'amount_in', 'amount_out', 'analytic_distribution_id/id', 'cheque_number', 'date', 'direct_invoice', 'document_date', 'employee_id/id', 'instance_id/id', 'name', 'note', 'partner_id/id', 'reconciled', 'ref', 'sequence', 'statement_id/id', 'transfer_amount','transfer_journal_id/id', 'type']",MISSION,account.bank.statement.line,instance_id,Register Line,Valid,,401
+msf_sync_data_server.register_cashbox_line_starting,TRUE,TRUE,FALSE,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('starting_id','in',('account.bank.statement','id',[('state','!=','draft')])),('starting_id', '!=', ''),('ending_id', '=', '')]","['instance_id/id', 'number', 'pieces', 'starting_id/id']",MISSION,account.cashbox.line,instance_id,Register Cashbox Line (starting),Valid,,402
+msf_sync_data_server.register_status,TRUE,TRUE,FALSE,Bidirectional-Private,"[('state','!=','draft'),('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')]))]","['instance_id/id', 'state']",MISSION,account.bank.statement,instance_id,Register Status,Valid,,403
+msf_sync_data_server.register_cashbox_line_ending,TRUE,TRUE,FALSE,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('ending_id','in',('account.bank.statement','id',[('state','!=','draft')])),('starting_id', '=', ''),('ending_id', '!=', '')]","['ending_id/id', 'instance_id/id', 'number', 'pieces']",MISSION,account.cashbox.line,instance_id,Register Cashbox Line (ending),Valid,,404
+msf_sync_data_server.account_move_reconcile,TRUE,TRUE,FALSE,Bidirectional,[],"['name', 'type', 'is_multi_instance', 'instance_id']",OC,account.move.reconcile,,Account Move Reconcile,Valid,,410
+msf_sync_data_server.account_move,TRUE,TRUE,TRUE,Bidirectional-Private,[],"['date', 'document_date', 'journal_id/id', 'name', 'narration', 'period_id/id', 'ref', 'statement_line_ids/id', 'to_check','instance_id/id','status','employee_id/id','transfer_journal_id/id','manual_currency_id/id','block_manual_currency_id','partner_id2/id','analytic_distribution_id/id']",OC,account.move,instance_id,Account Move,Valid,,411
+msf_sync_data_server.account_move_line,TRUE,TRUE,TRUE,Bidirectional-Private,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date_created', 'date_maturity', 'debit', 'debit_currency', 'document_date', 'employee_id/id', 'have_an_historic', 'instance_id/id', 'is_addendum_line', 'is_transfer_with_change', 'is_write_off', 'journal_id/id', 'move_id/id', 'name', 'narration', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'reconcile_partial_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount']",OC,account.move.line,instance_id,Account Move Line,Valid,,412
+msf_sync_data_server.account_move_line_correction,TRUE,TRUE,FALSE,Bidirectional-Private,"[('move_id','in',('account.move','id',[('state','=','posted')]))]","['corrected_line_id/id', 'instance_id/id', 'reversal_line_id/id']",OC,account.move.line,instance_id,Account Move Line Correction,Valid,,413
+msf_sync_data_server.account_move_line_register_line,TRUE,TRUE,FALSE,Bidirectional-Private,[],"['corrected_st_line_id/id', 'instance_id/id']",MISSION,account.move.line,instance_id,Account Move Line / Register Line,Valid,,414
+msf_sync_data_server.register_line_account_move_line,TRUE,TRUE,FALSE,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['first_move_line_id/id','imported_invoice_line_ids/id','instance_id/id']",MISSION,account.bank.statement.line,instance_id,Register Line / Account Move Line,Valid,,415
+msf_sync_data_server.account_move_state,TRUE,TRUE,FALSE,Bidirectional-Private,[],"['instance_id/id', 'state']",OC,account.move,instance_id,Account Move State,Valid,,416
+msf_sync_data_server.analytical_line,TRUE,TRUE,TRUE,Bidirectional-Private,"[('imported_commitment','=',False)]","['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', 'move_id/id', 'name', 'ref', 'reversal_origin/id', 'source_date', 'entry_sequence']",OC,account.analytic.line,cost_center_id,Analytical Line,Valid,,420
+msf_sync_data_server.budget,TRUE,TRUE,FALSE,Up,"[('type','=','normal')]","['code', 'cost_center_id/id', 'currency_id/id', 'decision_moment_id/id', 'decision_moment_order', 'display_type', 'fiscalyear_id/id', 'name', 'type', 'version']",OC,msf.budget,,Budget,Valid,,430
+msf_sync_data_server.budget_line,TRUE,TRUE,FALSE,Up,"[('budget_id','in',('msf.budget','id',[('type','=','normal')])), ('line_type','=','destination')]","['account_id/id', 'budget_id/id', 'budget_values', 'destination_id/id', 'line_type']",OC,msf.budget.line,,Budget line,Valid,,431
+msf_sync_data_server.budget_status,TRUE,TRUE,FALSE,Up,"[('type','=','normal')]",['state'],OC,msf.budget,,Budget status,Valid,,432
+msf_sync_data_server.mission_stock_report,FALSE,TRUE,FALSE,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,FALSE,TRUE,FALSE,Up,"[('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.financing_contract_formats,TRUE,TRUE,FALSE,Bidirectional,[],"['cost_center_ids/id', 'eligibility_from_date', 'eligibility_to_date', 'format_name', 'overhead_percentage', 'overhead_type', 'reporting_type']",COORDINATIONS,financing.contract.format,,Financing Contract Formats,Valid,,450
+msf_sync_data_server.financing_contract_format_lines,TRUE,TRUE,TRUE,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']",COORDINATIONS,financing.contract.format.line,,Financing Contract Format Lines,Valid,,451
+msf_sync_data_server.financing_contract_format_lines_tree,TRUE,TRUE,FALSE,Bidirectional,"[('parent_id', '!=', '')]",['parent_id/id'],COORDINATIONS,financing.contract.format.line,,Financing Contract Format Lines Tree,Valid,,452
+msf_sync_data_server.donors,TRUE,TRUE,FALSE,Bidirectional,[],"['active', 'code', 'format_id/id', 'name']",COORDINATIONS,financing.contract.donor,,Donors,Valid,,453
+msf_sync_data_server.financing_contract,TRUE,TRUE,FALSE,Bidirectional,[],"['code', 'currency_table_id/id', 'donor_grant_reference', 'donor_id/id', 'eligibility_from_date', 'eligibility_to_date', 'format_id/id', 'grant_amount', 'hard_closed_date', 'hq_grant_reference', 'name', 'notes', 'open_date', 'reporting_currency/id', 'soft_closed_date', 'state']",COORDINATIONS,financing.contract.contract,,Financing Contract,Valid,,454
+msf_sync_data_server.financing_contract_fp_line,TRUE,TRUE,TRUE,Bidirectional,[],"['contract_id/id', 'funded', 'funding_pool_id/id', 'total_project']",COORDINATIONS,financing.contract.funding.pool.line,,Financing Contract FP Line,Valid,,455
+msf_sync_data_server.country,TRUE,TRUE,FALSE,Down,[],"['code', 'name']",OC,res.country,,Country,Valid,,500
+msf_sync_data_server.state,TRUE,TRUE,FALSE,Down,[],"['code', 'country_id/id', 'name']",OC,res.country.state,,State,Valid,,501
+msf_sync_data_server.uom_categories,TRUE,TRUE,FALSE,Down,[],['name'],OC,product.uom.categ,,UoM Categories,Valid,,510
+msf_sync_data_server.uom,TRUE,TRUE,FALSE,Down,[],"['category_id/id', 'factor', 'factor_inv', 'name', 'rounding', 'uom_type']",OC,product.uom,,UoM,Valid,,511
+msf_sync_data_server.nomenclature,TRUE,TRUE,FALSE,Down,[],"['level', 'name', 'type']",OC,product.nomenclature,,Nomenclature,Valid,,520
+msf_sync_data_server.nomenclature_tree,TRUE,TRUE,FALSE,Down,"[('parent_id', '!=', '')]",['parent_id/id'],OC,product.nomenclature,,Nomenclature Tree,Valid,,521
+msf_sync_data_server.product_category,TRUE,TRUE,FALSE,Down,[],"['active', 'donation_expense_account/id', 'family_id/id', 'name', 'property_account_expense_categ/id', 'property_account_income_categ/id', 'property_stock_account_input_categ/id', 'property_stock_account_output_categ/id', 'property_stock_journal/id', 'property_stock_variation/id', 'type']",OC,product.category,,Product Category,Valid,,530
+msf_sync_data_server.product_category_tree,TRUE,TRUE,FALSE,Down,"[('parent_id', '!=', '')]",['parent_id/id'],OC,product.category,,Product Category Tree,Valid,,531
+msf_sync_data_server.justification_code,TRUE,TRUE,FALSE,Down,[],"['code', 'description']",OC,product.justification.code,,Justification Code,Valid,,540
+msf_sync_data_server.asset_type,TRUE,TRUE,FALSE,Down,[],['name'],OC,product.asset.type,,Asset Type,Valid,,550
+msf_sync_data_server.pricelist_type,FALSE,TRUE,FALSE,Bidirectional,[],"['key', 'name']",MISSION,product.pricelist.type,,Pricelist Type,Valid,,560
+msf_sync_data_server.price_list_version,FALSE,TRUE,FALSE,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,Down,[],['name'],MISSION,res.country.restriction,,Country restrictions,Valid,,570
+msf_sync_data_server.standard_product_list,TRUE,TRUE,FALSE,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,,580
+msf_sync_data_server.standard_product_list_line,TRUE,TRUE,FALSE,Down,[],"['comment','list_id/id','ref','name']",OC,product.list.line,,Standard Product List Line,Valid,,581
+msf_sync_data_server.oc_product_creator_itc_esc_hq,TRUE,TRUE,FALSE,Down,"['|','|',('international_status','=','ITC'),('international_status','=','ESC'),('international_status','=','HQ')]","['alert_time', 'batch_management', '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']",OC,product.product,,"OC Product (Creator = ITC, ESC or HQ)",Valid,,600
+msf_sync_data_server.mission_product_creator_local,TRUE,TRUE,FALSE,Down,"[('international_status','=','Local')]","['alert_time', 'batch_management', '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']",MISSION,product.product,,Mission Product (Creator = local),Valid,,601
+msf_sync_data_server.tax_code,TRUE,TRUE,FALSE,Down,[],"['code', 'info', 'name', 'notprintable', 'sign']",OC,account.tax.code,,Tax Code,Valid,,610
+msf_sync_data_server.tax_code_tree,TRUE,TRUE,FALSE,Down,"[('parent_id','!=','')]",['parent_id/id'],OC,account.tax.code,,Tax Code Tree,Valid,,611
+msf_sync_data_server.account_tax,TRUE,TRUE,FALSE,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
+msf_sync_data_server.account_tax_tree,TRUE,TRUE,FALSE,Down,"[('parent_id','!=','')]",['parent_id/id'],OC,account.tax,,Account Tax Tree,Valid,,613
+msf_sync_data_server.user_groups,TRUE,TRUE,FALSE,Down,[],"['comment', 'menu_access/id', 'name', 'visible_res_groups']",OC,res.groups,,User Groups,Valid,,700
+msf_sync_data_server.ACL,TRUE,TRUE,TRUE,Down,[],"['group_id/id', 'model_id/id', 'name', 'perm_create', 'perm_read', 'perm_unlink', 'perm_write']",OC,ir.model.access,,Access Control Lists,Valid,,701
+msf_sync_data_server.record_rules,TRUE,TRUE,TRUE,Down,[],"['domain_force', 'global', 'groups/id', 'model_id/id', 'name', 'perm_create', 'perm_read', 'perm_unlink', 'perm_write']",OC,ir.rule,,Record Rules,Valid,,702
+msf_sync_data_server.access_rights_header,TRUE,TRUE,TRUE,Down,[],"['active', 'comment', 'domain_id/id', 'domain_text', 'family_model_ids/id', 'group_ids/id', 'instance_level', 'model_id/id', 'model_name', 'name', 'status']",OC,msf_field_access_rights.field_access_rule,,Field Access Rules,Valid,,703
+msf_sync_data_server.access_rights_lines,TRUE,TRUE,TRUE,Down,[],"['field/id', 'field_access_rule/id', 'field_access_rule_model_id', 'field_name', 'value_not_synchronized_on_create', 'value_not_synchronized_on_write', 'write_access']",OC,msf_field_access_rights.field_access_rule_line,,Field Access Rule Lines,Valid,,704
+msf_sync_data_server.button_access_rules,TRUE,TRUE,FALSE,Down,[],"['active', 'comment', 'group_ids/id', 'group_names', 'label', 'model_id/id', 'name', 'type', 'view_id/id']",OC,msf_button_access_rights.button_access_rule,,Button Access Rules,Valid,,705
+>>>>>>> MERGE-SOURCE