From a85f78a48bb5a8681746925eaf6eb62243472453 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 2 Apr 2012 11:58:17 +0530
Subject: [PATCH 01/38] [ADD]event_sale: Add event_items fields for product_ids
 and sales_ends fields.

bzr revid: atp@tinyerp.com-20120402062817-yjd1pay0kqolv8fe
---
 addons/event_sale/event_sale.py       | 30 +++++++++++++++++-
 addons/event_sale/event_sale_view.xml | 45 +++++++++++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index df115c0eef4..0208714b083 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -92,4 +92,32 @@ class sale_order_line(osv.osv):
                 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}
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 4387e3a725a..1eb15e944a9 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -29,5 +29,50 @@
                 </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>

From 95952a8d56abb3c69e3597991b3c3819e65c8775 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 17 Apr 2012 15:03:40 +0530
Subject: [PATCH 02/38] [ADD] added functionality which checks the available
 seats at the time of confirming registration, and set current date in demo
 data inorder to show the upcoming events

bzr revid: bde@tinyerp.com-20120417093340-824lazijkbf83m1x
---
 addons/event/event.py       | 12 ++++++++++++
 addons/event/event_demo.xml |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 6bf1ea24786..071835fa240 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -102,6 +102,14 @@ class event_event(osv.osv):
             total_confirmed = self.event.register_current
             if total_confirmed < self.event.register_min or total_confirmed > self.event.register_max and self.event.register_max!=0:
                 raise osv.except_osv(_('Error!'),_("The total of confirmed registration for the event '%s' does not meet the expected minimum/maximum. You should maybe reconsider those limits before going further") % (self.event.name))
+            
+    def check_registration_limits_before(self, cr, uid, ids, no_of_registration, context=None):
+        total_confirmed = self.browse(cr, uid, ids, context=context).register_current
+        register_max = self.browse(cr, uid, ids, context=context).register_max
+        available_seats = register_max - total_confirmed
+        if no_of_registration > available_seats:
+            raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
+
 
     def confirm_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
@@ -295,6 +303,10 @@ class event_registration(osv.osv):
     def registration_open(self, cr, uid, ids, context=None):
         """ Open Registration
         """
+        event_obj = self.pool.get('event.event')
+        event_id = self.browse(cr, uid, ids, context=context)[0].event_id.id
+        no_of_registration = self.browse(cr, uid, ids, context=context)[0].nb_register
+        event_obj.check_registration_limits_before(cr, uid, event_id, no_of_registration, context=context)
         res = self.confirm_registration(cr, uid, ids, context=context)
         self.mail_user(cr, uid, ids, context=context)
         return res
diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index 96bc64e12aa..d5907b4bebf 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -38,16 +38,16 @@
 
     <record id="event_1" model="event.event">
         <field name="name">Opera of Verdi</field>
-        <field eval="time.strftime('%Y-%m-05 18:00:00')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-05 21:00:00')" name="date_end"/>
+        <field eval="time.strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
+        <field eval="time.strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
         <field name="type" ref="event_type_1"/>
         <field name="register_min">50</field>
         <field name="register_max">350</field>
     </record>
     <record id="event_2" model="event.event">
         <field name="name">Conference on ERP Business</field>
-        <field eval="time.strftime('%Y-%m-05 14:00:00')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-05 16:30:00')" name="date_end"/>
+        <field eval="time.strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
+        <field eval="time.strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
         <field name="type" ref="event_type_2"/>
         <field name="register_max">200</field>
     </record>

From 27d279e3c3e21233005efa5b4c2aca788044f912 Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Tue, 17 Apr 2012 17:01:20 +0530
Subject: [PATCH 03/38] [IMP] improved the date manipulation in
 event/event_demo.xml

bzr revid: bde@tinyerp.com-20120417113120-cm6tro3par1vtpy2
---
 addons/event/event_demo.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/event/event_demo.xml b/addons/event/event_demo.xml
index d5907b4bebf..81dad07b5e4 100644
--- a/addons/event/event_demo.xml
+++ b/addons/event/event_demo.xml
@@ -38,16 +38,16 @@
 
     <record id="event_1" model="event.event">
         <field name="name">Opera of Verdi</field>
-        <field eval="time.strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
+        <field eval="(DateTime.today()+ timedelta(days=1)).strftime('%Y-%m-%d 18:00:00')" name="date_begin"/>
+        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 21:00:00')" name="date_end"/>
         <field name="type" ref="event_type_1"/>
         <field name="register_min">50</field>
         <field name="register_max">350</field>
     </record>
     <record id="event_2" model="event.event">
         <field name="name">Conference on ERP Business</field>
-        <field eval="time.strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
-        <field eval="time.strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
+        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 14:00:00')" name="date_begin"/>
+        <field eval="(DateTime.today()+ timedelta(days=2)).strftime('%Y-%m-%d 16:30:00')" name="date_end"/>
         <field name="type" ref="event_type_2"/>
         <field name="register_max">200</field>
     </record>

From 89547acdfb6d883b6fc5c8790dbd2cc3abadedca Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Wed, 18 Apr 2012 14:56:37 +0530
Subject: [PATCH 04/38] [ADD] added text area in kanban view inorder to input
 number of seats

bzr revid: bde@tinyerp.com-20120418092637-uprsxgafbu1tl8vw
---
 addons/event/__openerp__.py           | 3 +++
 addons/event/event.py                 | 6 +++++-
 addons/event/event_view.xml           | 1 +
 addons/event/static/src/css/event.css | 3 +++
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index ea0e4316ef5..b9753835aeb 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,6 +54,9 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
+    'js': [
+        #'static/src/js/event.js',
+    ],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event.py b/addons/event/event.py
index 6bf1ea24786..27b8269db20 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -215,10 +215,13 @@ class event_event(osv.osv):
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
         user = user_pool.browse(cr, uid, uid, context=context)
+        print "user", user
         curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , ids[0])])
+        print "curr_reg_ids", curr_reg_ids
         #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe
         if not curr_reg_ids:
-            curr_reg_ids = [register_pool.create(cr, 1, {'event_id': ids[0] ,'email': user.user_email, 'name':user.name, 'user_id': user.id,})]
+            curr_reg_ids = [register_pool.create(cr, 1, {'event_id': ids[0] ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': 5})]
+            print "::::::::::::::", curr_reg_ids
         return register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context)
 
     def unsubscribe_to_event(self, cr, uid, ids, context=None):
@@ -288,6 +291,7 @@ class event_registration(osv.osv):
         return self.write(cr, uid, ids, {'state': 'draft'}, context=context)
 
     def confirm_registration(self, cr, uid, ids, context=None):
+        print "confirm_registrationconfirm_registration"
         self.message_append(cr, uid, ids,_('State set to open'),body_text= _('Open'))
         return self.write(cr, uid, ids, {'state': 'open'}, context=context)
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 4e22569c3e1..d4bbe059084 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -203,6 +203,7 @@
                             </p>
                             <t t-if="record.register_avail.raw_value != 0">
                               <t t-if="!record.is_subscribed.raw_value">
+                                  <textarea class="no_of_seats"/>
                                   <button type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
                                   <span >Subscribe</span>
                                   </button>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index a0f738e6323..52cf194dbe7 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -115,4 +115,7 @@ div.oe_fold_column{
    display: inline;
    background-color: #DC5F59;
  }
+ .no_of_seats{
+    width:40px;
+ }
 

From 6a15e8bf4a84355acdbf0bdb2fe3dd77e23108fb Mon Sep 17 00:00:00 2001
From: "Bharat Devnani (OpenERP)" <bde@tinyerp.com>
Date: Thu, 19 Apr 2012 17:45:06 +0530
Subject: [PATCH 05/38] [ADD] added image on home page dashboard for event
 module

bzr revid: bde@tinyerp.com-20120419121506-o0fgrf39f306r9h0
---
 addons/event/event_view.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index f3f3c165f93..bff081c1911 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -2,7 +2,9 @@
 <openerp>
     <data>
 
-        <menuitem  name="Events" id="event_main_menu"/>
+        <menuitem  name="Events" id="event_main_menu" 
+            web_icon="images/icon.png"
+            web_icon_hover="images/icon.png"/>
         <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu" />
 
     <!-- EVENTS  -->

From edd102bc770c84f546dd45147bbc07feca762145 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 23 Apr 2012 11:37:44 +0530
Subject: [PATCH 07/38] [IMP]: Improve code.

bzr revid: atp@tinyerp.com-20120423060744-gx0jm63z8ba6cq5i
---
 addons/event/event.py | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index f8a15112bfa..a633dc41961 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -115,12 +115,10 @@ class event_event(osv.osv):
             
     def check_registration_limits_before(self, cr, uid, ids, no_of_registration, context=None):
         available_seats = self.check_available_seats(cr, uid, ids, context=context)
-        if no_of_registration > available_seats:
-            if available_seats == 0:
-                raise osv.except_osv(_('Warning!'),_("No Tickets Available!"))
-            else:
-                raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
-
+        if available_seats and no_of_registration > available_seats:
+             raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
+        elif available_seats == 0:
+            raise osv.except_osv(_('Warning!'),_("No Tickets Available!"))
 
     def confirm_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
@@ -231,16 +229,10 @@ class event_event(osv.osv):
     }
 
     def subscribe_to_event(self, cr, uid, ids, context=None):
-        num_of_seats = int(context.get('ticket', 1))
-        available_seats = self.check_available_seats(cr, uid, ids, context=context)
-        if num_of_seats > available_seats:
-            if available_seats == 0:
-                raise osv.except_osv(_('Warning!'),_("No Tickets Available!"))
-            else:
-                raise osv.except_osv(_('Warning!'),_("Only %d Seats are Available!") % (available_seats))
-
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
+        num_of_seats = int(context.get('ticket', 1))
+        self.check_registration_limits_before(cr, uid, ids, num_of_seats, context=context)
         user = user_pool.browse(cr, uid, uid, context=context)
         curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , ids[0])])
         #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe

From fa10c5cec773a0b68d52522ec500c3e87d35d76e Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 27 Apr 2012 15:02:42 +0530
Subject: [PATCH 08/38] [imp] change the event view.

bzr revid: nco@tinyerp.com-20120427093242-o9srduq715lbqt8t
---
 addons/event/__openerp__.py           |   2 +-
 addons/event/event.py                 |   5 +-
 addons/event/event_view.xml           | 119 ++++++++++++++++++++++----
 addons/event/static/src/css/event.css |  36 +++++++-
 addons/event_sale/__openerp__.py      |   5 +-
 addons/event_sale/event_sale.py       |  51 +++++++++--
 addons/event_sale/event_sale_view.xml |  92 +++++++++++---------
 7 files changed, 238 insertions(+), 72 deletions(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index ea0e4316ef5..6de6d2c62c1 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -53,7 +53,7 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
-    'css': ['static/src/css/event.css'],
+    'css': ['static/src/css/*.css'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event.py b/addons/event/event.py
index a633dc41961..7eacad489ff 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -220,6 +220,8 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
+        'location_id': fields.many2one('res.company','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        
     }
 
     _defaults = {
@@ -408,6 +410,5 @@ class event_registration(osv.osv):
         return {'value': data}
 
 event_registration()
-
-
+    
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index a9dbca304f4..efa5eb68384 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -45,6 +45,39 @@
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
 
+
+		<!-- Event Item Tree view-->
+    	<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"  string="Ticket Type" />
+                    <field name="uom_id"/>
+                    <field name="sales_end_date"/>
+                    <field name="price"/>
+                    <field name="qty"/>
+                </tree>
+            </field>
+        </record>
+        <!-- Event Item Form View -->
+        <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" 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>
+
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
         <record model="ir.ui.view" id="view_event_form">
@@ -52,20 +85,75 @@
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events">
-                    <group col="6" colspan="4">
-                        <field name="name"/>
-                        <field name="date_begin"/>
-                        <field name="date_end"/>
-                        <field name="type" on_change="onchange_event_type(type,context)"/>
-                        <field name="user_id"/>
-                        <field name="address_id" />
-                    </group>
+                <form string="Events"  layout="manual">
+                <div class="oe_form_topbar">
+                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+               		<div class="oe_right">
+                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+               		</div>
+            	</div>
+            	<sheet string="Event Form" layout="auto">
+            		<group col="2">
+            			<group col="2">
+		                	<div class="oe_event_title">
+		                    	<field name="name" nolabel="1"/>
+		                    </div>
+		                    <newline/>
+		                    <group colspan="4" string="vanue">
+                            	<div class="sub1"> Venue   : </div> <separator orientation="vertical"/>
+                            	<field name="location_id" nolabel="1"/> 
+                        	</group>
+			             </group>	
+			             <group>
+			             	<div class="mapbox"> </div><newline/>
+		                    <!--table>
+		                        <tr>
+		                        <td width="70px" style="text-align:top;"  class="oe_td_border">
+		                            Where
+		                        </td>
+		                        <td width="150px">
+		                            <field name="address_id" nolabel="1"/>
+		                                
+		                        </td>
+		                        <td width="150px">
+									<span width="15px"> Start</span> <field name="date_begin" nolabel="1"/>   
+									<span width="15px"> End</span> <field name="date_end" nolabel="1"/>    
+		                        </td>
+		                        </tr>
+		                   </table-->   
+		                   <table>
+		                   	<tr>
+		                    	<td width="70px" class="oe_td_border">
+		                            Where
+		                        </td>
+		                        <td width="150px">
+		                            <field name="address_id" nolabel="1"/>
+		                        </td>
+		                        <td width="auto">
+                             		<table>
+										<tr>
+											<td class="oe_td_date_border">Start</td><td><field name="date_begin" nolabel="1"/></td>
+										</tr>
+										<tr>
+											<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
+										</tr>
+									</table>
+                                 
+		                        </td>
+		                     </tr>
+		                   </table>   
+		                      <!--field name="date_end" label="To" string="end"/-->
+					       
+			             </group>
+                    </group>	
                     <notebook colspan="4">
                     <page string="Event">
                         <separator string="Description" colspan="4"/>
                         <field name="note" colspan="4" nolabel="1"/>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
                                 <field name="email" />
@@ -98,13 +186,7 @@
                                     </group>
                             </form>
                             </field>
-                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                        <group col="4" colspan="2">
-                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        </group>
+                        
                     </page>
                     <page string="Speakers" groups="base.group_extended">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
@@ -112,7 +194,7 @@
                         <separator string="Other Speakers" colspan="4"/>
                         <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Extra Info">
+                    <page string="Extra Info" groups="event.group_event_manager">
                         <group col="2" colspan="2">
                             <separator string="Registrations" colspan="2"/>
                             <field name="register_min"/>
@@ -129,6 +211,7 @@
                         </group>
                     </page>
                     </notebook>
+                    </sheet>
             </form>
             </field>
         </record>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 0d0282826b7..f8fe5c04c86 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -64,6 +64,7 @@ div.oe_fold_column{
     -webkit-font-smoothing: antialiased;
     outline: none;
 }
+
 .oe_event_button_unsubscribe {
   display: inline-block;
     border: 1px solid #AAA;
@@ -116,7 +117,36 @@ div.oe_fold_column{
    background-color: #DC5F59;
  }
  .no_of_seats{
-    width:25px;
-    
+    width:25px;    
  }
-
+.oe_event_title{
+  font-size: 25px;
+}
+.sub1
+{
+    float:left;
+}
+.sub2
+{
+    padding-left:50px;
+    text-align:left;
+}
+.mapbox
+{ 
+    width:380px;
+    height:200px;
+    border:1px; 
+    margin-left:auto; 
+    margin-right:auto; 
+    border:solid #677933;
+}
+.oe_td_border
+{
+	width: 5em;
+	padding: 2px;
+	border-right: 1px solid black;
+}
+.oe_td_date_border
+{
+	border-right:1px solid black;
+}
\ No newline at end of file
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index d8f689986e2..be60ed3fdf6 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -34,12 +34,15 @@ This module allows you to automatize and connect your registration creation with
 It defines a new kind of service products that offers you the possibility to choose an event category associated with it. When you encode a sale order for that product, you will be able to choose an existing event of that category and when you confirm your sale order it will automatically create a registration for this event.
 """,
     'author': 'OpenERP SA',
-    'depends': ['event','sale','sale_crm'],
+    'depends': ['event','sale','sale_crm','portal'],
     'update_xml': [
         '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,
 }
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 0208714b083..93be776d336 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import time
 from osv import fields, osv
 from tools.translate import _
 
@@ -92,13 +93,53 @@ class sale_order_line(osv.osv):
                 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'),
-    }
-    
+                    'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
+                }
+
+    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):
+            if order_lines.event_item_ids:
+                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 = {
@@ -110,7 +151,7 @@ class event_items(osv.osv):
         '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 = {}
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 1eb15e944a9..ff0ead161d5 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -30,49 +30,57 @@
              </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_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="//group[@string='vanue']" position="after">
+						<field name="event_item_ids" nolabel="1"/><newline/>
+						<div class="oe_right">
+							<button string="Order Now" name="make_order" help="Order Event" type="object" icon="gtk-ok" attrs="{'invisible':[('state','=','confirm')]}"/>
+						</div>
+				</xpath>
+				<xpath expr="//group[@string='vanue']" position="attributes">
+                    <attribute name="string"></attribute>
+                </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="qty"/>
+					 <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="qty"/>
+					<field name="uom_id"/>
+					<field name="discount"/>
+					<field name="sales_end_date"/>
+				</form>
+		 	</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>

From 66814b5501edfc5aab0dd54eb161e488b8d23462 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 27 Apr 2012 15:16:34 +0530
Subject: [PATCH 09/38] [imp] event : remove unused code.

bzr revid: nco@tinyerp.com-20120427094634-foba34c88a4mn2ja
---
 addons/event/event.py                 |  2 +-
 addons/event/event_view.xml           | 63 ++++++++++-----------------
 addons/event/static/src/css/event.css |  9 +---
 addons/event_sale/__openerp__.py      |  3 --
 4 files changed, 26 insertions(+), 51 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 7eacad489ff..5e948c1a59b 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -220,7 +220,7 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
-        'location_id': fields.many2one('res.company','Location Address', readonly=False, states={'done': [('readonly', True)]}),
+        'location_id': fields.many2one('res.company','Organization Address', readonly=False, states={'done': [('readonly', True)]}),
         
     }
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index efa5eb68384..4e61844db80 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -103,50 +103,33 @@
 		                    </div>
 		                    <newline/>
 		                    <group colspan="4" string="vanue">
-                            	<div class="sub1"> Venue   : </div> <separator orientation="vertical"/>
+                            	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
                             	<field name="location_id" nolabel="1"/> 
                         	</group>
 			             </group>	
 			             <group>
-			             	<div class="mapbox"> </div><newline/>
-		                    <!--table>
-		                        <tr>
-		                        <td width="70px" style="text-align:top;"  class="oe_td_border">
-		                            Where
-		                        </td>
-		                        <td width="150px">
-		                            <field name="address_id" nolabel="1"/>
-		                                
-		                        </td>
-		                        <td width="150px">
-									<span width="15px"> Start</span> <field name="date_begin" nolabel="1"/>   
-									<span width="15px"> End</span> <field name="date_end" nolabel="1"/>    
-		                        </td>
-		                        </tr>
-		                   </table-->   
-		                   <table>
-		                   	<tr>
-		                    	<td width="70px" class="oe_td_border">
-		                            Where
-		                        </td>
-		                        <td width="150px">
-		                            <field name="address_id" nolabel="1"/>
-		                        </td>
-		                        <td width="auto">
-                             		<table>
-										<tr>
-											<td class="oe_td_date_border">Start</td><td><field name="date_begin" nolabel="1"/></td>
-										</tr>
-										<tr>
-											<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
-										</tr>
-									</table>
-                                 
-		                        </td>
-		                     </tr>
-		                   </table>   
-		                      <!--field name="date_end" label="To" string="end"/-->
-					       
+			             	<div class="oe_mapbox"> </div><newline/>
+		                    <table>
+			                   	<tr>
+			                    	<td width="70px" class="oe_td_border">
+			                            Where
+			                        </td>
+			                        <td width="150px">
+			                            <field name="address_id" nolabel="1"/>
+			                        </td>
+			                        <td width="auto">
+	                             		<table>
+											<tr>
+												<td class="oe_td_date_border">Start</td><td><field name="date_begin" nolabel="1"/></td>
+											</tr>
+											<tr>
+												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
+											</tr>
+										</table>
+	                                 
+			                        </td>
+			                     </tr>
+		                     </table>   
 			             </group>
                     </group>	
                     <notebook colspan="4">
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index f8fe5c04c86..d89131fe82f 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -122,16 +122,11 @@ div.oe_fold_column{
 .oe_event_title{
   font-size: 25px;
 }
-.sub1
+.oe_sub1
 {
     float:left;
 }
-.sub2
-{
-    padding-left:50px;
-    text-align:left;
-}
-.mapbox
+.oe_mapbox
 { 
     width:380px;
     height:200px;
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index be60ed3fdf6..fb7134f6070 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -39,10 +39,7 @@ It defines a new kind of service products that offers you the possibility to cho
         '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,
 }

From 8d91d9a580d9a3333e09220cada6ecd4ed01fbce Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 30 Apr 2012 13:09:03 +0530
Subject: [PATCH 10/38] [IMP]: Improve code . remove unused code.

bzr revid: atp@tinyerp.com-20120430073903-52rcd0khdkcyx292
---
 addons/event/event_view.xml                   |  2 +-
 addons/event_sale/event_sale.py               | 23 ++++---
 addons/event_sale/event_sale_view.xml         |  9 +--
 addons/portal_event/__init__.py               | 22 ++++++
 addons/portal_event/__openerp__.py            | 40 +++++++++++
 addons/portal_event/portal_event.py           | 69 +++++++++++++++++++
 .../portal_event/security/ir.model.access.csv |  4 ++
 .../security/portal_event_security.xml        | 33 +++++++++
 8 files changed, 184 insertions(+), 18 deletions(-)
 create mode 100644 addons/portal_event/__init__.py
 create mode 100644 addons/portal_event/__openerp__.py
 create mode 100644 addons/portal_event/portal_event.py
 create mode 100644 addons/portal_event/security/ir.model.access.csv
 create mode 100644 addons/portal_event/security/portal_event_security.xml

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c6cf379ffb7..92e850c011e 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -102,7 +102,7 @@
 		                    	<field name="name" nolabel="1"/>
 		                    </div>
 		                    <newline/>
-		                    <group colspan="4" string="vanue">
+		                    <group colspan="4" name="venue">
                             	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
                             	<field name="location_id" nolabel="1"/> 
                         	</group>
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 1e0e745edce..911d316cca8 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -35,15 +35,6 @@ class product(osv.osv):
 
 product()
 
-class sale_order(osv.osv):
-    _inherit = 'sale.order'
-    _columns = {
-    'partner_id': fields.many2one('res.partner', 'Customer', readonly=False, states={'draft': [('readonly', False)]}, required=False, change_default=True, select=True),
-    'partner_invoice_id': fields.many2one('res.partner', 'Invoice Address', readonly=False, required=False, states={'draft': [('readonly', False)]}, help="Invoice address for current sales order."),
-    'partner_shipping_id': fields.many2one('res.partner', 'Shipping Address', readonly=False, required=False, states={'draft': [('readonly', False)]}, help="Shipping address for current sales order."),
-    }
-    
-
 class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
     _columns = {
@@ -108,13 +99,20 @@ class event_event(osv.osv):
                     'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
                 }
 
-    def open_qoutation(self, cr, uid, ids, partner_id, context=None):
+    def make_quotation(self, cr, uid, ids, context=None):
         res = {}
         event_pool = self.pool.get('event.event')
         register_pool = self.pool.get('event.registration')
         sale_order_line_pool = self.pool.get('sale.order.line')
         sale_order = self.pool.get('sale.order')
         user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
+        partner_pool = self.pool.get("res.partner")
+        new_partner_id = False
+        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
+        if not partner_ids:
+            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
+            partner_invoice_id = self.pool.get('res.partner').address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = self.pool.get('res.partner').address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
         for event_id in self.browse(cr, uid, ids, context=context):
             prod_pricelist_obj = self.pool.get('product.pricelist')
             sale_order_lines = []
@@ -122,6 +120,9 @@ class event_event(osv.osv):
             new_sale_id = sale_order.create(cr, uid, {
                 'date_order': event_id.date_begin,
                 'pricelist_id': price_list,
+                 'partner_id': new_partner_id, 
+                  'partner_invoice_id': partner_invoice_id,
+                 'partner_shipping_id': partner_shipping_id
                 })            
             if event_id.event_item_ids:
                 for items in event_id.event_item_ids:
@@ -145,7 +146,7 @@ class event_event(osv.osv):
                         'nodestroy': True,
                         'target': 'new',
                 }
-                self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
+               # self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
         return res
 
 class event_items(osv.osv):
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 52a0723f950..7f1504b7b69 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -36,15 +36,12 @@
 			<field name="type">form</field>
 			<field name="inherit_id" ref="event.view_event_form"/>
 			<field name="arch" type="xml">
-				<xpath expr="//group[@string='vanue']" position="after">
+				<xpath expr="//group[@name='venue']" position="after">
 						<field name="event_item_ids" nolabel="1"/><newline/>
 						<div class="oe_right">
-							<button string="Order Now" name="open_qoutation" help="Order Event" type="object" icon="gtk-ok" attrs="{'invisible':[('state','=','confirm')]}"/>
+							<button string="Order Now" name="make_quotation" help="Order Event" type="object" icon="gtk-ok" attrs="{'invisible':[('state','=','confirm')]}"/>
 						</div>
 				</xpath>
-				<xpath expr="//group[@string='vanue']" position="attributes">
-                    <attribute name="string"></attribute>
-                </xpath>
 			</field>
 		</record>
 
@@ -53,7 +50,7 @@
 			 <field name="model">event.items</field>
 			 <field name="type">tree</field>
 			 <field name="arch" type="xml">
-				 <tree string="Event Items">
+				 <tree editable="top" string="Event Items">
 					 <field name="product_id"/>
 					 <field name="price"/>
 					 <field name="qty"/>
diff --git a/addons/portal_event/__init__.py b/addons/portal_event/__init__.py
new file mode 100644
index 00000000000..70c078b769d
--- /dev/null
+++ b/addons/portal_event/__init__.py
@@ -0,0 +1,22 @@
+# -*- 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
diff --git a/addons/portal_event/__openerp__.py b/addons/portal_event/__openerp__.py
new file mode 100644
index 00000000000..88ca9815323
--- /dev/null
+++ b/addons/portal_event/__openerp__.py
@@ -0,0 +1,40 @@
+# -*- 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.
+    """,
+    'update_xml': [
+        'security/portal_event_security.xml',
+        'security/ir.model.access.csv',
+    ],    
+    'website': 'http://www.openerp.com',
+    'installable': True,
+}
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/portal_event/portal_event.py b/addons/portal_event/portal_event.py
new file mode 100644
index 00000000000..41a7d81bcc5
--- /dev/null
+++ b/addons/portal_event/portal_event.py
@@ -0,0 +1,69 @@
+# -*- 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/>.
+#
+##############################################################################
+
+import time
+from osv import fields, osv
+from tools.translate import _
+
+class event_event(osv.osv):
+    _inherit = 'event.event'
+
+    def make_quotation(self, cr, uid, ids, partner_id, context=None):
+        event_pool = self.pool.get('event.event')
+        register_pool = self.pool.get('event.registration')
+        sale_order_line_pool = self.pool.get('sale.order.line')
+        sale_order = self.pool.get('sale.order')
+        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:
+              raise osv.except_osv(_('Error !'),
+                                    _('There is no Partner defined ' \
+                                            'for this event:'))
+        
+        user_name = res_users_obj.browse(cr, uid, uid, context=context).name
+        price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+        for event_id in self.browse(cr, uid, ids, context=context):
+            sale_order_lines = []
+            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+            new_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': event_id.date_begin
+                })            
+            if event_id.event_item_ids:
+                for items in event_id.event_item_ids:
+                    product = items.product_id.id
+                    sale_order_line = sale_order_line_pool.create(cr, uid, {
+                        'order_id': new_sale_id,                                
+                        'name': items.product_id.name,
+                        'product_uom_qty': items.qty,
+                        'product_id': items.product_id.id,
+                        'product_uom': items.uom_id.id,
+                        'price_unit': items.price,
+                        'date_planned': items.sales_end_date,
+                    }, context=context)
+        return True
diff --git a/addons/portal_event/security/ir.model.access.csv b/addons/portal_event/security/ir.model.access.csv
new file mode 100644
index 00000000000..2ca1e3def91
--- /dev/null
+++ b/addons/portal_event/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_event,event,event.model_event_event,portal_event.group_event_portal,1,0,0,0
+access_registration,registration,event.model_event_registration,portal_event.group_event_portal,1,0,0,0
+access_event_items,event.items,event.model_event_event,portal_event.group_event_portal,1,1,1,0
\ No newline at end of file
diff --git a/addons/portal_event/security/portal_event_security.xml b/addons/portal_event/security/portal_event_security.xml
new file mode 100644
index 00000000000..64c077c7bb9
--- /dev/null
+++ b/addons/portal_event/security/portal_event_security.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+    
+        <!-- Creating Portal Group -->
+        
+        <record id="group_event_portal" model="res.groups">
+            <field name="name">Portal User</field>
+            <field ref="event.module_category_event_management" name="category_id"/>
+        </record>
+        
+        <record id="portal_event" model="res.portal">
+            <field name="name">Events Portal</field>
+            <field name="group_id" ref="group_event_portal"/>
+        </record>
+            
+        <!-- Sale Portal Access Rules -->
+        <record id="portal_event_rule" model="ir.rule">
+            <field name="name">Personal Events</field>
+            <field ref="event.model_event_event" name="model_id"/>
+            <field name="domain_force">[]</field>
+            <field name="groups" eval="[(4, ref('group_event_portal'))]"/>
+        </record>
+        
+        <record id="portal_registration_rule" model="ir.rule">
+            <field name="name">Personal Registrations</field>
+            <field ref="event.model_event_registration" name="model_id"/>
+            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
+            <field name="groups" eval="[(4, ref('group_event_portal'))]"/>
+        </record>        
+        
+    </data>
+</openerp>
\ No newline at end of file

From 4443f39f3854ce511dfe68a6f7660c97513dea84 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 30 Apr 2012 15:14:54 +0530
Subject: [PATCH 11/38] [FIX]: Fix some code error. add security rules for
 event module

bzr revid: atp@tinyerp.com-20120430094454-hcz6w2xvllg7g2b7
---
 addons/event_sale/event_sale.py               | 81 +++++++++++--------
 addons/portal_event/portal_event.py           | 42 +++-------
 .../portal_event/security/ir.model.access.csv |  4 +-
 .../security/portal_event_security.xml        |  4 +-
 4 files changed, 61 insertions(+), 70 deletions(-)

diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 911d316cca8..ee48956324f 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -105,48 +105,59 @@ class event_event(osv.osv):
         register_pool = self.pool.get('event.registration')
         sale_order_line_pool = self.pool.get('sale.order.line')
         sale_order = self.pool.get('sale.order')
-        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
         partner_pool = self.pool.get("res.partner")
-        new_partner_id = False
+        prod_pricelist_obj = self.pool.get('product.pricelist')
+        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
         partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
         if not partner_ids:
             new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
-            partner_invoice_id = self.pool.get('res.partner').address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = self.pool.get('res.partner').address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
+            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
+        else:
+            new_partner_id = partner_ids[0]
+            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
         for event_id in self.browse(cr, uid, ids, context=context):
-            prod_pricelist_obj = self.pool.get('product.pricelist')
             sale_order_lines = []
             price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-            new_sale_id = sale_order.create(cr, uid, {
-                'date_order': event_id.date_begin,
-                'pricelist_id': price_list,
-                 'partner_id': new_partner_id, 
-                  'partner_invoice_id': partner_invoice_id,
-                 'partner_shipping_id': partner_shipping_id
-                })            
-            if event_id.event_item_ids:
-                for items in event_id.event_item_ids:
-                    product = items.product_id.id
-                    sale_order_line = sale_order_line_pool.create(cr, uid, {
-                        'order_id': new_sale_id,                                
-                        'name': items.product_id.name,
-                        'product_uom_qty': items.qty,
-                        'product_id': items.product_id.id,
-                        'product_uom': items.uom_id.id,
-                        'price_unit': items.price,
-                        'date_planned': items.sales_end_date,
-                    }, context=context)
-                res = {
-                        'name': _('Quotation'),
-                        'view_type': 'form',
-                        'view_mode': 'form',
-                        'res_model': 'sale.order',
-                        'res_id': new_sale_id,
-                        'type': 'ir.actions.act_window',
-                        'nodestroy': True,
-                        'target': 'new',
-                }
-               # self.write(cr, uid, ids, {'state': 'confirm'}, context=context)
+            sale_ids = sale_order.search(cr, uid, [('date_order', '=', event_id.date_begin), ('partner_id', '=', new_partner_id)])
+            if not sale_ids:
+#                    raise osv.except_osv(_('Error !'),
+#                        _('sale order is already Exists for this event:'))
+#            else:          
+                new_sale_id = sale_order.create(cr, uid, {
+                    'date_order': event_id.date_begin,
+                    'pricelist_id': price_list,
+                     'partner_id': new_partner_id, 
+                      'partner_invoice_id': partner_invoice_id,
+                     'partner_shipping_id': partner_shipping_id
+                    })            
+                if event_id.event_item_ids:
+                    for items in event_id.event_item_ids:
+                        product = items.product_id.id
+                        sale_order_line = sale_order_line_pool.create(cr, uid, {
+                            'order_id': new_sale_id,                                
+                            'name': items.product_id.name,
+                            'product_uom_qty': items.qty,
+                            'product_id': items.product_id.id,
+                            'product_uom': items.uom_id.id,
+                            'price_unit': items.price,
+                            'date_planned': items.sales_end_date,
+                        }, context=context)
+                    view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
+                    if view_id:
+                        res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+                    res = {
+                            'name': _('Quotation'),
+                            'view_type': 'form',
+                            'view_mode': 'form',
+                            'res_model': 'sale.order',
+                            'res_id': new_sale_id,
+                            'views':[(res_id,'form'), (False, 'tree')],
+                            'type': 'ir.actions.act_window',
+                            'nodestroy': True,
+                            'target': 'current',
+                    }
         return res
 
 class event_items(osv.osv):
diff --git a/addons/portal_event/portal_event.py b/addons/portal_event/portal_event.py
index 41a7d81bcc5..570bd3131b6 100644
--- a/addons/portal_event/portal_event.py
+++ b/addons/portal_event/portal_event.py
@@ -26,44 +26,22 @@ from tools.translate import _
 class event_event(osv.osv):
     _inherit = 'event.event'
 
-    def make_quotation(self, cr, uid, ids, partner_id, context=None):
+    def make_quotation(self, cr, uid, ids, context=None):
         event_pool = self.pool.get('event.event')
         register_pool = self.pool.get('event.registration')
         sale_order_line_pool = self.pool.get('sale.order.line')
         sale_order = self.pool.get('sale.order')
-        res_partner_obj = self.pool.get('res.partner')
+        partner_pool = 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 = res_users_obj.browse(cr, uid, uid, context=context)
+        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
+        if partner_ids:
+            res_users_obj.write(cr, uid, user.id, {'partner_id': partner_ids[0]})        
+        if not partner_ids:
               raise osv.except_osv(_('Error !'),
                                     _('There is no Partner defined ' \
                                             'for this event:'))
-        
-        user_name = res_users_obj.browse(cr, uid, uid, context=context).name
-        price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-        for event_id in self.browse(cr, uid, ids, context=context):
-            sale_order_lines = []
-            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-            new_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': event_id.date_begin
-                })            
-            if event_id.event_item_ids:
-                for items in event_id.event_item_ids:
-                    product = items.product_id.id
-                    sale_order_line = sale_order_line_pool.create(cr, uid, {
-                        'order_id': new_sale_id,                                
-                        'name': items.product_id.name,
-                        'product_uom_qty': items.qty,
-                        'product_id': items.product_id.id,
-                        'product_uom': items.uom_id.id,
-                        'price_unit': items.price,
-                        'date_planned': items.sales_end_date,
-                    }, context=context)
-        return True
+        res = super(event_event,self).make_quotation(cr, uid, ids, context)              
+
+        return res
diff --git a/addons/portal_event/security/ir.model.access.csv b/addons/portal_event/security/ir.model.access.csv
index 2ca1e3def91..0b3dfe5f3b2 100644
--- a/addons/portal_event/security/ir.model.access.csv
+++ b/addons/portal_event/security/ir.model.access.csv
@@ -1,4 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_event,event,event.model_event_event,portal_event.group_event_portal,1,0,0,0
 access_registration,registration,event.model_event_registration,portal_event.group_event_portal,1,0,0,0
-access_event_items,event.items,event.model_event_event,portal_event.group_event_portal,1,1,1,0
\ No newline at end of file
+access_event_items,event.items,event.model_event_event,portal_event.group_event_portal,1,1,1,0
+access_product_product,product.product,product.model_product_product,portal_event.group_event_portal,1,0,0,0
+access_product_uom,product.uom,product.model_product_uom,portal_event.group_event_portal,1,0,0,0
\ No newline at end of file
diff --git a/addons/portal_event/security/portal_event_security.xml b/addons/portal_event/security/portal_event_security.xml
index 64c077c7bb9..1202fcce3f5 100644
--- a/addons/portal_event/security/portal_event_security.xml
+++ b/addons/portal_event/security/portal_event_security.xml
@@ -5,12 +5,12 @@
         <!-- Creating Portal Group -->
         
         <record id="group_event_portal" model="res.groups">
-            <field name="name">Portal User</field>
+            <field name="name">Event Portal Groups</field>
             <field ref="event.module_category_event_management" name="category_id"/>
         </record>
         
         <record id="portal_event" model="res.portal">
-            <field name="name">Events Portal</field>
+            <field name="name">Portal User</field>
             <field name="group_id" ref="group_event_portal"/>
         </record>
             

From 2d6fba0621c1cbd5e1a6d52e3e71adbc3208b628 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 2 May 2012 12:37:22 +0530
Subject: [PATCH 12/38] [ADD]: Add event_items one2many fields into event form
 view.

bzr revid: atp@tinyerp.com-20120502070722-3twkfw14q89nznuo
---
 addons/event/event.py                 |   2 -
 addons/event/event_view.xml           | 152 ++++++++++++++++++++------
 addons/event/static/src/css/event.css |   3 +-
 addons/event_sale/event_sale.py       | 124 ++++++++++-----------
 addons/event_sale/event_sale_view.xml |  17 +--
 5 files changed, 184 insertions(+), 114 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 5b14f25d733..62b1d79f969 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -221,7 +221,6 @@ class event_event(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
         'location_id': fields.many2one('res.partner','Organization Address', readonly=False, states={'done': [('readonly', True)]}),
-        
     }
 
     _defaults = {
@@ -259,7 +258,6 @@ class event_event(osv.osv):
     _constraints = [
         (_check_closing_date, 'Error ! Closing Date cannot be set before Beginning Date.', ['date_end']),
     ]
-
     def onchange_event_type(self, cr, uid, ids, type_event, context=None):
         if type_event:
             type_info =  self.pool.get('event.type').browse(cr,uid,type_event,context)
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 92e850c011e..5b9dfe41d09 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -45,42 +45,124 @@
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
 
-
-		<!-- Event Item Tree view-->
-    	<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"  string="Ticket Type" />
-                    <field name="uom_id"/>
-                    <field name="sales_end_date"/>
-                    <field name="price"/>
-                    <field name="qty"/>
-                </tree>
-            </field>
-        </record>
-        <!-- Event Item Form View -->
-        <record model="ir.ui.view" id="view_event_items_form">
-            <field name="name">Event Items Form</field>
-            <field name="model">event.items</field>
+    <!-- Events Organisation/CONFIGURATION/EVENTS -->
+    
+        <record model="ir.ui.view" id="view_event_form">
+            <field name="name">Events</field>
+            <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Event Items">
-                    <field name="product_id" 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>
+ 			 <form string="Events"  layout="manual">
+                <div class="oe_form_topbar">
+                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+               		<div class="oe_right">
+                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+               		</div>
+            	</div>
+             <sheet string="Event Form" layout="auto">
+            	<group  colspan="4">
+            	     <group colspan="2">
+                        <field name="name"/>
+						 <field name="type" on_change="onchange_event_type(type,context)"/>
+						<field name="user_id"/>
+                        </group>
+			             <group colspan="2">
+			             	<div class="oe_mapbox oe_right"> </div><newline/>
+		                    <table align="right">
+			                   	<tr>
+			                    	<td width="70px" class="oe_td_border">
+			                            Where
+			                        </td>
+			                        <td width="150px">
+			                            <field name="address_id" nolabel="1"/>
+			                        </td>
+			                        <td width="auto">
+	                             		<table>
+											<tr>
+												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1"/></td>
+											</tr>
+											<tr>
+												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
+											</tr>
+										</table>
+			                        </td>
+			                     </tr>
+		                     </table>   
+			             </group>  
+			         </group>
+                    <notebook colspan="4">
+                    <page string="Event">
+                        <separator string="Description" colspan="4"/>
+                        <field name="note" colspan="4" nolabel="1"/>
+                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                            <tree string="Registration" editable="top">
+                                <field name="name" />
+                                <field name="email" />
+                                <field name="phone"/>
+                                <field name="nb_register" />
+                                <field name="state"/>
+                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                            </tree>
+                            <form string="Registration">
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
+                                <field name="name"/>
+                                <group colspan="4" col="4">
+                                <field name="email"/>
+                                <field name="phone"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                    <field name="nb_register"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                </group>
+                                    <group col="8" colspan="4">
+                                        <separator string="" colspan="4"/>
+                                        <newline/>
+                                        <field name="state" select="1" colspan="2"/>
+                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                    </group>
+                            </form>
+                            </field>
+                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                    </page>
+                    <page string="Speakers">
+                        <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
+                        <field name="speaker_confirmed"/>
+                        <separator string="Other Speakers" colspan="4"/>
+                        <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Extra Info">
+                        <group col="2" colspan="2">
+                            <separator string="Registrations" colspan="2"/>
+                            <field name="register_min"/>
+                            <field name="register_max"/>
+                            <field name="register_prospect"/>
+                            <field name="register_current"/>
+                            <field name="register_attended"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Emails" colspan="2"/>
+                            <field name="reply_to"/>
+                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
+                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
+                        </group>
+                    </page>
+                    </notebook>
+                    </sheet>
+            </form>
             </field>
         </record>
-
-    <!-- Events Organisation/CONFIGURATION/EVENTS -->
-
-        <record model="ir.ui.view" id="view_event_form">
+        
+       <!--  Event Page view -->
+       
+        <record model="ir.ui.view" id="view_event_page">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
@@ -126,7 +208,6 @@
 												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
 											</tr>
 										</table>
-	                                 
 			                        </td>
 			                     </tr>
 		                     </table>   
@@ -169,7 +250,6 @@
                                     </group>
                             </form>
                             </field>
-                        
                     </page>
                     <page string="Speakers" groups="base.group_extended">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
@@ -198,8 +278,8 @@
             </form>
             </field>
         </record>
-
-        <!-- Event tree view -->
+        
+       <!-- Event tree view -->
 
         <record model="ir.ui.view" id="view_event_tree">
             <field name="name">event.event.tree</field>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 7cf87ffc38c..cebf155081b 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -133,13 +133,14 @@ div.oe_fold_column{
     border:1px solid black; 
     margin-left:auto; 
     margin-right:auto; 
-    
+    text-align: right;
 }
 .oe_td_border
 {
 	width: 5em;
 	padding: 2px;
 	border-right: 1px solid black;
+	text-align: center;
 }
 .oe_td_date_border
 {
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index ee48956324f..81b69babebf 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -35,6 +35,7 @@ class product(osv.osv):
 
 product()
 
+
 class sale_order_line(osv.osv):
     _inherit = 'sale.order.line'
     _columns = {
@@ -98,75 +99,70 @@ class event_event(osv.osv):
     _columns = {
                     'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
                 }
-
-    def make_quotation(self, cr, uid, ids, context=None):
-        res = {}
-        event_pool = self.pool.get('event.event')
-        register_pool = self.pool.get('event.registration')
-        sale_order_line_pool = self.pool.get('sale.order.line')
-        sale_order = self.pool.get('sale.order')
-        partner_pool = self.pool.get("res.partner")
-        prod_pricelist_obj = self.pool.get('product.pricelist')
-        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
-        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
-        if not partner_ids:
-            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
-            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
-        else:
-            new_partner_id = partner_ids[0]
-            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
-        for event_id in self.browse(cr, uid, ids, context=context):
-            sale_order_lines = []
-            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-            sale_ids = sale_order.search(cr, uid, [('date_order', '=', event_id.date_begin), ('partner_id', '=', new_partner_id)])
-            if not sale_ids:
-#                    raise osv.except_osv(_('Error !'),
-#                        _('sale order is already Exists for this event:'))
-#            else:          
-                new_sale_id = sale_order.create(cr, uid, {
-                    'date_order': event_id.date_begin,
-                    'pricelist_id': price_list,
-                     'partner_id': new_partner_id, 
-                      'partner_invoice_id': partner_invoice_id,
-                     'partner_shipping_id': partner_shipping_id
-                    })            
-                if event_id.event_item_ids:
-                    for items in event_id.event_item_ids:
-                        product = items.product_id.id
-                        sale_order_line = sale_order_line_pool.create(cr, uid, {
-                            'order_id': new_sale_id,                                
-                            'name': items.product_id.name,
-                            'product_uom_qty': items.qty,
-                            'product_id': items.product_id.id,
-                            'product_uom': items.uom_id.id,
-                            'price_unit': items.price,
-                            'date_planned': items.sales_end_date,
-                        }, context=context)
-                    view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
-                    if view_id:
-                        res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-                    res = {
-                            'name': _('Quotation'),
-                            'view_type': 'form',
-                            'view_mode': 'form',
-                            'res_model': 'sale.order',
-                            'res_id': new_sale_id,
-                            'views':[(res_id,'form'), (False, 'tree')],
-                            'type': 'ir.actions.act_window',
-                            'nodestroy': True,
-                            'target': 'current',
-                    }
-        return res
-
+#    def subscribe_to_event(self, cr, uid, ids, context=None):
+#        res = {}
+#        event_pool = self.pool.get('event.event')
+#        register_pool = self.pool.get('event.registration')
+#        sale_order_line_pool = self.pool.get('sale.order.line')
+#        sale_order = self.pool.get('sale.order')
+#        partner_pool = self.pool.get("res.partner")
+#        data_obj = self.pool.get("ir.model.data")
+#        prod_pricelist_obj = self.pool.get('product.pricelist')
+#        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
+#        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
+#        if not partner_ids:
+#            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
+#            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+#            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
+#        else:
+#            new_partner_id = partner_ids[0]
+#            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+#            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
+#        for event_id in self.browse(cr, uid, ids, context=context):
+#            sale_order_lines = []
+#            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+#            new_sale_id = sale_order.create(cr, uid, {
+#                'date_order': event_id.date_begin,
+#                'pricelist_id': price_list,
+#                 'partner_id': new_partner_id, 
+#                  'partner_invoice_id': partner_invoice_id,
+#                 'partner_shipping_id': partner_shipping_id
+#                })  
+#            if event_id.event_item_ids:
+#                for items in event_id.event_item_ids:
+#                    product = items.product_id.id
+#                    sale_order_line = sale_order_line_pool.create(cr, uid, {
+#                        'order_id': new_sale_id,                                
+#                        'name': items.product_id.name,
+#                        'product_uom_qty': items.qty,
+#                        'product_id': items.product_id.id,
+#                        'price_unit': items.price,
+#                        'date_planned': items.sales_end_date,
+#                    }, context=context)
+#            view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
+#            if view_id:
+#                res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+#            res = {
+#                    'name': _('Quotation'),
+#                    'view_type': 'form',
+#                    'view_mode': 'form',
+#                    'res_model': 'sale.order',
+#                    'res_id': new_sale_id,
+#                    'views':[(res_id,'form'), (False, 'tree')],
+#                    'type': 'ir.actions.act_window',
+#                    'nodestroy': True,
+#                    'target': 'current',
+#            }
+#        return res
+    
 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'),
+         'qty': fields.integer('QTY'),
+       # 'qty': fields.selection(_max_register, 'QTY'),
+        'uom_id': fields.many2one('product.uom', 'UoM'),
         'discount': fields.integer('Discount'),
         'event_id': fields.many2one('event.event', 'Event'),
         'sales_end_date': fields.date('Sales End')
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 7f1504b7b69..2176affac40 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -36,11 +36,10 @@
 			<field name="type">form</field>
 			<field name="inherit_id" ref="event.view_event_form"/>
 			<field name="arch" type="xml">
-				<xpath expr="//group[@name='venue']" position="after">
-						<field name="event_item_ids" nolabel="1"/><newline/>
-						<div class="oe_right">
-							<button string="Order Now" name="make_quotation" help="Order Event" type="object" icon="gtk-ok" attrs="{'invisible':[('state','=','confirm')]}"/>
-						</div>
+				<xpath expr="//notebook/page[@string='Extra Info']" position="after">
+                    <page string="Event Items">
+                    <field name="event_item_ids" nolabel="1"/>
+                   </page>
 				</xpath>
 			</field>
 		</record>
@@ -51,17 +50,16 @@
 			 <field name="type">tree</field>
 			 <field name="arch" type="xml">
 				 <tree editable="top" string="Event Items">
-					 <field name="product_id"/>
+					 <field name="product_id" domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
 					 <field name="price"/>
+					 <field name="uom_id" invisible="1"/>
 					 <field name="qty"/>
-					 <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>
@@ -71,13 +69,10 @@
 			   	 	<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>
-        
-        
     </data>
 </openerp>

From 09dc29291da30ed5de8825412c9d4a2bd668a72a Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Wed, 2 May 2012 12:45:35 +0530
Subject: [PATCH 13/38] [IMP]impelment map widget.

bzr revid: vme@tinyerp.com-20120502071535-5h213fx2p5s0tlqi
---
 addons/event/__openerp__.py           |   1 +
 addons/event/event_view.xml           | 158 +++++++-------------------
 addons/event/static/src/css/event.css |   1 -
 addons/event/static/src/js/event.js   |  52 +++++++++
 4 files changed, 92 insertions(+), 120 deletions(-)
 create mode 100644 addons/event/static/src/js/event.js

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 6de6d2c62c1..85eb78f32f1 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,6 +54,7 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/*.css'],
+    'js': ['static/src/js/event.js'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 9276f77ed9d..87e29a641f2 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -45,124 +45,42 @@
         <menuitem name="Configuration" id="base.menu_marketing_config_root" parent="event_main_menu" sequence="30"/>
         <menuitem name="Types of Events" id="menu_event_type" action="action_event_type" parent="base.menu_marketing_config_root" groups="base.group_no_one"/>
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS -->
-    
-        <record model="ir.ui.view" id="view_event_form">
-            <field name="name">Events</field>
-            <field name="model">event.event</field>
-            <field name="type">form</field>
+
+		<!-- Event Item Tree view-->
+    	<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">
- 			 <form string="Events"  layout="manual">
-                <div class="oe_form_topbar">
-                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-               		<div class="oe_right">
-                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-               		</div>
-            	</div>
-             <sheet string="Event Form" layout="auto">
-            	<group  colspan="4">
-            	     <group colspan="2">
-                        <field name="name"/>
-						 <field name="type" on_change="onchange_event_type(type,context)"/>
-						<field name="user_id"/>
-                        </group>
-			             <group colspan="2">
-			             	<div class="oe_mapbox oe_right"> </div><newline/>
-		                    <table align="right">
-			                   	<tr>
-			                    	<td width="70px" class="oe_td_border">
-			                            Where
-			                        </td>
-			                        <td width="150px">
-			                            <field name="address_id" nolabel="1"/>
-			                        </td>
-			                        <td width="auto">
-	                             		<table>
-											<tr>
-												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1"/></td>
-											</tr>
-											<tr>
-												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
-											</tr>
-										</table>
-			                        </td>
-			                     </tr>
-		                     </table>   
-			             </group>  
-			         </group>
-                    <notebook colspan="4">
-                    <page string="Event">
-                        <separator string="Description" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
-                            <tree string="Registration" editable="top">
-                                <field name="name" />
-                                <field name="email" />
-                                <field name="phone"/>
-                                <field name="nb_register" />
-                                <field name="state"/>
-                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            </tree>
-                            <form string="Registration">
-                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
-                                <field name="name"/>
-                                <group colspan="4" col="4">
-                                <field name="email"/>
-                                <field name="phone"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                    <field name="nb_register"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                </group>
-                                    <group col="8" colspan="4">
-                                        <separator string="" colspan="4"/>
-                                        <newline/>
-                                        <field name="state" select="1" colspan="2"/>
-                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                    </group>
-                            </form>
-                            </field>
-                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                    </page>
-                    <page string="Speakers">
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
-                        <field name="speaker_confirmed"/>
-                        <separator string="Other Speakers" colspan="4"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Extra Info">
-                        <group col="2" colspan="2">
-                            <separator string="Registrations" colspan="2"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                            <field name="register_prospect"/>
-                            <field name="register_current"/>
-                            <field name="register_attended"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator string="Emails" colspan="2"/>
-                            <field name="reply_to"/>
-                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
-                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
-                        </group>
-                    </page>
-                    </notebook>
-                    </sheet>
-            </form>
+                <tree string="Event Items">
+                    <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>
-        
-       <!--  Event Page view -->
-       
-        <record model="ir.ui.view" id="view_event_page">
+        <!-- Event Item Form View -->
+        <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" 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>
+
+    <!-- Events Organisation/CONFIGURATION/EVENTS -->
+
+        <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
@@ -190,14 +108,14 @@
                         	</group>
 			             </group>	
 			             <group>
-			             	<div class="oe_mapbox"> </div><newline/>
+			             	<div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
 		                    <table>
 			                   	<tr>
 			                    	<td width="70px" class="oe_td_border">
 			                            Where
 			                        </td>
 			                        <td width="150px">
-			                            <field name="address_id" nolabel="1"/>
+			                            <field name="address_id" widget = "geo_address" nolabel="1"/>
 			                        </td>
 			                        <td width="auto">
 	                             		<table>
@@ -208,6 +126,7 @@
 												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
 											</tr>
 										</table>
+	                                 
 			                        </td>
 			                     </tr>
 		                     </table>   
@@ -250,6 +169,7 @@
                                     </group>
                             </form>
                             </field>
+                        
                     </page>
                     <page string="Speakers">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
@@ -278,8 +198,8 @@
             </form>
             </field>
         </record>
-        
-       <!-- Event tree view -->
+
+        <!-- Event tree view -->
 
         <record model="ir.ui.view" id="view_event_tree">
             <field name="name">event.event.tree</field>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index cebf155081b..c9f9084a583 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -130,7 +130,6 @@ div.oe_fold_column{
 { 
     width:380px;
     height:200px;
-    border:1px solid black; 
     margin-left:auto; 
     margin-right:auto; 
     text-align: right;
diff --git a/addons/event/static/src/js/event.js b/addons/event/static/src/js/event.js
new file mode 100644
index 00000000000..6081533397a
--- /dev/null
+++ b/addons/event/static/src/js/event.js
@@ -0,0 +1,52 @@
+openerp.event = function(instance){
+	instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
+	instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
+
+		init : function(){
+			this._super.apply(this,arguments);
+		},
+
+		start:function(){
+		},
+		
+	 	set_input_id:function(id){
+	 	},
+	 	set_value:function(value){
+	 		var self = this;
+			this.get_address(value).done(function(value){
+				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+				return self.list_addresses(address);
+			});
+			
+	 	},
+	 	get_address:function(value){
+	 		if (!value || value.length == 0){
+	 			return $.Deferred().reject();
+	 		}
+			return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
+	 	},
+
+	 	list_addresses: function(address){
+	 		var geocoder = new google.maps.Geocoder();
+			geocoder.geocode( { 'address': address}, function(results, status) 
+			{
+			if (status == google.maps.GeocoderStatus.OK){
+				var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
+				var myOptions = {       
+					zoom: 17,       
+					center:  new google.maps.LatLng(lat,lng),       
+					mapTypeId: google.maps.MapTypeId.ROADMAP     
+				}
+		    	return new google.maps.Marker({
+				    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
+				    position: new google.maps.LatLng(lat,lng)
+			 	 });
+	 		}
+			});
+			
+	 	},
+	 	get_value:function(){
+	 	}
+		
+	}));
+};
\ No newline at end of file

From bfe05098460c888fde44d03306f7fa29fd6ffcf7 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 4 May 2012 17:01:36 +0530
Subject: [PATCH 14/38] [imp] add the event page view for user

bzr revid: nco@tinyerp.com-20120504113136-ws9nxquin9sk95vu
---
 addons/event/__openerp__.py                   |   1 +
 addons/event/event_view.xml                   | 131 ++++++++++-------
 addons/event/static/src/css/event.css         |  11 ++
 addons/event/static/src/js/event.js           |   6 +
 addons/event/static/src/xml/event_address.xml |   9 ++
 addons/event_sale/event_sale.py               | 134 ++++++++++--------
 addons/event_sale/event_sale_view.xml         |  85 ++++++-----
 7 files changed, 235 insertions(+), 142 deletions(-)
 create mode 100644 addons/event/static/src/xml/event_address.xml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 85eb78f32f1..88943b06654 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -55,6 +55,7 @@ Note that:
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/*.css'],
     'js': ['static/src/js/event.js'],
+    'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 87e29a641f2..b4df8cb48ed 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -78,65 +78,27 @@
             </field>
         </record>
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS -->
+<!-- Events Organisation/CONFIGURATION/EVENTS -->
 
         <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events"  layout="manual">
-                <div class="oe_form_topbar">
-                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-               		<div class="oe_right">
-                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-               		</div>
-            	</div>
-            	<sheet string="Event Form" layout="auto">
-            		<group col="2">
-            			<group col="2">
-		                	<div class="oe_event_title">
-		                    	<field name="name" nolabel="1"/>
-		                    </div>
-		                    <newline/>
-		                    <group colspan="4" name="venue">
-                            	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
-                            	<field name="location_id" nolabel="1"/> 
-                        	</group>
-			             </group>	
-			             <group>
-			             	<div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
-		                    <table>
-			                   	<tr>
-			                    	<td width="70px" class="oe_td_border">
-			                            Where
-			                        </td>
-			                        <td width="150px">
-			                            <field name="address_id" widget = "geo_address" nolabel="1"/>
-			                        </td>
-			                        <td width="auto">
-	                             		<table>
-											<tr>
-												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1"/></td>
-											</tr>
-											<tr>
-												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1"/></td>
-											</tr>
-										</table>
-	                                 
-			                        </td>
-			                     </tr>
-		                     </table>   
-			             </group>
-                    </group>	
+                <form string="Events">
+                    <group col="6" colspan="4">
+                        <field name="name"/>
+                        <field name="date_begin"/>
+                        <field name="date_end"/>
+                        <field name="type" on_change="onchange_event_type(type,context)"/>
+                        <field name="user_id"/>
+                        <field name="address_id" />
+                    </group>
                     <notebook colspan="4">
                     <page string="Event">
                         <separator string="Description" colspan="4"/>
                         <field name="note" colspan="4" nolabel="1"/>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager">
+                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
                                 <field name="email" />
@@ -169,7 +131,13 @@
                                     </group>
                             </form>
                             </field>
-                        
+                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                        <group col="4" colspan="2">
+                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                        </group>
                     </page>
                     <page string="Speakers">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]"/>
@@ -177,7 +145,7 @@
                         <separator string="Other Speakers" colspan="4"/>
                         <field name="speaker_ids" domain="[('speaker','=',True)]" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Extra Info" groups="event.group_event_manager">
+                    <page string="Extra Info">
                         <group col="2" colspan="2">
                             <separator string="Registrations" colspan="2"/>
                             <field name="register_min"/>
@@ -194,6 +162,67 @@
                         </group>
                     </page>
                     </notebook>
+            </form>
+            </field>
+        </record>
+
+
+    <!-- Events Organisation/CONFIGURATION/EVENTS PAGE VIEW -->
+
+        <record model="ir.ui.view" id="view_event_page">
+            <field name="name">Events</field>
+            <field name="model">event.event</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Events"  layout="manual">
+                <div class="oe_form_topbar" readonly="1">
+                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+               		<div class="oe_right">
+                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+               		</div>
+            	</div>
+            	<sheet string="Event Form" layout="auto">
+            		<group col="2">
+            			<group col="2">
+		                	<div class="oe_event_title">
+		                    	<field name="name" nolabel="1" readonly="1"/>
+		                    </div>
+		                    <newline/>
+		                    <group colspan="4" name="venue">
+                            	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
+                            	<field name="location_id" nolabel="1" readonly="1"/> 
+                        	</group>
+			             </group>	
+			             <group>
+			             	<div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
+		                    <table>
+			                   	<tr>
+			                    	<td width="70px" class="oe_td_border">
+			                            Where
+			                        </td>
+			                        <td width="auto">
+			                            <field name="address_id" widget ="geo_address" nolabel="1"/>
+			                        </td>
+			                        <td width="210px">
+	                             		<table>
+											<tr>
+												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
+											</tr>
+											<tr>
+												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
+											</tr>
+										</table>
+	                                 
+			                        </td>
+			                     </tr>
+		                     </table>   
+			             </group>
+                    </group>	
+                    <separator string="Event Details" colspan="4"/>
+                    <field name="note" colspan="4" nolabel="1" readonly="1"/>
                     </sheet>
             </form>
             </field>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index c9f9084a583..f3f40834072 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -144,4 +144,15 @@ div.oe_fold_column{
 .oe_td_date_border
 {
 	border-right:1px solid black;
+}
+.oe_pager_group11 {
+  float: left;
+  height: 24px;
+  line-height: 24px;
+  display: inline-block;
+  border: 1px solid #ababab;
+  cursor: pointer;
+  -moz-border-radius: 5px;
+  -webkit-border-radius: 5px;
+  border-radius: 5px;
 }
\ No newline at end of file
diff --git a/addons/event/static/src/js/event.js b/addons/event/static/src/js/event.js
index 6081533397a..bd59bc78818 100644
--- a/addons/event/static/src/js/event.js
+++ b/addons/event/static/src/js/event.js
@@ -14,8 +14,11 @@ openerp.event = function(instance){
 	 	set_value:function(value){
 	 		var self = this;
 			this.get_address(value).done(function(value){
+				console.log("value",value,self);
+				self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
 				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
 				return self.list_addresses(address);
+				
 			});
 			
 	 	},
@@ -49,4 +52,7 @@ openerp.event = function(instance){
 	 	}
 		
 	}));
+
+	
+	
 };
\ No newline at end of file
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event/static/src/xml/event_address.xml
new file mode 100644
index 00000000000..370da230e6b
--- /dev/null
+++ b/addons/event/static/src/xml/event_address.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	
+	<template>
+		<td t-name="address">
+			<t t-esc="record.street"/> <br/>
+			<t t-esc="record.city"/> <br/>
+			<t t-esc="record.country_id[1]"/>
+		</td>
+	</template>
\ No newline at end of file
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 81b69babebf..fa3a9c14f46 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -99,75 +99,93 @@ class event_event(osv.osv):
     _columns = {
                     'event_item_ids': fields.one2many('event.items','event_id', 'Event Items'),
                 }
-#    def subscribe_to_event(self, cr, uid, ids, context=None):
-#        res = {}
-#        event_pool = self.pool.get('event.event')
-#        register_pool = self.pool.get('event.registration')
-#        sale_order_line_pool = self.pool.get('sale.order.line')
-#        sale_order = self.pool.get('sale.order')
-#        partner_pool = self.pool.get("res.partner")
-#        data_obj = self.pool.get("ir.model.data")
-#        prod_pricelist_obj = self.pool.get('product.pricelist')
-#        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
-#        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
-#        if not partner_ids:
-#            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
-#            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-#            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
-#        else:
-#            new_partner_id = partner_ids[0]
-#            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-#            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
-#        for event_id in self.browse(cr, uid, ids, context=context):
-#            sale_order_lines = []
-#            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-#            new_sale_id = sale_order.create(cr, uid, {
-#                'date_order': event_id.date_begin,
-#                'pricelist_id': price_list,
-#                 'partner_id': new_partner_id, 
-#                  'partner_invoice_id': partner_invoice_id,
-#                 'partner_shipping_id': partner_shipping_id
-#                })  
-#            if event_id.event_item_ids:
-#                for items in event_id.event_item_ids:
-#                    product = items.product_id.id
-#                    sale_order_line = sale_order_line_pool.create(cr, uid, {
-#                        'order_id': new_sale_id,                                
-#                        'name': items.product_id.name,
-#                        'product_uom_qty': items.qty,
-#                        'product_id': items.product_id.id,
-#                        'price_unit': items.price,
-#                        'date_planned': items.sales_end_date,
-#                    }, context=context)
-#            view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
-#            if view_id:
-#                res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-#            res = {
-#                    'name': _('Quotation'),
-#                    'view_type': 'form',
-#                    'view_mode': 'form',
-#                    'res_model': 'sale.order',
-#                    'res_id': new_sale_id,
-#                    'views':[(res_id,'form'), (False, 'tree')],
-#                    'type': 'ir.actions.act_window',
-#                    'nodestroy': True,
-#                    'target': 'current',
-#            }
-#        return res
+    def order_now(self, cr, uid, ids, context=None):
+        res = {}
+        event_pool = self.pool.get('event.event')
+        register_pool = self.pool.get('event.registration')
+        sale_order_line_pool = self.pool.get('sale.order.line')
+        sale_order = self.pool.get('sale.order')
+        partner_pool = self.pool.get("res.partner")
+        data_obj = self.pool.get("ir.model.data")
+        prod_pricelist_obj = self.pool.get('product.pricelist')
+        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
+        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
+        if not partner_ids:
+            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
+            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
+        else:
+            new_partner_id = partner_ids[0]
+            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
+            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']     
+        for event_id in self.browse(cr, uid, ids, context=context):
+            sale_order_lines = []
+            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
+            new_sale_id = sale_order.create(cr, uid, {
+                'date_order': event_id.date_begin,
+                'pricelist_id': price_list,
+                 'partner_id': new_partner_id, 
+                  'partner_invoice_id': partner_invoice_id,
+                 'partner_shipping_id': partner_shipping_id
+                })  
+            if event_id.event_item_ids:
+                for items in event_id.event_item_ids:
+                    product = items.product_id.id
+                    sale_order_line = sale_order_line_pool.create(cr, uid, {
+                        'order_id': new_sale_id,                                
+                        'name': items.product_id.name,
+                        'product_uom_qty': items.qty,
+                        'product_id': items.product_id.id,
+                        'price_unit': items.price,
+                        'date_planned': items.sales_end_date,
+                    }, context=context)
+            view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
+            if view_id:
+                res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+            res = {
+                    'name': _('Quotation'),
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'sale.order',
+                    'res_id': new_sale_id,
+                    'views':[(res_id,'form'), (False, 'tree')],
+                    'type': 'ir.actions.act_window',
+                    'nodestroy': True,
+                    'target': 'current',
+            }
+        return res
+    def subscribe_to_event(self, cr, uid, ids, context=None):
+        res = {}
+        data_obj = self.pool.get("ir.model.data")
+        view_id = data_obj._get_id(cr, uid, 'event', 'view_event_page')
+        if view_id:
+            res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+        res = {
+                'name': _('Event Page'),
+                'view_type': 'form',
+                'view_mode': 'form',
+                'views':[(res_id,'form'), (False, 'tree')],
+                'res_model': 'event.event',
+                'res_id': ids[0],
+                'type': 'ir.actions.act_window',
+                'nodestroy': True,
+                'target': 'current',
+        }
+        return res
     
 class event_items(osv.osv):
     _name = "event.items"
     _columns = {
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'price': fields.integer('Price'),
-         'qty': fields.integer('QTY'),
-       # 'qty': fields.selection(_max_register, 'QTY'),
+        'max_qty': fields.integer('Max Qty'),
+        'qty': fields.integer('QTY', type = 'integer'),
         'uom_id': fields.many2one('product.uom', 'UoM'),
         '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 = {}
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 72782d5c421..0110bc1df2c 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -30,49 +30,68 @@
              </field>
         </record>
         
+		<record model="ir.ui.view" id="view_event_page_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_page"/>
+			<field name="arch" type="xml">
+				<xpath expr="//group[@name='venue']" position="after">
+					<field name="event_item_ids" nolabel="1">
+						 <tree editable="top" string="Event Items">
+							 <field name="product_id" readonly="1" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
+							 <field name="sales_end_date" readonly="1"/>
+							 <field name="price" readonly="1"/>
+							 <field name="max_qty" readonly="1" groups="event.group_event_manager"/>
+							 <field name="qty"/>
+				 		</tree>
+					</field>
+					<newline/>
+					<div class="oe_right">
+						<button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+					</div>
+				</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/page[@string='Extra Info']" position="after">
-                    <page string="Event Items">
-                    <field name="event_item_ids" nolabel="1"/>
-                   </page>
+				<xpath expr="//page[@string='Extra Info']" position="after">
+					<page string="Event Item">
+						<field name="event_item_ids" nolabel="1">
+							 <tree editable="top" string="Event Items">
+								 <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
+								 <field name="sales_end_date" />
+								 <field name="price"/>
+								 <field name="max_qty" groups="event.group_event_manager"/>
+								 <field name="qty"/>
+				 			</tree>
+						</field>
+						<newline/>
+						<div class="oe_right">
+							<button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+						</div>
+					</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 editable="top" 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" invisible="1"/>
-					 <field name="qty"/>
-					 <field name="discount"/>
-					 <field name="sales_end_date"/>
-				 </tree>
-			 </field>
-		 </record>
+		<record id="view_event_kanban_inherit" model="ir.ui.view">
+            <field name="name">event.inherit.kanban</field>
+            <field name="model">event.event</field>
+            <field name="type">kanban</field>
+            <field name="inherit_id" ref="event.view_event_kanban"/>
+            <field name="arch" type="xml">
+            	<xpath expr="//div/t/t/input[@name='subscribe']" position="replace">
+            		<input type="hidden"/>
+                </xpath> 
+            </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="discount"/>
-					<field name="sales_end_date"/>
-				</form>
-		 	</field>
-		</record>
     </data>
 </openerp>

From 12f03240ef4084acb759d7d05a6313481940ed23 Mon Sep 17 00:00:00 2001
From: "Nimesh (Open ERP)" <nco@tinyerp.com>
Date: Fri, 4 May 2012 17:17:41 +0530
Subject: [PATCH 15/38] [remove] remove the unused console statement.

bzr revid: nco@tinyerp.com-20120504114741-ik1ft1ln90188tpt
---
 addons/event/static/src/js/event.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/event/static/src/js/event.js b/addons/event/static/src/js/event.js
index bd59bc78818..ed390d6af9e 100644
--- a/addons/event/static/src/js/event.js
+++ b/addons/event/static/src/js/event.js
@@ -14,7 +14,6 @@ openerp.event = function(instance){
 	 	set_value:function(value){
 	 		var self = this;
 			this.get_address(value).done(function(value){
-				console.log("value",value,self);
 				self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
 				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
 				return self.list_addresses(address);

From 0a09dbed34812d416e9c52bc4226117ca3176b7e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Sat, 5 May 2012 23:03:40 +0530
Subject: [PATCH 16/38] [FIX]: Improve css file. Improve view.

bzr revid: atp@tinyerp.com-20120505173340-1jmgy4clza1gy6sh
---
 addons/event/event_view.xml           | 9 +++++----
 addons/event/static/src/css/event.css | 7 +++++++
 addons/event_sale/event_sale.py       | 5 +++--
 addons/event_sale/event_sale_view.xml | 6 +++---
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 42037637ea5..91c2590008d 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -159,7 +159,7 @@
 		                    </div>
 		                    <newline/>
 		                    <group colspan="4" name="venue">
-                            	<div class="oe_sub1"> Venue   : </div> <separator orientation="vertical"/>
+                            	<div class="oe_sub1"> Venue   : </div> 
                             	<field name="location_id" nolabel="1" readonly="1"/> 
                         	</group>
 			             </group>	
@@ -187,9 +187,10 @@
 			                     </tr>
 		                     </table>   
 			             </group>
-                    </group>	
-                    <separator string="Event Details" colspan="4"/>
-                    <field name="note" colspan="4" nolabel="1" readonly="1"/>
+                    </group>
+                    <separator string="" colspan="4"/>
+                    	<label string="Event Details:" colspan="4"/>
+                    	<field name="note" colspan="4" nolabel="1" readonly="1"/>
                     </sheet>
             </form>
             </field>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 3ff0bb8564f..d53770071d0 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -125,6 +125,9 @@ div.oe_fold_column{
 .oe_sub1
 {
     float:left;
+    height:50px;
+    border-right: 1px solid black;
+    border-color: #DCDCDC;
 }
 .oe_mapbox
 { 
@@ -133,6 +136,7 @@ div.oe_fold_column{
     margin-left:auto; 
     margin-right:auto; 
     text-align: right;
+    
 }
 .oe_td_border
 {
@@ -140,9 +144,12 @@ div.oe_fold_column{
 	padding: 2px;
 	border-right: 1px solid black;
 	text-align: center;
+	border-color: #DCDCDC;
+	
 	
 }
 .oe_td_date_border
 {
 	border-right:1px solid black;
+	border-color: #DCDCDC;
 }
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index eb17f6ac59a..5097ea5b9f3 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -179,8 +179,9 @@ class event_items(osv.osv):
     _columns = {
         'product_id': fields.many2one('product.product', 'Product', required=True),
         'price': fields.integer('Price'),
-        'max_qty': fields.integer('Max.Quantity available'),
-        'qty': fields.integer('QTY', type ='integer'),
+        #Need to convert  this integer field in to dynamic selection.. TODO
+      #  'max_qty': fields.integer('Max.Quantity available'),
+        'qty': fields.integer('Quantity'),
         'uom_id': fields.many2one('product.uom', 'UoM'),
         'discount': fields.integer('Discount'),
         'event_id': fields.many2one('event.event', 'Event'),
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 9fb3fb9f81b..bf2e8833df7 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -42,8 +42,8 @@
 							 <field name="product_id" readonly="1" />
 							 <field name="sales_end_date" readonly="1"/>
 							 <field name="price" readonly="1"/>
-							 <field name="max_qty" readonly="1" groups="event.group_event_manager"/>
-							 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
+							 <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
+							 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
 				 		</tree>
 					</field>
 					<newline/>
@@ -68,7 +68,7 @@
 								 <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
 								 <field name="sales_end_date" />
 								 <field name="price"/>
-								 <field name="max_qty" groups="event.group_event_manager"/>
+								<!-- <field name="max_qty" groups="event.group_event_manager"/> --> 
 								 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
 				 			</tree>
 						</field>

From 80a595d631f5335b068d445fc87644787d686d1d Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Sat, 5 May 2012 23:33:49 +0530
Subject: [PATCH 17/38] [FIX]: Remove unused space.

bzr revid: atp@tinyerp.com-20120505180349-tlrsdqqpjpm1haaf
---
 addons/event/__openerp__.py           |  2 +-
 addons/event/event_view.xml           | 93 +++++++++++++------------
 addons/event_sale/event_sale_view.xml | 97 +++++++++++++--------------
 3 files changed, 95 insertions(+), 97 deletions(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 88943b06654..e36914ee9fb 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -53,7 +53,7 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
-    'css': ['static/src/css/*.css'],
+    'css': ['static/src/css/event.css'],
     'js': ['static/src/js/event.js'],
     'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 91c2590008d..34688f18efb 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -143,54 +143,53 @@
             <field name="arch" type="xml">
                 <form string="Events"  layout="manual">
                 <div class="oe_form_topbar" readonly="1">
-                	<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-               		<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-               		<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-               		<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-               		<div class="oe_right">
-                    	<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-               		</div>
-            	</div>
-            	<sheet string="Event Form" layout="auto">
-            		<group col="2">
-            			<group col="2">
-		                	<div class="oe_event_title">
-		                    	<field name="name" nolabel="1" readonly="1"/>
-		                    </div>
-		                    <newline/>
-		                    <group colspan="4" name="venue">
-                            	<div class="oe_sub1"> Venue   : </div> 
-                            	<field name="location_id" nolabel="1" readonly="1"/> 
-                        	</group>
-			             </group>	
-			             <group>
-			             	<div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
-		                    <table>
-			                   	<tr>
-			                    	<td width="70px" class="oe_td_border">
-			                            Where
-			                        </td>
-			                        <td width="auto">
-			                            <field name="address_id" widget ="geo_address" nolabel="1"/>
-			                        </td>
-			                        <td width="210px">
-	                             		<table align="right">
-											<tr>
-												<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
-											</tr>
-											<tr>
-												<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
-											</tr>
-										</table>
-	                                 
-			                        </td>
-			                     </tr>
-		                     </table>   
-			             </group>
-                    </group>
+                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                   <div class="oe_right">
+                      <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                   </div>
+                </div>
+                <sheet string="Event Form" layout="auto">
+                   <group col="2">
+                     <group col="2">
+                       <div class="oe_event_title">
+                          <field name="name" nolabel="1" readonly="1"/>
+                       </div>
+                      <newline/>
+                      <group colspan="4" name="venue">
+                            <div class="oe_sub1"> Venue   : </div> 
+                              <field name="location_id" nolabel="1" readonly="1"/> 
+                      </group>
+                   </group>	
+                    <group>
+                     <div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
+                     <table>
+                       <tr>
+                         <td width="70px" class="oe_td_border">
+                             Where
+                         </td>
+                         <td width="auto">
+                             <field name="address_id" widget ="geo_address" nolabel="1"/>
+                         </td>
+                         <td width="210px">
+                             <table align="right">
+                              <tr>
+                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
+                              </tr>
+                              <tr>
+                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
+                              </tr>
+                            </table>
+                         </td>
+                       </tr>
+                     </table>
+                  </group>
+                  </group>
                     <separator string="" colspan="4"/>
-                    	<label string="Event Details:" colspan="4"/>
-                    	<field name="note" colspan="4" nolabel="1" readonly="1"/>
+                      <label string="Event Details:" colspan="4"/>
+                       <field name="note" colspan="4" nolabel="1" readonly="1"/>
                     </sheet>
             </form>
             </field>
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index bf2e8833df7..ad752a36dd1 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -30,56 +30,55 @@
              </field>
         </record>
         
-		<record model="ir.ui.view" id="view_event_page_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_page"/>
-			<field name="arch" type="xml">
-				<xpath expr="//group[@name='venue']" position="after">
-					<field name="event_item_ids" nolabel="1">
-						 <tree editable="top" string="Event Items">
-							 <field name="product_id" readonly="1" />
-							 <field name="sales_end_date" readonly="1"/>
-							 <field name="price" readonly="1"/>
-							 <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
-							 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
-				 		</tree>
-					</field>
-					<newline/>
-					<div class="oe_right">
-						<button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-					</div>
-				</xpath>
-			</field>
-		</record>
+        <record model="ir.ui.view" id="view_event_page_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_page"/>
+          <field name="arch" type="xml">
+          <xpath expr="//group[@name='venue']" position="after">
+            <field name="event_item_ids" nolabel="1">
+               <tree editable="top" string="Event Items">
+                  <field name="product_id" readonly="1" />
+                   <field name="sales_end_date" readonly="1"/>
+                   <field name="price" readonly="1"/>
+                    <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
+                   <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
+               </tree>
+              </field>
+               <newline/>
+               <div class="oe_right">
+                 <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+               </div>
+          </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="//page[@string='Extra Info']" position="after">
-					<page string="Event Item">
-						<field name="event_item_ids" nolabel="1">
-							 <tree editable="top" string="Event Items">
-								 <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
-								 <field name="sales_end_date" />
-								 <field name="price"/>
-								<!-- <field name="max_qty" groups="event.group_event_manager"/> --> 
-								 <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
-				 			</tree>
-						</field>
-						<newline/>
-						<div class="oe_right">
-							<button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-						</div>
-					</page>
-				</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="//page[@string='Extra Info']" position="after">
+             <page string="Event Item">
+             <field name="event_item_ids" nolabel="1">
+             <tree editable="top" string="Event Items">
+                <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
+                <field name="sales_end_date" />
+                <field name="price"/>
+                <!-- <field name="max_qty" groups="event.group_event_manager"/> --> 
+                <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
+             </tree>
+            </field>
+            <newline/>
+            <div class="oe_right">
+                <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+            </div>
+             </page>
+           </xpath>
+          </field>
+        </record>
 
 		<record id="view_event_kanban_inherit" model="ir.ui.view">
             <field name="name">event.inherit.kanban</field>

From 20624a156e9edaa09db5267a6f68b60f2bd1a827 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 7 May 2012 10:56:45 +0530
Subject: [PATCH 18/38] [FIX]: Optimize code.

bzr revid: atp@tinyerp.com-20120507052645-5jkwjolm0tm3rb5c
---
 addons/event/event.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 62b1d79f969..2d5c85aef4a 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -104,13 +104,11 @@ class event_event(osv.osv):
                 raise osv.except_osv(_('Error!'),_("The total of confirmed registration for the event '%s' does not meet the expected minimum/maximum. You should maybe reconsider those limits before going further") % (self.event.name))
             
     def check_available_seats(self, cr, uid, ids, context=None):
-        if isinstance(ids, list):
-            ids = ids[0]
-        else:
-            ids = ids 
-        total_confirmed = self.browse(cr, uid, ids, context=context).register_current
-        register_max = self.browse(cr, uid, ids, context=context).register_max
-        available_seats = register_max - total_confirmed
+        available_seats = False
+        for event in self.browse(cr, uid, ids, context=context):
+            total_confirmed = event.register_current
+            register_max = event.register_max
+            available_seats = register_max - total_confirmed
         return available_seats
             
     def check_registration_limits_before(self, cr, uid, ids, no_of_registration, context=None):
@@ -317,9 +315,10 @@ class event_registration(osv.osv):
         """ Open Registration
         """
         event_obj = self.pool.get('event.event')
-        event_id = self.browse(cr, uid, ids, context=context)[0].event_id.id
-        no_of_registration = self.browse(cr, uid, ids, context=context)[0].nb_register
-        event_obj.check_registration_limits_before(cr, uid, event_id, no_of_registration, context=context)
+        for register in  self.browse(cr, uid, ids, context=context):
+            event_id = register.event_id.id
+            no_of_registration = register.nb_register
+            event_obj.check_registration_limits_before(cr, uid, [event_id], no_of_registration, context=context)
         res = self.confirm_registration(cr, uid, ids, context=context)
         self.mail_user(cr, uid, ids, context=context)
         return res

From 7a087d62406f33c43f102eb02ae6bd8e242488a0 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 7 May 2012 15:40:32 +0530
Subject: [PATCH 19/38] [FIX]: Remove page view from form view and place it
 into event_sale module.

bzr revid: atp@tinyerp.com-20120507101032-e9q0u4cgng231i62
---
 addons/event/event_view.xml           | 61 -----------------
 addons/event_sale/event_sale.py       |  2 +-
 addons/event_sale/event_sale_view.xml | 99 +++++++++++++++++++++------
 3 files changed, 78 insertions(+), 84 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 34688f18efb..23257cd8efe 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -134,67 +134,6 @@
         </record>
 
 
-    <!-- Events Organisation/CONFIGURATION/EVENTS PAGE VIEW -->
-
-        <record model="ir.ui.view" id="view_event_page">
-            <field name="name">Events</field>
-            <field name="model">event.event</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Events"  layout="manual">
-                <div class="oe_form_topbar" readonly="1">
-                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                   <div class="oe_right">
-                      <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                   </div>
-                </div>
-                <sheet string="Event Form" layout="auto">
-                   <group col="2">
-                     <group col="2">
-                       <div class="oe_event_title">
-                          <field name="name" nolabel="1" readonly="1"/>
-                       </div>
-                      <newline/>
-                      <group colspan="4" name="venue">
-                            <div class="oe_sub1"> Venue   : </div> 
-                              <field name="location_id" nolabel="1" readonly="1"/> 
-                      </group>
-                   </group>	
-                    <group>
-                     <div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
-                     <table>
-                       <tr>
-                         <td width="70px" class="oe_td_border">
-                             Where
-                         </td>
-                         <td width="auto">
-                             <field name="address_id" widget ="geo_address" nolabel="1"/>
-                         </td>
-                         <td width="210px">
-                             <table align="right">
-                              <tr>
-                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
-                              </tr>
-                              <tr>
-                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
-                              </tr>
-                            </table>
-                         </td>
-                       </tr>
-                     </table>
-                  </group>
-                  </group>
-                    <separator string="" colspan="4"/>
-                      <label string="Event Details:" colspan="4"/>
-                       <field name="note" colspan="4" nolabel="1" readonly="1"/>
-                    </sheet>
-            </form>
-            </field>
-        </record>
-
         <!-- Event tree view -->
 
         <record model="ir.ui.view" id="view_event_tree">
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 5097ea5b9f3..0abbfc2cfb3 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -158,7 +158,7 @@ class event_event(osv.osv):
     def subscribe_to_event(self, cr, uid, ids, context=None):
         res = {}
         data_obj = self.pool.get("ir.model.data")
-        view_id = data_obj._get_id(cr, uid, 'event', 'view_event_page')
+        view_id = data_obj._get_id(cr, uid, 'event_sale', 'view_event_page')
         if view_id:
             res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
         res = {
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index ad752a36dd1..1c2d520beb8 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -30,30 +30,85 @@
              </field>
         </record>
         
-        <record model="ir.ui.view" id="view_event_page_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_page"/>
-          <field name="arch" type="xml">
-          <xpath expr="//group[@name='venue']" position="after">
-            <field name="event_item_ids" nolabel="1">
-               <tree editable="top" string="Event Items">
-                  <field name="product_id" readonly="1" />
-                   <field name="sales_end_date" readonly="1"/>
-                   <field name="price" readonly="1"/>
-                    <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
-                   <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
-               </tree>
-              </field>
-               <newline/>
-               <div class="oe_right">
-                 <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-               </div>
-          </xpath>
-          </field>
+        
+    <!-- Events Organisation/CONFIGURATION/EVENTS PAGE VIEW -->
+
+        <record model="ir.ui.view" id="view_event_page">
+            <field name="name">Events</field>
+            <field name="model">event.event</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Events"  layout="manual">
+                <div class="oe_form_topbar" readonly="1">
+                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                   <div class="oe_right">
+                      <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                   </div>
+                </div>
+                <sheet string="Event Form" layout="auto">
+                   <group col="2">
+                     <group col="2">
+                       <div class="oe_event_title">
+                          <field name="name" nolabel="1" readonly="1"/>
+                       </div>
+                      <newline/>
+                      <group colspan="4" name="venue">
+                            <div class="oe_sub1"> Venue   : </div> 
+                              <field name="location_id" nolabel="1" readonly="1"/> 
+                      </group>
+                       <field name="event_item_ids" nolabel="1">
+                         <tree editable="top" string="Event Items">
+                          <field name="product_id" readonly="1" />
+                          <field name="sales_end_date" readonly="1"/>
+                          <field name="price" readonly="1"/>
+                          <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
+                          <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
+                         </tree>
+                       </field>
+                       <newline/>
+                      <div class="oe_right">
+                         <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
+                      </div>
+                   </group>	
+                    <group>
+                     <div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
+                     <table>
+                       <tr>
+                         <td width="70px" class="oe_td_border">
+                             Where
+                         </td>
+                         <td width="auto">
+                             <field name="address_id" widget ="geo_address" nolabel="1"/>
+                         </td>
+                         <td width="210px">
+                             <table align="right">
+                              <tr>
+                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
+                              </tr>
+                              <tr>
+                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
+                              </tr>
+                            </table>
+                         </td>
+                         
+                       </tr>
+                     </table>
+                  </group>
+                  </group>
+                    <separator string="" colspan="4"/>
+                      <label string="Event Details:" colspan="4"/>
+                       <field name="note" colspan="4" nolabel="1" readonly="1"/>
+                    </sheet>
+            </form>
+            </field>
         </record>
 
+        
+
+
         <record model="ir.ui.view" id="view_event_form_inherit">
            <field name="name">Events Inherit</field>
            <field name="model">event.event</field>

From 042e72de8d9c3f2838c6e1d443c83dc4da48c8c8 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 17:12:10 +0530
Subject: [PATCH 20/38] [FIX]: Fix alignment in kanban view. add accessrights
 for event.items.

bzr revid: atp@tinyerp.com-20120509114210-r3tp1nnn5rvoipqy
---
 addons/event/event_view.xml           | 3 ++-
 addons/event/static/src/css/event.css | 4 ++--
 addons/event_sale/__openerp__.py      | 1 +
 addons/event_sale/event_sale_view.xml | 3 ---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 23257cd8efe..6432a50542e 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -53,13 +53,14 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Events">
-                    <group col="6" colspan="4">
+                    <group col="8" colspan="4">
                         <field name="name"/>
                         <field name="date_begin"/>
                         <field name="date_end"/>
                         <field name="type" on_change="onchange_event_type(type,context)"/>
                         <field name="user_id"/>
                         <field name="address_id" />
+                        <field name="location_id"/> 
                     </group>
                     <notebook colspan="4">
                     <page string="Event">
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index d53770071d0..f898647db23 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -37,7 +37,7 @@ div.oe_fold_column{
     border: 1px solid #ababab;
     color: #404040;
     font-size: 12px;
-    padding: 3px 10px;
+    padding: 0px !important;
     text-align: center;
     -o-background-size: 100% 100%;
     -moz-background-size: 100% 100%;
@@ -117,7 +117,7 @@ div.oe_fold_column{
    background-color: #DC5F59;
  }
  .no_of_seats{
-    width:25px;    
+    width:35px;    
  }
 .oe_event_title{
   font-size: 25px;
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index d8f689986e2..e235c31aa08 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -36,6 +36,7 @@ It defines a new kind of service products that offers you the possibility to cho
     'author': 'OpenERP SA',
     'depends': ['event','sale','sale_crm'],
     'update_xml': [
+        'security/ir.model.access.csv',
         'event_sale_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index 1c2d520beb8..faaa157d356 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -127,9 +127,6 @@
              </tree>
             </field>
             <newline/>
-            <div class="oe_right">
-                <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-            </div>
              </page>
            </xpath>
           </field>

From d2faa8c8ea8e94a77c78d2538080e253a9fcf29e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 17:13:57 +0530
Subject: [PATCH 21/38] [ADD]: ADD security files

bzr revid: atp@tinyerp.com-20120509114357-ikyou2uf4uo3iwhd
---
 addons/event_sale/security/ir.model.access.csv | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 addons/event_sale/security/ir.model.access.csv

diff --git a/addons/event_sale/security/ir.model.access.csv b/addons/event_sale/security/ir.model.access.csv
new file mode 100644
index 00000000000..da2067dff00
--- /dev/null
+++ b/addons/event_sale/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_event_items,event.items,event.model_event_items,event.group_event_user,1,1,0,0

From 9ea1132374f4a170863c78fd78eb388d8910b98b Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 17:30:11 +0530
Subject: [PATCH 22/38] [FIX]: Change model_id in security access right.

bzr revid: atp@tinyerp.com-20120509120011-f4224eeji0m8ix05
---
 addons/event_sale/security/ir.model.access.csv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event_sale/security/ir.model.access.csv b/addons/event_sale/security/ir.model.access.csv
index da2067dff00..8078ec3ff78 100644
--- a/addons/event_sale/security/ir.model.access.csv
+++ b/addons/event_sale/security/ir.model.access.csv
@@ -1,2 +1,2 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_event_items,event.items,event.model_event_items,event.group_event_user,1,1,0,0
+access_event_items,event.items,event_sale.model_event_items,event.group_event_user,1,1,0,0

From 8d2723ac4f49e17c186cb701a250abd28015e432 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 17:42:44 +0530
Subject: [PATCH 23/38] [FIX]: Fix address template problem.

bzr revid: atp@tinyerp.com-20120509121244-ougokpvpe9i5dxkx
---
 addons/event/static/src/js/event.js           | 2 +-
 addons/event/static/src/xml/event_address.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/static/src/js/event.js b/addons/event/static/src/js/event.js
index 0932d6ed776..4fb368d0845 100644
--- a/addons/event/static/src/js/event.js
+++ b/addons/event/static/src/js/event.js
@@ -14,7 +14,7 @@ openerp.event = function(instance){
 	 	set_value:function(value){
 	 		var self = this;
 			this.get_address(value).done(function(value){
-				self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
+				if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
 				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
 				return self.list_addresses(address);
 				
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event/static/src/xml/event_address.xml
index 370da230e6b..14c7051cf7d 100644
--- a/addons/event/static/src/xml/event_address.xml
+++ b/addons/event/static/src/xml/event_address.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 	
 	<template>
-		<td t-name="address">
+		<td id = "address_text" t-name="address">
 			<t t-esc="record.street"/> <br/>
 			<t t-esc="record.city"/> <br/>
 			<t t-esc="record.country_id[1]"/>

From 9dc92d18d5d86459ade21c8d9985c0deda005f20 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 9 May 2012 23:08:39 +0530
Subject: [PATCH 24/38] [Add]: Add css file into event_sale modules.

bzr revid: atp@tinyerp.com-20120509173839-q3y5egsp8xliyfvi
---
 addons/event/__openerp__.py                   |  2 --
 addons/event/event_view.xml                   |  4 +--
 addons/event/static/src/css/event.css         | 34 -------------------
 addons/event_sale/__openerp__.py              |  3 ++
 .../event_sale/static/src/css/event_page.css  | 31 +++++++++++++++++
 .../static/src/js/google_map.js}              |  0
 .../static/src/xml/event_address.xml          |  0
 7 files changed, 36 insertions(+), 38 deletions(-)
 create mode 100644 addons/event_sale/static/src/css/event_page.css
 rename addons/{event/static/src/js/event.js => event_sale/static/src/js/google_map.js} (100%)
 rename addons/{event => event_sale}/static/src/xml/event_address.xml (100%)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index e36914ee9fb..ea0e4316ef5 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,8 +54,6 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'css': ['static/src/css/event.css'],
-    'js': ['static/src/js/event.js'],
-    'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
     'application': True,
     'auto_install': False,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 6432a50542e..0d8a4478650 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -53,14 +53,13 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string="Events">
-                    <group col="8" colspan="4">
+                    <group col="6" colspan="4">
                         <field name="name"/>
                         <field name="date_begin"/>
                         <field name="date_end"/>
                         <field name="type" on_change="onchange_event_type(type,context)"/>
                         <field name="user_id"/>
                         <field name="address_id" />
-                        <field name="location_id"/> 
                     </group>
                     <notebook colspan="4">
                     <page string="Event">
@@ -121,6 +120,7 @@
                             <field name="register_prospect"/>
                             <field name="register_current"/>
                             <field name="register_attended"/>
+                            <field name="location_id"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Emails" colspan="2"/>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index f898647db23..b0f5db0e9d2 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -119,37 +119,3 @@ div.oe_fold_column{
  .no_of_seats{
     width:35px;    
  }
-.oe_event_title{
-  font-size: 25px;
-}
-.oe_sub1
-{
-    float:left;
-    height:50px;
-    border-right: 1px solid black;
-    border-color: #DCDCDC;
-}
-.oe_mapbox
-{ 
-    width:auto;
-    height:200px;
-    margin-left:auto; 
-    margin-right:auto; 
-    text-align: right;
-    
-}
-.oe_td_border
-{
-	width: 5em;
-	padding: 2px;
-	border-right: 1px solid black;
-	text-align: center;
-	border-color: #DCDCDC;
-	
-	
-}
-.oe_td_date_border
-{
-	border-right:1px solid black;
-	border-color: #DCDCDC;
-}
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index e235c31aa08..e4d9cd3897c 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -41,6 +41,9 @@ It defines a new kind of service products that offers you the possibility to cho
     ],
     'demo_xml': ['event_demo.xml'],
     'test':['test/confirm.yml'],
+    'css': ['static/src/css/event_page.css'],
+    'js': ['static/src/js/google_map.js'],
+    'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/event_sale/static/src/css/event_page.css b/addons/event_sale/static/src/css/event_page.css
new file mode 100644
index 00000000000..0f7b2a81e32
--- /dev/null
+++ b/addons/event_sale/static/src/css/event_page.css
@@ -0,0 +1,31 @@
+.oe_event_title{
+  font-size: 25px;
+}
+.oe_sub1
+{
+    float:left;
+    height:50px;
+    border-right: 1px solid black;
+    border-color: #DCDCDC;
+}
+.oe_mapbox
+{ 
+    width:auto;
+    height:200px;
+    margin-left:auto; 
+    margin-right:auto; 
+    text-align: right;
+}
+.oe_td_border
+{
+    width: 5em;
+    padding: 2px;
+    border-right: 1px solid black;
+    text-align: center;
+    border-color: #DCDCDC;
+}
+.oe_td_date_border
+{
+    border-right:1px solid black;
+    border-color: #DCDCDC;
+}
diff --git a/addons/event/static/src/js/event.js b/addons/event_sale/static/src/js/google_map.js
similarity index 100%
rename from addons/event/static/src/js/event.js
rename to addons/event_sale/static/src/js/google_map.js
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event_sale/static/src/xml/event_address.xml
similarity index 100%
rename from addons/event/static/src/xml/event_address.xml
rename to addons/event_sale/static/src/xml/event_address.xml

From 369e54b547b1ac590b40becb075c073f6a2047b8 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 10 May 2012 11:10:50 +0530
Subject: [PATCH 25/38] [FIX]: Fix yaml as per event improvement.

bzr revid: atp@tinyerp.com-20120510054050-pjkux4vl1lgnlfxc
---
 addons/event/test/process/event_draft2done.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/addons/event/test/process/event_draft2done.yml b/addons/event/test/process/event_draft2done.yml
index d3f3d1fb466..dfe2b01cb33 100644
--- a/addons/event/test/process/event_draft2done.yml
+++ b/addons/event/test/process/event_draft2done.yml
@@ -9,6 +9,7 @@
    name: event
    date_begin: 2012-01-01 19:05:15
    date_end: 2012-01-01 20:05:15
+   register_max: 10
 -
   I create a registration for the event
 -
@@ -32,6 +33,15 @@
    I confirm the registration1
 -
    !python {model: event.registration}: |
+     event_pool = self.pool.get("event.event")
+     for register in self.browse(cr, uid, [ref("event_registration1")], context):
+         nb_register = register.nb_register
+         event_id = register.event_id.id
+         available_seats = event_pool.check_available_seats(cr, uid, [event_id], context=context)
+         if available_seats and nb_register > available_seats:
+             assert available_seats, "seats available."
+         elif available_seats == 0:
+             assert available_seats, "No Tickets Available."
      self.registration_open(cr, uid, [ref("event_registration1")],context=context)
 -
    I check that registration is "confirmed"

From b0a13bff6784fa4b9244dfa68865a53844975ea6 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 11 May 2012 17:15:13 +0530
Subject: [PATCH 26/38] [IMP]load script from addons side.

bzr revid: vme@tinyerp.com-20120511114513-bfco3w7u0itaq171
---
 addons/event_sale/static/src/js/google_map.js | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/addons/event_sale/static/src/js/google_map.js b/addons/event_sale/static/src/js/google_map.js
index 4fb368d0845..179c26069cc 100644
--- a/addons/event_sale/static/src/js/google_map.js
+++ b/addons/event_sale/static/src/js/google_map.js
@@ -1,9 +1,9 @@
 openerp.event = function(instance){
 	instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
 	instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
-
 		init : function(){
 			this._super.apply(this,arguments);
+			this.googleMapsLoaded = $.Deferred();
 		},
 
 		start:function(){
@@ -11,13 +11,27 @@ openerp.event = function(instance){
 		
 	 	set_input_id:function(id){
 	 	},
+	 	map_load: function() {
+	 		var self = this;
+	 		if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
+			googleMapsCallback = function () {
+        		self.googleMapsLoaded.resolve();
+    		};
+			 $.ajax({
+	                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
+	                dataType: "script"
+	            }).fail(self.googleMapsLoaded.reject);
+			return this.googleMapsLoaded.promise();
+		},
 	 	set_value:function(value){
 	 		var self = this;
 			this.get_address(value).done(function(value){
 				if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
 				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
-				return self.list_addresses(address);
-				
+				var defer = self.Map_Load();
+				defer.done(function(){
+					return self.render_map(address);	
+				})
 			});
 			
 	 	},
@@ -28,7 +42,7 @@ openerp.event = function(instance){
 			return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
 	 	},
 
-	 	list_addresses: function(address){
+	 	render_map: function(address){
 	 		var geocoder = new google.maps.Geocoder();
 			geocoder.geocode( { 'address': address}, function(results, status) 
 			{

From 32ecb048dc3daa39573c37144683d3842490dbb2 Mon Sep 17 00:00:00 2001
From: "Vidhin Mehta (OpenERP)" <vme@tinyerp.com>
Date: Fri, 11 May 2012 17:33:06 +0530
Subject: [PATCH 27/38] [IMP]perfect indentation.

bzr revid: vme@tinyerp.com-20120511120306-j72jwc1mm8kfdsq4
---
 addons/event_sale/static/src/js/google_map.js | 124 +++++++++---------
 1 file changed, 60 insertions(+), 64 deletions(-)

diff --git a/addons/event_sale/static/src/js/google_map.js b/addons/event_sale/static/src/js/google_map.js
index 179c26069cc..6fe69160447 100644
--- a/addons/event_sale/static/src/js/google_map.js
+++ b/addons/event_sale/static/src/js/google_map.js
@@ -1,68 +1,64 @@
 openerp.event = function(instance){
-	instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
-	instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
-		init : function(){
-			this._super.apply(this,arguments);
-			this.googleMapsLoaded = $.Deferred();
-		},
+    instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
+    instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
+        init : function(){
+            this._super.apply(this,arguments);
+            this.googleMapsLoaded = $.Deferred();
+        },
+        start:function(){
+        },
 
-		start:function(){
-		},
-		
-	 	set_input_id:function(id){
-	 	},
-	 	map_load: function() {
-	 		var self = this;
-	 		if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
-			googleMapsCallback = function () {
-        		self.googleMapsLoaded.resolve();
-    		};
-			 $.ajax({
-	                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
-	                dataType: "script"
-	            }).fail(self.googleMapsLoaded.reject);
-			return this.googleMapsLoaded.promise();
-		},
-	 	set_value:function(value){
-	 		var self = this;
-			this.get_address(value).done(function(value){
-				if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
-				var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
-				var defer = self.Map_Load();
-				defer.done(function(){
-					return self.render_map(address);	
-				})
-			});
-			
-	 	},
-	 	get_address:function(value){
-	 		if (!value || value.length == 0){
-	 			return $.Deferred().reject();
-	 		}
-			return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
-	 	},
+        set_input_id:function(id){
+        },
+        map_load: function() {
+            var self = this;
+            if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
+                googleMapsCallback = function () {
+                self.googleMapsLoaded.resolve();
+            };
+            $.ajax({
+                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
+                dataType: "script"
+            }).fail(self.googleMapsLoaded.reject);
+            return this.googleMapsLoaded.promise();
+        },
+        set_value:function(value){
+            var self = this;
+            this.get_address(value).done(function(value){
+            if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
+            var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+            var defer = self.Map_Load();
+            defer.done(function(){
+                return self.render_map(address);	
+            });
+            });
+        },
+        get_address:function(value){
+            if (!value || value.length == 0){
+                return $.Deferred().reject();
+            }
+            return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
+        },
 
-	 	render_map: function(address){
-	 		var geocoder = new google.maps.Geocoder();
-			geocoder.geocode( { 'address': address}, function(results, status) 
-			{
-			if (status == google.maps.GeocoderStatus.OK){
-				var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
-				var myOptions = {       
-					zoom: 17,       
-					center:  new google.maps.LatLng(lat,lng),       
-					mapTypeId: google.maps.MapTypeId.ROADMAP     
-				}
-		    	return new google.maps.Marker({
-				    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
-				    position: new google.maps.LatLng(lat,lng)
-			 	 });
-	 		}
-			});
-			
-	 	},
-	 	get_value:function(){
-	 	}
-		
-	}));
+        render_map: function(address){
+            var geocoder = new google.maps.Geocoder();
+            geocoder.geocode( { 'address': address}, function(results, status){
+                if (status == google.maps.GeocoderStatus.OK){
+                    var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
+                    var myOptions = {
+                    zoom: 17,
+                    center:  new google.maps.LatLng(lat,lng),
+                    mapTypeId: google.maps.MapTypeId.ROADMAP
+                }
+                return new google.maps.Marker({
+                    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
+                    position: new google.maps.LatLng(lat,lng)
+                });
+                }
+            });
+        },
+        get_value:function(){
+        }
+
+    }));
 };
\ No newline at end of file

From 99e1ebfcd7a96cc6d9348b01462bb16c73f91e05 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 17 May 2012 12:58:53 +0530
Subject: [PATCH 28/38] [FIX]: New event page view

bzr revid: atp@tinyerp.com-20120517072853-is1te37zsy3be4y6
---
 addons/event/__openerp__.py |   3 +
 addons/event/event_view.xml | 119 +++++++++++++++++++++++++++++++++++-
 2 files changed, 120 insertions(+), 2 deletions(-)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index ea0e4316ef5..e05754eb992 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -1,3 +1,4 @@
+
 # -*- coding: utf-8 -*-
 ##############################################################################
 #
@@ -53,6 +54,8 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
+  #  'js': ['static/src/js/google_map.js'],
+    'qweb': ['static/src/xml/event_address.xml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
     'application': True,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 7a41153acd8..c6e16a240ae 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -47,7 +47,7 @@
 
 <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
-        <record model="ir.ui.view" id="view_event_form">
+<!--         <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
@@ -132,7 +132,119 @@
                     </notebook>
             </form>
             </field>
-        </record>
+        </record> -->
+
+    <record model="ir.ui.view" id="view_event_form">
+        <field name="name">Events</field>
+        <field name="model">event.event</field>
+        <field name="type">form</field>
+        <field name="priority">20</field>
+        <field name="arch" type="xml">
+            <form string="Preview" layout="manual">
+                <div class="oe_form_topbar">
+                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                        <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet layout="auto">
+                <group colspan="4" col="2">
+                        <field name="name" class="oe_form_title" width="60%%" nolabel="1"/>
+                </group>
+                <group colspan="4" col="5" class="oe_form_group_label_border" style="margin-top: 20px;">
+                     <field name="address_id" widget ="geo_address" string="Venue"/> 
+                 </group>
+                 <group colspan="2" col="2" class="oe-listview-content">    
+                    <label string="Ticket Description"/>
+                     <label string="Quantity"/>
+                     <field nolabel="1" name="full_name" />
+                      <field nolabel="1" name="register_max" />
+                     </group>   
+                     <newline/>
+                     <group colspan="2">
+                        <button name="order_now" string="Order Now" type="object" icon="gtk-apply" align="Right"/>
+                      </group>                
+ <!--                <notebook colspan="4">
+                    <page string="Event">
+                        <separator string="Description" colspan="4"/>
+                        <field name="note" colspan="4" nolabel="1"/>
+                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
+                            <tree string="Registration" editable="top">
+                                <field name="name" />
+                                <field name="email" />
+                                <field name="phone"/>
+                                <field name="nb_register" />
+                                <field name="state"/>
+                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                            </tree>
+                            <form string="Registration">
+                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
+                                <field name="name"/>
+                                <group colspan="4" col="4">
+                                <field name="email"/>
+                                <field name="phone"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                    <field name="nb_register"/>
+                                </group>
+                                <group colspan="4" col="4">
+                                </group>
+                                    <group col="8" colspan="4">
+                                        <separator string="" colspan="4"/>
+                                        <newline/>
+                                        <field name="state" select="1" colspan="2"/>
+                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
+                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
+                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                                    </group>
+                            </form>
+                            </field>
+                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
+                        <group col="4" colspan="2">
+                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                        </group>
+                    </page>
+                    <page string="Speakers">
+                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
+                        <field name="speaker_confirmed"/>
+                        <separator string="Other Speakers" colspan="4"/>
+                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Extra Info">
+                        <group col="2" colspan="2">
+                            <separator string="Registrations" colspan="2"/>
+                            <field name="register_min"/>
+                            <field name="register_max"/>
+                            <field name="register_prospect"/>
+                            <field name="register_current"/>
+                            <field name="register_attended"/>
+                            <field name="location_id"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <separator string="Emails" colspan="2"/>
+                            <field name="reply_to"/>
+                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
+                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
+                        </group>
+                    </page>
+
+                </notebook> -->
+                      <separator colspan="4" string="Details"/>
+                    <field name="note" nolabel="1" colspan="4"/>
+                 </sheet>
+
+            </form>
+        </field>
+    </record>
+
 
 
         <!-- Event tree view -->
@@ -160,6 +272,7 @@
                 </tree>
             </field>
         </record>
+
         
         <!-- Event Kanban View -->
 	
@@ -211,6 +324,7 @@
                                   <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
                                   <span >Subscribe</span>
                                   </button>
+                                <a string="Edit" icon="gtk-edit" type="edit"/>                                  
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
@@ -218,6 +332,7 @@
                                 <span>Subscribed</span>
                                 <span class="unsubscribe">Unsubscribe</span>
                               </button>
+                                                              
                             </t>
                         </div>
                       </div>

From 08cd412d78a55cc86d841bf9220920ef576dd3d8 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 17 May 2012 13:00:46 +0530
Subject: [PATCH 29/38] [ADD]: Add event google map file.

bzr revid: atp@tinyerp.com-20120517073046-i47jypr9p6ndckox
---
 addons/event/static/src/js/google_map.js      | 69 +++++++++++++++++++
 addons/event/static/src/xml/event_address.xml |  9 +++
 2 files changed, 78 insertions(+)
 create mode 100644 addons/event/static/src/js/google_map.js
 create mode 100644 addons/event/static/src/xml/event_address.xml

diff --git a/addons/event/static/src/js/google_map.js b/addons/event/static/src/js/google_map.js
new file mode 100644
index 00000000000..2209001f29d
--- /dev/null
+++ b/addons/event/static/src/js/google_map.js
@@ -0,0 +1,69 @@
+openerp.event = function(instance){
+    instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
+    instance.event.GoogleMapConnecter = instance.web.Class.extend({
+    	init : function(){
+//    		call ajex to render map load
+    		
+    	},
+        render_map: function(address){
+            var geocoder = new google.maps.Geocoder();
+            geocoder.geocode( { 'address': address}, function(results, status){
+                if (status == google.maps.GeocoderStatus.OK){
+                    var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
+                    var myOptions = {
+                    zoom: 17,
+                    center:  new google.maps.LatLng(lat,lng),
+                    mapTypeId: google.maps.MapTypeId.ROADMAP
+                }
+                return new google.maps.Marker({
+                    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
+                    position: new google.maps.LatLng(lat,lng)
+                });
+                }
+            });
+            map_load: function() {
+                var self = this;
+                if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
+                    googleMapsCallback = function () {
+                    self.googleMapsLoaded.resolve();
+                };
+                $.ajax({
+                    url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
+                    dataType: "script"
+                }).fail(self.googleMapsLoaded.reject);
+                return this.googleMapsLoaded.promise();
+            },
+            
+    }),
+    
+    instance.event.GeoAddress = instance.web.form.Many2OneField.extend(_.extend({}, {
+        init : function(){
+            this._super();
+            this.googleMapsLoaded = $.Deferred();
+        },
+
+
+        set_value:function(value){
+            var self = this;
+            this.get_address(value).done(function(value){
+            if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
+            var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+            var defer = self.map_load();
+            defer.done(function(){
+                return self.render_map(address);	
+            });
+            });
+        },
+        get_address:function(value){
+            if (!value || value.length == 0){
+                return $.Deferred().reject();
+            }
+            return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
+        },
+
+        },
+        get_value:function(){
+        }
+
+    }));
+};
\ No newline at end of file
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event/static/src/xml/event_address.xml
new file mode 100644
index 00000000000..14c7051cf7d
--- /dev/null
+++ b/addons/event/static/src/xml/event_address.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+	
+	<template>
+		<td id = "address_text" t-name="address">
+			<t t-esc="record.street"/> <br/>
+			<t t-esc="record.city"/> <br/>
+			<t t-esc="record.country_id[1]"/>
+		</td>
+	</template>
\ No newline at end of file

From 96fde61acf012673b4f0a197b7a9b62d10ee9b5e Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Thu, 17 May 2012 16:09:41 +0530
Subject: [PATCH 30/38] [ADD]: Event page

bzr revid: atp@tinyerp.com-20120517103941-6ngwqfkiow8f4ugq
---
 addons/event/event.py       | 39 ++++++++++++++++++++--
 addons/event/event_view.xml | 66 ++++++++++++++-----------------------
 2 files changed, 62 insertions(+), 43 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 38ad0027c9d..d029ba22acd 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -218,7 +218,8 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
-        'location_id': fields.many2one('res.partner','Organization Address', readonly=False, states={'done': [('readonly', True)]}),
+        'available_qty': fields.integer('Availabel Quantity'),
+      
     }
 
     _defaults = {
@@ -226,7 +227,41 @@ class event_event(osv.osv):
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c),
         'user_id': lambda obj, cr, uid, context: uid,
     }
-
+    
+    def order_now(self, cr, uid, ids, context=None):
+          register_pool = self.pool.get('event.registration')
+          user_pool = self.pool.get('res.users')
+          data_obj = self.pool.get('ir.model.data')
+          user = user_pool.browse(cr, uid, uid, context=context)
+          for event in self.browse(cr, uid, ids, context):
+              self.check_registration_limits_before(cr, uid, ids, event.available_qty, context=context)
+              curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , event.id)])
+        #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe
+              print "event.curre_reg_ids",event.available_qty
+              if not curr_reg_ids and event.available_qty > 0:
+                print "cccccccccccc",event.available_qty  
+                curr_reg_ids = [register_pool.create(cr, 1, {'event_id': event.id ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': event.available_qty})]
+              elif event.available_qty > 0:
+                print "mmmmmmm",event.available_qty
+                register_pool.write(cr, uid, curr_reg_ids, {'nb_register': event.available_qty}, context=context)
+              if event.available_qty > 0:  
+                register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context)      
+          view_id = data_obj._get_id(cr, uid, 'event', 'view_event_registration_form')
+          if view_id:
+              res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
+          res = {
+                    'name': _('Registration'),
+                    'view_type': 'form',
+                    'view_mode': 'form',
+                    'res_model': 'event.registration',
+                    'res_id': curr_reg_ids[0],
+                    'views':[(res_id,'form'), (False, 'tree')],
+                    'type': 'ir.actions.act_window',
+                    'nodestroy': True,
+                    'target': 'current',
+          }
+          return res
+         
     def subscribe_to_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c6e16a240ae..27ff18d1457 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -152,25 +152,33 @@
                 </div>
                 <sheet layout="auto">
                 <group colspan="4" col="2">
-                        <field name="name" class="oe_form_title" width="60%%" nolabel="1"/>
+                        <field name="name" class="oe_form_title" width="80%%" nolabel="1"/>
                 </group>
-                <group colspan="4" col="5" class="oe_form_group_label_border" style="margin-top: 20px;">
+                <group colspan="2" col="2"  class="oe_form_group_label_border">
                      <field name="address_id" widget ="geo_address" string="Venue"/> 
                  </group>
-                 <group colspan="2" col="2" class="oe-listview-content">    
-                    <label string="Ticket Description"/>
-                     <label string="Quantity"/>
-                     <field nolabel="1" name="full_name" />
-                      <field nolabel="1" name="register_max" />
-                     </group>   
-                     <newline/>
-                     <group colspan="2">
-                        <button name="order_now" string="Order Now" type="object" icon="gtk-apply" align="Right"/>
-                      </group>                
- <!--                <notebook colspan="4">
+                 <newline/>
+                     <group colspan="2" col="2" class="oe-listview-content">    
+                        <label string="Ticket Description"/>
+                        <label string="Quantity"/>
+                        <field nolabel="1" name="full_name" />
+                        <field nolabel="1" name="available_qty" />
+                     </group> 
+                 <newline/>
+                 <group colspan="2" col="2">
+                        <button name="order_now" string="Order Now" type="object" icon="gtk-apply" />
+                 </group>                
+                 <notebook colspan="4">
                     <page string="Event">
-                        <separator string="Description" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
+                         <group colspan="2" col="2" class="oe_form_group_label_border">
+                            <field name="register_min"/>
+                            <field name="register_max"/>
+                        </group>
+                        <group colspan="2" col="2" class="oe_form_group_label_border">
+                            <field name="register_current"/> 
+                            <field name="register_prospect"/>
+                            <field name="register_attended"/>
+                        </group>
                         <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
@@ -204,39 +212,15 @@
                                     </group>
                             </form>
                             </field>
-                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                        <group col="4" colspan="2">
-                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        </group>
                     </page>
+                
                     <page string="Speakers">
                         <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
                         <field name="speaker_confirmed"/>
                         <separator string="Other Speakers" colspan="4"/>
                         <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
                     </page>
-                    <page string="Extra Info">
-                        <group col="2" colspan="2">
-                            <separator string="Registrations" colspan="2"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                            <field name="register_prospect"/>
-                            <field name="register_current"/>
-                            <field name="register_attended"/>
-                            <field name="location_id"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator string="Emails" colspan="2"/>
-                            <field name="reply_to"/>
-                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
-                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
-                        </group>
-                    </page>
-
-                </notebook> -->
+                </notebook>
                       <separator colspan="4" string="Details"/>
                     <field name="note" nolabel="1" colspan="4"/>
                  </sheet>

From 4a02e98d42678b9becec3bacf4d65906596bfdf7 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Mon, 21 May 2012 18:54:58 +0530
Subject: [PATCH 31/38] [FIX]: Add osv memory wizard for event preview.Refactor
 code as per new specification.

bzr revid: atp@tinyerp.com-20120521132458-xozrh3vcz4wbo6t5
---
 addons/event/__openerp__.py                |   3 +-
 addons/event/event.py                      |  37 +----
 addons/event/event_view.xml                | 110 +------------
 addons/event/static/src/css/event.css      | 181 ++++++++++++++-------
 addons/event/static/src/js/google_map.js   |  87 +++++-----
 addons/event/wizard/__init__.py            |   1 +
 addons/event/wizard/event_preview.py       |  56 +++++++
 addons/event/wizard/event_preview_view.xml |  67 ++++++++
 addons/event_sale/event_sale_view.xml      |   2 +-
 addons/mail/static/src/css/mail.css        |   1 +
 10 files changed, 300 insertions(+), 245 deletions(-)
 create mode 100644 addons/event/wizard/event_preview.py
 create mode 100644 addons/event/wizard/event_preview_view.xml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index e05754eb992..577a9ba9f3c 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -46,6 +46,7 @@ Note that:
         'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_view.xml',
+         'wizard/event_preview_view.xml',
         'event_view.xml',
         'report/report_event_registration_view.xml',
         'board_association_view.xml',
@@ -54,7 +55,7 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
-  #  'js': ['static/src/js/google_map.js'],
+    'js': ['static/src/js/google_map.js'],
     'qweb': ['static/src/xml/event_address.xml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
diff --git a/addons/event/event.py b/addons/event/event.py
index d029ba22acd..dfa35ad50b2 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -219,49 +219,14 @@ class event_event(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
         'available_qty': fields.integer('Availabel Quantity'),
+         'sale_end_date': fields.datetime('SalesEnd'),
       
     }
-
     _defaults = {
         'state': 'draft',
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'event.event', context=c),
         'user_id': lambda obj, cr, uid, context: uid,
     }
-    
-    def order_now(self, cr, uid, ids, context=None):
-          register_pool = self.pool.get('event.registration')
-          user_pool = self.pool.get('res.users')
-          data_obj = self.pool.get('ir.model.data')
-          user = user_pool.browse(cr, uid, uid, context=context)
-          for event in self.browse(cr, uid, ids, context):
-              self.check_registration_limits_before(cr, uid, ids, event.available_qty, context=context)
-              curr_reg_ids = register_pool.search(cr, uid, [('user_id', '=', user.id), ('event_id', '=' , event.id)])
-        #the subscription is done with UID = 1 because in case we share the kanban view, we want anyone to be able to subscribe
-              print "event.curre_reg_ids",event.available_qty
-              if not curr_reg_ids and event.available_qty > 0:
-                print "cccccccccccc",event.available_qty  
-                curr_reg_ids = [register_pool.create(cr, 1, {'event_id': event.id ,'email': user.user_email, 'name':user.name, 'user_id': user.id, 'nb_register': event.available_qty})]
-              elif event.available_qty > 0:
-                print "mmmmmmm",event.available_qty
-                register_pool.write(cr, uid, curr_reg_ids, {'nb_register': event.available_qty}, context=context)
-              if event.available_qty > 0:  
-                register_pool.confirm_registration(cr, 1, curr_reg_ids, context=context)      
-          view_id = data_obj._get_id(cr, uid, 'event', 'view_event_registration_form')
-          if view_id:
-              res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-          res = {
-                    'name': _('Registration'),
-                    'view_type': 'form',
-                    'view_mode': 'form',
-                    'res_model': 'event.registration',
-                    'res_id': curr_reg_ids[0],
-                    'views':[(res_id,'form'), (False, 'tree')],
-                    'type': 'ir.actions.act_window',
-                    'nodestroy': True,
-                    'target': 'current',
-          }
-          return res
-         
     def subscribe_to_event(self, cr, uid, ids, context=None):
         register_pool = self.pool.get('event.registration')
         user_pool = self.pool.get('res.users')
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 27ff18d1457..730f6cb6573 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -47,7 +47,7 @@
 
 <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
-<!--         <record model="ir.ui.view" id="view_event_form">
+        <record model="ir.ui.view" id="view_event_form">
             <field name="name">Events</field>
             <field name="model">event.event</field>
             <field name="type">form</field>
@@ -120,7 +120,6 @@
                             <field name="register_prospect"/>
                             <field name="register_current"/>
                             <field name="register_attended"/>
-                            <field name="location_id"/>
                         </group>
                         <group col="2" colspan="2">
                             <separator string="Emails" colspan="2"/>
@@ -132,104 +131,7 @@
                     </notebook>
             </form>
             </field>
-        </record> -->
-
-    <record model="ir.ui.view" id="view_event_form">
-        <field name="name">Events</field>
-        <field name="model">event.event</field>
-        <field name="type">form</field>
-        <field name="priority">20</field>
-        <field name="arch" type="xml">
-            <form string="Preview" layout="manual">
-                <div class="oe_form_topbar">
-                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                    </div>
-                </div>
-                <sheet layout="auto">
-                <group colspan="4" col="2">
-                        <field name="name" class="oe_form_title" width="80%%" nolabel="1"/>
-                </group>
-                <group colspan="2" col="2"  class="oe_form_group_label_border">
-                     <field name="address_id" widget ="geo_address" string="Venue"/> 
-                 </group>
-                 <newline/>
-                     <group colspan="2" col="2" class="oe-listview-content">    
-                        <label string="Ticket Description"/>
-                        <label string="Quantity"/>
-                        <field nolabel="1" name="full_name" />
-                        <field nolabel="1" name="available_qty" />
-                     </group> 
-                 <newline/>
-                 <group colspan="2" col="2">
-                        <button name="order_now" string="Order Now" type="object" icon="gtk-apply" />
-                 </group>                
-                 <notebook colspan="4">
-                    <page string="Event">
-                         <group colspan="2" col="2" class="oe_form_group_label_border">
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                        </group>
-                        <group colspan="2" col="2" class="oe_form_group_label_border">
-                            <field name="register_current"/> 
-                            <field name="register_prospect"/>
-                            <field name="register_attended"/>
-                        </group>
-                        <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
-                            <tree string="Registration" editable="top">
-                                <field name="name" />
-                                <field name="email" />
-                                <field name="phone"/>
-                                <field name="nb_register" />
-                                <field name="state"/>
-                                <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                <button name="button_reg_close" string="Attented the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                            </tree>
-                            <form string="Registration">
-                                <field name="partner_id" attrs="{'readonly':[('state','!=', 'draft')]}" on_change="onchange_partner_id(partner_id, context)" />
-                                <field name="name"/>
-                                <group colspan="4" col="4">
-                                <field name="email"/>
-                                <field name="phone"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                    <field name="nb_register"/>
-                                </group>
-                                <group colspan="4" col="4">
-                                </group>
-                                    <group col="8" colspan="4">
-                                        <separator string="" colspan="4"/>
-                                        <newline/>
-                                        <field name="state" select="1" colspan="2"/>
-                                        <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                                        <button name="button_reg_close" string="Attended the Event" states="open" type="object" icon="gtk-jump-to"/>
-                                        <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
-                                    </group>
-                            </form>
-                            </field>
-                    </page>
-                
-                    <page string="Speakers">
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                        <field name="speaker_confirmed"/>
-                        <separator string="Other Speakers" colspan="4"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
-                    </page>
-                </notebook>
-                      <separator colspan="4" string="Details"/>
-                    <field name="note" nolabel="1" colspan="4"/>
-                 </sheet>
-
-            </form>
-        </field>
-    </record>
-
-
+        </record>
 
         <!-- Event tree view -->
 
@@ -257,6 +159,7 @@
             </field>
         </record>
 
+
         
         <!-- Event Kanban View -->
 	
@@ -308,7 +211,9 @@
                                   <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
                                   <span >Subscribe</span>
                                   </button>
-                                <a string="Edit" icon="gtk-edit" type="edit"/>                                  
+                                 <button name="%(action_event_preview)d" type="action">
+                                 <span>Preview</span>
+                                 </button>
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
@@ -316,7 +221,6 @@
                                 <span>Subscribed</span>
                                 <span class="unsubscribe">Unsubscribe</span>
                               </button>
-                                                              
                             </t>
                         </div>
                       </div>
@@ -584,7 +488,7 @@
           <field name="view_mode">tree,form,calendar,graph</field>
           <field name="context">{}</field>
           <field name="search_view_id" ref="view_registration_search"/>
-        </record>
+        </record>view_
 
         <menuitem
             name="Registrations"
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 4a2d8d558fb..cdf92810392 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -33,69 +33,25 @@ div.oe_fold_column{
   padding:0px !important;
 }
 .oe_event_button_subscribe {
-    display: inline-block;
-    border: 1px solid #ababab;
-    color: #404040;
-    font-size: 12px;
-    padding: 0px !important;
-    text-align: center;
-    -o-background-size: 100% 100%;
-    -moz-background-size: 100% 100%;
-    -webkit-background-size: auto auto !important;
-    background-size: 100% 100%;
-    background: #d8d8d8 none;
-    background: none, -webkit-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
-    background: none, -webkit-linear-gradient(#efefef, #d8d8d8);
-    background: none, -moz-linear-gradient(#efefef, #d8d8d8);
-    background: none, -o-linear-gradient(top, #efefef, #d8d8d8);
-    background: none, -khtml-gradient(linear, left top, left bottom, from(#efefef), to(#d8d8d8));
-    background: -ms-linear-gradient(top, #efefef, #d8d8d8);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#efefef', endColorstr='#d8d8d8',GradientType=0 );
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    -o-border-radius: 3px;
-    -ms-border-radius: 3px;
-    border-radius: 3px;
-    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    -o-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
-    -webkit-font-smoothing: antialiased;
-    outline: none;
+  color: white;
+  background-color: #8a89ba;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
+  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);
 }
 
 .oe_event_button_unsubscribe {
-  display: inline-block;
-    border: 1px solid #AAA;
-    color: #404040;
-    font-size: 12px;
-    padding: 3px 10px;
-    text-align: center;
-    -o-background-size: 100% 100%;
-    -moz-background-size: 100% 100%;
-    -webkit-background-size: auto auto !important;
-    background-size: 100% 100%;
-    background: #AAA none;
-    background: none, -webkit-gradient(linear, left top, left bottom, from(#AAA), to(#AAA));
-    background: none, -webkit-linear-gradient(#AAA, #AAA);
-    background: none, -moz-linear-gradient(#AAA, #AAA);
-    background: none, -o-linear-gradient(top, #AAA, #AAA);
-    background: none, -khtml-gradient(linear, left top, left bottom, from(#AAA), to(#AAA));
-    background: -ms-linear-gradient(top, #AAA, #AAA);
-    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#AAA, endColorstr='#AAA',GradientType=0 );
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    -o-border-radius: 3px;
-    -ms-border-radius: 3px;
-    border-radius: 3px;
-    -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    -o-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 1px rgba(255, 255, 255, 0.8) inset;
-    text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
-    -webkit-font-smoothing: antialiased;
-    outline: none;
+  color: white;
+  background-color: #8a89ba;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
+  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
+  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);;
 }
 .oe_event_button_subscribe:hover {
   cursor: pointer;
@@ -120,3 +76,108 @@ div.oe_fold_column{
     width:35px;
     
  }
+ .oe_event_title{
+  font-size: 25px;
+}
+.oe_sub1
+{
+    float:left;
+    height:50px;
+    border-right: 1px solid black;
+    border-color: #DCDCDC;
+}
+.oe_mapbox
+{ 
+    width:auto;
+    height:200px;
+    margin-left:auto; 
+    margin-right:auto; 
+    text-align: right;
+}
+.oe_td_border
+{
+    width: 7em;
+    padding: 5px;
+    border-right: 1px solid black;
+    text-align: right;
+    border-color: #DCDCDC;
+    border-spacing:5em
+}
+.oe_td_date_border
+{
+    border-right:1px solid black;
+    border-color: #DCDCDC;
+}
+
+td.oe_sale_end_date
+{
+    padding:5px;
+}
+td.oe_qty
+{
+    width: 80px;
+    text-align:right;
+    padding:5px;
+}
+
+.oe_order_button
+{
+    height:25px;
+    position: absolute;
+    left:330px;
+    padding: 5px;
+}
+ 
+.oe_a
+{
+    position: absolute;
+    left: 22%;
+}
+
+td.oe_b
+{
+    position:relative;
+    left: 60%;
+}
+
+textarea.field_text
+{
+    width: 765px;
+    height: 318px;
+}
+
+td.oe_form_group_nested
+{
+    padding: 5px;
+}
+.oe_event_title{
+  font-size: 25px;
+}
+.oe_sub1
+{
+    float:left;
+    height:50px;
+    border-right: 1px solid black;
+    border-color: #DCDCDC;
+}
+.oe_mapbox
+{ 
+    width:auto;
+    height:200px;
+    margin-left:auto; 
+    margin-right:auto; 
+    text-align: right;
+}
+.oe_td_border
+{
+    width: 5em;
+    padding: 2px;
+    border-right: 1px solid black;
+    text-align: center;
+    border-color: #DCDCDC;
+}
+.oe_td_date_border
+{
+    border-right:1px solid black;
+    border-color: #DCDCDC;
+}
diff --git a/addons/event/static/src/js/google_map.js b/addons/event/static/src/js/google_map.js
index 2209001f29d..7d2681a7369 100644
--- a/addons/event/static/src/js/google_map.js
+++ b/addons/event/static/src/js/google_map.js
@@ -1,11 +1,24 @@
 openerp.event = function(instance){
-    instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
-    instance.event.GoogleMapConnecter = instance.web.Class.extend({
-    	init : function(){
-//    		call ajex to render map load
-    		
-    	},
-        render_map: function(address){
+    instance.web.form.widgets.add('many2one_Geo_address', 'instance.event.Many2OneAddress');
+    
+    instance.web.GoogleMapConnector = instance.web.Class.extend({
+        init: function(){
+            this.googleMapsLoaded = $.Deferred();
+            this.map_load();
+        },
+        map_load: function() {
+            var self = this;
+            if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
+                googleMapsCallback = function () {
+                self.googleMapsLoaded.resolve();
+            };
+            $.ajax({
+                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
+                dataType: "script"
+            }).fail(self.googleMapsLoaded.reject);
+            return this.googleMapsLoaded.promise();
+        },
+        render_map: function(address,$element){
             var geocoder = new google.maps.Geocoder();
             geocoder.geocode( { 'address': address}, function(results, status){
                 if (status == google.maps.GeocoderStatus.OK){
@@ -16,54 +29,40 @@ openerp.event = function(instance){
                     mapTypeId: google.maps.MapTypeId.ROADMAP
                 }
                 return new google.maps.Marker({
-                    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
+                    map : new google.maps.Map($element,myOptions),
                     position: new google.maps.LatLng(lat,lng)
                 });
                 }
             });
-            map_load: function() {
-                var self = this;
-                if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
-                    googleMapsCallback = function () {
-                    self.googleMapsLoaded.resolve();
-                };
-                $.ajax({
-                    url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
-                    dataType: "script"
-                }).fail(self.googleMapsLoaded.reject);
-                return this.googleMapsLoaded.promise();
-            },
-            
-    }),
-    
-    instance.event.GeoAddress = instance.web.form.Many2OneField.extend(_.extend({}, {
-        init : function(){
-            this._super();
-            this.googleMapsLoaded = $.Deferred();
         },
-
-
-        set_value:function(value){
-            var self = this;
-            this.get_address(value).done(function(value){
-            if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
-            var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
-            var defer = self.map_load();
-            defer.done(function(){
-                return self.render_map(address);	
-            });
-            });
+    });
+    instance.event.Many2OneAddress = instance.web.form.FieldMany2One.extend({
+        init: function(field_manager, node){
+          this._super(field_manager, node);
+          this.map = new instance.web.GoogleMapConnector(); 
         },
         get_address:function(value){
+            var self = this;
             if (!value || value.length == 0){
                 return $.Deferred().reject();
             }
-            return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
+            (value instanceof Array)?value = parseInt(value[0]):false;
+            var data = new instance.web.DataSet(this,this.field.relation, this.build_context());
+            data.read_ids(value,["street","city","country_id"]).done(function(value){
+                var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+                self.map.googleMapsLoaded.done(function(){
+                    self.map.render_map(address,document.getElementById("oe_mapbox"));
+                })
+            });
+        },
+        set_value:function(value){
+            this._super(value);
+            this.get_address(value);
         },
 
-        },
-        get_value:function(){
+        render_value:function(no_recurse){
+            this.get_address(this.get("value"));
+            this._super(no_recurse);
         }
-
-    }));
+    });
 };
\ No newline at end of file
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index 92e33960484..d1350fb43b8 100644
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -21,4 +21,5 @@
 
 
 import event_confirm
+import event_preview
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/event_preview.py b/addons/event/wizard/event_preview.py
new file mode 100644
index 00000000000..4a490ad930e
--- /dev/null
+++ b/addons/event/wizard/event_preview.py
@@ -0,0 +1,56 @@
+# -*- 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 osv, fields
+
+    
+class event_preview(osv.osv_memory):
+    _name = 'event.preview'
+    _inherit= 'event.event'
+    _columns = {
+     'qty': fields.integer('Quantity'),
+     'sale_end_date': fields.datetime('SalesEnd'),
+    }
+    def default_get(self, cr, uid, fields, context=None):
+        event_pool = self.pool.get('event.event')
+        data_obj = self.pool.get('ir.model.data')
+        res_id = data_obj._get_id(cr, uid, 'event', 'view_event_preview')
+        if res_id:
+            event_preview_id = data_obj.browse(cr, uid, res_id, context=context).res_id
+
+        record_ids = context and context.get('active_ids', []) or []
+        res = {}
+        for event in event_pool.browse(cr, uid, record_ids, context=context):
+            if 'name' in fields:
+                res.update({'name': event.name})
+            if 'date_begin' in fields:
+                res.update({'date_begin': event.date_begin or False})
+            if 'address_id' in fields:
+                res.update({'address_id': event.address_id and event.address_id.id or False})
+            if 'date_end' in fields:
+                res.update({'date_end': event.date_end})
+            if 'note' in fields:
+                res.update({'note': event.note})
+        return res
+    
+event_preview()   
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/wizard/event_preview_view.xml b/addons/event/wizard/event_preview_view.xml
new file mode 100644
index 00000000000..1d2aead8b28
--- /dev/null
+++ b/addons/event/wizard/event_preview_view.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>  
+<openerp>
+    <data>
+
+    <record model="ir.ui.view" id="view_event_preview">
+        <field name="name">Events</field>
+        <field name="model">event.preview</field>
+        <field name="type">form</field>
+        <field name="priority">20</field>
+        <field name="arch" type="xml">
+            <form string="Preview" layout="manual">
+                <div class="oe_form_topbar">
+                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
+                        <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet layout="auto">
+                    <group colspan="4" col="2">
+                            <field name="name"  nolabel="1" class="oe_form_title" width="60%%" />
+		                     <div id = "oe_mapbox" class="oe_mapbox"> </div>
+		                     <table>
+		                       <tr>
+		                         <td width="70px" class="oe_td_border">
+		                             Where
+		                         </td>
+		                         <td width="auto">
+		                             <field name="address_id" widget ="many2one_Geo_address" nolabel="1"/>
+		                         </td>
+		                         <td width="210px">
+		                             <table align="right">
+		                              <tr>
+		                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
+		                              </tr>
+		                              <tr>
+		                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
+		                              </tr>
+		                            </table>
+		                         </td>
+		                         
+		                       </tr>
+		                     </table>
+
+                        <group colspan="2">
+                        </group>
+                    </group> 
+                      <separator colspan="4" string="Details" nolabel="1"/>
+                    <field name="note" colspan="4" nolabel="1"/>
+                 </sheet>
+            </form>
+        </field>
+    </record>
+    
+    <record model="ir.actions.act_window" id="action_event_preview">
+            <field name="name">Preview</field>
+            <field name="res_model">event.preview</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">form</field>
+            <field name="target">current</field>
+        </record>
+
+
+    </data>
+</openerp>
\ No newline at end of file
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index faaa157d356..d0e00c9a8bf 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -57,7 +57,7 @@
                       <newline/>
                       <group colspan="4" name="venue">
                             <div class="oe_sub1"> Venue   : </div> 
-                              <field name="location_id" nolabel="1" readonly="1"/> 
+                              <field name="address_id_id" nolabel="1"/> 
                       </group>
                        <field name="event_item_ids" nolabel="1">
                          <tree editable="top" string="Event Items">
diff --git a/addons/mail/static/src/css/mail.css b/addons/mail/static/src/css/mail.css
index 895ca575f08..554f8085fb5 100644
--- a/addons/mail/static/src/css/mail.css
+++ b/addons/mail/static/src/css/mail.css
@@ -1,3 +1,4 @@
+
 /* ------------------------------ */
 /* Wall                           */
 /* ------------------------------ */

From 7f93ac0dc3347972904d4321038bb530f5bc95a6 Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 23 May 2012 18:49:56 +0530
Subject: [PATCH 32/38] [FIX]: ADD google map in event form view. remove
 preveiw wizard.

bzr revid: atp@tinyerp.com-20120523131956-ttslmltvzscz024o
---
 addons/event/__openerp__.py                |   1 -
 addons/event/event.py                      |   6 +
 addons/event/event_view.xml                | 124 +++++++++++++--------
 addons/event/static/src/css/event.css      |  65 +----------
 addons/event/wizard/__init__.py            |   1 -
 addons/event/wizard/event_preview.py       |  56 ----------
 addons/event/wizard/event_preview_view.xml |  67 -----------
 7 files changed, 86 insertions(+), 234 deletions(-)
 delete mode 100644 addons/event/wizard/event_preview.py
 delete mode 100644 addons/event/wizard/event_preview_view.xml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index 577a9ba9f3c..5f02bb8a05e 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -46,7 +46,6 @@ Note that:
         'security/event_security.xml',
         'security/ir.model.access.csv',
         'wizard/event_confirm_view.xml',
-         'wizard/event_preview_view.xml',
         'event_view.xml',
         'report/report_event_registration_view.xml',
         'board_association_view.xml',
diff --git a/addons/event/event.py b/addons/event/event.py
index dfa35ad50b2..ef33b6ebc52 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -221,6 +221,12 @@ class event_event(osv.osv):
         'available_qty': fields.integer('Availabel Quantity'),
          'sale_end_date': fields.datetime('SalesEnd'),
       
+     'city': fields.related('address_id', 'city', type='char', string='City'),
+     'street': fields.related('address_id', 'street', type='char', string='Street'),
+     'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'),
+     'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'),
+     'zip': fields.related('address_id','zip', type="char", string="Zip"),      
+      
     }
     _defaults = {
         'state': 'draft',
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 730f6cb6573..0964f52e36b 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -52,19 +52,82 @@
             <field name="model">event.event</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Events">
-                    <group col="6" colspan="4">
-                        <field name="name"/>
-                        <field name="date_begin"/>
-                        <field name="date_end"/>
-                        <field name="type" on_change="onchange_event_type(type,context)"/>
-                        <field name="user_id"/>
-                        <field name="address_id" />
-                    </group>
-                    <notebook colspan="4">
-                    <page string="Event">
-                        <separator string="Description" colspan="4"/>
-                        <field name="note" colspan="4" nolabel="1"/>
+            <form string="Events" layout="manual">
+                <div class="oe_form_topbar">
+                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
+                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/> 
+                    <div class="oe_right">
+                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
+                    </div>
+                </div>
+                <sheet layout="auto">
+                <group colspan="4">
+                  <group col="2" colspan="2" class="oe_form_group_label_border"  >
+                  <field name="name" required="1" nolabel="1" class="oe_form_title" /><br/><br/><br/>
+                    <field name="type" on_change="onchange_event_type(type,context)"/>
+                    <field name="user_id"/>
+                    <field name="address_id" widget ="many2one_Geo_address"/>
+                  </group>
+                  <group colspan="2" col="2">
+                    <div id = "oe_mapbox" class="oe_mapbox">
+                    </div>
+                  </group>  
+                  <group colspan="4">
+                     <group col="4" colspan="2" class="oe_form_group_label_border" >
+                           <field name="register_min"/>
+                           <field name="register_max"/>
+                     </group>
+                     <group colspan="2" col="2">
+	                   <div>
+	                        <table  width="400px" >
+	                         <tr>
+	                           <td  class="oe_td_border">
+	                               Where :
+	                           </td>
+	                           <td width="auto">
+	                            <field name="street" nolabel="1" readonly="1"/><br/>
+	                             <field name="state_id" nolabel="1" readonly="1"/><br/>
+	                              <field name="city" nolabel="1" readonly="1"/><br/>
+	                               <field name="country_id" nolabel="1" readonly="1"/><br/>
+	                               <field name="zip" nolabel="1" readonly="1"/><br/>
+	                           </td>
+	                           <td width="10px" >
+	                               <table width="150px" >
+	                                <tr >
+	                                  <td class="oe_td_date_border">Start: </td><td width="auto"><field name="date_begin" nolabel="1" /></td>
+	                                </tr>
+	                                <tr >
+	                                  <td class="oe_td_date_border">End</td><td width="auto"><field name="date_end" nolabel="1" /></td>
+	                                </tr><newline/>
+	                              </table>
+	                           </td>
+	                         </tr>
+	                       </table>
+	                    </div>
+                     </group>
+                  </group>
+                  </group>
+                <notebook colspan="4">
+                <page string="Event Details">
+                <separator colspan="4" string="Details" nolabel="1"/>
+                <field name="note" colspan="4" nolabel="1"/>    
+                </page>
+                    <page string="Speakers">
+                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
+                        <field name="speaker_confirmed"/>
+                        <separator string="Other Speakers" colspan="4"/>
+                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
+                    </page>
+                    <page string="Event Registration">
+	                     <group col="6" colspan="4" class="oe_form_group_label_border" >
+                            <field name="register_current"/>
+                            <field name="register_prospect"/>
+                            <field name="register_attended"/>
+	                     </group> 
+	                     <br/>
+	                     <br/>                   
                         <field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
                             <tree string="Registration" editable="top">
                                 <field name="name" />
@@ -98,37 +161,9 @@
                                     </group>
                             </form>
                             </field>
-                        <field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
-                        <group col="4" colspan="2">
-                           <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                           <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                           <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                           <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        </group>
                     </page>
-                    <page string="Speakers">
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                        <field name="speaker_confirmed"/>
-                        <separator string="Other Speakers" colspan="4"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Extra Info">
-                        <group col="2" colspan="2">
-                            <separator string="Registrations" colspan="2"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                            <field name="register_prospect"/>
-                            <field name="register_current"/>
-                            <field name="register_attended"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator string="Emails" colspan="2"/>
-                            <field name="reply_to"/>
-                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
-                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
-                        </group>
-                    </page>
-                    </notebook>
+                </notebook>
+                </sheet>
             </form>
             </field>
         </record>
@@ -211,9 +246,6 @@
                                   <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
                                   <span >Subscribe</span>
                                   </button>
-                                 <button name="%(action_event_preview)d" type="action">
-                                 <span>Preview</span>
-                                 </button>
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index cdf92810392..160e0d82b1c 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -93,7 +93,9 @@ div.oe_fold_column{
     margin-left:auto; 
     margin-right:auto; 
     text-align: right;
+
 }
+
 .oe_td_border
 {
     width: 7em;
@@ -109,75 +111,12 @@ div.oe_fold_column{
     border-color: #DCDCDC;
 }
 
-td.oe_sale_end_date
-{
-    padding:5px;
-}
-td.oe_qty
-{
-    width: 80px;
-    text-align:right;
-    padding:5px;
-}
-
-.oe_order_button
-{
-    height:25px;
-    position: absolute;
-    left:330px;
-    padding: 5px;
-}
- 
-.oe_a
-{
-    position: absolute;
-    left: 22%;
-}
-
-td.oe_b
-{
-    position:relative;
-    left: 60%;
-}
-
 textarea.field_text
 {
     width: 765px;
     height: 318px;
 }
-
 td.oe_form_group_nested
 {
     padding: 5px;
 }
-.oe_event_title{
-  font-size: 25px;
-}
-.oe_sub1
-{
-    float:left;
-    height:50px;
-    border-right: 1px solid black;
-    border-color: #DCDCDC;
-}
-.oe_mapbox
-{ 
-    width:auto;
-    height:200px;
-    margin-left:auto; 
-    margin-right:auto; 
-    text-align: right;
-}
-.oe_td_border
-{
-    width: 5em;
-    padding: 2px;
-    border-right: 1px solid black;
-    text-align: center;
-    border-color: #DCDCDC;
-}
-.oe_td_date_border
-{
-    border-right:1px solid black;
-    border-color: #DCDCDC;
-}
diff --git a/addons/event/wizard/__init__.py b/addons/event/wizard/__init__.py
index d1350fb43b8..92e33960484 100644
--- a/addons/event/wizard/__init__.py
+++ b/addons/event/wizard/__init__.py
@@ -21,5 +21,4 @@
 
 
 import event_confirm
-import event_preview
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/event/wizard/event_preview.py b/addons/event/wizard/event_preview.py
deleted file mode 100644
index 4a490ad930e..00000000000
--- a/addons/event/wizard/event_preview.py
+++ /dev/null
@@ -1,56 +0,0 @@
-# -*- 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 osv, fields
-
-    
-class event_preview(osv.osv_memory):
-    _name = 'event.preview'
-    _inherit= 'event.event'
-    _columns = {
-     'qty': fields.integer('Quantity'),
-     'sale_end_date': fields.datetime('SalesEnd'),
-    }
-    def default_get(self, cr, uid, fields, context=None):
-        event_pool = self.pool.get('event.event')
-        data_obj = self.pool.get('ir.model.data')
-        res_id = data_obj._get_id(cr, uid, 'event', 'view_event_preview')
-        if res_id:
-            event_preview_id = data_obj.browse(cr, uid, res_id, context=context).res_id
-
-        record_ids = context and context.get('active_ids', []) or []
-        res = {}
-        for event in event_pool.browse(cr, uid, record_ids, context=context):
-            if 'name' in fields:
-                res.update({'name': event.name})
-            if 'date_begin' in fields:
-                res.update({'date_begin': event.date_begin or False})
-            if 'address_id' in fields:
-                res.update({'address_id': event.address_id and event.address_id.id or False})
-            if 'date_end' in fields:
-                res.update({'date_end': event.date_end})
-            if 'note' in fields:
-                res.update({'note': event.note})
-        return res
-    
-event_preview()   
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/event/wizard/event_preview_view.xml b/addons/event/wizard/event_preview_view.xml
deleted file mode 100644
index 1d2aead8b28..00000000000
--- a/addons/event/wizard/event_preview_view.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>  
-<openerp>
-    <data>
-
-    <record model="ir.ui.view" id="view_event_preview">
-        <field name="name">Events</field>
-        <field name="model">event.preview</field>
-        <field name="type">form</field>
-        <field name="priority">20</field>
-        <field name="arch" type="xml">
-            <form string="Preview" layout="manual">
-                <div class="oe_form_topbar">
-                     <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                        <div class="oe_right">
-                        <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                    </div>
-                </div>
-                <sheet layout="auto">
-                    <group colspan="4" col="2">
-                            <field name="name"  nolabel="1" class="oe_form_title" width="60%%" />
-		                     <div id = "oe_mapbox" class="oe_mapbox"> </div>
-		                     <table>
-		                       <tr>
-		                         <td width="70px" class="oe_td_border">
-		                             Where
-		                         </td>
-		                         <td width="auto">
-		                             <field name="address_id" widget ="many2one_Geo_address" nolabel="1"/>
-		                         </td>
-		                         <td width="210px">
-		                             <table align="right">
-		                              <tr>
-		                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
-		                              </tr>
-		                              <tr>
-		                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
-		                              </tr>
-		                            </table>
-		                         </td>
-		                         
-		                       </tr>
-		                     </table>
-
-                        <group colspan="2">
-                        </group>
-                    </group> 
-                      <separator colspan="4" string="Details" nolabel="1"/>
-                    <field name="note" colspan="4" nolabel="1"/>
-                 </sheet>
-            </form>
-        </field>
-    </record>
-    
-    <record model="ir.actions.act_window" id="action_event_preview">
-            <field name="name">Preview</field>
-            <field name="res_model">event.preview</field>
-            <field name="view_type">form</field>
-            <field name="view_mode">form</field>
-            <field name="target">current</field>
-        </record>
-
-
-    </data>
-</openerp>
\ No newline at end of file

From e21492a8bf490e64d7323967541d9e83e1b791ca Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 23 May 2012 19:14:48 +0530
Subject: [PATCH 33/38] [REM]: Remove unused code and refactor code as per
 specification

bzr revid: atp@tinyerp.com-20120523134448-9vqtiufzjgmmaq0b
---
 addons/event/__openerp__.py                   |   1 -
 addons/event/event.py                         |  13 +-
 addons/event/static/src/xml/event_address.xml |   9 --
 addons/event_sale/__openerp__.py              |   4 -
 addons/event_sale/event_sale.py               | 105 ----------------
 addons/event_sale/event_sale_view.xml         | 114 ------------------
 .../event_sale/security/ir.model.access.csv   |   2 -
 .../event_sale/static/src/css/event_page.css  |  31 -----
 addons/event_sale/static/src/js/google_map.js |  64 ----------
 .../static/src/xml/event_address.xml          |   9 --
 addons/portal_event/__init__.py               |  22 ----
 addons/portal_event/__openerp__.py            |  40 ------
 addons/portal_event/portal_event.py           |  47 --------
 .../portal_event/security/ir.model.access.csv |   6 -
 .../security/portal_event_security.xml        |  33 -----
 15 files changed, 5 insertions(+), 495 deletions(-)
 delete mode 100644 addons/event/static/src/xml/event_address.xml
 delete mode 100644 addons/event_sale/security/ir.model.access.csv
 delete mode 100644 addons/event_sale/static/src/css/event_page.css
 delete mode 100644 addons/event_sale/static/src/js/google_map.js
 delete mode 100644 addons/event_sale/static/src/xml/event_address.xml
 delete mode 100644 addons/portal_event/__init__.py
 delete mode 100644 addons/portal_event/__openerp__.py
 delete mode 100644 addons/portal_event/portal_event.py
 delete mode 100644 addons/portal_event/security/ir.model.access.csv
 delete mode 100644 addons/portal_event/security/portal_event_security.xml

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index f9f7ef6c416..c491dd06138 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -54,7 +54,6 @@ Note that:
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
     'js': ['static/src/js/google_map.js'],
-    'qweb': ['static/src/xml/event_address.xml'],
     'css': ['static/src/css/event.css'],
     'installable': True,
     'application': True,
diff --git a/addons/event/event.py b/addons/event/event.py
index 5f72b3d40b6..a15d1d92557 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -218,14 +218,11 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
-        'available_qty': fields.integer('Availabel Quantity'),
-         'sale_end_date': fields.datetime('SalesEnd'),
-      
-     'city': fields.related('address_id', 'city', type='char', string='City'),
-     'street': fields.related('address_id', 'street', type='char', string='Street'),
-     'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'),
-     'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'),
-     'zip': fields.related('address_id','zip', type="char", string="Zip"),      
+         'city': fields.related('address_id', 'city', type='char', string='City'),
+         'street': fields.related('address_id', 'street', type='char', string='Street'),
+         'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'),
+         'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'),
+         'zip': fields.related('address_id','zip', type="char", string="Zip"),      
       
     }
     _defaults = {
diff --git a/addons/event/static/src/xml/event_address.xml b/addons/event/static/src/xml/event_address.xml
deleted file mode 100644
index 14c7051cf7d..00000000000
--- a/addons/event/static/src/xml/event_address.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	
-	<template>
-		<td id = "address_text" t-name="address">
-			<t t-esc="record.street"/> <br/>
-			<t t-esc="record.city"/> <br/>
-			<t t-esc="record.country_id[1]"/>
-		</td>
-	</template>
\ No newline at end of file
diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index a7e9495af60..d06e964c483 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -35,14 +35,10 @@ It defines a new kind of service products that offers you the possibility to cho
     'author': 'OpenERP SA',
     'depends': ['event','sale','sale_crm'],
     'update_xml': [
-        'security/ir.model.access.csv',
         'event_sale_view.xml',
     ],
     'demo_xml': ['event_demo.xml'],
     'test':['test/confirm.yml'],
-    'css': ['static/src/css/event_page.css'],
-    'js': ['static/src/js/google_map.js'],
-    'qweb': ['static/src/xml/event_address.xml'],
     'installable': True,
     'active': False,
 }
diff --git a/addons/event_sale/event_sale.py b/addons/event_sale/event_sale.py
index 0abbfc2cfb3..44b3aaf5409 100644
--- a/addons/event_sale/event_sale.py
+++ b/addons/event_sale/event_sale.py
@@ -93,108 +93,3 @@ class sale_order_line(osv.osv):
                 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'),
-                }
-    
-    def order_now(self, cr, uid, ids, context=None):
-        res = {}
-        register_pool = self.pool.get('event.registration')
-        sale_order_line_pool = self.pool.get('sale.order.line')
-        sale_order = self.pool.get('sale.order')
-        partner_pool = self.pool.get("res.partner")
-        data_obj = self.pool.get("ir.model.data")
-        prod_pricelist_obj = self.pool.get('product.pricelist')
-        user = self.pool.get("res.users").browse(cr, uid, uid, context=context)
-        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
-        if not partner_ids:
-            # partner not found create new partner.....
-            new_partner_id = partner_pool.create(cr, uid, {'name': user.name, 'email': user.user_email})
-            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
-        else:
-            new_partner_id = partner_ids[0]
-            partner_invoice_id = partner_pool.address_get(cr, uid, [new_partner_id], ['invoice'])['invoice']
-            partner_shipping_id = partner_pool.address_get(cr, uid, [new_partner_id], ['delivery'])['delivery']
-        for event_id in self.browse(cr, uid, ids, context=context):
-            price_list = prod_pricelist_obj.search(cr,uid,[],context=context)[0]
-            new_sale_id = sale_order.create(cr, uid, {
-                'date_order': event_id.date_begin,
-                'pricelist_id': price_list,
-                 'partner_id': new_partner_id, 
-                  'partner_invoice_id': partner_invoice_id,
-                 'partner_shipping_id': partner_shipping_id
-                })  
-            if event_id.event_item_ids:
-                for items in event_id.event_item_ids:
-                    product = items.product_id.id
-                    sale_order_line = sale_order_line_pool.create(cr, uid, {
-                        'order_id': new_sale_id, 
-                        'name': items.product_id.name,
-                        'product_uom_qty': items.qty,
-                        'product_id': items.product_id.id,
-                        'price_unit': items.price,
-                        'date_planned': items.sales_end_date,
-                    }, context=context)
-            view_id = data_obj._get_id(cr, uid, 'sale', 'view_order_form')
-            if view_id:
-                res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-            res = {
-                    'name': _('Quotation'),
-                    'view_type': 'form',
-                    'view_mode': 'form',
-                    'res_model': 'sale.order',
-                    'res_id': new_sale_id,
-                    'views':[(res_id,'form'), (False, 'tree')],
-                    'type': 'ir.actions.act_window',
-                    'nodestroy': True,
-                    'target': 'current',
-            }
-        return res
-    
-    def subscribe_to_event(self, cr, uid, ids, context=None):
-        res = {}
-        data_obj = self.pool.get("ir.model.data")
-        view_id = data_obj._get_id(cr, uid, 'event_sale', 'view_event_page')
-        if view_id:
-            res_id = data_obj.browse(cr, uid, view_id, context=context).res_id
-        res = {
-                'name': _('Event Page'),
-                'view_type': 'form',
-                'view_mode': 'form',
-                'views':[(res_id,'form'), (False, 'tree')],
-                'res_model': 'event.event',
-                'res_id': ids[0],
-                'type': 'ir.actions.act_window',
-                'nodestroy': True,
-                'target': 'current',
-        }
-        return res
-    
-class event_items(osv.osv):
-    _name = "event.items"
-    _columns = {
-        'product_id': fields.many2one('product.product', 'Product', required=True),
-        'price': fields.integer('Price'),
-        #Need to convert  this integer field in to dynamic selection.. TODO
-      #  'max_qty': fields.integer('Max.Quantity available'),
-        'qty': fields.integer('Quantity'),
-        'uom_id': fields.many2one('product.uom', 'UoM'),
-        '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}
diff --git a/addons/event_sale/event_sale_view.xml b/addons/event_sale/event_sale_view.xml
index d0e00c9a8bf..5746f1de554 100644
--- a/addons/event_sale/event_sale_view.xml
+++ b/addons/event_sale/event_sale_view.xml
@@ -29,120 +29,6 @@
                 </xpath>
              </field>
         </record>
-        
-        
-    <!-- Events Organisation/CONFIGURATION/EVENTS PAGE VIEW -->
-
-        <record model="ir.ui.view" id="view_event_page">
-            <field name="name">Events</field>
-            <field name="model">event.event</field>
-            <field name="type">form</field>
-            <field name="arch" type="xml">
-                <form string="Events"  layout="manual">
-                <div class="oe_form_topbar" readonly="1">
-                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                   <div class="oe_right">
-                      <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
-                   </div>
-                </div>
-                <sheet string="Event Form" layout="auto">
-                   <group col="2">
-                     <group col="2">
-                       <div class="oe_event_title">
-                          <field name="name" nolabel="1" readonly="1"/>
-                       </div>
-                      <newline/>
-                      <group colspan="4" name="venue">
-                            <div class="oe_sub1"> Venue   : </div> 
-                              <field name="address_id_id" nolabel="1"/> 
-                      </group>
-                       <field name="event_item_ids" nolabel="1">
-                         <tree editable="top" string="Event Items">
-                          <field name="product_id" readonly="1" />
-                          <field name="sales_end_date" readonly="1"/>
-                          <field name="price" readonly="1"/>
-                          <!--  <field name="max_qty" readonly="1" groups="event.group_event_manager"/>-->
-                          <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user" />
-                         </tree>
-                       </field>
-                       <newline/>
-                      <div class="oe_right">
-                         <button name="order_now" string="Order Now" type="object" icon="gtk-apply"/>
-                      </div>
-                   </group>	
-                    <group>
-                     <div id = "oe_mapbox" class="oe_mapbox"> </div><newline/>
-                     <table>
-                       <tr>
-                         <td width="70px" class="oe_td_border">
-                             Where
-                         </td>
-                         <td width="auto">
-                             <field name="address_id" widget ="geo_address" nolabel="1"/>
-                         </td>
-                         <td width="210px">
-                             <table align="right">
-                              <tr>
-                                <td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
-                              </tr>
-                              <tr>
-                                <td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
-                              </tr>
-                            </table>
-                         </td>
-                         
-                       </tr>
-                     </table>
-                  </group>
-                  </group>
-                    <separator string="" colspan="4"/>
-                      <label string="Event Details:" colspan="4"/>
-                       <field name="note" colspan="4" nolabel="1" readonly="1"/>
-                    </sheet>
-            </form>
-            </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="//page[@string='Extra Info']" position="after">
-             <page string="Event Item">
-             <field name="event_item_ids" nolabel="1">
-             <tree editable="top" string="Event Items">
-                <field name="product_id" string="Ticket Type"  domain="[('event_ok','=',True)]" on_change="onchange_product_id(product_id)"/>
-                <field name="sales_end_date" />
-                <field name="price"/>
-                <!-- <field name="max_qty" groups="event.group_event_manager"/> --> 
-                <field name="qty" attrs="{'readonly':[('product_id','=',False)]}" groups="event.group_event_user"/>
-             </tree>
-            </field>
-            <newline/>
-             </page>
-           </xpath>
-          </field>
-        </record>
-
-		<record id="view_event_kanban_inherit" model="ir.ui.view">
-            <field name="name">event.inherit.kanban</field>
-            <field name="model">event.event</field>
-            <field name="type">kanban</field>
-            <field name="inherit_id" ref="event.view_event_kanban"/>
-            <field name="arch" type="xml">
-            	<xpath expr="//div/t/t/input[@name='subscribe']" position="replace">
-            		<input type="hidden"/>
-                </xpath> 
-            </field>
-        </record>
 
     </data>
 </openerp>
diff --git a/addons/event_sale/security/ir.model.access.csv b/addons/event_sale/security/ir.model.access.csv
deleted file mode 100644
index 8078ec3ff78..00000000000
--- a/addons/event_sale/security/ir.model.access.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_event_items,event.items,event_sale.model_event_items,event.group_event_user,1,1,0,0
diff --git a/addons/event_sale/static/src/css/event_page.css b/addons/event_sale/static/src/css/event_page.css
deleted file mode 100644
index 0f7b2a81e32..00000000000
--- a/addons/event_sale/static/src/css/event_page.css
+++ /dev/null
@@ -1,31 +0,0 @@
-.oe_event_title{
-  font-size: 25px;
-}
-.oe_sub1
-{
-    float:left;
-    height:50px;
-    border-right: 1px solid black;
-    border-color: #DCDCDC;
-}
-.oe_mapbox
-{ 
-    width:auto;
-    height:200px;
-    margin-left:auto; 
-    margin-right:auto; 
-    text-align: right;
-}
-.oe_td_border
-{
-    width: 5em;
-    padding: 2px;
-    border-right: 1px solid black;
-    text-align: center;
-    border-color: #DCDCDC;
-}
-.oe_td_date_border
-{
-    border-right:1px solid black;
-    border-color: #DCDCDC;
-}
diff --git a/addons/event_sale/static/src/js/google_map.js b/addons/event_sale/static/src/js/google_map.js
deleted file mode 100644
index 2cf67df78a4..00000000000
--- a/addons/event_sale/static/src/js/google_map.js
+++ /dev/null
@@ -1,64 +0,0 @@
-openerp.event = function(instance){
-    instance.web.form.widgets.add('geo_address', 'instance.event.GeoAddress');
-    instance.event.GeoAddress = instance.web.form.AbstractField.extend(_.extend({}, {
-        init : function(){
-            this._super.apply(this,arguments);
-            this.googleMapsLoaded = $.Deferred();
-        },
-        start:function(){
-        },
-
-        set_input_id:function(id){
-        },
-        Map_Load: function() {
-            var self = this;
-            if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
-                googleMapsCallback = function () {
-                self.googleMapsLoaded.resolve();
-            };
-            $.ajax({
-                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
-                dataType: "script"
-            }).fail(self.googleMapsLoaded.reject);
-            return this.googleMapsLoaded.promise();
-        },
-        set_value:function(value){
-            var self = this;
-            this.get_address(value).done(function(value){
-            if(!self.__parentedParent.$element.find("#address_text").length)self.__parentedParent.$element.find(".oe_td_border").after(instance.web.qweb.render("address",{'record': value}));
-            var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
-            var defer = self.Map_Load();
-            defer.done(function(){
-                return self.render_map(address);	
-            });
-            });
-        },
-        get_address:function(value){
-            if (!value || value.length == 0){
-                return $.Deferred().reject();
-            }
-            return new instance.web.DataSet (this,this.field.relation, this.build_context()).read_ids(value[0],["street","city","country_id"]);
-        },
-
-        render_map: function(address){
-            var geocoder = new google.maps.Geocoder();
-            geocoder.geocode( { 'address': address}, function(results, status){
-                if (status == google.maps.GeocoderStatus.OK){
-                    var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
-                    var myOptions = {
-                    zoom: 17,
-                    center:  new google.maps.LatLng(lat,lng),
-                    mapTypeId: google.maps.MapTypeId.ROADMAP
-                }
-                return new google.maps.Marker({
-                    map : new google.maps.Map(document.getElementById("oe_mapbox"),myOptions),
-                    position: new google.maps.LatLng(lat,lng)
-                });
-                }
-            });
-        },
-        get_value:function(){
-        }
-
-    }));
-};
\ No newline at end of file
diff --git a/addons/event_sale/static/src/xml/event_address.xml b/addons/event_sale/static/src/xml/event_address.xml
deleted file mode 100644
index 14c7051cf7d..00000000000
--- a/addons/event_sale/static/src/xml/event_address.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-	
-	<template>
-		<td id = "address_text" t-name="address">
-			<t t-esc="record.street"/> <br/>
-			<t t-esc="record.city"/> <br/>
-			<t t-esc="record.country_id[1]"/>
-		</td>
-	</template>
\ No newline at end of file
diff --git a/addons/portal_event/__init__.py b/addons/portal_event/__init__.py
deleted file mode 100644
index 70c078b769d..00000000000
--- a/addons/portal_event/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- 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
diff --git a/addons/portal_event/__openerp__.py b/addons/portal_event/__openerp__.py
deleted file mode 100644
index 88ca9815323..00000000000
--- a/addons/portal_event/__openerp__.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# -*- 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.
-    """,
-    'update_xml': [
-        'security/portal_event_security.xml',
-        'security/ir.model.access.csv',
-    ],    
-    'website': 'http://www.openerp.com',
-    'installable': True,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/addons/portal_event/portal_event.py b/addons/portal_event/portal_event.py
deleted file mode 100644
index 570bd3131b6..00000000000
--- a/addons/portal_event/portal_event.py
+++ /dev/null
@@ -1,47 +0,0 @@
-# -*- 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/>.
-#
-##############################################################################
-
-import time
-from osv import fields, osv
-from tools.translate import _
-
-class event_event(osv.osv):
-    _inherit = 'event.event'
-
-    def make_quotation(self, cr, uid, ids, context=None):
-        event_pool = self.pool.get('event.event')
-        register_pool = self.pool.get('event.registration')
-        sale_order_line_pool = self.pool.get('sale.order.line')
-        sale_order = self.pool.get('sale.order')
-        partner_pool = self.pool.get('res.partner')
-        prod_pricelist_obj = self.pool.get('product.pricelist')
-        res_users_obj = self.pool.get('res.users')
-        user = res_users_obj.browse(cr, uid, uid, context=context)
-        partner_ids = partner_pool.search(cr, uid, [('name', '=', user.name), ('email', '=', user.user_email)])
-        if partner_ids:
-            res_users_obj.write(cr, uid, user.id, {'partner_id': partner_ids[0]})        
-        if not partner_ids:
-              raise osv.except_osv(_('Error !'),
-                                    _('There is no Partner defined ' \
-                                            'for this event:'))
-        res = super(event_event,self).make_quotation(cr, uid, ids, context)              
-
-        return res
diff --git a/addons/portal_event/security/ir.model.access.csv b/addons/portal_event/security/ir.model.access.csv
deleted file mode 100644
index 0b3dfe5f3b2..00000000000
--- a/addons/portal_event/security/ir.model.access.csv
+++ /dev/null
@@ -1,6 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_event,event,event.model_event_event,portal_event.group_event_portal,1,0,0,0
-access_registration,registration,event.model_event_registration,portal_event.group_event_portal,1,0,0,0
-access_event_items,event.items,event.model_event_event,portal_event.group_event_portal,1,1,1,0
-access_product_product,product.product,product.model_product_product,portal_event.group_event_portal,1,0,0,0
-access_product_uom,product.uom,product.model_product_uom,portal_event.group_event_portal,1,0,0,0
\ No newline at end of file
diff --git a/addons/portal_event/security/portal_event_security.xml b/addons/portal_event/security/portal_event_security.xml
deleted file mode 100644
index 1202fcce3f5..00000000000
--- a/addons/portal_event/security/portal_event_security.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data>
-    
-        <!-- Creating Portal Group -->
-        
-        <record id="group_event_portal" model="res.groups">
-            <field name="name">Event Portal Groups</field>
-            <field ref="event.module_category_event_management" name="category_id"/>
-        </record>
-        
-        <record id="portal_event" model="res.portal">
-            <field name="name">Portal User</field>
-            <field name="group_id" ref="group_event_portal"/>
-        </record>
-            
-        <!-- Sale Portal Access Rules -->
-        <record id="portal_event_rule" model="ir.rule">
-            <field name="name">Personal Events</field>
-            <field ref="event.model_event_event" name="model_id"/>
-            <field name="domain_force">[]</field>
-            <field name="groups" eval="[(4, ref('group_event_portal'))]"/>
-        </record>
-        
-        <record id="portal_registration_rule" model="ir.rule">
-            <field name="name">Personal Registrations</field>
-            <field ref="event.model_event_registration" name="model_id"/>
-            <field name="domain_force">[('partner_id.email','=',user.login)]</field>
-            <field name="groups" eval="[(4, ref('group_event_portal'))]"/>
-        </record>        
-        
-    </data>
-</openerp>
\ No newline at end of file

From f80dd759f0102df2ba649704f5d97f0ca66d6f2c Mon Sep 17 00:00:00 2001
From: "Atul Patel (OpenERP)" <atp@tinyerp.com>
Date: Wed, 23 May 2012 19:22:37 +0530
Subject: [PATCH 34/38] [REM]: Remove duplicate page view

bzr revid: atp@tinyerp.com-20120523135237-xylcrrkiod620sve
---
 addons/event/event_view.xml | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index e0d7badd1b4..0866dd876af 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -163,29 +163,6 @@
                             </form>
                             </field>
                     </page>
-
-                    <page string="Speakers">
-                        <field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
-                        <field name="speaker_confirmed"/>
-                        <separator string="Other Speakers" colspan="4"/>
-                        <field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
-                    </page>
-                    <page string="Extra Info">
-                        <group col="2" colspan="2">
-                            <separator string="Registrations" colspan="2"/>
-                            <field name="register_min"/>
-                            <field name="register_max"/>
-                            <field name="register_prospect"/>
-                            <field name="register_current"/>
-                            <field name="register_attended"/>
-                        </group>
-                        <group col="2" colspan="2">
-                            <separator string="Emails" colspan="2"/>
-                            <field name="reply_to"/>
-                            <field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
-                            <field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
-                        </group>
-                    </page>
                     </notebook>
             </sheet>
             </form>

From 7a70637b1000d5975067cc3eaa8685a407c03136 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 25 May 2012 09:28:29 +0200
Subject: [PATCH 35/38] [IMP] layout

bzr revid: fp@tinyerp.com-20120525072829-34lyox1jl60ffye8
---
 addons/event/event_view.xml           |  6 +-
 addons/event/static/src/css/event.css | 80 +--------------------------
 2 files changed, 5 insertions(+), 81 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b4932254d86..4cebf3dd309 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -206,14 +206,14 @@
                             </p>
                             <t t-if="record.register_avail.raw_value != 0">
                               <t t-if="!record.is_subscribed.raw_value">
-                                  <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1"   onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
-                                  <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
+                                  <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
+                                  <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_mail_button_follow">
                                   <span >Subscribe</span>
                                   </button>
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
-                              <button type="object" name="unsubscribe_to_event" class="unsubscribe_button oe_event_button_unsubscribe">
+                              <button type="object" name="unsubscribe_to_event" class="oe_mail_button_unfollow">
                                 <span>Subscribed</span>
                                 <span class="unsubscribe">Unsubscribe</span>
                               </button>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index e637bc56c65..8602ea24d53 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -29,63 +29,11 @@
   color: #FFFFFF;
   background-color: #8A89BA;
 }
-div.oe_fold_column{
-  padding:0px !important;
-}
-.oe_event_button_subscribe {
-  color: white;
-  background-color: #8a89ba;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
-  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);
-}
 
-.oe_event_button_unsubscribe {
-  color: white;
-  background-color: #8a89ba;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(#8a89ba), to(#807fb4));
-  background-image: -webkit-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -moz-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -ms-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: -o-linear-gradient(top, #8a89ba, #807fb4);
-  background-image: linear-gradient(to bottom, #8a89ba, #807fb4);;
-}
-.oe_event_button_subscribe:hover {
-  cursor: pointer;
-  background-size: 100% 100%;
-  /*background: #DC5F59 none;*/
-
-}
-.oe_event_button_unsubscribe:hover {
-   cursor: pointer;
-   background-size: 100% 100%;
-   background: #DC5F59 none;
- }
- .unsubscribe, .unsubscribe_button:hover span {
-   display: none;
-   background-color: #DC5F59
- }
- .unsubscribe_button:hover .unsubscribe {
-   display: inline;
-   background-color: #DC5F59;
- }
- .no_of_seats{
+.no_of_seats{
     width:35px;
-    
- }
- .oe_event_title{
-  font-size: 25px;
-}
-.oe_sub1
-{
-    float:left;
-    height:50px;
-    border-right: 1px solid black;
-    border-color: #DCDCDC;
 }
+
 .oe_mapbox
 { 
     position: relative;
@@ -95,27 +43,3 @@ div.oe_fold_column{
     border: 1px solid #eeeeee;
 }
 
-.oe_td_border
-{
-    width: 7em;
-    padding: 5px;
-    border-right: 1px solid black;
-    text-align: right;
-    border-color: #DCDCDC;
-    border-spacing:5em
-}
-.oe_td_date_border
-{
-    border-right:1px solid black;
-    border-color: #DCDCDC;
-}
-
-textarea.field_text
-{
-    width: 765px;
-    height: 318px;
-}
-td.oe_form_group_nested
-{
-    padding: 5px;
-}

From cdd8b9d47ad3fcd9aeb2279c05a0725ba68dad62 Mon Sep 17 00:00:00 2001
From: Fabien Pinckaers <fp@tinyerp.com>
Date: Fri, 25 May 2012 15:43:06 +0200
Subject: [PATCH 36/38] [IMP] merge events

bzr revid: fp@tinyerp.com-20120525134306-3lz3127527hyly77
---
 addons/event/event.py                    |  6 ------
 addons/event/event_view.xml              | 13 +++++++------
 addons/event/static/src/js/google_map.js | 14 ++++++++++----
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index bebddb34d17..f01caac175f 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -210,12 +210,6 @@ class event_event(osv.osv):
         'note': fields.text('Description', readonly=False, states={'done': [('readonly', True)]}),
         'company_id': fields.many2one('res.company', 'Company', required=False, change_default=True, readonly=False, states={'done': [('readonly', True)]}),
         'is_subscribed' : fields.function(_subscribe_fnc, type="boolean", string='Subscribed'),
-        'city': fields.related('address_id', 'city', type='char', string='City'),
-        'street': fields.related('address_id', 'street', type='char', string='Street'),
-        'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'),
-        'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'),
-        'zip': fields.related('address_id','zip', type="char", string="Zip"),      
-      
     }
     _defaults = {
         'state': 'draft',
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 4cebf3dd309..190445d6c20 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -64,16 +64,17 @@
                 <sheet layout="auto">
 
                 <field name="name" required="1" nolabel="1" class="oe_form_title" colspan="4"/>
-                <group colspan="4" col="3">
-                    <group colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
+                <group colspan="4" col="5">
+                    <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
                         <field name="type" on_change="onchange_event_type(type,context)"/>
-                        <field name="date_begin"/>
                         <field name="user_id"/>
-                        <field name="date_end"/>
                         <field name="address_id" widget ="many2one_Geo_address"/>
+                        <field name="address"/>
+                    </group>
+                    <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
+                        <field name="date_begin"/>
+                        <field name="date_end"/>
                         <field name="register_min"/>
-                        <label string=""/>
-                        <field name="street" nolabel="1"/>
                         <field name="register_max"/>
                     </group>
                     <div id="oe_mapbox" class="oe_mapbox"></div>
diff --git a/addons/event/static/src/js/google_map.js b/addons/event/static/src/js/google_map.js
index 7d2681a7369..4a02086b85a 100644
--- a/addons/event/static/src/js/google_map.js
+++ b/addons/event/static/src/js/google_map.js
@@ -1,4 +1,4 @@
-openerp.event = function(instance){
+openerp.event = function(instance) {
     instance.web.form.widgets.add('many2one_Geo_address', 'instance.event.Many2OneAddress');
     
     instance.web.GoogleMapConnector = instance.web.Class.extend({
@@ -48,8 +48,14 @@ openerp.event = function(instance){
             }
             (value instanceof Array)?value = parseInt(value[0]):false;
             var data = new instance.web.DataSet(this,this.field.relation, this.build_context());
-            data.read_ids(value,["street","city","country_id"]).done(function(value){
-                var address = _.str.sprintf(' %(street)s, %(city)s, %(country_id[1])s', value);
+            data.read_ids(value,["street","city","zip","country_id"]).done(function(value){
+                var address;
+                if value['country_id'] {
+                    address = _.str.sprintf('%(street)s, %(zip)s %(city)s, %(country_id[1])s', value);
+                } else {
+                    address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
+                }
+
                 self.map.googleMapsLoaded.done(function(){
                     self.map.render_map(address,document.getElementById("oe_mapbox"));
                 })
@@ -65,4 +71,4 @@ openerp.event = function(instance){
             this._super(no_recurse);
         }
     });
-};
\ No newline at end of file
+};

From df59b0b7d2146d5d8b2a88e19e79f1a24f07bfce Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 25 May 2012 21:11:27 +0200
Subject: [PATCH 37/38] [FIX] google map on event part1

bzr revid: al@openerp.com-20120525191127-v5o88etlbdq0jbzn
---
 addons/event/__openerp__.py                      |  3 +--
 addons/event/event_view.xml                      |  4 ++--
 addons/google_map/__openerp__.py                 |  1 +
 addons/google_map/google_map_view.xml            |  3 +--
 .../static/src/js/google_map.js                  | 16 +++++++---------
 5 files changed, 12 insertions(+), 15 deletions(-)
 rename addons/{event => google_map}/static/src/js/google_map.js (85%)

diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py
index c491dd06138..f1a9769f803 100644
--- a/addons/event/__openerp__.py
+++ b/addons/event/__openerp__.py
@@ -39,7 +39,7 @@ Note that:
         Association / Configuration / Types of Events
 """,
     'author': 'OpenERP SA',
-    'depends': ['email_template'],
+    'depends': ['email_template','google_map'],
     'init_xml': [],
     'update_xml': [
         'security/event_security.xml',
@@ -53,7 +53,6 @@ Note that:
     ],
     'demo_xml': ['event_demo.xml'],
     'test': ['test/process/event_draft2done.yml'],
-    'js': ['static/src/js/google_map.js'],
     'css': ['static/src/css/event.css'],
     'installable': True,
     'application': True,
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 190445d6c20..69d0135d091 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -68,7 +68,7 @@
                     <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
                         <field name="type" on_change="onchange_event_type(type,context)"/>
                         <field name="user_id"/>
-                        <field name="address_id" widget ="many2one_Geo_address"/>
+                        <field name="address_id" widget ="many2one_address_google_map" widget_option="{'placeholder':'.oe_form_google_map'}"/>
                         <field name="address"/>
                     </group>
                     <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
@@ -77,7 +77,7 @@
                         <field name="register_min"/>
                         <field name="register_max"/>
                     </group>
-                    <div id="oe_mapbox" class="oe_mapbox"></div>
+                    <div class="oe_form_google_map"></div>
                 </group>
 
                 <notebook colspan="4">
diff --git a/addons/google_map/__openerp__.py b/addons/google_map/__openerp__.py
index 8aa1b60ca88..a6e85c3cd66 100644
--- a/addons/google_map/__openerp__.py
+++ b/addons/google_map/__openerp__.py
@@ -38,6 +38,7 @@ Using this you can directly open Google Map from the URL widget.""",
                    'google_map_view.xml',
                   ],
     'demo_xml': [],
+    'js': ['static/src/js/google_map.js'],
     'installable': True,
     'auto_install': False,
     'certificate': '0029498930765',
diff --git a/addons/google_map/google_map_view.xml b/addons/google_map/google_map_view.xml
index 4cd7e4ad7c4..eda86a0662f 100644
--- a/addons/google_map/google_map_view.xml
+++ b/addons/google_map/google_map_view.xml
@@ -12,8 +12,7 @@
                         <label string="Street2 : " align="1.0"/>
                         <group colspan="1" col="2">
                         <field name="street2" nolabel="1"/>
-                        <button name="open_map"
-                           string="Map" type="object" icon="gtk-zoom-in"/>
+                        <button name="open_map" string="Map" type="object" icon="gtk-zoom-in"/>
                         </group>
                     </field>
                 </field>
diff --git a/addons/event/static/src/js/google_map.js b/addons/google_map/static/src/js/google_map.js
similarity index 85%
rename from addons/event/static/src/js/google_map.js
rename to addons/google_map/static/src/js/google_map.js
index 4a02086b85a..cec51510fe2 100644
--- a/addons/event/static/src/js/google_map.js
+++ b/addons/google_map/static/src/js/google_map.js
@@ -1,7 +1,7 @@
-openerp.event = function(instance) {
-    instance.web.form.widgets.add('many2one_Geo_address', 'instance.event.Many2OneAddress');
-    
-    instance.web.GoogleMapConnector = instance.web.Class.extend({
+openerp.event = function(instance, mod) {
+    instance.web.form.widgets.add('many2one_address_google_map', 'instance.event.Many2OneAddress');
+
+    instance.google_map.GoogleMapConnector = instance.web.Class.extend({
         init: function(){
             this.googleMapsLoaded = $.Deferred();
             this.map_load();
@@ -36,10 +36,10 @@ openerp.event = function(instance) {
             });
         },
     });
-    instance.event.Many2OneAddress = instance.web.form.FieldMany2One.extend({
+    instance.google_map.Many2OneAddress = instance.web.form.FieldMany2One.extend({
         init: function(field_manager, node){
           this._super(field_manager, node);
-          this.map = new instance.web.GoogleMapConnector(); 
+          this.map = new instance.google_map.GoogleMapConnector(); 
         },
         get_address:function(value){
             var self = this;
@@ -55,9 +55,8 @@ openerp.event = function(instance) {
                 } else {
                     address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
                 }
-
                 self.map.googleMapsLoaded.done(function(){
-                    self.map.render_map(address,document.getElementById("oe_mapbox"));
+                    self.map.render_map(address,self.$(self.options.selector)[0]);
                 })
             });
         },
@@ -65,7 +64,6 @@ openerp.event = function(instance) {
             this._super(value);
             this.get_address(value);
         },
-
         render_value:function(no_recurse){
             this.get_address(this.get("value"));
             this._super(no_recurse);

From 879b4a37c65975c5c615a1d52f2f39dc8923c66a Mon Sep 17 00:00:00 2001
From: Antony Lesuisse <al@openerp.com>
Date: Fri, 25 May 2012 22:03:26 +0200
Subject: [PATCH 38/38] [FIX] event and google map ok

bzr revid: al@openerp.com-20120525200326-0cfysbpcnlk2agyn
---
 addons/event/event_view.xml                   |  9 +--
 addons/google_map/static/src/js/google_map.js | 69 ++++++++++---------
 2 files changed, 41 insertions(+), 37 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 69d0135d091..6c4fada6621 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -61,15 +61,15 @@
                     </div>
                     <div class="oe_clear"/>
                 </div>
-                <sheet layout="auto">
+                <sheet layout="manual">
+
 
                 <field name="name" required="1" nolabel="1" class="oe_form_title" colspan="4"/>
                 <group colspan="4" col="5">
                     <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
                         <field name="type" on_change="onchange_event_type(type,context)"/>
                         <field name="user_id"/>
-                        <field name="address_id" widget ="many2one_address_google_map" widget_option="{'placeholder':'.oe_form_google_map'}"/>
-                        <field name="address"/>
+                        <field name="address_id" widget="many2one_address_google_map" widget_option="{'placeholder':'.oe_form_google_map'}"/>
                     </group>
                     <group col="2" colspan="2" class="oe_form_group_label_border" style="margin-top: 20px;">
                         <field name="date_begin"/>
@@ -77,9 +77,10 @@
                         <field name="register_min"/>
                         <field name="register_max"/>
                     </group>
-                    <div class="oe_form_google_map"></div>
                 </group>
 
+                <div class="oe_form_google_map" style="height: 200px"></div>
+
                 <notebook colspan="4">
                     <page string="Event Description">
                         <field name="note" colspan="4" nolabel="1"/>
diff --git a/addons/google_map/static/src/js/google_map.js b/addons/google_map/static/src/js/google_map.js
index cec51510fe2..9aa693e53c6 100644
--- a/addons/google_map/static/src/js/google_map.js
+++ b/addons/google_map/static/src/js/google_map.js
@@ -1,45 +1,48 @@
 openerp.event = function(instance, mod) {
-    instance.web.form.widgets.add('many2one_address_google_map', 'instance.event.Many2OneAddress');
+    instance.web.form.widgets.add('many2one_address_google_map', 'instance.google_map.Many2OneAddress');
+
+    var googleMapsLoaded = null;
 
     instance.google_map.GoogleMapConnector = instance.web.Class.extend({
-        init: function(){
-            this.googleMapsLoaded = $.Deferred();
-            this.map_load();
-        },
         map_load: function() {
             var self = this;
-            if(this.googleMapsLoaded.state() != "pending"){return this.googleMapsLoaded.promise();}
-                googleMapsCallback = function () {
-                self.googleMapsLoaded.resolve();
-            };
-            $.ajax({
-                url: "https://maps.googleapis.com/maps/api/js?v=3&callback=googleMapsCallback&sensor=false",
-                dataType: "script"
-            }).fail(self.googleMapsLoaded.reject);
-            return this.googleMapsLoaded.promise();
+            if(googleMapsLoaded === null) {
+                googleMapsLoaded = $.Deferred();
+                // global
+                openerp_googleMapsCallback = googleMapsLoaded.resolve;
+                $.ajax({
+                    url: "https://maps.googleapis.com/maps/api/js?v=3&callback=openerp_googleMapsCallback&sensor=false",
+                    dataType: "script"
+                }).fail(googleMapsLoaded.reject);
+            }
+            return googleMapsLoaded;
         },
-        render_map: function(address,$element){
-            var geocoder = new google.maps.Geocoder();
-            geocoder.geocode( { 'address': address}, function(results, status){
-                if (status == google.maps.GeocoderStatus.OK){
-                    var lat = results[0].geometry.location.lat(),lng =results[0].geometry.location.lng();
-                    var myOptions = {
-                    zoom: 17,
-                    center:  new google.maps.LatLng(lat,lng),
-                    mapTypeId: google.maps.MapTypeId.ROADMAP
-                }
-                return new google.maps.Marker({
-                    map : new google.maps.Map($element,myOptions),
-                    position: new google.maps.LatLng(lat,lng)
+        render_map: function(address,element) {
+            this.map_load().then(function() {
+                var geocoder = new google.maps.Geocoder();
+                geocoder.geocode({'address': address}, function(results, status) {
+                    if (status == google.maps.GeocoderStatus.OK) {
+                        var lat = results[0].geometry.location.lat();
+                        var lng = results[0].geometry.location.lng();
+                        var myOptions = {
+                            zoom: 17,
+                            center: new google.maps.LatLng(lat,lng),
+                            mapTypeId: google.maps.MapTypeId.ROADMAP
+                        };
+                        var map = new google.maps.Map(element,myOptions);
+                        var position = new google.maps.LatLng(lat,lng);
+                        var marker = new google.maps.Marker({ map: map, position: position });
+                        return marker;
+                    }
                 });
-                }
             });
         },
     });
+
     instance.google_map.Many2OneAddress = instance.web.form.FieldMany2One.extend({
         init: function(field_manager, node){
           this._super(field_manager, node);
-          this.map = new instance.google_map.GoogleMapConnector(); 
+          this.map = new instance.google_map.GoogleMapConnector();
         },
         get_address:function(value){
             var self = this;
@@ -50,14 +53,14 @@ openerp.event = function(instance, mod) {
             var data = new instance.web.DataSet(this,this.field.relation, this.build_context());
             data.read_ids(value,["street","city","zip","country_id"]).done(function(value){
                 var address;
-                if value['country_id'] {
+                if (value['country_id']) {
                     address = _.str.sprintf('%(street)s, %(zip)s %(city)s, %(country_id[1])s', value);
                 } else {
                     address = _.str.sprintf('%(street)s, %(zip)s %(city)s', value);
                 }
-                self.map.googleMapsLoaded.done(function(){
-                    self.map.render_map(address,self.$(self.options.selector)[0]);
-                })
+                // TODO repalce by widget_option selector self.options.selector
+                var el = self.view.$element.find(".oe_form_google_map")[0];
+                self.map.render_map(address,el);
             });
         },
         set_value:function(value){