pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] website_sale, *: review prices to be more realistic

Browse Source 
*: product, purchase, purchase_stock, sale, sale_stock, web

PR-69971

task-2501400

closes odoo/odoo#69971

Related: odoo/enterprise#19974
Signed-off-by: Jérémy Kersten (jke) <jke@openerp.com>
This commit is contained in:
Benjamin Vray
2021-07-30 10:39:44 +00:00
committed by Jeremy Kersten
parent 6aa85001cb
commit 81f0f0840c
7 changed files with 66 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/product/data/product_demo.xml
+24 -24
View File
@@ -296,8 +296,8 @@
<record id="product_product_7" model="product.product">
<field name="name">Storage Box</field>
<field name="categ_id" ref="product_category_5"/>
<field name="standard_price">70.0</field>
<field name="list_price">79.0</field>
<field name="standard_price">14.0</field>
<field name="list_price">15.8</field>
<field name="type">consu</field>
<field name="weight">0.01</field>
<field name="uom_id" ref="uom.product_uom_unit"/>
@@ -336,8 +336,8 @@
<record id="product_product_10" model="product.product">
<field name="name">Cabinet with Doors</field>
<field name="categ_id" ref="product_category_5"/>
<field name="standard_price">12.50</field>
<field name="list_price">14</field>
<field name="standard_price">120.50</field>
<field name="list_price">140</field>
<field name="type">consu</field>
<field name="weight">0.01</field>
<field name="uom_id" ref="uom.product_uom_unit"/>
@@ -349,8 +349,8 @@
<record id="product_product_11_product_template" model="product.template">
<field name="name">Conference Chair</field>
<field name="categ_id" ref="product_category_5"/>
<field name="standard_price">14</field>
<field name="list_price">16.50</field>
<field name="standard_price">28</field>
<field name="list_price">33</field>
<field name="type">consu</field>
<field name="uom_id" ref="uom.product_uom_unit"/>
<field name="uom_po_id" ref="uom.product_uom_unit"/>
@@ -410,8 +410,8 @@
<record id="product_product_12" model="product.product">
<field name="name">Office Chair Black</field>
<field name="categ_id" ref="product_category_5"/>
<field name="standard_price">18</field>
<field name="list_price">12.50</field>
<field name="standard_price">180</field>
<field name="list_price">120.50</field>
<field name="type">consu</field>
<field name="weight">0.01</field>
<field name="uom_id" ref="uom.product_uom_unit"/>
@@ -487,8 +487,8 @@
<record id="product_product_25" model="product.product">
<field name="name">Acoustic Bloc Screens</field>
<field name="categ_id" ref="product_category_5"/>
<field name="standard_price">2870.0</field>
<field name="list_price">2950.0</field>
<field name="standard_price">287.0</field>
<field name="list_price">295.0</field>
<field name="type">consu</field>
<field name="weight">0.01</field>
<field name="uom_id" ref="uom.product_uom_unit"/>
@@ -500,8 +500,8 @@
<record id="product_product_27" model="product.product">
<field name="name">Drawer</field>
<field name="categ_id" ref="product_category_5"/>
<field name="standard_price">3300.0</field>
<field name="list_price">3645.0</field>
<field name="standard_price">100.0</field>
<field name="list_price">110.50</field>
<field name="type">consu</field>
<field name="weight">0.01</field>
<field name="uom_id" ref="uom.product_uom_unit"/>
@@ -514,8 +514,8 @@
<record id="consu_delivery_03" model="product.product">
<field name="name">Four Person Desk</field>
<field name="categ_id" ref="product_category_5"/>
<field name="standard_price">25000.0</field>
<field name="list_price">23500.0</field>
<field name="standard_price">2500.0</field>
<field name="list_price">2350.0</field>
<field name="type">consu</field>
<field name="weight">0.01</field>
<field name="uom_id" ref="uom.product_uom_unit"/>
@@ -528,8 +528,8 @@
<record id="consu_delivery_02" model="product.product">
<field name="name">Large Meeting Table</field>
<field name="categ_id" ref="product_category_5"/>
<field name="standard_price">45000.0</field>
<field name="list_price">40000.0</field>
<field name="standard_price">4500.0</field>
<field name="list_price">4000.0</field>
<field name="type">consu</field>
<field name="weight">0.01</field>
<field name="uom_id" ref="uom.product_uom_unit"/>
@@ -589,7 +589,7 @@
<field name="name" ref="base.res_partner_1"/>
<field name="delay">3</field>
<field name="min_qty">1</field>
<field name="price">65</field>
<field name="price">13.0</field>
<field name="currency_id" ref="base.USD"/>
</record>
@@ -598,7 +598,7 @@
<field name="name" ref="base.res_partner_4"/>
<field name="delay">3</field>
<field name="min_qty">1</field>
<field name="price">72</field>
<field name="price">14.4</field>
<field name="currency_id" ref="base.USD"/>
</record>
@@ -625,7 +625,7 @@
<field name="name" ref="base.res_partner_1"/>
<field name="delay">2</field>
<field name="min_qty">1</field>
<field name="price">12.50</field>
<field name="price">120.50</field>
<field name="currency_id" ref="base.USD"/>
</record>
@@ -634,7 +634,7 @@
<field name="name" ref="base.res_partner_1"/>
<field name="delay">2</field>
<field name="min_qty">1</field>
<field name="price">14</field>
<field name="price">28</field>
<field name="currency_id" ref="base.USD"/>
</record>
@@ -697,7 +697,7 @@
<field name="name" ref="base.res_partner_1"/>
<field name="delay">8</field>
<field name="min_qty">1</field>
<field name="price">2870</field>
<field name="price">287</field>
<field name="currency_id" ref="base.USD"/>
</record>
@@ -760,7 +760,7 @@
<field name="name" ref="base.res_partner_1"/>
<field name="delay">10</field>
<field name="min_qty">0</field>
<field name="price">3300</field>
<field name="price">95.50</field>
<field name="currency_id" ref="base.USD"/>
</record>
@@ -769,7 +769,7 @@
<field name="name" ref="base.res_partner_1"/>
<field name="delay">3</field>
<field name="min_qty">0</field>
<field name="price">12.50</field>
<field name="price">120.50</field>
<field name="currency_id" ref="base.USD"/>
</record>
@@ -778,7 +778,7 @@
<field name="name" ref="base.res_partner_4"/>
<field name="delay">2</field>
<field name="min_qty">0</field>
<field name="price">13.50</field>
<field name="price">130.50</field>
<field name="currency_id" ref="base.USD"/>
</record>
addons/purchase/data/purchase_demo.xml
+3 -3
View File
@@ -33,14 +33,14 @@
(0, 0, {
'product_id': ref('product.product_product_25'),
'name': obj().env.ref('product.product_product_25').partner_ref,
'price_unit': 2868.70,
'price_unit': 286.70,
'product_qty': 5.0,
'product_uom': ref('uom.product_uom_unit'),
'date_planned': DateTime.today() + relativedelta(days=3)}),
(0, 0, {
'product_id': ref('product.product_product_27'),
'name': obj().env.ref('product.product_product_27').partner_ref,
'price_unit': 3297.20,
'price_unit': 99.00,
'product_qty': 4.0,
'product_uom': ref('uom.product_uom_unit'),
'date_planned': DateTime.today() + relativedelta(days=3)})
@@ -176,7 +176,7 @@
(0, 0, {
'product_id': ref('product.product_product_12'),
'name': obj().env.ref('product.product_product_12').partner_ref,
'price_unit': 13.5,
'price_unit': 130.5,
'product_qty': 5.0,
'product_uom': ref('uom.product_uom_unit'),
'date_planned': DateTime.today()}),
addons/purchase_stock/data/purchase_stock_demo.xml
+1 -1
View File
@@ -44,7 +44,7 @@
(0, 0, {
'product_id': ref('product.product_product_25'),
'name': obj().env.ref('product.product_product_25').partner_ref,
'price_unit': 2864.80,
'price_unit': 286.80,
'product_qty': 20.0,
'product_uom': ref('uom.product_uom_unit'),
'date_planned': DateTime.today()}),
addons/sale/data/sale_demo.xml
+25 -25
View File
@@ -44,7 +44,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">3</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">2950.00</field>
<field name="price_unit">295.00</field>
</record>
<record id="sale_order_line_2" model="sale.order.line">
@@ -239,7 +239,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">5</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">2950.00</field>
<field name="price_unit">295.00</field>
</record>
<record id="sale_order_line_17" model="sale.order.line">
@@ -288,7 +288,7 @@
<field name="product_id" ref="product.product_product_27"/>
<field name="product_uom_qty">2</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">3645.00</field>
<field name="price_unit">110.50</field>
</record>
<record id="sale_order_line_21" model="sale.order.line">
@@ -297,7 +297,7 @@
<field name="product_id" ref="product.product_product_12"/>
<field name="product_uom_qty">2</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">12.50</field>
<field name="price_unit">120.50</field>
</record>
<!-- additional demo data for pretty graphs in sales dashboard -->
@@ -321,7 +321,7 @@
<field name="product_id" ref="product.product_product_27"/>
<field name="product_uom_qty">3</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">3245.00</field>
<field name="price_unit">97.50</field>
</record>
<record id="sale_order_line_23" model="sale.order.line">
@@ -330,7 +330,7 @@
<field name="product_id" ref="product.product_product_12"/>
<field name="product_uom_qty">3</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">12.50</field>
<field name="price_unit">120.50</field>
</record>
<record id="sale_order_10" model="sale.order">
@@ -353,7 +353,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">2</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">2550.00</field>
<field name="price_unit">255.00</field>
</record>
<record id="sale_order_line_25" model="sale.order.line">
@@ -362,7 +362,7 @@
<field name="product_id" ref="product.product_product_12"/>
<field name="product_uom_qty">2</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">12.50</field>
<field name="price_unit">120.50</field>
</record>
@@ -385,7 +385,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">3</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">2450.00</field>
<field name="price_unit">245.00</field>
</record>
<record id="sale_order_line_27" model="sale.order.line">
@@ -394,7 +394,7 @@
<field name="product_id" ref="product.product_product_12"/>
<field name="product_uom_qty">3</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">12.50</field>
<field name="price_unit">120.50</field>
</record>
<record id="sale_order_12" model="sale.order">
@@ -417,7 +417,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">1</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">3150.00</field>
<field name="price_unit">315.00</field>
</record>
<record id="sale_order_line_29" model="sale.order.line">
@@ -426,7 +426,7 @@
<field name="product_id" ref="product.product_product_12"/>
<field name="product_uom_qty">2</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">12.50</field>
<field name="price_unit">120.50</field>
</record>
<record id="sale_order_13" model="sale.order">
@@ -448,7 +448,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">1</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">2950.00</field>
<field name="price_unit">295.00</field>
</record>
<record id="sale_order_line_31" model="sale.order.line">
@@ -457,7 +457,7 @@
<field name="product_id" ref="product.product_product_12"/>
<field name="product_uom_qty">1</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">12.50</field>
<field name="price_unit">120.50</field>
</record>
<record id="sale_order_14" model="sale.order">
@@ -479,7 +479,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">4</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">2750.00</field>
<field name="price_unit">275.00</field>
</record>
<record id="sale_order_line_33" model="sale.order.line">
@@ -488,7 +488,7 @@
<field name="product_id" ref="product.product_product_12"/>
<field name="product_uom_qty">4</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">12.50</field>
<field name="price_unit">120.50</field>
</record>
<record id="sale_order_15" model="sale.order">
@@ -510,7 +510,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">4</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">2950.00</field>
<field name="price_unit">295.00</field>
</record>
<record id="sale_order_line_35" model="sale.order.line">
@@ -519,7 +519,7 @@
<field name="product_id" ref="product.product_product_12"/>
<field name="product_uom_qty">3</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">12.50</field>
<field name="price_unit">120.50</field>
</record>
<record id="sale_order_16" model="sale.order">
@@ -541,7 +541,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">3</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">2750.00</field>
<field name="price_unit">275.00</field>
</record>
<record id="sale_order_line_37" model="sale.order.line">
@@ -550,7 +550,7 @@
<field name="product_id" ref="product.product_product_12"/>
<field name="product_uom_qty">3</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">12.50</field>
<field name="price_unit">120.50</field>
</record>
<record id="sale_order_17" model="sale.order">
@@ -572,7 +572,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">2</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">3550.00</field>
<field name="price_unit">355.00</field>
</record>
<record id="sale_order_line_39" model="sale.order.line">
@@ -581,7 +581,7 @@
<field name="product_id" ref="product.product_product_12"/>
<field name="product_uom_qty">2</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">12.50</field>
<field name="price_unit">120.50</field>
</record>
<record id="sale_order_18" model="sale.order">
@@ -603,7 +603,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">2</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">2950.00</field>
<field name="price_unit">295.00</field>
</record>
<record id="sale_order_line_41" model="sale.order.line">
@@ -612,7 +612,7 @@
<field name="product_id" ref="product.product_product_12"/>
<field name="product_uom_qty">2</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">12.50</field>
<field name="price_unit">120.50</field>
</record>
<!-- Confirm some Sales Orders-->
@@ -724,7 +724,7 @@ Thanks!</field>
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">3</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">2950.00</field>
<field name="price_unit">295.00</field>
</record>
<record id="portal_sale_order_line_2" model="sale.order.line">
addons/sale_stock/data/sale_order_demo.xml
+5 -5
View File
@@ -47,7 +47,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">5</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">2950.00</field>
<field name="price_unit">295.00</field>
</record>
<record id="sale_order_line_43" model="sale.order.line">
@@ -56,7 +56,7 @@
<field name="product_id" ref="product.product_product_10"/>
<field name="product_uom_qty">5</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">14.00</field>
<field name="price_unit">140.00</field>
</record>
<record id="sale_order_20" model="sale.order">
@@ -79,7 +79,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">5</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">2950.00</field>
<field name="price_unit">295.00</field>
</record>
<record id="sale_order_21" model="sale.order">
@@ -102,7 +102,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">10</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">2950.00</field>
<field name="price_unit">295.00</field>
</record>
<record id="sale_order_line_46" model="sale.order.line">
@@ -111,7 +111,7 @@
<field name="product_id" ref="product.product_product_10"/>
<field name="product_uom_qty">10</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">14.00</field>
<field name="price_unit">140.00</field>
</record>
<function model="sale.order" name="action_confirm" eval="[[
addons/web/views/report_templates.xml
+5 -5
View File
@@ -191,13 +191,13 @@
<span>5.000</span>
</td>
<td class="text-right d-none d-md-table-cell">
<span class="text-nowrap">23,500.00</span>
<span class="text-nowrap">2,350.00</span>
</td>
<td class="text-left d-none d-md-table-cell">
<span id="line_tax_ids">15.00%</span>
</td>
<td class="text-right o_price_total">
<span class="text-nowrap">$ <span class="oe_currency_value">117,500.00</span></span>
<span class="text-nowrap">$ <span class="oe_currency_value">11,750.00</span></span>
</td>
</tr>
</tbody>
@@ -209,20 +209,20 @@
<tbody><tr class="border-black o_subtotal" style="">
<td><strong>Subtotal</strong></td>
<td class="text-right">
<span>$ <span class="oe_currency_value">125,000.00</span></span>
<span>$ <span class="oe_currency_value">19,250.00</span></span>
</td>
</tr>
<tr style="">
<td><span class="text-nowrap">Tax 15%</span></td>
<td class="text-right o_price_total">
<span class="text-nowrap">$ 18,750.00</span>
<span class="text-nowrap">$ 2,887.50</span>
</td>
</tr>
<tr class="border-black o_total">
<td><strong>Total</strong></td>
<td class="text-right">
<span class="text-nowrap">$ <span class="oe_currency_value">
143,750.00</span></span>
22,137.50</span></span>
</td>
</tr>
</tbody></table>
addons/website_sale/data/demo.xml
+3 -3
View File
@@ -507,7 +507,7 @@
<field name="product_id" ref="product.product_product_25"/>
<field name="product_uom_qty">1</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">2950.00</field>
<field name="price_unit">295.00</field>
</record>
<record id="website_sale_order_line_10" model="sale.order.line">
@@ -516,7 +516,7 @@
<field name="product_id" ref="product.product_product_12"/>
<field name="product_uom_qty">1</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">12.50</field>
<field name="price_unit">120.50</field>
</record>
<!-- Active Carts -->
@@ -538,7 +538,7 @@
<field name="product_id" ref="product.product_product_11"/>
<field name="product_uom_qty">2</field>
<field name="product_uom" ref="uom.product_uom_unit"/>
<field name="price_unit">16.50</field>
<field name="price_unit">33</field>
</record>
<!-- Abandoned Carts -->