diff --git a/addons/account/account.py b/addons/account/account.py index 215c5fe00ba..a1c03db81cc 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -933,7 +933,7 @@ class account_fiscalyear(osv.osv): if de.strftime('%Y-%m-%d') > fy.date_stop: de = datetime.strptime(fy.date_stop, '%Y-%m-%d') - context_today = fields.date.context_today(cr,uid,context=context) + context_today = fields.date.context_today(self,cr,uid,context=context) period_obj.create(cr, uid, { 'name': ds.strftime('%m/%Y'), 'code': ds.strftime('%m/%Y'), @@ -951,7 +951,7 @@ class account_fiscalyear(osv.osv): def finds(self, cr, uid, dt=None, exception=True, context=None): if context is None: context = {} if not dt: - dt = fields.date.context_today(cr,uid,context=context) + dt = fields.date.context_today(self,cr,uid,context=context) args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)] if context.get('company_id', False): args.append(('company_id', '=', context['company_id'])) @@ -1040,7 +1040,7 @@ class account_period(osv.osv): def find(self, cr, uid, dt=None, context=None): if context is None: context = {} if not dt: - dt = fields.date.context_today(cr,uid,context=context) + dt = fields.date.context_today(self,cr,uid,context=context) #CHECKME: shouldn't we check the state of the period? args = [('date_start', '<=' ,dt), ('date_stop', '>=', dt)] if context.get('company_id', False): @@ -2270,7 +2270,7 @@ class account_model(osv.osv): 'ref': entry['name'], 'period_id': period_id, 'journal_id': model.journal_id.id, - 'date': context.get('date', fields.date.context_today(cr,uid,context=context)) + 'date': context.get('date', fields.date.context_today(self,cr,uid,context=context)) }) move_ids.append(move_id) for line in model.lines_id: @@ -2307,7 +2307,7 @@ class account_model(osv.osv): 'account_id': line.account_id.id, 'move_id': move_id, 'partner_id': line.partner_id.id, - 'date': context.get('date', fields.date.context_today(cr,uid,context=context)), + 'date': context.get('date', fields.date.context_today(self,cr,uid,context=context)), 'date_maturity': date_maturity }) account_move_line_obj.create(cr, uid, val, context=ctx) diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py index 7f09cc70c17..6a2bf7ff0ea 100644 --- a/addons/account/account_bank_statement.py +++ b/addons/account/account_bank_statement.py @@ -483,7 +483,7 @@ class account_bank_statement_line(osv.osv): } _defaults = { 'name': lambda self,cr,uid,context={}: self.pool.get('ir.sequence').get(cr, uid, 'account.bank.statement.line'), - 'date': lambda self,cr,uid,context={}: context.get('date', fields.date.context_today(cr,uid,context=context)), + 'date': lambda self,cr,uid,context={}: context.get('date', fields.date.context_today(self,cr,uid,context=context)), 'type': 'general', } diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py index bcc8b695c7e..32864f9477f 100644 --- a/addons/account/account_invoice.py +++ b/addons/account/account_invoice.py @@ -814,7 +814,7 @@ class account_invoice(osv.osv): ctx = context.copy() ctx.update({'lang': inv.partner_id.lang}) if not inv.date_invoice: - self.write(cr, uid, [inv.id], {'date_invoice': fields.date.context_today(cr,uid,context=context)}, context=ctx) + self.write(cr, uid, [inv.id], {'date_invoice': fields.date.context_today(self,cr,uid,context=context)}, context=ctx) company_currency = inv.company_id.currency_id.id # create the analytical lines # one move line per invoice line diff --git a/addons/account_coda/wizard/account_coda_import.py b/addons/account_coda/wizard/account_coda_import.py index d780c2d007b..c49eb9f1dbd 100644 --- a/addons/account_coda/wizard/account_coda_import.py +++ b/addons/account_coda/wizard/account_coda_import.py @@ -567,7 +567,7 @@ class account_coda_import(osv.osv_memory): 'name' : codafilename, 'coda_data': codafile, 'coda_creation_date' : coda_statement['date'], - 'date': fields.date.context_today(cr, uid, context=context), + 'date': fields.date.context_today(self, cr, uid, context=context), 'user_id': uid, }) context.update({'coda_id': coda_id}) diff --git a/addons/crm_partner_assign/partner_geo_assign.py b/addons/crm_partner_assign/partner_geo_assign.py index 48b54277831..f522cc63d7a 100644 --- a/addons/crm_partner_assign/partner_geo_assign.py +++ b/addons/crm_partner_assign/partner_geo_assign.py @@ -102,7 +102,7 @@ class res_partner(osv.osv): self.write(cr, uid, [partner.id], { 'partner_latitude': result[0], 'partner_longitude': result[1], - 'date_localization': fields.date.context_today(cr,uid,context=context) + 'date_localization': fields.date.context_today(self,cr,uid,context=context) }, context=context) return True res_partner() @@ -128,7 +128,7 @@ class crm_lead(osv.osv): partners = self.pool.get('res.partner').browse(cr, uid, [partner_assigned_id], context=context) user_id = partners[0] and partners[0].user_id.id or False return {'value': - {'date_assign': fields.date.context_today(cr,uid,context=context), + {'date_assign': fields.date.context_today(self,cr,uid,context=context), 'user_id' : user_id} } @@ -151,7 +151,7 @@ class crm_lead(osv.osv): if partner.user_id: for lead_id in ids: self.allocate_salesman(cr, uid, [lead_id], [partner.user_id.id], context=context) - self.write(cr, uid, [lead.id], {'date_assign': fields.date.context_today(cr,uid,context=context), 'partner_assigned_id': partner_id}, context=context) + self.write(cr, uid, [lead.id], {'date_assign': fields.date.context_today(self,cr,uid,context=context), 'partner_assigned_id': partner_id}, context=context) return res diff --git a/addons/hr_timesheet/hr_timesheet.py b/addons/hr_timesheet/hr_timesheet.py index 82163f7c254..1e15e5b19b1 100644 --- a/addons/hr_timesheet/hr_timesheet.py +++ b/addons/hr_timesheet/hr_timesheet.py @@ -149,7 +149,7 @@ class hr_analytic_timesheet(osv.osv): 'product_id': _getEmployeeProduct, 'general_account_id': _getGeneralAccount, 'journal_id': _getAnalyticJournal, - 'date': lambda self, cr, uid, ctx: ctx.get('date', fields.date.context_today(cr,uid,context=ctx)), + 'date': lambda self, cr, uid, ctx: ctx.get('date', fields.date.context_today(self,cr,uid,context=ctx)), 'user_id': lambda obj, cr, uid, ctx: ctx.get('user_id', uid), } def on_change_account_id(self, cr, uid, ids, account_id): diff --git a/addons/point_of_sale/wizard/pos_return.py b/addons/point_of_sale/wizard/pos_return.py index cc9f2946cfe..30b16a717d4 100644 --- a/addons/point_of_sale/wizard/pos_return.py +++ b/addons/point_of_sale/wizard/pos_return.py @@ -151,7 +151,7 @@ class pos_return(osv.osv_memory): 'name': 'Refund %s'%order_id.name, 'statement_id': order_id.statement_ids[0].statement_id.id, 'pos_statement_id': new_order, - 'date': fields.date.context_today(cr, uid, context=context), + 'date': fields.date.context_today(self, cr, uid, context=context), 'account_id': order_id.partner_id and order_id.partner_id.property_account_payable \ and order_id.partner_id.property_account_payable.id or account_def.id, 'amount': -amount, diff --git a/addons/project_planning/project_planning.py b/addons/project_planning/project_planning.py index 5f9d33ff86a..fafaf85ac4f 100644 --- a/addons/project_planning/project_planning.py +++ b/addons/project_planning/project_planning.py @@ -136,8 +136,8 @@ class report_account_analytic_planning(osv.osv): 'total_free': fields.function(_get_total_free, string='Total Free'), } _defaults = { - 'date_from': lambda self,cr,uid,ctx: fields.date.context_today(cr,uid,timestamp=(datetime.now()+relativedelta(day=1)),context=ctx), - 'date_to': lambda self,cr,uid,ctx: fields.date.context_today(cr,uid,timestamp=(datetime.now()+relativedelta(months=1, day=1, days=-1)),context=ctx), + 'date_from': lambda self,cr,uid,ctx: fields.date.context_today(self,cr,uid,timestamp=(datetime.now()+relativedelta(day=1)),context=ctx), + 'date_to': lambda self,cr,uid,ctx: fields.date.context_today(self,cr,uid,timestamp=(datetime.now()+relativedelta(months=1, day=1, days=-1)),context=ctx), 'user_id': lambda self, cr, uid, c: uid, 'state': 'draft', 'business_days': 20, diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index deabf18397d..5432067191d 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -274,7 +274,7 @@ class purchase_order(osv.osv): return {'value':{'partner_address_id': supplier_address['default'], 'pricelist_id': pricelist, 'fiscal_position': fiscal_position}} def wkf_approve_order(self, cr, uid, ids, context=None): - self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(cr,uid,context=context)}) + self.write(cr, uid, ids, {'state': 'approved', 'date_approve': fields.date.context_today(self,cr,uid,context=context)}) return True #TODO: implement messages system diff --git a/addons/sale/sale.py b/addons/sale/sale.py index ccdae775455..d2f3ffd72fb 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -631,9 +631,9 @@ class sale_order(osv.osv): if not o.order_line: raise osv.except_osv(_('Error !'),_('You cannot confirm a sale order which has no line.')) if (o.order_policy == 'manual'): - self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': fields.date.context_today(cr, uid, context=context)}) + self.write(cr, uid, [o.id], {'state': 'manual', 'date_confirm': fields.date.context_today(self, cr, uid, context=context)}) else: - self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': fields.date.context_today(cr, uid, context=context)}) + self.write(cr, uid, [o.id], {'state': 'progress', 'date_confirm': fields.date.context_today(self, cr, uid, context=context)}) 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,) self.log(cr, uid, o.id, message) diff --git a/addons/sale_crm/wizard/crm_make_sale.py b/addons/sale_crm/wizard/crm_make_sale.py index 273096739aa..c3515cc5b0b 100644 --- a/addons/sale_crm/wizard/crm_make_sale.py +++ b/addons/sale_crm/wizard/crm_make_sale.py @@ -97,7 +97,7 @@ class crm_make_sale(osv.osv_memory): 'partner_invoice_id': partner_addr['invoice'], 'partner_order_id': partner_addr['contact'], 'partner_shipping_id': partner_addr['delivery'], - 'date_order': fields.date.context_today(cr,uid,context=context), + 'date_order': fields.date.context_today(self,cr,uid,context=context), 'fiscal_position': fpos, } if partner.id: