[REV] lunch: Revert changes introduced in f727b8f0b57aad49f2ea8c54600ab73bbd02570f

YOLO

closes odoo/odoo#30025

3 files changed, 65 insertions, 126 deletions

diff --git a/addons/lunch/data/ir_cron_data.xml b/addons/lunch/data/ir_cron_data.xml
deleted file mode 100644
index 19275e67f21..00000000000
--- a/addons/lunch/data/ir_cron_data.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <data noupdate="1">
-        <record id="ir_cron_lunch" model="ir.cron">
-            <field name="name">Lunch: automatic email send</field>
-            <field name="model_id" ref="model_lunch_supplier"/>
-            <field name="state">code</field>
-            <field name="code">model._auto_email_send()</field>
-            <field name="active" eval="True"/>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="interval_number">10</field>
-            <field name="interval_type">minutes</field>
-            <field name="numbercall">-1</field>
-            <field name="doall" eval="False"/>
-        </record>
-    </data>
-</odoo>
diff --git a/addons/lunch/data/lunch_data.xml b/addons/lunch/data/lunch_data.xml
index 0f269f42d0c..2332d2e5272 100644
--- a/addons/lunch/data/lunch_data.xml
+++ b/addons/lunch/data/lunch_data.xml
@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 <data>
+    <record id="lunch_order_line_action_order" model="ir.actions.server">
+        <field name="name">Lunch: Order meals</field>
+        <field name="model_id" ref="model_lunch_order_line"/>
+        <field name="binding_model_id" ref="model_lunch_order_line"/>
+        <field name="state">code</field>
+        <field name="code">
+if records:
+    action = records.order()
+        </field>
+    </record>
+
     <record id="lunch_order_line_action_confirm" model="ir.actions.server">
         <field name="name">Lunch: Receive meals</field>
         <field name="model_id" ref="model_lunch_order_line"/>
         <field name="binding_model_id" ref="model_lunch_order_line"/>
         <field name="state">code</field>
-        <field name="code">records.action_confirm()</field>
+        <field name="code">records.confirm()</field>
     </record>
 
     <record id="lunch_order_line_action_cancel" model="ir.actions.server">
@@ -14,7 +25,7 @@
         <field name="model_id" ref="model_lunch_order_line"/>
         <field name="binding_model_id" ref="model_lunch_order_line"/>
         <field name="state">code</field>
-        <field name="code">records.action_cancel()</field>
+        <field name="code">records.cancel()</field>
     </record>
 </data>
 <data noupdate="0">
diff --git a/addons/lunch/data/lunch_demo.xml b/addons/lunch/data/lunch_demo.xml
index a5f44ebe955..bd36db1f0af 100644
--- a/addons/lunch/data/lunch_demo.xml
+++ b/addons/lunch/data/lunch_demo.xml
@@ -28,7 +28,7 @@
             <field name="name">Chirashi</field>
         </record>
 
-        <record id="partner_coin_gourmand" model="res.partner">
+        <record model="res.partner" id="partner_coin_gourmand">
             <field name="name">Coin gourmand</field>
             <field name="city">Tirana</field>
             <field name="country_id" ref="base.al"/>
@@ -37,13 +37,7 @@
             <field name="email">coin.gourmand@yourcompany.example.com</field>
         </record>
 
-        <record model="lunch.supplier" id="supplier_coin_gourmand">
-            <field name="partner_id" ref="partner_coin_gourmand"/>
-            <field name="recurrency_from">8</field>
-            <field name="recurrency_to">23</field>
-        </record>
-
-        <record id="partner_pizza_inn" model="res.partner">
+        <record model="res.partner" id="partner_pizza_inn">
             <field name="name">Pizza Inn</field>
             <field name="city">New Delhi TN</field>
             <field name="country_id" ref="base.us"/>
@@ -62,12 +56,6 @@
             <field name="email">info@corner.com</field>
         </record>
 
-        <record model="lunch.supplier" id="supplier_corner">
-            <field name="partner_id" ref="partner_corner"/>
-            <field name="recurrency_from">8</field>
-            <field name="recurrency_to">23</field>
-        </record>
-
         <record model="res.partner" id="partner_sushi_shop">
             <field name="name">Sushi Shop</field>
             <field name="city">Paris</field>
@@ -77,232 +65,178 @@
             <field name="email">order@sushi.com</field>
         </record>
 
-        <record model="lunch.supplier" id="supplier_sushi_shop">
-            <field name="partner_id" ref="partner_sushi_shop"/>
-            <field name="recurrency_from">8</field>
-            <field name="recurrency_to">23</field>
-        </record>
-
         <record model="lunch.product" id="product_bacon">
             <field name="name">Bacon</field>
             <field name="category_id" eval="str(ref('categ_burger'))"/>
             <field name="price">7.5</field>
-            <field name="supplier_id" ref="supplier_corner"/>
+            <field name="supplier" eval="str(ref('partner_corner'))"/>
             <field name="description">Beef, Bacon, Salad, Cheddar, Fried Onion, BBQ Sauce</field>
-            <field name="image" type="base64" file="lunch/static/img/bacon_burger.png"/>
         </record>
 
         <record model="lunch.product" id="product_cheeseburger">
             <field name="name">Cheese Burger</field>
             <field name="category_id" eval="str(ref('categ_burger'))"/>
             <field name="price">7.0</field>
-            <field name="supplier_id" ref="supplier_corner"/>
+            <field name="supplier" eval="str(ref('partner_corner'))"/>
             <field name="description">Beef, Cheddar, Salad, Fried Onions, BBQ Sauce</field>
-            <field name="image" type="base64" file="lunch/static/img/cheeseburger.png"/>
         </record>
 
         <record model="lunch.product" id="product_chicken_curry">
             <field name="name">Chicken Curry</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
             <field name="price">3.0</field>
-            <field name="supplier_id" ref="supplier_corner"/>
-            <field name="image" type="base64" file="lunch/static/img/chicken_curry.png"/>
+            <field name="supplier" eval="str(ref('partner_corner'))"/>
         </record>
 
         <record model="lunch.product" id="product_spicy_tuna">
             <field name="name">Spicy Tuna</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
             <field name="price">3.0</field>
-            <field name="supplier_id" ref="supplier_corner"/>
-            <field name="image" type="base64" file="lunch/static/img/chicken_curry.png"/>
+            <field name="supplier" eval="str(ref('partner_corner'))"/>
         </record>
 
         <record model="lunch.product" id="product_mozzarella">
             <field name="name">Mozzarella</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
             <field name="price">3.9</field>
-            <field name="supplier_id" ref="supplier_corner"/>
+            <field name="supplier" eval="str(ref('partner_corner'))"/>
             <field name="description">Mozzarella, Pesto, Tomatoes</field>
-            <field name="image" type="base64" file="lunch/static/img/mozza.png"/>
         </record>
 
         <record model="lunch.product" id="product_club">
             <field name="name">Club</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
             <field name="price">3.4</field>
-            <field name="supplier_id" ref="supplier_corner"/>
+            <field name="supplier" eval="str(ref('partner_corner'))"/>
             <field name="description">Ham, Cheese, Vegetables</field>
-            <field name="image" type="base64" file="lunch/static/img/club.png"/>
         </record>
 
         <record model="lunch.product" id="product_maki">
             <field name="name">Lunch Maki 18pc</field>
             <field name="category_id" eval="str(ref('categ_sushi'))"/>
             <field name="price">12.0</field>
-            <field name="supplier_id" ref="supplier_sushi_shop"/>
+            <field name="supplier" eval="str(ref('partner_sushi_shop'))"/>
             <field name="description">6 Maki Salmon - 6 Maki Tuna - 6 Maki Shrimp/Avocado</field>
-            <field name="image" type="base64" file="lunch/static/img/maki.png"/>
         </record>
 
         <record model="lunch.product" id="product_salmon">
             <field name="name">Lunch Salmon 20pc</field>
             <field name="category_id" eval="str(ref('categ_sushi'))"/>
             <field name="price">13.80</field>
-            <field name="supplier_id" ref="supplier_sushi_shop"/>
+            <field name="supplier" eval="str(ref('partner_sushi_shop'))"/>
             <field name="description">4 Sushi Salmon - 6 Maki Salmon - 4 Sashimi Salmon </field>
-            <field name="image" type="base64" file="lunch/static/img/salmon_sushi.png"/>
         </record>
 
         <record model="lunch.product" id="product_temaki">
             <field name="name">Lunch Temaki mix 3pc</field>
             <field name="category_id" eval="str(ref('categ_temaki'))"/>
             <field name="price">14.0</field>
-            <field name="supplier_id" ref="supplier_sushi_shop"/>
-            <field name="description">1 Avocado - 1 Salmon - 1 Eggs - 1 Tuna</field>
-            <field name="image" type="base64" file="lunch/static/img/temaki.png"/>
+            <field name="supplier" eval="str(ref('partner_sushi_shop'))"/>
+            <field name="description">1 Avocado/Cooked Tuna - 1 Salmon/Eggs - 1 Salmon/Avocado - 1 Tuna/Mango</field>
         </record>
 
         <record model="lunch.product" id="product_chirashi">
             <field name="name">Salmon and Avocado</field>
             <field name="category_id" eval="str(ref('categ_chirashi'))"/>
             <field name="price">9.25</field>
-            <field name="supplier_id" ref="supplier_sushi_shop"/>
-            <field name="description">2 Tempuras, Cabbages, Onions, Sesame Sauce</field>
-            <field name="image" type="base64" file="lunch/static/img/chirashi.png"/>
-        </record>
-
-        <record model="lunch.supplier" id="supplier_pizza_inn">
-            <field name="partner_id" ref="partner_pizza_inn"/>
-            <field name="send_by">mail</field>
-            <field name="automatic_email_send" eval="True"/>
-            <field name="automatic_email_time">11</field>
-            <field name="recurrency_from">8</field>
-            <field name="recurrency_to">23</field>
-            <field name="recurrency">reccurent</field>
-            <field name="recurrency_monday" eval="True"/>
-            <field name="recurrency_tuesday" eval="True"/>
-            <field name="recurrency_wednesday" eval="True"/>
-            <field name="recurrency_thursday" eval="True"/>
-            <field name="recurrency_friday" eval="True"/>
+            <field name="supplier" eval="str(ref('partner_sushi_shop'))"/>
+            <field name="description">Shrimp Tempura, Yam Tempura, Chinese Cabbage, Pickled Onions, Sesame Sauce</field>
         </record>
 
         <record model="lunch.product" id="product_cheese_ham">
             <field name="name">Cheese And Ham</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
             <field name="price">3.30</field>
-            <field name="supplier_id" eval="str(ref('supplier_coin_gourmand'))"/>
+            <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
             <field name="description">Cheese, Ham, Salad, Tomatoes, cucumbers, eggs</field>
-            <field name="image" type="base64" file="lunch/static/img/club.png"/>
         </record>
 
         <record model="lunch.product" id="product_country">
             <field name="name">The Country</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
             <field name="price">3.30</field>
-            <field name="supplier_id" eval="str(ref('supplier_coin_gourmand'))"/>
+            <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
             <field name="description">Brie, Honey, Walnut Kernels</field>
-            <field name="image" type="base64" file="lunch/static/img/brie.png"/>
         </record>
 
         <record model="lunch.product" id="product_tuna">
             <field name="name">Tuna</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
             <field name="price">2.50</field>
-            <field name="supplier_id" eval="str(ref('supplier_coin_gourmand'))"/>
+            <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
             <field name="description">Tuna, Mayonnaise</field>
-            <field name="image" type="base64" file="lunch/static/img/tuna_sandwich.png"/>
         </record>
 
         <record model="lunch.product" id="product_gouda">
             <field name="name">Gouda Cheese</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
             <field name="price">2.50</field>
-            <field name="supplier_id" eval="str(ref('supplier_coin_gourmand'))"/>
+            <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
             <field name="description"></field>
-            <field name="image" type="base64" file="lunch/static/img/gouda.png"/>
         </record>
 
         <record model="lunch.product" id="product_chicken_curry">
             <field name="name">Chicken Curry</field>
             <field name="category_id" eval="str(ref('categ_sandwich'))"/>
             <field name="price">2.60</field>
-            <field name="supplier_id" eval="str(ref('supplier_coin_gourmand'))"/>
+            <field name="supplier" eval="str(ref('partner_coin_gourmand'))"/>
             <field name="description"></field>
-            <field name="image" type="base64" file="lunch/static/img/chicken_curry.png"/>
         </record>
 
         <record model="lunch.product" id="product_margherita">
             <field name="name">Pizza Margherita</field>
             <field name="category_id" eval="str(ref('categ_pizza'))"/>
             <field name="price">6.90</field>
-            <field name="supplier_id" eval="str(ref('supplier_pizza_inn'))"/>
+            <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
             <field name="description">Tomatoes, Mozzarella</field>
-            <field name="image" type="base64" file="lunch/static/img/pizza_margherita.png"/>
         </record>
 
         <record model="lunch.product" id="product_funghi">
             <field name="name">Pizza Funghi</field>
             <field name="category_id" eval="str(ref('categ_pizza'))"/>
             <field name="price">7.00</field>
-            <field name="supplier_id" ref="supplier_pizza_inn"/>
+            <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
             <field name="description">Tomatoes, Mushrooms, Mozzarella</field>
-            <field name="image" type="base64" file="lunch/static/img/pizza_funghi.png"/>
         </record>
 
         <record model="lunch.product" id="product_vege">
             <field name="name">Pizza Vegetarian</field>
             <field name="category_id" eval="str(ref('categ_pizza'))"/>
             <field name="price">7.00</field>
-            <field name="supplier_id" ref="supplier_pizza_inn"/>
+            <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
             <field name="description">Tomatoes, Mozzarella, Mushrooms, Peppers, Olives</field>
-            <field name="image" type="base64" file="lunch/static/img/pizza_veggie.png"/>
         </record>
 
         <record model="lunch.product" id="product_italiana">
             <field name="name">Pizza Italiana</field>
             <field name="category_id" eval="str(ref('categ_pizza'))"/>
             <field name="price">7.40</field>
-            <field name="supplier_id" eval="str(ref('supplier_pizza_inn'))"/>
+            <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
             <field name="description">Fresh Tomatoes, Basil, Mozzarella</field>
-            <field name="image" type="base64" file="lunch/static/img/italiana.png"/>
         </record>
 
         <record model="lunch.product" id="product_Bolognese">
             <field name="name">Bolognese Pasta</field>
             <field name="category_id" eval="str(ref('categ_pasta'))"/>
             <field name="price">7.70</field>
-            <field name="supplier_id" eval="str(ref('supplier_pizza_inn'))"/>
+            <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
             <field name="description"></field>
-            <field name="image" type="base64" file="lunch/static/img/pasta_bolognese.png"/>
         </record>
 
          <record model="lunch.product" id="product_Napoli">
             <field name="name">Napoli Pasta</field>
             <field name="category_id" eval="str(ref('categ_pasta'))"/>
             <field name="price">7.70</field>
-            <field name="supplier_id" eval="str(ref('supplier_pizza_inn'))"/>
+            <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
             <field name="description">Tomatoes, Basil</field>
-            <field name="image" type="base64" file="lunch/static/img/napoli.png"/>
-        </record>
-
-        <record model="lunch.topping.type" id="type_garniture">
-            <field name="name">Garniture</field>
-        </record>
-
-        <record model="lunch.topping" id="product_olives">
-            <field name="name">Olives</field>
-            <field name="price">0.30</field>
-            <field name="category_id" ref="categ_pizza"/>
-            <field name="type_id" ref="type_garniture"/>
         </record>
 
          <record model="lunch.product" id="product_4formaggi">
             <field name="name">4 Formaggi</field>
             <field name="category_id" eval="str(ref('categ_pasta'))"/>
             <field name="price">5.50</field>
-            <field name="supplier_id" ref="supplier_pizza_inn"/>
+            <field name="supplier" eval="str(ref('partner_pizza_inn'))"/>
             <field name="description">Tomato sauce, Olive oil, Fresh Tomatoes, Onions, Vegetables, Parmesan</field>
-            <field name="image" type="base64" file="lunch/static/img/4formaggio.png"/>
         </record>
 
         <record model="lunch.order" id="order_1">
@@ -310,7 +244,6 @@
             <field name="date" eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d')"/>
             <field name="order_line_ids" eval="[]"/>
             <field name="state">new</field>
-            <field name="mail_sent" eval="True"/>
         </record>
 
         <record model="lunch.order" id="order_2">
@@ -318,7 +251,6 @@
             <field name="date" eval="(DateTime.now() + timedelta(days=1)).strftime('%Y-%m-%d')"/>
             <field name="order_line_ids" eval="[]"/>
             <field name="state">confirmed</field>
-            <field name="mail_sent" eval="True"/>
         </record>
 
         <record model="lunch.order" id="order_3">
@@ -326,7 +258,6 @@
             <field name="date" eval="(DateTime.now() + timedelta(days=3)).strftime('%Y-%m-%d')"/>
             <field name="order_line_ids" eval="[]"/>
             <field name="state">confirmed</field>
-            <field name="mail_sent" eval="True"/>
         </record>
 
         <record model="lunch.order" id="order_4">
@@ -342,9 +273,9 @@
             <field name="price">7.70</field>
             <field name="date" eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d')"/>
             <field name="state">new</field>
-            <field name="supplier_id" ref="supplier_pizza_inn"/>
+            <field name="supplier" ref="partner_pizza_inn"/>
+            <field name="note">+Emmental</field>
             <field name="order_id" ref="order_1"/>
-            <field name="quantity">1</field>
         </record>
 
         <record model="lunch.order.line" id="order_line_2">
@@ -353,9 +284,9 @@
             <field name="price">7.40</field>
             <field name="date" eval="(DateTime.now() + timedelta(days=1)).strftime('%Y-%m-%d')"/>
             <field name="state">confirmed</field>
-            <field name="supplier_id" ref="supplier_pizza_inn"/>
+            <field name="supplier" ref="partner_pizza_inn"/>
+            <field name="note">+Mushrooms</field>
             <field name="order_id" ref="order_2"/>
-            <field name="quantity">1</field>
         </record>
 
         <record model="lunch.order.line" id="order_line_3">
@@ -364,9 +295,9 @@
             <field name="price">2.50</field>
             <field name="date" eval="(DateTime.now() + timedelta(days=3)).strftime('%Y-%m-%d')"/>
             <field name="state">cancelled</field>
-            <field name="supplier_id" ref="supplier_coin_gourmand"/>
+            <field name="supplier" ref="partner_coin_gourmand"/>
+            <field name="note">+Salad +Tomatoes +Cucumbers</field>
             <field name="order_id" ref="order_3"/>
-            <field name="quantity">1</field>
         </record>
 
         <record model="lunch.order.line" id="order_line_4">
@@ -375,9 +306,9 @@
             <field name="price">2.60</field>
             <field name="date" eval="(DateTime.now() + timedelta(days=3)).strftime('%Y-%m-%d')"/>
             <field name="state">confirmed</field>
-            <field name="supplier_id" ref="supplier_coin_gourmand"/>
+            <field name="supplier" ref="partner_coin_gourmand"/>
+            <field name="note">+Salad +Tomatoes +Eggs</field>
             <field name="order_id" ref="order_3"/>
-            <field name="quantity">1</field>
         </record>
 
         <record model="lunch.order.line" id="order_line_5">
@@ -386,7 +317,7 @@
             <field name="price">5.50</field>
             <field name="date" eval="(DateTime.now() + timedelta(days=3)).strftime('%Y-%m-%d')"/>
             <field name="state">confirmed</field>
-            <field name="supplier_id" ref="supplier_pizza_inn"/>
+            <field name="supplier" ref="partner_pizza_inn"/>
             <field name="order_id" ref="order_4"/>
         </record>
 
@@ -395,7 +326,7 @@
             <field name="date" eval="(DateTime.now() + timedelta(days=2)).strftime('%Y-%m-%d')"/>
             <field name="description">Pizza Italiana</field>
             <field name="amount">-7.40</field>
-            <field name="order_line_id" ref="order_line_1"/>
+            <field name="order_id" ref="order_2"/>
             <field name="state">order</field>
         </record>
 
@@ -404,7 +335,7 @@
             <field name="date" eval="(DateTime.now() + timedelta(days=3)).strftime('%Y-%m-%d')"/>
             <field name="description">Chicken curry</field>
             <field name="amount">-2.60</field>
-            <field name="order_line_id" ref="order_line_2"/>
+            <field name="order_id" ref="order_3"/>
             <field name="state">order</field>
         </record>
 
@@ -429,8 +360,22 @@
             <field name="date" eval="(DateTime.now() + timedelta(days=3)).strftime('%Y-%m-%d')"/>
             <field name="description">Pasta 4 Formaggi</field>
             <field name="amount">-5.50</field>
-            <field name="order_line_id" ref="order_line_3"/>
+            <field name="order_id" ref="order_4"/>
             <field name="state">order</field>
         </record>
+
+        <record model="lunch.alert" id="alert_1">
+            <field name="alert_type">week</field>
+            <field name="monday" eval="True"/>
+            <field name="tuesday" eval="True"/>
+            <field name="wednesday" eval="True"/>
+            <field name="thursday" eval="True"/>
+            <field name="friday" eval="True"/>
+            <field name="saturday" eval="False"/>
+            <field name="sunday" eval="False"/>
+            <field name="start_hour">7</field>
+            <field name="end_hour">23</field>
+            <field name="message">Lunch must be ordered before 10:30 AM</field>
+        </record>
     </data>
 </odoo>