Jigar Amin (OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-import_salesforce-b9_document-jam into
lp:~openerp-dev/openobject-addons/trunk-import_salesforce.
Requested reviews:
Bhumika (OpenERP) (sbh-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import_salesforce-b9_document-jam/+merge/67659
Changes - Document :
- Merged document and folder checkbox => just "Documents" and in the tool-tip
improved.
Kindly review this
Thank You
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import_salesforce-b9_document-jam/+merge/67659
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-import_salesforce.
=== modified file 'import_salesforce/wizard/import_salesforce.py'
--- import_salesforce/wizard/import_salesforce.py 2011-07-11 11:28:55 +0000
+++ import_salesforce/wizard/import_salesforce.py 2011-07-12 06:56:23 +0000
@@ -883,8 +883,7 @@
'contact': fields.boolean('Contacts', help="If Contacts is checked, SalesFroce Contact data imported to OpenERP Partner Address."),
'case': fields.boolean('Cases/Claims', help="If Cases/Claims is checked, SalesFroce Cases data imported to OpenERP CRM Claim."),
'event': fields.boolean('Events/Meetings', help="If Events/Meetings is checked, SalesFroce Cases data imported to OpenERP Meetings."),
- 'folder': fields.boolean('Folders/Directories', help="If Folders/Directories checked, SalesFroce Folder data imported to OpenERP Directory."),
- 'document': fields.boolean('Documents', help="If Documents checked, SalesFroce Folder data imported to OpenERP Documents."),
+ 'document': fields.boolean('Documents', help="If Documents is checked all the document and document structure (Folders) in salesforce are going to be imported into OpenERP"),
'attachment': fields.boolean('Attachments', help="If Attachments is checked, SalesFroce attachments data will imported to OpenERP Attachments, and if resource of the attachment is imported and it will linked to the respective documents."),
'task': fields.boolean('Activities', help="If Activities is checked, SalesFroce Activities data will imported to OpenERP Meetings"),
'product': fields.boolean('Products', help="If Products is checked, SalesFroce Products data imported to OpenERP Products"),
@@ -921,10 +920,8 @@
nodes.append('Task')
if current.attachment:
nodes.append('Attachment')
- if current.folder:
- nodes.append('Folder')
if current.document:
- nodes.append('Document')
+ nodes.extend(['Folder' ,'Document'])
if current.product:
nodes.append('Product2')
return nodes
=== modified file 'import_salesforce/wizard/import_salesforce_view.xml'
--- import_salesforce/wizard/import_salesforce_view.xml 2011-07-11 11:32:11 +0000
+++ import_salesforce/wizard/import_salesforce_view.xml 2011-07-12 06:56:23 +0000
@@ -34,7 +34,6 @@
</group>
<group colspan="2" col="2">
<separator string="Document :" colspan="2"/>
- <field name='folder'/>
<field name='document'/>
<field name='attachment'/>
</group>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
