Launchpad automatic translations update.

[odoo/odoo.git] / addons / product_manufacturer / product_manufacturer.py

diff --git a/addons/product_manufacturer/product_manufacturer.py b/addons/product_manufacturer/product_manufacturer.py
index 78e951b..93f4a6f 100644 (file)
--- a/addons/product_manufacturer/product_manufacturer.py
+++ b/addons/product_manufacturer/product_manufacturer.py
@@ -18,32 +18,18 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from osv import fields, osv
 
 class product_product(osv.osv):
     _inherit = 'product.product'
-    _name = 'product.product'
     _columns = {
+        'manufacturer' : fields.many2one('res.partner', 'Manufacturer'),
+        'manufacturer_pname' : fields.char('Manufacturer Product Name', size=64),
+        'manufacturer_pref' : fields.char('Manufacturer Product Code', size=64),
         'attribute_ids': fields.one2many('product.manufacturer.attribute', 'product_id', 'Attributes'),
-        'manufacturer_ids': fields.one2many('res.partner.manufacturer', 'product_id', 'Manufacturers'),
     }
 product_product()
 
-class res_partner_manufacturer(osv.osv):
-    _name = 'res.partner.manufacturer'
-    _rec_name = 'manufacturer_id'
-    _columns = {
-        'manufacturer_id' : fields.many2one('res.partner', 'Manufacturer'),
-        'country_id' : fields.many2one('res.country', 'Country'),
-        'authorized' : fields.boolean('Authorized'),
-        'product_id': fields.many2one('product.product', 'Product', ondelete='cascade'),
-    }
-    _defaults = {
-        'authorized': True,
-    }
-
-res_partner_manufacturer()
-
 class product_attribute(osv.osv):
     _name = "product.manufacturer.attribute"
     _description = "Product attributes"
@@ -54,6 +40,4 @@ class product_attribute(osv.osv):
     }
 product_attribute()
 
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
-
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file