From abeddaa3888d659e067044208440a17a6060e8ca Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Wed, 27 Aug 2008 00:18:32 +0200
Subject: [PATCH] Small Improvements

bzr revid: fp@tinyerp.com-20080826221832-4vi06cwuv1lb238q
---
 addons/delivery/delivery.py       | 8 ++++----
 addons/delivery/partner.py        | 2 +-
 addons/product/partner.py         | 1 +
 addons/product/pricelist.py       | 2 +-
 addons/product/pricelist_view.xml | 4 ++--
 addons/purchase/partner.py        | 1 +
 addons/stock/stock.py             | 2 +-
 7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/addons/delivery/delivery.py b/addons/delivery/delivery.py
index cba9d83a585..da4bd854b10 100644
--- a/addons/delivery/delivery.py
+++ b/addons/delivery/delivery.py
@@ -37,9 +37,9 @@ class delivery_carrier(osv.osv):
     _description = "Carrier and delivery grids"
     _columns = {
         'name': fields.char('Carrier', size=64, required=True),
-        'partner_id': fields.many2one('res.partner', 'Carrier partner', required=True),
-        'product_id': fields.many2one('product.product', 'Delivery product', required=True),
-        'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery grids'),
+        'partner_id': fields.many2one('res.partner', 'Carrier Partner', required=True),
+        'product_id': fields.many2one('product.product', 'Delivery Product', required=True),
+        'grids_id': fields.one2many('delivery.grid', 'carrier_id', 'Delivery Grids'),
         'active': fields.boolean('Active')
     }
     _defaults = {
@@ -66,7 +66,7 @@ delivery_carrier()
 
 class delivery_grid(osv.osv):
     _name = "delivery.grid"
-    _description = "Delivery grid"
+    _description = "Delivery Grid"
     _columns = {
         'name': fields.char('Grid Name', size=64, required=True),
         'sequence': fields.integer('Sequence', size=64, required=True),
diff --git a/addons/delivery/partner.py b/addons/delivery/partner.py
index ae68ceb77a4..9e7be38b93b 100644
--- a/addons/delivery/partner.py
+++ b/addons/delivery/partner.py
@@ -40,7 +40,7 @@ class res_partner(osv.osv):
           string="Delivery Method", 
           method=True,
           view_load=True,
-          help="This carrier will be used, instead of the default one, for delivering goods to the current partner"),
+          help="This delivery method will be used when invoicing from packings."),
     }
 res_partner()
 
diff --git a/addons/product/partner.py b/addons/product/partner.py
index 51a9408878f..ed7a4d68d07 100644
--- a/addons/product/partner.py
+++ b/addons/product/partner.py
@@ -40,6 +40,7 @@ class res_partner(osv.osv):
             'product.pricelist',
             type='many2one', 
             relation='product.pricelist', 
+            domain=[('type','=','sale')],
             string="Sale Pricelist", 
             method=True,
             view_load=True,
diff --git a/addons/product/pricelist.py b/addons/product/pricelist.py
index 6defddcff64..e5d52cbb632 100644
--- a/addons/product/pricelist.py
+++ b/addons/product/pricelist.py
@@ -215,7 +215,7 @@ class product_pricelist(osv.osv):
 
                 price_limit = price
 
-                price = price * (1.0-(res['price_discount'] or 0.0))
+                price = price * (1.0+(res['price_discount'] or 0.0))
                 price = rounding(price, res['price_round'])
                 price += (res['price_surcharge'] or 0.0)
                 if res['price_min_margin']:
diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml
index 3000886397b..80c59479996 100644
--- a/addons/product/pricelist_view.xml
+++ b/addons/product/pricelist_view.xml
@@ -79,7 +79,7 @@
                     <group col="6" colspan="5">
                         <label string="New Price ="/>
                         <label string="Base Price"/>
-                        <label string="* ( 1 - "/>
+                        <label string="* ( 1 + "/>
                         <field name="price_discount" nolabel="1"/>
                         <label string=" ) + "/>
                         <field name="price_surcharge" nolabel="1"/>
@@ -185,4 +185,4 @@
         <menuitem action="product_pricelist_type_action" groups="base.group_extended" id="menu_product_pricelist_type_action" parent="product.menu_config_product"/>
         
     </data>
-</terp>
\ No newline at end of file
+</terp>
diff --git a/addons/purchase/partner.py b/addons/purchase/partner.py
index ab831b66bd1..e726b3476ac 100644
--- a/addons/purchase/partner.py
+++ b/addons/purchase/partner.py
@@ -38,6 +38,7 @@ class res_partner(osv.osv):
           'product.pricelist',
           type='many2one', 
           relation='product.pricelist', 
+          domain=[('type','=','purchase')],
           string="Purchase Pricelist", 
           method=True,
           view_load=True,
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index be472663a2e..5930e4ee719 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -76,7 +76,7 @@ class stock_location(osv.osv):
     _description = "Location"
     _parent_name = "location_id"
     _columns = {
-        'name': fields.char('Location Name', size=64, required=True),
+        'name': fields.char('Location Name', size=64, required=True, translate=True),
         'active': fields.boolean('Active'),
         'usage': fields.selection([('supplier','Supplier Location'),('view','View'),('internal','Internal Location'),('customer','Customer Location'),('inventory','Inventory'),('procurement','Procurement'),('production','Production')], 'Location type'),
         'allocation_method': fields.selection([('fifo','FIFO'),('lifo','LIFO'),('nearest','Nearest')], 'Allocation Method', required=True),