Merge lp://staging/~openerp-icm/openerp-icm/7.0-sale_commission into lp://staging/~openerp-icm/openerp-icm/7.0
| Status: | Merged |
|---|---|
| Merge reported by: | Nhomar - Vauxoo |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~openerp-icm/openerp-icm/7.0-sale_commission |
| Merge into: | lp://staging/~openerp-icm/openerp-icm/7.0 |
| Diff against target: |
4989 lines (+4837/-0) 28 files modified
sale_commission/__init__.py (+33/-0) sale_commission/__openerp__.py (+56/-0) sale_commission/cc_commission_report.xml (+13/-0) sale_commission/i18n/ca.po (+813/-0) sale_commission/i18n/es.po (+813/-0) sale_commission/i18n/sale_commission.pot (+813/-0) sale_commission/invoice.py (+135/-0) sale_commission/invoice_view.xml (+82/-0) sale_commission/partner.py (+40/-0) sale_commission/partner_agent.py (+89/-0) sale_commission/partner_agent_view.xml (+29/-0) sale_commission/partner_view.xml (+37/-0) sale_commission/product_view.xml (+17/-0) sale_commission/report/settlement_report.rml (+238/-0) sale_commission/sale_order.py (+171/-0) sale_commission/sale_order_view.xml (+62/-0) sale_commission/saleagent.py (+101/-0) sale_commission/saleagent_demo.xml (+59/-0) sale_commission/saleagent_view.xml (+147/-0) sale_commission/security/ir.model.access.csv (+28/-0) sale_commission/settled.py (+488/-0) sale_commission/settled_view.xml (+333/-0) sale_commission/settlement_wizard.xml (+15/-0) sale_commission/stock_picking.py (+65/-0) sale_commission/stock_picking_view.xml (+38/-0) sale_commission/wizard/__init__.py (+23/-0) sale_commission/wizard/wizard_invoice.py (+68/-0) sale_commission/wizard/wizard_invoice.xml (+31/-0) |
| To merge this branch: | bzr merge lp://staging/~openerp-icm/openerp-icm/7.0-sale_commission |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| OpenERP Community Reviewer/Maintainer | Pending | ||
| Maxime Chambreuil (http://www.savoirfairelinux.com) | Pending | ||
|
Review via email:
|
|||
Description of the change
[ADD] sale_commission extracted from lp:openobject-addons
To post a comment you must log in.
Revision history for this message
| Nhomar - Vauxoo (nhomar) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Done the first merge.