Merge lp://qastaging/~vauxoo/addons-vauxoo/addons-vauxoo-cicsa into lp://qastaging/addons-vauxoo/7.0
Proposed by
hbto [Vauxoo] http://www.vauxoo.com
| Status: | Merged |
|---|---|
| Merged at revision: | 1096 |
| Proposed branch: | lp://qastaging/~vauxoo/addons-vauxoo/addons-vauxoo-cicsa |
| Merge into: | lp://qastaging/addons-vauxoo/7.0 |
| Diff against target: |
1158 lines (+855/-30) 30 files modified
account_voucher_department/i18n/account_voucher_department.pot (+0/-5) account_voucher_department/model/account_voucher.py (+3/-13) account_voucher_department/view/account_voucher_view.xml (+1/-4) account_voucher_requester/__openerp__.py (+2/-2) account_voucher_requester/i18n/account_voucher_requester.pot (+2/-2) account_voucher_requester/model/account_voucher.py (+7/-3) account_voucher_requester/view/account_voucher_view.xml (+1/-1) analytic_split_quantity/__init__.py (+27/-0) analytic_split_quantity/__openerp__.py (+74/-0) analytic_split_quantity/model/__init__.py (+26/-0) analytic_split_quantity/model/account_analytic_plans.py (+52/-0) analytic_split_quantity/view/account_analytic_plans_view.xml (+27/-0) analytic_split_quantity/wizard/__init__.py (+25/-0) purchase_order_type/__init__.py (+27/-0) purchase_order_type/__openerp__.py (+55/-0) purchase_order_type/model/__init__.py (+26/-0) purchase_order_type/model/purchase_order.py (+63/-0) purchase_order_type/view/purchase_order_view.xml (+58/-0) purchase_order_type/wizard/__init__.py (+25/-0) purchase_requisition_remarks/__init__.py (+27/-0) purchase_requisition_remarks/__openerp__.py (+52/-0) purchase_requisition_remarks/model/__init__.py (+26/-0) purchase_requisition_remarks/model/purchase_requisition.py (+37/-0) purchase_requisition_remarks/view/purchase_requisition_view.xml (+18/-0) purchase_requisition_remarks/wizard/__init__.py (+25/-0) stock_purchase_analytic_plans/__init__.py (+27/-0) stock_purchase_analytic_plans/__openerp__.py (+53/-0) stock_purchase_analytic_plans/model/__init__.py (+26/-0) stock_purchase_analytic_plans/model/stock.py (+38/-0) stock_purchase_analytic_plans/wizard/__init__.py (+25/-0) |
| To merge this branch: | bzr merge lp://qastaging/~vauxoo/addons-vauxoo/addons-vauxoo-cicsa |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| hbto [Vauxoo] http://www.vauxoo.com | Pending | ||
|
Review via email:
|
|||
Description of the change
Weekly merge
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
