Merge lp:~odossmann/unifield-wm/UFTP_376_sync into lp:unifield-wm/sync
- UFTP_376_sync
- Merge into sync_module_prod
Proposed by
jftempo
Status: | Merged |
---|---|
Merged at revision: | 521 |
Proposed branch: | lp:~odossmann/unifield-wm/UFTP_376_sync |
Merge into: | lp:unifield-wm/sync |
Diff against target: |
25 lines (+3/-3) 1 file modified
msf_sync_data_server/data/sync_server.sync_rule.csv (+3/-3) |
To merge this branch: | bzr merge lp:~odossmann/unifield-wm/UFTP_376_sync |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
UniField Sync Reviewer | Pending | ||
Review via email: mp+241781@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
- 520. By Olivier DOSSMANN
-
UFTP-376 [FIX] Register line synchronization doesn't take into account the direct_
invoice_ move_id. Should be placed in another synchronization rule.
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 2014-11-10 08:25:42 +0000 | |||
3 | +++ msf_sync_data_server/data/sync_server.sync_rule.csv 2014-11-14 14:28:27 +0000 | |||
4 | @@ -67,10 +67,10 @@ | |||
5 | 67 | msf_sync_data_server.register_cashbox_line_ending,TRUE,TRUE,FALSE,bidirectional,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 | 67 | msf_sync_data_server.register_cashbox_line_ending,TRUE,TRUE,FALSE,bidirectional,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 |
6 | 68 | msf_sync_data_server.account_move_reconcile,TRUE,TRUE,TRUE,bidirectional,Bidirectional,[],"['name', 'type', 'is_multi_instance', 'multi_instance_level_creation', 'instance_id']",OC,account.move.reconcile,,Account Move Reconcile,Valid,,410 | 68 | msf_sync_data_server.account_move_reconcile,TRUE,TRUE,TRUE,bidirectional,Bidirectional,[],"['name', 'type', 'is_multi_instance', 'multi_instance_level_creation', 'instance_id']",OC,account.move.reconcile,,Account Move Reconcile,Valid,,410 |
7 | 69 | msf_sync_data_server.account_move,TRUE,TRUE,TRUE,bidirectional,Bidirectional-Private,[],"['date', 'document_date', 'imported', '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 | 69 | msf_sync_data_server.account_move,TRUE,TRUE,TRUE,bidirectional,Bidirectional-Private,[],"['date', 'document_date', 'imported', '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 |
9 | 70 | msf_sync_data_server.account_move_line,TRUE,TRUE,TRUE,bidirectional,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 | 70 | msf_sync_data_server.account_move_line,TRUE,TRUE,TRUE,bidirectional,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_counterpart', '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 |
10 | 71 | msf_sync_data_server.account_move_line_correction,TRUE,TRUE,FALSE,bidirectional,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 | 71 | msf_sync_data_server.account_move_line_correction,TRUE,TRUE,FALSE,bidirectional,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 |
11 | 72 | msf_sync_data_server.account_move_line_register_line,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['corrected_st_line_id/id', 'instance_id/id']",MISSION,account.move.line,instance_id,Account Move Line / Register Line,Valid,,414 | 72 | msf_sync_data_server.account_move_line_register_line,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['corrected_st_line_id/id', 'instance_id/id']",MISSION,account.move.line,instance_id,Account Move Line / Register Line,Valid,,414 |
13 | 73 | msf_sync_data_server.register_line_account_move_line,TRUE,TRUE,FALSE,bidirectional,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 | 73 | msf_sync_data_server.register_line_account_move_line,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['direct_invoice_move_id/id', '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 |
14 | 74 | msf_sync_data_server.account_move_state,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['instance_id/id', 'state']",OC,account.move,instance_id,Account Move State,Valid,,416 | 74 | msf_sync_data_server.account_move_state,TRUE,TRUE,FALSE,bidirectional,Bidirectional-Private,[],"['instance_id/id', 'state']",OC,account.move,instance_id,Account Move State,Valid,,416 |
15 | 75 | msf_sync_data_server.account_move_line_corrected_upstream,TRUE,TRUE,TRUE,bidirectional,Bidirectional-Private,[],"['corrected_upstream', 'instance_id/id']",OC,account.move.line,instance_id,Account Move Line Corrected Upstream,Valid,,417 | 75 | msf_sync_data_server.account_move_line_corrected_upstream,TRUE,TRUE,TRUE,bidirectional,Bidirectional-Private,[],"['corrected_upstream', 'instance_id/id']",OC,account.move.line,instance_id,Account Move Line Corrected Upstream,Valid,,417 |
16 | 76 | msf_sync_data_server.analytical_line,TRUE,TRUE,TRUE,bidirectional,Bidirectional-Private,"[('account_id.category', '=', 'FUNDING'), ('imported_commitment','=',False)]","['account_id/id', 'amount', 'amount_currency','correction_date', 'code', 'cost_center_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distrib_line_id', 'distribution_id/id', 'document_date', 'general_account_id/id', 'instance_id/id', 'is_reallocated', 'is_reversal', 'journal_id/id', 'move_id/id', 'name', 'partner_txt', 'ref', 'reversal_origin/id', 'source_date', 'entry_sequence']",OC,account.analytic.line,cost_center_id,Analytical Line,Valid,,420 | 76 | msf_sync_data_server.analytical_line,TRUE,TRUE,TRUE,bidirectional,Bidirectional-Private,"[('account_id.category', '=', 'FUNDING'), ('imported_commitment','=',False)]","['account_id/id', 'amount', 'amount_currency','correction_date', 'code', 'cost_center_id/id', 'currency_id/id', 'date', 'destination_id/id', 'distrib_line_id', 'distribution_id/id', 'document_date', 'general_account_id/id', 'instance_id/id', 'is_reallocated', 'is_reversal', 'journal_id/id', 'move_id/id', 'name', 'partner_txt', 'ref', 'reversal_origin/id', 'source_date', 'entry_sequence']",OC,account.analytic.line,cost_center_id,Analytical Line,Valid,,420 |
17 | @@ -162,7 +162,7 @@ | |||
18 | 162 | msf_usb_sync_data_server.cp_gl_journals_registers,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,"['|',('type', '=', 'cash'),('type', '=', 'cheque')]","['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']",USB,account.journal,,[MASTER] GL Journals - Registers,Valid,,1507 | 162 | msf_usb_sync_data_server.cp_gl_journals_registers,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,"['|',('type', '=', 'cash'),('type', '=', 'cheque')]","['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']",USB,account.journal,,[MASTER] GL Journals - Registers,Valid,,1507 |
19 | 163 | msf_usb_sync_data_server.cp_account_move_reconcile,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,[],"['name', 'type']",USB,account.move.reconcile,,[MASTER] Account Move Reconcile,Valid,,1510 | 163 | msf_usb_sync_data_server.cp_account_move_reconcile,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,[],"['name', 'type']",USB,account.move.reconcile,,[MASTER] Account Move Reconcile,Valid,,1510 |
20 | 164 | msf_usb_sync_data_server.cp_account_move,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['date', 'document_date', 'imported', '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']",USB,account.move,,[MASTER] Account Move,Valid,,1520 | 164 | msf_usb_sync_data_server.cp_account_move,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['date', 'document_date', 'imported', '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']",USB,account.move,,[MASTER] Account Move,Valid,,1520 |
22 | 165 | msf_usb_sync_data_server.cp_account_move_line,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date', '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', 'move_state', 'name', 'narration', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount']",USB,account.move.line,,[MASTER] Account Move Line,Valid,,1521 | 165 | msf_usb_sync_data_server.cp_account_move_line,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['account_id/id', 'accrual', 'analytic_account_id/id', 'analytic_distribution_id/id', 'blocked', 'cheque_number','corrected', 'credit', 'credit_currency', 'currency_id/id', 'date', 'date_created', 'date_maturity', 'debit', 'debit_currency', 'document_date', 'employee_id/id', 'have_an_historic', 'instance_id/id', 'is_addendum_line', 'is_counterpart', 'is_transfer_with_change', 'is_write_off', 'journal_id/id', 'move_id/id', 'move_state', 'name', 'narration', 'partner_id/id','partner_txt','period_id/id', 'reconcile_id/id', 'ref', 'reversal', 'source_date', 'statement_id/id', 'reference', 'state','transfer_journal_id/id', 'transfer_amount']",USB,account.move.line,,[MASTER] Account Move Line,Valid,,1521 |
23 | 166 | msf_usb_sync_data_server.cp_account_move_line_correction,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,"[('move_id','in',('account.move','id',[('state','=','posted')]))]","['corrected_line_id/id', 'instance_id/id', 'reversal_line_id/id']",USB,account.move.line,,[MASTER] Account Move Line Correction,Valid,,1522 | 166 | msf_usb_sync_data_server.cp_account_move_line_correction,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,"[('move_id','in',('account.move','id',[('state','=','posted')]))]","['corrected_line_id/id', 'instance_id/id', 'reversal_line_id/id']",USB,account.move.line,,[MASTER] Account Move Line Correction,Valid,,1522 |
24 | 167 | msf_usb_sync_data_server.cp_account_move_line_register_line,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['corrected_st_line_id/id', 'instance_id/id']",USB,account.move.line,,[MASTER] Account Move Line / Register Line,Valid,,1523 | 167 | msf_usb_sync_data_server.cp_account_move_line_register_line,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['corrected_st_line_id/id', 'instance_id/id']",USB,account.move.line,,[MASTER] Account Move Line / Register Line,Valid,,1523 |
25 | 168 | msf_usb_sync_data_server.cp_register_line_account_move_line,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['first_move_line_id/id', 'instance_id/id']",USB,account.bank.statement.line,,[MASTER] Register Line / Account Move Line,Valid,,1530 | 168 | msf_usb_sync_data_server.cp_register_line_account_move_line,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,"[('instance_id' , 'in' , ('msf.instance' , 'id' , [('level' , '=' , 'project')])),('statement_id','in',('account.bank.statement','id',[('state','!=','draft')])),'!',('state','=','draft')]","['first_move_line_id/id', 'instance_id/id']",USB,account.bank.statement.line,,[MASTER] Register Line / Account Move Line,Valid,,1530 |