lp:~unifield-team/unifield-wm/sync-uftp-2-fp

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:unifield-wm/sync at revision 545

UniField Sync Reviewer: Pending requested 2015-03-12

Diff: 316 lines (+169/-20) (has conflicts)

7 files modified

msf_sync_data_server/data/sync_server.message_rule.csv (+6/-0)
msf_sync_data_server/data/sync_server.sync_rule.csv (+10/-9)
sync_client/message.py (+57/-8)
sync_remote_warehouse/entity.py (+6/-0)
sync_remote_warehouse/wizard/setup_remote_warehouse.py (+44/-0)
sync_remote_warehouse/wizard/usb_synchronisation.py (+2/-2)
sync_so/specific_xml_id.py (+44/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

542. By dvo@dvo on 2015-03-17

BKLG-34: UFTP-2: Removed rule 125, and changed the 124 to be bidirectional private when for FP to a specific Coordo

541. By Duy VO on 2015-03-16

BKLG-34: Implement the method get children when sync to coordo.

540. By Duy VO on 2015-03-16

BKLG-34: Changed the financing contract rules to HQ+mission as type

539. By Duy VO on 2015-02-24

UFTP-2: Change the group type for rule 124 -- applied to Coordo and its children

538. By Duy VO on 2015-02-24

merged with trunk - US-89

537. By Duy VO on 2015-02-24

UFTP-2: Get the children of the given instance and create manual sync update for children: WIP

536. By Duy VO on 2015-02-12

UFTP-2: Merged code from trunk and the rules modif by OD

535. By Duy VO on 2015-02-05

US-27: Added a try catch to the inner catch for a double exception case

534. By Duy VO on 2015-02-03

US-27: minor change

533. By Duy VO on 2015-02-03

US-27: Added a confirmed state into the search for OUT in RW sync when converting to PICK - was a bug.