From faf8419e1566ade4c0516b41b0559f99e242a0ef Mon Sep 17 00:00:00 2001 From: olt Date: Mon, 13 Jul 2009 09:28:55 -0400 Subject: [PATCH 1/9] [FIX] fix ftp host address on Windows Vista bzr revid: olt@tinyerp.com-20090713132855-do36xyiee2l048dv --- addons/document/ftpserver/__init__.py | 42 +++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 3 deletions(-) diff --git a/addons/document/ftpserver/__init__.py b/addons/document/ftpserver/__init__.py index 7895755da5f..e31b1f5e5bd 100644 --- a/addons/document/ftpserver/__init__.py +++ b/addons/document/ftpserver/__init__.py @@ -35,23 +35,59 @@ if len(pps) == 2: PASSIVE_PORTS = int(pps[0]), int(pps[1]) class ftp_server(threading.Thread): - def log(self, level, message): + def log(self, level, message): logger = netsvc.Logger() logger.notifyChannel('FTP', level, message) + def detect_ip_addr(self): + def _detect_ip_addr(): + from array import array + import socket + from struct import pack, unpack + + try: + import fcntl + except ImportError: + fcntl = None + + if not fcntl: # not UNIX: + hostname = socket.gethostname() + ip_addr = socket.gethostbyname(hostname) + else: # UNIX: + # get all interfaces: + nbytes = 128 * 32 + s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) + names = array('B', '\0' * nbytes) + outbytes = unpack('iL', fcntl.ioctl( s.fileno(), 0x8912, pack('iL', nbytes, names.buffer_info()[0])))[0] + namestr = names.tostring() + ifaces = [namestr[i:i+32].split('\0', 1)[0] for i in range(0, outbytes, 32)] + + for ifname in [iface for iface in ifaces if iface != 'lo']: + ip_addr = socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, pack('256s', ifname[:15]))[20:24]) + break + return ip_addr + + try: + ip_addr = _detect_ip_addr() + except: + ip_addr = 'localhost' + return ip_addr + + def run(self): - autho = authorizer.authorizer() + autho = authorizer.authorizer() ftpserver.FTPHandler.authorizer = autho ftpserver.max_cons = 300 ftpserver.max_cons_per_ip = 50 ftpserver.FTPHandler.abstracted_fs = abstracted_fs.abstracted_fs if PASSIVE_PORTS: ftpserver.FTPHandler.passive_ports = PASSIVE_PORTS - + ftpserver.log = lambda msg: self.log(netsvc.LOG_INFO, msg) ftpserver.logline = lambda msg: None ftpserver.logerror = lambda msg: self.log(netsvc.LOG_ERROR, msg) + HOST = self.detect_ip_addr() address = (HOST, PORT) ftpd = ftpserver.FTPServer(address, ftpserver.FTPHandler) ftpd.serve_forever() From 4f47f833fafa2bc89766d56dc8d0e11054185f3e Mon Sep 17 00:00:00 2001 From: Olivier Laurent Date: Wed, 29 Jul 2009 15:36:02 +0200 Subject: [PATCH 2/9] [FIX] point of sale: don't convert the float with 'str' bzr revid: olt@tinyerp.com-20090729133602-ydi1dkt8i64ptljp --- addons/point_of_sale/pos.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py index 7c71436373d..f3ffec7ffc2 100644 --- a/addons/point_of_sale/pos.py +++ b/addons/point_of_sale/pos.py @@ -231,7 +231,7 @@ class pos_order(osv.osv): def test_paid(self, cr, uid, ids, context=None): def deci(val): - return Decimal(str(val)) + return Decimal("%f" % (val, )) for order in self.browse(cr, uid, ids, context): if order.lines and not order.amount_total: From 7e1a6139e3c8bb1450711e22d3c107b210590776 Mon Sep 17 00:00:00 2001 From: olt Date: Tue, 11 Aug 2009 08:40:04 -0400 Subject: [PATCH 3/9] [FIX] document: set default address to '' instead of 'localhost' bzr revid: olt@tinyerp.com-20090811124004-70qdwfbnh1g8iby7 --- addons/document/ftpserver/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/document/ftpserver/__init__.py b/addons/document/ftpserver/__init__.py index e31b1f5e5bd..7a68a7e5821 100644 --- a/addons/document/ftpserver/__init__.py +++ b/addons/document/ftpserver/__init__.py @@ -70,7 +70,7 @@ class ftp_server(threading.Thread): try: ip_addr = _detect_ip_addr() except: - ip_addr = 'localhost' + ip_addr = '' return ip_addr From 59e5081a0d5e6a5e15cf956b99e038f51bf382da Mon Sep 17 00:00:00 2001 From: husen daudi Date: Thu, 13 Aug 2009 17:25:49 +0530 Subject: [PATCH 5/9] module:document improved resource domain eval with uid bzr revid: hda@hda-20090813115549-xhwbxfq010u7jb9j --- addons/document/document.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/document/document.py b/addons/document/document.py index 1b0d6ad680f..cafbb074e28 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -174,7 +174,7 @@ class node_class(object): res = fobj.browse(self.cr, self.uid, file_ids, context=self.context) result +=map(lambda x: node_class(self.cr, self.uid, self.path+'/'+eval('x.'+fobj._rec_name), x, False, context=self.context, type='file', root=self.root), res) if self.type=='collection' and self.object.type=="ressource": - where = self.object.domain and eval(self.object.domain, {'active_id':self.root}) or [] + where = self.object.domain and eval(self.object.domain, {'active_id':self.root, 'uid':self.uid}) or [] pool = pooler.get_pool(self.cr.dbname) obj = pool.get(self.object.ressource_type_id.model) _dirname_field = obj._rec_name From c8212d8ac05ffb5be0e0ce0686909e6cd0eec63c Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Sun, 16 Aug 2009 22:16:51 +0200 Subject: [PATCH 6/9] [FIX] Sequences on picking bzr revid: fp@tinyerp.com-20090816201651-v2xceke7pxn7fpqg --- addons/stock/stock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 7c533f3cc2c..4398877df43 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -407,7 +407,7 @@ class stock_picking(osv.osv): return res def create(self, cr, user, vals, context=None): - if 'name' not in vals: + if ('name' not in vals) or (vals.get('name')=='/'): vals['name'] = self.pool.get('ir.sequence').get(cr, user, 'stock.picking') return super(stock_picking, self).create(cr, user, vals, context) From b4bb3d91548941ca0aecad830e1ad355c5e7b3f4 Mon Sep 17 00:00:00 2001 From: husen daudi Date: Mon, 17 Aug 2009 18:28:06 +0530 Subject: [PATCH 7/9] [IMP] code improvement lp bug: https://launchpad.net/bugs/413699 fixed bzr revid: hda@hda-20090817125806-eujqjcb9yq8eest9 --- addons/point_of_sale/pos.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/point_of_sale/pos.py b/addons/point_of_sale/pos.py index 7c71436373d..c208d62b86d 100644 --- a/addons/point_of_sale/pos.py +++ b/addons/point_of_sale/pos.py @@ -46,7 +46,6 @@ class pos_order(osv.osv): _name = "pos.order" _description = "Point of Sale" _order = "date_order, create_date desc" - _order = "date_order desc, name desc" def unlink(self, cr, uid, ids, context={}): for rec in self.browse(cr, uid, ids, context=context): From 1c81ef478b7a37e77b2bae06e292360b217b332b Mon Sep 17 00:00:00 2001 From: Olivier Laurent Date: Tue, 18 Aug 2009 10:05:10 +0200 Subject: [PATCH 8/9] [FIX] mrp: fr_FR.po file had a duplicate message definition bzr revid: olt@tinyerp.com-20090818080510-xm7jd65u8sbc9doi --- addons/mrp/i18n/fr_FR.po | 5 ----- 1 file changed, 5 deletions(-) diff --git a/addons/mrp/i18n/fr_FR.po b/addons/mrp/i18n/fr_FR.po index e77f8c6771d..68d3b0b5a34 100644 --- a/addons/mrp/i18n/fr_FR.po +++ b/addons/mrp/i18n/fr_FR.po @@ -974,11 +974,6 @@ msgstr "Montant en unité de mesure" msgid "Run procurement" msgstr "Lancer les approvisionnements" -#. module: mrp -#: help:mrp.workcenter,time_efficiency:0 -msgid "Factor that multiplies all times expressed in the workcenter." -msgstr "" - #. module: mrp #: help:res.company,schedule_range:0 msgid "This is the time frame analysed by the scheduler when computing procurements. All procurement that are not between today and today+range are skipped for futur computation." From ccb6079cd038170daca3028b11d1212599d89b3a Mon Sep 17 00:00:00 2001 From: "HDA (OpenERP)" Date: Tue, 18 Aug 2009 18:17:46 +0530 Subject: [PATCH 9/9] Improved graph view bzr revid: hda@tinyerp.com-20090818124746-i7q1923wa7z04txw --- addons/report_analytic/report_analytic_view.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/report_analytic/report_analytic_view.xml b/addons/report_analytic/report_analytic_view.xml index 87aa0c3b858..dc1a6fd1b71 100644 --- a/addons/report_analytic/report_analytic_view.xml +++ b/addons/report_analytic/report_analytic_view.xml @@ -42,10 +42,10 @@ report.analytic.account.close graph - - + + - +