diff --git a/addons/event/data/event_demo.xml b/addons/event/data/event_demo.xml index 33b74ce18b9..ab64502243c 100644 --- a/addons/event/data/event_demo.xml +++ b/addons/event/data/event_demo.xml @@ -72,42 +72,6 @@ ]]> - - Functional Webinar - - - - - limited - 350 - -
Functional Webinar
-

 

-

Webinars are online demonstrations where one of our team members explains the main features and benefits of our online offer 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 our software, 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 our software;
    • -
  • View full flow: purchasing, sales, project management, accounting;
    • -
  • Ask your questions to our expert;
    • -
  • Assess whether your expectations are met;
    • -
-

 

-

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@yourcompany.com.

-

 

-

We are looking forward to meeting you online,

-

Best regards,

-

Luigi Roni, Senior Event Manager

-

 

-

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

- -]]> - - Conference for Architects @@ -150,91 +114,9 @@ ]]> - - Technical Training - - - - - - unlimited - -
5-days Technical Training
-

 

-

Course summary:

-

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

-

 

-

Objectives:

-

Having attended this course, participants should be able to:

-
    -
  • Understand the development concepts and architecture;
    • -
  • Install and administer your own server;
    • -
  • Develop a new module for a particular application.
    • -
-

 

-

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 our software (see Functional Training).
    • -
-

 

-

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

-

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

-

 

-

Where to find us:

-

Chaussée de Namur 69, 1300 Wavre, 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@odoo.com.

-

 

-

Best regards,

-

Luigi Roni, Senior Event Manager

-

 

-

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

- -]]> - - - - - Agrolait - s.l@agrolait.be - 003281588558 - - - - - - ASUStek - info@asustek.com - + 1 64 61 04 01 - - - - - - Delta PC - deltapc@yourcompany.example.com - +1 510 340 2385 - - - - Camptocamp odoo@camptocamp.com diff --git a/addons/event_sale/data/event_demo.xml b/addons/event_sale/data/event_demo.xml index 033def21786..46be242ca7a 100644 --- a/addons/event_sale/data/event_demo.xml +++ b/addons/event_sale/data/event_demo.xml @@ -1,8 +1,5 @@ - - - Standard @@ -22,17 +19,6 @@ 10 - - - Standard - - - - 1000.0 - 60 - - - Standard @@ -50,119 +36,4 @@ 1500.0 5 - - - Standard - - - - 1000.0 - 20 - - - - VIP - - - - 1500.0 - 5 - - - - - Program -
Registrations are from 8:30 am, except on Friday from 9:00 am
-
- Lunch is served between 1:00 pm and 2:00 pm. -
-

Special Events

- - - - - - - - - - - -
4/619h00Barbecue Beer Event
5/618h30Odoo Awards Ceremony
-
-
-
-

- #OpenDays -

-
-
-
Wifi network: opendays
-
Wifi password: odoo2014
-
-
-
- sponsored by -
- - - -
-
- ]]> - Premium Tickets - - - - - - - - - - - - - - - - - - - - -
Full
Catering
BBQ &
Beer Event
Awards &
Walking
Dinner
Every DayJune 4thJune 5th
-

-

Free Tickets

- - - - - - - - - - - - - - - - - - -
Drinks
Premium
Ticket
onsite
Every Day60 €/day
30 €/Friday
- ]]> - -

Exhibition Hall

- -
- Picture of the exhibition hall -
- ]]> - diff --git a/addons/hr_timesheet/data/hr_timesheet_demo.xml b/addons/hr_timesheet/data/hr_timesheet_demo.xml index 3814d86c759..4f4cdd1f96e 100644 --- a/addons/hr_timesheet/data/hr_timesheet_demo.xml +++ b/addons/hr_timesheet/data/hr_timesheet_demo.xml @@ -12,7 +12,7 @@ - Requirements analysis and specification + Requirements analysis 2.00 @@ -21,7 +21,7 @@ - Design and specification + Design 1.00 @@ -30,7 +30,7 @@ - Coding and module testing + Quality analysis 3.00 @@ -39,7 +39,7 @@ - Integration and system testing + Quality analysis 1.00 @@ -48,7 +48,7 @@ - Delivery and maintenance + Delivery 1.00 diff --git a/addons/l10n_generic_coa/data/account_invoice_demo.xml b/addons/l10n_generic_coa/data/account_invoice_demo.xml index a93b18c6121..ba06a41e3bc 100644 --- a/addons/l10n_generic_coa/data/account_invoice_demo.xml +++ b/addons/l10n_generic_coa/data/account_invoice_demo.xml @@ -168,6 +168,7 @@ Coffee Machine with huge 'employee\'s performances boosting perk' + 4999.99 Tips + TIPS @@ -43,6 +44,7 @@ Miscellaneous + True 13.0 18.0 consu diff --git a/addons/point_of_sale/data/point_of_sale_demo.xml b/addons/point_of_sale/data/point_of_sale_demo.xml index aa8498815f4..2525a561481 100644 --- a/addons/point_of_sale/data/point_of_sale_demo.xml +++ b/addons/point_of_sale/data/point_of_sale_demo.xml @@ -23,18 +23,19 @@ - - Storage and Organizers - + + Miscellaneous - - Partner Services - + + Desks + + + Chairs - + True @@ -46,7 +47,7 @@ 2100002000003 False - + @@ -59,7 +60,7 @@ product False - + True @@ -74,7 +75,7 @@ product True - + @@ -88,7 +89,7 @@ 2300001000008 product - + @@ -104,7 +105,7 @@ 2301000000006 True - + @@ -117,7 +118,7 @@ product True - + @@ -130,7 +131,7 @@ product True - + @@ -156,7 +157,7 @@ product True - + @@ -171,7 +172,7 @@ True 2100001000004 - + @@ -184,16 +185,114 @@ CONS_0001 True - + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addons/point_of_sale/models/product.py b/addons/point_of_sale/models/product.py index ed9f2dce8cd..9febe9e985b 100644 --- a/addons/point_of_sale/models/product.py +++ b/addons/point_of_sale/models/product.py @@ -7,7 +7,7 @@ from odoo.exceptions import UserError class ProductTemplate(models.Model): _inherit = 'product.template' - available_in_pos = fields.Boolean(string='Available in Point of Sale', help='Check if you want this product to appear in the Point of Sale', default=True) + available_in_pos = fields.Boolean(string='Available in Point of Sale', help='Check if you want this product to appear in the Point of Sale', default=False) to_weight = fields.Boolean(string='To Weigh With Scale', help="Check if the product should be weighted using the hardware scale integration") pos_categ_id = fields.Many2one( 'pos.category', string='Point of Sale Category', diff --git a/addons/point_of_sale/views/product_view.xml b/addons/point_of_sale/views/product_view.xml index 4a8b2fceab7..96f92c5d7be 100644 --- a/addons/point_of_sale/views/product_view.xml +++ b/addons/point_of_sale/views/product_view.xml @@ -17,7 +17,7 @@ product.template form kanban,tree,form - + Product Variants @@ -25,7 +25,7 @@ product.product form kanban,tree,form - + diff --git a/addons/pos_restaurant/data/pos_restaurant_demo.xml b/addons/pos_restaurant/data/pos_restaurant_demo.xml index a2fc942e65f..69b39eafb63 100644 --- a/addons/pos_restaurant/data/pos_restaurant_demo.xml +++ b/addons/pos_restaurant/data/pos_restaurant_demo.xml @@ -8,7 +8,7 @@ Kitchen Printer localhost - + diff --git a/addons/product/data/product_demo.xml b/addons/product/data/product_demo.xml index 09e3fc12afd..19cb313e328 100644 --- a/addons/product/data/product_demo.xml +++ b/addons/product/data/product_demo.xml @@ -10,6 +10,10 @@ Services + + + Saleable + Software @@ -142,14 +146,6 @@ - - Quality - - - Premium - - - Desk Customizable @@ -199,14 +195,9 @@ - - - - - - + diff --git a/addons/project/data/project_demo.xml b/addons/project/data/project_demo.xml index 579baa3c791..f0466e2af29 100644 --- a/addons/project/data/project_demo.xml +++ b/addons/project/data/project_demo.xml @@ -64,15 +64,6 @@ - - 10 - Internal Projects - Trainings - - - employees - - Projects & Tasks @@ -82,8 +73,7 @@ @@ -206,63 +196,6 @@ 6 - - - - 1 - - Design Use Cases - - - - - - - 1 - - Dataflow Design - - - - - - 1 - - User Interface design - - 2011-02-06 - - - - - - - - 1 - - Set target for all deparments - - - - - - - 1 - - Integration of core components - - - - - - - 1 - - Deploy and review on live system - - - 24.0 @@ -300,15 +233,6 @@ Customer analysis + Architecture 7 - - 15 - 15.0 - - - - Data Export flow - 8 - 17 8.0 @@ -326,7 +250,7 @@ 20.0 - Data import + Doc + Office planning @@ -385,18 +309,6 @@ Send it ASAP, its urgent. - - - - - - - - - - - - @@ -408,14 +320,9 @@ Send it ASAP, its urgent. - - stage - - - diff --git a/addons/sale_timesheet/data/sale_service_demo.xml b/addons/sale_timesheet/data/sale_service_demo.xml index ba7a1308b07..1941bf31aaf 100644 --- a/addons/sale_timesheet/data/sale_service_demo.xml +++ b/addons/sale_timesheet/data/sale_service_demo.xml @@ -19,30 +19,15 @@ Done - - Internal - GAP Analysis - INT - - - - - - Internal - GAP Analysis - - 2 - employees - - - - Support + After-Sales Services INT - Support + After-Sales Services @@ -51,7 +36,7 @@ Internal training - + @@ -63,7 +48,6 @@ timesheet task_global_project - @@ -155,6 +139,28 @@ 50 + + Decoration + + + + + + Planning + + + + + + Furniture + + + + + + Furniture Delivery + + @@ -180,7 +186,7 @@ - Data uploading + Design 5.00 @@ -188,7 +194,7 @@ - Code improvement + Fine tuning 5.00 @@ -196,7 +202,7 @@ - Adding new module + Assembling 5.00 @@ -204,7 +210,7 @@ - Delivery and maintenance + Delivery 5.00 @@ -213,7 +219,7 @@ - Data analysis + Requirements analysis 1.00 @@ -237,7 +243,7 @@ - Data analysis + Requirements analysis 1.00 @@ -245,7 +251,7 @@ - Code migration + Building 1.00 @@ -261,7 +267,7 @@ - Development + Assembling 1.00 @@ -277,7 +283,7 @@ - Data migration + Assembling 1.00 @@ -285,7 +291,7 @@ - Code improvement + Wood chopping 1.00 @@ -311,7 +317,7 @@ - Maintenance + Repair 8.00 @@ -319,7 +325,7 @@ - Code improvement + Initial design improvement 8.00 @@ -344,7 +350,7 @@ - Specifications writing + Design analysis 4.00 @@ -366,15 +372,15 @@ 8.00 - + - Functional training + Internal training 8.00 - + @@ -382,7 +388,7 @@ 8.00 - + @@ -390,7 +396,7 @@ 8.00 - + diff --git a/addons/website_event/data/event_demo.xml b/addons/website_event/data/event_demo.xml index c1990efa2cd..03c11ce6301 100644 --- a/addons/website_event/data/event_demo.xml +++ b/addons/website_event/data/event_demo.xml @@ -164,161 +164,6 @@ True - - True - odoo - -
-
-
-

5 Intensive Days

-

to learn technical aspects

-
-
-
- -
-
-
-

Course Summary

-
- -
-

This course is dedicated to developers who need to grasp knowledge of the business applications development process. This course is for new developers or for IT professionals eager to learn more about technical aspects.

-
-
-
- -
-
-
-

What you will learn?

-
- -
-
-
-

Day 1

- -

Introduction to Javascript

-
- -
  • Hello World
    • -
  • Variables & Operators
    • -
  • Dive into Strings
    • -
  • Functions
    • -
  • Loops
    • -
  • Arrays
    • -
-

You will be able to develop simple dynamic components in HTML pages.

-
-
-
- -
-
-
-

Day 2

- -

Odoo Web Client

-
- -
  • Introduction to JQuery
    • -
  • Advanced JQuery
    • -
  • Underscore
    • -
  • Introduction to QWeb
    • -
  • Controllers and Views
    • -
  • Bootstrap CSS
    • -
  • Calling the ORM
    • -
-

You will be able to create dynamic page interacting with the ORM.

-
-
-
- -
-
-
-

Day 3

- -

Building a Full Application

-
- -
  • Modules
    • -
  • Python Objects
    • -
  • Report Engine
    • -
  • Workflows
    • -
  • Training Center Module
    • -
  • Integrated Help
    • -
  • How to Debug
    • -
-

You will be able to develop a full application with backend and user interface.

-
-
-
-
-
- -
-
-
-

Requirements

-
- -
-

Objectives:

- -

Having attended this course, participants should be able to:

- -
  • Understand the development concepts and architecture;
    • -
  • Install and administer your own server;
    • -
  • Develop a new module for a particular application.
    • -

- -

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 our software (see Functional Training).
    • -

- -

To get more information, visit the Odoo Official Website.

-
-
-
- - - -
-
-
-

Read Great Contents

- -

What do people say about this course?

-
- -
-
-

I did not expect such a great learning experience. I feel like I can develop anything now.

-John Doe, CEO
-
- -
-
-

This course help me build my first application within a month. Definetly worth its price.

-John Doe, CEO
-
-
-
-]]> - True @@ -334,160 +179,4 @@ True - - True - odoo - -
-
-
-

5 Intensive Days

-

to learn business applications development

-
-
-
- -
-
-
-

Course Summary

-
- -
-

This course is dedicated to developers who need to grasp knowledge of the business applications development process. This course is for new developers or for IT professionals eager to learn more about technical aspects.

-
-
-
- -
-
-
-

What you will learn?

-
- -
-
-
-

Day 1

- -

Introduction to Javascript

-
- -
  • Hello World
    • -
  • Variables & Operators
    • -
  • Dive into Strings
    • -
  • Functions
    • -
  • Loops
    • -
  • Arrays
    • -
-

You will be able to develop simple dynamic components in HTML pages.

-
-
-
- -
-
-
-

Day 2

- -

Odoo Web Client

-
- -
  • Introduction to JQuery
    • -
  • Advanced JQuery
    • -
  • Underscore
    • -
  • Introduction to QWeb
    • -
  • Controllers and Views
    • -
  • Bootstrap CSS
    • -
  • Calling the ORM
    • -
-

You will be able to create dynamic page interacting with the ORM.

-
-
-
- -
-
-
-

Day 3

- -

Building a Full Application

-
- -
  • Modules
    • -
  • Python Objects
    • -
  • Report Engine
    • -
  • Workflows
    • -
  • Training Center Module
    • -
  • Integrated Help
    • -
  • How to Debug
    • -
-

You will be able to develop a full application with backend and user interface.

-
-
-
-
-
- -
-
-
-

Requirements

-
- -
-

Objectives:

- -

Having attended this course, participants should be able to:

- -
  • Understand the development concepts and architecture;
    • -
  • Install and administer your own server;
    • -
  • Develop a new module for a particular application.
    • -

- -

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 our software (see Functional Training).
    • -

- -

To get more information, visit the Odoo Official Website.

-
-
-
- - - -
-
-
-

Read Great Contents

- -

What do people say about this course?

-
- -
-
-

I did not expect such a great learning experience. I feel like I can develop anything now.

-John Doe, CEO
-
- -
-
-

This course help me build my first application within a month. Definetly worth its price.

-John Doe, CEO
-
-
-
-]]> - - diff --git a/addons/website_event_questions/__manifest__.py b/addons/website_event_questions/__manifest__.py index 78200c5469e..3a67ac7fa15 100644 --- a/addons/website_event_questions/__manifest__.py +++ b/addons/website_event_questions/__manifest__.py @@ -12,8 +12,5 @@ 'report/report_event_question_view.xml', 'security/ir.model.access.csv', ], - 'demo': [ - 'data/event_demo.xml', - ], 'installable': True, } diff --git a/addons/website_event_questions/data/event_demo.xml b/addons/website_event_questions/data/event_demo.xml deleted file mode 100644 index 3a792415670..00000000000 --- a/addons/website_event_questions/data/event_demo.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - Kind of partner - - 1 - - - Veggie - - 2 - - - - Accommodation - - 3 - - - - Gold - - 3 - - - Silver - - 2 - - - Bronze - - 1 - - - - Yes - - 2 - - - No - - 1 - - - - Personal - - 1 - - - In Charge - - 2 - - - - - - - - - - - - - - diff --git a/addons/website_event_track/data/event_demo.xml b/addons/website_event_track/data/event_demo.xml index 68da8ebe721..090a8138703 100644 --- a/addons/website_event_track/data/event_demo.xml +++ b/addons/website_event_track/data/event_demo.xml @@ -87,7 +87,7 @@ Bruyère - How to develop a website module. + How to design a new piece of furniture @@ -99,7 +99,7 @@ blocked - How to integrate hardware materials with the Odoo point of sale. + How to integrate hardware materials in your pieces of furniture @@ -110,7 +110,7 @@ done - How to develop real time apps, the website live chat module explained. + Portfolio presentation @@ -120,7 +120,7 @@ - How to develop automated tests in the Odoo web client. + How to develop automated processes @@ -130,7 +130,7 @@ - The new way to promote your modules in the Apps platform and Odoo website. + The new way to promote your creations @@ -140,7 +140,7 @@ - Detailed roadmap of accounting new modules and improvements for version 8. + Detailed roadmap of our new products @@ -150,7 +150,7 @@ - A technical explanation of Odoo as a CMS and a eCommerce platform for version 8. + A technical explanation of how to use computer design apps @@ -160,7 +160,7 @@ - Discover Odoo CRM: How to optimize your sales, from leads to sales orders. + How to optimize your sales, from leads to sales orders @@ -172,7 +172,7 @@ blocked - How to use Odoo for your HR process: recruitment, leaves management, appraisals, expenses, etc. + How to improve your quality processes @@ -184,7 +184,7 @@ - Raising qualitive insights with the survey app + Raising qualitive insights from your customers @@ -194,7 +194,7 @@ - Discover Odoo Point-of-Sale: Your shop ready to use in 30 minutes. + Discover our new design team @@ -204,7 +204,7 @@ - Manage your events with Odoo, the new training modules. + Latest trends @@ -214,7 +214,7 @@ - Advanced reporting with Google Spreadsheets integration. + Advanced reporting @@ -224,7 +224,7 @@ - New Paypal modules (portal, handling, installments). + Partnership programs @@ -234,7 +234,7 @@ - Odoo Mobile for Notes, Meetings and Messages. + How to communicate with your community @@ -244,7 +244,7 @@ - Odoo as your Enterprise Social Network. + How to follow us on the social media @@ -254,7 +254,7 @@ - The Art of Making an Odoo Demo. + The new marketing strategy @@ -264,7 +264,7 @@ - How to build your marketing strategy for the purpose of generating leads with Odoo. + How to build your marketing strategy within a competitive environment @@ -275,7 +275,7 @@ - Advanced lead management with Odoo: tips and tricks from the fields + Advanced lead management : tips and tricks from the fields @@ -286,7 +286,7 @@ - New Certification Program (valid from Oct. 2013). + New Certification Program @@ -296,7 +296,7 @@ - Recruiting high skilled talents with Odoo HR apps + House of World Cultures @@ -306,7 +306,7 @@ - Manage your KPIs (recomended to openERP partners). + Minimal but efficient design @@ -316,7 +316,7 @@ - Key Success factors selling Odoo. + Key Success factors selling our furniture @@ -326,7 +326,7 @@ - Merge proposals review, code sprint (entire day). + Design contest (entire day) @@ -336,7 +336,7 @@ - Merge proposals review, code sprint (entire afternoon) + Design contest (entire afternoon) @@ -346,7 +346,7 @@ - Odoo in 2014 + My Company global presentation @@ -356,7 +356,7 @@ 3 - Odoo Status & Strategy 2014 + Status & Strategy @@ -365,7 +365,7 @@ - The new marketing strategy. + The new marketing strategy diff --git a/addons/website_sale/data/demo.xml b/addons/website_sale/data/demo.xml index 28751b8b849..b0bf8433f99 100644 --- a/addons/website_sale/data/demo.xml +++ b/addons/website_sale/data/demo.xml @@ -58,7 +58,7 @@ 2 2 - 3 + 1000 diff --git a/addons/website_sale_comparison/data/website_sale_comparison_demo.xml b/addons/website_sale_comparison/data/website_sale_comparison_demo.xml index 0b109d05ea1..f121f846207 100644 --- a/addons/website_sale_comparison/data/website_sale_comparison_demo.xml +++ b/addons/website_sale_comparison/data/website_sale_comparison_demo.xml @@ -1,56 +1,17 @@ - - Camera - 3 - Dimensions 7 - - Display - 6 - - - Platform - 10 - - - Battery - 8 - - - Memory And Storage - 9 - - - Internet And Connectivity - 4 - - - Multimedia - 2 - - - Other Features - 11 - - - Warranty - 5 - - + - - - Brand @@ -61,51 +22,6 @@ - - Processor - - - - Dual Core A5 - - - - - Video Formats Supported - - - - .mp4, .avi, .m4v, H.264, AAC-LC, .mov, MPEG-4, .m4v, .mp4, .mov, Motion JPEG (M-JPEG) - - - - - Audio Formats Supported - - - - 3, 4, Protected AAC, MP3, MP3 VBR, AAX and AAX), Apple Lossless, WAV, AAC, HE-AAC, Audible (Formats 2, Audible Enhanced Audio, AIFF - - - - - Primary Camera - - - - 5 megapixels - - - - - Secondary Camera - - - - 1.2 megapixels - - - Weight @@ -124,125 +40,10 @@ - - 4G - - - - No - - - - - 3G - - - - Yes - - - - - Display Type - - - - 7.9 inch LCD Assistive Touchscreen with 1024 x 768 pixels - - - - - Other Display Features - - - - LED Backlit Multi-touch Display with IPS Technology, Fingerprint-resistant Oleophobic Coating - - - - - Warranty Summary - - - - 1 Year Warranty - - - - - Battery Type - - - - Lithium - Polymer - - - - - Play Time - - - - 10 hrs - - - - - Operating System - - - - iOS 6 - - - - - Sensors - - - - Accelerometer, Three-axis Gyro, Ambient Light Sensor, Digital Compass - - - - - Bluetooth - - - - v4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -254,60 +55,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addons/website_sale_digital/data/product_demo.xml b/addons/website_sale_digital/data/product_demo.xml index 02f61d56ff9..b7497e04063 100644 --- a/addons/website_sale_digital/data/product_demo.xml +++ b/addons/website_sale_digital/data/product_demo.xml @@ -2,21 +2,20 @@ - Book: Office Renovation for Dummies + eBook: Office Renovation for Dummies 2 4.50 service - Novel by Lewis Caroll. - Alice's Adventures in Wonderland (commonly shortened to Alice in Wonderland) is an 1865 novel written by English author Charles Lutwidge Dodgson under the pseudonym Lewis Carroll. It tells of a girl named Alice falling through a rabbit hole into a fantasy world populated by peculiar, anthropomorphic creatures. The tale plays with logic, giving the story lasting popularity with adults as well as with children. It is considered to be one of the best examples of the literary nonsense genre. Its narrative course and structure, characters and imagery have been enormously influential in both popular culture and literature, especially in the fantasy genre. + - alice.pdf - alice.pdf + ebook.pdf + ebook.pdf binary - + product.template True diff --git a/addons/website_sale_digital/static/alice.pdf b/addons/website_sale_digital/static/alice.pdf deleted file mode 100644 index 10276ceb279..00000000000 Binary files a/addons/website_sale_digital/static/alice.pdf and /dev/null differ diff --git a/addons/website_sale_digital/static/digital_product_1.jpg b/addons/website_sale_digital/static/digital_product_1.jpg index 51d7780ee65..a39242bc616 100644 Binary files a/addons/website_sale_digital/static/digital_product_1.jpg and b/addons/website_sale_digital/static/digital_product_1.jpg differ diff --git a/addons/website_sale_digital/static/ebook.pdf b/addons/website_sale_digital/static/ebook.pdf new file mode 100644 index 00000000000..fa06657e1ec Binary files /dev/null and b/addons/website_sale_digital/static/ebook.pdf differ diff --git a/addons/website_sale_options/data/product_demo.xml b/addons/website_sale_options/data/product_demo.xml index 74d275ae1ce..a51dc8e2382 100644 --- a/addons/website_sale_options/data/product_demo.xml +++ b/addons/website_sale_options/data/product_demo.xml @@ -3,10 +3,15 @@ + + Duration + 20 + Duration select + 1 year diff --git a/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js b/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js index f4d74793b1a..921bbe32ffd 100644 --- a/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js +++ b/addons/website_sale_wishlist/static/src/js/website_sale_tour_wishlist.js @@ -89,7 +89,7 @@ tour.register('shop_wishlist', { }, { content: "add item to cart", - trigger: 'a.o_wish_add:first', + trigger: 'a.o_wish_add:eq(1)', }, { content: "check that cart contains 1 item", @@ -107,7 +107,7 @@ tour.register('shop_wishlist', { }, { content: "add last item to cart", - trigger: 'a.o_wish_add:first', + trigger: 'a.o_wish_add:eq(1)', }, { content: "check that user is redirect - wishlist is empty",