openerp-dev-web team mailing list archive

["Valencia Rodrigues \(OpenERP\)" <vro@xxxxxxxxxxx>]

Valencia Rodrigues (OpenERP) has proposed merging lp:~openerp-dev/openobject-addons/vro-import_quickbooks into lp:~openerp-dev/openobject-addons/apa-import_quickbooks.

Requested reviews:
  OpenERP R&D Team (openerp-dev)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/vro-import_quickbooks/+merge/57130

Mapped fields of Items/Services to Product. Mapped field "type".
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/vro-import_quickbooks/+merge/57130
Your team OpenERP R&D Team is requested to review the proposed merge of lp:~openerp-dev/openobject-addons/vro-import_quickbooks into lp:~openerp-dev/openobject-addons/apa-import_quickbooks.

=== modified file 'quickbooks_ippids/import_datas.py'
--- quickbooks_ippids/import_datas.py	2011-04-06 13:16:19 +0000
+++ quickbooks_ippids/import_datas.py	2011-04-11 09:47:34 +0000
@@ -96,7 +96,17 @@
                 if rec.has_key(qb_key):
                     if openerp_key not in tmp_fields:
                         tmp_fields.append(openerp_key)
-                    tmp_datas.append(rec.get(qb_key,[''])[0])
+                    if not isinstance(rec.get(qb_key)[0],dict):
+                        tmp_datas.append(rec.get(qb_key,[''])[0])
+                    else:
+                        if qb_key =='UnitPrice':
+                            tmp_datas.append(rec.get(qb_key,[''])[0].get('Amount')[0])
+                        elif qb_key =='PurchaseCost':
+                            tmp_datas.append(rec.get(qb_key,[''])[0].get('Amount')[0])
+                        elif qb_key =='IncomeAccountRef':
+                            tmp_datas.append(rec.get(qb_key,[''])[0].get('AccountName')[0])
+                        elif qb_key =='COGSAccountRef':
+                            tmp_datas.append(rec.get(qb_key,[''])[0].get('AccountName')[0])
             else:
                 o2m_fields,o2m_datas,relation,relation_field,parent_key=One2ManyDatas(cr,uid,rec,openerp_key,qb_key)
         #changed the partner type for res.partner.
@@ -138,6 +148,17 @@
                 tmp_fields.insert(0,'parent_id')
                 tmp_datas.insert(0,'Account Chart')
 
+        if qb_obj=='Item':
+            if tmp_datas[tmp_fields.index('categ_id')] in ['Service']:
+                tmp_fields.insert(0,'type')
+                tmp_datas.insert(0,'Service')
+            elif tmp_datas[tmp_fields.index('categ_id')] in ['Inventory Part','Inventory Assembly','Product','Assembly','Inventory']:
+                tmp_fields.insert(0,'type')
+                tmp_datas.insert(0,'Stockable Product')
+            else:
+                tmp_fields.insert(0,'type')
+                tmp_datas.insert(0,'Consumable')
+
         if 'qb_ref' in tmp_fields:
             rec_id=pool_obj.search(cr,uid,[('qb_ref','=',tmp_datas[tmp_fields.index('qb_ref')])])
             if not rec_id:

=== modified file 'quickbooks_ippids/map_fields.py'
--- quickbooks_ippids/map_fields.py	2011-04-08 05:56:27 +0000
+++ quickbooks_ippids/map_fields.py	2011-04-11 09:47:34 +0000
@@ -50,9 +50,13 @@
                                 'active':'Active',
                                 'qb_ref':'Id',
                                 'description':'Desc',
-#                                'list_price':'UnitPrice',
+                                'list_price':'UnitPrice',
                                 'categ_id':'Type',
                                 'description_purchase':'PurchaseDesc',
+                                'standard_price':'PurchaseCost',
+                                'property_account_income':'IncomeAccountRef',
+                                'property_account_expense':'COGSAccountRef',
+                                'seller_ids':{'PrefVendorRef':{'name':'VendorName'}}
                                 },
 #            'sale.order':{},
             }

=== modified file 'quickbooks_product/quickbooks_product.py'
--- quickbooks_product/quickbooks_product.py	2011-04-05 12:09:57 +0000
+++ quickbooks_product/quickbooks_product.py	2011-04-11 09:47:34 +0000
@@ -32,4 +32,14 @@
     }
 product_template()
 
+class product_supplierinfo(osv.osv):
+    _name = 'product.supplierinfo'
+    _inherit = 'product.supplierinfo'
+    _description = 'Information about a product supplier'
+
+    _defaults = {
+                 'min_qty': lambda *a: 0.0,
+                }
+product_supplierinfo()
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: