Merge lp://qastaging/~dorian-kemps/unifield-server/US-12730 into lp://qastaging/unifield-server
Proposed by
jftempo
| Status: | Merged |
|---|---|
| Merged at revision: | 6338 |
| Proposed branch: | lp://qastaging/~dorian-kemps/unifield-server/US-12730 |
| Merge into: | lp://qastaging/unifield-server |
| Diff against target: |
505 lines (+256/-82) (has conflicts) 6 files modified
bin/addons/msf_profile/data/patches.xml (+8/-0) bin/addons/msf_profile/msf_profile.py (+55/-0) bin/addons/purchase/purchase_order.py (+114/-72) bin/addons/tender_flow/__openerp__.py (+1/-0) bin/addons/tender_flow/tender_flow.py (+49/-10) bin/addons/tender_flow/tender_flow_data.xml (+29/-0) Text conflict in bin/addons/msf_profile/data/patches.xml Text conflict in bin/addons/msf_profile/msf_profile.py |
| To merge this branch: | bzr merge lp://qastaging/~dorian-kemps/unifield-server/US-12730 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| UniField Reviewer Team | Pending | ||
|
Review via email:
|
|||
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
