qrtl · mra-odoo · Nov 10, 2017 · Nov 10, 2017
diff --git a/base_import_log/__init__.py b/base_import_log/__init__.py
@@ -18,5 +18,5 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import models
+from . import models
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/base_import_log/models/__init__.py b/base_import_log/models/__init__.py
@@ -18,6 +18,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-import error_log
+from . import error_log
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/sale_order_import/__init__.py b/sale_order_import/__init__.py
@@ -15,7 +15,7 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import models
-import wizard
+from . import models
+from . import wizard
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/sale_order_import/__openerp__.py b/sale_order_import/__openerp__.py
@@ -20,7 +20,7 @@
     'category': 'Sales Management',
     'version': '8.0.1.0',
     'author': 'Rooms For (Hong Kong) T/A OSCG',
-    'depends': ['sale_stock', 'base_import_log', 'account_voucher'],
+    'depends': ['sale_stock', 'base_import_log', 'account_voucher','sale_management'],
     'website': 'www.openerp-asia.net',
     'description': """ 
 Imports sales data and processes the following:

diff --git a/sale_order_import/doc/ESH_TransactionImportFormats_151022.xlsx b/sale_order_import/doc/ESH_TransactionImportFormats_151022.xlsx
diff --git a/sale_order_import/doc/TransactionAutomationRequirements.pdf b/sale_order_import/doc/TransactionAutomationRequirements.pdf
diff --git a/sale_order_import/doc/sale_imort_test.csv b/sale_order_import/doc/sale_imort_test.csv
@@ -0,0 +1,5 @@
+Group,Customer,Line Product,Line Description,Line Unit Price,Line Qty,Line Tax,Notes,Pricelist,Warehouse,Picking Policy,Order Policy
+a,Agrolait,DVD,ニンテンドー3DS シルバー,16000,1,Tax 15.00%,,Public Pricelist,YourCompany,Deliver each product when available,On Demand
+a,Agrolait,HEAD,東芝 ロボット掃除機 トルネオ ロボ イエロー VC-RVD1-R,58000,1,Tax 15.00%,,Public Pricelist,YourCompany,Deliver each product when available,On Demand
+b,China Export,LAP-E5,PANASONIC MC-RX1S-W レッド RULO(ルーロ) [ロボット掃除機],75000,1,Tax 15.00%,,Public Pricelist,YourCompany,Deliver each product when available,On Demand
+c,Best Designers,HEAD,東芝 ロボット掃除機 トルネオ ロボ イエロー VC-RVD1-R,58000,1,Tax 15.00%,,Public Pricelist,YourCompany,Deliver each product when available,On Demand
diff --git a/sale_order_import/models/__init__.py b/sale_order_import/models/__init__.py
@@ -15,7 +15,7 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import sale
-import sale_import_default
+from . import sale
+from . import sale_import_default
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/sale_order_import/views/sale_import_default.xml b/sale_order_import/views/sale_import_default.xml
@@ -24,7 +24,7 @@
         </record>
 
         <menuitem id="sale_import_default_menu" name="Sale Import Defaults" parent="base_import_log.import_data_config"
-                action="sale_import_default_action" sequence="10" groups="base.group_sale_salesman_all_leads"/>
+                action="sale_import_default_action" sequence="10" groups="sales_team.group_sale_salesman_all_leads"/>
 
     </data>
 </openerp>
diff --git a/sale_order_import/wizard/__init__.py b/sale_order_import/wizard/__init__.py
@@ -19,6 +19,6 @@
 #
 ##############################################################################
 
-import import_sale
+from . import import_sale
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/sale_order_import/wizard/import_sale.py b/sale_order_import/wizard/import_sale.py
diff --git a/sale_order_import/wizard/import_sale_view.xml b/sale_order_import/wizard/import_sale_view.xml
@@ -6,13 +6,14 @@
             <field name="model">error.log</field>
             <field name="inherit_id" ref="base_import_log.import_error_log_form"/>
             <field name="arch" type="xml">
-                <page string="Error Logs" position="after">
-                    <page string="Sale Orders" attrs="{'invisible': [('model_name', '!=', 'sale.order')]}">
+<!--                <page string="Error Logs" position="after"-->
+                <xpath expr="//form/sheet/notebook/page" position="after">
+                    <page name="sales_orders" string="Sale Orders" attrs="{'invisible': [('model_name', '!=', 'sale.order')]}">
                         <group>
                             <div><field name="sale_order_ids" colspan="3" nolabel="1"/></div>
                         </group>
                     </page>
-                </page>
+                </xpath>
             </field>
         </record>