Merge lp:~unifield-team/unifield-wm/sync_us_547 into lp:unifield-wm/sync

Proposed by jftempo
Status: Merged
Merged at revision: 594
Proposed branch: lp:~unifield-team/unifield-wm/sync_us_547
Merge into: lp:unifield-wm/sync
Diff against target: 10 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/sync_us_547
Reviewer Review Type Date Requested Status
UniField Sync Reviewer Pending
Review via email: mp+270052@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-08-28 14:34:57 +0000
3+++ msf_sync_data_server/data/sync_server.sync_rule.csv 2015-09-03 12:30:36 +0000
4@@ -241,4 +241,4 @@
5 msf_usb_sync_data_server.access_rights_header,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,[],"['active', 'comment', 'domain_id/id', 'domain_text', 'family_model_ids/id', 'group_ids/id', 'instance_level', 'model_id/id', 'model_name', 'name', 'status']",USB,msf_field_access_rights.field_access_rule,,[USER RIGHTS] Field Access Rules,Valid,,4403
6 msf_usb_sync_data_server.access_rights_lines,TRUE,TRUE,TRUE,cp_to_rw,Bidirectional,[],"['field/id', 'field_access_rule/id', 'field_access_rule_model_id', 'field_name', 'value_not_synchronized_on_create', 'value_not_synchronized_on_write', 'write_access']",USB,msf_field_access_rights.field_access_rule_line,,[USER RIGHTS] Field Access Rule Lines,Valid,,4404
7 msf_usb_sync_data_server.button_access_rules,TRUE,TRUE,FALSE,cp_to_rw,Bidirectional,[],"['active', 'comment', 'group_ids/id', 'group_names', 'label', 'model_id/id', 'name', 'type', 'view_id/id']",USB,msf_button_access_rights.button_access_rule,,[USER RIGHTS] Button Access Rules,Valid,,4405
8-msf_sync_data_server.ir_translation_USB,TRUE,TRUE,TRUE,cp_to_rw,Down,"[('res_id', '!=', 0), ('lang', '!=', 'en_US'), ('type', '=', 'model')]","['lang', 'src', 'name', 'value', 'type', 'sd_ref']",USB,ir.translation,,"[OTHER] Translations",Valid,,4406
9+msf_sync_data_server.ir_translation_USB,TRUE,TRUE,TRUE,cp_to_rw,Down,"[('res_id', '!=', 0), ('lang', '!=', 'en_US'), ('type', '=', 'model')]","['lang', 'src', 'name', 'value', 'type', 'xml_id']",USB,ir.translation,,"[OTHER] Translations",Valid,,4406
10\ No newline at end of file

Subscribers

People subscribed via source and target branches

to all changes: