Merge lp:~apatel-serpentcs/openerp-usa/amazon_connector into lp:~faisal-basar/openerp-usa/Amazon-Connector

[Serpent Consulting Services]

[lp:~apatel-serpentcs/openerp-usa/amazon_connector]

3. By Anu Patel(SerpentCS) on 2013-07-23

[IMP] Improved the Code.

[Faisal (faisal-basar)]

Approved

review: Approve

Unmerged revisions

3. By Anu Patel(SerpentCS) on 2013-07-23

[IMP] Improved the Code.

2. By Anu Patel(SerpentCS) on 2013-07-23

[IMP] renamed the branch.

=== modified file '__init__.py'
--- __init__.py	2012-05-08 11:49:19 +0000
+++ __init__.py	2013-07-23 09:16:27 +0000
@@ -10,5 +10,3 @@
 import wizard
 import invoice_stock
 import product_images
-
-

=== modified file '__openerp__.py'
--- __openerp__.py	2012-05-08 11:49:19 +0000
+++ __openerp__.py	2013-07-23 09:16:27 +0000
@@ -2,15 +2,15 @@
 {
     "name" : "Amazon e-commerce",
     "version" : "1.0",
-    "depends" : ["base","product","sale",'base_sale_multichannels','product_images_olbs'],
+    "depends" : ["base","product","sale",'base_sale_multichannels','product_images'],
     "author" : "Bista Solutions",
     "description": """Amazon E-commerce management""",
     "website" : "http://www.bistasolutions.com/",
     "category" : "Generic Modules",
     "init_xml" : [],
     "demo_xml" : [],
-    "update_xml" : [
-        'security/ir.model.access.csv',
+    'data': [
+            'security/ir.model.access.csv',
             'amazon_view.xml',
             'product_view.xml',
             'partner_view.xml',
@@ -21,7 +21,8 @@
             'category_attribute.xml',
             'wizard/amazon_product_lookup.xml',
             'product_images_view.xml',
-            'magento_sale.xml'
+            'magento_sale.xml',
+           
                     ],
     "active": False,
     "installable": True,

=== modified file 'amazon.py'
--- amazon.py	2012-05-08 11:49:19 +0000
+++ amazon.py	2013-07-23 09:16:27 +0000
@@ -106,7 +106,8 @@
             postalcode = resultvals['PostalCode']
         else:
             postalcode = ''
-        address_id = self.pool.get('res.partner.address').search(cr,uid, [('country_id','=',country_id),('state_id','=',state_id),('city','=',city),('street','=',street),('zip','=',postalcode)])
+        address_id = self.pool.get('res.partner').search(cr,uid, [('country_id','=',country_id),('state_id','=',state_id),('city','=',city),('street','=',street),('zip','=',postalcode)])
+#        address_id = self.pool.get('res.partner.address').search(cr,uid, [('country_id','=',country_id),('state_id','=',state_id),('city','=',city),('street','=',street),('zip','=',postalcode)])
         if address_id:
             address_id = address_id
         if not address_id:
@@ -118,10 +119,11 @@
                 'phone' : resultvals.get('Phone',False) and resultvals['Phone'] or False,
                 'zip' : postalcode,
                 'state_id' : state_id,
-                'partner_id' : part_id,
+#                'partner_id' : part_id,
                 'type' : 'default',
             }
-            address_id = self.pool.get('res.partner.address').create(cr,uid,addressvals)
+            address_id = self.pool.get('res.partner').create(cr,uid,addressvals)
+#            address_id = self.pool.get('res.partner.address').create(cr,uid,addressvals)
         return address_id
 
     def updatePartner(self, cr, uid, id, shop_id, resultvals, part_id=0, context={}):

=== modified file 'amazon_view.xml'
--- amazon_view.xml	2012-05-08 11:49:19 +0000
+++ amazon_view.xml	2013-07-23 09:16:27 +0000
@@ -3,42 +3,42 @@
         <data>
 	       <!-- Amazon Form -->
             <record id="amazon_instance_form_view" model="ir.ui.view">
-                <field name="name">amazon.instance.form</field>
-	        <field name="type">form</field>
+            	<field name="name">amazon.instance.form</field>
                 <field name="model">amazon.instance</field>
                 <field name="arch" type="xml">
-                    <form string="Amazon Instance">
-                        <group colspan="4">
-                            <field name="name" colspan="4" select="1"/>
-                        </group>
-                        <notebook colspan="4">
-                            <page string="Authentication">
-                                <group colspan="4" col="4">
-                                    <separator string="Amazon Seller Account Credentials" colspan="4"/>
-                                        <field name="aws_access_key_id"/>
-                                        <field name="aws_secret_access_key"/>
-                                        <field name="aws_market_place_id"/>
-                                        <field name="aws_merchant_id"/>
-                                        
-                                </group>
-                                <!--<button name="import_cat" string="Import Categories" colspan="4" type="object" />-->
-                            </page>
-                        </notebook>
-                        </form>
+                    <form string="Amazon Instance" version="7.0">
+                        <sheet>
+	                        <group colspan="4">
+	                            <field name="name" colspan="4" select="1"/>
+	                        </group>
+	                        <notebook colspan="4">
+	                            <page string="Authentication">
+	                                <group colspan="4" col="4">
+	                                    <separator string="Amazon Seller Account Credentials" colspan="4"/>
+	                                        <field name="aws_access_key_id"/>
+	                                        <field name="aws_secret_access_key"/>
+	                                        <field name="aws_market_place_id"/>
+	                                        <field name="aws_merchant_id"/>
+	                                        
+	                                </group>
+	                                <!--<button name="import_cat" string="Import Categories" colspan="4" type="object" />-->
+	                            </page>
+	                        </notebook>
+                        </sheet>
+                   </form>
                 </field>
             </record>
             
 	    <record model="ir.ui.view" id="view_patient_info_tree">
-            	<field name="name">amazon.instance.tree</field>
+            <field name="name">amazon.instance.tree</field>
 	        <field name="model">amazon.instance</field>
-           	<field name="type">tree</field>
 	        <field name="arch" type="xml">
-                <tree string="Amazon Instance">
-			<field name="name"/>
+            	<tree string="Amazon Instance">
+					<field name="name"/>
                 	<field name="aws_access_key_id"/>
-                        <field name="aws_secret_access_key"/>
-                        <field name="aws_market_place_id"/>
-                        <field name="aws_merchant_id"/>
+                    <field name="aws_secret_access_key"/>
+                    <field name="aws_market_place_id"/>
+                    <field name="aws_merchant_id"/>
                 </tree>
             </field>
         </record>
@@ -57,27 +57,27 @@
         <!-- Amazon Browse Nodes Form,Tree Menu Action  by safan-->
             <record id="amazon_browse_node_form_view" model="ir.ui.view">
                 <field name="name">amazon.browse.node.form</field>
-	        <field name="type">form</field>
                 <field name="model">amazon.browse.node</field>
                 <field name="arch" type="xml">
-                    <form string="Amazon Browse Node">
-                        <group colspan="4">
-                            <field name="browse_node_name" colspan="4" select="1"/>
-                            <separator string="Available Browse Node Country" colspan="4"/>
-                            <newline/>
-                            <field name="browse_node_country" nolabel="1" colspan="4" domain="[('code','in',['US','GB','JP','IT','FR','ES','DE','CN','CA'])]"/>
-                        </group>
+                    <form string="Amazon Browse Node" version="7.0">
+                        <sheet>
+	                        <group colspan="4">
+	                            <field name="browse_node_name" colspan="4" select="1"/>
+	                            <separator string="Available Browse Node Country" colspan="4"/>
+	                            <newline/>
+	                            <field name="browse_node_country" nolabel="1" colspan="4" domain="[('code','in',['US','GB','JP','IT','FR','ES','DE','CN','CA'])]"/>
+	                        </group>
+                        </sheet>
                     </form>
                 </field>
             </record>
 
 	    <record model="ir.ui.view" id="view_browse_node_info_tree">
-            	<field name="name">amazon.browse.node.tree</field>
+            <field name="name">amazon.browse.node.tree</field>
 	        <field name="model">amazon.browse.node</field>
-           	<field name="type">tree</field>
 	        <field name="arch" type="xml">
                 <tree string="Amazon Browse Node">
-			<field name="browse_node_name"/>
+					<field name="browse_node_name"/>
                 </tree>
             </field>
         </record>

=== modified file 'category_attribute.xml'
--- category_attribute.xml	2012-05-08 11:49:19 +0000
+++ category_attribute.xml	2013-07-23 09:16:27 +0000
@@ -6,27 +6,27 @@
         <record id="view_category_attributes_form_amazon" model="ir.ui.view">
             <field name="name">view.category.attributes.form.amazon</field>
             <field name="model">amazon.category</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Amazon Categories">
-                   <field name="name" />
-                   
-                   <field name="amazon_attribute_ids" colspan="8"/>
-
+                <form string="Amazon Categories" version="7.0">
+                   <sheet>
+	                   <field name="name" />
+	                   <field name="amazon_attribute_ids" colspan="8"/>
+                   </sheet>
                </form>
             </field>
-            <!-- For Categories Master Tree View-->
         </record>
+        
+		<!-- For Categories Master Tree View-->
         <record id="view_category_attributes_tree_amazon" model="ir.ui.view">
             <field name="name">view.category.attributes.tree_amazon</field>
             <field name="model">amazon.category</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree  string="Amazon Categories">
                     <field name="name" />
                 </tree>
             </field>
         </record>
+        
         <!-- Action for the categories master-->
         <record id="action_amazon_category_master" model="ir.actions.act_window">
             <field name="name">Amazon Categories</field>
@@ -35,17 +35,17 @@
             <field name="view_mode">tree,form</field>
             <field name="view_id" ref="view_category_attributes_tree_amazon"/>
         </record>
+        
         <!--<menuitem id="menu_amazon_category" name="Categories" parent="menu_amazon_category_master" action="action_amazon_category_master" />-->
        <!--for Attributes Master Form View -->
         <record id="view_amazon_attributes_form" model="ir.ui.view">
             <field name="name">view.amazon.attributes.form</field>
             <field name="model">amazon.attribute</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Attributes">
-                    <field name="name" colspan="2"/>
-                    
-
+                <form string="Attributes" version="7.0">
+                    <sheet>
+                     	<field name="name" colspan="2"/>
+                   </sheet>
                 </form>
             </field>
         </record>
@@ -53,11 +53,9 @@
         <record id="view_amazon_attributes_tree" model="ir.ui.view">
             <field name="name">view.amazon.attributes.tree</field>
             <field name="model">amazon.attribute</field>
-            <field name="type">tree</field>
             <field name="arch" type="xml">
                 <tree string="Attributes">
                     <field name="name" />
-                    
                 </tree>
             </field>
         </record>

=== modified file 'invoice_stock.py'
--- invoice_stock.py	2012-05-08 11:49:19 +0000
+++ invoice_stock.py	2013-07-23 09:16:27 +0000
@@ -100,7 +100,17 @@
 
 class stock_partial_picking(osv.osv_memory):
     _inherit = 'stock.partial.picking'
-
+    
+    def get_picking_type(self, cr, uid, picking, context=None):
+        picking_type = picking.type
+        for move in picking.move_lines:
+            if picking.type == 'in' and move.product_id.cost_method == 'average':
+                picking_type = 'in'
+                break
+            else:
+                picking_type = 'out'
+        return picking_type
+    
     def do_partial(self, cr, uid, ids, context=None):
         """ Makes partial moves and pickings done.
         @param self: The object pointer.

=== modified file 'partner_view.xml'
--- partner_view.xml	2012-05-08 11:49:19 +0000
+++ partner_view.xml	2013-07-23 09:16:27 +0000
@@ -7,7 +7,7 @@
                 <field name="type">form</field>
                 <field name="inherit_id" ref="base.view_partner_form" />
                 <field name="arch" type="xml">
-                    <xpath expr="/form/notebook" position="inside">
+                    <xpath expr="/form/sheet/notebook" position="inside">
                         <page string="Amazon Information">
                             <separator string="Amazon Shops" colspan="4" />
                             <field colspan="4" name="amazon_shop_ids" nolabel="1" widget="one2many_list">
@@ -16,7 +16,7 @@
                                 </tree>
                             </field>
                         </page>
-                    </xpath>
+                    </xpath>   
                 </field>
             </record>
 </data>

=== modified file 'product_images_view.xml'
--- product_images_view.xml	2012-05-08 11:49:19 +0000
+++ product_images_view.xml	2013-07-23 09:16:27 +0000
@@ -4,13 +4,14 @@
 <record id="view_images_prod_amazon" model="ir.ui.view">
             <field name="name">view.images.prod.amazon</field>
             <field name="model">product.images</field>
-            <field name="type">form</field>
-            <field name="inherit_id" ref="product_images_olbs.view_product_image_form" />
+            <field name="inherit_id" ref="product_images.view_product_image_form" />
             <field name="arch" type="xml">
-                <xpath expr="/form/notebook" position="inside" >
+                <xpath expr="/form/sheet/notebook" position="inside" >
                     <page string="Amazon Images">
-                    <field name="amazon_url_location"/>
-                    <field name="preview_amazon" widget="image"/>
+                         <group>
+		                    <field name="amazon_url_location"/>
+		                    <field name="preview_amazon" widget="image"/>
+                    	</group>
                     </page>
                     </xpath>
             </field>

=== modified file 'product_view.xml'
--- product_view.xml	2012-05-08 11:49:19 +0000
+++ product_view.xml	2013-07-23 09:16:27 +0000
@@ -4,44 +4,51 @@
             <record id="product_amazon_form_view" model="ir.ui.view">
                 <field name="name">product.amazon.form.inherit</field>
                 <field name="model">product.product</field>
-                <field name="type">form</field>
                 <field name="inherit_id" ref="product.product_normal_form_view"/>
                 <field name="arch" type="xml">
                     <notebook position="inside">
                         <page string="Amazon Details">
-                            <separator string="Amazon Details" colspan="8"/>
-                            <field name="amazon_export"/>
-                            <!--<field name="amazon_sku" attrs="{'readonly':[('amazon_prod_status','in',('inactive','active'))]}"/>-->
-                            <newline/>
-                            <field name="amazon_sku" attrs="{'readonly':[('amazon_prod_status','in',('inactive','active'))]}"/>
-                            <field name="amazon_asin"/>
-                            <newline/>
-                            <field name="amzn_condtn" colspan="2" />
-                            <field name="condition_note" colspan="4" attrs="{'invisible':[('amzn_condtn','=','')]}"/>
-                            <field name="amz_type" on_change="onchange_amz_type(amz_type)"/>
-                            <field name="amz_type_value" attrs="{'required':[('amz_type','in',('UPC','EAN','ASIN','ISBN'))]}"/>
-                            <!--<field name="amazon_category" colspan="2" attrs="{'required':[('amazon_export','=',True)]}"/>-->
-                            <field name="amazon_category" colspan="2" invisible="1"/>
-                            <separator string="Submit Feed Details" colspan="8"/>
-                            <field name="amazon_prod_status" invisible="1"/>
-                            <field name="operation_performed" invisible="1"/>
-                            <field name="submit_feed_result" colspan="4"/>
-                            <separator string="Product Lookup" colspan="8"/>
-                            <field name="prod_query" colspan="4"/>
-                            <field name="prod_query_contextid"/>
-                            <field name="amazon_instance_id"/>
-                            <button name="amazon_product_lookup" string="Perform Amazon Product Search" colspan="2" type="object" />
-                            <!--<button name="amazon_product_by_salesrank" string="Perform Sales Rank Operation" colspan="2" type="object" />-->
-                            <!--<button name="amazon_submit_feed" string="Submit Feed" colspan="4" type="object" />-->
-                            <field name="amazon_products_ids" colspan="4" nolabel="1" mode="tree">
-                                <tree string="Amazon Products">
-                                    <field name="name" />
-                                    <field name="product_asin" />
-                                    <field name="product_category" />
-                                    <field name="product_id" />
-                                    <button name="action_process_amazon_details" string="View Amazon Product" icon="gtk-go-forward" type="object" />
-                                </tree>
-                          </field>
+                            <group>
+	                            <separator string="Amazon Details" colspan="8"/>
+	                            <group col="4" colspan="4">
+		                            <field name="amazon_export"/>
+		                            <!--<field name="amazon_sku" attrs="{'readonly':[('amazon_prod_status','in',('inactive','active'))]}"/>-->
+		                            <newline/>
+		                            <field name="amazon_sku" attrs="{'readonly':[('amazon_prod_status','in',('inactive','active'))]}"/>
+		                            <field name="amazon_asin"/>
+		                            <newline/>
+		                            <field name="amzn_condtn" colspan="2" />
+		                            <field name="condition_note" attrs="{'invisible':[('amzn_condtn','=','')]}"/>
+		                            <field name="amz_type" on_change="onchange_amz_type(amz_type)"/>
+		                            <field name="amz_type_value" attrs="{'required':[('amz_type','in',('UPC','EAN','ASIN','ISBN'))]}"/>
+		                            <!--<field name="amazon_category" colspan="2" attrs="{'required':[('amazon_export','=',True)]}"/>-->
+		                            <field name="amazon_category" colspan="2" invisible="1"/>
+	                            </group>
+	                            <separator string="Submit Feed Details" colspan="8"/>
+	                            <group col="4" colspan="4">
+		                            <field name="amazon_prod_status" invisible="1"/>
+		                            <field name="operation_performed" invisible="1"/>
+		                            <field name="submit_feed_result" colspan="4"/>
+	                            </group>
+	                            <separator string="Product Lookup" colspan="8"/>
+	                            <group col="4" colspan="4">
+		                            <field name="prod_query" colspan="4"/>
+		                            <field name="prod_query_contextid"/>
+		                            <field name="amazon_instance_id"/>
+		                            <button name="amazon_product_lookup" string="Perform Amazon Product Search" colspan="2" type="object" />
+		                            <!--<button name="amazon_product_by_salesrank" string="Perform Sales Rank Operation" colspan="2" type="object" />-->
+		                            <!--<button name="amazon_submit_feed" string="Submit Feed" colspan="4" type="object" />-->
+	                            </group>
+	                            <field name="amazon_products_ids" colspan="4" nolabel="1" mode="tree">
+	                                <tree string="Amazon Products">
+	                                    <field name="name" />
+	                                    <field name="product_asin" />
+	                                    <field name="product_category" />
+	                                    <field name="product_id" />
+	                                    <button name="action_process_amazon_details" string="View Amazon Product" icon="gtk-go-forward" type="object" />
+	                                </tree>
+	                          </field>
+                          </group>
                         </page>
                     </notebook>
                 </field>

=== modified file 'sale_view.xml'
--- sale_view.xml	2012-05-08 11:49:19 +0000
+++ sale_view.xml	2013-07-23 09:16:27 +0000
@@ -7,7 +7,6 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base_sale_multichannels.base_sale_multichannels_view_shop_form"/>
             <field name="arch" type="xml">
-                <data>
                     <field name="company_id" widget='selection' groups="base.group_multi_company" position="after">
                         <field name="amazon_instance_id" attrs="{'invisible':[('amazon_shop','=',False)]}" />
                     </field>
@@ -36,11 +35,12 @@
                             </group>
                         </page>
                         <page string="Amazon Information" attrs="{'invisible':[('amazon_shop','=',False)]}">
-                            <field name="amazon_shop" />
-                            <field name="auto_import_amazon" />
+                            <group>
+	                            <field name="amazon_shop" />
+	                            <field name="auto_import_amazon" />
+                            </group>
                         </page>
                     </xpath>
-                </data>
             </field>
         </record>
         <record id="act_amazonerp_shop_form" model="ir.actions.act_window">
@@ -56,19 +56,22 @@
         <record id="adding_policy_view" model="ir.ui.view">
             <field name="name">adding.policy.view</field>
             <field name="model">sale.shop</field>
-            <field name="type">form</field>
             <field name="inherit_id" ref="base_sale_multichannels.base_sale_multichannels_view_shop_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/notebook" position="inside">
                     <page string="Other Information" attrs="{'invisible':[('amazon_shop','=',False)]}">
-                        <field name="amazon_picking_policy"/>
-                              
-                        <field name="amazon_order_policy"/>
-                        <field name="amazon_invoice_quantity"/>
+                         <group>
+	                        <field name="amazon_picking_policy"/>
+	                              
+	                        <field name="amazon_order_policy"/>
+	                        <field name="amazon_invoice_quantity"/>
+                        </group>
                     </page>
                     <page string="Amazon Exportable Products" attrs="{'invisible':[('amazon_shop','=',False)]}">
+                            <group>
                                 <field name="amazon_exportable_product_ids" nolabel="1" colspan="4"/>
-                            </page>
+                            </group>
+                    </page>
                 </xpath>
             </field>
         </record>
@@ -77,7 +80,6 @@
         <record id="view_amazon_shop_search" model="ir.ui.view">
                     <field name="name">view.amazon.shop.search</field>
                     <field name="model">sale.shop</field>
-                    <field name="type">search</field>
                     <field name="arch" type="xml">
                     <search string="Sale Shop">
                         <field name="name"/>

=== modified file 'security/ir.model.access.csv'
--- security/ir.model.access.csv	2012-05-08 11:49:19 +0000
+++ security/ir.model.access.csv	2013-07-23 09:16:27 +0000
@@ -1,2 +1,2 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"access_amazonerp_instance_group_sale_manager","amazonerp_instance_group_sale_manager","model_amazon_instance","base.group_sale_manager",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_amazonerp_instance_group_sale_manager,amazonerp_instance_group_sale_manager,model_amazon_instance,base.group_sale_manager,1,1,1,1
\ No newline at end of file

=== modified file 'wizard/create_amazon_shop.py'
--- wizard/create_amazon_shop.py	2012-05-08 11:49:19 +0000
+++ wizard/create_amazon_shop.py	2013-07-23 09:16:27 +0000
@@ -14,7 +14,7 @@
                 raise osv.except_osv(_('Warning !'), _('Shop Is Already Created'))
         return res
     def create_amazon_shop_action(self, cr, uid, ids, context=None):
-        print"vishakha"
+        print"::::::::::create_amazon_shop_action called::::::::"
 #        print"data_amazon_shop",data_amazon_shop
         data_amazon_shop = self.read(cr, uid, ids, context=context)[0]
         shop_vals = {
@@ -41,7 +41,8 @@
     _columns = {
         'name': fields.char('Shop Name', size=64, required=True),
         'warehouse_id': fields.many2one('stock.warehouse', 'Warehouse',required=True),
-        'cust_address': fields.many2one('res.partner.address', 'Address', required=True),
+        'cust_address': fields.many2one('res.partner', 'Address', required=True),
+#        'cust_address': fields.many2one('res.partner.address', 'Address', required=True),
         'company_id': fields.many2one('res.company', 'Company', required=False),
         'picking_policy': fields.selection([('direct', 'Partial Delivery'), ('one', 'Complete Delivery')],
                                            'Packing Policy', help="""If you don't have enough stock available to deliver all at once, do you accept partial shipments or not?""",required=True),