From f9c2437959fba731b808208e184d86f51f2db600 Mon Sep 17 00:00:00 2001 From: "Amit (OpenERP)" Date: Fri, 18 May 2012 16:05:41 +0530 Subject: [PATCH 01/24] [FIX] account : Add access rules for entry analysis report lp bug: https://launchpad.net/bugs/999506 fixed bzr revid: amp@tinyerp.com-20120518103541-vfp9bh4p9dqwbr18 --- addons/account/security/account_security.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index e1a29a6edfb..997918650a5 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -107,6 +107,13 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + Entries Analysis multi-company + + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] + + Account fiscal Mapping company rule From 0195eb407d8f71b7adc878f9bc39d14de8bde38b Mon Sep 17 00:00:00 2001 From: "Amit (OpenERP)" Date: Wed, 22 Aug 2012 11:55:55 +0530 Subject: [PATCH 02/24] [FIX] mail_template : Fixes the duplication problem on email template lp bug: https://launchpad.net/bugs/1039645 fixed bzr revid: amp@tinyerp.com-20120822062555-d7thh474wn5lisnv --- addons/email_template/email_template.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index b43b7d19b85..6f48d37c714 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -236,6 +236,10 @@ class email_template(osv.osv): default = {} default = default.copy() default['name'] = template.name + _('(copy)') + default.update({ + 'ref_ir_act_window': False, + 'ref_ir_value': False, + }) return super(email_template, self).copy(cr, uid, id, default, context) def build_expression(self, field_name, sub_field_name, null_value): From 70f6e847f3001edb3aee08aff078930fcc093ac4 Mon Sep 17 00:00:00 2001 From: Rifakat Date: Mon, 24 Sep 2012 13:10:36 +0530 Subject: [PATCH 03/24] [FIX] stock: wrong stock accounting entries while doing return of any purchase/sales Accounting entries should be reverse while doing any return bzr revid: rha@tinyerp.com-20120924074036-0h7sybkwaegvg4tz --- addons/stock/stock.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 329159494d3..332a21895f2 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -2300,7 +2300,11 @@ class stock_move(osv.osv): or move.location_id.company_id != move.location_dest_id.company_id): journal_id, acc_src, acc_dest, acc_valuation = self._get_accounting_data_for_valuation(cr, uid, move, src_company_ctx) reference_amount, reference_currency_id = self._get_reference_accounting_values_for_valuation(cr, uid, move, src_company_ctx) - account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_valuation, acc_dest, reference_amount, reference_currency_id, context))] + #returning goods to supplier + if move.location_dest_id.usage == 'supplier': + account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_valuation, acc_src, reference_amount, reference_currency_id, context))] + else: + account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_valuation, acc_dest, reference_amount, reference_currency_id, context))] # Incoming moves (or cross-company input part) if move.location_dest_id.company_id \ @@ -2308,7 +2312,11 @@ class stock_move(osv.osv): or move.location_id.company_id != move.location_dest_id.company_id): journal_id, acc_src, acc_dest, acc_valuation = self._get_accounting_data_for_valuation(cr, uid, move, dest_company_ctx) reference_amount, reference_currency_id = self._get_reference_accounting_values_for_valuation(cr, uid, move, src_company_ctx) - account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_src, acc_valuation, reference_amount, reference_currency_id, context))] + #goods return from customer + if move.location_id.usage == 'customer': + account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_dest, acc_valuation, reference_amount, reference_currency_id, context))] + else: + account_moves += [(journal_id, self._create_account_move_line(cr, uid, move, acc_src, acc_valuation, reference_amount, reference_currency_id, context))] move_obj = self.pool.get('account.move') for j_id, move_lines in account_moves: From 7b4e8cbbf8c26cbf98db92a779672c4b9361870f Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 24 Sep 2012 12:33:07 +0200 Subject: [PATCH 04/24] [IMP] product: added constraints to make sure that the decimal precision of 'Account' is greater than the rounding factor of the company's main currency bzr revid: qdp-launchpad@openerp.com-20120924103307-4sdx61qxfy6lak2e --- addons/product/product.py | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/addons/product/product.py b/addons/product/product.py index ab282e722c0..144aa28c458 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -897,4 +897,43 @@ class pricelist_partnerinfo(osv.osv): } _order = 'min_quantity asc' pricelist_partnerinfo() + +class res_currency(osv.osv): + _inherit = 'res.currency' + + def _check_main_currency_rounding(self, cr, uid, ids, context=None): + cr.execute('SELECT digits FROM decimal_precision WHERE name like %s',('Account',)) + digits = cr.fetchone() + if len(digits): + digits = digits[0] + main_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id + for currency_id in ids: + if currency_id == main_currency.id: + if main_currency.rounding < 10 ** -digits: + return False + return True + + _constraints = [ + (_check_main_currency_rounding, 'Error! You cannot define a rounding factor for the company\'s main currency that is smaller than the decimal precision of \'Account\'.', ['rounding']), + ] + +class decimal_precision(osv.osv): + _inherit = 'decimal.precision' + + def _check_main_currency_rounding(self, cr, uid, ids, context=None): + cr.execute('SELECT id, digits FROM decimal_precision WHERE name like %s',('Account',)) + res = cr.fetchone() + if len(res): + account_precision_id, digits = res + main_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id + for decimal_precision in ids: + if decimal_precision == account_precision_id: + if main_currency.rounding < 10 ** -digits: + return False + return True + + _constraints = [ + (_check_main_currency_rounding, 'Error! You cannot define the decimal precision of \'Account\' as greater than the rounding factor of the company\'s main currency', ['digits']), + ] + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: From 6c60619a2bfeec6f3241e47ff4dbe1dd4844132c Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 24 Sep 2012 12:36:48 +0200 Subject: [PATCH 05/24] [FIX] wsgi wrapper bzr revid: al@openerp.com-20120924103648-uhxteeu6nd8batvd --- openerp-wsgi.py | 7 ++++--- openerp/__init__.py | 2 +- openerp/service/__init__.py | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/openerp-wsgi.py b/openerp-wsgi.py index 5ab7afc406e..48ffeaf3373 100644 --- a/openerp-wsgi.py +++ b/openerp-wsgi.py @@ -7,7 +7,7 @@ # # For generic wsgi handlers a global application is defined. # For uwsgi this should work: -# $ uwsgi --http :9090 --pythonpath . --wsgi-file openerp-wsgi.py +# $ uwsgi_python --http :9090 --pythonpath . --wsgi-file openerp-wsgi.py # # For gunicorn additional globals need to be defined in the Gunicorn section. # Then the following command should run: @@ -18,15 +18,16 @@ import openerp #---------------------------------------------------------- # Common #---------------------------------------------------------- +openerp.multi_process = True # Nah! + # Equivalent of --load command-line option openerp.conf.server_wide_modules = ['web'] conf = openerp.tools.config # Path to the OpenERP Addons repository (comma-separated for # multiple locations) -conf['addons_path'] = '/home/openerp/addons/trunk,/home/openerp/web/trunk/addons' -conf['addons_path'] = '/home/wis/stuff/version/openerp/source/addons/6.1,/home/wis/stuff/version/openerp/source/web/6.1/addons' +conf['addons_path'] = '../../addons/trunk,../../web/trunk/addons' # Optional database config if not using local socket #conf['db_name'] = 'mycompany' diff --git a/openerp/__init__.py b/openerp/__init__.py index 2fd2a9812f9..3a8f5f86f26 100644 --- a/openerp/__init__.py +++ b/openerp/__init__.py @@ -50,7 +50,7 @@ wsgi.register_wsgi_handler = wsgi.wsgi_server.register_wsgi_handler # e.g. database update or cache invalidation. Each process has also # its own copy of the data structure and we don't need to care about # locks between threads. -multi_process = True +multi_process = False # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/openerp/service/__init__.py b/openerp/service/__init__.py index 30a765b1f60..ef0fd757ddd 100644 --- a/openerp/service/__init__.py +++ b/openerp/service/__init__.py @@ -78,8 +78,6 @@ def start_internal(): def start_services(): """ Start all services including http, netrpc and cron """ - openerp.multi_process = False # Nah! - start_internal() # Initialize the HTTP stack. @@ -120,6 +118,8 @@ def stop_services(): openerp.modules.registry.RegistryManager.delete_all() def start_services_workers(): + openerp.multi_process = True # Nah! + openerp.service.workers.Multicorn(openerp.service.wsgi_server.application).run() From 470415ced97698c66bab4ae912e6d08c4831e54d Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Mon, 24 Sep 2012 12:40:26 +0200 Subject: [PATCH 06/24] [IMP] ir.ui.view: discard custom views before updating view arch - as the custom views are still in place when validating the new arch, they would hide the new arch and prevent proper validation (if custom views are set for uid 1) - conversely, if the RNG validation has changed, the old view customizations may not pass the updated validation rules, and cause spurious validation errors bzr revid: odo@openerp.com-20120924104026-z7bjzzq80ifxy1oc --- openerp/addons/base/ir/ir_ui_view.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index bad2c3d85af..9208297cf84 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -192,7 +192,6 @@ class view(osv.osv): def write(self, cr, uid, ids, vals, context=None): if not isinstance(ids, (list, tuple)): ids = [ids] - result = super(view, self).write(cr, uid, ids, vals, context) # drop the corresponding view customizations (used for dashboards for example), otherwise # not all users would see the updated views @@ -200,7 +199,7 @@ class view(osv.osv): if custom_view_ids: self.pool.get('ir.ui.view.custom').unlink(cr, uid, custom_view_ids) - return result + return super(view, self).write(cr, uid, ids, vals, context) def graph_get(self, cr, uid, id, model, node_obj, conn_obj, src_node, des_node, label, scale, context=None): nodes=[] From feb66a13c39a6605f7e1d46b5ffe5c108a0205c5 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 24 Sep 2012 12:50:11 +0200 Subject: [PATCH 07/24] [FIX] gunicorn wsgi wrapper instructions bzr revid: al@openerp.com-20120924105011-2gtopghuooxh37o0 --- openerp-wsgi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp-wsgi.py b/openerp-wsgi.py index 48ffeaf3373..9ae18ffc69e 100644 --- a/openerp-wsgi.py +++ b/openerp-wsgi.py @@ -11,7 +11,7 @@ # # For gunicorn additional globals need to be defined in the Gunicorn section. # Then the following command should run: -# $ gunicorn openerp:application -c openerp-wsgi.py +# $ gunicorn openerp:service.wsgi_server.application -c openerp-wsgi.py import openerp From d77fe9c1853b046fb97f77e96416c4bcdf7de4d8 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Mon, 24 Sep 2012 12:56:22 +0200 Subject: [PATCH 08/24] [FIX] restore poxy-mode command line option to prevent ip address impersonation bzr revid: al@openerp.com-20120924105622-nb3iwe1vnuffqrbm --- openerp/service/wsgi_server.py | 2 +- openerp/tools/config.py | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/openerp/service/wsgi_server.py b/openerp/service/wsgi_server.py index 61556974a00..a73617d8510 100644 --- a/openerp/service/wsgi_server.py +++ b/openerp/service/wsgi_server.py @@ -402,7 +402,7 @@ def application_unproxied(environ, start_response): return [response] def application(environ, start_response): - if 'HTTP_X_FORWARDED_HOST' in environ: + if config['proxy_mode'] and 'HTTP_X_FORWARDED_HOST' in environ: return werkzeug.contrib.fixers.ProxyFix(application_unproxied)(environ, start_response) else: return application_unproxied(environ, start_response) diff --git a/openerp/tools/config.py b/openerp/tools/config.py index 58d1d3c9c82..18b442221c9 100644 --- a/openerp/tools/config.py +++ b/openerp/tools/config.py @@ -116,6 +116,8 @@ class configmanager(object): help="specify the TCP port for the XML-RPC protocol", type="int") group.add_option("--no-xmlrpc", dest="xmlrpc", action="store_false", my_default=True, help="disable the XML-RPC protocol") + group.add_option("--proxy-mode", dest="proxy_mode", action="store_true", my_default=False, + help="Enable correct behavior when behind a reverse proxy") parser.add_option_group(group) # XML-RPC / HTTPS @@ -394,7 +396,7 @@ class configmanager(object): 'language', 'translate_out', 'translate_in', 'overwrite_existing_translations', 'debug_mode', 'smtp_ssl', 'load_language', 'stop_after_init', 'logrotate', 'without_demo', 'netrpc', 'xmlrpc', 'syslog', - 'list_db', 'xmlrpcs', + 'list_db', 'xmlrpcs', 'proxy_mode', 'test_file', 'test_enable', 'test_commit', 'test_report_directory', 'osv_memory_count_limit', 'osv_memory_age_limit', 'max_cron_threads', 'unaccent', 'workers', 'limit_memory_hard', 'limit_memory_soft', 'limit_time_cpu', 'limit_time_real', 'limit_request' From dfeeca1e8fd702bddd7ace33090d99395c485811 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 24 Sep 2012 13:04:50 +0200 Subject: [PATCH 09/24] [FIX] account: fixed list_partners_to_reconcile() in order to return all partners and not the first one only bzr revid: qdp-launchpad@openerp.com-20120924110450-q1k51qv0p2djumxk --- addons/account/account_move_line.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 2aed5b02107..5ddbbee74f2 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -736,7 +736,7 @@ class account_move_line(osv.osv): WHERE debit > 0 AND credit > 0 ORDER BY last_reconciliation_date""") ids = cr.fetchall() - ids = len(ids) and list(ids[0]) or [] + ids = len(ids) and [x[0] for x in ids] or [] return self.pool.get('res.partner').name_get(cr, uid, ids, context=context) def reconcile_partial(self, cr, uid, ids, type='auto', context=None, writeoff_acc_id=False, writeoff_period_id=False, writeoff_journal_id=False): From 29badc35a54e00f0ca0d516473eb82016d2b9355 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 24 Sep 2012 13:16:41 +0200 Subject: [PATCH 10/24] [FIX] product: 'Nonetype object has no len()' error fixed in newly added constraints for decimal precision of 'Account' <= company's main currency rounding bzr revid: qdp-launchpad@openerp.com-20120924111641-9papztx074vdbrpq --- addons/product/product.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/product/product.py b/addons/product/product.py index 144aa28c458..df0ab9122c2 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -904,7 +904,7 @@ class res_currency(osv.osv): def _check_main_currency_rounding(self, cr, uid, ids, context=None): cr.execute('SELECT digits FROM decimal_precision WHERE name like %s',('Account',)) digits = cr.fetchone() - if len(digits): + if digits and len(digits): digits = digits[0] main_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id for currency_id in ids: @@ -923,7 +923,7 @@ class decimal_precision(osv.osv): def _check_main_currency_rounding(self, cr, uid, ids, context=None): cr.execute('SELECT id, digits FROM decimal_precision WHERE name like %s',('Account',)) res = cr.fetchone() - if len(res): + if res and len(res): account_precision_id, digits = res main_currency = self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.currency_id for decimal_precision in ids: From f7255ac0b3b7e6b3d2dc67b571f7a169b2019598 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Mon, 24 Sep 2012 13:53:44 +0200 Subject: [PATCH 11/24] [FIX] clear breadcrumbs for client actions bzr revid: chs@openerp.com-20120924115344-rbtaus7a48pr56ka --- addons/web/static/src/js/views.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 608a856785e..d170aacc89d 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -318,8 +318,8 @@ instance.web.ActionManager = instance.web.Widget.extend({ } return this.ir_actions_common(action, on_close, clear_breadcrumbs); }, - ir_actions_client: function (action, on_close) { - return this.ir_actions_common(action, on_close); + ir_actions_client: function (action, on_close, clear_breadcrumbs) { + return this.ir_actions_common(action, on_close, clear_breadcrumbs); }, ir_actions_act_window_close: function (action, on_closed) { if (!this.dialog && on_closed) { From 4488c42ee532cb6715d986764f5532f26476cd25 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 24 Sep 2012 14:53:55 +0200 Subject: [PATCH 12/24] [FIX] problem in o2m, not reloading when we click a button in a o2m form popup bzr revid: nicolas.vanhoren@openerp.com-20120924125355-m1b53sjb6hle789z --- addons/web/static/src/js/view_form.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index af1980b7b6e..e3b7bde1bfe 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -940,6 +940,15 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM return self.dataset.parent_view.recursive_save(); }); }, + recursive_reload: function() { + var self = this; + var pre = $.when(); + if (self.dataset.parent_view) + pre = self.dataset.parent_view.recursive_reload(); + return pre.pipe(function() { + return self.reload(); + }); + }, is_dirty: function() { return _.any(this.fields, function (value_) { return value_._dirty_flag; @@ -1809,7 +1818,7 @@ instance.web.form.WidgetButton = instance.web.form.FormWidget.extend({ return this.view.do_execute_action( _.extend({}, this.node.attrs, {context: context}), this.view.dataset, this.view.datarecord.id, function () { - self.view.reload(); + self.view.recursive_reload(); }); }, check_disable: function() { From b3027a371cef466856307b5ac88c1fcc69a0be81 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 24 Sep 2012 15:45:33 +0200 Subject: [PATCH 13/24] [IMP] account: improved demo data to add a second bank journal, in foreign currency bzr revid: qdp-launchpad@openerp.com-20120924134533-s1j8mmqou9uw2mdt --- addons/account/demo/account_minimal.xml | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml index 53f2b54e0ef..2647364597b 100644 --- a/addons/account/demo/account_minimal.xml +++ b/addons/account/demo/account_minimal.xml @@ -122,6 +122,14 @@ other + + X11007 + USD Bank Account - (test) + + liquidity + + + Liabilities - (test) @@ -360,8 +368,8 @@ bank - - + + @@ -412,6 +420,17 @@ + + + USD Bank Journal - (test) + TUBK + bank + + + + + + From 247752851272d5bb3e222d31fcde81e1259e9f17 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 24 Sep 2012 15:49:10 +0200 Subject: [PATCH 14/24] [FIX] l10n_ch: linked the demo journal of BANK CHF JOURNAL to the CHF currency bzr revid: qdp-launchpad@openerp.com-20120924134910-5yye9t2m7yrqhhu7 --- addons/l10n_ch/journal_data.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/l10n_ch/journal_data.xml b/addons/l10n_ch/journal_data.xml index 04870ca936b..ede9136c3d2 100644 --- a/addons/l10n_ch/journal_data.xml +++ b/addons/l10n_ch/journal_data.xml @@ -19,6 +19,7 @@ + From edb74f79b1d502921dbf58c179d67f624b5a9879 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 24 Sep 2012 16:06:17 +0200 Subject: [PATCH 15/24] [IMP] base: added a new rate for USD, for demo transactions in multi currency bzr revid: qdp-launchpad@openerp.com-20120924140617-e0mlvtz2pf7icqo2 --- openerp/addons/base/base_demo.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/openerp/addons/base/base_demo.xml b/openerp/addons/base/base_demo.xml index 064b1f49e69..ce675ebb99e 100644 --- a/openerp/addons/base/base_demo.xml +++ b/openerp/addons/base/base_demo.xml @@ -14,5 +14,12 @@ + + + + 1.5289 + + + From de9eb7f78cdb3dcaa3c4320498f16dcda0a43a24 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Mon, 24 Sep 2012 16:06:32 +0200 Subject: [PATCH 16/24] [IMP] indentation and arguments order for readabily sake bzr revid: abo@openerp.com-20120924140632-mig0szmfvopl1wq0 --- addons/account/security/account_security.xml | 46 ++++++++++--------- .../portal_sale/security/portal_security.xml | 2 +- 2 files changed, 26 insertions(+), 22 deletions(-) diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index 26265cb2b2c..afbd19289b6 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -1,5 +1,6 @@ - + + Invoicing & Payments @@ -7,11 +8,13 @@ + Accountant + Manager @@ -25,107 +28,107 @@ Account Entry - - + + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - Entry lines + Entry lines - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Journal Period - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - + Journal multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Analytic journal multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Period multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Fiscal year multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Account multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - Tax multi-company + Tax multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Tax code multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Invoice multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Invoice Analysis multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Entries Analysis multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Account fiscal Mapping company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Account model company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] @@ -150,4 +153,5 @@ ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] - + + diff --git a/addons/portal_sale/security/portal_security.xml b/addons/portal_sale/security/portal_security.xml index 8028d5360c4..2f161a73281 100644 --- a/addons/portal_sale/security/portal_security.xml +++ b/addons/portal_sale/security/portal_security.xml @@ -12,7 +12,7 @@ Portal Personal Delivery Orders - + [('partner_id','child_of',[user.partner_id.id])] From aae20beef065bfd394ad5c7d988d06ae276c541b Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Mon, 24 Sep 2012 16:10:47 +0200 Subject: [PATCH 17/24] [IMP] remove the useless attribute model="ir.model" bzr revid: abo@openerp.com-20120924141047-2mang092z0ak288g --- addons/account/security/account_security.xml | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml index afbd19289b6..442b51466f8 100644 --- a/addons/account/security/account_security.xml +++ b/addons/account/security/account_security.xml @@ -35,14 +35,14 @@ Entry lines - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Journal Period - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] @@ -50,84 +50,84 @@ Journal multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Analytic journal multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Period multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Fiscal year multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Account multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Tax multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Tax code multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Invoice multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Invoice Analysis multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Entries Analysis multi-company - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Account fiscal Mapping company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] Account model company rule - + ['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])] From 9aa98a03d1ff0ca456e67041a7b73d436a44d358 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Mon, 24 Sep 2012 16:40:27 +0200 Subject: [PATCH 18/24] [FIX] account: fixed missing reference to sequence in demo journal bzr revid: qdp-launchpad@openerp.com-20120924144027-jxj61tt3cg0vud5j --- addons/account/demo/account_minimal.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/account/demo/account_minimal.xml b/addons/account/demo/account_minimal.xml index 2647364597b..8f879d6b465 100644 --- a/addons/account/demo/account_minimal.xml +++ b/addons/account/demo/account_minimal.xml @@ -426,7 +426,6 @@ TUBK bank - From 7b6280243572f4e0c60772be23ba8fc154e541b2 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Mon, 24 Sep 2012 17:34:30 +0200 Subject: [PATCH 19/24] [IMP] use kwargs instead of a new dict bzr revid: abo@openerp.com-20120924153430-0nb2gxker8v9is5p --- addons/email_template/email_template.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 6f48d37c714..cc4b52992a4 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -236,9 +236,7 @@ class email_template(osv.osv): default = {} default = default.copy() default['name'] = template.name + _('(copy)') - default.update({ - 'ref_ir_act_window': False, - 'ref_ir_value': False, + default.update(ref_ir_act_window=False, ref_ir_value=False) }) return super(email_template, self).copy(cr, uid, id, default, context) @@ -392,7 +390,7 @@ class email_template(osv.osv): :param bool force_send: if True, the generated mail.message is immediately sent after being created, as if the scheduler was executed for this message only. - :returns: id of the mail.message that was created + :returns: id of the mail.message that was created """ if context is None: context = {} mail_message = self.pool.get('mail.message') From f7b90af93ad6d97444d56ec81ee9d3ce959299e4 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Mon, 24 Sep 2012 17:56:00 +0200 Subject: [PATCH 20/24] [FIX] forgot to remove }) bzr revid: abo@openerp.com-20120924155600-dnaanyupa5jm0yre --- addons/email_template/email_template.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 53d484bd92d..87bdfccbbcf 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -217,7 +217,6 @@ class email_template(osv.osv): default = default.copy() default['name'] = template.name + _('(copy)') default.update(ref_ir_act_window=False, ref_ir_value=False) - }) return super(email_template, self).copy(cr, uid, id, default, context) def build_expression(self, field_name, sub_field_name, null_value): From 70a1aac877933c591b3d807dbed541c92fc7a6fe Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 24 Sep 2012 18:07:21 +0200 Subject: [PATCH 21/24] [IMP] minor change in form view fields bzr revid: nicolas.vanhoren@openerp.com-20120924160721-hay0ar7ap22gjyk7 --- addons/web/static/src/js/view_form.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index e3b7bde1bfe..dff9df11140 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -331,7 +331,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM _(this.fields).each(function (field, f) { field._dirty_flag = false; + field._inhibit_on_change_flag = true; var result = field.set_value(self.datarecord[f] || false); + field._inhibit_on_change_flag = false; set_values.push(result); }); return $.when.apply(null, set_values).pipe(function() { @@ -580,7 +582,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM if (field) { var value_ = result.value[f]; if (field.get_value() != value_) { + field._inhibit_on_change_flag = true; field.set_value(value_); + field._inhibit_on_change_flag = false; field._dirty_flag = true; if (!_.contains(processed, field.name)) { this.do_onchange(field, processed); @@ -1052,6 +1056,9 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM this.translatable_fields.push(field); } field.on('changed_value', this, function() { + if (field._inhibit_on_change_flag) { + return; + } field._dirty_flag = true; if (field.is_syntax_valid()) { this.do_onchange(field); @@ -1948,8 +1955,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w this.on("change:force_readonly", this, test_effective_readonly); test_effective_readonly.call(this); this.on("change:value", this, function() { - if (! this._inhibit_on_change) - this.trigger('changed_value'); + this.trigger('changed_value'); this._check_css_flags(); }); }, @@ -1984,9 +1990,7 @@ instance.web.form.AbstractField = instance.web.form.FormWidget.extend(instance.w this.$el.toggleClass('oe_form_required', this.get("required")); }, set_value: function(value_) { - this._inhibit_on_change = true; this.set({'value': value_}); - this._inhibit_on_change = false; }, get_value: function() { return this.get('value'); @@ -3321,6 +3325,7 @@ instance.web.form.FieldOne2Many = instance.web.form.AbstractField.extend({ this.dataset.index = 0; } self.is_setted.resolve(); + this.trigger_on_change(); return self.reload_current_view(); }, get_value: function() { From 1fbb4a5c16232c6130b31d870be4e44ecc743a72 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Mon, 24 Sep 2012 18:26:45 +0200 Subject: [PATCH 22/24] [IMP] handling of '(copy)' l10n bzr revid: abo@openerp.com-20120924162645-z1h4l2mj6c8i6wr3 --- addons/account/account.py | 9 ++-- addons/account_coda/account_coda.py | 11 +++-- addons/analytic/analytic.py | 7 +-- addons/document/document.py | 2 +- addons/document/document_directory.py | 2 +- addons/email_template/email_template.py | 4 +- addons/hr_payroll/hr_payroll.py | 11 ++--- addons/mrp/mrp.py | 2 +- addons/product/product.py | 2 +- addons/project/project.py | 6 +-- addons/project_issue/project_issue.py | 6 +-- addons/project_long_term/project_long_term.py | 6 +-- addons/resource/resource.py | 48 +++++++++---------- addons/survey/survey.py | 6 +-- 14 files changed, 62 insertions(+), 60 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index d145f0308b0..c2e6f3d1221 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -601,7 +601,7 @@ class account_account(osv.osv): if not default: default = {} default = default.copy() - default['code'] = (account['code'] or '') + '(copy)' + default.update(code=_("%s (copy)") % (account['code'] or '')) if not local: done_list = [] if account.id in done_list: @@ -782,9 +782,10 @@ class account_journal(osv.osv): if not default: default = {} default = default.copy() - default['code'] = (journal['code'] or '') + '(copy)' - default['name'] = (journal['name'] or '') + '(copy)' - default['sequence_id'] = False + default.update( + code=_("%s (copy)") % (journal['code'] or ''), + name=_("%s (copy)") % (journal['name'] or ''), + sequence_id=False) return super(account_journal, self).copy(cr, uid, id, default, context=context) def write(self, cr, uid, ids, vals, context=None): diff --git a/addons/account_coda/account_coda.py b/addons/account_coda/account_coda.py index cd117b5be88..1aa6e84402a 100644 --- a/addons/account_coda/account_coda.py +++ b/addons/account_coda/account_coda.py @@ -107,11 +107,12 @@ class coda_bank_account(osv.osv): if not default: default = {} default = default.copy() - default.update({'journal_id': None}) - default['description1'] = cba['description1'] or '' - default['description2'] = cba['description2'] or '' - default['name'] = (cba['name'] or '') + ' (copy)' - default['state'] = cba['state'] + default.update( + journal_id=None, + description1=cba['description1'] or '', + description2=cba['description2'] or '', + name=_("%s (copy)") % (cba['name'] or ''), + state=cba['state']) return super(coda_bank_account, self).copy(cr, uid, id, default, context) def onchange_state(self, cr, uid, ids, state): diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index d3a22782a68..269bf24ed61 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -223,9 +223,10 @@ class account_analytic_account(osv.osv): if not default: default = {} analytic = self.browse(cr, uid, id, context=context) - default['code'] = False - default['line_ids'] = [] - default['name'] = analytic['name'] + ' (' + _('copy') + ')' + default.update( + code=False, + line_ids=[], + name=_("%s (copy)") % (analytic['name'])) return super(account_analytic_account, self).copy(cr, uid, id, default, context=context) def on_change_company(self, cr, uid, id, company_id): diff --git a/addons/document/document.py b/addons/document/document.py index 3ee52f8e4fb..cb30e5f93c9 100644 --- a/addons/document/document.py +++ b/addons/document/document.py @@ -209,7 +209,7 @@ class document_file(osv.osv): default = {} if 'name' not in default: name = self.read(cr, uid, [id], ['name'])[0]['name'] - default.update({'name': name + " " + _("(copy)")}) + default.update(name=_("%s (copy)") % (name)) return super(document_file, self).copy(cr, uid, id, default, context=context) def write(self, cr, uid, ids, vals, context=None): diff --git a/addons/document/document_directory.py b/addons/document/document_directory.py index 1ead23ab402..ac0671d36d3 100644 --- a/addons/document/document_directory.py +++ b/addons/document/document_directory.py @@ -231,7 +231,7 @@ class document_directory(osv.osv): if not default: default ={} name = self.read(cr, uid, [id])[0]['name'] - default.update({'name': name+ " (copy)"}) + default.update(name=_("%s (copy)") % (name)) return super(document_directory,self).copy(cr, uid, id, default, context=context) def _check_duplication(self, cr, uid, vals, ids=[], op='create'): diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index 4080e62f002..dd05d1850fd 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -215,7 +215,7 @@ class email_template(osv.osv): if default is None: default = {} default = default.copy() - default['name'] = template.name + _('(copy)') + default.update(name=_("%s (copy)") % (template.name)) return super(email_template, self).copy(cr, uid, id, default, context) def build_expression(self, field_name, sub_field_name, null_value): @@ -335,7 +335,7 @@ class email_template(osv.osv): :param bool force_send: if True, the generated mail.message is immediately sent after being created, as if the scheduler was executed for this message only. - :returns: id of the mail.message that was created + :returns: id of the mail.message that was created """ if context is None: context = {} mail_mail = self.pool.get('mail.mail') diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/hr_payroll.py index 6a2e40b9571..08dacc9a951 100644 --- a/addons/hr_payroll/hr_payroll.py +++ b/addons/hr_payroll/hr_payroll.py @@ -81,10 +81,9 @@ class hr_payroll_structure(osv.osv): """ if not default: default = {} - default.update({ - 'code': self.browse(cr, uid, id, context=context).code + "(copy)", - 'company_id': self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id - }) + default.update( + code=_("%s (copy)") % (self.browse(cr, uid, id, context=context).code), + company_id=self.pool.get('res.users').browse(cr, uid, uid, context=context).company_id.id) return super(hr_payroll_structure, self).copy(cr, uid, id, default, context=context) def get_all_rules(self, cr, uid, structure_ids, context=None): @@ -305,7 +304,7 @@ class hr_payslip(osv.osv): return False return True - _constraints = [(_check_dates, "Payslip 'Date From' must be before 'Date To'.", ['date_from', 'date_to'])] + _constraints = [(_check_dates, "Payslip 'Date From' must be before 'Date To'.", ['date_from', 'date_to'])] def copy(self, cr, uid, id, default=None, context=None): if not default: @@ -851,7 +850,7 @@ result = rules.NET > categories.NET * 0.10''', """ :param rule_id: id of rule to compute :param localdict: dictionary containing the environement in which to compute the rule - :return: returns a tuple build as the base/amount computed, the quantity and the rate + :return: returns a tuple build as the base/amount computed, the quantity and the rate :rtype: (float, float, float) """ rule = self.browse(cr, uid, rule_id, context=context) diff --git a/addons/mrp/mrp.py b/addons/mrp/mrp.py index ae29ad324db..94ee4bdb3b2 100644 --- a/addons/mrp/mrp.py +++ b/addons/mrp/mrp.py @@ -356,7 +356,7 @@ class mrp_bom(osv.osv): if default is None: default = {} bom_data = self.read(cr, uid, id, [], context=context) - default.update({'name': bom_data['name'] + ' ' + _('Copy'), 'bom_id':False}) + default.update(name=_("%s (copy)") % (bom_data['name']), bom_id=False) return super(mrp_bom, self).copy_data(cr, uid, id, default, context=context) def create(self, cr, uid, vals, context=None): diff --git a/addons/product/product.py b/addons/product/product.py index df0ab9122c2..8bc0789d44b 100644 --- a/addons/product/product.py +++ b/addons/product/product.py @@ -727,7 +727,7 @@ class product_product(osv.osv): context_wo_lang.pop('lang', None) product = self.read(cr, uid, id, ['name'], context=context_wo_lang) default = default.copy() - default['name'] = product['name'] + ' (' + _('copy') + ')' + default.update(name=_("%s (copy)") % (product['name'])) if context.get('variant',False): fields = ['product_tmpl_id', 'active', 'variants', 'default_code', diff --git a/addons/project/project.py b/addons/project/project.py index f15656905ca..3572fd094b3 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -323,7 +323,7 @@ class project(osv.osv): default.pop('alias_id', None) proj = self.browse(cr, uid, id, context=context) if not default.get('name', False): - default['name'] = proj.name + _(' (copy)') + default.update(name=_("%s (copy)") % (proj.name)) res = super(project, self).copy(cr, uid, id, default, context) self.map_tasks(cr,uid,id,res,context) return res @@ -344,7 +344,7 @@ class project(osv.osv): new_date_end = (datetime(*time.strptime(new_date_start,'%Y-%m-%d')[:3])+(end_date-start_date)).strftime('%Y-%m-%d') context.update({'copy':True}) new_id = self.copy(cr, uid, proj.id, default = { - 'name': proj.name +_(' (copy)'), + 'name':_("%s (copy)") % (proj.name), 'state':'open', 'date_start':new_date_start, 'date':new_date_end, @@ -694,7 +694,7 @@ class task(base_stage, osv.osv): if not default.get('name', False): default['name'] = self.browse(cr, uid, id, context=context).name or '' if not context.get('copy',False): - new_name = _("%s (copy)")%default.get('name','') + new_name = _("%s (copy)") % (default.get('name', '')) default.update({'name':new_name}) return super(task, self).copy_data(cr, uid, id, default, context) diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py index 6121acbd607..f39be0c09d5 100644 --- a/addons/project_issue/project_issue.py +++ b/addons/project_issue/project_issue.py @@ -355,7 +355,7 @@ class project_issue(base_stage, osv.osv): if not default: default = {} default = default.copy() - default['name'] = issue['name'] + _(' (copy)') + default.update(name=_('%s (copy)') % (issue['name'])) return super(project_issue, self).copy(cr, uid, id, default=default, context=context) @@ -534,7 +534,7 @@ class project(osv.osv): def _get_alias_models(self, cr, uid, context=None): return [('project.task', "Tasks"), ("project.issue", "Issues")] - + def _issue_count(self, cr, uid, ids, field_name, arg, context=None): res = dict.fromkeys(ids, 0) issue_ids = self.pool.get('project.issue').search(cr, uid, [('project_id', 'in', ids)]) @@ -557,7 +557,7 @@ class project(osv.osv): _constraints = [ (_check_escalation, 'Error! You cannot assign escalation to the same project!', ['project_escalation_id']) ] - + project() class account_analytic_account(osv.osv): diff --git a/addons/project_long_term/project_long_term.py b/addons/project_long_term/project_long_term.py index 2eab5fa6ac6..5b88d5209c8 100644 --- a/addons/project_long_term/project_long_term.py +++ b/addons/project_long_term/project_long_term.py @@ -138,7 +138,7 @@ class project_phase(osv.osv): if default is None: default = {} if not default.get('name', False): - default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)') + default.update(name=_('%s (copy)') % (self.browse(cr, uid, id, context=context).name)) return super(project_phase, self).copy(cr, uid, id, default, context) def set_draft(self, cr, uid, ids, *args): @@ -227,7 +227,7 @@ class project(osv.osv): 'phase_ids': fields.one2many('project.phase', 'project_id', "Project Phases"), 'phase_count': fields.function(_phase_count, type='integer', string="Open Phases"), } - + def schedule_phases(self, cr, uid, ids, context=None): context = context or {} if type(ids) in (long, int,): @@ -250,7 +250,7 @@ class project(osv.osv): # Maybe it's better to update than unlink/create if it already exists ? p = getattr(project_gantt, 'Phase_%d' % (phase.id,)) - self.pool.get('project.user.allocation').unlink(cr, uid, + self.pool.get('project.user.allocation').unlink(cr, uid, [x.id for x in phase.user_ids], context=context ) diff --git a/addons/resource/resource.py b/addons/resource/resource.py index 354e9c5b27c..ed21eea85cc 100644 --- a/addons/resource/resource.py +++ b/addons/resource/resource.py @@ -45,24 +45,24 @@ class resource_calendar(osv.osv): def working_hours_on_day(self, cr, uid, resource_calendar_id, day, context=None): """Calculates the Working Total Hours based on Resource Calendar and given working day (datetime object). - + @param resource_calendar_id: resource.calendar browse record @param day: datetime object - + @return: returns the working hours (as float) men should work on the given day if is in the attendance_ids of the resource_calendar_id (i.e if that day is a working day), returns 0.0 otherwise """ res = 0.0 for working_day in resource_calendar_id.attendance_ids: if (int(working_day.dayofweek) + 1) == day.isoweekday(): res += working_day.hour_to - working_day.hour_from - return res + return res def _get_leaves(self, cr, uid, id, resource): - """Private Method to Calculate resource Leaves days - + """Private Method to Calculate resource Leaves days + @param id: resource calendar id - @param resource: resource id for which leaves will ew calculated - + @param resource: resource id for which leaves will ew calculated + @return : returns the list of dates, where resource on leave in resource.calendar.leaves object (e.g.['%Y-%m-%d', '%Y-%m-%d']) """ @@ -85,9 +85,9 @@ class resource_calendar(osv.osv): """ Calculates the working Schedule from supplied from date to till hours will be satisfied based or resource calendar id. If resource is also - given then it will consider the resource leave also and than will + given then it will consider the resource leave also and than will calculates resource working schedule - + @param dt_from: datetime object, start of working scheduled @param hours: float, total number working hours needed scheduled from start date @@ -187,29 +187,29 @@ class resource_calendar(osv.osv): def interval_get(self, cr, uid, id, dt_from, hours, resource=False, byday=True): """Calculates Resource Working Internal Timing Based on Resource Calendar. - + @param dt_from: start resource schedule calculation. @param hours : total number of working hours to be scheduled. - @param resource: optional resource id, If supplied it will take care of + @param resource: optional resource id, If supplied it will take care of resource leave while scheduling. @param byday: boolean flag bit enforce day wise scheduling - + @return : list of scheduled working timing based on resource calendar. """ res = self.interval_get_multi(cr, uid, [(dt_from.strftime('%Y-%m-%d %H:%M:%S'), hours, id)], resource, byday)[(dt_from.strftime('%Y-%m-%d %H:%M:%S'), hours, id)] return res def interval_hours_get(self, cr, uid, id, dt_from, dt_to, resource=False): - """ Calculates the Total Working hours based on given start_date to - end_date, If resource id is supplied that it will consider the source + """ Calculates the Total Working hours based on given start_date to + end_date, If resource id is supplied that it will consider the source leaves also in calculating the hours. - + @param dt_from : date start to calculate hours @param dt_end : date end to calculate hours @param resource: optional resource id, If given resource leave will be - considered. - - @return : Total number of working hours based dt_from and dt_end and + considered. + + @return : Total number of working hours based dt_from and dt_end and resource if supplied. """ if not id: @@ -257,7 +257,7 @@ resource_calendar() class resource_calendar_attendance(osv.osv): _name = "resource.calendar.attendance" _description = "Work Detail" - + _columns = { 'name' : fields.char("Name", size=64, required=True), 'dayofweek': fields.selection([('0','Monday'),('1','Tuesday'),('2','Wednesday'),('3','Thursday'),('4','Friday'),('5','Saturday'),('6','Sunday')], 'Day of Week', required=True, select=True), @@ -266,9 +266,9 @@ class resource_calendar_attendance(osv.osv): 'hour_to' : fields.float("Work to", required=True), 'calendar_id' : fields.many2one("resource.calendar", "Resource's Calendar", required=True), } - + _order = 'dayofweek, hour_from' - + _defaults = { 'dayofweek' : '0' } @@ -302,12 +302,12 @@ class resource_resource(osv.osv): 'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.resource', context=context) } - + def copy(self, cr, uid, id, default=None, context=None): if default is None: default = {} if not default.get('name', False): - default['name'] = self.browse(cr, uid, id, context=context).name + _(' (copy)') + default.update(name=_('%s (copy)') % (self.browse(cr, uid, id, context=context).name)) return super(resource_resource, self).copy(cr, uid, id, default, context) def generate_resources(self, cr, uid, user_ids, calendar_id, context=None): @@ -368,7 +368,7 @@ class resource_resource(osv.osv): """ if not calendar_id: # Calendar is not specified: working days: 24/7 - return [('fri', '8:0-12:0','13:0-17:0'), ('thu', '8:0-12:0','13:0-17:0'), ('wed', '8:0-12:0','13:0-17:0'), + return [('fri', '8:0-12:0','13:0-17:0'), ('thu', '8:0-12:0','13:0-17:0'), ('wed', '8:0-12:0','13:0-17:0'), ('mon', '8:0-12:0','13:0-17:0'), ('tue', '8:0-12:0','13:0-17:0')] resource_attendance_pool = self.pool.get('resource.calendar.attendance') time_range = "8:00-8:00" diff --git a/addons/survey/survey.py b/addons/survey/survey.py index 0239f8bf32f..2426ae5eeed 100644 --- a/addons/survey/survey.py +++ b/addons/survey/survey.py @@ -94,7 +94,7 @@ class survey(osv.osv): def copy(self, cr, uid, ids, default=None, context=None): vals = {} current_rec = self.read(cr, uid, ids, context=context) - title = current_rec.get('title') + ' (Copy)' + title = _("%s (copy)") % (current_rec.get('title')) vals.update({'title':title}) vals.update({'history':[],'tot_start_survey':0,'tot_comp_survey':0}) return super(survey, self).copy(cr, uid, ids, vals, context=context) @@ -143,7 +143,7 @@ class survey(osv.osv): 'nodestroy':True, } return report - + def fill_survey(self, cr, uid, ids, context=None): sur_obj = self.read(cr, uid, ids,['title'], context=context) for sur in sur_obj: @@ -232,7 +232,7 @@ class survey_page(osv.osv): def copy(self, cr, uid, ids, default=None, context=None): vals = {} current_rec = self.read(cr, uid, ids, context=context) - title = current_rec.get('title') + ' (Copy)' + title = _("%s (copy)") % (current_rec.get('title')) vals.update({'title':title}) return super(survey_page, self).copy(cr, uid, ids, vals, context=context) From 26780da2ef5b9b6f5a636ded6f8b21517f6b2198 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Tue, 25 Sep 2012 02:09:46 +0200 Subject: [PATCH 23/24] [FIX] fcntl not available on windows bzr revid: al@openerp.com-20120925000946-7qikupf5rt2hiwx4 --- openerp/service/workers.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/openerp/service/workers.py b/openerp/service/workers.py index 824bc07bb53..eae1b2839a8 100644 --- a/openerp/service/workers.py +++ b/openerp/service/workers.py @@ -3,7 +3,10 @@ # TODO rename class: Multicorn -> Arbiter ? #----------------------------------------------------------- import errno -import fcntl +try: + import fcntl +except ImportError: + fcntl = None import psutil import random import resource From 3cc8c24ef41027d52f2293f98877c2e1834d3468 Mon Sep 17 00:00:00 2001 From: Launchpad Translations on behalf of openerp <> Date: Tue, 25 Sep 2012 04:44:36 +0000 Subject: [PATCH 24/24] Launchpad automatic translations update. bzr revid: launchpad_translations_on_behalf_of_openerp-20120925044436-la8k19ynfgu07eeu --- openerp/addons/base/i18n/ru.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openerp/addons/base/i18n/ru.po b/openerp/addons/base/i18n/ru.po index fd9f91aa09d..82e7869a7ce 100644 --- a/openerp/addons/base/i18n/ru.po +++ b/openerp/addons/base/i18n/ru.po @@ -7,14 +7,14 @@ msgstr "" "Project-Id-Version: OpenERP Server 5.0.4\n" "Report-Msgid-Bugs-To: support@openerp.com\n" "POT-Creation-Date: 2012-02-08 00:44+0000\n" -"PO-Revision-Date: 2012-09-10 14:37+0000\n" +"PO-Revision-Date: 2012-09-24 14:20+0000\n" "Last-Translator: Chertykov Denis \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2012-09-20 04:40+0000\n" -"X-Generator: Launchpad (build 15985)\n" +"X-Launchpad-Export-Date: 2012-09-25 04:44+0000\n" +"X-Generator: Launchpad (build 16019)\n" #. module: base #: model:res.country,name:base.sh @@ -18206,7 +18206,7 @@ msgstr "Корпорация" #. module: base #: model:ir.module.module,shortdesc:base.module_purchase_requisition msgid "Purchase Requisitions" -msgstr "Требования закупки" +msgstr "Запросы на закупку" #. module: base #: selection:ir.cron,interval_type:0