From 6990b3cb9663e58494fb8650598f2a8a121ea77f Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 1 Jun 2010 14:06:18 +0200 Subject: [PATCH 1/5] [FIX] Add a new line in the layout of the search view bzr revid: stephane@openerp.com-20100601120618-id3sthnayjnbvvx6 --- addons/project/project_view.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index fccf13c7a21..0213b273faa 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -123,6 +123,7 @@ + From 91a42789ee20562cf4a40ca7db5bbd1d7c5b2fc7 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 1 Jun 2010 14:06:40 +0200 Subject: [PATCH 2/5] [FIX] Use the context in the company_default_get function of res.company bzr revid: stephane@openerp.com-20100601120640-hkbxhkwkxwjp4tr1 --- addons/resource/resource.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/resource/resource.py b/addons/resource/resource.py index 172d7e23a44..6e8b7539fdc 100644 --- a/addons/resource/resource.py +++ b/addons/resource/resource.py @@ -35,7 +35,7 @@ class resource_calendar(osv.osv): 'manager' : fields.many2one('res.users', 'Workgroup manager'), } _defaults = { - 'company_id': lambda self, cr, uid, c: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', c) + 'company_id': lambda self, cr, uid, context: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', context=context) } def interval_min_get(self, cr, uid, id, dt_from, hours, resource=False): From c543b3a5974221da638aa1522b43aa96a8c5d6aa Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 2 Jun 2010 09:12:16 +0200 Subject: [PATCH 3/5] [REF] Change the layout of the search view for the resource object bzr revid: stephane@openerp.com-20100602071216-gv5xum3il9idds2g --- addons/resource/resource_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index 579f6976814..35264a2b365 100644 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -178,11 +178,11 @@ + - From f65b23a319f14c071edd5cbd58a666d42ceb6500 Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Wed, 2 Jun 2010 09:12:57 +0200 Subject: [PATCH 4/5] [IMP] Add a search view for the product.pricelist object bzr revid: stephane@openerp.com-20100602071257-2woe2a8jzyqk2zko --- addons/product/pricelist_view.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/addons/product/pricelist_view.xml b/addons/product/pricelist_view.xml index 604c2b75324..634bb9da109 100644 --- a/addons/product/pricelist_view.xml +++ b/addons/product/pricelist_view.xml @@ -97,6 +97,21 @@ + + product.pricelist.search + product.pricelist + search + + + + + + + + + + + product.pricelist.tree product.pricelist @@ -145,6 +160,7 @@ product.pricelist form tree,form + Date: Wed, 2 Jun 2010 09:13:39 +0200 Subject: [PATCH 5/5] [FIX] Typo bzr revid: stephane@openerp.com-20100602071339-hwrtzy4w3e5wg7xw --- addons/document_ftp/ftpserver/ftpserver.py | 2 +- addons/hr_timesheet_sheet/hr_timesheet_sheet.py | 2 +- addons/mrp_procurement/mrp_procurement.py | 2 +- addons/resource/resource_view.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/document_ftp/ftpserver/ftpserver.py b/addons/document_ftp/ftpserver/ftpserver.py index d04251a229d..3a85b3061a7 100644 --- a/addons/document_ftp/ftpserver/ftpserver.py +++ b/addons/document_ftp/ftpserver/ftpserver.py @@ -1975,7 +1975,7 @@ class FTPHandler(asynchat.async_chat): # which IPv6 address to use for binding the socket? # Unfortunately RFC-2428 does not provide satisfing information # on how to do that. The assumption is that we don't have any way - # to know wich address to use, hence we just use the same address + # to know which address to use, hence we just use the same address # family used on the control connection. if not line: self._make_epasv(extmode=True) diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py index d6d9e38247b..5ae8313bf36 100644 --- a/addons/hr_timesheet_sheet/hr_timesheet_sheet.py +++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet.py @@ -301,7 +301,7 @@ class hr_timesheet_sheet(osv.osv): _constraints = [ (_sheet_date, 'You can not have 2 timesheets that overlaps !\nPlease use the menu \'My Current Timesheet\' to avoid this problem.', ['date_from','date_to']), - (_date_current_check, 'You must select a Current date wich is in the timesheet dates !', ['date_current']), + (_date_current_check, 'You must select a Current date which is in the timesheet dates !', ['date_current']), ] def action_set_to_draft(self, cr, uid, ids, *args): diff --git a/addons/mrp_procurement/mrp_procurement.py b/addons/mrp_procurement/mrp_procurement.py index ceaefb4c4db..1f974318ee3 100644 --- a/addons/mrp_procurement/mrp_procurement.py +++ b/addons/mrp_procurement/mrp_procurement.py @@ -200,7 +200,7 @@ class mrp_procurement(osv.osv): return False # - # Return the quantity of product shipped/produced/served, wich may be + # Return the quantity of product shipped/produced/served, which may be # different from the planned quantity # def quantity_get(self, cr, uid, id, context={}): diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml index 35264a2b365..035f3830673 100644 --- a/addons/resource/resource_view.xml +++ b/addons/resource/resource_view.xml @@ -56,7 +56,7 @@ - +