Prestashop OpenERP Connector

Merge lp:~angelmoya/prestashoperpconnect/prestashoperpconnect into lp:prestashoperpconnect/6.1

  1. prestashoperpconnect
  2. Merge into trunk
Proposed by Angel Moya - Domatix
Status: Merged
Merged at revision: 51
Proposed branch: lp:~angelmoya/prestashoperpconnect/prestashoperpconnect
Merge into: lp:prestashoperpconnect/6.1
Diff against target: 27 lines (+5/-1) (has conflicts)
2 files modified
prestashoperpconnect/__openerp__.py (+4/-0)
prestashoperpconnect/external_referential.py (+1/-1)
Text conflict in prestashoperpconnect/__openerp__.py
To merge this branch: bzr merge lp:~angelmoya/prestashoperpconnect/prestashoperpconnect
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp Approve
Review via email: mp+113698@code.launchpad.net

Description of the change

Fix:
Bug #1013121
Bug #1017409

To post a comment you must log in.
lp:~angelmoya/prestashoperpconnect/prestashoperpconnect updated
51. By Angel Moya <angel@mint>

FIX Bug #1017409 changed version to code

Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

Your branch is merged, I just totally removed the line
'settings/external.referential.category.csv',
instead of commented it out.

Thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'prestashoperpconnect/__openerp__.py'
2--- prestashoperpconnect/__openerp__.py 2012-07-06 07:44:48 +0000
3+++ prestashoperpconnect/__openerp__.py 2012-07-06 07:46:18 +0000
4@@ -68,6 +68,10 @@
5 'sale_states_view.xml',
6 'prestashoperpconnect_menu.xml',
7 'board_prestashoperpconnect_view.xml',
8+<<<<<<< TREE
9+=======
10+# 'settings/external.referential.category.csv',
11+>>>>>>> MERGE-SOURCE
12 'settings/external.referential.type.csv',
13 'settings/1.5.0.0/external.referential.version.csv',
14 'settings/1.5.0.0/external.mapping.template.csv',
15
16=== modified file 'prestashoperpconnect/external_referential.py'
17--- prestashoperpconnect/external_referential.py 2012-04-20 10:35:19 +0000
18+++ prestashoperpconnect/external_referential.py 2012-07-06 07:46:18 +0000
19@@ -135,7 +135,7 @@
20 """TODO Make this more clean because I think this "version" field is not the best way to handle this
21 (The 1.4.3 version of Prestashop don't have external shop group)
22 """
23- if external_session.referential_id.version_id.version >= '1.5' or not external_session.referential_id.version_id.version:
24+ if external_session.referential_id.version_id.code >= 'prestashop1500' or not external_session.referential_id.version_id.code:
25 self.import_resources(cr, uid, [referential_id], 'external.shop.group', context=context)
26 else:
27 ext_shop_group_obj = self.pool.get('external.shop.group')