[FIX] changed to MVC structure

[FIX] changed to MVC structure - modifications

[IMP] modifications for account_payment_mode

connector_ecommerce/__init__.py

@@ -19,12 +19,6 @@
 #
 ##############################################################################
 
-from . import stock
-from . import account
-from . import product
-from . import invoice
-from . import payment_method
-from . import event
+from . import models
 from . import unit
-from . import sale
 from . import wizard

connector_ecommerce/__openerp__.py

@@ -20,28 +20,28 @@
 ##############################################################################
 
 {'name': 'Connector for E-Commerce',
- 'version': '8.0.3.0.0',
+ 'version': '9.0.1.0.0',
  'category': 'Hidden',
  'author': "Camptocamp,Akretion,Odoo Community Association (OCA)",
  'website': 'http://openerp-connector.com',
  'license': 'AGPL-3',
  'depends': [
      'connector',
-     'sale_payment_method_automatic_workflow',
-     'sale_exceptions',
+     'sale_automatic_workflow_payment_mode',
+     'sale_exception',
      'delivery',
      'connector_base_product',
  ],
  'data': [
      'security/security.xml',
      'security/ir.model.access.csv',
      'wizard/sale_ignore_cancel_view.xml',
-     'sale_view.xml',
-     'invoice_view.xml',
-     'ecommerce_data.xml',
-     'stock_view.xml',
-     'payment_method_view.xml',
-     'account_view.xml',
+     'data/ecommerce_data.xml',
+     'views/sale_view.xml',
+     'views/invoice_view.xml',
+     'views/stock_view.xml',
+     'views/payment_mode_view.xml',
+     'views/account_view.xml',
  ],
  'installable': True,
  }

connector_ecommerce/models/__init__.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+from . import stock
+from . import account
+from . import product
+from . import invoice
+from . import payment_method
+from . import event
+from . import sale

connector_ecommerce/account.py → connector_ecommerce/models/account.py

@@ -22,7 +22,7 @@
 from openerp.osv import orm, fields
 
 
-class account_tax_code(orm.Model):
+class AccountTaxCode(orm.Model):
     _inherit = 'account.tax'
 
     def get_tax_from_rate(self, cr, uid, rate, is_tax_included=False,
@@ -51,7 +51,7 @@ def get_tax_from_rate(self, cr, uid, rate, is_tax_included=False,
         return False
 
 
-class account_tax_group(orm.Model):
+class AccountTaxGroup(orm.Model):
     _name = 'account.tax.group'
     _description = 'account tax group'
 
@@ -61,7 +61,7 @@ class account_tax_group(orm.Model):
     }
 
 
-class account_tax(orm.Model):
+class AccountTax(orm.Model):
     _inherit = 'account.tax'
 
     _columns = {

connector_ecommerce/payment_method.py → connector_ecommerce/models/payment_method.py

@@ -22,8 +22,8 @@
 from openerp import models, fields, api
 
 
-class PaymentMethod(models.Model):
-    _inherit = "sale.payment.method"
+class AccountPaymentMode(models.Model):
+    _inherit = "account.payment.mode"
 
     @api.model
     def _get_import_rules(self):

connector_ecommerce/tests/test_onchange.py

@@ -44,7 +44,7 @@ def test_play_onchange(self):
         product_model = self.env['product.product']
         partner_model = self.env['res.partner']
         tax_model = self.env['account.tax']
-        payment_method_model = self.env['sale.payment.method']
+        payment_mode_model = self.env['account.payment.mode']
 
         backend_record = mock.Mock()
         env = Environment(backend_record, self.session, 'sale.order')
@@ -63,7 +63,7 @@ def test_play_onchange(self):
                                         'weight': 15,
                                         'taxes_id': [(6, 0, [tax.id])]})
         payment_term = self.env.ref('account.account_payment_term_advance')
-        payment_method = payment_method_model.create({
+        payment_method = payment_mode_model.create({
             'name': 'Cash',
             'payment_term_id': payment_term.id,
         })

connector_ecommerce/payment_method_view.xml → connector_ecommerce/views/payment_mode_view.xml

@@ -6,13 +6,12 @@
     <data>
 
         <!-- VIEW FOR THE OBJECT : payment_method -->
-        <record id="payment_method_view_form" model="ir.ui.view">
-            <field name="name">sale.payment.method.connector_ecommerce.form</field>
-            <field name="model">sale.payment.method</field>
-            <field name="inherit_id"
-                ref="sale_payment_method_automatic_workflow.payment_method_view_form" />
+        <record id="account_payment_mode_form_inherit" model="ir.ui.view">
+            <field name="name">account.payment.mode.connector_ecommerce.form</field>
+            <field name="model">account.payment.mode</field>
+            <field name="inherit_id" ref="account_payment_mode.account_payment_mode_form" />
             <field name="arch" type="xml">
-                <group name="general" position="after">
+                <group name="main" position="after">
                     <group name="import_rule" string="Import Rules">
                         <group>
                             <field name="import_rule" />
@@ -41,13 +40,12 @@
             </field>
         </record>
 
-        <record id="payment_method_view_tree" model="ir.ui.view">
-            <field name="name">sale.payment.method.connector_ecommerce.tree</field>
-            <field name="model">sale.payment.method</field>
-            <field name="inherit_id"
-                ref="sale_payment_method_automatic_workflow.payment_method_view_tree" />
+        <record id="account_payment_mode_tree_inherit" model="ir.ui.view">
+            <field name="name">account.payment.mode.connector_ecommerce.tree</field>
+            <field name="model">account.payment.mode</field>
+            <field name="inherit_id" ref="account_payment_mode.account_payment_mode_tree" />
             <field name="arch" type="xml">
-                <field name="workflow_process_id" position="after">
+                <field name="company_id" position="before">
                     <field name="import_rule" />
                 </field>
             </field>