unifield-wm

Merge lp:~unifield-team/unifield-wm/bklg-11 into lp:unifield-wm

  1. bklg-11
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2394
Proposed branch: lp:~unifield-team/unifield-wm/bklg-11
Merge into: lp:unifield-wm
Diff against target: 33 lines (+6/-1) (has conflicts)
2 files modified
import_data/import_data.py (+2/-1)
product_list/product_list.py (+4/-0)
Text conflict in product_list/product_list.py
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/bklg-11
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+248503@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'import_data/import_data.py'
2--- import_data/import_data.py 2014-10-16 10:09:35 +0000
3+++ import_data/import_data.py 2015-02-04 08:47:19 +0000
4@@ -466,10 +466,11 @@
5 def import_csv(self, cr, uid, ids, context=None):
6 # UFTP-327
7 fg = self.pool.get('product.product').fields_get(cr, uid,
8- fields=['default_code'], context=context)
9+ fields=['default_code', 'xmlid_code'], context=context)
10 if fg and 'default_code' in fg and 'size' in fg['default_code']:
11 context['import_data_field_max_size'] = {
12 'default_code': fg['default_code']['size'],
13+ 'xmlid_code': fg['xmlid_code']['size'],
14 }
15
16 super(import_product, self).import_csv(cr, uid, ids, context=context)
17
18=== modified file 'product_list/product_list.py'
19--- product_list/product_list.py 2015-01-27 08:51:36 +0000
20+++ product_list/product_list.py 2015-02-04 08:47:19 +0000
21@@ -247,8 +247,12 @@
22 # UFTP-327 default_code passed from size 14 to 18
23 # http://jira.unifield.org/browse/UFTP-327?focusedCommentId=36173&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-36173
24 'default_code' : fields.char('CODE', size=18, select=True),
25+<<<<<<< TREE
26 'xmlid_code' : fields.char('Hidden xmlid code', size=64), # UF-2254: this code is only used for xml_id purpose, added ONLY when creating the product
27 'msfid' : fields.integer(string='Hidden field for UniData'), # US-45: Added this field but hidden, for UniData to be able to import the Id
28+=======
29+ 'xmlid_code' : fields.char('Hidden xmlid code', size=18), # UF-2254: this code is only used for xml_id purpose, added ONLY when creating the product
30+>>>>>>> MERGE-SOURCE
31 }
32
33 _sql_constraints = [

Subscribers

People subscribed via source and target branches