Mayur Maheshwari(OpenERP) has proposed merging
lp:~openerp-dev/openobject-addons/trunk-terminology_event-mma into
lp:openobject-addons.
Requested reviews:
Purnendu Singh (OpenERP) (psi-tinyerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-terminology_event-mma/+merge/128655
Hello
I have improved string as par terminology pad event section specification
and also fix the kanban issue when 0 tickets are available, it doesn’t show "No
tickets available" and just say “tickets available".
thanks
Mayur
--
https://code.launchpad.net/~openerp-dev/openobject-addons/trunk-terminology_event-mma/+merge/128655
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openobject-addons/trunk-terminology_event-mma.
=== modified file 'event/event_view.xml'
--- event/event_view.xml 2012-10-13 10:40:45 +0000
+++ event/event_view.xml 2012-10-15 11:33:22 +0000
@@ -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 -->
@@ -221,7 +221,7 @@
<field name="arch" type="xml">
<tree string="Events" fonts="bold:message_unread==True" colors="red:(register_min and register_min>register_current) or (register_max and register_max<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"/>
@@ -269,17 +269,17 @@
<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>
- <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 lte 1">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">
=== modified file 'event_moodle/wizard_moodle.xml'
--- event_moodle/wizard_moodle.xml 2012-09-16 11:42:49 +0000
+++ event_moodle/wizard_moodle.xml 2012-10-15 11:33:22 +0000
@@ -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>
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
