lp:~arthru/e-commerce-addons/payment-method-multicompany
Created by
arthru
and last modified
- Get this branch:
- bzr branch lp:~arthru/e-commerce-addons/payment-method-multicompany
Branch merges
Propose for merging
No branches
dependent on this one.
Rejected
for merging
into
lp:~extra-addons-commiter/e-commerce-addons/7.0
- Guewen Baconnier @ Camptocamp: Needs Resubmitting
-
Diff: 9198 lines (+3797/-4475) (has conflicts)80 files modifiedbase_sale_export_partner/__openerp__.py (+1/-1)
base_sale_export_partner/wizard/export_partner.py (+1/-1)
base_sale_export_product/__openerp__.py (+1/-1)
base_sale_export_product/wizard/export_product.py (+1/-1)
base_sale_multichannels/connector.py (+0/-37)
base_sale_multichannels/delivery.py (+0/-29)
base_sale_multichannels/delivery_view.xml (+0/-20)
base_sale_multichannels/external_referential.py (+0/-83)
base_sale_multichannels/i18n/base_sale_multichannels.pot (+0/-306)
base_sale_multichannels/i18n/ca.po (+0/-380)
base_sale_multichannels/i18n/ca_ES.po (+0/-334)
base_sale_multichannels/i18n/es.po (+0/-379)
base_sale_multichannels/i18n/fr.po (+0/-356)
base_sale_multichannels/i18n/pt.po (+0/-379)
base_sale_multichannels/i18n/sv.po (+0/-327)
base_sale_multichannels/partner.py (+0/-54)
base_sale_multichannels/partner_view.xml (+0/-28)
base_sale_multichannels/sale.py (+0/-971)
base_sale_multichannels/settings/external.referential.category.csv (+0/-2)
base_sale_multichannels/settings/sale.exception.csv (+0/-12)
base_sale_multichannels/wizard/__init__.py (+0/-23)
base_sale_multichannels/wizard/import_order.py (+0/-42)
base_sale_multichannels/wizard/import_order.xml (+0/-35)
base_sale_report_synchronizer/__openerp__.py (+1/-1)
base_sale_report_synchronizer/sale_view.xml (+1/-1)
connector_ecommerce/__init__.py (+12/-16)
connector_ecommerce/__openerp__.py (+67/-65)
connector_ecommerce/account.py (+20/-20)
connector_ecommerce/account_view.xml (+1/-4)
connector_ecommerce/ecommerce_data.xml (+32/-0)
connector_ecommerce/event.py (+87/-0)
connector_ecommerce/i18n/connector_ecommerce.pot (+354/-0)
connector_ecommerce/i18n/fr.po (+360/-0)
connector_ecommerce/invoice.py (+52/-38)
connector_ecommerce/invoice_view.xml (+9/-8)
connector_ecommerce/payment_method.py (+52/-36)
connector_ecommerce/payment_method_view.xml (+27/-14)
connector_ecommerce/product.py (+162/-139)
connector_ecommerce/product_view.xml (+29/-0)
connector_ecommerce/sale.py (+408/-0)
connector_ecommerce/sale_view.xml (+41/-199)
connector_ecommerce/security/ir.model.access.csv (+0/-15)
connector_ecommerce/security/security.xml (+22/-0)
connector_ecommerce/stock.py (+64/-42)
connector_ecommerce/stock_view.xml (+8/-6)
connector_ecommerce/tests/__init__.py (+32/-0)
connector_ecommerce/tests/test_invoice_event.py (+97/-0)
connector_ecommerce/tests/test_onchange.py (+94/-0)
connector_ecommerce/unit/__init__.py (+2/-0)
connector_ecommerce/unit/sale_order_onchange.py (+223/-0)
connector_ecommerce/wizard/__init__.py (+3/-0)
connector_ecommerce/wizard/sale_ignore_cancel.py (+46/-0)
connector_ecommerce/wizard/sale_ignore_cancel_view.xml (+43/-0)
product_custom_attributes_shop/__openerp__.py (+1/-1)
product_custom_attributes_shop/sale_view.xml (+1/-1)
product_images_sync/__openerp__.py (+2/-2)
product_images_sync/product_images_sync.py (+1/-1)
product_links_sync/product.py (+2/-2)
sale_automatic_workflow/__openerp__.py (+28/-0)
sale_automatic_workflow/automatic_workflow_data.xml (+39/-2)
sale_automatic_workflow/automatic_workflow_job.py (+120/-0)
sale_automatic_workflow/invoice.py (+22/-0)
sale_automatic_workflow/sale.py (+73/-27)
sale_automatic_workflow/sale_workflow.xml (+1/-1)
sale_automatic_workflow/sale_workflow_process.py (+41/-4)
sale_automatic_workflow/sale_workflow_process_view.xml (+10/-0)
sale_exceptions/i18n/fr.po (+177/-0)
sale_exceptions/i18n/sale_exceptions.pot (+177/-0)
sale_exceptions/sale_view.xml.OTHER (+109/-0)
sale_payment_method/__init__.py (+27/-0)
sale_payment_method/__openerp__.py (+42/-7)
sale_payment_method/account_move.py (+33/-0)
sale_payment_method/payment_method.py (+58/-0)
sale_payment_method/payment_method_view.xml (+48/-22)
sale_payment_method/sale.py (+256/-0)
sale_payment_method/security/rules.xml (+13/-0)
sale_quick_payment/__init__.py (+25/-0)
sale_quick_payment/__openerp__.py (+58/-0)
sale_quick_payment/sale_view.xml (+35/-0)
sale_quick_payment/wizard/pay_sale_order.py (+45/-0)
Branch information
Recent revisions
- 336. By Guewen Baconnier @ Camptocamp
-
[FIX] fix the failing test: the payment_method_id and workflow_payment_id are not mandatory in a sale order
- 335. By Guewen Baconnier @ Camptocamp
-
[FIX] remove failing migration: no relation account_
voucher_ sale_order_ rel - 333. By Mathieu Vatel - Julius Network Solutions
-
[IMP] - make possible to inherit the method _add_order_
extra_line (done for prestashoperpco nnect in a first place to be able to add or not the tax on delivery lines) - 331. By arthru
-
Fix a bug : remove special fields before database storage (avoid to try to store non existing fields in db)
- 330. By Brendan Clune (Logic Supply)
-
[ADD] 'Authorized' import rules to be able to import sales orders authorized by a payment institute but not paid yet.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:~extra-addons-commiter/e-commerce-addons/7.0