lp:~extra-addons-commiter/e-commerce-addons/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~extra-addons-commiter/e-commerce-addons/7.0 at revision 280

Guewen Baconnier @ Camptocamp: Approve on 2013-01-14

Diff: 1108 lines (+424/-248)

33 files modified

base_sale_export_partner/__openerp__.py (+1/-1)
base_sale_export_product/__openerp__.py (+1/-1)
base_sale_multichannels/__openerp__.py (+1/-1)
base_sale_multichannels/connector.py (+37/-0)
base_sale_multichannels/partner.py (+1/-0)
base_sale_multichannels/sale.py (+3/-1)
base_sale_report_synchronizer/__openerp__.py (+1/-1)
product_custom_attributes_shop/__openerp__.py (+1/-1)
product_images_sync/__openerp__.py (+1/-1)
product_links/__openerp__.py (+1/-1)
product_links_goodies/__openerp__.py (+1/-1)
product_links_sync/__openerp__.py (+1/-1)
sale_automatic_workflow/__init__.py (+2/-1)
sale_automatic_workflow/__openerp__.py (+6/-2)
sale_automatic_workflow/automatic_workflow_job.py (+1/-1)
sale_automatic_workflow/invoice.py (+112/-0)
sale_automatic_workflow/sale.py (+1/-75)
sale_automatic_workflow/stock.py (+65/-0)
sale_exceptions/__openerp__.py (+1/-1)
sale_exceptions/sale.py (+4/-4)
sale_exceptions/sale_view.xml (+6/-33)
sale_exceptions/wizard/sale_exception_confirm_view.xml (+17/-18)
sale_quick_payment/__init__.py (+1/-3)
sale_quick_payment/__openerp__.py (+5/-5)
sale_quick_payment/account_voucher.py (+33/-0)
sale_quick_payment/company.py (+0/-33)
sale_quick_payment/company_view.xml (+0/-25)
sale_quick_payment/migrations/0.1/post-migration.py (+35/-0)
sale_quick_payment/sale.py (+31/-11)
sale_quick_payment/sale_view.xml (+10/-2)
sale_quick_payment/settings/sale.exception.csv (+3/-0)
sale_quick_payment/wizard/pay_sale_order.py (+29/-9)
sale_quick_payment/wizard/pay_sale_order.xml (+12/-15)

api

Related source package recipes

3 recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

243. By Sébastien BEAU - http://www.akretion.com on 2012-12-26

[MERGE][MIGR] merge work done on 6.1 branch and start to port some module

242. By Sébastien BEAU - http://www.akretion.com on 2012-09-13

[MERGE] merge with 6.1-cleanning branch

241. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-08-22

[REF] started tagging methods to be extracted in BaseConnector'

240. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-08-22

[REF] base_sale_multichannels/sale.py: remove deprecated model instanciations

239. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-08-22

[REF] product_links_sync: reorder import statements

238. By Sébastien BEAU - http://www.akretion.com on 2012-08-21

[FIX] base_sale_multichannels : fix bug due to change done before

237. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-08-21

[REM] product_links_sync: a couple missed changes

236. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-08-21

[REF] base_sale_multichannels: reformat code

235. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-08-21

delete trailing whitespace

234. By Sébastien BEAU - http://www.akretion.com on 2012-08-21

[REF] refactor/clean code due to orm change in 6.1