Merge lp:~gbaconnier-c2c/openobject-addons/extra-6.0-c2c-magento-improvements into lp:openobject-addons/extra-6.0
Proposed by
Guewen Baconnier @ Camptocamp
Status: | Rejected |
---|---|
Rejected by: | Guewen Baconnier @ Camptocamp |
Proposed branch: | lp:~gbaconnier-c2c/openobject-addons/extra-6.0-c2c-magento-improvements |
Merge into: | lp:openobject-addons/extra-6.0 |
Diff against target: |
70 lines (+20/-1) (has conflicts) 2 files modified
base_sale_multichannels/sale.py (+18/-1) base_sale_multichannels/sale_view.xml (+2/-0) Text conflict in base_sale_multichannels/sale.py |
To merge this branch: | bzr merge lp:~gbaconnier-c2c/openobject-addons/extra-6.0-c2c-magento-improvements |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
OpenERP Committers | Pending | ||
Review via email: mp+59336@code.launchpad.net |
To post a comment you must log in.
Unmerged revisions
- 5353. By Guewen Baconnier @ CampToCamp <email address hidden>
-
[FIX] base_sale_
payment_ type: returns the good payment's settings when multiple codes match - 5351. By Lorenzo Battistini
-
[FIX] AgileBG authors
- 5350. By Jordi Esteve (www.zikzakmedia.com)
-
[IMP+FIX] Internet Domain:
- Domain Report (rml)
- Example webservice or send email expiration
- [FIX] Duplicity emails when run_mail_scheduler
- Redesing wizard osv_memory - 5349. By Launchpad Translations on behalf of openerp-commiter
-
Launchpad automatic translations update.
- 5348. By Raphaël Valyi - http://www.akretion.com
-
[FIX] kettle_connector: fixed issue with param replacement
- 5347. By Lorenzo Battistini
-
[FIX] product_
pricelist_ fixed_price translation - 5346. By Launchpad Translations on behalf of openerp-commiter
-
Launchpad automatic translations update.