Merge lp:~initos.com/openerp-connector-magento/7.0-import_customer_lang into lp:~openerp-connector-core-editors/openerp-connector-magento/7.0

Proposed by Katja Matthes
Status: Needs review
Proposed branch: lp:~initos.com/openerp-connector-magento/7.0-import_customer_lang
Merge into: lp:~openerp-connector-core-editors/openerp-connector-magento/7.0
Diff against target: 38 lines (+9/-1)
2 files modified
magentoerpconnect/magento_model.py (+5/-0)
magentoerpconnect/sale.py (+4/-1)
To merge this branch: bzr merge lp:~initos.com/openerp-connector-magento/7.0-import_customer_lang
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp Needs Resubmitting
Review via email: mp+224090@code.launchpad.net

Description of the change

1) When importing a partner from Magento to OpenERP the configured language of the storeview is set as the customer's language. But there's no mapping for the storeview's language, so it has to be configured manualy after creating the storeviews using the synchronize metadata function. We think (if it is set) it would be nice to use the configured default language of the backend as language of the storviews, too.

2) FIX: Customer addresses from sale order import do not use the parent contact's language.

To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

This project is now hosted on https://github.com/OCA/connector-magento. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

review: Needs Resubmitting

Unmerged revisions

1003. By Katja Matthes

map language of storeview to default language of backend, fix language for addresses from sale order import

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'magentoerpconnect/magento_model.py'
2--- magentoerpconnect/magento_model.py 2014-05-26 10:57:10 +0000
3+++ magentoerpconnect/magento_model.py 2014-06-23 09:58:45 +0000
4@@ -655,6 +655,11 @@
5 binding_id = binder.to_openerp(record['group_id'])
6 return {'store_id': binding_id}
7
8+ @mapping
9+ def lang(self, record):
10+ if self.backend_record.default_lang_id:
11+ return {'lang_id': self.backend_record.default_lang_id.id}
12+
13
14 @magento
15 class StoreImport(MagentoImportSynchronizer):
16
17=== modified file 'magentoerpconnect/sale.py'
18--- magentoerpconnect/sale.py 2014-05-26 11:25:41 +0000
19+++ magentoerpconnect/sale.py 2014-06-23 09:58:45 +0000
20@@ -626,6 +626,8 @@
21
22 partner_id = sess.read('magento.res.partner',
23 partner_bind_id, ['openerp_id'])['openerp_id'][0]
24+ # get parent's language
25+ lang = sess.read('res.partner', partner_id, ['lang'])['lang'] or 'en_US'
26
27 # Import of addresses. We just can't rely on the
28 # ``customer_address_id`` field given by Magento, because it is
29@@ -644,7 +646,8 @@
30
31 # For the orders which are from guests, we let the addresses
32 # as active because they don't have an address book.
33- addresses_defaults = {'parent_id': partner_id,
34+ addresses_defaults = {'lang': lang,
35+ 'parent_id': partner_id,
36 'magento_partner_id': partner_bind_id,
37 'email': record.get('customer_email', False),
38 'active': is_guest_order,