Nimesh Contractor(Open ERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-event_improvements-atp-event_page_view-nco
into lp:~openerp-dev/openobject-addons/trunk-event_improvements-atp.
Requested reviews:
Atul Patel(OpenERP) (atp-openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-event_improvements-atp-event_page_view-nco/+merge/103060
Hello sir,
I have resolved the conflicts.
Thanks,
NCO.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-event_improvements-atp-event_page_view-nco/+merge/103060
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-event_improvements-atp.
=== modified file 'event_sale/__openerp__.py'
--- event_sale/__openerp__.py 2012-03-22 09:53:52 +0000
+++ event_sale/__openerp__.py 2012-04-23 09:08:20 +0000
@@ -39,7 +39,10 @@
'event_sale_view.xml',
],
'demo_xml': ['event_demo.xml'],
+ 'js': ['static/src/js/*.js'],
+ 'html': ['static/*.html'],
'test':['test/confirm.yml'],
+ 'css': ['static/src/css/*.css'],
'installable': True,
'active': False,
}
=== modified file 'event_sale/event_sale.py'
--- event_sale/event_sale.py 2012-04-02 06:28:17 +0000
+++ event_sale/event_sale.py 2012-04-23 09:08:20 +0000
@@ -19,6 +19,7 @@
#
##############################################################################
+import time
from osv import fields, osv
from tools.translate import _
@@ -92,32 +93,3 @@
message = _("The registration %s has been created from the Sale Order %s.") % (registration_id, order_line.order_id.name)
registration_obj.log(cr, uid, registration_id, message)
return super(sale_order_line, self).button_confirm(cr, uid, ids, context=context)
-
-class event_event(osv.osv):
- _inherit = 'event.event'
- _columns = {
- 'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
- }
-
-class event_items(osv.osv):
- _name = "event.items"
- _columns = {
- 'product_id': fields.many2one('product.product', 'Product', required=True),
- 'qty': fields.integer('Quantity'),
- 'price': fields.integer('Price'),
- 'uom_id': fields.many2one('product.uom', 'Unit of Measure'),
- 'discount': fields.integer('Discount'),
- 'event_id': fields.many2one('event.event', 'Event'),
- 'sales_end_date': fields.date('Sales End')
- }
-
- def onchange_product_id(self, cr, uid, ids, product, context=None):
- product_obj = self.pool.get('product.product')
- data = {}
- if not product:
- return {'value': data}
- price = product_obj.browse(cr, uid, product).list_price
- uom = product_obj.browse(cr, uid, product).uom_id.id
- data['price'] = price
- data['uom_id'] = uom
- return {'value': data}
=== modified file 'event_sale/event_sale_view.xml'
--- event_sale/event_sale_view.xml 2012-04-02 06:28:17 +0000
+++ event_sale/event_sale_view.xml 2012-04-23 09:08:20 +0000
@@ -29,50 +29,5 @@
</xpath>
</field>
</record>
-
- <record model="ir.ui.view" id="view_event_form_inherit">
- <field name="name">Events Inherit</field>
- <field name="model">event.event</field>
- <field name="type">form</field>
- <field name="inherit_id" ref="event.view_event_form"/>
- <field name="arch" type="xml">
- <xpath expr="//notebook[last()]" position="inside">
- <page string="Event Items">
- <field name="event_item_ids" nolabel="1"/>
- </page>
- </xpath>
- </field>
- </record>
-
- <record model="ir.ui.view" id="view_event_items_tree">
- <field name="name">Event Items Tree</field>
- <field name="model">event.items</field>
- <field name="type">tree</field>
- <field name="arch" type="xml">
- <tree string="Event Items">
- <field name="product_id"/>
- <field name="price"/>
- <field name="uom_id"/>
- <field name="discount"/>
- <field name="sales_end_date"/>
- </tree>
- </field>
- </record>
-
- <record model="ir.ui.view" id="view_event_items_form">
- <field name="name">Event Items Form</field>
- <field name="model">event.items</field>
- <field name="type">form</field>
- <field name="arch" type="xml">
- <form string="Event Items">
- <field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
- <field name="price"/>
- <field name="uom_id"/>
- <field name="discount"/>
- <field name="sales_end_date"/>
- </form>
- </field>
- </record>
-
</data>
</openerp>
=== added directory 'portal_event'
=== added file 'portal_event/__init__.py'
--- portal_event/__init__.py 1970-01-01 00:00:00 +0000
+++ portal_event/__init__.py 2012-04-23 09:08:20 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+# 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/>.
+#
+##############################################################################
+import portal_event
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
=== added file 'portal_event/__openerp__.py'
--- portal_event/__openerp__.py 1970-01-01 00:00:00 +0000
+++ portal_event/__openerp__.py 2012-04-23 09:08:20 +0000
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+# 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/>.
+#
+##############################################################################
+
+{
+ 'name' : "Portal Event",
+ 'version' : "1.0",
+ 'depends' : ["portal", "event_sale"],
+ 'author' : "OpenERP SA",
+ 'category': 'Portal',
+ 'description': """
+This module defines 'portals' to customize the access to your OpenERP database
+for external users.
+ """,
+ 'website': 'http://www.openerp.com',
+ 'data': [
+ "security/portal_event_security.xml",
+ "security/ir.model.access.csv",
+ 'portal_event_view.xml',
+ ],
+ 'js': ['static/src/js/*.js'],
+ 'html': ['static/*.html'],
+ 'test':['test/confirm.yml'],
+ 'css': ['static/src/css/*.css'],
+ 'installable': True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
=== added file 'portal_event/portal_event.py'
--- portal_event/portal_event.py 1970-01-01 00:00:00 +0000
+++ portal_event/portal_event.py 2012-04-23 09:08:20 +0000
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#
+# 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 osv, fields
+from tools.translate import _
+
+class event_event(osv.osv):
+ _inherit = 'event.event'
+ def _full_date_start(self, cr, uid, ids, fields, args, context=None):
+ """
+ @param cr: the current row, from the database cursor,
+ @param uid: the current user’s ID for security checks,
+ @param ids: List of Openday’s IDs
+ @return: difference between current date and log date
+ @param context: A standard dictionary for contextual values
+ """
+ res = {}
+ for event in self.browse(cr, uid, ids, context=context):
+ for field in fields:
+ res[event.id] = {}
+ DATETIME_FORMAT = "%Y-%m-%d %H:%M:%S"
+ import datetime
+ if 'date_start' in fields:
+ from_dt = datetime.datetime.strptime(event.date_begin, DATETIME_FORMAT)
+ res[event.id]['date_start'] = from_dt.strftime('%A %b %d, %Y at %H:%M%p')
+
+ if 'date_finish' in fields:
+ from_dt = datetime.datetime.strptime(event.date_end, DATETIME_FORMAT)
+ res[event.id]['date_finish'] = from_dt.strftime('%A %b %d, %Y at %H:%M%p')
+ return res
+ _columns = {
+ 'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
+ 'date_start': fields.function(_full_date_start, string='Days to Open',multi='dc',type='text'),
+ 'date_finish': fields.function(_full_date_start, string='Days to Open',multi='dc', type='text'),
+ }
+ def make_order(self, cr, uid, ids, partner_id, context=None):
+ sale_order = self.pool.get('sale.order')
+ sale_order_line_obj = self.pool.get('sale.order.line')
+ res_partner_obj = self.pool.get('res.partner')
+ prod_pricelist_obj = self.pool.get('product.pricelist')
+ res_users_obj = self.pool.get('res.users')
+ customer = res_partner_obj.browse(cr, uid, partner_id, context=context)
+ partner_id = res_users_obj.browse(cr, uid, uid, context=context).partner_id.id
+ if not partner_id:
+ user_name = res_users_obj.browse(cr, uid, uid, context=context).name
+ partner_id = res_partner_obj.create(cr, uid, {'name': user_name})
+
+ price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+
+ for order_lines in self.browse(cr, uid, ids, context=context):
+ product = order_lines.id
+ sale_id = sale_order.create(cr, uid, {
+ 'partner_id': partner_id,
+ 'pricelist_id': price_list,
+ 'partner_invoice_id': partner_id,
+ 'partner_shipping_id': partner_id,
+ 'date_order': order_lines.date_begin
+ })
+
+ for line in order_lines.event_item_ids:
+
+ sale_order_line_obj.create(cr, uid, {
+ 'order_id': sale_id,
+ 'name': order_lines.name,
+ 'product_uom_qty': line.qty,
+ 'product_id': product,
+ 'product_uom': line.uom_id.id,
+ 'price_unit': line.price,
+ 'date_planned': line.sales_end_date,
+ }, context=context)
+ self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
+ return True
+
+class event_items(osv.osv):
+ _name = "event.items"
+ _columns = {
+ 'product_id': fields.many2one('product.product', 'Product', required=True),
+ 'qty': fields.integer('Quantity'),
+ 'price': fields.integer('Price'),
+ 'uom_id': fields.many2one('product.uom', 'Unit of Measure'),
+ 'discount': fields.integer('Discount'),
+ 'event_id': fields.many2one('event.event', 'Event'),
+ 'sales_end_date': fields.date('Sales End')
+ }
+
+ def onchange_product_id(self, cr, uid, ids, product, context=None):
+ product_obj = self.pool.get('product.product')
+ data = {}
+ if not product:
+ return {'value': data}
+ price = product_obj.browse(cr, uid, product).list_price
+ uom = product_obj.browse(cr, uid, product).uom_id.id
+ data['price'] = price
+ data['uom_id'] = uom
+ return {'value': data}
=== added file 'portal_event/portal_event_view.xml'
--- portal_event/portal_event_view.xml 1970-01-01 00:00:00 +0000
+++ portal_event/portal_event_view.xml 2012-04-23 09:08:20 +0000
@@ -0,0 +1,119 @@
+<?xml version="1.0"?>
+<openerp>
+ <data>
+ <record model="ir.ui.view" id="view_event_form_inherit">
+ <field name="name">Events Inherit</field>
+ <field name="model">event.event</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Events">
+
+ <field name="state" select="1" colspan="2" invisible="1"/>
+ <group colspan="2" col="4">
+ <group colspan="2" col="1">
+ <group colspan="2" col="2">
+ <field name="name" nolabel="1"/>
+ <field name="country_id" nolabel="1"/>
+ </group>
+
+ <group colspan="2" col="2">
+ <field name="date_start" nolabel="1"/>
+ <field name="date_finish" nolabel="1"/>
+ </group>
+ <!--field name="date_begin" nolabel="1" invisible="1"/>
+ <field name="date_end" nolabel="1" invisible="1"/-->
+ <group colspan="4">
+ <div class="sub1"> Venue : </div> <separator orientation="vertical"/>
+ <field name="address_id" nolabel="1"/>
+ </group>
+ <field name="event_item_ids" nolabel="1"/>
+ <div class="oe_right">
+ <button string="Order Now" name="make_order" help="Order Event" type="object" icon="gtk-ok" attrs="{'invisible':[('state','=','confirm')]}"/>
+ </div>
+ </group>
+
+ <group colspan="2" col="2">
+ <!--div class="oe_right">
+ <div id="map_canvas" style="width: 400px; height: 200px;"> </div>
+ </div>
+ <newline/>
+ <group colspan="4" col="4">
+ <div>Where</div> <separator orientation="vertical"/>
+ <field name="address_id" nolabel="1"/>
+ <div>When</div> <separator orientation="vertical"/>
+ <div>
+ <field name="date_start" nolabel="1"/>
+ <field name="date_finish" nolabel="1"/>
+ </div>
+ </group-->
+ </group>
+ <newline/>
+ </group>
+ <newline/>
+ <separator string="Event Details" colspan="4"/>
+ <field name="note" colspan="4" nolabel="1"/>
+ </form>
+ </field>
+ </record>
+
+
+<record model="ir.ui.view" id="event_tree_view_inherit">
+ <field name="name">Events</field>
+ <field name="model">event.event</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Events">
+ <field name="name" nolabel="1"/>
+ <field name="country_id" nolabel="1"/>
+ <field name="date_begin" nolabel="1"/>
+ <field name="date_end" nolabel="1"/>
+ <field name="address_id" nolabel="1"/>
+ </tree>
+ </field>
+ </record>
+
+
+ <record model="ir.ui.view" id="view_event_items_tree">
+ <field name="name">Event Items Tree</field>
+ <field name="model">event.items</field>
+ <field name="type">tree</field>
+ <field name="arch" type="xml">
+ <tree string="Event Items" editable="top">
+ <field name="product_id" string="Ticket Type" />
+ <field name="uom_id"/>
+ <field name="sales_end_date"/>
+ <field name="price"/>
+ <field name="qty"/>
+ </tree>
+ </field>
+ </record>
+
+ <record model="ir.ui.view" id="view_event_items_form">
+ <field name="name">Event Items Form</field>
+ <field name="model">event.items</field>
+ <field name="type">form</field>
+ <field name="arch" type="xml">
+ <form string="Event Items">
+ <field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
+ <field name="price"/>
+ <field name="qty"/>
+ <field name="uom_id"/>
+ <field name="discount"/>
+ <field name="sales_end_date"/>
+ </form>
+ </field>
+ </record>
+
+<!-- Stage Action -->
+ <record id="event_item_sale_action" model="ir.actions.act_window">
+ <field name="name">Event Items</field>
+ <field name="res_model">event.event</field>
+ <field name="view_type">form</field>
+ <field name="view_mode">tree,form</field>
+ <field name="view_id" ref="view_event_form_inherit"/>
+ <field name="help">will show event sale</field>
+ </record>
+
+ <menuitem name="Event Portal" id="menu_event_portal" parent="base.menu_event_main" action="event_item_sale_action"/>
+ </data>
+</openerp>
=== added directory 'portal_event/security'
=== added file 'portal_event/security/ir.model.access.csv'
--- portal_event/security/ir.model.access.csv 1970-01-01 00:00:00 +0000
+++ portal_event/security/ir.model.access.csv 2012-04-23 09:08:20 +0000
@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_event_event,event.event,event.model_event_event,group_events_portal,1,1,0,0
+access_event_registration,event.registration,event.model_event_registration,group_events_portal,1,1,0,0
\ No newline at end of file
=== added file 'portal_event/security/portal_event_security.xml'
--- portal_event/security/portal_event_security.xml 1970-01-01 00:00:00 +0000
+++ portal_event/security/portal_event_security.xml 2012-04-23 09:08:20 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+ <data>
+
+ <!-- Creating Portal Group -->
+
+ <record id="group_events_portal" model="res.groups">
+ <field name="name">Events Portal Group</field>
+ <field ref="base.module_category_sales_management" name="category_id"/>
+ </record>
+
+ <record id="portal_event" model="res.portal">
+ <field name="name">Event Portal</field>
+ <field name="group_id" ref="group_events_portal"/>
+ </record>
+
+
+ <!-- Event Portal Access Rules -->
+
+ <record id="portal_personal_event_registration" model="ir.rule">
+ <field name="name">Personal Event Registration</field>
+ <field ref="event.model_event_registration" name="model_id"/>
+ <field name="domain_force">[('email','=',user.login)]</field>
+ <field name="groups" eval="[(4, ref('group_events_portal'))]"/>
+ </record>
+
+ </data>
+</openerp>
\ No newline at end of file
=== added directory 'portal_event/static'
=== added directory 'portal_event/static/lib'
=== added file 'portal_event/static/lib/map.js'
--- portal_event/static/lib/map.js 1970-01-01 00:00:00 +0000
+++ portal_event/static/lib/map.js 2012-04-23 09:08:20 +0000
@@ -0,0 +1,23 @@
+
+
+window.google = window.google || {};
+google.maps = google.maps || {};
+(function() {
+
+ function getScript(src) {
+ document.write('<' + 'script src="' + src + '"' +
+ ' type="text/javascript"><' + '/script>');
+ }
+
+ var modules = google.maps.modules = {};
+ google.maps.__gjsload__ = function(name, text) {
+ modules[name] = text;
+ };
+
+ google.maps.Load = function(apiLoad) {
+ delete google.maps.Load;
+ apiLoad([null,[[["http://mt0.googleapis.com/vt?lyrs=m@174000000\u0026src=api\u0026hl=en-US\u0026","http://mt1.googleapis.com/vt?lyrs=m@174000000\u0026src=api\u0026hl=en-US\u0026"],null,null,null,null,"m@174000000"],[["http://khm0.googleapis.com/kh?v=107\u0026hl=en-US\u0026","http://khm1.googleapis.com/kh?v=107\u0026hl=en-US\u0026"],null,null,null,1,"107"],[["http://mt0.googleapis.com/vt?lyrs=h@174000000\u0026src=api\u0026hl=en-US\u0026","http://mt1.googleapis.com/vt?lyrs=h@174000000\u0026src=api\u0026hl=en-US\u0026"],null,null,"imgtp=png32\u0026",null,"h@174000000"],[["http://mt0.googleapis.com/vt?lyrs=t@128,r@174000000\u0026src=api\u0026hl=en-US\u0026","http://mt1.googleapis.com/vt?lyrs=t@128,r@174000000\u0026src=api\u0026hl=en-US\u0026"],null,null,null,null,"t@128,r@174000000"],null,[[null,0,7,7,[[[330000000,1246050000],[386200000,1293600000]],[[366500000,1297000000],[386200000,1320034790]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1.15\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1.15\u0026hl=en-US\u0026"]],[null,0,8,8,[[[330000000,1246050000],[386200000,1279600000]],[[345000000,1279600000],[386200000,1286700000]],[[354690000,1286700000],[386200000,1320035000]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1.15\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1.15\u0026hl=en-US\u0026"]],[null,0,9,9,[[[330000000,1246050000],[386200000,1279600000]],[[340000000,1279600000],[386200000,1286700000]],[[348900000,1286700000],[386200000,1302000000]],[[368300000,1302000000],[386200000,1320035000]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1.15\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1.15\u0026hl=en-US\u0026"]],[null,0,10,19,[[[329890840,1246055600],[386930130,1284960940]],[[344646740,1284960940],[386930130,1288476560]],[[350277470,1288476560],[386930130,1310531620]],[[370277730,1310531620],[386930130,1320034790]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1.15\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1.15\u0026hl=en-US\u0026"]],[null,3,7,7,[[[330000000,1246050000],[386200000,1293600000]],[[366500000,1297000000],[386200000,1320034790]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1p.12\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1p.12\u0026hl=en-US\u0026"]],[null,3,8,8,[[[330000000,1246050000],[386200000,1279600000]],[[345000000,1279600000],[386200000,1286700000]],[[354690000,1286700000],[386200000,1320035000]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1p.12\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1p.12\u0026hl=en-US\u0026"]],[null,3,9,9,[[[330000000,1246050000],[386200000,1279600000]],[[340000000,1279600000],[386200000,1286700000]],[[348900000,1286700000],[386200000,1302000000]],[[368300000,1302000000],[386200000,1320035000]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1p.12\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1p.12\u0026hl=en-US\u0026"]],[null,3,10,null,[[[329890840,1246055600],[386930130,1284960940]],[[344646740,1284960940],[386930130,1288476560]],[[350277470,1288476560],[386930130,1310531620]],[[370277730,1310531620],[386930130,1320034790]]],["http://mt0.gmaptiles.co.kr/mt?v=kr1p.12\u0026hl=en-US\u0026","http://mt1.gmaptiles.co.kr/mt?v=kr1p.12\u0026hl=en-US\u0026"]]],[["http://cbk0.googleapis.com/cbk?","http://cbk1.googleapis.com/cbk?"]],[["http://khmdb0.googleapis.com/kh?v=53\u0026hl=en-US\u0026","http://khmdb1.googleapis.com/kh?v=53\u0026hl=en-US\u0026"],null,null,null,null,"53"],[["http://mt0.googleapis.com/mapslt?hl=en-US\u0026","http://mt1.googleapis.com/mapslt?hl=en-US\u0026"]],[["http://mt0.googleapis.com/mapslt/ft?hl=en-US\u0026","http://mt1.googleapis.com/mapslt/ft?hl=en-US\u0026"]],[["http://mt0.googleapis.com/vt?hl=en-US\u0026","http://mt1.googleapis.com/vt?hl=en-US\u0026"]]],["en-US","US",null,0,null,null,"http://maps.gstatic.com/mapfiles/","http://csi.gstatic.com","https://maps.googleapis.com","http://maps.googleapis.com"],["http://maps.gstatic.com/intl/en_us/mapfiles/api-3/8/6","3.8.6"],[1412375771],1.0,null,null,null,null,0,"",null,null,0,"http://khm.googleapis.com/mz?v=107\u0026",null,"https://earthbuilder.google.com","https://earthbuilder.googleapis.com";], loadScriptTime);
+ };
+ var loadScriptTime = (new Date).getTime();
+ getScript("http://maps.gstatic.com/intl/en_us/mapfiles/api-3/8/6/main.js";);
+})();
=== added directory 'portal_event/static/src'
=== added directory 'portal_event/static/src/css'
=== added file 'portal_event/static/src/css/event_sale.css'
--- portal_event/static/src/css/event_sale.css 1970-01-01 00:00:00 +0000
+++ portal_event/static/src/css/event_sale.css 2012-04-23 09:08:20 +0000
@@ -0,0 +1,80 @@
+.main
+{
+ background: white;
+ width:'100%';
+ text-align:center;
+}
+
+a:link
+{
+ color: #ff8080
+}
+a:visited
+{
+ color: #ff0000
+}
+a:active
+{
+ color: #a05050
+}
+.class5
+{
+ background: #000080
+}
+.header1
+{
+ background: white;
+ width:'100%';
+ text-align:left;
+}
+.mapbox
+{
+ width:380px;
+ height:200px;
+ border:1px;
+ margin-left:auto;
+ margin-right:auto;
+ border:solid #677933;"
+
+
+}
+.mapview
+{
+ width:100%;
+ height:100%;
+}
+.wrapper
+{
+ margin-left:auto;
+ margin-right:auto;
+ border:solid #DCDCDC;
+}
+
+.inner_1
+{
+ float:left;
+ width:59%;
+}
+
+.inner_2
+{
+ float:left;
+ width:39%;
+ border-left: 1px solid #DCDCDC;
+ padding: 5px;
+
+}
+
+.sub1
+{
+ float:left;
+}
+.sub2
+{
+ padding-left:70px;
+ text-align:left;
+}
+.btn
+{
+ float:right;
+}
=== added directory 'portal_event/static/src/js'
=== added file 'portal_event/static/src/js/event.js'
--- portal_event/static/src/js/event.js 1970-01-01 00:00:00 +0000
+++ portal_event/static/src/js/event.js 2012-04-23 09:08:20 +0000
@@ -0,0 +1,24 @@
+openerp.event = function(temp) {
+
+ var QWeb = temp.web.qweb;
+ // temp.web.client_actions.add('event.ui', 'temp.event.getevents');
+ // console.log(temp.web.client_actions)
+ temp.event.getevents = temp.web.Widget.extend({
+ init: function(){
+ console.log(">???????>>>>>>>>>>.");
+ this._super();
+ },
+
+ start: function(){
+ var self = this;
+ var domain = [];
+ var events = new temp.web.DataSetSearch(this, 'event.event', this.session.context, domain);
+ return events.read_slice([]).done(this.on_load_event);
+ },
+
+ on_load_event: function(events) {
+ this.$element.append(QWeb.render('get_events', {'events': events}));
+ },
+
+ });
+}
\ No newline at end of file
=== added directory 'portal_event/static/src/xml'
=== added file 'portal_event/static/src/xml/event.xml'
--- portal_event/static/src/xml/event.xml 1970-01-01 00:00:00 +0000
+++ portal_event/static/src/xml/event.xml 2012-04-23 09:08:20 +0000
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates>
+ <t t-name="get_events">
+ <div class="wrapper">
+ <t t-foreach="events" t-as="event">
+ <div class="inner_1">
+ <div class="header1">
+ <h3><t t-esc="event.name" class="event_name"/> (<t t-esc="event.country_id[1]" class="event_venue"/>)</h3>
+ <t t-esc="event.date_begin"/> to
+ <t t-esc="event.date_end"/>
+ <br/>
+ <div class="sub1"> Venue :
+ <t t-esc="event.address_id"/>
+ </div><br/>
+ <table border="1" width="100%">
+ <tr>
+ <td>Ticket Type</td>
+ <td> Sales End </td>
+ <td> Unit Price </td>
+ <td> Discount </td>
+ <td>Qty.</td>
+ <td>Price</td>
+ </tr>
+ <tr>
+ <td>Training (Technical Training)</td>
+ <td>March 19, 2012</td>
+ <td>$2500</td>
+ <td>0</td>
+ <td>1</td>
+ <td> $2500 </td>
+ </tr>
+
+ </table>
+ <button class="btn" type="button">Order now</button>
+ </div>
+ </div>
+ <div class="inner_2">
+ <div class="mapbox">
+ <iframe class="mapview" frameborder="0" src="/static/map.html">map</iframe>
+ </div>
+ <table>
+ <tr>
+ <td>
+ <h6> Where</h6>
+ </td>
+ <td>
+ <h6>kdjafkl</h6>
+ </td>
+ <td>
+ <h6>kldj</h6>
+ </td>
+ </tr>
+ </table>
+ </div>
+ <div style="clear: both"></div>
+ <hr/>
+ <div>
+ <h3>Event Detail : </h3>
+ <h3><t t-esc="event.note"/></h3>
+ </div>
+ </t>
+ <br/>
+
+ </div>
+ </t>
+</templates>
\ No newline at end of file
_______________________________________________
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
