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

[MERGE] 

bzr revid: fp@tinyerp.com-20120928082545-4zzdohcah1f04w2e
This commit is contained in:
Fabien Pinckaers 2012-09-28 10:25:45 +02:00
parent b9f009cd50 adcc716bec
commit e752799344
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/import_google/wizard/google_import_message_view.xml
View File

@ -10,6 +10,9 @@
<group>
<field name='name'/>
</group>
<footer>
<button string="Close" class="oe_highlight" special="cancel" />
</footer>
</form>
</field>
</record>

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

@ -104,7 +104,7 @@ class synchronize_google(osv.osv_memory):
_columns = {
'customer': fields.boolean('Customer', help="Check this box to set newly created partner as Customer."),
'supplier': fields.boolean('Supplier', help="Check this box to set newly created partner as Supplier."),
'group_name': fields.selection(_get_group, "Group Name",help="Choose which group to import, By default it takes all."),
'group_name': fields.selection(_get_group, "Group Name", help="Choose which group to import, By default it takes all."),
'calendar_name': fields.selection(_get_calendars, "Calendar Name"),
}

4
addons/import_google/wizard/import_google_data_view.xml
View File

@ -7,7 +7,7 @@
<field name="arch" type="xml">
<form string="Import contacts from a google account" version="7.0">
<group colspan="4" col="4" width="430">
<field name="group_name" colspan="4"/>
<field name="group_name" colspan="4" required="1"/>
<newline/>
<group colspan="4" col="4">
<separator string="Partner Status for this Group:" colspan="4"/>
@ -32,7 +32,7 @@
<field name="arch" type="xml">
<form string="Import Google Calendar Events" version="7.0">
<group colspan="4" col="4" width="320">
<field name="calendar_name" />
<field name="calendar_name" required="1"/>
</group>
<footer>
<button name="import_google" string="_Import Events" type="object" class="oe_highlight" />