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

Proposed by jftempo
Status: Merged
Merged at revision: 609
Proposed branch: lp:~unifield-team/unifield-wm/us-335-sync
Merge into: lp:unifield-wm/sync
Diff against target: 12 lines (+1/-1)
1 file modified
msf_sync_data_server/data/sync_server.sync_rule.csv (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/us-335-sync
Reviewer Review Type Date Requested Status
UniField Sync Reviewer Pending
Review via email: mp+277964@code.launchpad.net
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 2015-10-27 09:15:15 +0000
3+++ msf_sync_data_server/data/sync_server.sync_rule.csv 2015-11-19 10:14:40 +0000
4@@ -61,7 +61,7 @@
5 msf_sync_data_server.expatriate_employees_tree,TRUE,TRUE,FALSE,bidirectional,Bidirectional,"[('parent_id', '!=', '')]",['parent_id/id'],HQ + MISSION,hr.employee,,Expatriate Employees Tree,Valid,,332
6 msf_sync_data_server.expatriate_employees_coach,FALSE,TRUE,FALSE,bidirectional,Bidirectional,"[('coach_id', '!=', '')]",['coach_id/id'],HQ + MISSION,hr.employee,,Expatriate Employees Coach,Valid,,334
7 msf_sync_data_server.local_employees,TRUE,TRUE,FALSE,bidirectional,Up,"[('employee_type','=','local'),('name','!=','Administrator')]","['active', 'birthday', 'code', 'cost_center_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']",OC,hr.employee,,Local Employees,Valid,,335
8-msf_sync_data_server.register,TRUE,TRUE,FALSE,bidirectional,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
9+msf_sync_data_server.register,TRUE,TRUE,FALSE,bidirectional,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','closing_balance_frozen_date','unrecorded_expenses_amount']",MISSION,account.bank.statement,instance_id,Register,Valid,,400
10 msf_sync_data_server.register_line,TRUE,TRUE,TRUE,bidirectional,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', 'direct_state', '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', 'from_cash_return']",MISSION,account.bank.statement.line,instance_id,Register Line,Valid,,401
11 msf_sync_data_server.register_cashbox_line_starting,TRUE,TRUE,TRUE,bidirectional,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
12 msf_sync_data_server.register_status,TRUE,TRUE,FALSE,bidirectional,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

Subscribers

People subscribed via source and target branches

to all changes: