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

[FIX] fixes 

bzr revid: qdp-launchpad@openerp.com-20140505125630-903olg3ko3y5gekh
This commit is contained in:
Quentin (OpenERP) 2014-05-05 14:56:30 +02:00
parent 693a60058e bd88fcd759
commit dcd10db66e
3 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/claim_from_delivery/claim_delivery_view.xml
View File

@ -17,7 +17,7 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="/form/sheet/h1" position="before"> <xpath expr="/form/sheet/h1" position="before">
<div class="oe_right oe_button_box"> <div class="oe_right oe_button_box">
<button name="%(action_claim_from_delivery)d" string="Claims" type="action" attrs="{'invisible': [('picking_type_id.code', '=', 'outgoing')]}"/> <button name="%(action_claim_from_delivery)d" string="Claims" type="action" attrs="{'invisible': [('picking_type_id.code', '!=', 'outgoing')]}"/>
</div> </div>
</xpath> </xpath>
</field> </field>

2
addons/stock/product_view.xml
View File

@ -75,7 +75,7 @@
<field name="type">ir.actions.act_window</field> <field name="type">ir.actions.act_window</field>
<field name="view_type">form</field> <field name="view_type">form</field>
<field name="view_mode">tree,form</field> <field name="view_mode">tree,form</field>
<field name="domain" eval="[('picking_id.picking_type_id.code','=','outgoing'), ('location_id.usage','!=','internal'), ('location_dest_id.usage', '=', 'internal')]"/> <field name="domain" eval="[('picking_id.picking_type_id.code','=','incoming'), ('location_id.usage','!=','internal'), ('location_dest_id.usage', '=', 'internal')]"/>
<field name="view_id" ref="view_move_tree_reception_picking"/> <field name="view_id" ref="view_move_tree_reception_picking"/>
<field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/> <field name="context" eval="'{\'search_default_product_id\': [active_id]}'"/>
<field name="help" type="html"> <field name="help" type="html">

16
addons/stock/stock.py
View File

@ -720,23 +720,11 @@ class stock_picking(osv.osv):
def check_group_lot(self, cr, uid, context=None): def check_group_lot(self, cr, uid, context=None):
""" This function will return true if we have the setting to use lots activated. """ """ This function will return true if we have the setting to use lots activated. """
settings_obj = self.pool.get('stock.config.settings') return self.pool.get('res.users').has_group(cr, uid, 'stock.group_production_lot')
config_ids = settings_obj.search(cr, uid, [], limit=1, order='id DESC', context=context)
#If we don't have updated config until now, all fields are by default false and so should be not dipslayed
if not config_ids:
return False
stock_settings = settings_obj.browse(cr, uid, config_ids[0], context=context)
return stock_settings.group_stock_production_lot
def check_group_pack(self, cr, uid, context=None): def check_group_pack(self, cr, uid, context=None):
""" This function will return true if we have the setting to use package activated. """ """ This function will return true if we have the setting to use package activated. """
settings_obj = self.pool.get('stock.config.settings') return self.pool.get('res.users').has_group(cr, uid, 'stock.group_tracking_lot')
config_ids = settings_obj.search(cr, uid, [], limit=1, order='id DESC', context=context)
#If we don't have updated config until now, all fields are by default false and so should be not dipslayed
if not config_ids:
return False
stock_settings = settings_obj.browse(cr, uid, config_ids[0], context=context)
return stock_settings.group_stock_tracking_lot
def action_assign_owner(self, cr, uid, ids, context=None): def action_assign_owner(self, cr, uid, ids, context=None):
for picking in self.browse(cr, uid, ids, context=context): for picking in self.browse(cr, uid, ids, context=context):