diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py index 68c5db17ab2..0e711541477 100644 --- a/addons/gamification/models/challenge.py +++ b/addons/gamification/models/challenge.py @@ -363,6 +363,9 @@ class gamification_challenge(osv.Model): Create goals that haven't been created yet (eg: if added users) Recompute the current value for each goal related""" + goal_obj = self.pool['gamification.goal'] + goal_ids = goal_obj.search(cr, uid, [('challenge_id', 'in', ids), ('state', '=', 'inprogress')], context=context) + goal_obj.unlink(cr, uid, goal_ids, context=context) return self._update_all(cr, uid, ids=ids, context=context) def action_report_progress(self, cr, uid, ids, context=None): diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py index f5f90b10d6e..dd723c4f10d 100644 --- a/addons/google_drive/google_drive.py +++ b/addons/google_drive/google_drive.py @@ -62,7 +62,7 @@ class config(osv.Model): client_secret=google_drive_client_secret, grant_type="refresh_token", scope=scope or 'https://www.googleapis.com/auth/drive')) - headers = {"Content-type": "application/x-www-form-urlencoded", "Accept-Encoding": "gzip, deflate"} + headers = {"Content-type": "application/x-www-form-urlencoded"} try: req = urllib2.Request('https://accounts.google.com/o/oauth2/token', data, headers) content = urllib2.urlopen(req, timeout=TIMEOUT).read() @@ -82,7 +82,7 @@ class config(osv.Model): access_token = self.get_access_token(cr, uid, context=context) # Copy template in to drive with help of new access token request_url = "https://www.googleapis.com/drive/v2/files/%s?fields=parents/id&access_token=%s" % (template_id, access_token) - headers = {"Content-type": "application/x-www-form-urlencoded", "Accept-Encoding": "gzip, deflate"} + headers = {"Content-type": "application/x-www-form-urlencoded"} try: req = urllib2.Request(request_url, None, headers) parents = urllib2.urlopen(req, timeout=TIMEOUT).read() diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py index 083e5cd5557..0b0f58027ab 100644 --- a/addons/hw_escpos/controllers/main.py +++ b/addons/hw_escpos/controllers/main.py @@ -52,60 +52,37 @@ class EscposDriver(Thread): self.lock = Lock() self.status = {'status':'connecting', 'messages':[]} - def supported_devices(self): - if not os.path.isfile('escpos_devices.pickle'): - return supported_devices.device_list - else: - try: - f = open('escpos_devices.pickle','r') - return pickle.load(f) - f.close() - except Exception as e: - self.set_status('error',str(e)) - return supported_devices.device_list - - def add_supported_device(self,device_string): - r = re.compile('[0-9A-Fa-f]{4}:[0-9A-Fa-f]{4}'); - match = r.search(device_string) - if match: - match = match.group().split(':') - vendor = int(match[0],16) - product = int(match[1],16) - name = device_string.split('ID') - if len(name) >= 2: - name = name[1] - else: - name = name[0] - _logger.info('ESC/POS: adding support for device: '+match[0]+':'+match[1]+' '+name) - - device_list = supported_devices.device_list[:] - if os.path.isfile('escpos_devices.pickle'): - try: - f = open('escpos_devices.pickle','r') - device_list = pickle.load(f) - f.close() - except Exception as e: - self.set_status('error',str(e)) - device_list.append({ - 'vendor': vendor, - 'product': product, - 'name': name, - }) - - try: - f = open('escpos_devices.pickle','w+') - f.seek(0) - pickle.dump(device_list,f) - f.close() - except Exception as e: - self.set_status('error',str(e)) - def connected_usb_devices(self): connected = [] - - for device in self.supported_devices(): - if usb.core.find(idVendor=device['vendor'], idProduct=device['product']) != None: - connected.append(device) + + # printers can either define bDeviceClass=7, or they can define one of + # their interfaces with bInterfaceClass=7. This class checks for both. + class FindUsbClass(object): + def __init__(self, usb_class): + self._class = usb_class + def __call__(self, device): + # first, let's check the device + if device.bDeviceClass == self._class: + return True + # transverse all devices and look through their interfaces to + # find a matching class + for cfg in device: + intf = usb.util.find_descriptor(cfg, bInterfaceClass=self._class) + + if intf is not None: + return True + + return False + + printers = usb.core.find(find_all=True, custom_match=FindUsbClass(7)) + + for printer in printers: + connected.append({ + 'vendor': printer.idVendor, + 'product': printer.idProduct, + 'name': usb.util.get_string(printer, 256, printer.iManufacturer) + " " + usb.util.get_string(printer, 256, printer.iProduct) + }) + return connected def lockedstart(self): @@ -377,18 +354,3 @@ class EscposProxy(hw_proxy.Proxy): _logger.info('ESC/POS: PRINT XML RECEIPT') driver.push_task('xml_receipt',receipt) - @http.route('/hw_proxy/escpos/add_supported_device', type='http', auth='none', cors='*') - def add_supported_device(self, device_string): - _logger.info('ESC/POS: ADDED NEW DEVICE:'+device_string) - driver.add_supported_device(device_string) - return "The device:\n"+device_string+"\n has been added to the list of supported devices.Ok" - - @http.route('/hw_proxy/escpos/reset_supported_devices', type='http', auth='none', cors='*') - def reset_supported_devices(self): - try: - os.remove('escpos_devices.pickle') - except Exception as e: - pass - return 'The list of supported devices has been reset to factory defaults.Ok' - - diff --git a/addons/hw_escpos/escpos/__init__.py b/addons/hw_escpos/escpos/__init__.py index 3fdeddee28b..22a5af61029 100644 --- a/addons/hw_escpos/escpos/__init__.py +++ b/addons/hw_escpos/escpos/__init__.py @@ -1 +1 @@ -__all__ = ["constants","escpos","exceptions","printer","supported_devices"] +__all__ = ["constants","escpos","exceptions","printer"] diff --git a/addons/hw_escpos/escpos/supported_devices.py b/addons/hw_escpos/escpos/supported_devices.py deleted file mode 100644 index ad086b5516b..00000000000 --- a/addons/hw_escpos/escpos/supported_devices.py +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/python - -# This is a list of esc/pos compatible usb printers. The vendor and product ids can be found by -# typing lsusb in a linux terminal, this will give you the ids in the form ID VENDOR:PRODUCT - -device_list = [ - { 'vendor' : 0x04b8, 'product' : 0x0e03, 'name' : 'Epson TM-T20' }, - { 'vendor' : 0x04b8, 'product' : 0x0202, 'name' : 'Epson TM-T70' }, - { 'vendor' : 0x04b8, 'product' : 0x0e15, 'name' : 'Epson TM-T20II' }, -] diff --git a/addons/hw_posbox_upgrade/controllers/main.py b/addons/hw_posbox_upgrade/controllers/main.py index 5ed958d020e..42811820e74 100644 --- a/addons/hw_posbox_upgrade/controllers/main.py +++ b/addons/hw_posbox_upgrade/controllers/main.py @@ -6,6 +6,7 @@ import time import openerp import openerp.addons.hw_proxy.controllers.main as hw_proxy import threading +import subprocess from openerp import http from openerp.http import request from openerp.tools.translate import _ @@ -74,6 +75,14 @@ upgrade_template = """
To upgrade the posbox, click on the upgrade button. The upgrade will take a few minutes. Do not reboot the PosBox during the upgrade.
+ Latest patch: +
+""" +upgrade_template += subprocess.check_output("git --work-tree=/home/pi/odoo/ --git-dir=/home/pi/odoo/.git log -1", shell=True).replace("\n", "") +upgrade_template += """ +