Merge lp:~fabien-morin/unifield-server/fm-us-2079 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4228
Proposed branch: lp:~fabien-morin/unifield-server/fm-us-2079
Merge into: lp:unifield-server
Diff against target: 9 lines (+2/-0)
1 file modified
bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv (+2/-0)
To merge this branch: bzr merge lp:~fabien-morin/unifield-server/fm-us-2079
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+317780@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 'bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv'
2--- bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv 2017-02-10 08:51:30 +0000
3+++ bin/addons/msf_sync_data_server/data/sync_server.sync_rule.csv 2017-02-20 15:40:11 +0000
4@@ -256,3 +256,5 @@
5 msf_usb_sync_data_server.button_access_rules2,TRUE,TRUE,FALSE,TRUE,cp_to_rw,Bidirectional,[],"['active', 'comment', 'group_ids/id', 'group_names', 'label', 'model_id/id', 'name', 'type', 'view_id/id', 'xmlname']",USB,msf_button_access_rights.button_access_rule,,[USER RIGHTS] Button Access Rules,Valid,,4415
6 msf_sync_data_server.ir_translation_USB,TRUE,TRUE,TRUE,TRUE,cp_to_rw,Down,"[('res_id', '!=', 0), ('src', '!=', False), ('xml_id', '!=', False), ('lang', '!=', 'en_US'), ('type', '=', 'model'), ('name', 'in', ['res.partner.category,name','product.uom,name','product.template,description_purchase','product.template,description','product.template,description_sale','product.uom.categ,name','product.pricelist,name','product.category,name','product.nomenclature,name','product.product,form_value','product.product,function_value','product.product,fit_value','res.currency,currency_name','res.country,name','product.ul,name','product.price.type,name','product.pricelist.type,name','product.pricelist.version,name','account.analytic.account,name','account.fiscal.position,note','hr.employee.marital.status,name','account.period,name','account.tax.code,name','account.journal,name','account.tax,name','account.analytic.journal,name','account.account,name','stock.reason.type,name','product.template,name','product.justification.code,code'])]","['lang', 'src', 'name', 'value', 'type', 'xml_id']",USB,ir.translation,,[OTHER] Translations,Valid,,4406
7 msf_sync_data_server.res_users,FALSE,TRUE,TRUE,TRUE,bidirectional,Down,"[('synchronize', '=', True)]","['action_id/id', 'active', 'address_id/id', 'email', 'force_password_change', 'groups_id/id', 'login', 'menu_id/id', 'menu_tips', 'name', 'password', 'signature', 'user_email', 'view']",OC,res.users,,Res Users,Valid,,1002
8+msf_sync_data_server.hr_department_children,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['company_id/id', 'complete_name', 'manager_id/id', 'name', 'note']",OC,hr.department,,HR Department,Valid,,1005
9+msf_sync_data_server.hr_department_parent,TRUE,TRUE,TRUE,TRUE,bidirectional,Down,[],"['company_id/id', 'complete_name', 'manager_id/id', 'name', 'note', 'parent_id/id']",OC,hr.department,,HR Department,Valid,,1006

Subscribers

People subscribed via source and target branches