From a1aa3651eb3ffc1af0e2f6317fb9b9a2347e10b5 Mon Sep 17 00:00:00 2001
From: "Vir (Open ERP)" <vir@tinyerp.com>
Date: Fri, 2 Jul 2010 14:02:50 +0530
Subject: [PATCH] [IMP] event, subscription : Usability improvements

bzr revid: vir@tinyerp.com-20100702083250-k0x6clkog8iqjo6f
---
 addons/event/event.py                     |  6 ++++++
 addons/event/event_view.xml               | 12 +++++++++++-
 addons/subscription/subscription.py       |  3 ++-
 addons/subscription/subscription_view.xml |  4 ++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/addons/event/event.py b/addons/event/event.py
index 8bd6d9ae1a5..e3398ad6ea5 100644
--- a/addons/event/event.py
+++ b/addons/event/event.py
@@ -176,6 +176,12 @@ class event_event(osv.osv):
         'note': fields.text('Notes', help="Description or Summary of Event"),
         'currency_id': fields.many2one('res.currency', 'Currency', required=True, readonly=True, states={'draft':[('readonly',False)]}),
         "unit_price": fields.float('Cost'),
+        'partner_id': fields.many2one('res.partner','Teacher'),
+        'address_id': fields.many2one('res.partner.address','Location Room'),
+        'teacher_confirmed': fields.boolean('Teacher Confirmed'),
+        'country_id': fields.related('address_id', 'country_id',
+                    type='many2one', relation='res.country', string='Country'),
+
         
     }
 
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b21165b110b..20047d00f73 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -57,6 +57,11 @@
                     <page string="General">
                         <field name="unit_price"/>
                         <field name="currency_id"/>
+                        <separator string="Teacher Information" colspan="4"/>
+                        <field name="partner_id"/>
+                        <field name="address_id"/>
+                        <field name="teacher_confirmed"/>
+                        <field name="country_id" />
                         <separator string="Event description" colspan="4"/>
                         <field name="parent_id" domain="[('parent_id','child_of','Event')]"/>
                         <field name="active"/>
@@ -97,6 +102,10 @@
                         <field name="register_current"/>
                         <field name="register_prospect"/>
                     </page>
+                    <page string="Notes">
+                        <separator string="Notes" colspan="4"/>
+                        <field name="note" colspan="4" nolabel="1"/>
+                    </page>
                     </notebook>
             </form>
             </field>
@@ -129,7 +138,8 @@
             <field name="arch" type="xml">
                 <calendar color="user_id" date_start="date_begin" string="Event Organization">
                     <field name="name"/>
-                    <field name="type"/>
+                    <field name="partner_id"/>
+                    <field name="type" widget="selection"/>
                 </calendar>
             </field>
         </record>
diff --git a/addons/subscription/subscription.py b/addons/subscription/subscription.py
index b05bf099d09..934f1a42707 100644
--- a/addons/subscription/subscription.py
+++ b/addons/subscription/subscription.py
@@ -79,7 +79,8 @@ class subscription_subscription(osv.osv):
         'state': fields.selection([('draft','Draft'),('running','Running'),('done','Done')], 'State'),
         'doc_source': fields.reference('Source Document', required=True, selection=_get_document_types, size=128),
         'doc_lines': fields.one2many('subscription.subscription.history', 'subscription_id', 'Documents created', readonly=True),
-        'cron_id': fields.many2one('ir.cron', 'Cron Job')
+        'cron_id': fields.many2one('ir.cron', 'Cron Job'),
+        'note': fields.text('Notes', help="Description or Summary of Subscription"),
     }
     _defaults = {
         'date_init': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S'),
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index 695f9b00895..f13565b56a6 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -42,6 +42,10 @@
                         <page string="Documents created">
                             <field colspan="4" name="doc_lines" nolabel="1" widget="one2many_list"/>
                         </page>
+                        <page string="Notes">
+                            <separator string="Notes" colspan="4"/>
+                            <field name="note" colspan="4" nolabel="1"/>
+                    </page>
                     </notebook>
                 </form>
             </field>