Merge lp:~jri-openerp/enapps-csv-import-tool/many2one_without_data into lp:~jri-openerp/enapps-csv-import-tool/fully-patched

Proposed by Juan Rial (OpenERP)
Status: Merged
Merged at revision: 5
Proposed branch: lp:~jri-openerp/enapps-csv-import-tool/many2one_without_data
Merge into: lp:~jri-openerp/enapps-csv-import-tool/fully-patched
Diff against target: 12 lines (+2/-0)
1 file modified
ea_import/ea_import_template_line.py (+2/-0)
To merge this branch: bzr merge lp:~jri-openerp/enapps-csv-import-tool/many2one_without_data
Reviewer Review Type Date Requested Status
Juan Rial (OpenERP) Approve
Review via email: mp+105967@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Juan Rial (OpenERP) (jri-openerp) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ea_import/ea_import_template_line.py'
2--- ea_import/ea_import_template_line.py 2012-04-10 11:00:44 +0000
3+++ ea_import/ea_import_template_line.py 2012-05-16 12:32:19 +0000
4@@ -140,6 +140,8 @@
5 target_string = input_list[template_line.sequence - 1]
6 if not target_string.strip() and template_line.default_value:
7 target_string = template_line.default_value
8+ elif not target_string.strip() and not template_line.target_field.required:
9+ continue
10 template_line_type = template_line.field_type
11 if template_line.calculated and template_line_type in ['integer', 'float']:
12 calc_fields = sorted(template_line.calc_field_ids, key=lambda k: k.sequence)

Subscribers

People subscribed via source and target branches

to all changes: