Merge lp://qastaging/~camptocamp/openerp-humanitarian-ngo/ngo-addons-separate-budget-dimension-in-logistic_requisition-rde into lp://qastaging/~camptocamp/openerp-humanitarian-ngo/ngo-addons-add_other_procurement_method-nbi
Proposed by
Romain Deheele - Camptocamp
| Status: | Merged |
|---|---|
| Merged at revision: | 177 |
| Proposed branch: | lp://qastaging/~camptocamp/openerp-humanitarian-ngo/ngo-addons-separate-budget-dimension-in-logistic_requisition-rde |
| Merge into: | lp://qastaging/~camptocamp/openerp-humanitarian-ngo/ngo-addons-add_other_procurement_method-nbi |
| Diff against target: |
4294 lines (+2416/-494) 31 files modified
framework_agreement_sourcing/i18n/en_US.po (+220/-0) framework_agreement_sourcing/i18n/framework_agreement_sourcing.pot (+209/-0) logistic_requisition/i18n/en_US.po (+360/-168) logistic_requisition/i18n/logistic_requisition.pot (+340/-148) logistic_requisition/model/logistic_requisition.py (+0/-67) logistic_requisition/report/logistic_requisition.mako (+0/-23) logistic_requisition/test/line_assigned.yml (+0/-2) logistic_requisition/test/logistic_requisition_report_test.yml (+0/-1) logistic_requisition/test/requisition_create_cost_estimate.yml (+0/-4) logistic_requisition/test/transport_plan.yml (+0/-3) logistic_requisition/test/transport_plan_from_lr_line_wizard.yml (+0/-2) logistic_requisition/test/transport_plan_to_cost_estimate.yml (+0/-5) logistic_requisition/tests/logistic_requisition.py (+0/-14) logistic_requisition/tests/test_mto_workflow.py (+0/-4) logistic_requisition/tests/test_mutlicurrency_update_po_line.py (+0/-3) logistic_requisition/tests/test_purchase_split_requisition.py (+0/-3) logistic_requisition/tests/test_sale_order_from_lr_confirm.py (+0/-3) logistic_requisition/view/logistic_requisition.xml (+0/-39) logistic_requisition/wizard/cost_estimate.py (+0/-5) logistic_requisition_budget/__init__.py (+22/-0) logistic_requisition_budget/__openerp__.py (+53/-0) logistic_requisition_budget/i18n/en_US.po (+227/-0) logistic_requisition_budget/i18n/logistic_requisition_budget.pot (+227/-0) logistic_requisition_budget/model/__init__.py (+23/-0) logistic_requisition_budget/model/logistic_requisition.py (+149/-0) logistic_requisition_budget/report/logistic_requisition.mako (+226/-0) logistic_requisition_budget/report/logistic_requisition_report.xml (+13/-0) logistic_requisition_budget/test/requisition_create_cost_estimate.yml (+197/-0) logistic_requisition_budget/view/logistic_requisition.xml (+89/-0) logistic_requisition_budget/wizard/__init__.py (+21/-0) logistic_requisition_budget/wizard/cost_estimate.py (+40/-0) |
| To merge this branch: | bzr merge lp://qastaging/~camptocamp/openerp-humanitarian-ngo/ngo-addons-separate-budget-dimension-in-logistic_requisition-rde |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Joël Grand-Guillaume @ camptocamp | code review, no tests | Approve | |
| Nicolas Bessi - Camptocamp (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Hello,
About logistic_
I will commit a budget dimension split in another addon :
- deletion of budget oriented terms in logistic_
- adding of these terms in a new addon : logistic_
Romain
To post a comment you must log in.
Revision history for this message
| Nicolas Bessi - Camptocamp (nbessi-c2c-deactivatedaccount) wrote | # |
review:
Approve
Revision history for this message
| Joël Grand-Guillaume @ camptocamp (jgrandguillaume-c2c) wrote | # |
review:
Approve
(code review, no tests)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Just fixed some neat points
LGTM Thanks