From 620e5271166ddb4dd1aa99a139b2df5b9f2319eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thibault=20Delavall=C3=A9e?= Date: Tue, 24 Sep 2013 12:26:51 +0200 Subject: [PATCH] [IMP] website_event: removed description_website, now using standard description field. Cleaned demo data. bzr revid: tde@openerp.com-20130924102651-fym6t9mgq6mpy3kz --- addons/website_event/__init__.py | 23 ++- addons/website_event/event.py | 26 ++- addons/website_event/event_demo.xml | 158 ++----------------- addons/website_event/views/website_event.xml | 2 +- 4 files changed, 59 insertions(+), 150 deletions(-) diff --git a/addons/website_event/__init__.py b/addons/website_event/__init__.py index 91898dc2123..b4f256be0d9 100644 --- a/addons/website_event/__init__.py +++ b/addons/website_event/__init__.py @@ -1,2 +1,23 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2013-Today OpenERP SA (). +# +# 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 . +# +############################################################################## + import controllers -import event \ No newline at end of file +import event diff --git a/addons/website_event/event.py b/addons/website_event/event.py index 05d032780da..165bed83146 100644 --- a/addons/website_event/event.py +++ b/addons/website_event/event.py @@ -1,8 +1,28 @@ # -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2013-Today OpenERP SA (). +# +# 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 . +# +############################################################################## from openerp.osv import osv, fields from openerp import SUPERUSER_ID + # defined for access rules class product(osv.osv): _inherit = 'product.product' @@ -15,7 +35,6 @@ class event(osv.osv): _inherit = 'event.event' _columns = { 'website_published': fields.boolean('Available in the website'), - 'description_website': fields.html('Description for the website'), } def google_map_img(self, cr, uid, ids, zoom=8, width=298, height=298, context=None): @@ -28,13 +47,14 @@ class event(osv.osv): if partner.address_id: return self.browse(cr, SUPERUSER_ID, ids[0], context=context).address_id.google_map_link() + class sale_order_line(osv.osv): _inherit = "sale.order.line" - + def _recalculate_product_values(self, cr, uid, ids, product_id=None, context=None): if not ids: return super(sale_order_line, self)._recalculate_product_values(cr, uid, ids, product_id, context=context) - + order_line = self.browse(cr, uid, ids[0], context=context) product = product_id and self.pool.get('product.product').browse(cr, uid, product_id, context=context) or order_line.product_id res = super(sale_order_line, self)._recalculate_product_values(cr, uid, ids, product.id, context=context) diff --git a/addons/website_event/event_demo.xml b/addons/website_event/event_demo.xml index f0ea735e76d..afd2a045e50 100644 --- a/addons/website_event/event_demo.xml +++ b/addons/website_event/event_demo.xml @@ -2,153 +2,21 @@ - - True - OpenERP v.7 Technical Training in English (5 days) -

 

-

Course summary:

-

This course is dedicated to partners, integrators and developers who need to grasp knowledge of the OpenERP development process. This course is for new developers or for IT professionals eager to learn more about the OpenERP technical aspects.

-

 

-

Objectives:

-

Having attended this course, participants should be able to:

-
    -
  • Understand the development concepts and architecture;
    • -
  • Install and administer OpenERP;
    • -
  • Develop a new OpenERP module.
    • -
-

 

-

Our prices include:

-
    -
  • drinks and lunch;
    • -
  • training material.
    • -
-

 

-

Requirements:

-
    -
  • Bring your own laptop.
    • -
  • Participants are expected to have some knowledge in programming. A basic knowledge of the Python programming is recommended.
    • -
  • Participants preferably have a functional knowledge of the OpenERP software (see Functional Training).
    • -
-

 

-

For more information on the program, please explore http://www.openerp.com/services/technical-training.

-

If you have a question concerning the content of the training, please contact training@openerp.com.

-

 

-

Where to find us:

-

Chaussée de Namur 40, 1367 Ramillies (Belgium)

-

More information about our Headquarter office (directions, transports, parking, hotels, ...), please have a look at http://bit.ly/VD8J67.

-

 

-

Cancellation Policy: 

-

The organization of the training session has related costs. Due to these costs, cancellations made less than 2 weeks (14 calendar days) prior to the start of the training session is a subject to a fee. This fee can be up to a maximum of 1000€ per cancellation request.

-

We strongly recommend to book your flight tickets and/or hotel reservations 2 weeks prior to the training. If the training is cancelled 2 weeks in advance, you'll be notified by email.

-
 
-

For any additional information, please contact us at events@openerp.com.

-

 

-

Best regards,

-

Miss Charline Louis, OpenERP Junior Event Manager

-

 

-

(OpenERP reserves the right to cancel, re-name or re-locate
the event or change the dates on which it is held.)

-]]> - + + True + - - True - Join us to our main event of the year, the OpenERP Open Days (now in Los Angeles) -

 

-

Every year we invite our community, partners and end-users to come and meet us! It's the ideal event to get together and present new features, roadmap of future versions, achievements of the software, workshops, training sessions, etc.... This event is also an opportunity to showcase our partners' case studies, methodology or developments. Be there and see directly from the source the features of the version 8! -

-

This event and all the conferences are in english!

-

 

-

What's new for this year?

-
    -
  • The Open Days are preceded by 2 days of optional training sessions for experts! We propose 3 different training sessions, 2 days each.
    • -
  • The whole event is open to all public! We ask a participation fee of 49.50€ for the costs for the 3 days (morning coffee, coffee breaks, drinks, sandwiches for lunch and the surprising beer party of Wednesday evening) but it's optional. For those who do not want to contribute, there is a free ticket, therefore, catering is not inclued.
    • -
  • The plenary sessions in the morning will be shorter and we will give more time for thematical meetings, conferences, workshops and tutorial sessions in the afternoon.
    • -
-

 

-

Program:

-

Conferences, workshops and trainings will be organized in 6 rooms:

-
    -
  • 2 technical rooms: one dedicated to advanced OpenERP developers, one for new developers.
    • -
  • 2 technical rooms: one dedicated to advanced OpenERP developers, one for new developers.
    • -
  • 1 business room: to discuss implementation methodologies, best sales practices, etc.
    • -
  • 1 workshop room: mainly for developers.
    • -
-

If you wish to make a presentation, please send your topic proposal as soon as possible for approval to Mrs. Nicoleta Gherlea at ngh (a) openerp (dot) com. The presentations should be, for example, a presentation of a community module, a case study, methodology feedback, technical, etc. Each presentation must be in English.

-

 

-

Where to find us:

-

Epix Technosoft Los Angeles, CA 90001 (United States)

-

For any additional information, please contact us at events@openerp.com.

-

 

-

Best regards,

-

Miss Charline Louis, OpenERP Junior Event Manager

-

 

-

(OpenERP reserves the right to cancel, re-name or re-locate
the event or change the dates on which it is held.)

-]]> - + + True + - - True - Functional Webinar -

 

-

Webinars are online demonstrations where one of our team members explains the main features and benefits of OpenERP Online through an online conference. We can therefore directly answer any questions you may have through a Q&A.

-

Each session lasts approximately one hour and is free, we just ask you to register to receive access codes.

-

 

-

Objective:

-

These webinars allow companies interested in OpenERP, to assess whether the solution meets their needs, and can adapt to the scope of their project.

-

This webinar helps participants to: -

    -
  • Discover how to navigate in OpenERP;
    • -
  • View full flow: purchasing, sales, project management, accounting;
    • -
  • Ask your questions to our expert;
    • -
  • Assess whether OpenERP meets your expectations;
    • -
-

 

-

After registering, you will receive a link and password by email before the start of the session. If you have a problem to connect, please contact us at events@openerp.com.

-

 

-

We are looking forward to meeting you online,

-

Best regards,

-

Miss Charline Louis, OpenERP Junior Event Manager

-

 

-

(OpenERP reserves the right to cancel, re-name or re-locate
the event or change the dates on which it is held.)

-]]> - - - - True - Conference on Business Applications -

 

-

During this conference, OpenERP team will give a detailed overview of OpenERP business applications. You’ll know all the benefits of using an OpenERP Business Applications.

-

 

-

Objectives:

-

Having attended this conference, participants should be able to:

-
    -
  • Understand the various OpenERP modules;
    • -
  • Functional flow of OpenERP Applications;
    • -
-

 

-

Program:

-
    -
  • Introduction, CRM, Sales Management
    • -
  • Purchase, Sales & Purchase management, Financial accounting.
    • -
  • Project management, Human resources, Contract management.
    • -
  • Warehouse management, Manufacturing (MRP) & Sales, Import/Export.
    • -
  • Point of Sale (POS), Introduction to report customization.
    • -
-

 

-

Where to find us:

-

Chamber Works 60, Rosewood Court Detroit, MI 48212 (United States)

-

For any additional information, please contact us at events@openerp.com.

-

 

-

Best regards,

-

Miss Charline Louis, OpenERP Junior Event Manager

-

 

-

(OpenERP reserves the right to cancel, re-name or re-locate
the event or change the dates on which it is held.)

-]]> - + + True + + + + True + diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index 1aa58f5466f..cbdb9738961 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -198,7 +198,7 @@
-
+