diff --git a/addons/account/account.py b/addons/account/account.py index 01a4d851de8..2fbc32b1bfd 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -3187,11 +3187,14 @@ class wizard_multi_charts_accounts(osv.osv_memory): def _get_analytic_journal(journal_type): # Get the analytic journal data = False - if journal_type in ('sale', 'sale_refund'): - data = obj_data.get_object_reference(cr, uid, 'account', 'analytic_journal_sale') - elif journal_type in ('purchase', 'purchase_refund'): - pass - elif journal_type == 'general': + try: + if journal_type in ('sale', 'sale_refund'): + data = obj_data.get_object_reference(cr, uid, 'account', 'analytic_journal_sale') + elif journal_type in ('purchase', 'purchase_refund'): + data = obj_data.get_object_reference(cr, uid, 'account', 'exp') + elif journal_type == 'general': + pass + except ValueError: pass return data and data[1] or False diff --git a/addons/account/wizard/account_reconcile.py b/addons/account/wizard/account_reconcile.py index 0d5a3525af4..fb3b6f18251 100644 --- a/addons/account/wizard/account_reconcile.py +++ b/addons/account/wizard/account_reconcile.py @@ -23,6 +23,7 @@ import time from openerp.osv import fields, osv from openerp.tools.translate import _ +from openerp.tools.float_utils import float_round import openerp.addons.decimal_precision as dp class account_move_line_reconcile(osv.osv_memory): @@ -64,7 +65,11 @@ class account_move_line_reconcile(osv.osv_memory): credit += line.credit debit += line.debit account_id = line.account_id.id - return {'trans_nbr': count, 'account_id': account_id, 'credit': credit, 'debit': debit, 'writeoff': debit - credit} + precision = self.pool['decimal.precision'].precision_get(cr, uid, 'Account') + writeoff = float_round(debit-credit, precision_digits=precision) + credit = float_round(credit, precision_digits=precision) + debit = float_round(debit, precision_digits=precision) + return {'trans_nbr': count, 'account_id': account_id, 'credit': credit, 'debit': debit, 'writeoff': writeoff} def trans_rec_addendum_writeoff(self, cr, uid, ids, context=None): return self.pool.get('account.move.line.reconcile.writeoff').trans_rec_addendum(cr, uid, ids, context) diff --git a/addons/account/wizard/account_reconcile_view.xml b/addons/account/wizard/account_reconcile_view.xml index 184ce1aaab0..9d4d2684a8e 100644 --- a/addons/account/wizard/account_reconcile_view.xml +++ b/addons/account/wizard/account_reconcile_view.xml @@ -17,8 +17,8 @@ diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml index 8e08f90eb02..f5b89db7089 100644 --- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml +++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml @@ -219,7 +219,7 @@ - + - [[ format(get_text(o,data['form']['followup_id'])) ]] + 
[[ format(get_text(o,data['form']['followup_id'])) ]]
diff --git a/addons/auth_ldap/users_ldap.py b/addons/auth_ldap/users_ldap.py index 1e957a184c3..7b3d88af154 100644 --- a/addons/auth_ldap/users_ldap.py +++ b/addons/auth_ldap/users_ldap.py @@ -99,6 +99,9 @@ class CompanyLDAP(osv.osv): filter = filter_format(conf['ldap_filter'], (login,)) try: results = self.query(conf, filter) + + # Get rid of (None, attrs) for searchResultReference replies + results = [i for i in results if i[0]] if results and len(results) == 1: dn = results[0][0] conn = self.connect(conf) diff --git a/addons/auth_oauth/res_users.py b/addons/auth_oauth/res_users.py index b1c7e214f12..f58473b24a4 100644 --- a/addons/auth_oauth/res_users.py +++ b/addons/auth_oauth/res_users.py @@ -1,6 +1,6 @@ import logging -import urllib +import werkzeug.urls import urlparse import urllib2 import simplejson @@ -25,7 +25,7 @@ class res_users(osv.Model): ] def _auth_oauth_rpc(self, cr, uid, endpoint, access_token, context=None): - params = urllib.urlencode({'access_token': access_token}) + params = werkzeug.url_encode({'access_token': access_token}) if urlparse.urlparse(endpoint)[4]: url = endpoint + '&' + params else: diff --git a/addons/calendar/calendar.py b/addons/calendar/calendar.py index f0862601611..a8efc343420 100644 --- a/addons/calendar/calendar.py +++ b/addons/calendar/calendar.py @@ -1330,13 +1330,13 @@ class calendar_event(osv.Model): new_id = get_real_ids(arg[2]) new_arg = (arg[0], arg[1], new_id) new_args.append(new_arg) - #offset, limit and count must be treated separately as we may need to deal with virtual ids - if context.get('virtual_id', True): - res = super(calendar_event, self).search(cr, uid, new_args, offset=0, limit=0, order=None, context=context, count=False) - res = self.get_recurrent_ids(cr, uid, res, args, order=order, context=context) - else: - res = super(calendar_event, self).search(cr, uid, new_args, offset=0, limit=0, order=order, context=context, count=False) + if not context.get('virtual_id', True): + return super(calendar_event, self).search(cr, uid, new_args, offset=offset, limit=limit, order=order, context=context, count=count) + + # offset, limit, order and count must be treated separately as we may need to deal with virtual ids + res = super(calendar_event, self).search(cr, uid, new_args, offset=0, limit=0, order=None, context=context, count=False) + res = self.get_recurrent_ids(cr, uid, res, args, order=order, context=context) if count: return len(res) elif limit: diff --git a/addons/calendar/calendar_view.xml b/addons/calendar/calendar_view.xml index 93649d046a1..01c4b596592 100644 --- a/addons/calendar/calendar_view.xml +++ b/addons/calendar/calendar_view.xml @@ -313,7 +313,7 @@ Meetings calendar.event form,calendar,tree,gantt - + diff --git a/addons/decimal_precision/decimal_precision.py b/addons/decimal_precision/decimal_precision.py index 27ce5641559..9af09704b61 100644 --- a/addons/decimal_precision/decimal_precision.py +++ b/addons/decimal_precision/decimal_precision.py @@ -50,9 +50,9 @@ class decimal_precision(orm.Model): self.precision_get.clear_cache(self) for obj in self.pool.obj_list(): for colname, col in self.pool.get(obj)._columns.items(): - if isinstance(col, (fields.float, fields.function)): + if hasattr(col, 'digits_change'): col.digits_change(cr) - RegistryManager.signal_registry_change(cr.dbname) + RegistryManager.signal_caches_change(cr.dbname) def create(self, cr, uid, data, context=None): res = super(decimal_precision, self).create(cr, uid, data, context=context) diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py index 4a2d6e5e1ec..514ba10f2f6 100644 --- a/addons/document_ftp/ftpserver/abstracted_fs.py +++ b/addons/document_ftp/ftpserver/abstracted_fs.py @@ -262,6 +262,7 @@ class abstracted_fs(object): if path == '/' and mode in ('list', 'cwd'): return (None, None, None ) + if path == '..': path = self.cwd + '/..' path = _to_unicode(os.path.normpath(path)) # again, for '/db/../ss' if path == '.': path = '' diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 29d1cb3a66d..fcfe869da90 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -417,8 +417,8 @@ class email_template(osv.osv): # create a mail_mail based on values, without attachments values = self.generate_email(cr, uid, template_id, res_id, context=context) - assert values.get('email_from'), 'email_from is missing or empty after template rendering, send_mail() cannot proceed' - + if not values.get('email_from'): + raise osv.except_osv(_('Warning!'),_("Sender email is missing or empty after template rendering. Specify one to deliver your message")) # process partner_to field that is a comma separated list of partner_ids -> recipient_ids # NOTE: only usable if force_send is True, because otherwise the value is # not stored on the mail_mail, and therefore lost -> fixed in v8 diff --git a/addons/google_account/google_account.py b/addons/google_account/google_account.py index 0ecade3554e..d42b0b67e59 100644 --- a/addons/google_account/google_account.py +++ b/addons/google_account/google_account.py @@ -24,7 +24,7 @@ from openerp import SUPERUSER_ID from openerp.tools.translate import _ from openerp.addons.web.http import request -import urllib +import werkzeug.urls import urllib2 import simplejson @@ -43,7 +43,7 @@ class google_service(osv.osv_memory): #Get the Refresh Token From Google And store it in ir.config_parameter headers = {"Content-type": "application/x-www-form-urlencoded"} data = dict(code=authorization_code, client_id=client_id, client_secret=client_secret, redirect_uri=redirect_uri, grant_type="authorization_code") - data = urllib.urlencode(data) + data = werkzeug.url_encode(data) try: req = urllib2.Request("https://accounts.google.com/o/oauth2/token", data, headers) content = urllib2.urlopen(req).read() @@ -62,7 +62,7 @@ class google_service(osv.osv_memory): 'response_type': 'code', 'client_id': ir_config.get_param(cr, SUPERUSER_ID, 'google_%s_client_id' % service), } - uri = 'https://accounts.google.com/o/oauth2/auth?%s' % urllib.urlencode(params) + uri = 'https://accounts.google.com/o/oauth2/auth?%s' % werkzeug.url_encode(params) return uri #If no scope is passed, we use service by default to get a default scope @@ -83,7 +83,7 @@ class google_service(osv.osv_memory): 'access_type':'offline' } - uri = self.get_uri_oauth(a='auth') + "?%s" % urllib.urlencode(params) + uri = self.get_uri_oauth(a='auth') + "?%s" % werkzeug.url_encode(params) return uri def _get_google_token_json(self, cr, uid, authorize_code, service, context=None): @@ -103,7 +103,7 @@ class google_service(osv.osv_memory): headers = {"content-type": "application/x-www-form-urlencoded"} try: - data = urllib.urlencode(params) + data = werkzeug.url_encode(params) req = urllib2.Request(self.get_uri_oauth(a='token'), data, headers) content = urllib2.urlopen(req).read() @@ -128,7 +128,7 @@ class google_service(osv.osv_memory): headers = {"content-type": "application/x-www-form-urlencoded"} try: - data = urllib.urlencode(params) + data = werkzeug.url_encode(params) req = urllib2.Request(self.get_uri_oauth(a='token'), data, headers) content = urllib2.urlopen(req).read() res = simplejson.loads(content) @@ -139,12 +139,12 @@ class google_service(osv.osv_memory): def _do_request(self,cr,uid,uri,params={},headers={},type='POST', context=None): - _logger.debug("Uri: %s - Type : %s - Headers: %s - Params : %s !" % (uri,type,headers,urllib.urlencode(params) if type =='GET' else params)) + _logger.debug("Uri: %s - Type : %s - Headers: %s - Params : %s !" % (uri,type,headers,werkzeug.url_encode(params) if type =='GET' else params)) res = False try: if type.upper() == 'GET' or type.upper() == 'DELETE': - data = urllib.urlencode(params) + data = werkzeug.url_encode(params) req = urllib2.Request(self.get_uri_api() + uri + "?" + data) elif type.upper() == 'POST' or type.upper() == 'PATCH' or type.upper() == 'PUT': req = urllib2.Request(self.get_uri_api() + uri, params, headers) diff --git a/addons/google_drive/google_drive.py b/addons/google_drive/google_drive.py index f3607094040..81e1a49b785 100644 --- a/addons/google_drive/google_drive.py +++ b/addons/google_drive/google_drive.py @@ -23,7 +23,7 @@ from openerp import SUPERUSER_ID from openerp.osv import fields, osv from openerp.tools.translate import _ -import urllib +import werkzeug.urls import urllib2 import json import re @@ -70,7 +70,7 @@ class config(osv.Model): google_drive_client_secret = ir_config.get_param(cr, SUPERUSER_ID, 'google_drive_client_secret') #For Getting New Access Token With help of old Refresh Token - data = urllib.urlencode(dict(client_id=google_drive_client_id, + data = werkzeug.url_encode(dict(client_id=google_drive_client_id, refresh_token=google_drive_refresh_token, client_secret=google_drive_client_secret, grant_type="refresh_token", diff --git a/addons/google_spreadsheet/google_spreadsheet.py b/addons/google_spreadsheet/google_spreadsheet.py index 81ec536b6f2..4c24a46a404 100644 --- a/addons/google_spreadsheet/google_spreadsheet.py +++ b/addons/google_spreadsheet/google_spreadsheet.py @@ -23,7 +23,7 @@ import simplejson import logging from lxml import etree import re -import urllib +import werkzeug.urls import urllib2 from openerp.osv import osv @@ -89,7 +89,7 @@ class config(osv.osv): try: req = urllib2.Request( - 'https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/batch?%s' % (spreadsheet_key, urllib.urlencode({'v': 3, 'access_token': access_token})), + 'https://spreadsheets.google.com/feeds/cells/%s/od6/private/full/batch?%s' % (spreadsheet_key, werkzeug.url_encode({'v': 3, 'access_token': access_token})), data=request, headers={'content-type': 'application/atom+xml', 'If-Match': '*'}) urllib2.urlopen(req) diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py index 85309ea31c9..16df99a5f77 100644 --- a/addons/hw_escpos/controllers/main.py +++ b/addons/hw_escpos/controllers/main.py @@ -21,6 +21,7 @@ except ImportError: try: from .. import escpos from ..escpos import printer + from ..escpos import supported_devices except ImportError: escpos = printer = None @@ -39,21 +40,16 @@ class EscposDriver(Thread): self.queue = Queue() self.status = {'status':'connecting', 'messages':[]} - self.supported_printers = [ - { 'vendor' : 0x04b8, 'product' : 0x0e03, 'name' : 'Epson TM-T20' }, - { 'vendor' : 0x04b8, 'product' : 0x0202, 'name' : 'Epson TM-T70' }, - ] - - def connected_usb_devices(self,devices): + def connected_usb_devices(self): connected = [] - for device in devices: + for device in supported_devices.device_list: if usb.core.find(idVendor=device['vendor'], idProduct=device['product']) != None: connected.append(device) return connected def get_escpos_printer(self): try: - printers = self.connected_usb_devices(self.supported_printers) + printers = self.connected_usb_devices() if len(printers) > 0: self.set_status('connected','Connected to '+printers[0]['name']) return escpos.printer.Usb(printers[0]['vendor'], printers[0]['product']) @@ -267,12 +263,12 @@ hw_proxy.drivers['escpos'] = driver class EscposProxy(hw_proxy.Proxy): - @http.route('/hw_proxy/open_cashbox', type='json', auth='admin') + @http.route('/hw_proxy/open_cashbox', type='json', auth='none') def open_cashbox(self): _logger.info('ESC/POS: OPEN CASHBOX') driver.push_task('cashbox') - @http.route('/hw_proxy/print_receipt', type='json', auth='admin') + @http.route('/hw_proxy/print_receipt', type='json', auth='none') def print_receipt(self, receipt): _logger.info('ESC/POS: PRINT RECEIPT') driver.push_task('receipt',receipt) diff --git a/addons/hw_escpos/escpos/__init__.py b/addons/hw_escpos/escpos/__init__.py index 22a5af61029..3fdeddee28b 100644 --- a/addons/hw_escpos/escpos/__init__.py +++ b/addons/hw_escpos/escpos/__init__.py @@ -1 +1 @@ -__all__ = ["constants","escpos","exceptions","printer"] +__all__ = ["constants","escpos","exceptions","printer","supported_devices"] diff --git a/addons/hw_escpos/escpos/supported_devices.py b/addons/hw_escpos/escpos/supported_devices.py new file mode 100644 index 00000000000..2c6a6be2d07 --- /dev/null +++ b/addons/hw_escpos/escpos/supported_devices.py @@ -0,0 +1,10 @@ +#!/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' }, +] + diff --git a/addons/hw_proxy/controllers/main.py b/addons/hw_proxy/controllers/main.py index 3ea2de4424b..adb59a072b3 100644 --- a/addons/hw_proxy/controllers/main.py +++ b/addons/hw_proxy/controllers/main.py @@ -33,7 +33,7 @@ class Proxy(http.Controller): statuses[driver] = drivers[driver].get_status() return statuses - @http.route('/hw_proxy/hello', type='http', auth='admin') + @http.route('/hw_proxy/hello', type='http', auth='none') def hello(self): return request.make_response('ping', { 'Cache-Control': 'no-cache', @@ -42,11 +42,11 @@ class Proxy(http.Controller): 'Access-Control-Allow-Methods': 'GET', }) - @http.route('/hw_proxy/handshake', type='json', auth='admin') + @http.route('/hw_proxy/handshake', type='json', auth='none') def handshake(self): return True - @http.route('/hw_proxy/status', type='http', auth='admin') + @http.route('/hw_proxy/status', type='http', auth='none') def status_http(self): resp = '\n\n

Hardware Proxy Status

\n' statuses = self.get_status() @@ -75,39 +75,39 @@ class Proxy(http.Controller): 'Access-Control-Allow-Methods': 'GET', }) - @http.route('/hw_proxy/status_json', type='json', auth='admin') + @http.route('/hw_proxy/status_json', type='json', auth='none') def status_json(self): return self.get_status() - @http.route('/hw_proxy/scan_item_success', type='json', auth='admin') + @http.route('/hw_proxy/scan_item_success', type='json', auth='none') def scan_item_success(self, ean): """ A product has been scanned with success """ print 'scan_item_success: ' + str(ean) - @http.route('/hw_proxy/scan_item_error_unrecognized', type='json', auth='admin') + @http.route('/hw_proxy/scan_item_error_unrecognized', type='json', auth='none') def scan_item_error_unrecognized(self, ean): """ A product has been scanned without success """ print 'scan_item_error_unrecognized: ' + str(ean) - @http.route('/hw_proxy/help_needed', type='json', auth='admin') + @http.route('/hw_proxy/help_needed', type='json', auth='none') def help_needed(self): """ The user wants an help (ex: light is on) """ print "help_needed" - @http.route('/hw_proxy/help_canceled', type='json', auth='admin') + @http.route('/hw_proxy/help_canceled', type='json', auth='none') def help_canceled(self): """ The user stops the help request """ print "help_canceled" - @http.route('/hw_proxy/weighting_start', type='json', auth='admin') + @http.route('/hw_proxy/weighting_start', type='json', auth='none') def weighting_start(self): if self.scale == 'closed': print "Opening (Fake) Connection to Scale..." @@ -118,7 +118,7 @@ class Proxy(http.Controller): else: print "WARNING: Scale already Connected !!!" - @http.route('/hw_proxy/weighting_read_kg', type='json', auth='admin') + @http.route('/hw_proxy/weighting_read_kg', type='json', auth='none') def weighting_read_kg(self): if self.scale == 'open': print "Reading Scale..." @@ -130,7 +130,7 @@ class Proxy(http.Controller): print "WARNING: Reading closed scale !!!" return 0.0 - @http.route('/hw_proxy/weighting_end', type='json', auth='admin') + @http.route('/hw_proxy/weighting_end', type='json', auth='none') def weighting_end(self): if self.scale == 'open': print "Closing Connection to Scale ..." @@ -141,7 +141,7 @@ class Proxy(http.Controller): else: print "WARNING: Scale already Closed !!!" - @http.route('/hw_proxy/payment_request', type='json', auth='admin') + @http.route('/hw_proxy/payment_request', type='json', auth='none') def payment_request(self, price): """ The PoS will activate the method payment @@ -149,55 +149,55 @@ class Proxy(http.Controller): print "payment_request: price:"+str(price) return 'ok' - @http.route('/hw_proxy/payment_status', type='json', auth='admin') + @http.route('/hw_proxy/payment_status', type='json', auth='none') def payment_status(self): print "payment_status" return { 'status':'waiting' } - @http.route('/hw_proxy/payment_cancel', type='json', auth='admin') + @http.route('/hw_proxy/payment_cancel', type='json', auth='none') def payment_cancel(self): print "payment_cancel" - @http.route('/hw_proxy/transaction_start', type='json', auth='admin') + @http.route('/hw_proxy/transaction_start', type='json', auth='none') def transaction_start(self): print 'transaction_start' - @http.route('/hw_proxy/transaction_end', type='json', auth='admin') + @http.route('/hw_proxy/transaction_end', type='json', auth='none') def transaction_end(self): print 'transaction_end' - @http.route('/hw_proxy/cashier_mode_activated', type='json', auth='admin') + @http.route('/hw_proxy/cashier_mode_activated', type='json', auth='none') def cashier_mode_activated(self): print 'cashier_mode_activated' - @http.route('/hw_proxy/cashier_mode_deactivated', type='json', auth='admin') + @http.route('/hw_proxy/cashier_mode_deactivated', type='json', auth='none') def cashier_mode_deactivated(self): print 'cashier_mode_deactivated' - @http.route('/hw_proxy/open_cashbox', type='json', auth='admin') + @http.route('/hw_proxy/open_cashbox', type='json', auth='none') def open_cashbox(self): print 'open_cashbox' - @http.route('/hw_proxy/print_receipt', type='json', auth='admin') + @http.route('/hw_proxy/print_receipt', type='json', auth='none') def print_receipt(self, receipt): print 'print_receipt' + str(receipt) - @http.route('/hw_proxy/is_scanner_connected', type='json', auth='admin') + @http.route('/hw_proxy/is_scanner_connected', type='json', auth='none') def print_receipt(self, receipt): print 'is_scanner_connected?' return False - @http.route('/hw_proxy/scanner', type='json', auth='admin') + @http.route('/hw_proxy/scanner', type='json', auth='none') def print_receipt(self, receipt): print 'scanner' time.sleep(10) return '' - @http.route('/hw_proxy/log', type='json', auth='admin') + @http.route('/hw_proxy/log', type='json', auth='none') def log(self, arguments): _logger.info(' '.join(str(v) for v in arguments)) - @http.route('/hw_proxy/print_pdf_invoice', type='json', auth='admin') + @http.route('/hw_proxy/print_pdf_invoice', type='json', auth='none') def print_pdf_invoice(self, pdfinvoice): print 'print_pdf_invoice' + str(pdfinvoice) diff --git a/addons/hw_scanner/controllers/main.py b/addons/hw_scanner/controllers/main.py index 3e487cab404..664606954c3 100644 --- a/addons/hw_scanner/controllers/main.py +++ b/addons/hw_scanner/controllers/main.py @@ -109,8 +109,8 @@ class Scanner(Thread): if not evdev: return None devices = [ device for device in listdir(self.input_dir)] - keyboards = [ device for device in devices if 'kbd' in device ] - scanners = [ device for device in devices if ('barcode' in device.lower()) or ('scanner' in device.lower()) ] + keyboards = [ device for device in devices if ('kbd' in device) and ('keyboard' not in device.lower())] + scanners = [ device for device in devices if ('barcode' in device.lower()) or ('scanner' in device.lower())] if len(scanners) > 0: self.set_status('connected','Connected to '+scanners[0]) return evdev.InputDevice(join(self.input_dir,scanners[0])) @@ -124,7 +124,7 @@ class Scanner(Thread): self.set_status('error',str(e)) return None - @http.route('/hw_proxy/Vis_scanner_connected', type='json', auth='admin') + @http.route('/hw_proxy/Vis_scanner_connected', type='json', auth='none') def is_scanner_connected(self): return self.get_device() != None @@ -144,6 +144,8 @@ class Scanner(Thread): return '' def get_status(self): + if not s.isAlive(): + s.start() return self.status def run(self): @@ -205,7 +207,7 @@ s = Scanner() hw_proxy.drivers['scanner'] = s class ScannerDriver(hw_proxy.Proxy): - @http.route('/hw_proxy/scanner', type='json', auth='admin') + @http.route('/hw_proxy/scanner', type='json', auth='none') def scanner(self): if not s.isAlive(): s.start() diff --git a/addons/im/im.py b/addons/im/im.py index 20b8a966172..af3e8e5b10b 100644 --- a/addons/im/im.py +++ b/addons/im/im.py @@ -185,8 +185,8 @@ class im_message(osv.osv): def post(self, cr, uid, message, to_session_id, technical=False, uuid=None, context=None): assert_uuid(uuid) my_id = self.pool.get('im.user').get_my_id(cr, uid, uuid) - session = self.pool.get('im.session').browse(cr, uid, to_session_id, context) - to_ids = [x.id for x in session.user_ids if x.id != my_id] + session_user_ids = self.pool.get('im.session').get_session_users(cr, uid, to_session_id, context=context).get("user_ids", []) + to_ids = [user_id for user_id in session_user_ids if user_id != my_id] self.create(cr, openerp.SUPERUSER_ID, {"message": message, 'from_id': my_id, 'to_id': [(6, 0, to_ids)], 'session_id': to_session_id, 'technical': technical}, context=context) notify_channel(cr, "im_channel", {'type': 'message', 'receivers': [my_id] + to_ids}) @@ -202,7 +202,7 @@ class im_session(osv.osv): return res _columns = { - 'user_ids': fields.many2many('im.user'), + 'user_ids': fields.many2many('im.user', 'im_session_im_user_rel', 'im_session_id', 'im_user_id', 'Users'), "name": fields.function(_calc_name, string="Name", type='char'), } @@ -225,6 +225,9 @@ class im_session(osv.osv): }, context=context) return self.read(cr, uid, session_id, context=context) + def get_session_users(self, cr, uid, session_id, context=None): + return self.read(cr, openerp.SUPERUSER_ID, session_id, ['user_ids'], context=context) + def add_to_session(self, cr, uid, session_id, user_id, uuid=None, context=None): my_id = self.pool.get("im.user").get_my_id(cr, uid, uuid, context=context) session = self.read(cr, uid, session_id, context=context) @@ -259,7 +262,7 @@ class im_user(osv.osv): return ['&', ('im_last_status', '=', True), ('im_last_status_update', '>', (current - delta).strftime(DEFAULT_SERVER_DATETIME_FORMAT))] else: return ['|', ('im_last_status', '=', False), ('im_last_status_update', '<=', (current - delta).strftime(DEFAULT_SERVER_DATETIME_FORMAT))] - + # TODO: Remove fields arg in trunk. Also in im.js. def search_users(self, cr, uid, text_search, fields, limit, context=None): my_id = self.get_my_id(cr, uid, None, context) group_employee = self.pool['ir.model.data'].get_object_reference(cr, uid, 'base', 'group_user')[1] @@ -271,7 +274,7 @@ class im_user(osv.osv): if len(found) < limit: found += self.search(cr, uid, [["name", "ilike", text_search], ["id", "<>", my_id], ["uuid", "=", False], ["im_status", "=", False], ["id", "not in", found]], order="name asc", limit=limit-len(found), context=context) - users = self.read(cr, uid, found, fields, context=context) + users = self.read(cr,openerp.SUPERUSER_ID, found, ["name", "user_id", "uuid", "im_status"], context=context) users.sort(key=lambda obj: found.index(obj['id'])) return users @@ -319,6 +322,9 @@ class im_user(osv.osv): continue return res + def get_users(self, cr, uid, ids, context=None): + return self.read(cr,openerp.SUPERUSER_ID, ids, ["name", "im_status", "uuid"], context=context) + _columns = { 'name': fields.function(_get_name, type='char', size=200, string="Name", store=True, readonly=True), 'assigned_name': fields.char(string="Assigned Name", size=200, required=False), @@ -341,3 +347,16 @@ class im_user(osv.osv): ('user_uniq', 'unique (user_id)', 'Only one chat user per OpenERP user.'), ('uuid_uniq', 'unique (uuid)', 'Chat identifier already used.'), ] + +class res_users(osv.osv): + _inherit = "res.users" + + def _get_im_user(self, cr, uid, ids, field_name, arg, context=None): + result = dict.fromkeys(ids, False) + for index, im_user in enumerate(self.pool['im.user'].search_read(cr, uid, domain=[('user_id', 'in', ids)], fields=['name', 'user_id'], context=context)): + result[ids[index]] = im_user.get('user_id') and (im_user['user_id'][0], im_user['name']) or False + return result + + _columns = { + 'im_user_id' : fields.function(_get_im_user, type='many2one', string="IM User", relation="im.user"), + } diff --git a/addons/im/security/im_security.xml b/addons/im/security/im_security.xml index d6b854c8a98..6713b88cda6 100644 --- a/addons/im/security/im_security.xml +++ b/addons/im/security/im_security.xml @@ -2,10 +2,10 @@ - Can only read messages that you sent or messages sent to you + Can only read messages from a session where user is - ["|", ('to_id.user_id', 'in', [user.id]), ('from_id.user_id', '=', user.id)] + [('session_id.user_ids', 'in', user.im_user_id.id)] diff --git a/addons/im/security/ir.model.access.csv b/addons/im/security/ir.model.access.csv index 651aa68c1bb..5137990498a 100644 --- a/addons/im/security/ir.model.access.csv +++ b/addons/im/security/ir.model.access.csv @@ -1,4 +1,4 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_im_message,im.message,model_im_message,base.group_user,1,0,1,0 +access_im_message,im.message,model_im_message,,1,0,1,0 access_im_user,im.user,model_im_user,,1,1,1,0 access_im_session,im.session,model_im_session,,1,0,0,0 \ No newline at end of file diff --git a/addons/im/static/src/js/im.js b/addons/im/static/src/js/im.js index aa2e7d963b6..95f29bc5c49 100644 --- a/addons/im/static/src/js/im.js +++ b/addons/im/static/src/js/im.js @@ -92,6 +92,7 @@ search_changed: function(e) { var users = new instance.web.Model("im.user"); var self = this; + // TODO: Remove fields arg in trunk. Also in im.js. return this.user_search_dm.add(users.call("search_users", [this.get("current_search"), ["name", "user_id", "uuid", "im_status"], USERS_LIMIT], {context:new instance.web.CompoundContext()})).then(function(users) { var logged_users = _.filter(users, function(u) { return !!u.im_status; }); diff --git a/addons/im/static/src/js/im_common.js b/addons/im/static/src/js/im_common.js index 83f92265ec6..5a88ddfb581 100644 --- a/addons/im/static/src/js/im_common.js +++ b/addons/im/static/src/js/im_common.js @@ -145,7 +145,7 @@ function declare($, _, openerp) { if (_.size(no_cache) === 0) def = $.when(); else - def = im_common.connection.model("im.user").call("read", [_.values(no_cache), []]).then(function(users) { + def = im_common.connection.model("im.user").call("get_users", [_.values(no_cache)]).then(function(users) { self.add_to_user_cache(users); }); return def.then(function() { @@ -230,7 +230,8 @@ function declare($, _, openerp) { return self.chat_with_users(users); }); }, - activate_session: function(session_id, focus) { + activate_session: function(session_id, focus, message) { + var self = this; var conv = _.find(this.conversations, function(conv) {return conv.session_id == session_id;}); var def = $.when(); if (! conv) { @@ -244,6 +245,9 @@ function declare($, _, openerp) { this.calc_positions(); this.trigger("new_conversation", conv); }, this)); + def = def.then(function(){ + return self.load_history(conv, message); + }); } if (focus) { def = def.then(function() { @@ -252,13 +256,32 @@ function declare($, _, openerp) { } return def.then(function() {return conv}); }, - received_messages: function(messages) { + load_history: function(conv, message){ + var self = this; + var domain = [["session_id", "=", conv.session_id]]; + if (!_.isUndefined(message)){ + domain.push(["date", "<", message.date]); + } + return im_common.connection.model("im.message").call("search_read", [domain, [], 0, 10]).then(function(messages){ + messages.reverse(); + var users = _.unique(_.map(messages, function(message){ + return message.from_id[0]; + })); + return self.ensure_users(users).then(function(){ + return self.received_messages(messages, true); + }); + }); + }, + received_messages: function(messages, seen) { var self = this; var defs = []; var received = false; + if (_.isUndefined(seen)){ + seen = false; + } _.each(messages, function(message) { if (! message.technical) { - defs.push(self.activate_session(message.session_id[0]).then(function(conv) { + defs.push(self.activate_session(message.session_id[0], false, message).then(function(conv) { received = self.my_id !== message.from_id[0]; return conv.received_message(message); })); @@ -269,7 +292,7 @@ function declare($, _, openerp) { } }); return $.when.apply($, defs).then(function(){ - if (! self.get("window_focus") && received) { + if (! self.get("window_focus") && received && !seen) { self.set("waiting_messages", self.get("waiting_messages") + messages.length); self.ting.play(); self.create_ting(); @@ -368,7 +391,7 @@ function declare($, _, openerp) { refresh_users: function() { var self = this; var user_ids; - return im_common.connection.model("im.session").call("read", [self.session_id]).then(function(session) { + return im_common.connection.model("im.session").call("get_session_users", [self.session_id]).then(function(session) { user_ids = _.without(session.user_ids, self.c_manager.me.get("id")); return self.c_manager.ensure_users(user_ids); }).then(function(users) { @@ -449,7 +472,7 @@ function declare($, _, openerp) { date = "" + zpad(date.getHours(), 2) + ":" + zpad(date.getMinutes(), 2); var to_show = _.map(items, im_common.escape_keep_url); this.last_bubble = $(openerp.qweb.render("im_common.conversation_bubble", {"items": to_show, "user": user, "time": date})); - $(this.$(".oe_im_chatview_content").children()[0]).append(this.last_bubble); + $(this.$(".oe_im_chatview_conversation")).append(this.last_bubble); this._go_bottom(); }, _go_bottom: function() { diff --git a/addons/im/static/src/xml/im_common.xml b/addons/im/static/src/xml/im_common.xml index 462e242befd..efaaf602577 100644 --- a/addons/im/static/src/xml/im_common.xml +++ b/addons/im/static/src/xml/im_common.xml @@ -11,7 +11,7 @@ All users are offline. They will receive your messages on their next connection.
-
+
diff --git a/addons/im_livechat/im_livechat.py b/addons/im_livechat/im_livechat.py index ca4a5f3ac20..cfc6bb9ce8e 100644 --- a/addons/im_livechat/im_livechat.py +++ b/addons/im_livechat/im_livechat.py @@ -171,8 +171,8 @@ class im_livechat_channel(osv.osv): return users def get_session(self, cr, uid, channel_id, uuid, context=None): - my_id = self.pool.get("im.user").get_my_id(cr, uid, uuid, context=context) - users = self.get_available_users(cr, uid, channel_id, context=context) + self.pool.get("im.user").get_my_id(cr, uid, uuid, context=context) + users = self.get_available_users(cr, openerp.SUPERUSER_ID, channel_id, context=context) if len(users) == 0: return False user_id = random.choice(users).id diff --git a/addons/im_livechat/im_livechat_view.xml b/addons/im_livechat/im_livechat_view.xml index 22d12292d3e..249021e25e8 100644 --- a/addons/im_livechat/im_livechat_view.xml +++ b/addons/im_livechat/im_livechat_view.xml @@ -125,6 +125,7 @@ im.message list [('session_id.channel_id', '!=', None)] + {'search_default_group_by_session_id': 1, 'search_default_group_by_date': 1, 'search_default_session_id': 1} @@ -141,5 +142,21 @@ + + im.message.search + im.message + + + + + + + + + + + + + diff --git a/addons/im_livechat/security/ir.model.access.csv b/addons/im_livechat/security/ir.model.access.csv index 6e501ee09f4..d73e0931647 100644 --- a/addons/im_livechat/security/ir.model.access.csv +++ b/addons/im_livechat/security/ir.model.access.csv @@ -2,7 +2,5 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_ls_chann1,im_livechat.channel,model_im_livechat_channel,,1,0,0,0 access_ls_chann2,im_livechat.channel,model_im_livechat_channel,group_im_livechat,1,1,1,0 access_ls_chann3,im_livechat.channel,model_im_livechat_channel,group_im_livechat_manager,1,1,1,1 -access_ls_message_portal,im_livechat.im.message.portal,im.model_im_message,base.group_portal,0,0,0,0 access_im_user_portal,im_livechat.im.user.portal,im.model_im_user,base.group_portal,1,0,0,0 -access_ls_message,im_livechat.im.message,im.model_im_message,base.group_public,0,0,0,0 access_im_user,im_livechat.im.user,im.model_im_user,base.group_public,1,0,0,0 \ No newline at end of file diff --git a/addons/im_livechat/static/ext/static/js/livesupport.js b/addons/im_livechat/static/ext/static/js/livesupport.js index b8bad166fa8..844cddc8908 100644 --- a/addons/im_livechat/static/ext/static/js/livesupport.js +++ b/addons/im_livechat/static/ext/static/js/livesupport.js @@ -107,11 +107,14 @@ define(["openerp", "im_common", "underscore", "require", "jquery", } self.manager.activate_session(session_id, true).then(function(conv) { if (self.options.defaultMessage) { - conv.received_message({ - message: self.options.defaultMessage, - date: openerp.datetime_to_str(new Date()), - from_id: [conv.get("users")[0].get("id"), "Unknown"] - }); + setTimeout(function(){ + conv.received_message({ + message: self.options.defaultMessage, + date: openerp.datetime_to_str(new Date()), + from_id: [conv.get("users")[0].get("id"), "Unknown"] + }); + }, + 2500); } }); }); diff --git a/addons/mail/res_users.py b/addons/mail/res_users.py index e335929ec2f..645a77ea707 100644 --- a/addons/mail/res_users.py +++ b/addons/mail/res_users.py @@ -83,7 +83,7 @@ class res_users(osv.Model): def copy_data(self, *args, **kwargs): data = super(res_users, self).copy_data(*args, **kwargs) - if data.get('alias_name'): + if data and data.get('alias_name'): data['alias_name'] = data['login'] return data diff --git a/addons/mail/update.py b/addons/mail/update.py index b5938e36c3b..6969b1479b1 100644 --- a/addons/mail/update.py +++ b/addons/mail/update.py @@ -2,7 +2,7 @@ import datetime import logging import sys -import urllib +import werkzeug.urls import urllib2 import openerp @@ -59,7 +59,7 @@ def get_sys_logs(self, cr, uid): add_arg = {"timeout":30} if sys.version_info >= (2,6) else {} arguments = {'arg0': msg, "action": "update",} - arguments_raw = urllib.urlencode(arguments) + arguments_raw = werkzeug.url_encode(arguments) url = config.get("publisher_warranty_url") diff --git a/addons/mail/wizard/mail_compose_message.py b/addons/mail/wizard/mail_compose_message.py index 833811c07a1..74aea3dfc01 100644 --- a/addons/mail/wizard/mail_compose_message.py +++ b/addons/mail/wizard/mail_compose_message.py @@ -322,9 +322,9 @@ class mail_compose_message(osv.TransientModel): mail_values['email_from'] = email_dict.pop('email_from') # replies redirection: mass mailing only if not wizard.same_thread: - mail_values['reply_to'] = email_dict.pop('reply_to') + mail_values['reply_to'] = email_dict.pop('reply_to', None) else: - email_dict.pop('reply_to') + email_dict.pop('reply_to', None) mail_values.update(email_dict) # mass mailing without post: mail_mail values if mass_mail_mode and not wizard.post: diff --git a/addons/mass_mailing/controllers/main.py b/addons/mass_mailing/controllers/main.py index ac1531d7192..9f5f88327e9 100644 --- a/addons/mass_mailing/controllers/main.py +++ b/addons/mass_mailing/controllers/main.py @@ -1,11 +1,12 @@ -from openerp import http +from openerp import http, SUPERUSER_ID from openerp.http import request class MassMailController(http.Controller): - @http.route('/mail/track//blank.gif', type='http', auth='admin') + @http.route('/mail/track//blank.gif', type='http', auth='none') def track_mail_open(self, mail_id): """ Email tracking. """ + request.disable_db = False mail_mail_stats = request.registry.get('mail.mail.statistics') - mail_mail_stats.set_opened(request.cr, request.uid, mail_mail_ids=[mail_id]) + mail_mail_stats.set_opened(request.cr, SUPERUSER_ID, mail_mail_ids=[mail_id]) return "data:image/gif;base64,R0lGODlhAQABAIAAANvf7wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index 4ef2a6a4f4c..e3271f3f947 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -320,10 +320,9 @@ class mrp_bom(osv.osv): """ routing_obj = self.pool.get('mrp.routing') factor = factor / (bom.product_efficiency or 1.0) - max_rounding = max(bom.product_rounding, bom.product_uom.rounding) - factor = rounding(factor, max_rounding) - if factor < max_rounding: - factor = max_rounding + factor = rounding(factor, bom.product_rounding) + if factor < bom.product_rounding: + factor = bom.product_rounding result = [] result2 = [] phantom = False @@ -772,7 +771,7 @@ class mrp_production(osv.osv): # qty available for consume and produce qty_avail = scheduled.product_qty - consumed_data.get(scheduled.product_id.id, 0.0) - if qty_avail <= 0.0: + if float_compare(qty_avail, 0, precision_rounding=scheduled.product_id.uom_id.rounding) <= 0: # there will be nothing to consume for this raw material continue @@ -784,7 +783,7 @@ class mrp_production(osv.osv): # if qtys we have to consume is more than qtys available to consume prod_name = scheduled.product_id.name_get()[0][1] raise osv.except_osv(_('Warning!'), _('You are going to consume total %s quantities of "%s".\nBut you can only consume up to total %s quantities.') % (qty, prod_name, qty_avail)) - if qty <= 0.0: + if float_compare(qty, 0, precision_rounding=scheduled.product_id.uom_id.rounding) <= 0: # we already have more qtys consumed than we need continue diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 2576235586f..d145bbeb847 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -764,7 +764,7 @@ - + @@ -772,7 +772,7 @@ - + diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml index 4fb6bb18a3f..d886097585f 100644 --- a/addons/mrp_operations/mrp_operations_view.xml +++ b/addons/mrp_operations/mrp_operations_view.xml @@ -51,7 +51,7 @@ - + diff --git a/addons/pad/py_etherpad/__init__.py b/addons/pad/py_etherpad/__init__.py index 0db607fe16f..fce51d36890 100644 --- a/addons/pad/py_etherpad/__init__.py +++ b/addons/pad/py_etherpad/__init__.py @@ -1,7 +1,7 @@ """Module to talk to EtherpadLite API.""" import json -import urllib +import werkzeug.urls import urllib2 @@ -32,7 +32,7 @@ class EtherpadLiteClient: params = arguments or {} params.update({'apikey': self.apiKey}) - data = urllib.urlencode(params, True) + data = werkzeug.url_encode(params, True) try: opener = urllib2.build_opener() diff --git a/addons/payment_adyen/controllers/main.py b/addons/payment_adyen/controllers/main.py index 6c456d9f0cf..ad5a68d2327 100644 --- a/addons/payment_adyen/controllers/main.py +++ b/addons/payment_adyen/controllers/main.py @@ -8,8 +8,8 @@ import logging import pprint import werkzeug -from openerp.addons.web import http -from openerp.addons.web.http import request +from openerp import http, SUPERUSER_ID +from openerp.http import request _logger = logging.getLogger(__name__) @@ -19,12 +19,13 @@ class AdyenController(http.Controller): @http.route([ '/payment/adyen/return/', - ], type='http', auth='admin') + ], type='http', auth='none') def adyen_return(self, pspReference, **post): """ Paypal IPN.""" + request.disable_db = False post["pspReference"] = pspReference _logger.info('Beginning Adyen form_feedback with post data %s', pprint.pformat(post)) # debug - request.registry['payment.transaction'].form_feedback(request.cr, request.uid, post, 'adyen', context=request.context) + request.registry['payment.transaction'].form_feedback(request.cr, SUPERUSER_ID, post, 'adyen', context=request.context) return_url = post.pop('return_url', '') if not return_url: custom = json.loads(post.pop('merchantReturnData', '{}')) diff --git a/addons/payment_ogone/controllers/main.py b/addons/payment_ogone/controllers/main.py index 75194b33059..6ffc0661767 100644 --- a/addons/payment_ogone/controllers/main.py +++ b/addons/payment_ogone/controllers/main.py @@ -3,8 +3,8 @@ import logging import pprint import werkzeug -from openerp.addons.web import http -from openerp.addons.web.http import request +from openerp import http, SUPERUSER_ID +from openerp.http import request _logger = logging.getLogger(__name__) @@ -20,10 +20,11 @@ class OgoneController(http.Controller): '/payment/ogone/decline', '/payment/ogone/test/decline', '/payment/ogone/exception', '/payment/ogone/test/exception', '/payment/ogone/cancel', '/payment/ogone/test/cancel', - ], type='http', auth='admin') + ], type='http', auth='none') def ogone_form_feedback(self, **post): """ Ogone contacts using GET, at least for accept """ + request.disable_db = False _logger.info('Ogone: entering form_feedback with post data %s', pprint.pformat(post)) # debug - cr, uid, context = request.cr, request.uid, request.context + cr, uid, context = request.cr, SUPERUSER_ID, request.context request.registry['payment.transaction'].form_feedback(cr, uid, post, 'ogone', context=context) return werkzeug.utils.redirect(post.pop('return_url', '/')) diff --git a/addons/payment_paypal/controllers/main.py b/addons/payment_paypal/controllers/main.py index e6347f2a51f..ce43314498f 100644 --- a/addons/payment_paypal/controllers/main.py +++ b/addons/payment_paypal/controllers/main.py @@ -6,12 +6,11 @@ except ImportError: import json import logging import pprint -import urllib import urllib2 import werkzeug -from openerp.addons.web import http -from openerp.addons.web.http import request +from openerp import http, SUPERUSER_ID +from openerp.http import request _logger = logging.getLogger(__name__) @@ -41,12 +40,12 @@ class PaypalController(http.Controller): Once data is validated, process it. """ res = False new_post = dict(post, cmd='_notify-validate') - urequest = urllib2.Request("https://www.sandbox.paypal.com/cgi-bin/webscr", urllib.urlencode(new_post)) + urequest = urllib2.Request("https://www.sandbox.paypal.com/cgi-bin/webscr", werkzeug.url_encode(new_post)) uopen = urllib2.urlopen(urequest) resp = uopen.read() if resp == 'VERIFIED': _logger.info('Paypal: validated data') - cr, uid, context = request.cr, request.uid, request.context + cr, uid, context = request.cr, SUPERUSER_ID, request.context res = request.registry['payment.transaction'].form_feedback(cr, uid, post, 'paypal', context=context) elif resp == 'INVALID': _logger.warning('Paypal: answered INVALID on data verification') @@ -54,25 +53,28 @@ class PaypalController(http.Controller): _logger.warning('Paypal: unrecognized paypal answer, received %s instead of VERIFIED or INVALID' % resp.text) return res - @http.route('/payment/paypal/ipn/', type='http', auth='admin', methods=['POST']) + @http.route('/payment/paypal/ipn/', type='http', auth='none', methods=['POST']) def paypal_ipn(self, **post): """ Paypal IPN. """ + request.disable_db = False _logger.info('Beginning Paypal IPN form_feedback with post data %s', pprint.pformat(post)) # debug self.paypal_validate_data(**post) return '' - @http.route('/payment/paypal/dpn', type='http', auth="admin", methods=['POST']) + @http.route('/payment/paypal/dpn', type='http', auth="none", methods=['POST']) def paypal_dpn(self, **post): """ Paypal DPN """ + request.disable_db = False _logger.info('Beginning Paypal DPN form_feedback with post data %s', pprint.pformat(post)) # debug return_url = self._get_return_url(**post) self.paypal_validate_data(**post) return werkzeug.utils.redirect(return_url) - @http.route('/payment/paypal/cancel', type='http', auth="admin") + @http.route('/payment/paypal/cancel', type='http', auth="none") def paypal_cancel(self, **post): """ When the user cancels its Paypal payment: GET on this route """ - cr, uid, context = request.cr, request.uid, request.context + request.disable_db = False + cr, uid, context = request.cr, SUPERUSER_ID, request.context _logger.info('Beginning Paypal cancel with post data %s', pprint.pformat(post)) # debug return_url = self._get_return_url(**post) return werkzeug.utils.redirect(return_url) diff --git a/addons/payment_paypal/models/paypal.py b/addons/payment_paypal/models/paypal.py index 84b3fcfce97..13945bab6e8 100644 --- a/addons/payment_paypal/models/paypal.py +++ b/addons/payment_paypal/models/paypal.py @@ -7,7 +7,7 @@ except ImportError: import json import logging import urlparse -import urllib +import werkzeug.urls import urllib2 from openerp.addons.payment.models.payment_acquirer import ValidationError @@ -134,7 +134,7 @@ class AcquirerPaypal(osv.Model): password manager """ res = dict.fromkeys(ids, False) - parameters = urllib.urlencode({'grant_type': 'client_credentials'}) + parameters = werkzeug.url_encode({'grant_type': 'client_credentials'}) for acquirer in self.browse(cr, uid, ids, context=context): tx_url = self._get_paypal_urls(cr, uid, acquirer.env)['paypal_rest_url'] diff --git a/addons/payment_transfer/controllers/main.py b/addons/payment_transfer/controllers/main.py index 1346fbb3760..9f5152e442a 100644 --- a/addons/payment_transfer/controllers/main.py +++ b/addons/payment_transfer/controllers/main.py @@ -3,8 +3,8 @@ import logging import pprint import werkzeug -from openerp.addons.web import http -from openerp.addons.web.http import request +from openerp import http, SUPERUSER_ID +from openerp.http import request _logger = logging.getLogger(__name__) @@ -14,9 +14,10 @@ class OgoneController(http.Controller): @http.route([ '/payment/transfer/feedback', - ], type='http', auth='admin') + ], type='http', auth='none') def transfer_form_feedback(self, **post): - cr, uid, context = request.cr, request.uid, request.context + request.disable_db = False + cr, uid, context = request.cr, SUPERUSER_ID, request.context _logger.info('Beginning form_feedback with post data %s', pprint.pformat(post)) # debug request.registry['payment.transaction'].form_feedback(cr, uid, post, 'transfer', context) return werkzeug.utils.redirect(post.pop('return_url', '/')) diff --git a/addons/plugin/plugin_handler.py b/addons/plugin/plugin_handler.py index fc6c874fab5..932ea4ccbb6 100644 --- a/addons/plugin/plugin_handler.py +++ b/addons/plugin/plugin_handler.py @@ -93,8 +93,9 @@ class plugin_handler(osv.osv_memory): """ mail_message = self.pool.get('mail.message') model_obj = self.pool[model] - msg = self.pool.get('mail.thread').message_parse(cr, uid, email) - message_id = msg.get('message-id') + mail_thread_obj = self.pool.get('mail.thread') + msg = mail_thread_obj.message_parse(cr, uid, email) + message_id = msg.get('message_id') mail_ids = mail_message.search(cr, uid, [('message_id', '=', message_id), ('res_id', '=', res_id), ('model', '=', model)]) if message_id and mail_ids: mail_record = mail_message.browse(cr, uid, mail_ids)[0] @@ -107,12 +108,22 @@ class plugin_handler(osv.osv_memory): res_id = model_obj.message_process(cr, uid, model, email) notify = _("Mail successfully pushed, a new %s has been created.") % model else: + email_from = msg.get('email_from') + if not email_from: + author_id = False + else: + authors = mail_thread_obj.message_find_partner_from_emails(cr, uid, [res_id], [email_from]) + author_id = authors and authors[0].get('partner_id') or False + model_obj.message_post(cr, uid, [res_id], body=msg.get('body'), subject=msg.get('subject'), type='comment' if model == 'res.partner' else 'email', parent_id=msg.get('parent_id'), - attachments=msg.get('attachments')) + attachments=msg.get('attachments'), + message_id=message_id, + email_from=email_from, + author_id=author_id) notify = _("Mail successfully pushed") url = self._make_url(cr, uid, res_id, model) return (model, res_id, url, notify) @@ -151,7 +162,7 @@ class plugin_handler(osv.osv_memory): ir_attachment_obj = self.pool.get('ir.attachment') attach_ids = [] msg = self.pool.get('mail.thread').message_parse(cr, uid, headers) - message_id = msg.get('message-id') + message_id = msg.get('message_id') push_mail = self.push_message(cr, uid, model, headers, res_id) res_id = push_mail[1] model = push_mail[0] @@ -165,6 +176,6 @@ class plugin_handler(osv.osv_memory): attach_ids.append(ir_attachment_obj.create(cr, uid, vals)) mail_ids = mail_message.search(cr, uid, [('message_id', '=', message_id), ('res_id', '=', res_id), ('model', '=', model)]) if mail_ids: - mail_message.write(cr, uid, mail_ids[0], {'attachment_ids': [(6, 0, attach_ids)], 'body': body, 'body_html': body_html}) + mail_message.write(cr, uid, mail_ids[0], {'attachment_ids': [(6, 0, attach_ids)], 'body': body_html}) url = self._make_url(cr, uid, res_id, model) return (model, res_id, url, notify) diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index 0a15e625b5d..f65cf3b64f3 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -92,6 +92,7 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal }, connect_to_proxy: function(){ var self = this; + var done = new $.Deferred(); this.barcode_reader.disconnect_from_proxy(); this.pos_widget.loading_message(_t('Connecting to the PosBox'),0); this.pos_widget.loading_skip(function(){ @@ -106,7 +107,10 @@ function openerp_pos_models(instance, module){ //module is instance.point_of_sal if(self.config.iface_scan_via_proxy){ self.barcode_reader.connect_to_proxy(); } + }).always(function(){ + done.resolve(); }); + return done; }, // helper function to load data from the server diff --git a/addons/project_long_term/wizard/project_compute_phases.py b/addons/project_long_term/wizard/project_compute_phases.py index 5ac89e2def2..751265d5eba 100644 --- a/addons/project_long_term/wizard/project_compute_phases.py +++ b/addons/project_long_term/wizard/project_compute_phases.py @@ -52,7 +52,8 @@ class project_compute_phases(osv.osv_memory): else: project_ids = project_pool.search(cr, uid, [('user_id','=',uid)], context=context) - project_pool.schedule_phases(cr, uid, project_ids, context=context) + if project_ids: + project_pool.schedule_phases(cr, uid, project_ids, context=context) return self._open_phases_list(cr, uid, data, context=context) def _open_phases_list(self, cr, uid, data, context=None): diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index feb38021aa9..b47320b1e79 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -695,7 +695,7 @@ class purchase_order(osv.osv): continue if order_line.product_id.type in ('product', 'consu'): move = stock_move.create(cr, uid, self._prepare_order_line_move(cr, uid, order, order_line, picking_id, context=context)) - if order_line.move_dest_id: + if order_line.move_dest_id and order_line.move_dest_id.state != 'done': order_line.move_dest_id.write({'location_id': order.location_id.id}) todo_moves.append(move) stock_move.action_confirm(cr, uid, todo_moves) @@ -909,6 +909,15 @@ class purchase_order_line(osv.osv): default.update({'state':'draft', 'move_ids':[],'invoiced':0,'invoice_lines':[]}) return super(purchase_order_line, self).copy_data(cr, uid, id, default, context) + def unlink(self, cr, uid, ids, context=None): + procurement_ids_to_cancel = [] + for line in self.browse(cr, uid, ids, context=context): + if line.move_dest_id: + procurement_ids_to_cancel.extend(procurement.id for procurement in line.move_dest_id.procurements) + if procurement_ids_to_cancel: + self.pool['procurement.order'].action_cancel(cr, uid, procurement_ids_to_cancel) + return super(purchase_order_line, self).unlink(cr, uid, ids, context=context) + def onchange_product_uom(self, cr, uid, ids, pricelist_id, product_id, qty, uom_id, partner_id, date_order=False, fiscal_position_id=False, date_planned=False, name=False, price_unit=False, context=None): diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 75269037236..e40d219ef10 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -208,7 +208,7 @@ - + @@ -387,7 +387,7 @@ - +
@@ -878,6 +862,22 @@