odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

Small Improvements 

bzr revid: fp@tinyerp.com-20080826221832-4vi06cwuv1lb238q
This commit is contained in:
Fabien Pinckaers 2008-08-27 00:18:32 +02:00
parent 27499668c5
commit abeddaa388
7 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/delivery/delivery.py
View File

@ -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),

2
addons/delivery/partner.py
View File

@ -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()

1
addons/product/partner.py
View File

@ -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,

2
addons/product/pricelist.py
View File

@ -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']:

4
addons/product/pricelist_view.xml
View File

@ -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>
</terp>

1
addons/purchase/partner.py
View File

@ -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,

2
addons/stock/stock.py
View File

@ -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),