From 2e138b0d0d65e691bd324e3c9f072f5b9c3ef844 Mon Sep 17 00:00:00 2001 From: "Ujjvala Collins (OpenERP)" Date: Tue, 12 Apr 2011 10:26:42 +0530 Subject: [PATCH 1/5] [FIX] : Fixed partner label report bug. bzr revid: uco@tinyerp.com-20110412045642-d2gpgoyzmi00glio --- openerp/addons/base/res/partner/report/partner_address.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/res/partner/report/partner_address.xml b/openerp/addons/base/res/partner/report/partner_address.xml index a6865f88153..2a413f4e3c6 100644 --- a/openerp/addons/base/res/partner/report/partner_address.xml +++ b/openerp/addons/base/res/partner/report/partner_address.xml @@ -1,11 +1,11 @@
- + - + <title type="field" name="title.name"/> <name type="field" name="name"/> <street type="field" name="street"/> <street2 type="field" name="street2"/> From 59ee56541c419268aafd7890396923459d903a53 Mon Sep 17 00:00:00 2001 From: "AMP (OpenERP)" <amp@tinyerp.com> Date: Thu, 14 Apr 2011 15:22:31 +0530 Subject: [PATCH 2/5] [FIX] base : Fixes the partner manager group problem bzr revid: amp@tinyerp.com-20110414095231-jltmqb3i22z4s7i3 --- openerp/addons/base/res/res_security.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openerp/addons/base/res/res_security.xml b/openerp/addons/base/res/res_security.xml index 9185ec2dcac..df80f90373c 100644 --- a/openerp/addons/base/res/res_security.xml +++ b/openerp/addons/base/res/res_security.xml @@ -12,6 +12,9 @@ <record model="ir.ui.menu" id="menu_base_config"> <field eval="[(6,0,[ref('group_system'), ref('group_partner_manager')])]" name="groups_id"/> </record> + <record model="ir.ui.menu" id="menu_base_partner"> + <field eval="[(6,0,[ref('group_partner_manager')])]" name="groups_id"/> + </record> <!-- Record Rule For Company --> From da64dc059f21cbd1fcf07f11a78df613b8ae2c2d Mon Sep 17 00:00:00 2001 From: "Anup (OpenERP)" <ach@tinyerp.com> Date: Tue, 19 Apr 2011 14:33:43 +0530 Subject: [PATCH 3/5] [FIX] base : Now It's Possible to save languages that have code having size>5 bzr revid: ach@tinyerp.com-20110419090343-7h35qwblnfeotsg2 --- openerp/addons/base/res/partner/partner.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py index a2de7f9d154..f02260a520f 100644 --- a/openerp/addons/base/res/partner/partner.py +++ b/openerp/addons/base/res/partner/partner.py @@ -116,7 +116,7 @@ class res_partner(osv.osv): 'parent_id': fields.many2one('res.partner','Parent Partner'), 'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'), 'ref': fields.char('Reference', size=64, select=1), - 'lang': fields.selection(_lang_get, 'Language', size=5, help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."), + 'lang': fields.selection(_lang_get, 'Language', help="If the selected language is loaded in the system, all documents related to this partner will be printed in this language. If not, it will be english."), 'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'), 'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."), 'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'), From 8cd3b960193f5709cbaf73f1575ed7d7bd454f00 Mon Sep 17 00:00:00 2001 From: "AMP (OpenERP)" <amp@tinyerp.com> Date: Tue, 19 Apr 2011 18:41:54 +0530 Subject: [PATCH 4/5] [FIX] Usability : Usability Improvement bzr revid: amp@tinyerp.com-20110419131154-1ucsrn7wtpq83apg --- .../base/publisher_warranty/publisher_warranty_view.xml | 5 +++-- openerp/addons/base/res/bank_view.xml | 2 +- openerp/addons/base/res/partner/partner.py | 4 ++-- openerp/addons/base/res/res_currency.py | 6 +++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml index 7ee95eecde9..8c40d0a1c6b 100644 --- a/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml +++ b/openerp/addons/base/publisher_warranty/publisher_warranty_view.xml @@ -37,9 +37,10 @@ <field name="check_opw"/> </group> <group col="2" colspan="3"> - <button name="check_validity" string="Validate" type="object" + <button name="check_validity" icon="camera_test.png +" string="Validate" type="object" attrs="{'invisible':[('state','in',['valid', 'terminated', 'canceled'])]}"/> - <button name="check_validity" string="Refresh Validation Dates" type="object" + <button name="check_validity" icon="camera_test.png" string="Refresh Validation Dates" type="object" attrs="{'invisible':[('state','in',['unvalidated'])]}"/> </group> </group> diff --git a/openerp/addons/base/res/bank_view.xml b/openerp/addons/base/res/bank_view.xml index 2929055b21e..10c78e847a2 100644 --- a/openerp/addons/base/res/bank_view.xml +++ b/openerp/addons/base/res/bank_view.xml @@ -25,7 +25,7 @@ <group colspan="2" col="2"> <field name="phone"/> <field name="fax"/> - <field name="email"/> + <field name="email" widget="email"/> </group> </form> </field> diff --git a/openerp/addons/base/res/partner/partner.py b/openerp/addons/base/res/partner/partner.py index a2de7f9d154..f773a101827 100644 --- a/openerp/addons/base/res/partner/partner.py +++ b/openerp/addons/base/res/partner/partner.py @@ -112,7 +112,7 @@ class res_partner(osv.osv): _columns = { 'name': fields.char('Name', size=128, required=True, select=True), 'date': fields.date('Date', select=1), - 'title': fields.many2one('res.partner.title','Partner Form'), + 'title': fields.many2one('res.partner.title','Partner Firm'), 'parent_id': fields.many2one('res.partner','Parent Partner'), 'child_ids': fields.one2many('res.partner', 'parent_id', 'Partner Ref.'), 'ref': fields.char('Reference', size=64, select=1), @@ -120,7 +120,7 @@ class res_partner(osv.osv): 'user_id': fields.many2one('res.users', 'Salesman', help='The internal user that is in charge of communicating with this partner if any.'), 'vat': fields.char('VAT',size=32 ,help="Value Added Tax number. Check the box if the partner is subjected to the VAT. Used by the VAT legal statement."), 'bank_ids': fields.one2many('res.partner.bank', 'partner_id', 'Banks'), - 'website': fields.char('Website',size=64, help="Website of Partner"), + 'website': fields.char('Website',size=64, help="Website of Partner."), 'comment': fields.text('Notes'), 'address': fields.one2many('res.partner.address', 'partner_id', 'Contacts'), 'category_id': fields.many2many('res.partner.category', 'res_partner_category_rel', 'partner_id', 'category_id', 'Categories'), diff --git a/openerp/addons/base/res/res_currency.py b/openerp/addons/base/res/res_currency.py index 2565d471cd3..caa97ec0339 100644 --- a/openerp/addons/base/res/res_currency.py +++ b/openerp/addons/base/res/res_currency.py @@ -49,12 +49,12 @@ class res_currency(osv.osv): _columns = { # Note: 'code' column was removed as of v6.0, the 'name' should now hold the ISO code. 'name': fields.char('Currency', size=32, required=True, help="Currency Code (ISO 4217)"), - 'symbol': fields.char('Symbol', size=3, help="Currency sign, to be used when printing amounts"), + 'symbol': fields.char('Symbol', size=3, help="Currency sign, to be used when printing amounts."), 'rate': fields.function(_current_rate, method=True, string='Current Rate', digits=(12,6), - help='The rate of the currency to the currency of rate 1'), + help='The rate of the currency to the currency of rate 1.'), 'rate_ids': fields.one2many('res.currency.rate', 'currency_id', 'Rates'), 'accuracy': fields.integer('Computational Accuracy'), - 'rounding': fields.float('Rounding factor', digits=(12,6)), + 'rounding': fields.float('Rounding Factor', digits=(12,6)), 'active': fields.boolean('Active'), 'company_id':fields.many2one('res.company', 'Company'), 'date': fields.date('Date'), From 6e516475ee4896a053d3227d93c2603ac23afe08 Mon Sep 17 00:00:00 2001 From: "Naresh (OpenERP)" <nch@tinyerp.com> Date: Wed, 20 Apr 2011 11:19:47 +0530 Subject: [PATCH 5/5] [FIX]:editing shortcuts from client were not dispalying the changes bzr revid: nch@tinyerp.com-20110420054947-t02qg7sm8g5vzcuf --- openerp/addons/base/ir/ir_ui_view.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/ir/ir_ui_view.py b/openerp/addons/base/ir/ir_ui_view.py index b342235133e..1600fa62d90 100644 --- a/openerp/addons/base/ir/ir_ui_view.py +++ b/openerp/addons/base/ir/ir_ui_view.py @@ -196,13 +196,10 @@ class view_sc(osv.osv): def get_sc(self, cr, uid, user_id, model='ir.ui.menu', context=None): ids = self.search(cr, uid, [('user_id','=',user_id),('resource','=',model)], context=context) - results = self.read(cr, uid, ids, ['res_id'], context=context) - name_map = dict(self.pool.get(model).name_get(cr, uid, [x['res_id'] for x in results], context=context)) + results = self.read(cr, uid, ids, ['res_id','name'], context=context) + available_menus = self.pool.get(model).search(cr, uid, [], context=context) # Make sure to return only shortcuts pointing to exisintg menu items. - filtered_results = filter(lambda result: result['res_id'] in name_map, results) - for result in filtered_results: - result.update(name=name_map[result['res_id']]) - return filtered_results + return filter(lambda result: result['res_id'] in available_menus, results) _order = 'sequence,name' _defaults = {