← Back to branch summary

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

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

Viewing all changes in revision 243.

Committer: Sébastien Beau
Date: 2012-12-26 13:34:03 UTC
mfrom: (231.6.17 e-commerce-addons)
Revision ID: sebastien.beau@akretion.com-20121226133403-w60qs02og27t2z4z

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

files added:
base_sale_export_partner

base_sale_export_partner/__init__.py

base_sale_export_partner/__openerp__.py

base_sale_export_partner/wizard

base_sale_export_partner/wizard/__init__.py

base_sale_export_partner/wizard/export_partner.py

base_sale_export_partner/wizard/export_partner.xml

base_sale_export_product

base_sale_export_product/__init__.py

base_sale_export_product/__openerp__.py

base_sale_export_product/wizard

base_sale_export_product/wizard/__init__.py

base_sale_export_product/wizard/export_product.py

base_sale_export_product/wizard/export_product.xml

base_sale_multichannels/partner_view.xml

product_custom_attributes_shop/security

product_custom_attributes_shop/security/ir.model.access.csv

sale_automatic_workflow/invoice.py

sale_automatic_workflow/stock.py

sale_quick_payment/account_voucher.py

sale_quick_payment/migrations

sale_quick_payment/migrations/0.1

sale_quick_payment/migrations/0.1/post-migration.py

sale_quick_payment/settings

sale_quick_payment/settings/sale.exception.csv

files removed:
base_sale_multichannels/wizard/export_product.py

base_sale_multichannels/wizard/export_product.xml

base_sale_report_synchronizer/external_referential.py

base_sale_report_synchronizer/external_referential_view.xml

base_sale_report_synchronizer/invoice.py

sale_quick_payment/company.py

sale_quick_payment/company_view.xml

files modified:
base_sale_multichannels/__openerp__.py

base_sale_multichannels/account.py

base_sale_multichannels/account_view.xml

base_sale_multichannels/external_referential.py

base_sale_multichannels/partner.py

base_sale_multichannels/product.py

base_sale_multichannels/sale.py

base_sale_multichannels/sale_view.xml

base_sale_multichannels/security/ir.model.access.csv

base_sale_multichannels/settings/sale.exception.csv

base_sale_multichannels/wizard/__init__.py

base_sale_report_synchronizer/__init__.py

base_sale_report_synchronizer/__openerp__.py

base_sale_report_synchronizer/sale_view.xml

product_custom_attributes_shop/__openerp__.py

product_custom_attributes_shop/product.py

product_images_sync/__openerp__.py

product_images_sync/product_images_sync.py

product_links/__openerp__.py

product_links/product_links.py

product_links/product_links_view.xml

product_links/security/ir.model.access.csv

product_links_goodies/__openerp__.py

product_links_sync/__openerp__.py

product_links_sync/product.py

sale_automatic_workflow/__init__.py

sale_automatic_workflow/__openerp__.py

sale_automatic_workflow/automatic_workflow_job.py

sale_automatic_workflow/sale.py

sale_automatic_workflow/sale_workflow_process_view.xml

sale_exceptions/__openerp__.py

sale_exceptions/sale.py

sale_exceptions/sale_view.xml

sale_exceptions/wizard/sale_exception_confirm_view.xml

sale_quick_payment/__init__.py

sale_quick_payment/__openerp__.py

sale_quick_payment/sale.py

sale_quick_payment/sale_view.xml

sale_quick_payment/wizard/pay_sale_order.py

sale_quick_payment/wizard/pay_sale_order.xml

Show diffs side-by-side

added added

removed removed

base_sale_export_partner/

base_sale_export_partner/__init__.py

base_sale_export_partner/__openerp__.py

base_sale_export_partner/wizard/

base_sale_export_partner/wizard/__init__.py

base_sale_export_partner/wizard/export_partner.py

base_sale_export_partner/wizard/export_partner.xml

base_sale_export_product/

base_sale_export_product/__init__.py

base_sale_export_product/__openerp__.py

base_sale_export_product/wizard/

base_sale_export_product/wizard/__init__.py

base_sale_export_product/wizard/export_product.py

base_sale_export_product/wizard/export_product.xml

base_sale_multichannels/__openerp__.py

base_sale_multichannels/account.py

base_sale_multichannels/account_view.xml

base_sale_multichannels/external_referential.py

base_sale_multichannels/partner.py

base_sale_multichannels/partner_view.xml

base_sale_multichannels/product.py

base_sale_multichannels/sale.py

base_sale_multichannels/sale_view.xml

base_sale_multichannels/security/ir.model.access.csv

base_sale_multichannels/settings/sale.exception.csv

base_sale_multichannels/wizard/__init__.py

base_sale_multichannels/wizard/export_product.py

base_sale_multichannels/wizard/export_product.xml

base_sale_report_synchronizer/__init__.py

base_sale_report_synchronizer/__openerp__.py

base_sale_report_synchronizer/external_referential.py

base_sale_report_synchronizer/external_referential_view.xml

base_sale_report_synchronizer/invoice.py

base_sale_report_synchronizer/sale_view.xml

product_custom_attributes_shop/__openerp__.py

product_custom_attributes_shop/product.py

product_custom_attributes_shop/security/

product_custom_attributes_shop/security/ir.model.access.csv

product_images_sync/__openerp__.py

product_images_sync/product_images_sync.py

product_links/__openerp__.py

product_links/product_links.py

product_links/product_links_view.xml

product_links/security/ir.model.access.csv

product_links_goodies/__openerp__.py

product_links_sync/__openerp__.py

product_links_sync/product.py

sale_automatic_workflow/__init__.py

sale_automatic_workflow/__openerp__.py

sale_automatic_workflow/automatic_workflow_job.py

sale_automatic_workflow/invoice.py

sale_automatic_workflow/sale.py

sale_automatic_workflow/sale_workflow_process_view.xml

sale_automatic_workflow/stock.py

sale_exceptions/__openerp__.py

sale_exceptions/sale.py

sale_exceptions/sale_view.xml

sale_exceptions/wizard/sale_exception_confirm_view.xml

sale_quick_payment/__init__.py

sale_quick_payment/__openerp__.py

sale_quick_payment/account_voucher.py

sale_quick_payment/company.py

sale_quick_payment/company_view.xml

sale_quick_payment/migrations/

sale_quick_payment/migrations/0.1/

sale_quick_payment/migrations/0.1/post-migration.py

sale_quick_payment/sale.py

sale_quick_payment/sale_view.xml

sale_quick_payment/settings/

sale_quick_payment/settings/sale.exception.csv

sale_quick_payment/wizard/pay_sale_order.py

sale_quick_payment/wizard/pay_sale_order.xml

Older »