Merge lp:~akretion-team/openobject-addons/addons-mxdatetime-free into lp:openobject-addons

[Raphaël Valyi - http://www.akretion.com]

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Hello,

This branch is the addons equivalent of https://code.launchpad.net/~openerp-commiter/openobject-server/server-mxdatetime-free/+merge/16099 making our way toward a better OpenERP Python portability, on Jython especially (see https://blueprints.launchpad.net/openobject-server/+spec/jython-support-as-jython-improves ).

Here I replace mx.DateTime C only usage by pure Python datetime and Labix dateutil equivalents in the following centric modules as a start:
process, hr, product, account, stock, mrp, sale, purchase.
(on exception is account/wizard/wizard_aged_trial_balance.py which I was not too sure how to refactor).

Of course more is required, but it's already a decent step toward better compat. Please merge that first, more might eventually follow from me if I have time (hey folks please help us for that great Jython feature!)

I'm available for any question

[Xavier (Open ERP) (xmo-deactivatedaccount)]

Merged. Thanks.

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

Thank you too!

On Fri, Mar 5, 2010 at 6:45 AM, Xavier (Open ERP) <email address hidden> wrote:

> Merged. Thanks.
> --
>
> https://code.launchpad.net/~akretion-team/openobject-addons/addons-mxdatetime-free/+merge/20342
> You proposed lp:~akretion-team/openobject-addons/addons-mxdatetime-free for
> merging.
>

[Raphaël Valyi - http://www.akretion.com (rvalyi)]

More is coming then...

2010/3/5 Raphaël Valyi <email address hidden>

> Thank you too!
>
>
> On Fri, Mar 5, 2010 at 6:45 AM, Xavier (Open ERP) <email address hidden> wrote:
>
>> Merged. Thanks.
>> --
>>
>> https://code.launchpad.net/~akretion-team/openobject-addons/addons-mxdatetime-free/+merge/20342
>> You proposed lp:~akretion-team/openobject-addons/addons-mxdatetime-free
>> for merging.
>>
>
>

=== modified file 'account/account.py'
--- account/account.py	2010-02-24 10:55:29 +0000
+++ account/account.py	2010-03-01 05:35:23 +0000
@@ -27,8 +27,8 @@
 from tools.misc import currency
 from tools.translate import _
 import pooler
-import mx.DateTime
-from mx.DateTime import RelativeDateTime, now, DateTime, localtime
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 
 from tools import config
 
@@ -48,7 +48,7 @@
 
     def compute(self, cr, uid, id, value, date_ref=False, context={}):
         if not date_ref:
-            date_ref = now().strftime('%Y-%m-%d')
+            date_ref = datetime.now().strftime('%Y-%m-%d')
         pt = self.browse(cr, uid, id, context)
         amount = value
         result = []
@@ -60,11 +60,11 @@
             elif line.value == 'balance':
                 amt = round(amount, int(config['price_accuracy']))
             if amt:
-                next_date = mx.DateTime.strptime(date_ref, '%Y-%m-%d') + RelativeDateTime(days=line.days)
+                next_date = datetime.strptime(date_ref, '%y-%m-%d') + relativedelta(days=line.days)
                 if line.days2 < 0:
-                    next_date += RelativeDateTime(day=line.days2)
+                    next_date += relativedelta(day=line.days2)
                 if line.days2 > 0:
-                    next_date += RelativeDateTime(day=line.days2, months=1)
+                    next_date += relativedelta(day=line.days2, months=1)
                 result.append( (next_date.strftime('%Y-%m-%d'), amt) )
                 amount -= amt
         return result
@@ -582,12 +582,12 @@
 
     def create_period(self,cr, uid, ids, context={}, interval=1):
         for fy in self.browse(cr, uid, ids, context):
-            ds = mx.DateTime.strptime(fy.date_start, '%Y-%m-%d')
+            ds = datetime.strptime(fy.date_start, '%Y-%m-%d')
             while ds.strftime('%Y-%m-%d')<fy.date_stop:
-                de = ds + RelativeDateTime(months=interval, days=-1)
+                de = ds + relativedelta(months=interval, days=-1)
 
                 if de.strftime('%Y-%m-%d')>fy.date_stop:
-                    de=mx.DateTime.strptime(fy.date_stop, '%Y-%m-%d')
+                    de = datetime.strptime(fy.date_stop, '%Y-%m-%d')
 
                 self.pool.get('account.period').create(cr, uid, {
                     'name': ds.strftime('%m/%Y'),
@@ -596,7 +596,7 @@
                     'date_stop': de.strftime('%Y-%m-%d'),
                     'fiscalyear_id': fy.id,
                 })
-                ds = ds + RelativeDateTime(months=interval)
+                ds = ds + relativedelta(months=interval)
         return True
 
     def find(self, cr, uid, dt=None, exception=True, context={}):
@@ -1720,11 +1720,11 @@
                     'subscription_id': sub.id,
                 })
                 if sub.period_type=='day':
-                    ds = (mx.DateTime.strptime(ds, '%Y-%m-%d') + RelativeDateTime(days=sub.period_nbr)).strftime('%Y-%m-%d')
+                    ds = (datetime.strptime(ds, '%Y-%m-%d') + relativedelta(days=sub.period_nbr)).strftime('%Y-%m-%d')
                 if sub.period_type=='month':
-                    ds = (mx.DateTime.strptime(ds, '%Y-%m-%d') + RelativeDateTime(months=sub.period_nbr)).strftime('%Y-%m-%d')
+                    ds = (datetime.strptime(ds, '%Y-%m-%d') + relativedelta(months=sub.period_nbr)).strftime('%Y-%m-%d')
                 if sub.period_type=='year':
-                    ds = (mx.DateTime.strptime(ds, '%Y-%m-%d') + RelativeDateTime(years=sub.period_nbr)).strftime('%Y-%m-%d')
+                    ds = (datetime.strptime(ds, '%Y-%m-%d') + relativedelta(years=sub.period_nbr)).strftime('%Y-%m-%d')
         self.write(cr, uid, ids, {'state':'running'})
         return True
 account_subscription()

=== modified file 'account/account_bank_statement.py'
--- account/account_bank_statement.py	2010-02-24 10:55:29 +0000
+++ account/account_bank_statement.py	2010-03-01 05:35:23 +0000
@@ -26,10 +26,6 @@
 from tools.misc import currency
 from tools.translate import _
 
-import mx.DateTime
-from mx.DateTime import RelativeDateTime, now, DateTime, localtime
-
-
 class account_bank_statement(osv.osv):
     def _default_journal_id(self, cr, uid, context={}):
         if context.get('journal_id', False):

=== modified file 'account/account_move_line.py'
--- account/account_move_line.py	2010-02-24 10:55:29 +0000
+++ account/account_move_line.py	2010-03-01 05:35:23 +0000
@@ -24,8 +24,7 @@
 from osv import fields, osv
 from tools.translate import _
 
-import mx.DateTime
-from mx.DateTime import RelativeDateTime, now, DateTime, localtime
+from datetime import datetime
 
 import tools
 
@@ -485,7 +484,7 @@
         if not partner_id:
             return {'value':val}
         if not date:
-            date = now().strftime('%Y-%m-%d')
+            date = datetime.now().strftime('%Y-%m-%d')
         part = self.pool.get('res.partner').browse(cr, uid, partner_id)
 
         if part.property_payment_term and part.property_payment_term.line_ids:

=== modified file 'account/invoice.py'
--- account/invoice.py	2010-02-24 10:55:29 +0000
+++ account/invoice.py	2010-03-01 05:35:23 +0000
@@ -24,8 +24,6 @@
 from osv import fields, osv
 import ir
 import pooler
-import mx.DateTime
-from mx.DateTime import RelativeDateTime
 from tools import config
 from tools.translate import _
 

=== modified file 'account/report/general_ledger.py'
--- account/report/general_ledger.py	2010-02-24 10:55:29 +0000
+++ account/report/general_ledger.py	2010-03-01 05:35:23 +0000
@@ -25,7 +25,6 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 import time
-from mx.DateTime import *
 from report import report_sxw
 import xml
 import rml_parse

=== modified file 'account/report/general_ledger_landscape.py'
--- account/report/general_ledger_landscape.py	2010-02-24 10:55:29 +0000
+++ account/report/general_ledger_landscape.py	2010-03-01 05:35:23 +0000
@@ -27,7 +27,6 @@
 ##############################################################################
 
 import time
-from mx.DateTime import *
 from report import report_sxw
 import xml
 import rml_parse

=== modified file 'hr/hr.py'
--- hr/hr.py	2010-02-28 19:46:55 +0000
+++ hr/hr.py	2010-03-01 05:35:23 +0000
@@ -19,10 +19,6 @@
 #
 ##############################################################################
 
-from mx import DateTime
-import time
-import math
-
 from osv import fields, osv
 from tools.translate import _
 

=== modified file 'purchase/purchase.py'
--- purchase/purchase.py	2010-02-24 10:55:29 +0000
+++ purchase/purchase.py	2010-03-01 05:35:23 +0000
@@ -25,7 +25,8 @@
 import netsvc
 
 import ir
-from mx import DateTime
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 import pooler
 from tools import config
 from tools.translate import _
@@ -518,7 +519,7 @@
                         'uom': uom,
                         'date': date_order,
                         })[pricelist]
-        dt = (DateTime.now() + DateTime.RelativeDateTime(days=seller_delay or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
+        dt = (datetime.now() + relativedelta(days=seller_delay or 0.0)).strftime('%Y-%m-%d %H:%M:%S')
         prod_name = self.pool.get('product.product').name_get(cr, uid, [prod.id])[0][1]
 
 

=== modified file 'sale/sale.py'
--- sale/sale.py	2010-02-24 10:55:29 +0000
+++ sale/sale.py	2010-03-01 05:35:23 +0000
@@ -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 import config
 from tools.translate import _
 
@@ -581,8 +582,8 @@
             picking_id = False
             for line in order.order_line:
                 proc_id = False
-                date_planned = DateTime.now() + DateTime.DateTimeDeltaFromDays(line.delay or 0.0)
-                date_planned = (date_planned - DateTime.DateTimeDeltaFromDays(company.security_lead)).strftime('%Y-%m-%d %H:%M:%S')
+                date_planned = datetime.now() + relativedelta(days=line.delay or 0.0)
+                date_planned = (date_planned - relativedelta(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'):

=== modified file 'stock/report/product_stock.py'
--- stock/report/product_stock.py	2010-02-24 10:55:29 +0000
+++ stock/report/product_stock.py	2010-03-01 05:35:23 +0000
@@ -19,7 +19,8 @@
 #
 ##############################################################################
 
-from mx import DateTime
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
 
 import osv
 import time
@@ -76,7 +77,7 @@
                    "group by date_planned,product_id",(('confirmed','assigned','waiting'),loc_ids ,product_ids,))
         for (qty, dt, prod_id) in cr.fetchall():
             if dt<=dt_from:
-                dt= (DateTime.now() + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d')
+                dt= (datetime.now() + relativedelta(days=1)).strftime('%Y-%m-%d')
             else:
                 dt = dt[:10]
             products.setdefault(prod_id, [])
@@ -91,7 +92,7 @@
 
         for (qty, dt, prod_id) in cr.fetchall():
             if dt<=dt_from:
-                dt= (DateTime.now() + DateTime.RelativeDateTime(days=1)).strftime('%Y-%m-%d')
+                dt= (datetime.now() + relativedelta(days=1)).strftime('%Y-%m-%d')
             else:
                 dt = dt[:10]
             products.setdefault(prod_id, [])

=== modified file 'stock/report/stock_graph.py'
--- stock/report/stock_graph.py	2010-02-24 10:55:29 +0000
+++ stock/report/stock_graph.py	2010-03-01 05:35:23 +0000
@@ -18,7 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
 #
 ##############################################################################
-from mx.DateTime import *
 from pychart import *
 import pychart.legend
 import time

=== modified file 'stock/stock.py'
--- stock/stock.py	2010-02-24 12:50:18 +0000
+++ stock/stock.py	2010-03-01 05:35:23 +0000
@@ -19,7 +19,9 @@
 #
 ##############################################################################
 
-from mx import DateTime
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
 from osv import fields, osv
 from tools import config
 from tools.translate import _
@@ -1169,8 +1171,8 @@
             if dest:
                 if dest[1] == 'transparent':
                     self.write(cr, uid, [m.id], {
-                        'date_planned': (DateTime.strptime(m.date_planned, '%Y-%m-%d %H:%M:%S') + \
-                            DateTime.RelativeDateTime(days=dest[2] or 0)).strftime('%Y-%m-%d'),
+                        'date_planned': (datetime.strptime(m.date_planned, '%Y-%m-%d %H:%M:%S') + \
+                            relativedelta(days=dest[2] or 0)).strftime('%Y-%m-%d'),
                         'location_dest_id': dest[0].id})
                 else:
                     result.setdefault(m.picking_id, [])
@@ -1206,7 +1208,7 @@
                         'picking_id': pickid,
                         'state': 'waiting',
                         'move_history_ids': [],
-                        'date_planned': (DateTime.strptime(move.date_planned, '%Y-%m-%d %H:%M:%S') + DateTime.RelativeDateTime(days=delay or 0)).strftime('%Y-%m-%d'),
+                        'date_planned': (datetime.strptime(move.date_planned, '%Y-%m-%d %H:%M:%S') + relativedelta(days=delay or 0)).strftime('%Y-%m-%d'),
                         'move_history_ids2': []}
                     )
                     self.pool.get('stock.move').write(cr, uid, [move.id], {