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

forgetdatetime 

bzr revid: fp@tinyerp.com-20080917153112-8kn5br5nxe0z3ku3
This commit is contained in:
Fabien Pinckaers 2008-09-17 17:31:12 +02:00
parent 99911f3550
commit e27eb7005a
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/account/account.py
View File

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

2
addons/mrp/mrp_view.xml
View File

@ -440,7 +440,7 @@
<page string="Finnished Products">
<field colspan="4" name="move_created_ids" nolabel="1"/>
</page>
<page string="Workcenters">
<page string="Operations">
<field colspan="4" name="workcenter_lines" nolabel="1" widget="one2many_list"/>
</page>
<page string="Extra Information">

2
addons/sale/sale.py
View File

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

4
addons/sale/security/ir.model.access.csv
View File

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

1 id name model_id:id group_id:id perm_read perm_write perm_create perm_unlink
2 access_sale_shop sale.shop model_sale_shop group_sale_user 1 0 0 0
3 access_sale_order sale.order model_sale_order group_sale_user 1 1 1 1 0
4 access_sale_order_line sale.order.line model_sale_order_line group_sale_user 1 1 1 1 0
5 access_sale_shop_admin sale.shop model_sale_shop base.group_system 1 1 1 1