From 43951ef5b42310889ff4b5ce6f14e1bb5a3f327c Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Wed, 3 Oct 2012 15:07:42 +0530 Subject: [PATCH 1/4] [IMP]rename field and improve code for removing error bzr revid: sgo@tinyerp.com-20121003093742-waibinp6s7t6ismv --- addons/crm/crm_lead.py | 2 +- addons/sale/sale.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index 7e33f397e8a..cfa30a48b7b 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -776,7 +776,7 @@ class crm_lead(base_stage, format_address, osv.osv): 'default_user_id': uid, 'default_section_id': opportunity.section_id and opportunity.section_id.id or False, 'default_email_from': opportunity.email_from, - 'default_state': 'open', + 'default_state': 'needs-action', 'default_name': opportunity.name, } return res diff --git a/addons/sale/sale.py b/addons/sale/sale.py index c47bf1357c8..5f12d302f10 100644 --- a/addons/sale/sale.py +++ b/addons/sale/sale.py @@ -694,7 +694,7 @@ class sale_order_line(osv.osv): _description = 'Sales Order Line' _columns = { 'order_id': fields.many2one('sale.order', 'Order Reference', required=True, ondelete='cascade', select=True, readonly=True, states={'draft':[('readonly',False)]}), - 'name': fields.text('Product Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}), + 'name': fields.text('Description', size=256, required=True, select=True, readonly=True, states={'draft': [('readonly', False)]}), 'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of sales order lines."), 'product_id': fields.many2one('product.product', 'Product', domain=[('sale_ok', '=', True)], change_default=True), 'invoice_lines': fields.many2many('account.invoice.line', 'sale_order_line_invoice_rel', 'order_line_id', 'invoice_id', 'Invoice Lines', readonly=True), From 45eb7b676bc1caf8cabbf849d70501b958c78130 Mon Sep 17 00:00:00 2001 From: Jigar Amin Date: Fri, 5 Oct 2012 14:37:40 +0530 Subject: [PATCH 2/4] [FIX] crm : Oppoertunity to Meeting state field id Depricated not needed anymore. bzr revid: jam@tinyerp.com-20121005090740-jgun1jodxng11owe --- addons/crm/crm_lead.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py index cfa30a48b7b..ff03beda550 100644 --- a/addons/crm/crm_lead.py +++ b/addons/crm/crm_lead.py @@ -776,7 +776,6 @@ class crm_lead(base_stage, format_address, osv.osv): 'default_user_id': uid, 'default_section_id': opportunity.section_id and opportunity.section_id.id or False, 'default_email_from': opportunity.email_from, - 'default_state': 'needs-action', 'default_name': opportunity.name, } return res From 362b1ef843db9f8060e5fa20c5daf5091a44576f Mon Sep 17 00:00:00 2001 From: "Sanjay Gohel (Open ERP)" Date: Wed, 10 Oct 2012 14:54:10 +0530 Subject: [PATCH 3/4] [IMP]resolve security restriction for user bzr revid: sgo@tinyerp.com-20121010092410-3be51cvvv3jcap2g --- addons/mail/mail_message.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/mail/mail_message.py b/addons/mail/mail_message.py index bbf68509277..11fe5d27eba 100644 --- a/addons/mail/mail_message.py +++ b/addons/mail/mail_message.py @@ -496,9 +496,7 @@ class mail_message(osv.Model): other_ids = set(ids).difference(set(notified_ids), set(author_ids), set(doc_follower_ids), set(document_related_ids)) if not other_ids: return - raise orm.except_orm(_('Access Denied'), - _('The requested operation cannot be completed due to security restrictions. Please contact your system administrator.\n\n(Document type: %s, Operation: %s)') % \ - (self._description, operation)) + return False def create(self, cr, uid, values, context=None): if not values.get('message_id') and values.get('res_id') and values.get('model'): From 2191382ce35cbce143315e2911db3b950275b71c Mon Sep 17 00:00:00 2001 From: Amit Patel Date: Wed, 10 Oct 2012 18:11:15 +0530 Subject: [PATCH 4/4] [IMP]:improved code bzr revid: apa@tinyerp.com-20121010124115-cfsqfursxprfhgrx --- addons/hr_recruitment/hr_recruitment.py | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py index ccfcae0d26e..56c517620e0 100644 --- a/addons/hr_recruitment/hr_recruitment.py +++ b/addons/hr_recruitment/hr_recruitment.py @@ -297,7 +297,6 @@ class hr_applicant(base_stage, osv.Model): res['context'] = { 'default_partner_ids': applicant.partner_id and [applicant.partner_id.id] or False, 'default_user_id': uid, - 'default_state': 'open', 'default_name': applicant.name, 'default_categ_ids': category and [category.id] or False, }