lp:~unifield-team/unifield-wm/sync_remote_warehouse_trunk_merge

Branch merges

Propose for merging

No branches dependent on this one.

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

UniField Dev Team: Pending requested 2013-11-07

Diff: 4830 lines (+3256/-670) (has conflicts)

51 files modified

msf_sync_data_hq/data/account.account.csv (+268/-290)
msf_sync_data_hq/data/account.analytic.account.csv (+22/-23)
msf_sync_data_post_synchro/data/account.journal.csv (+2/-2)
msf_sync_data_server/data/sync_server.sync_rule.csv (+100/-100)
sync_client/ir_model_data.py (+1/-1)
sync_client/message.py (+43/-21)
sync_client/orm.py (+0/-106)
sync_client/sync_client.py (+1/-1)
sync_client/update.py (+8/-3)
sync_common/__init__.py (+1/-0)
sync_common/common.py (+4/-1)
sync_common/orm.py (+41/-0)
sync_remote_warehouse/__init__.py (+9/-0)
sync_remote_warehouse/__openerp__.py (+24/-0)
sync_remote_warehouse/data/setup_remote_warehouse.xml (+19/-0)
sync_remote_warehouse/data/usb_recovery.xml (+15/-0)
sync_remote_warehouse/data/usb_synchronisation.xml (+15/-0)
sync_remote_warehouse/entity.py (+669/-0)
sync_remote_warehouse/ir_model_data.py (+10/-0)
sync_remote_warehouse/message.py (+26/-0)
sync_remote_warehouse/orm.py (+170/-0)
sync_remote_warehouse/sync_client_message_rule.py (+16/-0)
sync_remote_warehouse/sync_client_update_rule.py (+15/-0)
sync_remote_warehouse/sync_monitor.py (+12/-0)
sync_remote_warehouse/update.py (+97/-0)
sync_remote_warehouse/views/message.xml (+180/-0)
sync_remote_warehouse/views/setup_remote_warehouse.xml (+27/-0)
sync_remote_warehouse/views/sync_monitor.xml (+46/-0)
sync_remote_warehouse/views/update.xml (+224/-0)
sync_remote_warehouse/views/usb_recovery.xml (+44/-0)
sync_remote_warehouse/views/usb_synchronisation.xml (+30/-0)
sync_remote_warehouse/wizard/__init__.py (+3/-0)
sync_remote_warehouse/wizard/setup_remote_warehouse.py (+123/-0)
sync_remote_warehouse/wizard/usb_recovery.py (+83/-0)
sync_remote_warehouse/wizard/usb_synchronisation.py (+154/-0)
sync_remote_warehouse_server/__init__.py (+1/-0)
sync_remote_warehouse_server/__openerp__.py (+20/-0)
sync_remote_warehouse_server/data/rule_group_type.xml (+10/-0)
sync_remote_warehouse_server/data/sync_server.message_rule.csv (+3/-0)
sync_remote_warehouse_server/data/sync_server.sync_rule.csv (+133/-0)
sync_remote_warehouse_server/server_rules.py (+62/-0)
sync_remote_warehouse_server/views/sync_message_rule.xml (+21/-0)
sync_remote_warehouse_server/views/sync_update_rule.xml (+77/-0)
sync_server/rules.py (+57/-32)
sync_server/rules_view.xml (+6/-4)
sync_server/sync_server.py (+3/-1)
sync_so/picking.py (+152/-67)
sync_so/purchase.py (+17/-0)
update_client/version.py (+83/-9)
update_client/wizard.py (+105/-8)
update_client/wizard_view.xml (+4/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

354. By Max (OpenERP) on 2013-11-07

[ADD] usb remote warehouse rules importation with RW server module

353. By Max (OpenERP) on 2013-11-07

[FIX] rule.model field changed from reference to char to make appropriate changes in code

352. By Max (OpenERP) on 2013-11-07

[FIX] workflow.instance res_id received from sync not being converted from sd ref to id

351. By Max (OpenERP) on 2013-11-04

[MERGE] usb remote warehouse

350. By Samus CTO (OpenERP) on 2013-10-30

Merge UF-2132 and UF2168: FO (loan) status is never Closed

349. By Samus CTO (OpenERP) on 2013-10-07

[MERGE] UTP-805 // #86668: Invoices still shown as Open in the Supplier Invoices sub-module while already imported in the registers and hard posted (and the registers closed)

348. By Samus CTO (OpenERP) on 2013-09-24

[MERGE] UF-2148 // Some issues linked to UF-1617 IN/OUT

347. By Matthieu Dietrich @ camptocamp on 2013-09-16

SP-76: [RULES]: v1.40:
- UTP-874: "not_correctible" added.
- UF-2143: rules 310 & 311 modified.
- UF-1617 (?): rule 316 on product list line was added, rule 171 on pricelist was removed. And no f***in' clue of what happened or why, since it was merged without being reported here.

346. By Samus CTO (OpenERP) on 2013-09-16

[MERGE] UF-2133 // Related to UF-1617. When parcel is removed from Shipment at SHIP Shipped stage, then processed, this SHIP is not synched.

345. By Samus CTO (OpenERP) on 2013-09-16

[MERGE] UF-1617