Micronaet - Quality

Merge lp:~anna-g/micronaet-quality/anna into lp:micronaet-quality

  1. anna
  2. Merge into trunk
Proposed by Anna Micronaet
Status: Merged
Approved by: Nicola Riolini - Micronaet
Approved revision: 118
Merged at revision: 237
Proposed branch: lp:~anna-g/micronaet-quality/anna
Merge into: lp:micronaet-quality
Diff against target: 30 lines (+5/-1) (has conflicts)
2 files modified
quality_import_bf/wizard_import.py (+4/-0)
sql_custom_product_lot/product.py (+1/-1)
Text conflict in quality_import_bf/wizard_import.py
To merge this branch: bzr merge lp:~anna-g/micronaet-quality/anna
Reviewer Review Type Date Requested Status
Nicola Riolini - Micronaet Pending
Review via email: mp+234989@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=== removed directory 'quality/wizard'
2=== modified file 'quality_import_bf/wizard_import.py'
3--- quality_import_bf/wizard_import.py 2014-09-17 12:47:52 +0000
4+++ quality_import_bf/wizard_import.py 2014-09-17 14:41:10 +0000
5@@ -20,8 +20,12 @@
6 import os
7 import sys
8 import logging
9+<<<<<<< TREE
10 from osv import osv, fields
11 import shutil
12+=======
13+from openerp.osv import osv, fields
14+>>>>>>> MERGE-SOURCE
15 from datetime import datetime, timedelta
16 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
17 import openerp.addons.decimal_precision as dp
18
19=== modified file 'sql_custom_product_lot/product.py'
20--- sql_custom_product_lot/product.py 2014-05-26 12:25:06 +0000
21+++ sql_custom_product_lot/product.py 2014-09-17 14:41:10 +0000
22@@ -21,7 +21,7 @@
23 import sys
24 import netsvc
25 import logging
26-from osv import osv, fields
27+from openerp.osv import osv, fields
28 from datetime import datetime, timedelta
29 from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT, DATETIME_FORMATS_MAP, float_compare
30 import openerp.addons.decimal_precision as dp

Subscribers

People subscribed via source and target branches