[FIX] website_sale: renames files

bzr revid: chm@openerp.com-20130812091249-oz2ji7m8remif0xo

8 files changed, 23 insertions, 32 deletions

diff --git a/addons/website_sale/__openerp__.py b/addons/website_sale/__openerp__.py
index 88d7c948d93..e2f3a3b5f5d 100644
--- a/addons/website_sale/__openerp__.py
+++ b/addons/website_sale/__openerp__.py
@@ -10,10 +10,9 @@ OpenERP E-Commerce
     'author': 'OpenERP SA',
     'depends': ['website', 'sale', 'point_of_sale'],
     'data': [
-        'views/ecommerce.xml',
-        'views/pricelist.xml',
+        'views/website_sale.xml',
         'security/ir.model.access.csv',
-        'security/ecommerce.xml',
+        'security/website_sale.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
diff --git a/addons/website_sale/product.py b/addons/website_sale/product.py
deleted file mode 100644
index 27e34f1cd9d..00000000000
--- a/addons/website_sale/product.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from openerp.osv import osv, fields
-
-
-class product_pricelist(osv.osv):
-    _inherit = "product.product"
-    _columns = {
-        'website_published': fields.boolean('Available in the website'),
-        'description_website': fields.html('Description for the website'),
-    }
\ No newline at end of file
diff --git a/addons/website_sale/security/ecommerce.xml b/addons/website_sale/security/website_sale.xml
index b37578d41e0..b37578d41e0 100644
--- a/addons/website_sale/security/ecommerce.xml
+++ b/addons/website_sale/security/website_sale.xml
diff --git a/addons/website_sale/static/src/css/ecommerce.css b/addons/website_sale/static/src/css/website_sale.css
index e69de29bb2d..e69de29bb2d 100644
--- a/addons/website_sale/static/src/css/ecommerce.css
+++ b/addons/website_sale/static/src/css/website_sale.css
diff --git a/addons/website_sale/static/src/js/ecommerce.js b/addons/website_sale/static/src/js/website_sale.js
index 548f190e674..548f190e674 100644
--- a/addons/website_sale/static/src/js/ecommerce.js
+++ b/addons/website_sale/static/src/js/website_sale.js
diff --git a/addons/website_sale/views/pricelist.xml b/addons/website_sale/views/pricelist.xml
deleted file mode 100644
index 70003191238..00000000000
--- a/addons/website_sale/views/pricelist.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<openerp>
-    <data>
-        <record model="ir.ui.view" id="product_pricelist_view">
-            <field name="name">product.pricelist.website.form</field>
-            <field name="model">product.pricelist</field>
-            <field name="inherit_id" ref="product.product_pricelist_view"/>
-            <field name="arch" type="xml">
-                <field name="active" position="after">
-                    <field name="code"/>
-                </field>
-            </field>
-        </record>
-    </data>
-</openerp>
diff --git a/addons/website_sale/views/ecommerce.xml b/addons/website_sale/views/website_sale.xml
index 9191665e3dc..29d18218058 100644
--- a/addons/website_sale/views/ecommerce.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -2,6 +2,17 @@
 <openerp>
 <data>
 
+    <record model="ir.ui.view" id="product_pricelist_view">
+        <field name="name">product.pricelist.website.form</field>
+        <field name="model">product.pricelist</field>
+        <field name="inherit_id" ref="product.product_pricelist_view"/>
+        <field name="arch" type="xml">
+            <field name="active" position="after">
+                <field name="code"/>
+            </field>
+        </field>
+    </record>
+    
     <!-- Layout add nav and footer -->
 
     <record id="header_ecommerce" model="ir.ui.view">
@@ -44,8 +55,8 @@
     <template id="page">
         <t t-call="website.layout">
             <t t-set="head">
-                <script type="text/javascript" src="/website_sale/static/src/js/ecommerce.js"></script>
-                <link rel='stylesheet' href='/website_sale/static/src/css/ecommerce.css'/>
+                <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
+                <link rel='stylesheet' href='/website_sale/static/src/css/website_sale.css'/>
                 <t t-raw="head or ''"/>
             </t>
             <t t-set="title">Shop - <t t-raw="title">Categories</t></t>
@@ -247,7 +258,7 @@
     <template id="checkout">
         <t t-call="website.layout">
             <t t-set="head">
-                <script type="text/javascript" src="/website_sale/static/src/js/ecommerce.js"></script>
+                <script type="text/javascript" src="/website_sale/static/src/js/website_sale.js"></script>
                 <t t-raw="head"/>
             </t>
             <t t-set="title">Shop - Checkout</t>
diff --git a/addons/website_sale/pricelist.py b/addons/website_sale/website_sale.py
index 92ceed90f98..b24455c89fd 100644
--- a/addons/website_sale/pricelist.py
+++ b/addons/website_sale/website_sale.py
@@ -27,3 +27,10 @@ class product_pricelist(osv.osv):
     _columns = {
         'code': fields.char('Promotionnal Code', size=64, required=True, translate=True),
     }
+
+class product_product(osv.osv):
+    _inherit = "product.product"
+    _columns = {
+        'website_published': fields.boolean('Available in the website'),
+        'description_website': fields.html('Description for the website'),
+    }
\ No newline at end of file