Merge lp:~unifield-team/unifield-wm/us-822-sync into lp:unifield-wm/sync
- us-822-sync
- Merge into sync_module_prod
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 633 |
Proposed branch: | lp:~unifield-team/unifield-wm/us-822-sync |
Merge into: | lp:unifield-wm/sync |
Diff against target: |
35 lines (+8/-3) (has conflicts) 1 file modified
msf_sync_data_server/data/sync_server.sync_rule.csv (+8/-3) Text conflict in msf_sync_data_server/data/sync_server.sync_rule.csv |
To merge this branch: | bzr merge lp:~unifield-team/unifield-wm/us-822-sync |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Sync Reviewer | Pending | ||
Review via email: mp+283763@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'msf_sync_data_server/data/sync_server.sync_rule.csv' | |||
2 | --- msf_sync_data_server/data/sync_server.sync_rule.csv 2016-01-21 10:22:31 +0000 | |||
3 | +++ msf_sync_data_server/data/sync_server.sync_rule.csv 2016-01-25 08:54:32 +0000 | |||
4 | @@ -8,7 +8,7 @@ | |||
5 | 8 | msf_sync_data_server.account_target_costcenter,TRUE,TRUE,TRUE,TRUE,bidirectional,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 | 8 | msf_sync_data_server.account_target_costcenter,TRUE,TRUE,TRUE,TRUE,bidirectional,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 |
6 | 9 | msf_sync_data_server.account_target_costcenter_tree,TRUE,TRUE,FALSE,TRUE,bidirectional,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 | 9 | msf_sync_data_server.account_target_costcenter_tree,TRUE,TRUE,FALSE,TRUE,bidirectional,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 |
7 | 10 | msf_sync_data_server.fiscal_year,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['code', 'date_start', 'date_stop', 'name', 'state']",OC,account.fiscalyear,,Fiscal Year,Valid,,108 | 10 | msf_sync_data_server.fiscal_year,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['code', 'date_start', 'date_stop', 'name', 'state']",OC,account.fiscalyear,,Fiscal Year,Valid,,108 |
9 | 11 | msf_sync_data_server.periods,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['code', 'date_start', 'date_stop', 'fiscalyear_id/id', 'name', 'number', 'special', 'state_sync_flag']",OC,account.period,,Periods,Valid,,109 | 11 | msf_sync_data_server.periods,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('active', 'in', ['t', 'f'])]","['active', 'code', 'date_start', 'date_stop', 'fiscalyear_id/id', 'name', 'number', 'special', 'state_sync_flag']",OC,account.period,,Periods,Valid,,109 |
10 | 12 | msf_sync_data_server.currency_table_header,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('state','=','valid')]","['code', 'name']",OC,res.currency.table,,Currency Table Header,Valid,,110 | 12 | msf_sync_data_server.currency_table_header,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('state','=','valid')]","['code', 'name']",OC,res.currency.table,,Currency Table Header,Valid,,110 |
11 | 13 | msf_sync_data_server.currency,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|', ('active', '=', ''), ('active', '!=', ''),('currency_table_id', '=', '')]","['accuracy', 'currency_name', 'name', 'rounding', 'symbol']",OC,res.currency,,Currency,Valid,,111 | 13 | msf_sync_data_server.currency,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|', ('active', '=', ''), ('active', '!=', ''),('currency_table_id', '=', '')]","['accuracy', 'currency_name', 'name', 'rounding', 'symbol']",OC,res.currency,,Currency,Valid,,111 |
12 | 14 | msf_sync_data_server.currency_with_ref_to_cur_table,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|', ('active', '=', ''), ('active', '!=', ''),('currency_table_id', '!=', ''), ('currency_table_id.state', '=', 'valid')]","['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 | 14 | msf_sync_data_server.currency_with_ref_to_cur_table,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"['|', ('active', '=', ''), ('active', '!=', ''),('currency_table_id', '!=', ''), ('currency_table_id.state', '=', 'valid')]","['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 |
13 | @@ -16,7 +16,7 @@ | |||
14 | 16 | msf_sync_data_server.currency_activator,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('active', '!=', ''),('currency_table_id', '!=', ''), ('currency_table_id.state', '=', 'valid')]",['active'],OC,res.currency,,Currency activator,Valid,,114 | 16 | msf_sync_data_server.currency_activator,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('active', '!=', ''),('currency_table_id', '!=', ''), ('currency_table_id.state', '=', 'valid')]",['active'],OC,res.currency,,Currency activator,Valid,,114 |
15 | 17 | msf_sync_data_server.currency_table_header_state,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('state','=','valid')]",['state'],OC,res.currency.table,,Currency Table Header State,Valid,,115 | 17 | msf_sync_data_server.currency_table_header_state,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('state','=','valid')]",['state'],OC,res.currency.table,,Currency Table Header State,Valid,,115 |
16 | 18 | msf_sync_data_server.gl_account_type,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['close_method', 'code', 'name', 'note', 'not_correctible', 'report_type']",OC,account.account.type,,GL Account Type,Valid,,116 | 18 | msf_sync_data_server.gl_account_type,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['close_method', 'code', 'name', 'note', 'not_correctible', 'report_type']",OC,account.account.type,,GL Account Type,Valid,,116 |
18 | 19 | msf_sync_data_server.gl_accounts,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['accrual_account','code', 'default_destination_id/id', 'inactivation_date', 'activation_date', 'is_not_hq_correctible', 'name', 'note', 'reconcile', 'shrink_entries_for_hq', 'type', 'type_for_register', 'user_type/id', 'currency_revaluation']",OC,account.account,,GL Accounts,Valid,,117 | 19 | msf_sync_data_server.gl_accounts,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,[],"['accrual_account','code', 'default_destination_id/id', 'inactivation_date', 'activation_date', 'is_not_hq_correctible', 'name', 'note', 'reconcile', 'shrink_entries_for_hq', 'type', 'type_for_register', 'user_type/id', 'currency_revaluation', 'include_in_yearly_move']",OC,account.account,,GL Accounts,Valid,,117 |
19 | 20 | msf_sync_data_server.gl_accounts_tree,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('parent_id', '!=', '')]",['parent_id/id'],OC,account.account,,GL Accounts Tree,Valid,,118 | 20 | msf_sync_data_server.gl_accounts_tree,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('parent_id', '!=', '')]",['parent_id/id'],OC,account.account,,GL Accounts Tree,Valid,,118 |
20 | 21 | msf_sync_data_server.analytical_journal_hq,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('instance_id.level', '=', 'section'),('code','!=','ENGI')]","['active', 'code', 'name', 'type','instance_id/id']",OC,account.analytic.journal,,Analytical Journal (HQ),Valid,,119 | 21 | msf_sync_data_server.analytical_journal_hq,TRUE,TRUE,FALSE,TRUE,bidirectional,Down,"[('instance_id.level', '=', 'section'),('code','!=','ENGI')]","['active', 'code', 'name', 'type','instance_id/id']",OC,account.analytic.journal,,Analytical Journal (HQ),Valid,,119 |
21 | 22 | msf_sync_data_server.analytical_journal_coordo,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('instance_id.level', '=', 'coordo'),('code','!=','ENGI')]","['active', 'code', 'name', 'type','instance_id/id']",MISSION,account.analytic.journal,,Analytical Journal (Coordo),Valid,,120 | 22 | msf_sync_data_server.analytical_journal_coordo,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,"[('instance_id.level', '=', 'coordo'),('code','!=','ENGI')]","['active', 'code', 'name', 'type','instance_id/id']",MISSION,account.analytic.journal,,Analytical Journal (Coordo),Valid,,120 |
22 | @@ -27,7 +27,12 @@ | |||
23 | 27 | 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 | 27 | 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 |
24 | 28 | 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 | 28 | 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 |
25 | 29 | 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 | 29 | 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 |
27 | 30 | 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 | 30 | <<<<<<< TREE |
28 | 31 | 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 | ||
29 | 32 | ======= | ||
30 | 33 | 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 | ||
31 | 34 | msf_sync_data_server.fys_state,TRUE,TRUE,TRUE,TRUE,bidirectional,Up,[],"['state', 'fy_id/id', 'instance_id/id']",HQ + MISSION,account.fiscalyear.state,,Fiscal years states,Valid,,130 | ||
32 | 35 | >>>>>>> MERGE-SOURCE | ||
33 | 31 | msf_sync_data_server.analytic_distribution,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional,[],['name'],OC,analytic.distribution,,Analytic Distribution,Valid,,200 | 36 | msf_sync_data_server.analytic_distribution,TRUE,TRUE,FALSE,FALSE,bidirectional,Bidirectional,[],['name'],OC,analytic.distribution,,Analytic Distribution,Valid,,200 |
34 | 32 | 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 | 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 |
35 | 33 | msf_sync_data_server.cost_center_distribution_line_non_internal,TRUE,TRUE,FALSE,FALSE,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 | 38 | msf_sync_data_server.cost_center_distribution_line_non_internal,TRUE,TRUE,FALSE,FALSE,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 |