lp://staging/~magentoerpconnect-core-editors/magentoerpconnect/trunk-fix-876312

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/magentoerpconnect/oerp6.1-oldstable

Guewen Baconnier @ Camptocamp: Approve on 2012-07-06

Diff: 796 lines (+705/-4)

10 files modified

magentoerpconnect/__openerp__.py (+7/-0)
magentoerpconnect/settings/1.4.0.0/external.mapping.template.csv (+14/-0)
magentoerpconnect/settings/1.4.0.0/external.mappinglines.template.csv (+321/-0)
magentoerpconnect/settings/1.4.0.0/external.referential.type.csv (+2/-0)
magentoerpconnect/settings/1.4.2.0/external.mapping.template.csv (+14/-0)
magentoerpconnect/settings/1.4.2.0/external.mappinglines.template.csv (+318/-0)
magentoerpconnect/settings/1.4.2.0/external.referential.type.csv (+2/-0)
magentoerpconnect/settings/1.5.0.0/external.mappinglines.template.csv (+4/-4)
magentoerpconnect/settings/update/fix_product_categories.sql (+7/-0)
magentoerpconnect/settings/update/magerp.product_category_attribute_options.xml (+16/-0)

api

Superseded for merging into lp://staging/~magentoerpconnect-core-editors/magentoerpconnect/oerp7.0-refactor

Guewen Baconnier @ Camptocamp: Pending requested 2012-07-06

Diff: 4695 lines (+3433/-115) (has conflicts)

27 files modified

magento_sku_is_code/product.py (+29/-10)
magentoerpconnect/__openerp__.py (+16/-1)
magentoerpconnect/board_view.xml (+30/-0)
magentoerpconnect/magerp_core.py (+28/-12)
magentoerpconnect/magerp_menu.xml (+3/-27)
magentoerpconnect/magerp_osv.py (+129/-20)
magentoerpconnect/partner.py (+252/-0)
magentoerpconnect/partner_view.xml (+38/-0)
magentoerpconnect/product.py (+752/-19)
magentoerpconnect/product_images.py (+54/-5)
magentoerpconnect/sale.py (+594/-0)
magentoerpconnect/sale_view.xml (+19/-0)
magentoerpconnect/settings/1.3.2.4/external.mapping.template.csv (+1/-1)
magentoerpconnect/settings/1.3.2.4/external.mappinglines.template.csv (+244/-20)
magentoerpconnect/settings/1.4.0.0/external.mapping.template.csv (+14/-0)
magentoerpconnect/settings/1.4.0.0/external.mappinglines.template.csv (+321/-0)
magentoerpconnect/settings/1.4.0.0/external.referential.type.csv (+2/-0)
magentoerpconnect/settings/1.4.2.0/external.mapping.template.csv (+14/-0)
magentoerpconnect/settings/1.4.2.0/external.mappinglines.template.csv (+318/-0)
magentoerpconnect/settings/1.4.2.0/external.referential.type.csv (+2/-0)
magentoerpconnect/settings/1.5.0.0/external.mapping.template.csv (+17/-0)
magentoerpconnect/settings/1.5.0.0/external.mappinglines.template.csv.OTHER (+330/-0)
magentoerpconnect/settings/update/fix_product_categories.sql (+7/-0)
magentoerpconnect/settings/update/magerp.product_category_attribute_options.xml (+16/-0)
magentoerpconnect/stock.py (+19/-0)
magentoerpconnect_payment/sale.py (+95/-0)
magentoerpconnect_product_variant/product.py (+89/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #876312: [TRUNK] available_sort_by bug/feature magento limitation

High

Fix Committed

Link a bug report

Related blueprints

647. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-07-06

[FIX] magentoerpconnect: fix export product.category issues

* the product.category meta_title has a max length of 255 char on magento
* add mappings for Magento 1.4.0.0 and 1.4.2.0, for the product.category available_sort_by bug (lp:876312)
* duplicate the option used for default value with an empty string and fix mappings (>> 1.4)

  I did not simply change the value of the option as there might be a chance that
  the 'None' trick works with Magento 1.3.x (and I don't have such an instance to
  run a test on it)

  In the mappings, the options are looked for by value, so the new option is used
  with the new mappings.
* added settings/update/fix_product_categories.sql script to fix the related options on product_category on an existing database. Must be run manually

646. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-07-05

bump up version number, reflecting schema change

645. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-07-05

[FIX] magentoerpconnect: the product.category metat_title has a max length of 255 char on magento

644. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-07-05

[FIX] magentoerpconnect: we can get a bool instead of a list of values to log. Don't truncate in that case

643. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-07-05

[IMP] magentoerpconnect: also truncate long strings in logging of returned value

642. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-07-05

[IMP] magentoerpconnect: enhance logging truncation by processing dict argument elements

641. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-06-27

[IMP] reduce verbosity logs for large strings such as images

640. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-06-27

[FIX] write the last_products_export_date only at the end of the products export to avoid locking sale.shop during the whole export

639. By Guewen Baconnier @ Camptocamp <email address hidden> on 2012-06-27

[FIX] mappings for page_layout and default_sort_by fail when empty, force export of categories which are missing when exporting a product

638. By Alexandre Fayolle @ camptocamp <email address hidden> on 2012-06-27

[FIX] fix product_category export and stock sync problems