From 689efb5b94f53c9ba35cb7c382dda9d1e11eccc3 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Tue, 16 Jan 2007 10:04:27 +0000
Subject: [PATCH] PRODUCT: fix digits on volume and weight, add weight_net

bzr revid: ced-a585115f93ae8e6c5c31f3e584217aab2a216008
---
 addons/product/product.py       |  3 ++-
 addons/product/product_view.xml | 12 ++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/product/product.py b/addons/product/product.py
index 9eb8deb037a..1869b68c0a8 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -182,7 +182,8 @@ class product_template(osv.osv):
 		'list_price': fields.float('List Price', digits=(16, int(config['price_accuracy']))),
 		'standard_price': fields.float('Cost Price', required=True, digits=(16, int(config['price_accuracy']))),
 		'volume': fields.float('Volume'),
-		'weight': fields.float('Weight'),
+		'weight': fields.float('Gross weight'),
+		'weight_net': fields.float('Net weight'),
 		'cost_method': fields.selection([('standard','Standard Price'), ('average','Average Price')], 'Costing Method', required=True),
 		'warranty': fields.float('Warranty (months)'),
 		'sale_ok': fields.boolean('Can be sold', help="Determine if the product can be visible in the list of product within a selection from a sale order line."),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index f5899e78c15..e189d45901b 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -39,8 +39,10 @@
 							<newline/>
 							<field name="categ_id" select="1"/>
 							<field name="type" select="1"/>
-							<field name="volume"/>
-							<field name="weight"/>
+							<field name="volume" digits="(14, 3)"/>
+							<newline/>
+							<field name="weight" digits="(14, 3)"/>
+							<field name="weight_net" digits="(14, 3)"/>
 							<field name="procure_method" select="1"/>
 							<field name="state"/>
 							<field name="uom_id"/>
@@ -138,8 +140,10 @@
 							<field name="name" colspan="3" select="1"/>
 							<field name="categ_id" select="1"/>
 							<field name="type" select="1"/>
-							<field name="volume"/>
-							<field name="weight"/>
+							<field name="volume" digits="(14, 3)"/>
+							<newline/>
+							<field name="weight" digits="(14, 3)"/>
+							<field name="weight_net" digits="(14, 3)"/>
 							<field name="procure_method"/>
 							<field name="state"/>
 							<field name="uom_id"/>