[IMP] sale: replaced hardcoded date/time formats by appropriate constants
bzr revid: odo@openerp.com-20111011141921-chzenvq0i2kvbnw7
This commit is contained in:
parent
e806259e93
commit
6bfd0ec586
|
@ -25,6 +25,7 @@ import time
|
||||||
import pooler
|
import pooler
|
||||||
from osv import fields, osv
|
from osv import fields, osv
|
||||||
from tools.translate import _
|
from tools.translate import _
|
||||||
|
from tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT
|
||||||
import decimal_precision as dp
|
import decimal_precision as dp
|
||||||
import netsvc
|
import netsvc
|
||||||
|
|
||||||
|
@ -268,7 +269,7 @@ class sale_order(osv.osv):
|
||||||
}
|
}
|
||||||
_defaults = {
|
_defaults = {
|
||||||
'picking_policy': 'direct',
|
'picking_policy': 'direct',
|
||||||
'date_order': lambda *a: time.strftime('%Y-%m-%d'),
|
'date_order': lambda *a: time.strftime(DEFAULT_SERVER_DATE_FORMAT),
|
||||||
'order_policy': 'manual',
|
'order_policy': 'manual',
|
||||||
'state': 'draft',
|
'state': 'draft',
|
||||||
'user_id': lambda obj, cr, uid, context: uid,
|
'user_id': lambda obj, cr, uid, context: uid,
|
||||||
|
@ -435,7 +436,7 @@ class sale_order(osv.osv):
|
||||||
}
|
}
|
||||||
inv.update(self._inv_get(cr, uid, order))
|
inv.update(self._inv_get(cr, uid, order))
|
||||||
inv_id = inv_obj.create(cr, uid, inv, context=context)
|
inv_id = inv_obj.create(cr, uid, inv, context=context)
|
||||||
data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id], pay_term, time.strftime('%Y-%m-%d'))
|
data = inv_obj.onchange_payment_term_date_invoice(cr, uid, [inv_id], pay_term, time.strftime(DEFAULT_SERVER_DATE_FORMAT))
|
||||||
if data.get('value', False):
|
if data.get('value', False):
|
||||||
inv_obj.write(cr, uid, [inv_id], data['value'], context=context)
|
inv_obj.write(cr, uid, [inv_id], data['value'], context=context)
|
||||||
inv_obj.button_compute(cr, uid, [inv_id])
|
inv_obj.button_compute(cr, uid, [inv_id])
|
||||||
|
@ -619,9 +620,9 @@ class sale_order(osv.osv):
|
||||||
def action_wait(self, cr, uid, ids, *args):
|
def action_wait(self, cr, uid, ids, *args):
|
||||||
for o in self.browse(cr, uid, ids):
|
for o in self.browse(cr, uid, ids):
|
||||||
if (o.order_policy == 'manual'):
|
if (o.order_policy == 'manual'):
|
||||||
self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime('%Y-%m-%d')})
|
self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': time.strftime(DEFAULT_SERVER_DATE_FORMAT)})
|
||||||
else:
|
else:
|
||||||
self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime('%Y-%m-%d')})
|
self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': time.strftime(DEFAULT_SERVER_DATE_FORMAT)})
|
||||||
self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
|
self.pool.get('sale.order.line').button_confirm(cr, uid, [x.id for x in o.order_line])
|
||||||
message = _("The quotation '%s' has been converted to a sales order.") % (o.name,)
|
message = _("The quotation '%s' has been converted to a sales order.") % (o.name,)
|
||||||
self.log(cr, uid, o.id, message)
|
self.log(cr, uid, o.id, message)
|
||||||
|
@ -759,8 +760,8 @@ class sale_order(osv.osv):
|
||||||
if line.state == 'done':
|
if line.state == 'done':
|
||||||
continue
|
continue
|
||||||
|
|
||||||
date_planned = datetime.strptime(order.date_order, '%Y-%m-%d') + relativedelta(days=line.delay or 0.0)
|
date_planned = datetime.strptime(order.date_order, DEFAULT_SERVER_DATE_FORMAT) + relativedelta(days=line.delay or 0.0)
|
||||||
date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime('%Y-%m-%d %H:%M:%S')
|
date_planned = (date_planned - timedelta(days=order.company_id.security_lead)).strftime(DEFAULT_SERVER_DATETIME_FORMAT)
|
||||||
|
|
||||||
if line.product_id:
|
if line.product_id:
|
||||||
if line.product_id.product_tmpl_id.type in ('product', 'consu'):
|
if line.product_id.product_tmpl_id.type in ('product', 'consu'):
|
||||||
|
@ -845,7 +846,7 @@ class sale_order(osv.osv):
|
||||||
'description': 'Order '+str(inv['id']),
|
'description': 'Order '+str(inv['id']),
|
||||||
'document': '',
|
'document': '',
|
||||||
'partner_id': part,
|
'partner_id': part,
|
||||||
'date': time.strftime('%Y-%m-%d'),
|
'date': time.strftime(DEFAULT_SERVER_DATE_FORMAT),
|
||||||
'user_id': uid,
|
'user_id': uid,
|
||||||
'partner_type': partnertype,
|
'partner_type': partnertype,
|
||||||
'probability': 1.0,
|
'probability': 1.0,
|
||||||
|
@ -1094,7 +1095,7 @@ class sale_order_line(osv.osv):
|
||||||
'product_uos_qty': qty}, 'domain': {'product_uom': [],
|
'product_uos_qty': qty}, 'domain': {'product_uom': [],
|
||||||
'product_uos': []}}
|
'product_uos': []}}
|
||||||
if not date_order:
|
if not date_order:
|
||||||
date_order = time.strftime('%Y-%m-%d')
|
date_order = time.strftime(DEFAULT_SERVER_DATE_FORMAT)
|
||||||
|
|
||||||
result = {}
|
result = {}
|
||||||
product_obj = product_obj.browse(cr, uid, product, context=context)
|
product_obj = product_obj.browse(cr, uid, product, context=context)
|
||||||
|
|
Loading…
Reference in New Issue