- +
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index d92bd493530..c0dc35ef082 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -143,7 +143,7 @@ class crm_lead(format_address, osv.osv): action = self.get_formview_action(cr, user, context['opportunity_id'], context=context) if action.get('views') and any(view_id for view_id in action['views'] if view_id[1] == view_type): view_id = next(view_id[0] for view_id in action['views'] if view_id[1] == view_type) - res = super(crm_lead, self).fields_view_get(cr, user, view_id, view_type, context, toolbar=toolbar, submenu=submenu) + res = super(crm_lead, self).fields_view_get(cr, user, view_id, view_type, context=context, toolbar=toolbar, submenu=submenu) if view_type == 'form': res['arch'] = self.fields_view_get_address(cr, user, res['arch'], context=context) return res diff --git a/addons/gamification/models/challenge.py b/addons/gamification/models/challenge.py index 48400159dd5..7feab491ea1 100644 --- a/addons/gamification/models/challenge.py +++ b/addons/gamification/models/challenge.py @@ -381,6 +381,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 b26cc44860e..45eca296175 100644 --- a/addons/google_drive/google_drive.py +++ b/addons/google_drive/google_drive.py @@ -81,7 +81,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() @@ -101,7 +101,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 += """ +
OUR REFERENCES RFQ number: ${object.name} - RFQ date: ${object.date_order} + RFQ date: ${format_tz(object.date_order, tz=user.tz, context={'lang':object.partner_id.lang})} % if object.origin: RFQ reference: ${object.origin} % endif @@ -112,7 +112,7 @@ OUR REFERENCES Order number: ${object.name} Order total: ${object.amount_total} ${object.currency_id.name} - Order date: ${object.date_order} + Order date: ${format_tz(object.date_order, tz=user.tz, context={'lang':object.partner_id.lang})} % if object.origin: Order reference: ${object.origin} % endif diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 3a977732467..24e11fb599d 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -38,6 +38,7 @@ class purchase_order(osv.osv): def _amount_all(self, cr, uid, ids, field_name, arg, context=None): res = {} cur_obj=self.pool.get('res.currency') + line_obj = self.pool['purchase.order.line'] for order in self.browse(cr, uid, ids, context=context): res[order.id] = { 'amount_untaxed': 0.0, @@ -47,10 +48,15 @@ class purchase_order(osv.osv): val = val1 = 0.0 cur = order.pricelist_id.currency_id for line in order.order_line: - taxes = self.pool.get('account.tax').compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, line.product_id, order.partner_id) - val1 += cur_obj.round(cr, uid, cur, taxes['total']) #Decimal precision? - for c in taxes['taxes']: - val += c.get('amount', 0.0) + line_price = line_obj._calc_line_base_price(cr, uid, line, + context=context) + line_qty = line_obj._calc_line_quantity(cr, uid, line, + context=context) + taxes = self.pool['account.tax'].compute_all(cr, uid, line.taxes_id, line_price, line_qty, + line.product_id, order.partner_id) + val1 += cur_obj.round(cr, uid, cur, taxes['total']) #Decimal precision? + for c in taxes['taxes']: + val += c.get('amount', 0.0) res[order.id]['amount_tax']=cur_obj.round(cr, uid, cur, val) res[order.id]['amount_untaxed']=cur_obj.round(cr, uid, cur, val1) @@ -1014,12 +1020,34 @@ class purchase_order(osv.osv): class purchase_order_line(osv.osv): + def _calc_line_base_price(self, cr, uid, line, context=None): + """Return the base price of the line to be used for tax calculation. + + This function can be extended by other modules to modify this base + price (adding a discount, for example). + """ + return line.price_unit + + def _calc_line_quantity(self, cr, uid, line, context=None): + """Return the base quantity of the line to be used for the subtotal. + + This function can be extended by other modules to modify this base + quantity (adding for example offers 3x2 and so on). + """ + return line.product_qty + def _amount_line(self, cr, uid, ids, prop, arg, context=None): res = {} cur_obj=self.pool.get('res.currency') tax_obj = self.pool.get('account.tax') for line in self.browse(cr, uid, ids, context=context): - taxes = tax_obj.compute_all(cr, uid, line.taxes_id, line.price_unit, line.product_qty, line.product_id, line.order_id.partner_id) + line_price = self._calc_line_base_price(cr, uid, line, + context=context) + line_qty = self._calc_line_quantity(cr, uid, line, + context=context) + taxes = tax_obj.compute_all(cr, uid, line.taxes_id, line_price, + line_qty, line.product_id, + line.order_id.partner_id) cur = line.order_id.pricelist_id.currency_id res[line.id] = cur_obj.round(cr, uid, cur, taxes['total']) return res diff --git a/addons/sale/sale.py b/addons/sale/sale.py index 8d4936293ca..906d8baba01 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -48,7 +48,12 @@ class sale_order(osv.osv): def _amount_line_tax(self, cr, uid, line, context=None): val = 0.0 - for c in self.pool.get('account.tax').compute_all(cr, uid, line.tax_id, line.price_unit * (1-(line.discount or 0.0)/100.0), line.product_uom_qty, line.product_id, line.order_id.partner_id)['taxes']: + line_obj = self.pool['sale.order.line'] + price = line_obj._calc_line_base_price(cr, uid, line, context=context) + qty = line_obj._calc_line_quantity(cr, uid, line, context=context) + for c in self.pool['account.tax'].compute_all( + cr, uid, line.tax_id, price, qty, line.product_id, + line.order_id.partner_id)['taxes']: val += c.get('amount', 0.0) return val @@ -827,6 +832,12 @@ class sale_order_line(osv.osv): return True return False + def _calc_line_base_price(self, cr, uid, line, context=None): + return line.price_unit * (1 - (line.discount or 0.0) / 100.0) + + def _calc_line_quantity(self, cr, uid, line, context=None): + return line.product_uom_qty + def _amount_line(self, cr, uid, ids, field_name, arg, context=None): tax_obj = self.pool.get('account.tax') cur_obj = self.pool.get('res.currency') @@ -834,8 +845,11 @@ class sale_order_line(osv.osv): if context is None: context = {} for line in self.browse(cr, uid, ids, context=context): - price = line.price_unit * (1 - (line.discount or 0.0) / 100.0) - taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, line.product_uom_qty, line.product_id, line.order_id.partner_id) + price = self._calc_line_base_price(cr, uid, line, context=context) + qty = self._calc_line_quantity(cr, uid, line, context=context) + taxes = tax_obj.compute_all(cr, uid, line.tax_id, price, qty, + line.product_id, + line.order_id.partner_id) cur = line.order_id.pricelist_id.currency_id res[line.id] = cur_obj.round(cr, uid, cur, taxes['total']) return res diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c31595dc0c0..0d7df4688c8 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2967,6 +2967,10 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc } } }, + focus: function() { + var input = !this.get("effective_readonly") && this.$cleditor + return input ? input.focus() : false; + }, render_value: function() { if (! this.get("effective_readonly")) { this.$textarea.val(this.get('value') || ''); diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index 150ca20a110..d424fd7b075 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -301,7 +301,7 @@ var $cell = $(cell); field.set_dimensions($cell.outerHeight(), $cell.outerWidth()); - field.$el.position({ + field.$el.css({top: 0, left: 0}).position({ my: 'left top', at: 'left top', of: $cell diff --git a/addons/web_kanban/static/src/js/kanban.js b/addons/web_kanban/static/src/js/kanban.js index 66432568fd7..6beb648637c 100644 --- a/addons/web_kanban/static/src/js/kanban.js +++ b/addons/web_kanban/static/src/js/kanban.js @@ -1312,6 +1312,17 @@ instance.web_kanban.AbstractField = instance.web.Widget.extend(instance.web_kanb }, }); +instance.web_kanban.FormatChar = instance.web_kanban.AbstractField.extend({ + tagName: 'span', + init: function(parent, field, $node) { + this._super.apply(this, arguments); + this.format_descriptor = _.extend({}, this.field, {'widget': this.$node.attr('widget')}); + }, + renderElement: function() { + this.$el.text(instance.web.format_value(this.field.raw_value, this.format_descriptor)); + } +}); + instance.web_kanban.Priority = instance.web_kanban.AbstractField.extend({ init: function(parent, field, $node) { this._super.apply(this, arguments); @@ -1413,4 +1424,5 @@ instance.web_kanban.KanbanSelection = instance.web_kanban.AbstractField.extend({ instance.web_kanban.fields_registry = new instance.web.Registry({}); instance.web_kanban.fields_registry.add('priority','instance.web_kanban.Priority'); instance.web_kanban.fields_registry.add('kanban_state_selection','instance.web_kanban.KanbanSelection'); +instance.web_kanban.fields_registry.add('float_time','instance.web_kanban.FormatChar'); }; diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py index d10e33a4708..2d28cc449d8 100644 --- a/addons/website/models/ir_qweb.py +++ b/addons/website/models/ir_qweb.py @@ -344,7 +344,12 @@ class Image(orm.AbstractModel): if options.get('resize'): src = "%s/%s" % (src, options.get('resize')) - img = '' % (classes, src, options.get('style', '')) + alt = None + if options.get('alt-field') and getattr(record, options['alt-field'], None): + alt = record[options['alt-field']] + elif options.get('alt'): + alt = options['alt'] + img = '' % (classes, src, options.get('style', ''), ' alt="%s"' % alt if alt else '') return ir_qweb.HTMLSafe(img) local_url_re = re.compile(r'^/(?P[^]]+)/static/(?P.+)$') diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py index b84be1a5440..75d03986438 100644 --- a/addons/website/models/ir_ui_view.py +++ b/addons/website/models/ir_ui_view.py @@ -8,7 +8,6 @@ from openerp import SUPERUSER_ID, api, tools from openerp.addons.website.models import website from openerp.http import request from openerp.osv import osv, fields -from openerp.tools import html_escape _logger = logging.getLogger(__name__) @@ -144,14 +143,6 @@ class view(osv.osv): # ensure there's only one match [root] = arch.xpath(section_xpath) - # html text need to be escaped for xml storage - def escape_node(node): - node.text = node.text and html_escape(node.text) - node.tail = node.tail and html_escape(node.tail) - escape_node(replacement) - for descendant in replacement.iterdescendants(): - escape_node(descendant) - root.text = replacement.text root.tail = replacement.tail # replace all children diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 16448fc01c1..985a5ac5237 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -1119,7 +1119,14 @@ define(['summernote/summernote'], function () { return this._save(); }, saveElement: function ($el) { - var markup = $el.prop('outerHTML'); + // escape text nodes for xml saving + var escaped_el = $el.clone(); + escaped_el.find('*').addBack().not('script,style').contents().each(function(){ + if(this.nodeType == 3) { + this.nodeValue = _.escape(this.nodeValue); + } + }); + var markup = escaped_el.prop('outerHTML'); return openerp.jsonRpc('/web/dataset/call', 'call', { model: 'ir.ui.view', method: 'save', diff --git a/addons/website/tests/test_views.py b/addons/website/tests/test_views.py index c8e7efb9044..b63ac75997d 100644 --- a/addons/website/tests/test_views.py +++ b/addons/website/tests/test_views.py @@ -175,14 +175,34 @@ class TestViewSaving(common.TransactionCase): ) def test_save_escaped_text(self): + """ Test saving html special chars in text nodes """ view_id = self.registry('ir.ui.view').create(self.cr, self.uid, { - 'arch':'hello world', + 'arch':'hello world