diff options
| author | Mahendra barad <mba@openerp.com> | 2015-11-04 15:34:15 +0530 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2016-06-13 15:16:31 +0200 |
| commit | 703ccb998615fc3ee3f207c4b0ed70a52fcef92a (patch) | |
| tree | 10c9456212b943c2a0e05fa5dbb02e2f86fe2a7a /addons | |
| parent | 25504cc11f2a579b94d95d0586c5b40cd275292f (diff) | |
[ADD] event: option to install event_barcode
New Enterprise module
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/event/models/event_config_settings.py | 2 | ||||
| -rw-r--r-- | addons/event/views/event_config_settings_views.xml | 7 | ||||
| -rw-r--r-- | addons/event_sale/report/event_event_templates.xml | 16 |
3 files changed, 18 insertions, 7 deletions
diff --git a/addons/event/models/event_config_settings.py b/addons/event/models/event_config_settings.py index 74782937d3b..ca9210caad4 100644 --- a/addons/event/models/event_config_settings.py +++ b/addons/event/models/event_config_settings.py @@ -32,6 +32,8 @@ class event_config_settings(osv.TransientModel): ], "Email Scheduling", help='You will be able to configure emails, and to schedule them to be automatically sent to the attendees on registration and/or attendance', implied_group='event.group_email_scheduling'), + 'module_event_barcode': fields.boolean("Scan badges to confirm attendances", + help="Install the event_barcode module"), } def set_default_auto_confirmation(self, cr, uid, ids, context=None): diff --git a/addons/event/views/event_config_settings_views.xml b/addons/event/views/event_config_settings_views.xml index 44537e24c35..3f929febb44 100644 --- a/addons/event/views/event_config_settings_views.xml +++ b/addons/event/views/event_config_settings_views.xml @@ -17,6 +17,11 @@ <field name="module_website_event_questions" widget="radio"/> <field name="auto_confirmation" widget="radio"/> <field name="group_email_scheduling" widget="radio"/> + <label for="id" string="Barcode Interface"/> + <div class="o_row"> + <field name="module_event_barcode" widget="upgrade_boolean"/> + <label for="module_event_barcode"/> + </div> </group> </form> </field> @@ -30,6 +35,6 @@ </record> <menuitem id="menu_event_global_settings" name="Settings" - parent="menu_event_configuration" sequence="0" action="action_event_configuration" groups="base.group_no_one"/> + parent="menu_event_configuration" sequence="0" action="action_event_configuration" groups="base.group_system"/> </data> </openerp> diff --git a/addons/event_sale/report/event_event_templates.xml b/addons/event_sale/report/event_event_templates.xml index 850f8fbdf8d..ddeecdd322a 100644 --- a/addons/event_sale/report/event_event_templates.xml +++ b/addons/event_sale/report/event_event_templates.xml @@ -2,17 +2,21 @@ <odoo> <template id="event_registration_report_template_badge" inherit_id="event.event_registration_report_template_badge"> - <xpath expr="//div[@id='o_event_name']" position="after"> - <div t-if="o.event_ticket_id" class="col-xs-12 mt32 text-center" style="background: lightgrey; height: 65px"> - <h3><span t-field="o.event_ticket_id"/></h3> + <xpath expr="//div[@id='o_event_name']" position="inside"> + <div t-if="o.event_ticket_id" class="col-xs-12 text-center" style="padding:0px;"> + <div style="background: lightgrey; height: 65px;" class="mt16 text-center"> + <h3><span t-field="o.event_ticket_id"/></h3> + </div> </div> </xpath> </template> <template id="event_event_report_template_badge" inherit_id="event.event_event_report_template_badge"> - <xpath expr="//div[@id='o_event_attendee_name']" position="after"> - <div t-if="bool(len(event.event_ticket_ids))" class="col-xs-12 mt16 text-center" style="background: lightgrey; height: 65px;" t-ignore="true"> - <h3>Ticket Type</h3> + <xpath expr="//div[@id='o_event_attendee_name']" position="inside"> + <div t-if="bool(len(event.event_ticket_ids))" class="col-xs-12" style="padding: 0px;" t-ignore="true"> + <div style="background: lightgrey; height: 65px;" class="mt16 text-center"> + <h3>Ticket Type</h3> + </div> </div> </xpath> </template> |