From fb58e0c8fbe0131c330be57c4dc80b506d52b196 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:13:48 +0200 Subject: [PATCH 01/15] l10n_ch: port yaml tests to test_reports utility. bzr revid: p_christ@hol.gr-20101127201348-2khma0uejh5fqm2d --- addons/l10n_ch/test/l10n_ch_report.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/addons/l10n_ch/test/l10n_ch_report.yml b/addons/l10n_ch/test/l10n_ch_report.yml index 5b2a636813e..b07c574e5ad 100644 --- a/addons/l10n_ch/test/l10n_ch_report.yml +++ b/addons/l10n_ch/test/l10n_ch_report.yml @@ -16,18 +16,12 @@ In order to test the PDF reports defined on a l10n_ch, we will print BVR Report - !python {model: account.invoice}: | - import netsvc, tools, os - run_str = 'cp ' + tools.config['addons_path'] + '/l10n_ch/report/ocrbb.ttf' + ' ' + '/tmp/ocrbb.ttf' - os.system(run_str) - (data, format) = netsvc.LocalService('report.l10n_ch.bvr').create(cr, uid, [ref('test_invoice_1')], {}, {}) - if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_report.'+format), 'wb+').write(data) + from tools.test_reports import try_report + try_report(cr, uid, 'report.l10n_ch.bvr', [ref('test_invoice_1')]) - In order to test the PDF reports defined on a l10n_ch, we will print a BVR Invoice Report - !python {model: account.invoice}: | - import netsvc, tools, os - (data, format) = netsvc.LocalService('report.l10n_ch.invoice.bvr').create(cr, uid, [ref('test_invoice_1')], {}, {}) - if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'l10ch-bvr_invoice_report.'+format), 'wb+').write(data) + from tools.test_reports import try_report + try_report(cr, uid, 'report.l10n_ch.invoice.bvr', [ref('test_invoice_1')]) From 749e24645ee31f761c58f9ba49e1a8c07bd4b3d3 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:14:08 +0200 Subject: [PATCH 02/15] email_template: cleanup the startup warning lines. Multiple coding malpractices (I can't name them errors, yet) were in those lines: - they used the netsvc.Logger() interface, which is deprecated - they wrapped too much (we're not COBOL) - they used capital letters for an object - they defined a logger object that would live throughout the module life, although it would only be useful for startup - they used the gettext function, although there is absolutely no context around to provide a language. bzr revid: p_christ@hol.gr-20101127201408-gnn6js103fbpw8ou --- addons/email_template/email_template.py | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index def74fe17dc..4b1ec7e8e0f 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -23,10 +23,9 @@ import base64 import random import netsvc +import logging import re -LOGGER = netsvc.Logger() - TEMPLATE_ENGINES = [] from osv import osv, fields @@ -35,12 +34,9 @@ from tools.translate import _ try: from mako.template import Template as MakoTemplate TEMPLATE_ENGINES.append(('mako', 'Mako Templates')) -except: - LOGGER.notifyChannel( - _("Email Template"), - netsvc.LOG_WARNING, - _("Mako templates not installed") - ) +except ImportError: + logging.getLogger('init').warning("module email_template: Mako templates not installed") + try: from django.template import Context, Template as DjangoTemplate #Workaround for bug: @@ -49,12 +45,8 @@ try: settings.configure() #Workaround ends TEMPLATE_ENGINES.append(('django', 'Django Template')) -except: - LOGGER.notifyChannel( - _("Email Template"), - netsvc.LOG_WARNING, - _("Django templates not installed") - ) +except ImportError: + logging.getLogger('init').warning("module email_template: Django templates not installed") import tools import pooler From bffc2487968be0e77241d5d40d353901e4ce3aed Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:14:29 +0200 Subject: [PATCH 03/15] account.move.line: Fix ugly SQL call A matter of coding style, tripple quotes in the same line, put in a list is just a candidate for the hall of shame. bzr revid: p_christ@hol.gr-20101127201429-07u0bc8xra998zhi --- addons/account/account_move_line.py | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/addons/account/account_move_line.py b/addons/account/account_move_line.py index 307ab1f58da..2987b3c69d6 100644 --- a/addons/account/account_move_line.py +++ b/addons/account/account_move_line.py @@ -300,19 +300,15 @@ class account_move_line(osv.osv): context = {} c = context.copy() c['initital_bal'] = True - sql = [ - """SELECT l2.id, SUM(l1.debit-l1.credit) FROM account_move_line l1, account_move_line l2""", - """WHERE l2.account_id = l1.account_id""", - """AND""", - """l1.id <= l2.id""", - """AND""", - """l2.id IN %s""", - """AND""", - self._query_get(cr, uid, obj='l1', context=c), - """ GROUP BY l2.id""", - ] + sql = """SELECT l2.id, SUM(l1.debit-l1.credit) + FROM account_move_line l1, account_move_line l2 + WHERE l2.account_id = l1.account_id + AND l1.id <= l2.id + AND l2.id IN %%s AND """ + \ + self._query_get(cr, uid, obj='l1', context=c) + \ + " GROUP BY l2.id" - cr.execute('\n'.join(sql), [tuple(ids)]) + cr.execute(sql, [tuple(ids)]) res = dict(cr.fetchall()) return res From 6aa18c41c77d3c041436ca6877fe31a88e2c753a Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:14:37 +0200 Subject: [PATCH 04/15] board: fix a string typo It had been haunting our development process for years, making our teeth turn green and our cow's milk turn sour. bzr revid: p_christ@hol.gr-20101127201437-4y0xj8hamt7blk9j --- addons/board/board.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/board/board.py b/addons/board/board.py index 9677c8aaa17..6049f501e00 100644 --- a/addons/board/board.py +++ b/addons/board/board.py @@ -185,7 +185,7 @@ class board_note_type(osv.osv): Board note Type """ _name = 'board.note.type' - _description = "NOte Type" + _description = "Note Type" _columns = { 'name': fields.char('Note Type', size=64, required=True), From dbcf9f404a675449a91357749d2f571a98e4d59e Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:15:32 +0200 Subject: [PATCH 05/15] analytic, event, crm_profiling: use new _check_recursion() from ORM bzr revid: p_christ@hol.gr-20101127201532-0ybt027d05qt52rp --- addons/analytic/analytic.py | 2 +- addons/crm_profiling/crm_profiling.py | 2 +- addons/event/event.py | 12 +----------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/addons/analytic/analytic.py b/addons/analytic/analytic.py index 2704ec987f3..58f2357d452 100644 --- a/addons/analytic/analytic.py +++ b/addons/analytic/analytic.py @@ -153,7 +153,7 @@ class account_analytic_account(osv.osv): } def check_recursion(self, cr, uid, ids, parent=None): - return super(account_analytic_account, self).check_recursion(cr, uid, ids, parent=parent) + return super(account_analytic_account, self)._check_recursion(cr, uid, ids, parent=parent) _order = 'date_start desc,parent_id desc,code' _constraints = [ diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py index 86cd41c0335..e5165f5b186 100644 --- a/addons/crm_profiling/crm_profiling.py +++ b/addons/crm_profiling/crm_profiling.py @@ -266,7 +266,7 @@ class crm_segmentation(osv.osv): } _constraints = [ - (orm.orm.check_recursion, 'Error ! You can not create recursive profiles.', ['parent_id']) + (orm.orm._check_recursion, 'Error ! You can not create recursive profiles.', ['parent_id']) ] def process_continue(self, cr, uid, ids, start=False): diff --git a/addons/event/event.py b/addons/event/event.py index ab90fe64803..db58971fd7c 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -247,17 +247,7 @@ class event_event(osv.osv): } def _check_recursion(self, cr, uid, ids): - """ - Checks for recursion level for event - """ - level = 100 - while len(ids): - cr.execute('SELECT DISTINCT parent_id FROM event_event WHERE id IN %s', (tuple(ids),)) - ids = filter(None, map(lambda x: x[0], cr.fetchall())) - if not level: - return False - level -= 1 - return True + return super(event_event, self)._check_recursion(self, cr, uid, ids) def _check_closing_date(self, cr, uid, ids): for event in self.browse(cr, uid, ids): From 8fa6d985a7f79f332b6711b15fa6aea0afbade55 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:15:41 +0200 Subject: [PATCH 06/15] event: fix call to _check_recursion, after last commit. bzr revid: p_christ@hol.gr-20101127201541-78wspzmaxdjt9cs2 --- addons/event/event.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/event/event.py b/addons/event/event.py index db58971fd7c..8c8bed8584b 100644 --- a/addons/event/event.py +++ b/addons/event/event.py @@ -247,7 +247,7 @@ class event_event(osv.osv): } def _check_recursion(self, cr, uid, ids): - return super(event_event, self)._check_recursion(self, cr, uid, ids) + return super(event_event, self)._check_recursion(cr, uid, ids) def _check_closing_date(self, cr, uid, ids): for event in self.browse(cr, uid, ids): From 9e01e43db84631e56795a084887a80910503a474 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:16:05 +0200 Subject: [PATCH 07/15] account: one wording error in invoice's exception bzr revid: p_christ@hol.gr-20101127201605-lzfk017mhmbbqwx8 --- addons/account/invoice.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/account/invoice.py b/addons/account/invoice.py index 9ae8a141f97..3f675f90a07 100644 --- a/addons/account/invoice.py +++ b/addons/account/invoice.py @@ -385,7 +385,7 @@ class account_invoice(osv.osv): raise orm.except_orm(_('Configuration Error!'), _('There is no Accounting Journal of type Sale/Purchase defined!')) else: - raise orm.except_orm(_('UnknownError'), str(e)) + raise orm.except_orm(_('Unknown Error'), str(e)) def confirm_paid(self, cr, uid, ids, context=None): self.write(cr, uid, ids, {'state':'paid'}, context=context) From 7c5d0e6aba0401969c8f59b4689d4725b85c45d6 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:16:16 +0200 Subject: [PATCH 08/15] delivery, purchase, sale, stock_location: minor fixes, mutable args bzr revid: p_christ@hol.gr-20101127201616-fq46x1c2uo7s7b62 --- addons/delivery/stock.py | 5 ++--- addons/purchase/stock.py | 2 +- addons/sale/stock.py | 2 +- addons/sale_margin/sale_margin.py | 4 ++-- addons/stock_location/stock_location.py | 8 ++++---- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/addons/delivery/stock.py b/addons/delivery/stock.py index c9fd50986f7..23cc1563cff 100644 --- a/addons/delivery/stock.py +++ b/addons/delivery/stock.py @@ -160,13 +160,12 @@ class stock_move(osv.osv): _columns = { 'weight': fields.function(_cal_move_weight, method=True, type='float', string='Weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight', store={ - 'stock.move': (lambda self, cr, uid, ids, c={}: ids, ['product_id', 'product_qty', 'product_uom'], 20), + 'stock.move': (lambda self, cr, uid, ids, c=None: ids, ['product_id', 'product_qty', 'product_uom'], 20), }), 'weight_net': fields.function(_cal_move_weight, method=True, type='float', string='Net weight', digits_compute= dp.get_precision('Stock Weight'), multi='_cal_move_weight', store={ - 'stock.move': (lambda self, cr, uid, ids, c={}: ids, ['product_id', 'product_qty', 'product_uom'], 20), + 'stock.move': (lambda self, cr, uid, ids, c=None: ids, ['product_id', 'product_qty', 'product_uom'], 20), }), - } stock_move() diff --git a/addons/purchase/stock.py b/addons/purchase/stock.py index 987c76e372d..93cd142ac01 100644 --- a/addons/purchase/stock.py +++ b/addons/purchase/stock.py @@ -55,7 +55,7 @@ class stock_picking(osv.osv): ondelete='set null', select=True), } _defaults = { - 'purchase_id': lambda *a: False, + 'purchase_id': False, } def get_currency_id(self, cursor, user, picking): diff --git a/addons/sale/stock.py b/addons/sale/stock.py index 2855323c7a0..72e3f0a6c24 100644 --- a/addons/sale/stock.py +++ b/addons/sale/stock.py @@ -188,7 +188,7 @@ class stock_picking(osv.osv): }) return result - def action_cancel(self, cr, uid, ids, context={}): + def action_cancel(self, cr, uid, ids, context=None): res = super(stock_picking, self).action_cancel(cr, uid, ids, context=context) for pick in self.browse(cr, uid, ids, context): call_ship_end = True diff --git a/addons/sale_margin/sale_margin.py b/addons/sale_margin/sale_margin.py index 2f756d5ecda..3a0e09a0309 100644 --- a/addons/sale_margin/sale_margin.py +++ b/addons/sale_margin/sale_margin.py @@ -94,13 +94,13 @@ class account_invoice_line(osv.osv): _columns = { 'cost_price': fields.float('Cost Price', digits=(16, 2)), } - def write(self, cr, uid, ids, vals, context={}): + def write(self, cr, uid, ids, vals, context=None): if vals.get('product_id', False): res = self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price']) vals['cost_price'] = res[0]['standard_price'] return super(account_invoice_line, self).write(cr, uid, ids, vals, context) - def create(self, cr, uid, vals, context={}): + def create(self, cr, uid, vals, context=None): if vals.get('product_id',False): res = self.pool.get('product.product').read(cr, uid, [vals['product_id']], ['standard_price']) vals['cost_price'] = res[0]['standard_price'] diff --git a/addons/stock_location/stock_location.py b/addons/stock_location/stock_location.py index 01d3b906d29..1f6d7b78e61 100644 --- a/addons/stock_location/stock_location.py +++ b/addons/stock_location/stock_location.py @@ -52,10 +52,10 @@ class stock_location_path(osv.osv): ), } _defaults = { - 'auto': lambda *arg: 'auto', - 'delay': lambda *arg: 1, - 'invoice_state': lambda *args: 'none', - 'picking_type':lambda *args:'internal', + 'auto': 'auto', + 'delay': 1, + 'invoice_state': 'none', + 'picking_type': 'internal', } stock_location_path() From d07eb4c18ca1d3123cf4188ae83d9e1d5b70b26b Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:16:19 +0200 Subject: [PATCH 09/15] claim_from_delivery: don't override stock.picking, partner_id is already there This module had been inheriting stock.picking, and redefining the "partner_id" column. Moreover, it has been redefining it with store=False, which broke the parent stock.picking. That's redundant, skip the whole class. bzr revid: p_christ@hol.gr-20101127201619-qjmxvnw12kdqd2q2 --- addons/claim_from_delivery/__init__.py | 2 +- addons/claim_from_delivery/claim_delivery.py | 33 -------------------- 2 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 addons/claim_from_delivery/claim_delivery.py diff --git a/addons/claim_from_delivery/__init__.py b/addons/claim_from_delivery/__init__.py index 6c1b79535b5..5e947ee409d 100644 --- a/addons/claim_from_delivery/__init__.py +++ b/addons/claim_from_delivery/__init__.py @@ -17,7 +17,7 @@ # along with this program. If not, see . # ############################################################################## -import claim_delivery + # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/claim_from_delivery/claim_delivery.py b/addons/claim_from_delivery/claim_delivery.py deleted file mode 100644 index 67e6f0baae2..00000000000 --- a/addons/claim_from_delivery/claim_delivery.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2004-2010 Tiny SPRL (). -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -############################################################################## - -from osv import fields, osv - -class stock_picking(osv.osv): - _inherit = "stock.picking" - _columns = { - 'partner_id': fields.related('address_id', 'partner_id', type='many2one', relation="res.partner", string="Partner"), - } - -stock_picking() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: - From 543cc3253dcd371ecfd65fb840628eeec9259587 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:16:22 +0200 Subject: [PATCH 10/15] hr_timesheet_invoice: fix tabs in yml test. bzr revid: p_christ@hol.gr-20101127201622-1ejourg60zu0si5i --- .../hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml index 9a22de4d828..39c2d9c6769 100644 --- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml +++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml @@ -44,8 +44,8 @@ I check that Invoice is created for this timesheet. - !python {model: account.analytic.line}: | - account_id = self.pool.get('account.analytic.line') - accounts = account_id.browse(cr, uid, [ref("account_analytic_line_developyamlforhrmodule0")])[0] + account_id = self.pool.get('account.analytic.line') + accounts = account_id.browse(cr, uid, [ref("account_analytic_line_developyamlforhrmodule0")])[0] exp = self.browse(cr, uid, [ref('account_analytic_line_developyamlforhrmodule0')])[0] analytic_account_obj = self.pool.get('account.analytic.account') data = self.pool.get('hr.timesheet.invoice.create').read(cr, uid, [ref("hr_timesheet_invoice_create_0")], [], context)[0] From c9bb11b2f1f5bf91003e1d2eb481602a464718be Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:16:26 +0200 Subject: [PATCH 11/15] product_expiry: don't define invalid EANs in demo data. bzr revid: p_christ@hol.gr-20101127201626-v7muq1xa1rhptb1v --- addons/product_expiry/product_expiry_demo.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/product_expiry/product_expiry_demo.xml b/addons/product_expiry/product_expiry_demo.xml index 4ddeb92e359..bb4962d63c4 100644 --- a/addons/product_expiry/product_expiry_demo.xml +++ b/addons/product_expiry/product_expiry_demo.xml @@ -34,7 +34,7 @@ 6 4 - 12345678901234 + 10 240 @@ -63,7 +63,7 @@ 6 4 - 12345678901234 + 10 240 @@ -92,7 +92,7 @@ 6 4 - 12345678901234 + 10 240 @@ -121,7 +121,7 @@ 6 4 - 12345678901234 + 10 240 From 61560695f415b74444596adfe036c0dd404b092d Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:16:30 +0200 Subject: [PATCH 12/15] account/test: simplify Aged Partner Balance report, reduce imports It has been importing md5, hashlib, warnings, netsvc and tools, which are not really appropriate for testing code. Instead, port to the "test_reports" testing helper. The rest of the file needs to be ported, too. TODO. bzr revid: p_christ@hol.gr-20101127201630-zaaowb4oaoxvxlv1 --- addons/account/test/account_report.yml | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/addons/account/test/account_report.yml b/addons/account/test/account_report.yml index 0e0ddfb3e99..aaf45de3212 100644 --- a/addons/account/test/account_report.yml +++ b/addons/account/test/account_report.yml @@ -42,13 +42,9 @@ Print the Aged Partner Balance Report - !python {model: res.partner}: | - import netsvc, tools, os, time + import time from datetime import datetime from dateutil.relativedelta import relativedelta - import warnings - import md5 - import hashlib - warnings.filterwarnings('ignore',".*struct integer overflow masking is deprecated*") start = datetime.fromtimestamp(time.mktime(time.strptime(time.strftime('%Y-%m-%d'), "%Y-%m-%d"))) start = datetime(int(start.year), int(start.month), int(start.day)) res = {} @@ -71,12 +67,18 @@ query_line = obj_move._query_get(cr, uid, obj='l', context=ctx) - data_dict = {'model': 'ir.ui.menu', 'form': {'chart_account_id':ref('account.chart0'),'initial_balance': 1, 'periods': period_list,'journal_ids':journal_ids, 'page_split': 0, 'date_from': time.strftime('%Y-%m-%d'), 'period_length': 30, 'amount_currency': 0,'query_line' : query_line, 'result_selection': 'customer','direction_selection': 'past','fiscalyear_id':fy_id}} + data_dict = {'model': 'ir.ui.menu', 'form': \ + {'chart_account_id':ref('account.chart0'), + 'initial_balance': 1, 'periods': period_list, + 'journal_ids':journal_ids, 'page_split': 0, + 'date_from': time.strftime('%Y-%m-%d'), + 'period_length': 30, 'amount_currency': 0, + 'query_line' : query_line, 'result_selection': + 'customer','direction_selection': + 'past','fiscalyear_id':fy_id } } data_dict['form'].update(res) - (data, format) = netsvc.LocalService('report.account.aged_trial_balance').create(cr, uid, [], data_dict, {}) - if tools.config['test_report_directory']: - file(os.path.join(tools.config['test_report_directory'], 'account-aged_partner_balance.'+format), 'wb+').write(data) - + from tools.test_reports import try_report + try_report(cr, uid, 'report.account.aged_trial_balance', [], data_dict, context={}) - Print the Account Balance Sheet in Horizontal mode - From 6a07f9c2fe3fd98bc66189f0381cd7d7aef6418b Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:16:52 +0200 Subject: [PATCH 13/15] crm_claim: make sure we don't reference the stage_claim4 any more. bzr revid: p_christ@hol.gr-20101127201652-rbpkl8o1fx7np9lg --- addons/crm_claim/crm_claim_data.xml | 2 +- addons/crm_claim/crm_claim_demo.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm_claim/crm_claim_data.xml b/addons/crm_claim/crm_claim_data.xml index 79fbbc3c6ff..13292d16c3b 100644 --- a/addons/crm_claim/crm_claim_data.xml +++ b/addons/crm_claim/crm_claim_data.xml @@ -67,7 +67,7 @@ Sales Department Sales - + diff --git a/addons/crm_claim/crm_claim_demo.xml b/addons/crm_claim/crm_claim_demo.xml index 0a603cb8f5a..0762e431f3b 100644 --- a/addons/crm_claim/crm_claim_demo.xml +++ b/addons/crm_claim/crm_claim_demo.xml @@ -98,7 +98,7 @@ - + From 0bf244804f795272c1a4823556a3bd3ae605c634 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:16:56 +0200 Subject: [PATCH 14/15] views: fix xml records using The view_id had not been functioning as expected, and fixed today. So, all these records that had it are now evaluated. These ones broke after the server fix. bzr revid: p_christ@hol.gr-20101127201656-bek6n0h4bxashwl2 --- addons/account_followup/account_followup_view.xml | 4 ++-- addons/hr_holidays/hr_holidays_view.xml | 2 +- addons/hr_payroll/hr_payroll_view.xml | 2 +- addons/project/board_project_manager_view.xml | 9 ++++++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml index e246e3659e1..326264ffdcd 100644 --- a/addons/account_followup/account_followup_view.xml +++ b/addons/account_followup/account_followup_view.xml @@ -144,7 +144,7 @@ name="Receivable Items" res_model="account.move.line" src_model="" - view="account_move_line_partner_tree"/> + view_id="account_move_line_partner_tree"/> @@ -154,7 +154,7 @@ name="Payable Items" res_model="account.move.line" src_model="" - view="account_move_line_partner_tree"/> + view_id="account_move_line_partner_tree"/> diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml index be2be2dd54f..c76e8359b9e 100644 --- a/addons/hr_holidays/hr_holidays_view.xml +++ b/addons/hr_holidays/hr_holidays_view.xml @@ -449,7 +449,7 @@ context="{'search_default_employee_id': [active_id]}" res_model="hr.holidays" src_model="hr.employee" - view_id ="eval('edit_holiday_new')" + view_id ="edit_holiday_new" id="act_hr_employee_holiday_request"/> diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml index ce68f1e20cf..1c792c5ba6f 100644 --- a/addons/hr_payroll/hr_payroll_view.xml +++ b/addons/hr_payroll/hr_payroll_view.xml @@ -1094,7 +1094,7 @@ domain="[('employee_id', '=', active_id)]" res_model="hr.payslip" src_model="hr.employee" - view_id ="eval('view_hr_payslip_tree')" + view_id ="view_hr_payslip_tree" id="act_hr_employee_payslip_list"/> diff --git a/addons/project/board_project_manager_view.xml b/addons/project/board_project_manager_view.xml index d92592a9f38..6a563bd2910 100644 --- a/addons/project/board_project_manager_view.xml +++ b/addons/project/board_project_manager_view.xml @@ -15,7 +15,14 @@ res_model="project.project" view_mode="tree,form" view_type="form"/> - + From 054469fcded4ee7f93866a198a1516bf1e7769d2 Mon Sep 17 00:00:00 2001 From: "P. Christeas" Date: Sat, 27 Nov 2010 22:16:59 +0200 Subject: [PATCH 15/15] caldav/wizard: remove duplicate act_window entries, use the view_id bzr revid: p_christ@hol.gr-20101127201659-uqooowr8a4s90myb --- addons/caldav/wizard/calendar_event_export_view.xml | 11 +---------- addons/caldav/wizard/calendar_event_import_view.xml | 10 +--------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/addons/caldav/wizard/calendar_event_export_view.xml b/addons/caldav/wizard/calendar_event_export_view.xml index 3161bb7d45e..8b74e29a98e 100644 --- a/addons/caldav/wizard/calendar_event_export_view.xml +++ b/addons/caldav/wizard/calendar_event_export_view.xml @@ -19,20 +19,11 @@ - - - Export .ics File - calendar.event.export - form - tree,form - - new - - diff --git a/addons/caldav/wizard/calendar_event_import_view.xml b/addons/caldav/wizard/calendar_event_import_view.xml index 41afcc7fcfd..e580e6b2733 100644 --- a/addons/caldav/wizard/calendar_event_import_view.xml +++ b/addons/caldav/wizard/calendar_event_import_view.xml @@ -37,18 +37,10 @@ - - Import .ics File - calendar.event.import - form - tree,form - - new - -