diff --git a/addons/account/account.py b/addons/account/account.py index b47b4c14bd9..ef02e970a5f 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -1479,13 +1479,14 @@ account_subscription_line() class account_config_fiscalyear(osv.osv_memory): _name = 'account.config.fiscalyear' _columns = { - 'name':fields.char('Name', required=True,size=64), - 'code':fields.char('Code', required=True,size=64), + 'name':fields.char('Name', required=True, size=64, help="Name of the fiscal year as displayed on screens."), + 'code':fields.char('Code', required=True, size=64, help="Name of the fiscal year as displayed in reports."), 'date1': fields.date('Starting Date', required=True), 'date2': fields.date('Ending Date', required=True), } _defaults = { 'code': lambda *a: time.strftime('%Y'), + 'name': lambda *a: time.strftime('%Y'), 'date1': lambda *a: time.strftime('%Y-01-01'), 'date2': lambda *a: time.strftime('%Y-12-31'), } diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 55986cd260c..a5d0c6f0500 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -440,7 +440,7 @@ - + diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 4a52e8d4608..7de48d9370c 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -479,7 +479,7 @@ class sale_order(osv.osv): for line in order.order_line: proc_id=False date_planned = DateTime.now() + DateTime.RelativeDateTime(days=line.delay or 0.0) - date_planned = (date_planned - DateTime.RelativeDateTime(days=company.security_lead)).strftime('%Y-%m-%d') + date_planned = (date_planned - DateTime.RelativeDateTime(days=company.security_lead)).strftime('%Y-%m-%d %H:%M:%S') if line.state == 'done': continue if line.product_id and line.product_id.product_tmpl_id.type in ('product', 'consu'): diff --git a/addons/sale/security/ir.model.access.csv b/addons/sale/security/ir.model.access.csv index 04064fa910d..31c68c7c885 100644 --- a/addons/sale/security/ir.model.access.csv +++ b/addons/sale/security/ir.model.access.csv @@ -1,5 +1,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_sale_shop,sale.shop,model_sale_shop,group_sale_user,1,0,0,0 -access_sale_order,sale.order,model_sale_order,group_sale_user,1,1,1,1 -access_sale_order_line,sale.order.line,model_sale_order_line,group_sale_user,1,1,1,1 +access_sale_order,sale.order,model_sale_order,group_sale_user,1,1,1,0 +access_sale_order_line,sale.order.line,model_sale_order_line,group_sale_user,1,1,1,0 access_sale_shop_admin,sale.shop,model_sale_shop,base.group_system,1,1,1,1