Merge branch 'master' of git:~/gitrepos/cam-template

ext/custom-addons/cam_custom/cam_custom.py

@@ -62,6 +62,16 @@ class res_partner(osv.osv):
         """ verhindert das Überschreiben von address_format """
         return arch
     
+class product_product(osv.osv):
+    _inherit = 'product.product'
+    
+    def name_get(self, cr, user, ids, context=None):
+        if context is None:
+            context = {}
+        c = context.copy()
+        c.update({'display_default_code': False})
+        return super(product_product, self).name_get(cr, user, ids, context=c)
+    
 class mail_notification(osv.Model):
     _inherit = 'mail.notification'
 
@@ -106,3 +116,14 @@ class mail_notification(osv.Model):
 #         footer = tools.append_content_to_html(footer, signature_company, plaintext=False, container_tag='div')
 
         return footer
+    
+# class product_product(osv.osv):
+#     _inherit = 'product.product'
+#     
+#     def name_get(self, cr, user, ids, context=None):
+#         if context is None:
+#             context = {}
+#         c = context.copy()
+#         c.update({'display_default_code': False})
+#         return super(product_product, self).name_get(cr, user, ids, context=c) 
+    

ext/custom-addons/cam_custom/cam_custom_view.xml

@@ -64,5 +64,16 @@
             <field name="view_id"></field>
         </record>  
     
+        <record id="product_supplierinfo_form_view" model="ir.ui.view">
+            <field name="name">product.supplierinfo.form.view</field>
+            <field name="model">product.supplierinfo</field>
+            <field name="inherit_id" ref="product.product_supplierinfo_form_view"/>
+            <field name="arch" type="xml">
+                <field name="product_code" position="replace">
+                	<field name="product_code" invisible="1"/>
+                </field>
+            </field>
+        </record>
+        
 	</data>
 </openerp>