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

[FIX]delivery form view + some label 

bzr revid: csn@openerp.com-20140212141302-g08x29wejo2om79o
This commit is contained in:
Cedric Snauwaert 2014-02-12 15:13:02 +01:00
parent fdf9fc34dc
commit 50b2c041aa
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/delivery/delivery_view.xml
View File

@ -27,15 +27,13 @@
</h1>
</div>
<group>
<group name="general">
<field name="active"/>
</group>
<group>
<group string="General Information">
<field name="partner_id"/>
<field name="product_id"/>
</group>
<group>
<field name="active"/>
</group>
</group>
<group col="4">
<group string="Pricing Information">
<field name="normal_price" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
<label for="free_if_more_than"/>
@ -43,10 +41,12 @@
<field name="free_if_more_than" attrs="{'readonly':[('use_detailed_pricelist', '=', True)]}"/>
<field name="amount" attrs="{'required':[('free_if_more_than','&lt;&gt;',False)], 'invisible':[('free_if_more_than','=',False)]}"/>
</div>
</group>
<newline/>
<field name="use_detailed_pricelist"/>
</group>
</group>
<field name="pricelist_ids" attrs="{'invisible':[('use_detailed_pricelist','=',False)]}" mode="tree">
<tree string="Delivery grids">
<field name="sequence"/>

2
addons/stock/stock.py
View File

@ -3805,7 +3805,7 @@ class stock_picking_type(osv.osv):
return res and res[0] or False
_columns = {
'name': fields.char('Name', translate=True, required=True),
'name': fields.char('Picking Type Name', translate=True, required=True),
'complete_name': fields.function(_get_name, type='char', string='Name'),
'auto_force_assign': fields.boolean('Automatic Availability', help='This picking type does\'t need to check for the availability in source location.'),
'color': fields.integer('Color'),

2
addons/stock_picking_wave/stock_picking_wave.py
View File

@ -9,7 +9,7 @@ class stock_picking_wave(osv.osv):
'name': fields.char('Picking wave name', required=True, help='Name of the picking wave'),
'user_id': fields.many2one('res.users', 'Responsible', help='Person responsible for this wave'),
'picking_ids': fields.one2many('stock.picking', 'wave_id', 'Pickings', help='List of picking associated to this wave'),
'state': fields.selection([('draft', 'Draft'), ('in_progress', 'Running'), ('done', 'Done'), ('cancel', 'Cancelled')], required=True),
'state': fields.selection([('draft', 'Draft'), ('in_progress', 'Running'), ('done', 'Done'), ('cancel', 'Cancelled')], string="State", required=True),
}
_defaults = {