diff --git a/addons/point_of_sale/test/01_order_to_payment.yml b/addons/point_of_sale/test/01_order_to_payment.yml
index bf201affc4a..1f2713763c4 100644
--- a/addons/point_of_sale/test/01_order_to_payment.yml
+++ b/addons/point_of_sale/test/01_order_to_payment.yml
@@ -81,12 +81,12 @@
discount: 0.0
qty: 3.0
-
- I check that the total of the order is equal to 450*2 + 300*3*1.05 and the tax of the order is equal to 900 -(450 * 2 / 1.1) + 300*0.05*3
+ I check that the total of the order is equal to 450*2 + 300*3*1.10 and the tax of the order is equal to 900 -(450 * 2) + 300*1.10*3
-
!python {model: pos.order}: |
order = self.browse(cr, uid, ref('pos_order_pos0'))
- assert(abs(order.amount_total - (450*2 + 300*3*1.05)) < 0.01), "The order has a wrong amount, tax included"
- assert(abs(order.amount_tax - (900-(450*2/1.1) + 300*0.05*3)) < 0.01), "The order has a wrong tax amount"
+ assert(abs(order.amount_total - (450*2 + 300*3*1.10)) < 0.01), "The order has a wrong amount, tax included"
+ assert(abs(order.amount_tax - (900-(450*2) + 300*0.10*3)) < 0.01), "The order has a wrong tax amount"
-
I want to add a global discount of 5 percent using the wizard
-
@@ -99,11 +99,11 @@
self.apply_discount(cr, uid, [ref("pos_discount_0")], {"active_model": "pos.order",
"active_ids": [ref("pos_order_pos0")], "active_id": ref("pos_order_pos0"), })
-
- I check that the total of the order is now equal to (450*2 + 300*3*1.05)*0.95
+ I check that the total of the order is now equal to (450*2 + 300*3*1.10)*0.95
-
!python {model: pos.order}: |
order = self.browse(cr, uid, ref('pos_order_pos0'))
- assert(abs(order.amount_total - (450*2 + 300*3*1.05)*0.95) < 0.01), "The order has a wrong total including tax and discounts"
+ assert(abs(order.amount_total - (450*2 + 300*3*1.10)*0.95) < 0.01), "The order has a wrong total including tax and discounts"
-
I click on the "Make Payment" wizard to pay the PoS order with a partial amount of 100.0 EUR
-
@@ -124,13 +124,13 @@
-
!python {model: pos.make.payment}: |
defs = self.default_get(cr, uid, ['amount'], {'active_id': ref('pos_order_pos0')})
- assert abs(defs['amount'] - ((450*2 + 300*3*1.05)*0.95-100.0)) < 0.01, "The remaining balance is incorrect"
+ assert abs(defs['amount'] - ((450*2 + 300*3*1.10)*0.95-100.0)) < 0.01, "The remaining balance is incorrect"
-
I pay the remaining balance.
-
!record {model: pos.make.payment, id: pos_make_payment_1, context: '{"active_id": ref("pos_order_pos0"), "active_ids": [ref("pos_order_pos0")]}' }:
amount: !eval >
- (450*2 + 300*3*1.05)*0.95-100.0
+ (450*2 + 300*3*1.10)*0.95-100.0
-
I click on the validate button to register the payment.
-
diff --git a/addons/point_of_sale/test/02_order_to_invoice.yml b/addons/point_of_sale/test/02_order_to_invoice.yml
index bd76eb08a9c..c7b45ed11ce 100644
--- a/addons/point_of_sale/test/02_order_to_invoice.yml
+++ b/addons/point_of_sale/test/02_order_to_invoice.yml
@@ -20,7 +20,7 @@
-
!record {model: pos.make.payment, id: pos_make_payment_2, context: '{"active_id": ref("pos_order_pos1"), "active_ids": [ref("pos_order_pos1")]}' }:
amount: !eval >
- (450*2 + 300*3*1.05)*0.95
+ (450*2 + 300*3*1.10)*0.95
-
I click on the validate button to register the payment.
-
@@ -43,4 +43,4 @@
I test that the total of the attached invoice is correct
-
!assert {model: pos.order, id: pos_order_pos1, string: Invoice not correct}:
- - amount_total == (450*2 + 300*3*1.05)*0.95
+ - amount_total == (450*2 + 300*3*1.10)*0.95
diff --git a/addons/product/product_demo.xml b/addons/product/product_demo.xml
index d01777da143..07ed9989cd1 100644
--- a/addons/product/product_demo.xml
+++ b/addons/product/product_demo.xml
@@ -108,7 +108,7 @@
PCSC234
SC234
- 10
+ 0.0
17" LCD Monitor
Processor AMD 8-Core
512MB RAM
@@ -119,7 +119,7 @@ HDD SH-1
PCSC349
SC349
- 300
+ 300.0
19" LCD Monitor
Processor Core i5 2.70 Ghz
2GB RAM
@@ -130,7 +130,7 @@ HDD SH-1
PC-DEM
Custom
- 450
+ 450.0
Custom computer assembled on order based on customer's requirement.
@@ -149,14 +149,14 @@ HDD SH-1
LCD15
15inch
- 100
+ 0.0
LCD17
17inch
- 150
+ 150.0
@@ -172,7 +172,7 @@ HDD SH-1
KeyQ
QWERTY
- 2.0
+ 0.0
@@ -195,7 +195,7 @@ HDD SH-1
M-Opt
Optical
- 1.0
+ 0.0
@@ -209,7 +209,7 @@ HDD SH-1
M-Wir
Wireless
- 7.50
+ 1.50
@@ -225,21 +225,21 @@ HDD SH-1
RAM-SR5
1GB-SR5
- 5.0
+ 0.0
RAM-SR2
2GB-SR2
- 15.0
+ 10.0
RAM-SR3
1GB-SR3
- 5.0
+ 0.0
@@ -269,21 +269,21 @@ HDD SH-1
HDD-SH1
180GB-SH1
- 5.0
+ 0.0
HDD-SH2
180GB-SH2
- 250.0
+ 175.0
HDD-DEM
On Demand
- 300.0
+ 275.0
On demand hard-disk having capacity based on requirement.
@@ -307,7 +307,7 @@ HDD SH-1
MBa20
A20Z7
- 100.0
+ 50.0
@@ -376,7 +376,7 @@ QWERTY keyboard
LAP-S3
S3450
- 550.0
+ 295.0
17" Monitor
6GB RAM
Hi-Speed 234Q Processor
@@ -387,7 +387,7 @@ QWERTY keyboard
LAP-CUS
Customized
- 645.0
+ 695.0
Custom Laptop based on customer's requirement.
@@ -419,7 +419,7 @@ QWERTY keyboard
PD-SP2
4GB-SP2
- 10
+ 0.0
@@ -427,7 +427,7 @@ QWERTY keyboard
PD-SP4
8GB-SP4
- 85
+ 45
@@ -458,7 +458,7 @@ QWERTY keyboard
HEAD
Standard
- 3
+ 0.0
Hands free headset for laptop PC with in-line microphone and headphone plug.
@@ -466,7 +466,7 @@ QWERTY keyboard
HEAD-USB
USB
- 10
+ 30.0
Headset for laptop PC with USB connector.