Jigar Amin  (OpenERP) has proposed merging 
lp:~openerp-dev/openobject-addons/trunk-import_salesforce-b9_querymore-jam into 
lp:~openerp-dev/openobject-addons/trunk-import_salesforce.

Requested reviews:
  Søren Bregnholm Hansen (sbh)

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import_salesforce-b9_querymore-jam/+merge/67531

changes : Import Salesforce
  1) Implemented "quryMore" for calling available data in default batch size of 
500.
  2) and Removed the "Import" Menu from import_salesforce and used the parent 
from import_base
Kindly review this
Thank You
-- 
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-import_salesforce-b9_querymore-jam/+merge/67531
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-07 13:53:03 +0000
+++ import_salesforce/wizard/import_salesforce.py	2011-07-11 11:35:58 +0000
@@ -101,18 +101,13 @@
     def get_data(self, table):
         table_origin = table
         table = self.get_salesforce_table(table)
-        sql = "SELECT " + ', '.join(self.remove_body(self.object_description[table].fields)) + " FROM " + table + self.get_where_clause(table_origin)
-        print sql # for debugging
+        sql = "SELECT " + ', '.join(self.object_description[table].fields) + " FROM " + table + self.get_where_clause(table_origin)
         res = self._SFCLIENT.query(sql)
-        pp.pprint(res)
-        return res
-    
-    def remove_body(self, fields):
-        res = []
-        for f in fields:
-            if f != 'Body':
-                res.append(f)
-        return res
+        data = res
+        while res['done'] != 'false' and res['queryLocator']:
+            res = self._SFCLIENT.queryMore(res['queryLocator'])
+            data += res
+        return data
 
     def get_mapping(self):
         return {
@@ -560,7 +555,6 @@
     def import_attachment(self, val):
         parent = val.get('ParentId')
         if parent:
-            print "ParentID"
             #the prefix of the id give us the table name, just look in the prefix table
             table = self.prefix_table.get(parent[0:3])
             xmlid = self.xml_id_exist(table, val.get('ParentId'))
@@ -572,7 +566,6 @@
                 elif model:
                     val['Model'] = model
                     val['ResourceId'] = res_id
-        print "attachment", val.get('ResourceId'), val.get('Model'), val.get('Name'), val.get('PartnerID')
         return val
 
     def get_attachment_mapping(self):

=== modified file 'import_salesforce/wizard/import_salesforce_view.xml'
--- import_salesforce/wizard/import_salesforce_view.xml	2011-07-04 10:52:49 +0000
+++ import_salesforce/wizard/import_salesforce_view.xml	2011-07-11 11:35:58 +0000
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-        <!-- Menu for SalesForce Import Wizard-->
-        <menuitem id="menu_import" name="Import" parent="base.menu_base_partner" />
-
         <!--Form View for the model import sf for webservices-->
         <record model="ir.ui.view" id="view_import_sf_webservice_form">
             <field name="name">import.saleforce.webservice.form</field>
@@ -80,7 +77,7 @@
         </record>
 
         <!--wizard under importsalesforce menu-->
-        <menuitem id="menu_salesforce_service" name="Import Salesforce" parent="menu_import" action="action_view_import_sf_webservice_form" icon="STOCK_EXECUTE"/>
+        <menuitem id="menu_salesforce_service" name="Import Salesforce" parent="import_base.menu_import_crm" action="action_view_import_sf_webservice_form" icon="STOCK_EXECUTE"/>
 
 
         <record model="ir.ui.view" id="view_salesforce_login_services_form">

_______________________________________________
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

Reply via email to