Bharat Devnani (Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-ecommerce-bde into
lp:~openerp-dev/openobject-addons/trunk-module-ecommerce.
Requested reviews:
OpenERP R&D Team (openerp-dev)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-ecommerce-bde/+merge/94140
Hello Sir,
I have added ecommerce_search, ecommerce_reviews, Web Shop object, inherited
product.category, also included delivery module in dependencey of ecommerce
module.
Thanks & Regards,
Devnani Bharat R.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-ecommerce-bde/+merge/94140
Your team OpenERP R&D Team is requested to review the proposed merge of
lp:~openerp-dev/openobject-addons/trunk-ecommerce-bde into
lp:~openerp-dev/openobject-addons/trunk-module-ecommerce.
=== modified file 'ecommerce/__init__.py'
--- ecommerce/__init__.py 2012-02-08 11:10:16 +0000
+++ ecommerce/__init__.py 2012-02-22 12:30:27 +0000
@@ -21,6 +21,7 @@
import ecommerce
import wizard
+import catalog
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'ecommerce/__openerp__.py'
--- ecommerce/__openerp__.py 2012-02-17 06:12:05 +0000
+++ ecommerce/__openerp__.py 2012-02-22 12:30:27 +0000
@@ -22,7 +22,7 @@
{
"name" : "E-Commerce",
"version" : "1.0",
- "depends" : ["sale"],
+ "depends" : ["sale", "delivery"],
"author" : "OpenERP S.A.",
"description": """
This module provides the E-Commerce functionality, through which you can add and update products
@@ -37,6 +37,7 @@
],
"update_xml" : [
"ecommerce_view.xml",
+ "catalog_view.xml",
"wizard/shopping_order_wizard.xml",
"ecommerce_sequence.xml",
],
=== added file 'ecommerce/catalog.py'
--- ecommerce/catalog.py 1970-01-01 00:00:00 +0000
+++ ecommerce/catalog.py 2012-02-22 12:30:27 +0000
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Affero General Public License for more details.
+#
+# 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/>.
+#
+##############################################################################
+
+from osv import fields, osv
+import time
+
+class ecommerce_search(osv.osv):
+ _name = "ecommerce.search"
+ _description = "search parameters"
+ _columns = {
+ 'name': fields.char('Name', size=56, required= True, help="Search parameter name which you want to display at website"),
+ 'code': fields.many2one('ir.model.fields','Product fields', required=True, domain=[('model','=','product.template')])
+ }
+
+ def searchproducts(self, cr, uid, search_code):
+
+ prd_ids = []
+ final_list = []
+ send_ids = []
+ obj = self.pool.get('product.product')
+ for i in search_code.items():
+ args = []
+ if(i[1] != ''):
+ if(i[0] == 'name'):
+ final_list = (i[0], 'ilike', str(i[1]))
+ args.append(final_list)
+ ids = obj.search(cr, uid, args)
+ prd_ids.extend(ids)
+ else:
+ final_list = (i[0], '=', str(i[1]))
+ args.append(final_list)
+ ids = obj.search(cr, uid, args)
+ prd_ids.extend(ids)
+ for item in prd_ids:
+ if not item in send_ids:
+ send_ids.append(item)
+ return send_ids
+
+ecommerce_search()
+
+class ecommerce_reviews(osv.osv):
+ _name = "ecommerce.product.reviews"
+ _rec_name = "product_id"
+ _description = "Reviews about product"
+ _columns = {
+ 'product_id': fields.many2one('product.product','Product',
+ required=True, ondelete='cascade'),
+ 'customer_id': fields.many2one('res.partner','Customer',
+ required=True, ondelete='cascade'),
+ 'reviewdate': fields.date('Review Date'),
+ 'rating': fields.integer('Rating'),
+ 'review': fields.text('Review')
+ }
+
+ _defaults = {
+ 'reviewdate': lambda *a: time.strftime('%Y-%m-%d'),
+ }
+
+ecommerce_reviews()
\ No newline at end of file
=== added file 'ecommerce/catalog_view.xml'
--- ecommerce/catalog_view.xml 1970-01-01 00:00:00 +0000
+++ ecommerce/catalog_view.xml 2012-02-22 12:30:27 +0000
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<openerp>
+ <data>
+
+ <!-- Reviews -->
+
+ <record model="ir.ui.view" id="ecommerce_reviews_view_tree">
+ <field name="name">ecommerce.reviews.tree</field>
+ <field name="model">ecommerce.product.reviews</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Reviews">
+ <field name="product_id" select="1"></field>
+ <field name="customer_id" select="1"></field>
+ <field name="reviewdate"></field>
+ <field name="rating"></field>
+ </tree>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="ecommerce_reviews_view_form">
+ <field name="name">ecommerce.reviews.form</field>
+ <field name="model">ecommerce.product.reviews</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Product Reviews">
+ <field name="product_id" select="1"></field>
+ <field name="customer_id" select="1"></field>
+ <field name="reviewdate"></field>
+ <field name="rating"></field>
+ <field name="review" colspan="4"/>
+ </form>
+ </field>
+ </record>
+
+ <record model="ir.actions.act_window" id="action_ecommerce_reviews_view_form">
+ <field name="res_model">ecommerce.product.reviews</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="view_id" ref="ecommerce_reviews_view_tree"/>
+ </record>
+
+ <menuitem name="Product Reviews" id="menu_action_ecommerce_reviews_view_form" action="action_ecommerce_reviews_view_form" parent="menu_ecommerce_product_configuration"/>
+
+ <!-- For Products Search Parameters -->
+
+ <record model="ir.ui.view" id="view_ecommerce_search">
+ <field name="name">ecommerce.search.tree</field>
+ <field name="model">ecommerce.search</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Search Parameters">
+ <field name="name" select="1"/>
+ <field name="code" select="1"/>
+ </tree>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="view_ecommerce_search_form">
+ <field name="name">ecommerce.search.form</field>
+ <field name="model">ecommerce.search</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Search Parameters">
+ <field name="name" select="1"/>
+ <field name="code" search="[('model','=','ir.model.fields'), ('model','=','product.template'), ('name','=','name')]"></field>
+ </form>
+ </field>
+ </record>
+
+ <record model="ir.actions.act_window" id="action_ecommerce_search_form">
+ <field name="name">Search Parameters</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">ecommerce.search</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="view_id" ref="view_ecommerce_search"/>
+ </record>
+
+ <menuitem name="Search Parameters" action="action_ecommerce_search_form" id="menu_ecommerce_search_form" parent="menu_ecommerce_product_configuration"/>
+
+ </data>
+</openerp>
\ No newline at end of file
=== modified file 'ecommerce/ecommerce.py'
--- ecommerce/ecommerce.py 2012-02-17 06:12:05 +0000
+++ ecommerce/ecommerce.py 2012-02-22 12:30:27 +0000
@@ -47,6 +47,15 @@
sale_order_line()
+class product_category(osv.osv):
+
+ _inherit = 'product.category'
+ _columns = {
+ 'attribute_ids': fields.many2many('product.attribute.details', 'rel_product_attribute', 'product_id', 'product_attribute_detail_id', 'Attribute'),
+ }
+
+product_category()
+
class product_product(osv.osv):
def _get_shop(self, cr, uid, ids, context=None):
@@ -204,4 +213,41 @@
}
ecommerce_payment_received()
+class ecommerce_shop(osv.osv):
+
+ _name = "ecommerce.shop"
+ _description = "ecommerce shop"
+ _columns = {
+ 'name': fields.char('Name', size=256, required=True,
+ help="Name of the shop which you are configure at website."),
+ 'company_id': fields.many2one('res.company', 'Company'),
+ 'shop_id': fields.many2one('sale.shop', 'Sale Shop', required=True),
+ 'payment_method_ids': fields.many2many('ecommerce.payment', 'shop_payment', 'shop_id',
+ 'payment_id', 'Payment Methods', required=False),
+ 'category_ids': fields.many2many('product.category', 'rel_product_categ', 'shop_id', 'category_id', 'Categories',
+ help="Add the product categories which you want to displayed on the website."),
+ 'currency_ids': fields.many2many('res.currency','currency_rel', 'currency', 'ecommerce_currency',
+ 'Currency', help="Add the currency options for the online customers."),
+ 'language_ids': fields.many2many('res.lang', 'lang_rel', 'language','ecommerce_lang', 'Language',
+ help="Add the launguage options for the online customers."),
+ 'row_configuration': fields.integer('No. of Rows',
+ help="Add number of rows for products which you want to configure at website"),
+ 'column_configuration': fields.integer('No. of Columns',
+ help="Add number of columns for products which you want to configure at website"),
+ 'image_height': fields.integer('Height in Pixel', help="Add product image height in pixels."),
+ 'image_width': fields.integer('Width in Pixel', help="Add product image width in pixels."),
+ 'delivery_ids': fields.many2many('delivery.carrier', 'delivery_rel', 'delivery', 'ecommrce_delivery',
+ 'Delivery', help="Add the carriers which you use for the shipping."),
+ 'search_ids': fields.many2many('ecommerce.search', 'search_rel', 'search', 'ecommrce_search_parameter',
+ 'Search On', help="Add the search parameters which you are allow from the website." )
+ }
+
+ _defaults = {
+ 'row_configuration': lambda *a: 3,
+ 'column_configuration': lambda *a: 3,
+ 'image_height': lambda *a: 30,
+ 'image_width': lambda *a:30
+ }
+ecommerce_shop()
+
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== modified file 'ecommerce/ecommerce_view.xml'
--- ecommerce/ecommerce_view.xml 2012-02-17 06:12:05 +0000
+++ ecommerce/ecommerce_view.xml 2012-02-22 12:30:27 +0000
@@ -3,6 +3,87 @@
<data>
+ <!-- Shop Tree View -->
+
+ <record model="ir.ui.view" id="view_shop_basic_tree">
+ <field name="name">ecommerce.shop.tree</field>
+ <field name="model">ecommerce.shop</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Basic Store">
+ <field name="name"/>
+ <field name="company_id" groups="base.group_multi_company"/>
+
+ </tree>
+ </field>
+ </record>
+
+ <!-- Shop Form View -->
+
+ <record model="ir.ui.view" id="view_shop_basic_form">
+ <field name="name">Web Shop</field>
+ <field name="model">ecommerce.shop</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="General Information">
+ <group colspan="4" col="4">
+ <separator string="WebShop Description" colspan="4"/>
+ <newline/>
+ <field name="name" select="1"/><newline/>
+ <field name="company_id" select="1" groups="base.group_multi_company"/>
+ <field name="shop_id" select="1"></field>
+ </group>
+ <notebook colspan="4">
+ <page string="Payment Methods">
+ <field name="payment_method_ids" colspan="4" nolabel='1'>
+ <tree string="Payment">
+ <field name="name" select="1"/>
+ </tree>
+ </field>
+ </page>
+ <page string="Categories">
+ <field name="category_ids" nolabel="1" />
+ </page>
+ <page string="Setting">
+ <separator string="Add Currency" colspan="4"/>
+ <field name="currency_ids" colspan="4" nolabel='1'/>
+ <separator string="Add Languages" colspan="4"/>
+ <field name="language_ids" colspan="4" nolabel='1'/>
+ <group colspan="2" col="2">
+ <separator string="Add Product Row,Column" colspan="2"/>
+ <field name="row_configuration"/>
+ <field name="column_configuration"/>
+ </group>
+ <group colspan="2" col="2">
+ <separator string="Add Image Size" colspan="2"/>
+ <field name="image_height"/>
+ <field name="image_width"/>
+ </group>
+ </page>
+ <page string="Delivery">
+ <separator string="Add Carriers" colspan="4"/>
+ <field name="delivery_ids" colspan="4" nolabel="1"/>
+ </page>
+ <page string="Search">
+ <separator string="Add Search Parameters" colspan="4"/>
+ <field name="search_ids" colspan="4" nolabel="1"/>
+ </page>
+ </notebook>
+ </form>
+ </field>
+ </record>
+
+ <!-- Shop Action -->
+
+ <record model="ir.actions.act_window" id="action_shop_basic_form">
+ <field name="name">Web Shop</field>
+ <field name="type">ir.actions.act_window</field>
+ <field name="res_model">ecommerce.shop</field>
+ <field name="view_type">form</field>
+ <field name="view_id" ref="view_shop_basic_tree"/>
+ </record>
+
+
<!-- Sale Order Form View -->
<record id="view_ecommerce_sale_order_form" model="ir.ui.view">
@@ -161,6 +242,22 @@
</field>
</record>
+ <!-- Product Category Form View -->
+ <record id="view_product_category_inherited_form" model="ir.ui.view">
+ <field name="name">product.category.form</field>
+ <field name="model">product.category</field>
+ <field name="inherit_id" ref="product.product_category_form_view"/>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <field name="type" position="after">
+ <newline/>
+ <separator string="Attributes" colspan="4"/>
+ <field name="attribute_ids" nolabel="1" colspan="4"/>
+ </field>
+ </field>
+ </record>
+
+
<!-- Product Attribute Form View -->
<record id="view_product_attribute_form" model="ir.ui.view">
@@ -358,7 +455,7 @@
<menuitem name="Ecommerce"
id="menu_action_ecommerce" icon="terp-sale"/>
-
+
<menuitem id="menu_action_ecommerce_products"
name="Products" parent="menu_action_ecommerce" sequence="1"/>
@@ -368,6 +465,11 @@
<menuitem name="Configuration"
id="menu_ecommerce_configuration" parent="menu_action_ecommerce" sequence="4"/>
+ <menuitem id="menu_action_ecommerce_shop"
+ name="Shop" parent="menu_ecommerce_configuration" sequence="0"/>
+
+ <menuitem name="Web Shop" action="action_shop_basic_form" id="menu_shop_basic_form" parent="menu_action_ecommerce_shop"/>
+
<menuitem name="Product Configuration"
id="menu_ecommerce_product_configuration" parent="menu_ecommerce_configuration" sequence="1"/>
_______________________________________________
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
