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

[FIX]: Fix typo for warehouse and set default company time unit. 

bzr revid: atp@tinyerp.com-20120618102613-5gd35uk0bbwvptn3
This commit is contained in:
Atul Patel (OpenERP) 2012-06-18 15:56:13 +05:30
parent 00ae9a7f18
commit 0624eddfc3
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/project/res_config.py
View File

@ -65,14 +65,15 @@ class project_configuration(osv.osv_memory):
def _get_default_time_unit(self, cr, uid, context=None):
res = {}
product_uom_obj = self.pool.get('product.uom')
ids = product_uom_obj.search(cr, uid, [('name', '=', _('Hour'))], context=context)
return ids and ids[0] or False
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
res['time_unit'] = user.company_id.project_time_mode_id.id
return res.get('time_unit', False)
_defaults = {
'time_unit': _get_default_time_unit,
}
def set_project_defaults(self, cr, uid, ids, context=None):
wizard = self.browse(cr, uid, ids)[0]
if wizard.time_unit:

36
addons/sale/res_config_view.xml
View File

@ -9,11 +9,24 @@
<field name="inherit_id" ref="base.view_sale_config_settings"/>
<field name="arch" type="xml">
<group name="config_sale" position="after">
<separator string="Sale Order" colspan="4"/>
<field name="group_uom"/>
<field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
<field name="group_sale_delivery_address"/>
<field name="group_discount_per_so_line"/>
<separator string="Invoicing Policy" colspan="4"/>
<field name="module_project_timesheet" invisible="1"/>
<field name="module_project_mrp" invisible="1"/>
<field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
<field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
<field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
<field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
<field name="task_work" on_change="onchange_task_work(task_work)"/>
<newline/>
<field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
<field name="time_unit" domain="[('category_id.name','=','Working Time')]"
attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
<separator string="Sale Order" colspan="4"/>
<field name="group_uom"/>
<field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
<field name="group_sale_delivery_address"/>
<field name="group_discount_per_so_line"/>
<field name="group_sale_pricelist"/>
<field name="module_sale_margin"/>
<field name="group_multiple_shops"/>
@ -21,19 +34,6 @@
<field name="decimal_precision"/>
<field name="module_sale_journal"/>
<field name="module_warning"/>
<separator string="Invoicing Policy" colspan="4"/>
<field name="module_project_timesheet" invisible="1"/>
<field name="module_project_mrp" invisible="1"/>
<field name="group_invoice_so_lines" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
<field name="default_order_policy" attrs="{'invisible':['|',('group_invoice_so_lines','=',False),('group_invoice_deli_orders','=',False)],'required': ['|',('group_invoice_so_lines','=',True),('group_invoice_deli_orders','=',True)]}"/>
<field name="group_invoice_deli_orders" on_change="onchange_invoice_methods(group_invoice_so_lines, group_invoice_deli_orders)"/>
<field name="module_delivery" attrs="{'invisible':[('group_invoice_so_lines','=',False), ('group_invoice_deli_orders','=',False)]}"/>
<field name="task_work" on_change="onchange_task_work(task_work)"/>
<newline/>
<field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
<field name="time_unit" domain="[('category_id.name','=','Working Time')]"
attrs="{'invisible': [('task_work','=',False), ('module_account_analytic_analysis','=',False)],'required': ['|', ('task_work','=',True), ('module_account_analytic_analysis','=',True)]}"/>
<separator string="Contracts" colspan="4"/>
<field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>

2
addons/stock/res_config.py
View File

@ -65,7 +65,7 @@ class stock_config_settings(osv.osv_memory):
help="""Allows you to get the upstream or downstream traceability of the products contained in lot."""),
'group_stock_inventory_valuation': fields.boolean("Generate Accounting Entries per Stock Movement",
implied_group='stock.group_inventory_valuation',
help="""This allows to configure Inventory valuation on product and product categories."""),
help="""Allows to configure inventory valuations on products and product categories."""),
'group_stock_multiple_locations': fields.boolean("Manage Multiple Locations and Warehouses",
implied_group='stock.group_locations',
help="""This allows to configure and use multiple stock locations and warehouses,