pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE]:lp:~openerp-commiter/openobject-addons/trunk-add-placeholder-apa-product-hsa

Browse Source 
bzr revid: apa@tinyerp.com-20120531060254-15ql7qrxxh1js9sf
This commit is contained in:
Amit Patel (OpenERP)
2012-05-31 11:32:54 +05:30
parent 74d324e628 f1ea7634ea
commit 592de49960
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/product/product.py
+1 -1
View File
@@ -518,7 +518,7 @@ class product_product(osv.osv):
'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the product without removing it."),
'variants': fields.char('Variants', size=64),
'product_tmpl_id': fields.many2one('product.template', 'Product Template', required=True, ondelete="cascade"),
'ean13': fields.char('EAN13', size=13),
'ean13': fields.char('EAN13', size=13, help="The numbers encoded in EAN-13 bar codes are product identification numbers."),
'packaging' : fields.one2many('product.packaging', 'product_id', 'Logistical Units', help="Gives the different ways to package the same product. This has no impact on the picking order and is mainly used if you use the EDI module."),
'price_extra': fields.float('Variant Price Extra', digits_compute=dp.get_precision('Sale Price')),
'price_margin': fields.float('Variant Price Margin', digits_compute=dp.get_precision('Sale Price')),
addons/product/product_view.xml
+3 -3
View File
@@ -78,7 +78,7 @@
<group colspan="1" col="2">
<separator string="Codes" colspan="2"/>
<field name="default_code"/>
<field name="ean13"/>
<field name="ean13" placeholder="5901234123457" />
</group>
<group colspan="1" col="2">
<separator string="Characteristics" colspan="2"/>
@@ -163,9 +163,9 @@
<separator string="Description"/>
<field colspan="4" name="description" nolabel="1"/>
<separator string="Sale Description"/>
<field colspan="4" name="description_sale" nolabel="1"/>
<field colspan="4" name="description_sale" nolabel="1" placeholder="This note will be displayed on quotations..."/>
<separator string="Purchase Description"/>
<field colspan="4" name="description_purchase" nolabel="1"/>
<field colspan="4" name="description_purchase" nolabel="1" placeholder="This note will be displayed on requests for quotation..."/>
</page>
<page groups="product.group_stock_packaging" string="Packaging">
<field colspan="4" name="packaging" nolabel="1">
addons/stock_location/stock_location_view.xml
+2 -2
View File
@@ -51,7 +51,7 @@
</tree>
<form string="Pulled Paths">
<separator string="Conditions" colspan="4"/>
<field name="name" colspan="4"/>
<field name="name" colspan="4" placeholder="Fulfill needs on location X from location Y "/>
<field name="location_id"/>
<separator string="Action Type" colspan="4"/>
<field name="type_proc"/>
@@ -81,7 +81,7 @@
</tree>
<form string="Pushed flows">
<group colspan="4" col="6">
<field name="name"/>
<field name="name" placeholder="When receiving at location X, move to location Y"/>
<field name="location_from_id"/>
<field name="location_dest_id"/>
<field name="auto"/>