odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[Merge] Merge outlook improvement 

bzr revid: sbh@tinyerp.com-20101221064230-mvyhauz4qr4z42c9
This commit is contained in:
Sbh (OpenERP) 2010-12-21 12:12:30 +05:30
parent c516bede92 ae8d972baf
commit fe7e395e20
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account/account.py
View File

@ -708,7 +708,9 @@ class account_journal(osv.osv):
return self.name_get(cr, user, ids, context=context)
def onchange_type(self, cr, uid, ids, type, currency):
def onchange_type(self, cr, uid, ids, type, currency,context=None):
if context is None:
context = {}
obj_data = self.pool.get('ir.model.data')
user_pool = self.pool.get('res.users')

1
addons/account/invoice.py
View File

@ -1313,7 +1313,6 @@ class account_invoice_line(osv.osv):
if context is None:
context = {}
company_id = context.get('company_id',False)
tax_obj = self.pool.get('account.tax')
if not partner_id:
raise osv.except_osv(_('No Partner Defined !'),_("You must first select a partner !") )
if not product:

2
addons/outlook/installer.py
View File

@ -39,7 +39,7 @@ class outlook_installer(osv.osv_memory):
_columns = {
'name':fields.char('File name', size=34),
'doc_name':fields.char('File name', size=64),
'outlook':fields.boolean('Outlook Plug-in ', help="Allows you to select an object that you’d like to add to your email and its attachments."),
'outlook':fields.boolean('Outlook Plug-in ', help="Allows you to select an object that you would like to add to your email and its attachments."),
'plugin_file':fields.binary('Outlook Plug-in', readonly=True, help="outlook plug-in file. Save as this file and install this plug-in in outlook."),
'doc_file':fields.char('Installation Manual',size="264",help="The documentation file :- how to install Outlook Plug-in.", readonly=True),
'description':fields.text('Description', readonly=True)