From dcaef8c77ce21098439c144ea82749941a05fdf5 Mon Sep 17 00:00:00 2001 From: Niels Huylebroeck Date: Tue, 2 Nov 2010 16:35:07 +0100 Subject: [PATCH 01/13] [FIX] Fetchmail module was using domain 'type' on mailgate.message, real name was 'server_type' lp bug: https://launchpad.net/bugs/669957 fixed bzr revid: niels@bubbles-it.be-20101102153507-xy0yp3vouif0holl --- addons/fetchmail/fetchmail_view.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 1d0cf21be08..11a988b7093 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -71,8 +71,8 @@ form tree,form - {'type':'pop'} - [('type','=','pop')] + {'server_type':'pop'} + [('server_type','=','pop')] form tree,form - {'type':'imap'} - [('type','=','imap')] + {'server_type':'imap'} + [('server_type','=','imap')] form tree,form - {'type':'imap'} - [('type','=','imap')] + {'server_type':'imap'} + [('server_type','=','imap')] form tree,form - {'type':'pop'} - [('type','=','pop')] + {'server_type':'pop'} + [('server_type','=','pop')] Date: Tue, 2 Nov 2010 16:53:51 +0100 Subject: [PATCH 02/13] [REV] Reverted some changes to actions for servers (there the field IS 'type') bzr revid: niels@bubbles-it.be-20101102155351-byhpbklwf7t3ep12 --- addons/fetchmail/fetchmail_view.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index 11a988b7093..7f751f7c5a2 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -71,8 +71,8 @@ form tree,form - {'server_type':'pop'} - [('server_type','=','pop')] + {'type':'pop'} + [('type','=','pop')] form tree,form - {'server_type':'imap'} - [('server_type','=','imap')] + {'type':'imap'} + [('type','=','imap')] Date: Tue, 2 Nov 2010 17:58:07 +0100 Subject: [PATCH 03/13] [IMP] reindent html_view demo/example bzr revid: xmo@openerp.com-20101102165807-t907zgsih9edxnj5 --- addons/html_view/html_view.xml | 76 +++++++++++++++++----------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/addons/html_view/html_view.xml b/addons/html_view/html_view.xml index 7babda37c46..a279b408300 100644 --- a/addons/html_view/html_view.xml +++ b/addons/html_view/html_view.xml @@ -1,41 +1,41 @@ - - - htmlform - html.view - form - -
- -

This is Test Html Page

- - - - - - - -
- Name : - - - - Company : - - -
- - - -
- - - Html Test - ir.actions.act_window - html.view - form - - - + + + htmlform + html.view + form + +
+ +

This is Test Html Page

+ + + + + + + +
+ Name : + + + + Company : + + +
+ + + +
+ + + Html Test + ir.actions.act_window + html.view + form + + + \ No newline at end of file From 5f1f000193e83139f559ef1b84f7a1b7093852a6 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 2 Nov 2010 17:58:27 +0100 Subject: [PATCH 04/13] [IMP] pad: update_xml -> data in module descriptor bzr revid: xmo@openerp.com-20101102165827-ghyy19b83emwpc2i --- addons/pad/__openerp__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py index 4b5e3ca959e..01d2e3f0c1c 100644 --- a/addons/pad/__openerp__.py +++ b/addons/pad/__openerp__.py @@ -11,7 +11,7 @@ company customize which Pad installation should be used to link to new pads 'author': 'OpenERP SA', 'website': 'http://openerp.com', 'depends': ['base'], - 'update_xml': [ + 'data': [ 'company_pad.xml' ], 'installable': True, From 199387f4c6ac4b8f45974104acb7984471964ccc Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Tue, 2 Nov 2010 18:05:10 +0100 Subject: [PATCH 05/13] [FIX] account, generation form chart template: fixed the selection of default taxes for sale and purchase + small usability fixes bzr revid: qdp-launchpad@tinyerp.com-20101102170510-1n340469gxnflvl0 --- addons/account/account.py | 16 ++++++++-------- addons/account/account_view.xml | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/addons/account/account.py b/addons/account/account.py index 7cce45ad006..45474178977 100644 --- a/addons/account/account.py +++ b/addons/account/account.py @@ -2533,8 +2533,8 @@ class wizard_multi_charts_accounts(osv.osv_memory): 'bank_accounts_id': fields.one2many('account.bank.accounts.wizard', 'bank_account_id', 'Bank Accounts', required=True), 'code_digits':fields.integer('# of Digits', required=True, help="No. of Digits to use for account code"), 'seq_journal':fields.boolean('Separated Journal Sequences', help="Check this box if you want to use a different sequence for each created journal. Otherwise, all will use the same sequence."), - "sale_tax": fields.many2one("account.tax.template", "Sale Tax"), - "purchase_tax": fields.many2one("account.tax.template", "Purchase Tax"), + "sale_tax": fields.many2one("account.tax.template", "Default Sale Tax"), + "purchase_tax": fields.many2one("account.tax.template", "Default Purchase Tax"), } def onchange_chart_template_id(self, cr, uid, ids, chart_template_id=False, context=None): res = {} @@ -2542,12 +2542,12 @@ class wizard_multi_charts_accounts(osv.osv_memory): res['value']["sale_tax"] = False res['value']["purchase_tax"] = False if chart_template_id: - ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" - , "=", chart_template_id)], order="sequence") - if len(ids) > 0: - id=ids[0] - res['value']["sale_tax"] = id - res['value']["purchase_tax"] = id + sale_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" + , "=", chart_template_id), ('type_tax_use', 'in', ('sale','all'))], order="sequence") + purchase_tax_ids = self.pool.get('account.tax.template').search(cr, uid, [("chart_template_id" + , "=", chart_template_id), ('type_tax_use', 'in', ('purchase','all'))], order="sequence") + res['value']["sale_tax"] = sale_tax_ids and sale_tax_ids[0] or False + res['value']["purchase_tax"] = purchase_tax_ids and purchase_tax_ids[0] or False return res def _get_chart(self, cr, uid, context={}): diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml index a829e4b2955..320d5b1089e 100644 --- a/addons/account/account_view.xml +++ b/addons/account/account_view.xml @@ -2419,8 +2419,8 @@ - - + +
@@ -2467,7 +2467,7 @@ action = self.pool.get('res.config').next(cr, uid, [], context) New Company Financial Setting - STOCK_JUSTIFY_FILL + STOCK_EXECUTE From a11edd028ede4d8792d0be48863efcb009263f48 Mon Sep 17 00:00:00 2001 From: "qdp-launchpad@tinyerp.com" <> Date: Tue, 2 Nov 2010 18:07:13 +0100 Subject: [PATCH 06/13] [IMP] purchase: usability changes bzr revid: qdp-launchpad@tinyerp.com-20101102170713-r8sji2zac7638nt7 --- addons/purchase/purchase.py | 4 ++-- addons/purchase/purchase_view.xml | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/addons/purchase/purchase.py b/addons/purchase/purchase.py index 3145979d7b0..5291df7d258 100644 --- a/addons/purchase/purchase.py +++ b/addons/purchase/purchase.py @@ -297,10 +297,10 @@ class purchase_order(osv.osv): managers.append(manager.id) for manager_id in managers: request.create(cr, uid,{ - 'name' : "Purchase amount over the limit", + 'name' : _("Purchase amount over the limit"), 'act_from' : uid, 'act_to' : manager_id, - 'body': 'Somebody has just confirmed a purchase with an amount over the defined limit', + 'body': _('Somebody has just confirmed a purchase with an amount over the defined limit'), 'ref_partner_id': po.partner_id.id, 'ref_doc1': 'purchase.order,%d' % (po.id,), }) diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 18317f2cff1..fbb05024c29 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -41,7 +41,7 @@ parent="base.menu_purchase_root" sequence="4"/> + groups="base.group_extended"/> @@ -147,8 +147,7 @@