[IMP] : Removed mx.DateTime and used datetime object.
authorHarry (Open ERP) <>
Fri, 15 Oct 2010 14:01:53 +0000 (19:31 +0530)
committeruco (OpenERP) <uco@tinyerp.com>
Fri, 15 Oct 2010 14:01:53 +0000 (19:31 +0530)
bzr revid: uco@tinyerp.com-20101015140153-tyy27fby84tijohb

14 files changed:
addons/account_payment/account_invoice.py
addons/auction/report/report_auction.py
addons/hr_evaluation/hr_evaluation.py
addons/hr_timesheet_sheet/hr_timesheet_sheet.py
addons/l10n_ch/invoice.py
addons/mrp/procurement.py
addons/point_of_sale/pos.py
addons/point_of_sale/wizard/all_closed_cashbox_of_the_day.py
addons/point_of_sale/wizard/pos_box_out.py
addons/procurement/schedulers.py
addons/purchase/purchase.py
addons/purchase_requisition/wizard/purchase_requisition_partner.py
addons/resource/resource.py
addons/subscription/subscription.py

index 9a45ae2..c05721c 100644 (file)
@@ -19,8 +19,7 @@
 #
 ##############################################################################
 
-from mx import DateTime
-
+from datetime import datetime
 from osv import fields, osv
 
 class Invoice(osv.osv):
@@ -36,8 +35,8 @@ class Invoice(osv.osv):
             if invoice.move_id:
                 for line in invoice.move_id.line_id:
                     if not line.date_maturity or \
-                            DateTime.strptime(line.date_maturity, '%Y-%m-%d') \
-                            < DateTime.now():
+                            datetime.strptime(line.date_maturity, '%Y-%m-%d') \
+                            < datetime.today():
                         res[invoice.id] += line.amount_to_pay
         return res
 
@@ -50,4 +49,4 @@ class Invoice(osv.osv):
 
 Invoice()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
index cf1c680..25cdab8 100644 (file)
@@ -18,7 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-from mx import DateTime
 from osv import fields, osv, orm
 from tools import config
 from tools.translate import _
index 960849b..098f7e7 100644 (file)
@@ -20,8 +20,9 @@
 ##############################################################################
 
 import time
-from mx import DateTime as dt
-
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+from dateutil import parser
 from osv import fields, osv
 import tools
 from tools.translate import _
@@ -109,8 +110,8 @@ class hr_employee(osv.osv):
             context = {}
         for id in self.browse(cr, uid, self.search(cr, uid, [], context=context), context=context):
             if id.evaluation_plan_id and id.evaluation_date:
-                if (dt.ISO.ParseAny(id.evaluation_date) + dt.RelativeDateTime(months = int(id.evaluation_plan_id.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"):
-                    self.write(cr, uid, id.id, {'evaluation_date' : (dt.ISO.ParseAny(id.evaluation_date) + dt.RelativeDateTime(months =+ int(id.evaluation_plan_id.month_next))).strftime('%Y-%m-%d')}, context=context)
+                if (parser.parse(id.evaluation_date) + relativedelta(months = int(id.evaluation_plan_id.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"):
+                    self.write(cr, uid, id.id, {'evaluation_date' : (parser.parse(id.evaluation_date) + relativedelta(months =+ int(id.evaluation_plan_id.month_next))).strftime('%Y-%m-%d')}, context=context)
                     obj_evaluation.create(cr, uid, {'employee_id' : id.id, 'plan_id': id.evaluation_plan_id}, context=context)
         return True
 
@@ -123,11 +124,11 @@ class hr_employee(osv.osv):
             flag = False
             evaluation_plan =  evaluation_plan_obj.browse(cr, uid, [evaluation_plan_id], context=context)[0]
             if not evaluation_date:
-               evaluation_date=(dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d'))+ dt.RelativeDateTime(months=+evaluation_plan.month_first)).strftime('%Y-%m-%d')
+               evaluation_date=(parser.parse(datetime.date.today().strftime('%Y-%m-%d'))+ relativedelta(months=+evaluation_plan.month_first)).strftime('%Y-%m-%d')
                flag = True
             else:
-                if (dt.ISO.ParseAny(evaluation_date) + dt.RelativeDateTime(months = int(evaluation_plan.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"):
-                    evaluation_date=(dt.ISO.ParseAny(evaluation_date)+ dt.RelativeDateTime(months=+evaluation_plan.month_next)).strftime('%Y-%m-%d')
+                if (parser.parse(evaluation_date) + relativedelta(months = int(evaluation_plan.month_next))).strftime('%Y-%m-%d') <= time.strftime("%Y-%m-%d"):
+                    evaluation_date=(parser.parse(evaluation_date)+ relativedelta(months=+evaluation_plan.month_next)).strftime('%Y-%m-%d')
                     flag = True
             if ids and flag:
                 obj_evaluation.create(cr, uid, {'employee_id': ids[0], 'plan_id': evaluation_plan_id}, context=context)
@@ -174,7 +175,7 @@ class hr_evaluation(osv.osv):
         'progress' : fields.float("Progress"),
     }
     _defaults = {
-        'date' : lambda *a: (dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d')) + dt.RelativeDateTime(months =+ 1)).strftime('%Y-%m-%d'),
+        'date' : lambda *a: (parser.parse(datetime.date.today().strftime('%Y-%m-%d')) + relativedelta(months =+ 1)).strftime('%Y-%m-%d'),
         'state' : lambda *a: 'draft',
     }
 
@@ -225,7 +226,7 @@ class hr_evaluation(osv.osv):
                     int_id = hr_eval_inter_obj.create(cr, uid, {
                         'evaluation_id': evaluation.id,
                         'survey_id': phase.survey_id.id,
-                        'date_deadline': (dt.ISO.ParseAny(dt.now().strftime('%Y-%m-%d')) + dt.RelativeDateTime(months =+ 1)).strftime('%Y-%m-%d'),
+                        'date_deadline': (parser.parse(datetime.date.today().strftime('%Y-%m-%d')) + relativedelta(months =+ 1)).strftime('%Y-%m-%d'),
                         'user_id': child.user_id.id,
                         'user_to_review_id': evaluation.employee_id.id
                     }, context=context)
index 44bda56..b152e01 100644 (file)
@@ -23,7 +23,8 @@ import time
 import netsvc
 
 from osv import fields, osv
-from mx import DateTime
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 from tools.translate import _
 
 class one2many_mod2(fields.one2many):
@@ -210,9 +211,9 @@ class hr_timesheet_sheet(osv.osv):
         if context is None:
             context = {}
         for sheet in self.browse(cr, uid, ids, context=context):
-            if DateTime.now() <= DateTime.strptime(sheet.date_from, '%Y-%m-%d'):
+            if datetime.today() <= datetime.strptime(sheet.date_from, '%Y-%m-%d'):
                 self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}, context=context)
-            elif DateTime.now() >= DateTime.strptime(sheet.date_to, '%Y-%m-%d'):
+            elif datetime.now() >= datetime.strptime(sheet.date_to, '%Y-%m-%d'):
                 self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
             else:
                 self.write(cr, uid, [sheet.id], {'date_current': time.strftime('%Y-%m-%d')}, context=context)
@@ -222,11 +223,11 @@ class hr_timesheet_sheet(osv.osv):
         if context is None:
             context = {}
         for sheet in self.browse(cr, uid, ids, context=context):
-            if DateTime.strptime(sheet.date_current, '%Y-%m-%d') <= DateTime.strptime(sheet.date_from, '%Y-%m-%d'):
+            if datetime.strptime(sheet.date_current, '%Y-%m-%d') <= datetime.strptime(sheet.date_from, '%Y-%m-%d'):
                 self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}, context=context)
             else:
                 self.write(cr, uid, [sheet.id], {
-                    'date_current': (DateTime.strptime(sheet.date_current, '%Y-%m-%d') + DateTime.RelativeDateTime(days=-1)).strftime('%Y-%m-%d'),
+                    'date_current': (datetime.strptime(sheet.date_current, '%Y-%m-%d') + relativedelta(days=-1)).strftime('%Y-%m-%d'),
                 }, context=context)
         return True
 
@@ -234,11 +235,11 @@ class hr_timesheet_sheet(osv.osv):
         if context is None:
             context = {}
         for sheet in self.browse(cr, uid, ids, context=context):
-            if DateTime.strptime(sheet.date_current, '%Y-%m-%d') >= DateTime.strptime(sheet.date_to, '%Y-%m-%d'):
+            if datetime.strptime(sheet.date_current, '%Y-%m-%d') >= datetime.strptime(sheet.date_to, '%Y-%m-%d'):
                 self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
             else:
                 self.write(cr, uid, [sheet.id], {
-                    'date_current': (DateTime.strptime(sheet.date_current, '%Y-%m-%d') + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d'),
+                    'date_current': (datetime.strptime(sheet.date_current, '%Y-%m-%d') + relativedelta(days=1)).strftime('%Y-%m-%d'),
                 }, context=context)
         return True
 
@@ -246,9 +247,9 @@ class hr_timesheet_sheet(osv.osv):
         if context is None:
             context = {}
         for sheet in self.browse(cr, uid, ids, context=context):
-            if DateTime.strptime(sheet.date_current, '%Y-%m-%d') <= DateTime.strptime(sheet.date_from, '%Y-%m-%d'):
+            if datetime.strptime(sheet.date_current, '%Y-%m-%d') <= datetime.strptime(sheet.date_from, '%Y-%m-%d'):
                 self.write(cr, uid, [sheet.id], {'date_current': sheet.date_from,}, context=context)
-            elif DateTime.strptime(sheet.date_current, '%Y-%m-%d') >= DateTime.strptime(sheet.date_to, '%Y-%m-%d'):
+            elif datetime.strptime(sheet.date_current, '%Y-%m-%d') >= datetime.strptime(sheet.date_to, '%Y-%m-%d'):
                 self.write(cr, uid, [sheet.id], {'date_current': sheet.date_to,}, context=context)
         return True
 
@@ -318,7 +319,7 @@ class hr_timesheet_sheet(osv.osv):
         if r=='month':
             return time.strftime('%Y-%m-01')
         elif r=='week':
-            return (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Monday,0))).strftime('%Y-%m-%d')
+            return (datetime.today() + relativedelta(weekday=0)).strftime('%Y-%m-%d')
         elif r=='year':
             return time.strftime('%Y-01-01')
         return time.strftime('%Y-%m-%d')
@@ -327,9 +328,9 @@ class hr_timesheet_sheet(osv.osv):
         user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
         r = user.company_id and user.company_id.timesheet_range or 'month'
         if r=='month':
-            return (DateTime.now() + DateTime.RelativeDateTime(months=+1,day=1,days=-1)).strftime('%Y-%m-%d')
+            return (datetime.today() + relativedelta(months=+1,day=1,days=-1)).strftime('%Y-%m-%d')
         elif r=='week':
-            return (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Sunday,0))).strftime('%Y-%m-%d')
+            return (datetime.today() + relativedelta(weekday=6)).strftime('%Y-%m-%d')
         elif r=='year':
             return time.strftime('%Y-12-31')
         return time.strftime('%Y-%m-%d')
index 1057fc3..1f836c4 100644 (file)
@@ -30,7 +30,7 @@
 #
 ##############################################################################
 
-from mx import DateTime
+from datetime import datetime
 
 from osv import fields, osv
 from tools import mod10r
@@ -71,8 +71,8 @@ class account_invoice(osv.osv):
             if invoice.move_id:
                 for line in invoice.move_id.line_id:
                     if not line.date_maturity or \
-                            DateTime.strptime(line.date_maturity, '%Y-%m-%d') \
-                            < DateTime.now():
+                            datetime.strptime(line.date_maturity, '%Y-%m-%d') \
+                            < datetime.today():
                         res[invoice.id] += line.amount_to_pay
         return res
 
@@ -209,4 +209,4 @@ class account_tax_code(osv.osv):
 
 account_tax_code()
 
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
index 29eb2d3..acc45e4 100644 (file)
@@ -19,7 +19,8 @@
 #
 ##############################################################################
 
-from mx import DateTime
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 from osv import fields
 from osv import osv
 from tools.translate import _
@@ -81,8 +82,8 @@ class procurement_order(osv.osv):
         for procurement in procurement_obj.browse(cr, uid, ids):
             res_id = procurement.move_id.id
             loc_id = procurement.location_id.id
-            newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - DateTime.RelativeDateTime(days=procurement.product_id.product_tmpl_id.produce_delay or 0.0)
-            newdate = newdate - DateTime.RelativeDateTime(days=company.manufacturing_lead)
+            newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S') - relativedelta(days=procurement.product_id.product_tmpl_id.produce_delay or 0.0)
+            newdate = newdate - relativedelta(days=company.manufacturing_lead)
             produce_id = production_obj.create(cr, uid, {
                 'origin': procurement.origin,
                 'product_id': procurement.product_id.id,
index f741522..6429e21 100644 (file)
@@ -22,7 +22,8 @@
 import time
 import netsvc
 from osv import fields, osv
-from mx import DateTime
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 from tools.translate import _
 from decimal import Decimal
 import decimal_precision as dp
@@ -337,7 +338,7 @@ class pos_order(osv.osv):
         'price_type': lambda *a: 'tax_excluded',
         'name': lambda obj, cr, uid, context: obj.pool.get('ir.sequence').get(cr, uid, 'pos.order'),
         'date_order': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
-        'date_validity': lambda *a: (DateTime.now() + DateTime.RelativeDateTime(months=+6)).strftime('%Y-%m-%d'),
+        'date_validity': lambda *a: (datetime.today() + relativedelta(months=+6)).strftime('%Y-%m-%d'),
         'nb_print': lambda *a: 0,
         'company_id': lambda self,cr,uid,c: self.pool.get('res.users').browse(cr, uid, uid, c).company_id.id,
         'sale_journal': _sale_journal_get,
index 93c25d6..58f7890 100644 (file)
@@ -22,7 +22,6 @@
 import netsvc
 from osv import osv,fields
 from tools.translate import _
-from mx import DateTime
 import time
 
 class all_closed_cashbox_of_the_day(osv.osv_memory):
index 92e7dde..e4aebe2 100644 (file)
@@ -22,7 +22,8 @@
 from osv import osv, fields
 import time
 from tools.translate import _
-from mx import DateTime
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 import pos_box_entries
 
 
@@ -78,8 +79,8 @@ class pos_box_out(osv.osv_memory):
         for data in  self.read(cr, uid, ids):
             curr_company = res_obj.browse(cr, uid, uid).company_id.id
             statement_id = statement_obj.search(cr, uid, [('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid), ('state', '=', 'open')])
-            monday = (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Monday, 0))).strftime('%Y-%m-%d')
-            sunday = (DateTime.now() + DateTime.RelativeDateTime(weekday=(DateTime.Sunday, 0))).strftime('%Y-%m-%d')
+            monday = (datetime.today() + relativedelta(weekday=0)).strftime('%Y-%m-%d')
+            sunday = (datetime.today() + relativedelta(weekday=6)).strftime('%Y-%m-%d')
             done_statmt = statement_obj.search(cr, uid, [('date', '>=', monday+' 00:00:00'), ('date', '<=', sunday+' 23:59:59'), ('journal_id', '=', data['journal_id']), ('company_id', '=', curr_company), ('user_id', '=', uid)])
             stat_done = statement_obj.browse(cr, uid, done_statmt)
             address_u = res_obj.browse(cr, uid, uid).address_id
index 1a1222f..b3d3c3b 100644 (file)
@@ -20,8 +20,8 @@
 ##############################################################################
 
 import time
-from mx import DateTime
-
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 from osv import osv
 from tools.translate import _
 import tools
@@ -59,7 +59,7 @@ class procurement_order(osv.osv):
             if use_new_cursor:
                 cr.commit()
             company = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id
-            maxdate = (DateTime.now() + DateTime.RelativeDateTime(days=company.schedule_range)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
+            maxdate = (datetime.today() + relativedelta(days=company.schedule_range)).strftime(tools.DEFAULT_SERVER_DATE_FORMAT)
             start_date = time.strftime('%Y-%m-%d, %Hh %Mm %Ss')
             offset = 0
             report = []
@@ -166,7 +166,7 @@ class procurement_order(osv.osv):
                 if product.virtual_available >= 0.0:
                     continue
 
-                newdate = DateTime.now()
+                newdate = datetime.today()
                 if product.supply_method == 'buy':
                     location_id = warehouse.lot_input_id.id
                 elif product.supply_method == 'produce':
@@ -228,7 +228,7 @@ class procurement_order(osv.osv):
                     reste = qty % op.qty_multiple
                     if reste > 0:
                         qty += op.qty_multiple - reste
-                    newdate = DateTime.now() + DateTime.RelativeDateTime(
+                    newdate = datetime.today() + relativedelta(
                             days = int(op.product_id.seller_delay))
                     if qty <= 0:
                         continue
index 655e74a..18f3413 100644 (file)
@@ -19,7 +19,6 @@
 #
 ##############################################################################
 
-from mx import DateTime
 import time
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
@@ -765,9 +764,8 @@ class procurement_order(osv.osv):
 
             price = pricelist_obj.price_get(cr, uid, [pricelist_id], procurement.product_id.id, qty, False, {'uom': uom_id})[pricelist_id]
 
-            newdate = DateTime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
-            newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
-            newdate = newdate - seller_delay
+            newdate = datetime.strptime(procurement.date_planned, '%Y-%m-%d %H:%M:%S')
+            newdate = (newdate - relativedelta(days=company.po_lead)) - relativedelta(days=seller_delay)
 
             #Passing partner_id to context for purchase order line integrity of Line name
             context.update({'lang': partner.lang, 'partner_id': partner_id})
index 297286c..2ae3ae7 100644 (file)
@@ -20,8 +20,8 @@
 ##############################################################################
 
 import time
-from mx import DateTime
-
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 from osv import fields, osv
 from osv.orm import browse_record, browse_null
 
@@ -84,10 +84,10 @@ class purchase_requisition_partner(osv.osv_memory):
                     partner_list = sorted([(partner.sequence, partner) for partner in  line.product_id.seller_ids if partner])
                     partner_rec = partner_list and partner_list[0] and partner_list[0][1] or False
                     uom_id = line.product_id.uom_po_id and line.product_id.uom_po_id.id or False
-                    newdate = DateTime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S')
-                    newdate = newdate - DateTime.RelativeDateTime(days=company.po_lead)
+                    newdate = datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S')
+                    newdate = newdate - relativedelta(days=company.po_lead)
                     delay = partner_rec and partner_rec.delay or False
-                    newdate = newdate -(delay or DateTime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') )
+                    newdate = newdate -(delay or datetime.strptime(tender.date_start, '%Y-%m-%d %H:%M:%S') )
                     partner = partner_rec and partner_rec.name or supplier_data
                     pricelist_id = partner.property_product_pricelist_purchase and partner.property_product_pricelist_purchase.id or False
                     price = pricelist_obj.price_get(cr, uid, [pricelist_id], line.product_id.id, line.product_qty, False, {'uom': uom_id})[pricelist_id]
index 24efc17..5401c05 100644 (file)
@@ -20,7 +20,6 @@
 ##############################################################################
 
 from datetime import datetime, timedelta
-from mx import DateTime
 import math
 from faces import *
 from new import classobj
@@ -113,7 +112,7 @@ class resource_calendar(osv.osv):
         results = {}
 
         for d, hours, id in date_and_hours_by_cal:
-            dt_from = DateTime.strptime(d, '%Y-%m-%d %H:%M:%S')
+            dt_from = datetime.strptime(d, '%Y-%m-%d %H:%M:%S')
             if not id:
                 td = int(hours)*3
                 results[(d, hours, id)] = [(dt_from, dt_from + timedelta(hours=td))]
index 307f06c..ef959a5 100644 (file)
@@ -22,7 +22,6 @@
 # TODO:
 #   Error treatment: exception, request, ... -> send request to user_id
 
-from mx import DateTime
 import time
 from osv import fields,osv
 from tools.translate import _