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

[MERGE]merge with parent branch 

bzr revid: sgo@tinyerp.com-20120606114151-btknqh6cvilt49vn
bzr revid: sgo@tinyerp.com-20120606120751-0j0kvlg64i8k57g1
This commit is contained in:
Sanjay Gohel (Open ERP) 2012-06-06 17:37:51 +05:30
parent f462764fd7 60187c8998
commit 645b37da0c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/account_bank_statement_extensions/account_bank_statement_view.xml
View File

@ -51,10 +51,10 @@
<field name="globalisation_id" string="Glob. Id"/>
<field name="state" invisible="1"/>
</xpath>
<xpath expr="//field[@name='date']" position="after">
<xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='date']" position="after">
<field name="val_date"/>
</xpath>
<xpath expr="//field[@name='amount']" position="after">
<xpath expr="//page[@name='statement_line_ids']/field[@name='line_ids']/form/group/field[@name='amount']" position="after">
<field name="globalisation_id"/>
<field name="state" invisible="1"/>
</xpath>

6
addons/import_google/wizard/import_google_data.py
View File

@ -65,10 +65,12 @@ class synchronize_google(osv.osv_memory):
_name = 'synchronize.google.import'
def _get_group(self, cr, uid, context=None):
# why this method is call when module is load???
# all the selection field which have method are called at load time. why ?
res = []
if context:
user_obj = self.pool.get('res.users').browse(cr, uid, uid,context)
user_obj = self.pool.get('res.users').browse(cr, uid, uid,context=context)
google=self.pool.get('google.login')
if not user_obj.gmail_user or not user_obj.gmail_password:
raise osv.except_osv(_('Warning !'), _("No Google Username or password Defined for user.\nPlease define in user view"))