lp:~sebastien.beau/magentoerpconnect/oerp6.1-cleanning
Please use this branch for dependency
https:/
https:/
https:/
- Get this branch:
- bzr branch lp:~sebastien.beau/magentoerpconnect/oerp6.1-cleanning
Branch merges
- Alexandre Fayolle - camptocamp: Approve (code review, no test)
- Guewen Baconnier @ Camptocamp: Needs Fixing (no test, review)
-
Diff: 4911 lines (+1653/-1559)65 files modifiedmagento_product_auto_sku/__openerp__.py (+1/-1)
magento_product_auto_sku/data.xml (+3/-3)
magento_product_auto_sku/product.py (+9/-15)
magento_sku_is_code/__init__.py (+0/-22)
magento_sku_is_code/__openerp__.py (+0/-41)
magento_sku_is_code/product.py (+0/-66)
magento_sku_is_code/product_view.xml (+0/-24)
magentoerpconnect/__openerp__.py (+2/-2)
magentoerpconnect/delivery.py (+6/-4)
magentoerpconnect/delivery_view.xml (+2/-2)
magentoerpconnect/invoice.py (+76/-27)
magentoerpconnect/magerp_core.py (+26/-26)
magentoerpconnect/magerp_core_view.xml (+152/-156)
magentoerpconnect/magerp_data.xml (+10/-10)
magentoerpconnect/magerp_menu.xml (+1/-1)
magentoerpconnect/magerp_osv.py (+67/-64)
magentoerpconnect/partner.py (+49/-49)
magentoerpconnect/partner_view.xml (+2/-6)
magentoerpconnect/product.py (+151/-186)
magentoerpconnect/product_images.py (+25/-19)
magentoerpconnect/product_images_view.xml (+21/-21)
magentoerpconnect/product_links.py (+6/-10)
magentoerpconnect/product_view.xml (+310/-310)
magentoerpconnect/sale.py (+40/-37)
magentoerpconnect/sale_view.xml (+72/-42)
magentoerpconnect/server_tmp.patch (+0/-14)
magentoerpconnect/settings/1.3.2.4/external.mappinglines.template.csv (+53/-53)
magentoerpconnect/settings/1.5.0.0/product.category/external.mappinglines.template.csv (+8/-8)
magentoerpconnect/settings/1.5.0.0/product/external.mappinglines.template.csv (+1/-1)
magentoerpconnect/settings/1.5.0.0/res.partner.address/external.mappinglines.template.csv (+13/-2)
magentoerpconnect/settings/1.5.0.0/res.partner/external.mappinglines.template.csv (+2/-1)
magentoerpconnect/settings/1.5.0.0/sale.order.line/external.mappinglines.template.csv (+3/-2)
magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv (+14/-3)
magentoerpconnect/stock.py (+4/-7)
magentoerpconnect/wizard/open_product_by_attribut_set.py (+5/-7)
magentoerpconnect_bundle/__openerp__.py (+3/-3)
magentoerpconnect_bundle/product.py (+9/-16)
magentoerpconnect_bundle/product_view.xml (+31/-31)
magentoerpconnect_bundle/sale.py (+4/-6)
magentoerpconnect_bundle/sale_bundle_product.py (+6/-16)
magentoerpconnect_bundle/sale_bundle_product_view.xml (+14/-14)
magentoerpconnect_bundle_split/__openerp__.py (+1/-1)
magentoerpconnect_bundle_split/sale.py (+16/-21)
magentoerpconnect_bundle_split/stock.py (+8/-14)
magentoerpconnect_customer_fiscal_category/__openerp__.py (+2/-2)
magentoerpconnect_customer_fiscal_category/settings/1.5.0.0/external.mappinglines.template.csv (+2/-7)
magentoerpconnect_init_stock/__openerp__.py (+1/-1)
magentoerpconnect_init_stock/product.py (+2/-5)
magentoerpconnect_magento_invoice/__init__.py (+28/-0)
magentoerpconnect_magento_invoice/__openerp__.py (+44/-0)
magentoerpconnect_magento_invoice/account.py (+35/-0)
magentoerpconnect_openerp_invoice/__init__.py (+1/-5)
magentoerpconnect_openerp_invoice/__openerp__.py (+9/-5)
magentoerpconnect_openerp_invoice/external_referential.py (+33/-0)
magentoerpconnect_openerp_invoice/external_referential_view.xml (+22/-0)
magentoerpconnect_openerp_invoice/invoice.py (+57/-24)
magentoerpconnect_partner_surname/__init__.py (+21/-0)
magentoerpconnect_partner_surname/__openerp__.py (+43/-0)
magentoerpconnect_partner_surname/settings/1.5.0.0/res.partner.address/external.mappinglines.template.csv (+3/-0)
magentoerpconnect_payment/__openerp__.py (+1/-1)
magentoerpconnect_payment/payment_type.py (+6/-8)
magentoerpconnect_payment/sale.py (+18/-20)
magentoerpconnect_product_variant/__openerp__.py (+3/-3)
magentoerpconnect_product_variant/product.py (+20/-38)
magentoerpconnect_product_variant/product_view.xml (+76/-76)
Related bugs
Related blueprints
Branch information
- Project:
- Magento OpenERP Connector
- Status:
- Development
Recent revisions
- 683. By Sébastien BEAU - http://www.akretion.com
-
[FIX] magentoerpconnn
ect_openerp_ invoice: fix invoice export due to too many ssh connection open, use the same ssh connection for all of the invoice pushed - 682. By Sébastien BEAU - http://www.akretion.com
-
[FIX] magentoerpconne
ct_openerp_ invoice: fix openerp invoice export into magento - 681. By Sébastien BEAU - http://www.akretion.com
-
[FIX] magentoerpconne
ct_openerp_ invoice: fix openerp invoice export into magento - 680. By Sébastien BEAU - http://www.akretion.com
-
[FIX] Magentoerpconnect : fix shipping tax when a discount have been apply and the shipping amount is 0
- 679. By Sébastien BEAU - http://www.akretion.com
-
[IMP] magentoerpconnect: add the posibility to manage the option for stock directly from OpenERP
- 678. By Sébastien BEAU - http://www.akretion.com
-
[MERGE] merge with cleaning branch, please do not forget to update dependency, product-
extra-addons, openobject- extention, e-commerce-adddons. magentoerpconnect :
- REFACTOR
- refactor the invoice syncronisation
2 modules are available, 1 for using Magento Invoice, one for using OpenERP invoice
moreover if invoice syncronisation failed try to map if an existing one already exist : fonction => map_magento_order
- refactor view for compatibility in multi-e-commerce solution
- NAME REFACTOR : by default use only name if you need to use the lastname and firstname please first update magentoerpconnect and them install magentoerpconnect_partner_ surname. DO IT ON A DATABASE TEST BEFORE. If you have any trouble please open a bug on lp
- use new api for moving the category and updating the stock informationADD
- add reporting when exporting stock level - 677. By Guewen Baconnier @ Camptocamp <email address hidden>
-
[MRG] Chinese translation, contributed by Joshua Jan (SHINEIT)
- 675. By Sébastien BEAU - http://www.akretion.com
-
[FIX] magentoerpconnect : fix bug introduce in rev 672, missing not
- 674. By Sébastien BEAU - http://www.akretion.com
-
[FIX] magentoerpconnect : fix category export, and add ean as attributs to not create
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)