From a4fe575abc4a6b74a9e3d38fce6a3755c52f8096 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 9 Oct 2012 11:31:37 +0530
Subject: [PATCH 1/4] [IMP]event : improve string

bzr revid: mma@tinyerp.com-20121009060137-tuaclaj2dm8vr8x0
---
 addons/event/event_view.xml           | 4 ++--
 addons/event_moodle/wizard_moodle.xml | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index b46fafe270f..e31e3c3d0cf 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -15,7 +15,7 @@
             id="event_main_menu"
             groups="base.group_user"
             sequence="80"/>
-        <menuitem name="Events Organisation" id="base.menu_event_main" parent="event_main_menu"/>
+        <menuitem name="Events Organization" id="base.menu_event_main" parent="event_main_menu"/>
 
         <!-- EVENTS  -->
 
@@ -223,7 +223,7 @@
             <field name="arch" type="xml">
                 <tree string="Events" fonts="bold:message_unread==True" colors="red:(register_min and register_min&gt;register_current) or (register_max and register_max&lt;register_current);grey:state=='cancel'">
                     <field name="name" string="Name"/>
-                    <field name="type"/>
+                    <field name="type" string="Event Category"/>
                     <field name="date_begin"/>
                     <field name="date_end"/>
                     <field name="register_current"/>
diff --git a/addons/event_moodle/wizard_moodle.xml b/addons/event_moodle/wizard_moodle.xml
index 6eda25fcc4d..8dbe5d485f9 100644
--- a/addons/event_moodle/wizard_moodle.xml
+++ b/addons/event_moodle/wizard_moodle.xml
@@ -8,7 +8,7 @@
                 <form string="Configure Moodle" version="7.0">
                     <header>
                         <button type="object" name="configure_moodle"
-                            string="Configure Moodle" class="oe_highlight"  />
+                            string="Apply" class="oe_highlight"  />
                             or
                             <button string="Cancel" class="oe_link" special="cancel" />
                     </header>
@@ -16,12 +16,12 @@
                      <separator string="Server" colspan="4"/>
                      <field name="server_moodle"/>
                      <newline/>
-                     <separator string="Connexion with a Token" colspan="4"/>
+                     <separator string="Connection with a Token" colspan="4"/>
                      <label string="The easiest way to connect OpenERP with a moodle server is to create a 'token' in Moodle. It will be used to authenticate OpenERP as a trustable application." colspan="4"/>
                      <field name="moodle_token"/>
                      <newline/>
-                     <separator string="Connexion with Password and Username" colspan="4"/>
-                     <label string="Another approach is to create a user for OpenERP in Moodle. If you do so, make sure that this user has enough access rights" colspan="4"/>
+                     <separator string="Connection with username and password" colspan="4"/>
+                     <label string="Another approach is to create a user for OpenERP in Moodle. If you do so, make sure that this user has appropriate access rights." colspan="4"/>
                      <field name="moodle_username"/>
                      <field name="moodle_password"/>
                     </group>

From 91b257b0e8cd27aa63ab86cf498b8c67ae1f4b47 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Tue, 9 Oct 2012 14:31:58 +0530
Subject: [PATCH 2/4] [IMP]event : improve kanban view tickets condition

bzr revid: mma@tinyerp.com-20121009090158-btfq6ypk6f7wio41
---
 addons/event/event_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index e31e3c3d0cf..5f14c354f53 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -271,8 +271,8 @@
                               <t t-if="record.country_id.raw_value">@<field name="country_id"/><br/></t>
                               <t t-if="record.user_id.raw_value">Organized by <field name="user_id"/><br/></t>
                               <t t-if="record.register_avail.raw_value lte 10 and record.register_avail.raw_value gt 0"><i>Only</i></t>
-                              <t t-if="record.register_avail.raw_value == 0"><i>No ticket available.</i></t>
-                              <t t-if="record.register_avail.raw_value != 0">
+                              <t t-if="record.register_avail.raw_value == 9999"><i>No ticket available.</i></t>
+                              <t t-if="record.register_avail.raw_value != 9999">
                                 <i><b><t t-if="record.register_avail.raw_value != 9999"><field name="register_avail"/></t></b></i>
                                 <i>
                                     <t t-if="record.register_avail.raw_value > 1">tickets </t>

From e479d6a05d6e94dfcfbc89af5c784b7b55954f0d Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 15 Oct 2012 16:41:10 +0530
Subject: [PATCH 3/4] [IMP]event : improve kanaban button condition

bzr revid: mma@tinyerp.com-20121015111110-wvbw3rg54s2c6u3k
---
 addons/event/event_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index cebc297c6a1..81984637137 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -274,12 +274,12 @@
                                 <i><b><t t-if="record.register_avail.raw_value != 9999"><field name="register_avail"/></t></b></i>
                                 <i>
                                     <t t-if="record.register_avail.raw_value > 1">tickets </t>
-                                    <t t-if="record.register_avail.raw_value == 1 || !record.register_avail.raw_value > 1">ticket </t>
+                                    <t t-if="record.register_avail.raw_value == 1 || !record.register_avail.raw_value > 0">ticket </t>
                                     available.
                                 </i>
                               </t>
                             </p>
-                            <t t-if="record.register_avail.raw_value != 0">
+                            <t t-if="record.register_avail.raw_value gt 0 and  record.register_avail.raw_value lt 9999">
                               <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="oe_subscribe_button">

From 3a38ecd3c2febaa6aa5d7c9ff2127a8589cdd206 Mon Sep 17 00:00:00 2001
From: "Mayur Maheshwari (OpenERP)" <mma@tinyerp.com>
Date: Mon, 15 Oct 2012 17:00:22 +0530
Subject: [PATCH 4/4] [IMP]event : improve kanaban button condition

bzr revid: mma@tinyerp.com-20121015113022-um8ursgf4mzwvskl
---
 addons/event/event_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index 81984637137..92d88024d08 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -274,12 +274,12 @@
                                 <i><b><t t-if="record.register_avail.raw_value != 9999"><field name="register_avail"/></t></b></i>
                                 <i>
                                     <t t-if="record.register_avail.raw_value > 1">tickets </t>
-                                    <t t-if="record.register_avail.raw_value == 1 || !record.register_avail.raw_value > 0">ticket </t>
+                                    <t t-if="record.register_avail.raw_value lte 1">ticket </t>
                                     available.
                                 </i>
                               </t>
                             </p>
-                            <t t-if="record.register_avail.raw_value gt 0 and  record.register_avail.raw_value lt 9999">
+                            <t t-if="record.register_avail.raw_value gt 0 and record.register_avail.raw_value lt 9999">
                               <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="oe_subscribe_button">