Merge lp:~unifield-team/unifield-wm/us-649-sync into lp:unifield-wm/sync

[jftempo]

Unmerged revisions

620. By Vincent GREINER on 2015-12-08

US-649 [IMP] account.period.state sync rule: OC to HQ+MISSION / bidir to up

=== modified file 'msf_sync_data_server/data/sync_server.sync_rule.csv'
--- msf_sync_data_server/data/sync_server.sync_rule.csv	2015-12-21 20:22:41 +0000
+++ msf_sync_data_server/data/sync_server.sync_rule.csv	2016-01-20 14:10:03 +0000
@@ -27,6 +27,7 @@
 msf_sync_data_server.fp_tree0,TRUE,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,FALSE,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,FALSE,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
+<<<<<<< TREE
 msf_sync_data_server.periods_state,TRUE,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,FALSE,bidirectional,Bidirectional,[],['name'],OC,analytic.distribution,,Analytic Distribution,Valid,,200
 msf_sync_data_server.cost_center_distribution_line,TRUE,TRUE,TRUE,FALSE,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
@@ -37,6 +38,18 @@
 msf_sync_data_server.free_1_distribution_line,TRUE,TRUE,TRUE,FALSE,bidirectional,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,,220
 msf_sync_data_server.free_2_distribution_line,TRUE,TRUE,TRUE,FALSE,bidirectional,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,,221
 msf_sync_data_server.hq_entries,TRUE,TRUE,FALSE,FALSE,bidirectional,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.periods_state,TRUE,TRUE,TRUE,TRUE,bidirectional,Up,[],"['state', 'period_id/id', 'instance_id/id']",HQ + MISSION,account.period.state,,Periods states,Valid,,129
+msf_sync_data_server.analytic_distribution,TRUE,TRUE,FALSE,TRUE,bidirectional,Bidirectional,[],['name'],OC,analytic.distribution,,Analytic Distribution,Valid,,200
+msf_sync_data_server.cost_center_distribution_line,TRUE,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,FALSE,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
+msf_sync_data_server.cost_center_distribution_line_intermission,TRUE,TRUE,FALSE,TRUE,bidirectional,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', 'partner_type', 'source_date']",COORDINATIONS,cost.center.distribution.line,,Cost Center Distribution Line - Intermission,Valid,,203
+msf_sync_data_server.fp_distribution_line,TRUE,TRUE,TRUE,TRUE,bidirectional,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,,210
+msf_sync_data_server.fp_distribution_line_intermission,TRUE,TRUE,FALSE,TRUE,bidirectional,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,,211
+msf_sync_data_server.free_1_distribution_line,TRUE,TRUE,TRUE,TRUE,bidirectional,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,,220
+msf_sync_data_server.free_2_distribution_line,TRUE,TRUE,TRUE,TRUE,bidirectional,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,,221
+msf_sync_data_server.hq_entries,TRUE,TRUE,FALSE,TRUE,bidirectional,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
+>>>>>>> MERGE-SOURCE
 msf_sync_data_server.gl_journal_non_registers,TRUE,TRUE,FALSE,TRUE,bidirectional,Up,"[('type', '!=', 'cash'),('type', '!=', 'cheque'),('type', '!=', 'bank')]","['bank_journal_id/id','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_bank,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('type', '=', 'bank'),('instance_id.level', '=', 'section')]","['bank_journal_id/id','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 – Bank Registers (HQ),Valid,,261
 msf_sync_data_server.gl_journals_registers_coordo_bank,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('type', '=', 'bank'),('instance_id.level', '=', 'coordo')]","['bank_journal_id/id','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 – Bank Registers (Coordo),Valid,,262