From e2b7cd17fcec0e9f73d460f329ab223bf64525b4 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Tue, 23 Jul 2013 20:43:41 +0200 Subject: [PATCH 01/19] [FIX] hr_timesheet_sheet - search sheet_id for attendance using date in users timezone. As attendances depends on timezone but timesheet have from and to date instead of datetime we have to change the attendance to the same timezone expected for timesheet. And as a Timesheet belongs to a user, we can expect this timesheet to be in the same timezone as its owner. Maybe a timezone field should be added on timesheet. In anycase it make no sense to have all timesheet forced with start and end date as UTC. lp bug: https://launchpad.net/bugs/1204224 fixed bzr revid: yannick.vaucher@camptocamp.com-20130723184341-zowaw71f0mpghgrx --- .../hr_timesheet_sheet/hr_timesheet_sheet.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index 768d85860df..b02bd7edcac 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -22,10 +22,13 @@ import time from datetime import datetime, timedelta from dateutil.relativedelta import relativedelta +from pytz import timezone +import pytz from openerp.osv import fields, osv from openerp.tools.translate import _ from openerp import netsvc +from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT class hr_timesheet_sheet(osv.osv): _name = "hr_timesheet_sheet.sheet" @@ -364,11 +367,20 @@ class hr_attendance(osv.osv): def _sheet(self, cursor, user, ids, name, args, context=None): sheet_obj = self.pool.get('hr_timesheet_sheet.sheet') + utc_tz = pytz.utc res = {}.fromkeys(ids, False) for attendance in self.browse(cursor, user, ids, context=context): - date_to = datetime.strftime(datetime.strptime(attendance.name[0:10], '%Y-%m-%d'), '%Y-%m-%d %H:%M:%S') + + # Simulate timesheet in employee timezone + att_tz = timezone(attendance.employee_id.user_id.partner_id.tz) + + attendance_dt = datetime.strptime(attendance.name, DEFAULT_SERVER_DATETIME_FORMAT) + att_tz_dt = pytz.utc.localize(attendance_dt) + att_tz_dt = att_tz_dt.astimezone(att_tz) + date_from = datetime.strftime(att_tz_dt, DEFAULT_SERVER_DATETIME_FORMAT) + date_to = datetime.strftime(att_tz_dt.date(), DEFAULT_SERVER_DATETIME_FORMAT) sheet_ids = sheet_obj.search(cursor, user, - [('date_to', '>=', date_to), ('date_from', '<=', attendance.name), + [('date_to', '>=', date_to), ('date_from', '<=', date_from), ('employee_id', '=', attendance.employee_id.id)], context=context) if sheet_ids: @@ -488,7 +500,7 @@ class hr_timesheet_sheet_sheet_day(osv.osv): a.name::date as name, s.id as sheet_id, 0.0 as total_timesheet, - SUM(((EXTRACT(hour FROM a.name) * 60) + EXTRACT(minute FROM a.name)) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance + SUM(((EXTRACT(hour FROM a.name AT TIME ZONE 'UTC') * 60) + EXTRACT(minute FROM a.name AT TIME ZONE 'UTC')) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance from hr_attendance a LEFT JOIN hr_timesheet_sheet_sheet s From 372f3d131a05d9a3e78076e28af9941df0aa2eb7 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Mon, 9 Sep 2013 12:36:54 +0200 Subject: [PATCH 02/19] [IMP] hr_timesheet_sheet - remove unused variable bzr revid: yannick.vaucher@camptocamp.com-20130909103654-wwkpyaaoqpwq1mqu --- addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index b02bd7edcac..c10aa4905eb 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -20,7 +20,7 @@ ############################################################################## import time -from datetime import datetime, timedelta +from datetime import datetime from dateutil.relativedelta import relativedelta from pytz import timezone import pytz @@ -367,7 +367,6 @@ class hr_attendance(osv.osv): def _sheet(self, cursor, user, ids, name, args, context=None): sheet_obj = self.pool.get('hr_timesheet_sheet.sheet') - utc_tz = pytz.utc res = {}.fromkeys(ids, False) for attendance in self.browse(cursor, user, ids, context=context): From 0ed7f5ef3bc8a8696ceb96ce0efb75cff736f1b1 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Mon, 9 Sep 2013 12:37:24 +0200 Subject: [PATCH 03/19] [IMP] hr_timesheet_sheet - simplify and improve readability in search for sheet_ids bzr revid: yannick.vaucher@camptocamp.com-20130909103724-4w5tkx2bfms07s91 --- addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index c10aa4905eb..5f51e8e3df1 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -28,7 +28,7 @@ import pytz from openerp.osv import fields, osv from openerp.tools.translate import _ from openerp import netsvc -from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT +from openerp.tools import DEFAULT_SERVER_DATE_FORMAT, DEFAULT_SERVER_DATETIME_FORMAT class hr_timesheet_sheet(osv.osv): _name = "hr_timesheet_sheet.sheet" @@ -376,10 +376,13 @@ class hr_attendance(osv.osv): attendance_dt = datetime.strptime(attendance.name, DEFAULT_SERVER_DATETIME_FORMAT) att_tz_dt = pytz.utc.localize(attendance_dt) att_tz_dt = att_tz_dt.astimezone(att_tz) - date_from = datetime.strftime(att_tz_dt, DEFAULT_SERVER_DATETIME_FORMAT) - date_to = datetime.strftime(att_tz_dt.date(), DEFAULT_SERVER_DATETIME_FORMAT) + # We take only the date omiting the hours as we compare with timesheet + # date_from which is a date format thus using hours would lead to + # be out of scope of timesheet + att_tz_date_str = datetime.strftime(att_tz_dt, DEFAULT_SERVER_DATE_FORMAT) sheet_ids = sheet_obj.search(cursor, user, - [('date_to', '>=', date_to), ('date_from', '<=', date_from), + [('date_from', '<=', att_tz_date_str), + ('date_to', '>=', att_tz_date_str), ('employee_id', '=', attendance.employee_id.id)], context=context) if sheet_ids: From 76a0d0acf61ea042fbf49efaa5e5591e35f46744 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Mon, 9 Sep 2013 12:37:49 +0200 Subject: [PATCH 04/19] [IMP] hr_timesheet_sheet - set default timezone as UTC if employee has none bzr revid: yannick.vaucher@camptocamp.com-20130909103749-sc1ia08hna4o6q8h --- addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index 5f51e8e3df1..76e6a90d292 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -371,7 +371,7 @@ class hr_attendance(osv.osv): for attendance in self.browse(cursor, user, ids, context=context): # Simulate timesheet in employee timezone - att_tz = timezone(attendance.employee_id.user_id.partner_id.tz) + att_tz = timezone(attendance.employee_id.user_id.partner_id.tz or 'utc') attendance_dt = datetime.strptime(attendance.name, DEFAULT_SERVER_DATETIME_FORMAT) att_tz_dt = pytz.utc.localize(attendance_dt) From c59b97b358526563a7ad32a101ec778c35f2a891 Mon Sep 17 00:00:00 2001 From: Yannick Vaucher Date: Mon, 9 Sep 2013 12:38:19 +0200 Subject: [PATCH 05/19] [FIX] hr_timesheet_sheet - remove useless call to AT TIME ZONE in psql request here it isn't current_date but an utc 'timestamp' date. Need a strong tea even if it isn't utc tea time. bzr revid: yannick.vaucher@camptocamp.com-20130909103819-i3143f6zenrf8hi9 --- addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index 76e6a90d292..4f91d79c041 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -502,7 +502,7 @@ class hr_timesheet_sheet_sheet_day(osv.osv): a.name::date as name, s.id as sheet_id, 0.0 as total_timesheet, - SUM(((EXTRACT(hour FROM a.name AT TIME ZONE 'UTC') * 60) + EXTRACT(minute FROM a.name AT TIME ZONE 'UTC')) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance + SUM(((EXTRACT(hour FROM a.name) * 60) + EXTRACT(minute FROM a.name)) * (CASE WHEN a.action = 'sign_in' THEN -1 ELSE 1 END)) as total_attendance from hr_attendance a LEFT JOIN hr_timesheet_sheet_sheet s From d9423585d5a28fe007af01d58a1984a3e69883cb Mon Sep 17 00:00:00 2001 From: "Jamin Shah (OpenERP)" Date: Mon, 14 Apr 2014 10:59:04 +0530 Subject: [PATCH 06/19] [FIX]Fixed the issue of mimetype not detected properly, used python mimetypes module to detect file's mimitype. bzr revid: jas@tinyerp.com-20140414052904-rp4oia2py6b61xg8 --- addons/mail/controllers/main.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/mail/controllers/main.py b/addons/mail/controllers/main.py index 4c6f6e56064..e6b0b7cb3c6 100644 --- a/addons/mail/controllers/main.py +++ b/addons/mail/controllers/main.py @@ -1,6 +1,7 @@ import base64 import openerp.addons.web.http as oeweb from openerp.addons.web.controllers.main import content_disposition +import mimetypes #---------------------------------------------------------- # Controller @@ -15,8 +16,9 @@ class MailController(oeweb.Controller): if res: filecontent = base64.b64decode(res.get('base64')) filename = res.get('filename') + content_type = mimetypes.guess_type(filename) if filecontent and filename: return req.make_response(filecontent, - headers=[('Content-Type', 'application/octet-stream'), + headers=[('Content-Type', content_type[0] or 'application/octet-stream'), ('Content-Disposition', content_disposition(filename, req))]) return req.not_found() From 986e466bf206a1c8b87433bcce5ab0cf89aa7c4e Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Fri, 25 Apr 2014 15:34:21 +0200 Subject: [PATCH 07/19] [FIX] multi_company: set currency of OpenERP US to USD in the demo data bzr revid: dle@openerp.com-20140425133421-czisl2dpm5hletts --- addons/multi_company/multi_company_demo.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/multi_company/multi_company_demo.xml b/addons/multi_company/multi_company_demo.xml index 088aa35e915..bf963146267 100644 --- a/addons/multi_company/multi_company_demo.xml +++ b/addons/multi_company/multi_company_demo.xml @@ -28,7 +28,7 @@ - + OpenERP US @@ -450,7 +450,7 @@ - + From a2536d5e3271160d9d67d49268b0d4f7960588bf Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Sun, 27 Apr 2014 06:18:44 +0000 Subject: [PATCH 08/19] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140427061844-eycgmbqvphlakiz3 --- addons/account_anglo_saxon/i18n/sk.po | 62 +++++++++++ addons/account_report_company/i18n/mk.po | 62 +++++++++++ addons/association/i18n/sk.po | 135 +++++++++++++++++++++++ 3 files changed, 259 insertions(+) create mode 100644 addons/account_anglo_saxon/i18n/sk.po create mode 100644 addons/account_report_company/i18n/mk.po create mode 100644 addons/association/i18n/sk.po diff --git a/addons/account_anglo_saxon/i18n/sk.po b/addons/account_anglo_saxon/i18n/sk.po new file mode 100644 index 00000000000..e3452974d53 --- /dev/null +++ b/addons/account_anglo_saxon/i18n/sk.po @@ -0,0 +1,62 @@ +# Slovak translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-06-07 19:36+0000\n" +"PO-Revision-Date: 2014-04-26 16:04+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Slovak \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-04-27 06:18+0000\n" +"X-Generator: Launchpad (build 16985)\n" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_product_category +msgid "Product Category" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_account_invoice_line +msgid "Invoice Line" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_purchase_order +msgid "Purchase Order" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_product_template +msgid "Product Template" +msgstr "" + +#. module: account_anglo_saxon +#: field:product.category,property_account_creditor_price_difference_categ:0 +#: field:product.template,property_account_creditor_price_difference:0 +msgid "Price Difference Account" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: account_anglo_saxon +#: model:ir.model,name:account_anglo_saxon.model_stock_picking +msgid "Picking List" +msgstr "" + +#. module: account_anglo_saxon +#: help:product.category,property_account_creditor_price_difference_categ:0 +#: help:product.template,property_account_creditor_price_difference:0 +msgid "" +"This account will be used to value price difference between purchase price " +"and cost price." +msgstr "" diff --git a/addons/account_report_company/i18n/mk.po b/addons/account_report_company/i18n/mk.po new file mode 100644 index 00000000000..c738c069832 --- /dev/null +++ b/addons/account_report_company/i18n/mk.po @@ -0,0 +1,62 @@ +# Macedonian translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-06-07 19:36+0000\n" +"PO-Revision-Date: 2014-04-26 12:11+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Macedonian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-04-27 06:18+0000\n" +"X-Generator: Launchpad (build 16985)\n" + +#. module: account_report_company +#: field:res.partner,display_name:0 +msgid "Name" +msgstr "" + +#. module: account_report_company +#: field:account.invoice,commercial_partner_id:0 +#: help:account.invoice.report,commercial_partner_id:0 +msgid "Commercial Entity" +msgstr "" + +#. module: account_report_company +#: field:account.invoice.report,commercial_partner_id:0 +msgid "Partner Company" +msgstr "" + +#. module: account_report_company +#: model:ir.model,name:account_report_company.model_account_invoice +msgid "Invoice" +msgstr "" + +#. module: account_report_company +#: view:account.invoice:0 +#: view:account.invoice.report:0 +#: model:ir.model,name:account_report_company.model_res_partner +msgid "Partner" +msgstr "" + +#. module: account_report_company +#: model:ir.model,name:account_report_company.model_account_invoice_report +msgid "Invoices Statistics" +msgstr "" + +#. module: account_report_company +#: view:res.partner:0 +msgid "True" +msgstr "" + +#. module: account_report_company +#: help:account.invoice,commercial_partner_id:0 +msgid "" +"The commercial entity that will be used on Journal Entries for this invoice" +msgstr "" diff --git a/addons/association/i18n/sk.po b/addons/association/i18n/sk.po new file mode 100644 index 00000000000..dfce4c381b6 --- /dev/null +++ b/addons/association/i18n/sk.po @@ -0,0 +1,135 @@ +# Slovak translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2011-01-11 11:14+0000\n" +"PO-Revision-Date: 2014-04-26 16:22+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Slovak \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-04-27 06:18+0000\n" +"X-Generator: Launchpad (build 16985)\n" + +#. module: association +#: field:profile.association.config.install_modules_wizard,wiki:0 +msgid "Wiki" +msgstr "" + +#. module: association +#: view:profile.association.config.install_modules_wizard:0 +msgid "Event Management" +msgstr "" + +#. module: association +#: field:profile.association.config.install_modules_wizard,project_gtd:0 +msgid "Getting Things Done" +msgstr "" + +#. module: association +#: model:ir.module.module,description:association.module_meta_information +msgid "This module is to create Profile for Associates" +msgstr "" + +#. module: association +#: field:profile.association.config.install_modules_wizard,progress:0 +msgid "Configuration Progress" +msgstr "" + +#. module: association +#: view:profile.association.config.install_modules_wizard:0 +msgid "" +"Here are specific applications related to the Association Profile you " +"selected." +msgstr "" + +#. module: association +#: view:profile.association.config.install_modules_wizard:0 +msgid "title" +msgstr "" + +#. module: association +#: help:profile.association.config.install_modules_wizard,event_project:0 +msgid "Helps you to manage and organize your events." +msgstr "" + +#. module: association +#: field:profile.association.config.install_modules_wizard,config_logo:0 +msgid "Image" +msgstr "" + +#. module: association +#: help:profile.association.config.install_modules_wizard,hr_expense:0 +msgid "" +"Tracks and manages employee expenses, and can automatically re-invoice " +"clients if the expenses are project-related." +msgstr "" + +#. module: association +#: help:profile.association.config.install_modules_wizard,project_gtd:0 +msgid "" +"GTD is a methodology to efficiently organise yourself and your tasks. This " +"module fully integrates GTD principle with OpenERP's project management." +msgstr "" + +#. module: association +#: view:profile.association.config.install_modules_wizard:0 +msgid "Resources Management" +msgstr "" + +#. module: association +#: model:ir.module.module,shortdesc:association.module_meta_information +msgid "Association profile" +msgstr "" + +#. module: association +#: field:profile.association.config.install_modules_wizard,hr_expense:0 +msgid "Expenses Tracking" +msgstr "" + +#. module: association +#: model:ir.actions.act_window,name:association.action_config_install_module +#: view:profile.association.config.install_modules_wizard:0 +msgid "Association Application Configuration" +msgstr "" + +#. module: association +#: help:profile.association.config.install_modules_wizard,wiki:0 +msgid "" +"Lets you create wiki pages and page groups in order to keep track of " +"business knowledge and share it with and between your employees." +msgstr "" + +#. module: association +#: help:profile.association.config.install_modules_wizard,project:0 +msgid "" +"Helps you manage your projects and tasks by tracking them, generating " +"plannings, etc..." +msgstr "" + +#. module: association +#: model:ir.model,name:association.model_profile_association_config_install_modules_wizard +msgid "profile.association.config.install_modules_wizard" +msgstr "" + +#. module: association +#: field:profile.association.config.install_modules_wizard,event_project:0 +msgid "Events" +msgstr "" + +#. module: association +#: view:profile.association.config.install_modules_wizard:0 +#: field:profile.association.config.install_modules_wizard,project:0 +msgid "Project Management" +msgstr "" + +#. module: association +#: view:profile.association.config.install_modules_wizard:0 +msgid "Configure" +msgstr "" From 93ba7cc5755b9fc27f0edc9dc6c6bada140c6409 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Mon, 28 Apr 2014 13:00:42 +0200 Subject: [PATCH 09/19] [FIX] base: ir.model.fields, write, use tools.ustr instead of str so it handle if the string is already unicode Writing special chars in the field label resulted in a traceback (write only, no problem with creation) bzr revid: dle@openerp.com-20140428110042-qeaswuwsquy1612h --- openerp/addons/base/ir/ir_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/ir/ir_model.py b/openerp/addons/base/ir/ir_model.py index ec89fe8bc70..d71622727c5 100644 --- a/openerp/addons/base/ir/ir_model.py +++ b/openerp/addons/base/ir/ir_model.py @@ -385,7 +385,7 @@ class ir_model_fields(osv.osv): # static table of properties model_props = [ # (our-name, fields.prop, set_fn) - ('field_description', 'string', str), + ('field_description', 'string', tools.ustr), ('required', 'required', bool), ('readonly', 'readonly', bool), ('domain', '_domain', eval), From 4836354a164306e9fb9f02e1dcc07bba24ba3def Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 28 Apr 2014 17:11:33 +0200 Subject: [PATCH 10/19] [FIX] safe_eval: allow STORE_FAST and DELETE_FAST opcodes, used e.g. for comprehension expressions bzr revid: odo@openerp.com-20140428151133-uz7mphscch35dl6o --- openerp/tools/safe_eval.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openerp/tools/safe_eval.py b/openerp/tools/safe_eval.py index aa6abccd549..76987e278e6 100644 --- a/openerp/tools/safe_eval.py +++ b/openerp/tools/safe_eval.py @@ -66,7 +66,8 @@ _SAFE_OPCODES = _EXPR_OPCODES.union(set(opmap[x] for x in [ 'MAKE_FUNCTION', 'SLICE+0', 'SLICE+1', 'SLICE+2', 'SLICE+3', # New in Python 2.7 - http://bugs.python.org/issue4715 : 'JUMP_IF_FALSE_OR_POP', 'JUMP_IF_TRUE_OR_POP', 'POP_JUMP_IF_FALSE', - 'POP_JUMP_IF_TRUE', 'SETUP_EXCEPT', 'END_FINALLY', 'LOAD_FAST', + 'POP_JUMP_IF_TRUE', 'SETUP_EXCEPT', 'END_FINALLY', + 'LOAD_FAST', 'STORE_FAST', 'DELETE_FAST', 'LOAD_GLOBAL', # Only allows access to restricted globals ] if x in opmap)) From fdfcb6bf4792a45f642cf5b95b4b3d43678b1440 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 29 Apr 2014 06:41:21 +0000 Subject: [PATCH 11/19] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140429064121-xnusb4mb3r8vgtzh --- addons/account/i18n/zh_TW.po | 10 +++++----- addons/delivery/i18n/de.po | 30 ++++++++++++++-------------- addons/hr_holidays/i18n/de.po | 11 +++++----- addons/hr_timesheet_sheet/i18n/de.po | 20 +++++++++---------- 4 files changed, 35 insertions(+), 36 deletions(-) diff --git a/addons/account/i18n/zh_TW.po b/addons/account/i18n/zh_TW.po index 15f8f290ed4..ffe735e0196 100644 --- a/addons/account/i18n/zh_TW.po +++ b/addons/account/i18n/zh_TW.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-14 22:29+0000\n" -"PO-Revision-Date: 2013-12-29 15:15+0000\n" +"PO-Revision-Date: 2014-04-28 06:10+0000\n" "Last-Translator: Andy Cheng \n" "Language-Team: Chinese (Traditional) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-12-30 05:06+0000\n" -"X-Generator: Launchpad (build 16877)\n" +"X-Launchpad-Export-Date: 2014-04-29 06:41+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: account #: model:process.transition,name:account.process_transition_supplierreconcilepaid0 @@ -167,7 +167,7 @@ msgid "" "You have to set the 'End of Year Entries Journal' for this Fiscal Year " "which is set after generating opening entries from 'Generate Opening " "Entries'." -msgstr "" +msgstr "以「產生起始分錄」產生年度起始分錄後，您必須為此會計年度設定「年終分錄日記帳簿」。" #. module: account #: field:account.fiscal.position.account,account_src_id:0 @@ -706,7 +706,7 @@ msgstr "SAJ" #: code:addons/account/account.py:1591 #, python-format msgid "Cannot create move with currency different from .." -msgstr "" +msgstr "無法產生調動幣別不同於..." #. module: account #: model:email.template,report_name:account.email_template_edi_invoice diff --git a/addons/delivery/i18n/de.po b/addons/delivery/i18n/de.po index 794bfd02542..4b1a676cdd7 100644 --- a/addons/delivery/i18n/de.po +++ b/addons/delivery/i18n/de.po @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2014-02-02 18:32+0000\n" -"Last-Translator: Ralf Hilgenstock \n" +"PO-Revision-Date: 2014-04-28 17:20+0000\n" +"Last-Translator: Rudolf Schnapka \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2014-02-03 05:55+0000\n" -"X-Generator: Launchpad (build 16916)\n" +"X-Launchpad-Export-Date: 2014-04-29 06:41+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: delivery #: report:sale.shipping:0 @@ -104,7 +104,7 @@ msgstr "Abzurechnende Lieferungen" #. module: delivery #: field:delivery.carrier,pricelist_ids:0 msgid "Advanced Pricing" -msgstr "Vorauskasse" +msgstr "Detaillierte Preisfindung" #. module: delivery #: help:delivery.grid,sequence:0 @@ -167,7 +167,7 @@ msgstr "Betrag" #. module: delivery #: view:sale.order:0 msgid "Add in Quote" -msgstr "Um Angebot erweitern" +msgstr "Dem Angebot hinzufügen" #. module: delivery #: selection:delivery.grid.line,price_type:0 @@ -220,12 +220,12 @@ msgstr "Definition Auslieferungstarif" #: code:addons/delivery/stock.py:90 #, python-format msgid "Warning!" -msgstr "Warnung !" +msgstr "Warnung!" #. module: delivery #: field:delivery.grid.line,operator:0 msgid "Operator" -msgstr "Operator" +msgstr "Ausführender" #. module: delivery #: model:ir.model,name:delivery.model_res_partner @@ -313,7 +313,7 @@ msgstr "Durch Deaktivierung können Sie die Liefertarife ausblenden" #. module: delivery #: field:delivery.grid,zip_to:0 msgid "To Zip" -msgstr "An PLZ" +msgstr "Bis PLZ" #. module: delivery #: code:addons/delivery/delivery.py:147 @@ -334,7 +334,7 @@ msgstr "Auftragsdatum" #. module: delivery #: field:delivery.grid,name:0 msgid "Grid Name" -msgstr "Tarif" +msgstr "Tarifbezeichnung" #. module: delivery #: field:stock.picking,number_of_packages:0 @@ -376,7 +376,7 @@ msgstr "" #: code:addons/delivery/sale.py:54 #, python-format msgid "No grid available !" -msgstr "Kein Tarif definiert!" +msgstr "Kein Tarifmodell definiert!" #. module: delivery #: selection:delivery.grid.line,operator:0 @@ -403,7 +403,7 @@ msgstr "Aktiv" #. module: delivery #: report:sale.shipping:0 msgid "Shipping Date" -msgstr "Lieferdatum" +msgstr "Versanddatum" #. module: delivery #: field:delivery.carrier,product_id:0 @@ -502,7 +502,7 @@ msgstr "Frei wenn mehr als %.2f" #. module: delivery #: model:ir.model,name:delivery.model_stock_picking_in msgid "Incoming Shipments" -msgstr "Wareneingang" +msgstr "Anlieferung" #. module: delivery #: selection:delivery.grid.line,operator:0 @@ -525,7 +525,7 @@ msgid "" "If the active field is set to False, it will allow you to hide the delivery " "carrier without removing it." msgstr "" -"Durch Aktivierung dieses Feldes, können Sie diesen Frachtführer ausblenden." +"Durch Deaktivierung dieses Feldes, können Sie diesen Frachtführer ausblenden." #. module: delivery #: model:ir.actions.act_window,name:delivery.action_delivery_grid_form @@ -544,7 +544,7 @@ msgstr "Preis" #: code:addons/delivery/sale.py:54 #, python-format msgid "No grid matching for this carrier !" -msgstr "Kein Tarif für diesen Frachtführer definiert!" +msgstr "Kein Tarifmodell für diesen Frachtführer definiert!" #. module: delivery #: model:ir.ui.menu,name:delivery.menu_delivery diff --git a/addons/hr_holidays/i18n/de.po b/addons/hr_holidays/i18n/de.po index f413abea3af..b25de8707ab 100644 --- a/addons/hr_holidays/i18n/de.po +++ b/addons/hr_holidays/i18n/de.po @@ -8,15 +8,14 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-01-06 21:01+0000\n" -"Last-Translator: Thorsten Vocks (OpenBig.org) \n" +"PO-Revision-Date: 2014-04-28 07:26+0000\n" +"Last-Translator: Fabien (Open ERP) \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:12+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-29 06:41+0000\n" +"X-Generator: Launchpad (build 16985)\n" #. module: hr_holidays #: selection:hr.holidays.status,color_name:0 @@ -360,7 +359,7 @@ msgstr "Gesamte Urlaube je Typ" #: field:hr.holidays.remaining.leaves.user,name:0 #: model:ir.model,name:hr_holidays.model_hr_employee msgid "Employee" -msgstr "Mitabeiter" +msgstr "Mitarbeiter" #. module: hr_holidays #: selection:hr.employee,current_leave_state:0 diff --git a/addons/hr_timesheet_sheet/i18n/de.po b/addons/hr_timesheet_sheet/i18n/de.po index b09a150a544..218f9a08e34 100644 --- a/addons/hr_timesheet_sheet/i18n/de.po +++ b/addons/hr_timesheet_sheet/i18n/de.po @@ -8,14 +8,21 @@ msgstr "" "Project-Id-Version: openobject-addons\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2013-06-07 19:36+0000\n" -"PO-Revision-Date: 2013-01-28 17:43+0000\n" +"PO-Revision-Date: 2014-04-28 07:41+0000\n" "Last-Translator: Felix Schubert \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-11-21 06:14+0000\n" -"X-Generator: Launchpad (build 16831)\n" +"X-Launchpad-Export-Date: 2014-04-29 06:41+0000\n" +"X-Generator: Launchpad (build 16985)\n" + +#. module: hr_timesheet_sheet +#. openerp-web +#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:39 +#, python-format +msgid "Add a Line" +msgstr "Eintrag hinzufügen" #. module: hr_timesheet_sheet #: field:hr.analytic.timesheet,sheet_id:0 @@ -1047,13 +1054,6 @@ msgstr "Schreibt erfasste Aufgabe in die Zeiterfassung" msgid "Total Attendances" msgstr "Gesamt Anwesenheitszeit" -#. module: hr_timesheet_sheet -#. openerp-web -#: code:addons/hr_timesheet_sheet/static/src/xml/timesheet.xml:39 -#, python-format -msgid "Add a Line" -msgstr "EIntrag hinzufügen" - #. module: hr_timesheet_sheet #: field:hr_timesheet_sheet.sheet,total_difference:0 #: field:hr_timesheet_sheet.sheet.day,total_difference:0 From f3b5913842d689f402f150b53cf1394fb16d7132 Mon Sep 17 00:00:00 2001 From: "Richard Mathot (OpenERP)" Date: Tue, 29 Apr 2014 09:11:25 +0200 Subject: [PATCH 12/19] [IMP] res_group: more explicit constraint error message bzr revid: rim@openerp.com-20140429071125-avjggwlmlozv7hz5 --- openerp/addons/base/res/res_users.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py index 69aa273c07e..a018ee6e17d 100644 --- a/openerp/addons/base/res/res_users.py +++ b/openerp/addons/base/res/res_users.py @@ -94,7 +94,7 @@ class groups(osv.osv): } _sql_constraints = [ - ('name_uniq', 'unique (category_id, name)', 'The name of the group must be unique !') + ('name_uniq', 'unique (category_id, name)', 'The name of the group must be unique within an application!') ] def search(self, cr, uid, args, offset=0, limit=None, order=None, context=None, count=False): From 25f88efb98b79c0dd4bcc613550da8711f49bd59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ana=C3=ABl=20Closson=20=28openerp=29?= <> Date: Tue, 29 Apr 2014 18:31:08 +1000 Subject: [PATCH 13/19] [FIX] stock: destination location should not be limited to internal as this wizard is also used for incoming and outgoing pickings (opw 606213) bzr revid: mat@openerp.com-20140429083108-njr9ixk1faj8hv3r --- addons/stock/stock_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 3baee26c883..fcf7bad01cb 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -776,7 +776,7 @@ - + @@ -910,7 +910,7 @@ - +
@@ -1037,7 +1037,7 @@ - +
@@ -1324,7 +1324,7 @@ - + From 9cf14197ac575cbbca08687bc2815edd364e19f3 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Tue, 29 Apr 2014 14:42:56 +0200 Subject: [PATCH 14/19] [FIX] stock: recompute the qty_available based on the location instead of using the one in the result of the browse (opw 606423) The qty_available field is a function field that uses the information of the context (eg: location) to compute the value. Using the global browse record would return the same qty_available value for each location (and then produce way too many account.move) bzr revid: mat@openerp.com-20140429124256-ljph37kijosg5dqb --- addons/stock/product.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/stock/product.py b/addons/stock/product.py index 06f9c36332e..5db1e1b3164 100644 --- a/addons/stock/product.py +++ b/addons/stock/product.py @@ -105,7 +105,9 @@ class product_product(osv.osv): 'compute_child': False }) - qty = product.qty_available + # qty_available depends of the location in the context + qty = self.read(cr, uid, [product.id], ['qty_available'], context=c)[0]['qty_available'] + diff = product.standard_price - new_price if not diff: raise osv.except_osv(_('Error!'), _("No difference between standard price and new price!")) if qty: From 2d32d9e89c055008da2ecedbd9211de9e8958355 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Wed, 30 Apr 2014 07:01:50 +0000 Subject: [PATCH 15/19] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20140430070150-8jkf4uv0z6lbfjik --- addons/note/i18n/ar.po | 284 +++++++++++++++++++++ addons/product_visible_discount/i18n/am.po | 62 +++++ 2 files changed, 346 insertions(+) create mode 100644 addons/note/i18n/ar.po create mode 100644 addons/product_visible_discount/i18n/am.po diff --git a/addons/note/i18n/ar.po b/addons/note/i18n/ar.po new file mode 100644 index 00000000000..9adc4658db5 --- /dev/null +++ b/addons/note/i18n/ar.po @@ -0,0 +1,284 @@ +# Arabic translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-06-07 19:36+0000\n" +"PO-Revision-Date: 2014-04-29 13:45+0000\n" +"Last-Translator: Mohamed M. Hagag \n" +"Language-Team: Arabic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-04-30 07:01+0000\n" +"X-Generator: Launchpad (build 16985)\n" + +#. module: note +#: field:note.note,memo:0 +msgid "Note Content" +msgstr "محتوى الملاحظة" + +#. module: note +#: view:note.stage:0 +msgid "Stages of Notes" +msgstr "مراحل الملاحظات" + +#. module: note +#: model:note.stage,name:note.demo_note_stage_04 +#: model:note.stage,name:note.note_stage_02 +msgid "This Week" +msgstr "هذا الأسبوع" + +#. module: note +#: model:ir.model,name:note.model_base_config_settings +msgid "base.config.settings" +msgstr "" + +#. module: note +#: model:ir.model,name:note.model_note_tag +msgid "Note Tag" +msgstr "تاج الملاحظة" + +#. module: note +#: model:res.groups,name:note.group_note_fancy +msgid "Notes / Fancy mode" +msgstr "" + +#. module: note +#: model:ir.model,name:note.model_note_note +#: view:note.note:0 +msgid "Note" +msgstr "ملاحظة" + +#. module: note +#: view:note.note:0 +msgid "Group By..." +msgstr "تجميع حسب..." + +#. module: note +#: field:note.note,message_follower_ids:0 +msgid "Followers" +msgstr "المتابعون" + +#. module: note +#: model:note.stage,name:note.note_stage_00 +msgid "New" +msgstr "جديد" + +#. module: note +#: model:ir.actions.act_window,help:note.action_note_note +msgid "" +"

\n" +" Click to add a personal note.\n" +"

\n" +" Use notes to organize personal tasks or notes. All\n" +" notes are private; no one else will be able to see them. " +"However\n" +" you can share some notes with other people by inviting " +"followers\n" +" on the note. (Useful for meeting minutes, especially if\n" +" you activate the pad feature for collaborative writings).\n" +"

\n" +" You can customize how you process your notes/tasks by adding,\n" +" removing or modifying columns.\n" +"

\n" +" " +msgstr "" + +#. module: note +#: model:note.stage,name:note.demo_note_stage_01 +#: model:note.stage,name:note.note_stage_01 +msgid "Today" +msgstr "اليوم" + +#. module: note +#: model:ir.model,name:note.model_res_users +msgid "Users" +msgstr "المستخدمون" + +#. module: note +#: view:note.note:0 +msgid "í" +msgstr "í" + +#. module: note +#: view:note.stage:0 +msgid "Stage of Notes" +msgstr "مراحل الملاحظات" + +#. module: note +#: field:note.note,message_unread:0 +msgid "Unread Messages" +msgstr "رسائل غير مقروءة" + +#. module: note +#: view:note.note:0 +msgid "By sticky note Category" +msgstr "بالتصنيف" + +#. module: note +#: help:note.note,message_unread:0 +msgid "If checked new messages require your attention." +msgstr "عند التفعيل، يجب الانتباه الى الرسائل الجديدة" + +#. module: note +#: field:note.stage,name:0 +msgid "Stage Name" +msgstr "اسم المرحلة" + +#. module: note +#: field:note.note,message_is_follower:0 +msgid "Is a Follower" +msgstr "متابع ؟" + +#. module: note +#: model:note.stage,name:note.demo_note_stage_02 +msgid "Tomorrow" +msgstr "غدًا" + +#. module: note +#: view:note.note:0 +#: field:note.note,open:0 +msgid "Active" +msgstr "‎نشط‎" + +#. module: note +#: help:note.stage,user_id:0 +msgid "Owner of the note stage." +msgstr "" + +#. module: note +#: model:ir.ui.menu,name:note.menu_notes_stage +msgid "Categories" +msgstr "التصنيفات" + +#. module: note +#: view:note.note:0 +#: field:note.note,stage_id:0 +msgid "Stage" +msgstr "مرحلة" + +#. module: note +#: field:note.tag,name:0 +msgid "Tag Name" +msgstr "إسم التاج" + +#. module: note +#: field:note.note,message_ids:0 +msgid "Messages" +msgstr "رسائل" + +#. module: note +#: view:base.config.settings:0 +#: model:ir.actions.act_window,name:note.action_note_note +#: model:ir.ui.menu,name:note.menu_note_notes +#: view:note.note:0 +#: model:note.stage,name:note.note_stage_04 +msgid "Notes" +msgstr "ملاحظات" + +#. module: note +#: model:note.stage,name:note.demo_note_stage_03 +#: model:note.stage,name:note.note_stage_03 +msgid "Later" +msgstr "لاحقاً" + +#. module: note +#: model:ir.model,name:note.model_note_stage +msgid "Note Stage" +msgstr "" + +#. module: note +#: field:note.note,message_summary:0 +msgid "Summary" +msgstr "" + +#. module: note +#: field:note.note,stage_ids:0 +msgid "Stages of Users" +msgstr "" + +#. module: note +#: field:note.note,name:0 +msgid "Note Summary" +msgstr "" + +#. module: note +#: model:ir.actions.act_window,name:note.action_note_stage +#: view:note.note:0 +msgid "Stages" +msgstr "" + +#. module: note +#: help:note.note,message_ids:0 +msgid "Messages and communication history" +msgstr "" + +#. module: note +#: view:note.note:0 +msgid "Delete" +msgstr "" + +#. module: note +#: field:note.note,color:0 +msgid "Color Index" +msgstr "" + +#. module: note +#: field:note.note,sequence:0 +#: field:note.stage,sequence:0 +msgid "Sequence" +msgstr "" + +#. module: note +#: view:note.note:0 +#: field:note.note,tag_ids:0 +msgid "Tags" +msgstr "" + +#. module: note +#: view:note.note:0 +msgid "Archive" +msgstr "" + +#. module: note +#: field:base.config.settings,module_note_pad:0 +msgid "Use collaborative pads (etherpad)" +msgstr "" + +#. module: note +#: help:note.note,message_summary:0 +msgid "" +"Holds the Chatter summary (number of messages, ...). This summary is " +"directly in html format in order to be inserted in kanban views." +msgstr "" + +#. module: note +#: field:base.config.settings,group_note_fancy:0 +msgid "Use fancy layouts for notes" +msgstr "" + +#. module: note +#: field:note.note,current_partner_id:0 +#: field:note.stage,user_id:0 +msgid "Owner" +msgstr "" + +#. module: note +#: help:note.stage,sequence:0 +msgid "Used to order the note stages" +msgstr "" + +#. module: note +#: field:note.note,date_done:0 +msgid "Date done" +msgstr "" + +#. module: note +#: field:note.stage,fold:0 +msgid "Folded by Default" +msgstr "" diff --git a/addons/product_visible_discount/i18n/am.po b/addons/product_visible_discount/i18n/am.po new file mode 100644 index 00000000000..fa60f5dc66e --- /dev/null +++ b/addons/product_visible_discount/i18n/am.po @@ -0,0 +1,62 @@ +# Amharic translation for openobject-addons +# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014 +# This file is distributed under the same license as the openobject-addons package. +# FIRST AUTHOR , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: openobject-addons\n" +"Report-Msgid-Bugs-To: FULL NAME \n" +"POT-Creation-Date: 2013-06-07 19:37+0000\n" +"PO-Revision-Date: 2014-04-29 08:23+0000\n" +"Last-Translator: FULL NAME \n" +"Language-Team: Amharic \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2014-04-30 07:01+0000\n" +"X-Generator: Launchpad (build 16985)\n" + +#. module: product_visible_discount +#: code:addons/product_visible_discount/product_visible_discount.py:149 +#, python-format +msgid "No Sale Pricelist Found!" +msgstr "" + +#. module: product_visible_discount +#: field:product.pricelist,visible_discount:0 +msgid "Visible Discount" +msgstr "" + +#. module: product_visible_discount +#: code:addons/product_visible_discount/product_visible_discount.py:141 +#, python-format +msgid "No Purchase Pricelist Found!" +msgstr "" + +#. module: product_visible_discount +#: model:ir.model,name:product_visible_discount.model_account_invoice_line +msgid "Invoice Line" +msgstr "" + +#. module: product_visible_discount +#: model:ir.model,name:product_visible_discount.model_product_pricelist +msgid "Pricelist" +msgstr "" + +#. module: product_visible_discount +#: code:addons/product_visible_discount/product_visible_discount.py:141 +#, python-format +msgid "You must first define a pricelist on the supplier form!" +msgstr "" + +#. module: product_visible_discount +#: model:ir.model,name:product_visible_discount.model_sale_order_line +msgid "Sales Order Line" +msgstr "" + +#. module: product_visible_discount +#: code:addons/product_visible_discount/product_visible_discount.py:149 +#, python-format +msgid "You must first define a pricelist on the customer form!" +msgstr "" From c43fdfe32b52e2c770cb2f74c367361562cf04ec Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 30 Apr 2014 12:25:52 +0200 Subject: [PATCH 16/19] [FIX] mail: avoid catching (transient) MemoryErrors when sending outgoing mail This would permanently mark the mail as failed while there is a good chance it will be sent properly next time it is retried (provided the memory situation improves or the server/worker has restarted). bzr revid: odo@openerp.com-20140430102552-qkwv20b20nve64th --- addons/mail/mail_mail.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py index d49c84bbd6d..b558f4729be 100644 --- a/addons/mail/mail_mail.py +++ b/addons/mail/mail_mail.py @@ -319,6 +319,10 @@ class mail_mail(osv.Model): # see revid:odo@openerp.com-20120622152536-42b2s28lvdv3odyr in 6.1 if mail_sent: self._postprocess_sent_message(cr, uid, mail, context=context) + except MemoryError: + # prevent catching transient MemoryErrors, bubble up to notify user or abort cron job + # instead of marking the mail as failed + raise except Exception: _logger.exception('failed sending mail.mail %s', mail.id) mail.write({'state': 'exception'}) From 8d496399336b4a97200f6f7b5907ed1c7b99970c Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 30 Apr 2014 14:37:27 +0200 Subject: [PATCH 17/19] [FIX] web: reset active_model, id, ids on executing button of type object bzr revid: dle@openerp.com-20140430123727-cnz6k8is2sqe65w0 --- addons/web/static/src/js/views.js | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index e3e91752f4d..87016635a8f 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -1443,6 +1443,7 @@ instance.web.View = instance.web.Widget.extend({ console.error("Could not JSON.parse arguments", action_data.args); } } + context.add({'active_model': dataset.model, 'active_ids': [record_id], 'active_id': record_id}) args.push(context); return dataset.call_button(action_data.name, args).then(handler).then(function () { if (instance.webclient) { From d59cb1eda2ddf1bd8fc00a109457478c0aca3385 Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Wed, 30 Apr 2014 15:17:39 +0200 Subject: [PATCH 18/19] [FIX] web: missing ; from previous revision bzr revid: dle@openerp.com-20140430131739-ywyqb1gh68xbxid1 --- addons/web/static/src/js/views.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 87016635a8f..85b2df564a8 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -1443,7 +1443,7 @@ instance.web.View = instance.web.Widget.extend({ console.error("Could not JSON.parse arguments", action_data.args); } } - context.add({'active_model': dataset.model, 'active_ids': [record_id], 'active_id': record_id}) + context.add({'active_model': dataset.model, 'active_ids': [record_id], 'active_id': record_id}); args.push(context); return dataset.call_button(action_data.name, args).then(handler).then(function () { if (instance.webclient) { From b88755c4317ac61fc8d0533162d4ed19082f3fab Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 1 May 2014 14:16:33 +0200 Subject: [PATCH 19/19] [REVERT] 2 previous revision, as it looks like that the fix causes more troubles than it resolve a problem bzr revid: dle@openerp.com-20140501121633-6umc2sxwi0h0lhay --- addons/web/static/src/js/views.js | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 85b2df564a8..e3e91752f4d 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -1443,7 +1443,6 @@ instance.web.View = instance.web.Widget.extend({ console.error("Could not JSON.parse arguments", action_data.args); } } - context.add({'active_model': dataset.model, 'active_ids': [record_id], 'active_id': record_id}); args.push(context); return dataset.call_button(action_data.name, args).then(handler).then(function () { if (instance.webclient) {