lp://staging/~magentoerpconnect-core-editors/magentoerpconnect/oerp6.1-stable-nocheck_tracking-1108643
Created by
Guewen Baconnier @ Camptocamp
and last modified
- Get this branch:
- bzr branch lp://staging/~magentoerpconnect-core-editors/magentoerpconnect/oerp6.1-stable-nocheck_tracking-1108643
Members of
MagentoERPConnect core editors
can upload to this branch. Log in for directions.
Branch merges
Propose for merging
No branches
dependent on this one.
Superseded
for merging
into
lp://staging/~magentoerpconnect-core-editors/magentoerpconnect/oerp6.1-oldstable-nocheck_tracking-1108643
- Alexandre Fayolle - camptocamp: Approve (code review, no test)
-
Diff: 45 lines (+10/-7)1 file modifiedmagentoerpconnect/stock.py (+10/-7)
- MagentoERPConnect core editors: Pending requested
-
Diff: 9618 lines (+5822/-1326) (has conflicts)87 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_view.xml (+0/-24)
magentoerpconnect/__openerp__.py (+26/-3)
magentoerpconnect/delivery.py (+6/-4)
magentoerpconnect/delivery_view.xml (+2/-2)
magentoerpconnect/i18n/zh_CN.po (+1794/-0)
magentoerpconnect/invoice.py (+135/-2)
magentoerpconnect/magerp_core.py (+115/-101)
magentoerpconnect/magerp_core_view.xml (+163/-165)
magentoerpconnect/magerp_data.xml (+37/-6)
magentoerpconnect/magerp_menu.xml (+65/-0)
magentoerpconnect/magerp_osv.py (+206/-5)
magentoerpconnect/partner.py (+113/-8)
magentoerpconnect/partner_view.xml (+14/-1)
magentoerpconnect/product.py (+811/-98)
magentoerpconnect/product_images.py (+111/-8)
magentoerpconnect/product_images_view.xml (+21/-21)
magentoerpconnect/product_links.py (+6/-10)
magentoerpconnect/product_links_view.xml (+8/-23)
magentoerpconnect/product_view.xml (+318/-313)
magentoerpconnect/sale.py (+424/-24)
magentoerpconnect/sale_view.xml (+77/-4)
magentoerpconnect/server_tmp.patch (+0/-14)
magentoerpconnect/settings/1.3.2.4/external.mapping.template.csv (+1/-1)
magentoerpconnect/settings/1.3.2.4/external.mappinglines.template.csv (+222/-23)
magentoerpconnect/settings/1.3.2.4/external.referential.version.csv (+2/-2)
magentoerpconnect/settings/1.5.0.0/account.invoice/external.mappinglines.template.csv (+10/-0)
magentoerpconnect/settings/1.5.0.0/attribut.group/external.mappinglines.template.csv (+5/-0)
magentoerpconnect/settings/1.5.0.0/attribut.set/external.mappinglines.template.csv (+5/-0)
magentoerpconnect/settings/1.5.0.0/attribut/external.mappinglines.template.csv (+26/-0)
magentoerpconnect/settings/1.5.0.0/external.mapping.template.csv (+19/-0)
magentoerpconnect/settings/1.5.0.0/external.referential.version.csv (+2/-2)
magentoerpconnect/settings/1.5.0.0/external.shop.group/external.mappinglines.template.csv (+6/-0)
magentoerpconnect/settings/1.5.0.0/magerp.storeviews/external.mappinglines.template.csv (+6/-0)
magentoerpconnect/settings/1.5.0.0/product.category/external.mappinglines.template.csv (+60/-0)
magentoerpconnect/settings/1.5.0.0/product.link/external.mappinglines.template.csv (+5/-0)
magentoerpconnect/settings/1.5.0.0/product/external.mappinglines.template.csv (+61/-0)
magentoerpconnect/settings/1.5.0.0/res.partner.address/external.mappinglines.template.csv (+59/-0)
magentoerpconnect/settings/1.5.0.0/res.partner.category/external.mappinglines.template.csv (+3/-0)
magentoerpconnect/settings/1.5.0.0/res.partner/external.mappinglines.template.csv (+21/-0)
magentoerpconnect/settings/1.5.0.0/sale.order.line/external.mappinglines.template.csv (+24/-0)
magentoerpconnect/settings/1.5.0.0/sale.order/external.mappinglines.template.csv (+44/-0)
magentoerpconnect/settings/1.5.0.0/sale.shop/external.mappinglines.template.csv (+5/-0)
magentoerpconnect/settings/external.referential.type.csv (+2/-0)
magentoerpconnect/stock.py (+25/-3)
magentoerpconnect/wizard/__init__.py (+0/-1)
magentoerpconnect/wizard/open_product_by_attribut_set.py (+5/-7)
magentoerpconnect/wizard/product_change_sku.py (+0/-41)
magentoerpconnect/wizard/product_change_sku_view.xml (+0/-36)
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 (+4/-3)
magentoerpconnect_bundle_split/sale.py (+17/-22)
magentoerpconnect_bundle_split/settings/1.5.0.0/external.mappinglines.template.csv (+3/-3)
magentoerpconnect_bundle_split/stock.py (+9/-15)
magentoerpconnect_customer_fiscal_category/__openerp__.py (+2/-2)
magentoerpconnect_customer_fiscal_category/settings/1.5.0.0/external.mappinglines.template.csv (+5/-0)
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 (+25/-0)
magentoerpconnect_openerp_invoice/__openerp__.py (+47/-0)
magentoerpconnect_openerp_invoice/external_referential.py (+33/-0)
magentoerpconnect_openerp_invoice/external_referential_view.xml (+22/-0)
magentoerpconnect_openerp_invoice/invoice.py (+81/-0)
magentoerpconnect_openerp_invoice/sale.py (+38/-0)
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 (+21/-18)
magentoerpconnect_product_variant/__openerp__.py (+4/-4)
magentoerpconnect_product_variant/product.py (+75/-50)
magentoerpconnect_product_variant/product_view.xml (+82/-70)
magentoerpconnect_product_variant/settings/1.3.2.4/external.mappinglines.template.csv (+0/-2)
magentoerpconnect_product_variant/settings/1.5.0.0/external.mappinglines.template.csv (+20/-2)
Related source package recipes
Related bugs
Related blueprints
Branch information
Recent revisions
- 685. By Guewen Baconnier @ Camptocamp
-
[FIX] do not check if the carrier exists in getCarrier if there is no tracking number, do not send an empty tracking number
- 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 - 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)
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/magentoerpconnect
MagentoERPConnect...
