@@ -144,13 +144,13 @@
- Model brand of Vehicle
+ Model make of Vehicle
fleet.vehicle.model.brand
form
kanban,tree,form
- Click to create a new brand.
+ Click to create a new make.
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
index b6b52544cbc..3a185736fe5 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice.yml
@@ -92,6 +92,7 @@
I check that Invoice is created for this timesheet.
-
!python {model: account.analytic.line}: |
+ from openerp.tools import float_compare
aline = self.browse(cr, uid, ref('account_analytic_line_developyamlforhrmodule0'))
analytic_account_obj = self.pool.get('account.analytic.account')
data = self.pool.get('hr.timesheet.invoice.create').read(cr, uid, [ref("hr_timesheet_invoice_create_0")], [], context)[0]
@@ -111,5 +112,5 @@
assert product == product_exp
assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
- assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
- assert invoice_id.amount_tax == 50, "Invoice tax mismatch: %s" % invoice_id.amount_tax
+ assert float_compare(invoice_id.amount_untaxed, 187.5, precision_digits=2) == 0, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
+ assert float_compare(invoice_id.amount_tax, 50, precision_digits=2) == 0, "Invoice tax mismatch: %s" % invoice_id.amount_tax
diff --git a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
index c5b7c9b5be8..dac550a369a 100644
--- a/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
+++ b/addons/hr_timesheet_invoice/test/test_hr_timesheet_invoice_no_prod_tax.yml
@@ -90,6 +90,7 @@
I check that Invoice is created for this timesheet.
-
!python {model: account.analytic.line}: |
+ from openerp.tools import float_compare
aline = self.browse(cr, uid, ref('account_analytic_line_developyamlforhrmodule1'))
analytic_account_obj = self.pool.get('account.analytic.account')
data = self.pool.get('hr.timesheet.invoice.create').read(cr, uid, [ref("hr_timesheet_invoice_create_0")], [], context)[0]
@@ -110,5 +111,5 @@
assert product == product_exp
assert aline.invoice_id, "Invoice created, but analytic line wasn't updated."
assert aline.invoice_id == invoice_id, "Invoice doesn't match the one at analytic line"
- assert invoice_id.amount_untaxed == 187.5, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
- assert invoice_id.amount_tax == 40, "Invoice tax mismatch: %s" % invoice_id.amount_tax
+ assert float_compare(invoice_id.amount_untaxed, 187.5, precision_digits=2) == 0, "Invoice amount mismatch: %s" % invoice_id.amount_untaxed
+ assert float_compare(invoice_id.amount_tax, 40, precision_digits=2) == 0, "Invoice tax mismatch: %s" % invoice_id.amount_tax
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 ea63b24c58c..90442a9a2e1 100644
--- a/addons/point_of_sale/test/02_order_to_invoice.yml
+++ b/addons/point_of_sale/test/02_order_to_invoice.yml
@@ -47,5 +47,7 @@
-
I test that the total of the attached invoice is correct
-
- !assert {model: pos.order, id: pos_order_pos1, string: Invoice inconsistent with its origin order}:
- - invoice_id.amount_total == 1795.5
+ !python {model: pos.order}: |
+ from openerp.tools import float_compare
+ amount_total = self.browse(cr, uid, ref('pos_order_pos1')).amount_total
+ assert float_compare(amount_total, 1752.75, precision_digits=2) == 0, "Invoice not correct"
diff --git a/addons/product/test/product_pricelist.yml b/addons/product/test/product_pricelist.yml
index 53fa22df43e..6380e660451 100644
--- a/addons/product/test/product_pricelist.yml
+++ b/addons/product/test/product_pricelist.yml
@@ -4,60 +4,64 @@
I check sale price of Assemble Computer
-
!python {model: product.product}: |
+ from openerp.tools import float_compare
context.update({'pricelist': ref("customer_pricelist"), 'quantity':1})
product = self.browse(cr, uid, ref("product_product_4"), context=context)
- assert product.price == (product.lst_price-product.lst_price*(0.10)), "Wrong sale price: Assemble Computer."
+ assert float_compare(product.price, (product.lst_price-product.lst_price*(0.10)), precision_digits=2) == 0, "Wrong sale price: Assemble Computer."
-
I check sale price of Laptop.
-
!python {model: product.product}: |
+ from openerp.tools import float_compare
product = self.browse(cr, uid, ref("product_product_25"), context=context)
- assert product.price == product.lst_price + 1, "Wrong sale price: Laptop."
+ assert float_compare(product.price, product.lst_price + 1, precision_digits=2) == 0, "Wrong sale price: Laptop."
-
I check sale price of IT component.
-
!python {model: product.product}: |
+ from openerp.tools import float_compare
product = self.browse(cr, uid, ref("product_product_7"), context=context)
- assert product.price == product.lst_price, "Wrong sale price: IT component."
-
+ assert float_compare(product.price, product.lst_price, precision_digits=2) == 0, "Wrong sale price: IT component."
-
I check sale price of IT component if more than 3 Unit.
-
!python {model: product.product}: |
+ from openerp.tools import float_compare
context.update({'quantity':5})
product = self.browse(cr, uid, ref("product_product_26"), context=context)
- assert product.price == product.lst_price-product.lst_price*(0.05), "Wrong sale price: IT component if more than 3 Unit."
+ assert float_compare(product.price, product.lst_price-product.lst_price*(0.05), precision_digits=2) == 0, "Wrong sale price: IT component if more than 3 Unit."
-
I check sale price of LCD Monitor.
-
!python {model: product.product}: |
+ from openerp.tools import float_compare
context.update({'quantity':1})
product = self.browse(cr, uid, ref("product_product_6"), context=context)
- assert product.price == product.lst_price, "Wrong sale price: LCD Monitor."
-
+ assert float_compare(product.price, product.lst_price, precision_digits=2) == 0, "Wrong sale price: LCD Monitor."
-
I check sale price of LCD Monitor on end of year.
-
!python {model: product.product}: |
+ from openerp.tools import float_compare
context.update({'quantity':1, 'date': '2011-12-31'})
product = self.browse(cr, uid, ref("product_product_6"), context=context)
- assert product.price == product.lst_price-product.lst_price*(0.30), "Wrong sale price: LCD Monitor on end of year."
-
+ assert float_compare(product.price, product.lst_price-product.lst_price*(0.30), precision_digits=2) == 0, "Wrong sale price: LCD Monitor on end of year."
-
I check cost price of LCD Monitor.
-
!python {model: product.product}: |
+ from openerp.tools import float_compare
context.update({'quantity':1, 'date': False, 'partner': ref('base.res_partner_4'), 'pricelist': ref("supplier_pricelist")})
product = self.browse(cr, uid, ref("product_product_6"), context=context)
- assert product.price == 792, "wrong cost price: LCD Monitor."
+ assert float_compare(product.price, 792, precision_digits=2) == 0, "Wrong cost price: LCD Monitor."
-
I check cost price of LCD Monitor if more than 3 Unit.
-
!python {model: product.product}: |
+ from openerp.tools import float_compare
context.update({'quantity':3})
product = self.browse(cr, uid, ref("product_product_6"), context=context)
- assert product.price == 787, "wrong cost price: LCD Monitor if more than 3 Unit."
-
+ assert float_compare(product.price, 787, precision_digits=2) == 0, "Wrong cost price: LCD Monitor if more than 3 Unit."
-
I print the sale prices report.
-
diff --git a/addons/purchase/test/process/edi_purchase_order.yml b/addons/purchase/test/process/edi_purchase_order.yml
index 6d585d69c65..f97a20ab3a9 100644
--- a/addons/purchase/test/process/edi_purchase_order.yml
+++ b/addons/purchase/test/process/edi_purchase_order.yml
@@ -37,6 +37,7 @@
Then I import a sample EDI document of a sale order (v7.0)
-
!python {model: edi.edi}: |
+ from openerp.tools import float_compare
purchase_order_pool = self.pool.get('purchase.order')
edi_document = {
"__id": "sale:724f9v70-dv70-1v70-8v70-701a04e25v70.sale_order_test",
@@ -120,17 +121,17 @@
assert bank_info.acc_number == "Guys bank: 123477777-156113", 'Expected "Guys bank: 123477777-156113", got %s' % bank_info.acc_number
assert order_new.pricelist_id.name == 'Default Purchase Pricelist' , "Default Purchase Pricelist was not automatically assigned"
- assert order_new.amount_total == 350, "Amount total is not same"
- assert order_new.amount_untaxed == 350, "untaxed amount is not same"
+ assert float_compare(order_new.amount_total, 350, precision_digits=2) == 0, "Amount total is not same"
+ assert float_compare(order_new.amount_untaxed, 350, precision_digits=2) == 0, "untaxed amount is not same"
assert len(order_new.order_line) == 2, "Purchase order lines number mismatch"
for purchase_line in order_new.order_line:
if purchase_line.name == 'PC Assemble SC234':
assert purchase_line.product_uom.name == "Unit" , "uom is not same"
- assert purchase_line.price_unit == 150 , "unit price is not same, got %s, expected 150"%(purchase_line.price_unit,)
+ assert float_compare(purchase_line.price_unit, 150 , precision_digits=2) == 0, "unit price is not same, got %s, expected 150"%(purchase_line.price_unit,)
assert purchase_line.product_qty == 1 , "product qty is not same"
elif purchase_line.name == 'PC on Demand':
assert purchase_line.product_uom.name == "Unit" , "uom is not same"
- assert purchase_line.price_unit == 20 , "unit price is not same, got %s, expected 20"%(purchase_line.price_unit,)
+ assert float_compare(purchase_line.price_unit, 20 , precision_digits=2) == 0, "unit price is not same, got %s, expected 20"%(purchase_line.price_unit,)
assert purchase_line.product_qty == 10 , "product qty is not same"
else:
raise AssertionError('unknown order line: %s' % purchase_line)
@@ -138,6 +139,7 @@
"Then I import a sample EDI document of a sale order (v6.1 - to test backwards compatibility)"
-
!python {model: edi.edi}: |
+ from openerp.tools import float_compare
purchase_order_pool = self.pool.get('purchase.order')
edi_document = {
"__id": "sale:724f93ec-ddd0-11e0-88ec-701a04e25543.sale_order_test",
@@ -221,17 +223,17 @@
assert bank_info.acc_number == "Another bank: 123477700-156113", 'Expected "Another bank: 123477700-156113", got %s' % bank_info.acc_number
assert order_new.pricelist_id.name == 'Default Purchase Pricelist' , "Default Purchase Pricelist was not automatically assigned"
- assert order_new.amount_total == 350, "Amount total is not same"
- assert order_new.amount_untaxed == 350, "untaxed amount is not same"
+ assert float_compare(order_new.amount_total, 350, precision_digits=2) == 0, "Amount total is not same"
+ assert float_compare(order_new.amount_untaxed, 350, precision_digits=2) == 0, "untaxed amount is not same"
assert len(order_new.order_line) == 2, "Purchase order lines number mismatch"
for purchase_line in order_new.order_line:
if purchase_line.name == 'Basic PC':
assert purchase_line.product_uom.name == "PCE" , "uom is not same"
- assert purchase_line.price_unit == 150 , "unit price is not same, got %s, expected 150"%(purchase_line.price_unit,)
+ assert float_compare(purchase_line.price_unit, 150 , precision_digits=2) == 0, "unit price is not same, got %s, expected 150"%(purchase_line.price_unit,)
assert purchase_line.product_qty == 1 , "product qty is not same"
elif purchase_line.name == 'Medium PC':
assert purchase_line.product_uom.name == "PCE" , "uom is not same"
- assert purchase_line.price_unit == 20 , "unit price is not same, got %s, expected 20"%(purchase_line.price_unit,)
+ assert float_compare(purchase_line.price_unit, 20 , precision_digits=2) == 0, "unit price is not same, got %s, expected 20"%(purchase_line.price_unit,)
assert purchase_line.product_qty == 10 , "product qty is not same"
else:
raise AssertionError('unknown order line: %s' % purchase_line)
diff --git a/addons/purchase/test/process/rfq2order2done.yml b/addons/purchase/test/process/rfq2order2done.yml
index bf48e3369d2..d4c4a9dff0d 100644
--- a/addons/purchase/test/process/rfq2order2done.yml
+++ b/addons/purchase/test/process/rfq2order2done.yml
@@ -3,8 +3,10 @@
-
I check the total untaxed amount of the RFQ is correctly computed
-
- !assert {model: purchase.order, id: purchase_order_1, string: The amount of RFQ is not correctly computed}:
- - round(sum([l.price_subtotal for l in order_line]), 2) == round(amount_untaxed, 2)
+ !python {model: purchase.order}: |
+ from openerp.tools import float_compare
+ po = self.browse(cr, uid, ref('purchase_order_1'))
+ assert float_compare(sum([l.price_subtotal for l in po.order_line]), po.amount_untaxed, precision_digits=2) == 0, "The amount of RFQ is not correctly computed"
-
I confirm the RFQ.
-
@@ -18,6 +20,7 @@
I check that the invoice details which is generated after confirmed RFQ.
-
!python {model: purchase.order}: |
+ from openerp.tools import float_compare
purchase_order = self.browse(cr, uid, ref("purchase_order_1"))
assert len(purchase_order.invoice_ids) >= 1, "Invoice is not generated more or less than one"
for invoice in purchase_order.invoice_ids:
@@ -28,9 +31,9 @@
assert invoice.currency_id.id == purchase_order.pricelist_id.currency_id.id ,"Invoice currency is not correspond with purchase order"
assert invoice.origin == purchase_order.name,"Invoice origin is not correspond with purchase order"
assert invoice.company_id.id == purchase_order.company_id.id ,"Invoice company is not correspond with purchase order"
- assert invoice.amount_untaxed == purchase_order.amount_untaxed, "Invoice untaxed amount is not correspond with purchase order"
- assert invoice.amount_tax == purchase_order.amount_tax, "Invoice tax amount is not correspond with purchase order"
- assert invoice.amount_total == purchase_order.amount_total, "Invoice total amount is not correspond with purchase order"
+ assert float_compare(invoice.amount_untaxed, purchase_order.amount_untaxed, precision_digits=2) == 0, "Invoice untaxed amount is not correspond with purchase order"
+ assert float_compare(invoice.amount_tax, purchase_order.amount_tax, precision_digits=2) == 0, "Invoice tax amount is not correspond with purchase order"
+ assert float_compare(invoice.amount_total, purchase_order.amount_total, precision_digits=2) == 0, "Invoice total amount is not correspond with purchase order"
assert len(invoice.invoice_line) == len(purchase_order.order_line), "Lines of Invoice and Purchase Order are not correspond"
-
I check that Reception details after confirmed RFQ.
diff --git a/addons/purchase_requisition/test/purchase_requisition.yml b/addons/purchase_requisition/test/purchase_requisition.yml
index af5aade2833..97b0875ed35 100644
--- a/addons/purchase_requisition/test/purchase_requisition.yml
+++ b/addons/purchase_requisition/test/purchase_requisition.yml
@@ -21,6 +21,7 @@
I check requisition details which created after run procurement.
-
!python {model: procurement.order}: |
+ from openerp.tools import float_compare
procurement_ids = self.search(cr, uid, [('requisition_id','!=', False)])
for procurement in self.browse(cr, uid, procurement_ids, context=context):
requisition = procurement.requisition_id
@@ -29,7 +30,7 @@
line = requisition.line_ids[0]
assert line.product_id.id == procurement.product_id.id, "Product is not correspond."
assert line.product_uom_id.id == procurement.product_uom.id, "UOM is not correspond."
- assert line.product_qty == procurement.product_qty, "Quantity is not correspond."
+ assert float_compare(line.product_qty, procurement.product_qty, precision_digits=2) == 0, "Quantity is not correspond."
-
I send the purchase order associated to the requisition.
-
diff --git a/addons/resource/test/resource.yml b/addons/resource/test/resource.yml
index b085c0734c4..618f3227d0c 100644
--- a/addons/resource/test/resource.yml
+++ b/addons/resource/test/resource.yml
@@ -12,13 +12,15 @@
First, I generate the resource detail and check the resource Efficiency assigned.
-
!python {model: resource.resource}: |
+ from openerp.tools import float_compare
resources = self.generate_resources(cr, uid, [ref('base.user_root'),ref('base.user_demo')], ref('timesheet_group1'), context)
for resource in resources.values():
- assert resource.get('efficiency', 0.0) == 1.0, 'Invalid resource generated.'
+ assert float_compare(resource.get('efficiency', 0.0), 1.0, precision_digits=2) == 0, 'Invalid resource generated.'
-
I check per day work hour availability of the Resource based on Working Calendar Assigned to each resource, for first day of the week.
-
!python {model: resource.resource}: |
+ from openerp.tools import float_compare
calendar_pool = self.pool.get('resource.calendar')
resources = self.browse(cr, uid, [ref('resource_analyst'), ref('resource_designer'), ref('resource_developer')], context)
from datetime import datetime, timedelta
@@ -26,7 +28,7 @@
dt = now - timedelta(days=now.weekday())
for resource in resources:
result = calendar_pool.working_hours_on_day(cr, uid, resource.calendar_id, dt, context)
- assert result == 9.0, 'Wrong calculation of day work hour availability of the Resource (found %d).' % result
+ assert float_compare(result, 9.0, precision_digits=2) == 0, 'Wrong calculation of day work hour availability of the Resource (found %d).' % result
-
Now, resource "Developer" drafted leave on Thursday in this week.
-
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index 8881e917269..8903f321310 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -174,7 +174,7 @@ class sale_order(osv.osv):
'name': fields.char('Order Reference', required=True, copy=False,
readonly=True, states={'draft': [('readonly', False)], 'sent': [('readonly', False)]}, select=True),
'origin': fields.char('Source Document', help="Reference of the document that generated this sales order request."),
- 'client_order_ref': fields.char('Reference/Description', copy=False),
+ 'client_order_ref': fields.char('Customer Reference', copy=False),
'state': fields.selection([
('draft', 'Draft Quotation'),
('sent', 'Quotation Sent'),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 13e5d952006..0295e61f516 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -76,18 +76,18 @@
+
-
-
+
@@ -107,7 +107,6 @@
-
@@ -203,6 +202,7 @@
+
diff --git a/addons/sale/test/edi_sale_order.yml b/addons/sale/test/edi_sale_order.yml
index 65b6eb76835..4eb7ebb34b4 100644
--- a/addons/sale/test/edi_sale_order.yml
+++ b/addons/sale/test/edi_sale_order.yml
@@ -35,6 +35,7 @@
"Then I import a sample EDI document of a purchase order (v7.0)"
-
!python {model: edi.edi}: |
+ from openerp.tools import float_compare
sale_order_pool = self.pool.get('sale.order')
edi_document = {
"__id": "purchase:5af12v70-dv70-1v70-bv70-701a04e25v70.purchase_order_test",
@@ -103,17 +104,17 @@
assert bank_info.acc_number == "Another bank: 032465700-156700", 'Expected "Another bank: 032465700-156700", got %s' % bank_info.acc_number
assert order_new.pricelist_id.name == 'Public Pricelist' , "Public Price list was not automatically assigned"
- assert order_new.amount_total == 350, "Amount total is wrong"
- assert order_new.amount_untaxed == 350, "Untaxed amount is wrong"
+ assert float_compare(order_new.amount_total, 350, precision_digits=2) == 0, "Amount total is wrong"
+ assert float_compare(order_new.amount_untaxed, 350, precision_digits=2) == 0, "Untaxed amount is wrong"
assert len(order_new.order_line) == 2, "Sale order lines mismatch"
for sale_line in order_new.order_line:
if sale_line.name == 'PC Assemble SC234':
assert sale_line.product_uom.name == "Unit" , "uom is not same"
- assert sale_line.price_unit == 150 , "unit price is not same, got %s, expected 150"%(sale_line.price_unit,)
+ assert float_compare(sale_line.price_unit, 150 , precision_digits=2) == 0, "unit price is not same, got %s, expected 150"%(sale_line.price_unit,)
assert sale_line.product_uom_qty == 1 , "product qty is not same"
elif sale_line.name == 'PC on Demand':
assert sale_line.product_uom.name == "Unit" , "uom is not same"
- assert sale_line.price_unit == 100 , "unit price is not same, got %s, expected 100"%(sale_line.price_unit,)
+ assert float_compare(sale_line.price_unit, 100, precision_digits=2) == 0, "unit price is not same, got %s, expected 100"%(sale_line.price_unit,)
assert sale_line.product_uom_qty == 2 , "product qty is not same"
else:
raise AssertionError('unknown order line: %s' % sale_line)
@@ -121,6 +122,7 @@
"Then I import a sample EDI document of a purchase order (v6.1 - to test backwards compatibility)"
-
!python {model: edi.edi}: |
+ from openerp.tools import float_compare
sale_order_pool = self.pool.get('sale.order')
edi_document = {
"__id": "purchase:5af1272e-dd26-11e0-b65e-701a04e25543.purchase_order_test",
@@ -199,17 +201,17 @@
assert bank_info.acc_number == "Ladies bank: 032465789-156113", 'Expected "Ladies bank: 032465789-156113", got %s' % bank_info.acc_number
assert order_new.pricelist_id.name == 'Public Pricelist' , "Public Price list was not automatically assigned"
- assert order_new.amount_total == 350, "Amount total is wrong"
- assert order_new.amount_untaxed == 350, "Untaxed amount is wrong"
+ assert float_compare(order_new.amount_total, 350, precision_digits=2) == 0, "Amount total is wrong"
+ assert float_compare(order_new.amount_untaxed, 350, precision_digits=2) == 0, "Untaxed amount is wrong"
assert len(order_new.order_line) == 2, "Sale order lines mismatch"
for sale_line in order_new.order_line:
if sale_line.name == 'Basic PC':
assert sale_line.product_uom.name == "PCE" , "uom is not same"
- assert sale_line.price_unit == 150 , "unit price is not same, got %s, expected 150"%(sale_line.price_unit,)
+ assert float_compare(sale_line.price_unit, 150, precision_digits=2) == 0, "unit price is not same, got %s, expected 150"%(sale_line.price_unit,)
assert sale_line.product_uom_qty == 1 , "product qty is not same"
elif sale_line.name == 'Medium PC':
assert sale_line.product_uom.name == "PCE" , "uom is not same"
- assert sale_line.price_unit == 100 , "unit price is not same, got %s, expected 100"%(sale_line.price_unit,)
+ assert float_compare(sale_line.price_unit, 100 , precision_digits=2) == 0, "unit price is not same, got %s, expected 100"%(sale_line.price_unit,)
assert sale_line.product_uom_qty == 2 , "product qty is not same"
else:
raise AssertionError('unknown order line: %s' % sale_line)
diff --git a/addons/sale/test/sale_order_demo.yml b/addons/sale/test/sale_order_demo.yml
index c911815f25b..1488b2ff0f7 100644
--- a/addons/sale/test/sale_order_demo.yml
+++ b/addons/sale/test/sale_order_demo.yml
@@ -16,11 +16,13 @@
-
I verify that the onchange was correctly triggered
-
- !assert {model: sale.order, id: sale.sale_order_test1, string: The onchange function of product was not correctly triggered}:
- - order_line[0].name == u'[A8767] Apple In-Ear Headphones'
- - order_line[0].price_unit == 79.0
- - order_line[0].product_uom_qty == 8
- - order_line[0].product_uom.id == ref('product.product_uom_unit')
+ !python {model: sale.order}: |
+ from openerp.tools import float_compare
+ order_line = self.browse(cr, uid, ref('sale.sale_order_test1')).order_line
+ assert order_line[0].name == u'[A8767] Apple In-Ear Headphones', "The onchange function of product was not correctly triggered"
+ assert float_compare(order_line[0].price_unit, 79.0, precision_digits=2) == 0, "The onchange function of product was not correctly triggered"
+ assert order_line[0].product_uom_qty == 8, "The onchange function of product was not correctly triggered"
+ assert order_line[0].product_uom.id == ref('product.product_uom_unit'), "The onchange function of product was not correctly triggered"
-
I create another sale order
@@ -34,8 +36,11 @@
-
I verify that the onchange was correctly triggered
-
- !assert {model: sale.order, id: sale.sale_order_test2, string: The onchange function of product was not correctly triggered}:
- - order_line[0].name == u'[A8767] Apple In-Ear Headphones'
- - order_line[0].price_unit == 79.0 * 12
- - order_line[0].product_uom.id == ref('product.product_uom_dozen')
- - order_line[0].product_uom_qty == 16
\ No newline at end of file
+ !python {model: sale.order}: |
+ from openerp.tools import float_compare
+ order_line = self.browse(cr, uid, ref('sale.sale_order_test2')).order_line
+ assert order_line[0].name == u'[A8767] Apple In-Ear Headphones', "The onchange function of product was not correctly triggered"
+ assert float_compare(order_line[0].price_unit, 79.0 * 12, precision_digits=2) == 0, "The onchange function of product was not correctly triggered"
+ assert order_line[0].product_uom.id == ref('product.product_uom_dozen'), "The onchange function of product was not correctly triggered"
+ assert order_line[0].product_uom_qty == 16, "The onchange function of product was not correctly triggered"
+
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index d49f090ebcf..24086419ff8 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -29,7 +29,7 @@
-
+
diff --git a/addons/sale_stock/test/picking_order_policy.yml b/addons/sale_stock/test/picking_order_policy.yml
index 8de8ea45a08..06a0f4d4884 100644
--- a/addons/sale_stock/test/picking_order_policy.yml
+++ b/addons/sale_stock/test/picking_order_policy.yml
@@ -37,8 +37,10 @@
-
First I check the total amount of the Quotation before Approved.
-
- !assert {model: sale.order, id: sale_order_service, string: The amount of the Quotation is not correctly computed}:
- - sum([l.price_subtotal for l in order_line]) == amount_untaxed
+ !python {model: sale.order}: |
+ from openerp.tools import float_compare
+ so = self.browse(cr, uid, ref('sale_order_service'))
+ float_compare(sum([l.price_subtotal for l in so.order_line]), so.amount_untaxed, precision_digits=2) == 0, "The amount of the Quotation is not correctly computed"
-
I set an explicit invoicing partner that is different from the main SO Customer
-
@@ -156,6 +158,7 @@
I check the invoice details after dispatched delivery.
-
!python {model: sale.order}: |
+ from openerp.tools import float_compare
order = self.browse(cr, uid, ref("sale_order_service"))
assert order.invoice_ids, "Invoice is not created."
ac = order.partner_invoice_id.property_account_receivable.id
@@ -175,7 +178,7 @@
assert inv_line.product_id.id == so_line.product_id.id or False,"Product is not correspond"
assert inv_line.account_id.id == ac,"Account of Invoice line is not corresponding."
assert inv_line.uos_id.id == (so_line.product_uos and so_line.product_uos.id or so_line.product_uom.id), "Product UOS is not correspond."
- assert inv_line.price_unit == so_line.price_unit , "Price Unit is not correspond."
+ assert float_compare(inv_line.price_unit, so_line.price_unit , precision_digits=2) == 0, "Price Unit is not correspond."
assert inv_line.quantity == (so_line.product_uos and so_line.product_uos_qty or so_line.product_uom_qty), "Product qty is not correspond."
assert inv_line.price_subtotal == so_line.price_subtotal, "Price sub total is not correspond."
-
diff --git a/addons/sale_stock/test/sale_order_onchange.yml b/addons/sale_stock/test/sale_order_onchange.yml
index 7cb4da5c338..f01b8ba0bf6 100644
--- a/addons/sale_stock/test/sale_order_onchange.yml
+++ b/addons/sale_stock/test/sale_order_onchange.yml
@@ -25,6 +25,8 @@
-
I verify that the onchange of product on sale order line was correctly triggered
-
- !assert {model: sale.order, id: sale_order_onchange1, string: The onchange function of product was not correctly triggered}:
- - order_line[0].name == u'Devil Worship Book'
- - order_line[0].price_unit == 66.6
+ !python {model: sale.order}: |
+ from openerp.tools import float_compare
+ order_line = self.browse(cr, uid, ref('sale_order_onchange1')).order_line
+ assert order_line[0].name == u'Devil Worship Book', "The onchange function of product was not correctly triggered"
+ assert float_compare(order_line[0].price_unit, 66.6, precision_digits=2) == 0, "The onchange function of product was not correctly triggered"
diff --git a/addons/stock/controllers/main.py b/addons/stock/controllers/main.py
index ad8aa8826af..44531169254 100644
--- a/addons/stock/controllers/main.py
+++ b/addons/stock/controllers/main.py
@@ -1,74 +1,16 @@
# -*- coding: utf-8 -*-
import logging
-import simplejson
from openerp import http
from openerp.http import request
-from openerp.addons.web.controllers.main import module_boot
_logger = logging.getLogger(__name__)
-html_template = """
-
-
- Barcode Scanner
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-"""
-
class BarcodeController(http.Controller):
- @http.route(['/barcode/web/'], type='http', auth='user')
+ @http.route(['/stock/barcode/'], type='http', auth='user')
def a(self, debug=False, **k):
if not request.session.uid:
- return http.local_redirect('/web/login?redirect=/barcode/web')
+ return http.local_redirect('/web/login?redirect=/stock/barcode/')
- r = html_template % {
- 'modules': simplejson.dumps(module_boot(request.db)),
- 'init': """
- var wc = new s.web.WebClient();
- wc.show_application = function(){
- wc.action_manager.do_action("stock.ui", {});
- };
- wc.do_push_state = function(state){};
- wc.setElement($(document.body));
- wc.start();
- """
- }
- return r
+ return request.render('stock.barcode_index')
diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index 8da55a82fcb..1146d628ac9 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -1070,7 +1070,7 @@ class stock_picking(osv.osv):
@api.cr_uid_ids_context
def open_barcode_interface(self, cr, uid, picking_ids, context=None):
- final_url="/barcode/web/#action=stock.ui&picking_id="+str(picking_ids[0])
+ final_url="/stock/barcode/#action=stock.ui&picking_id="+str(picking_ids[0])
return {'type': 'ir.actions.act_url', 'url':final_url, 'target': 'self',}
@api.cr_uid_ids_context
@@ -4038,7 +4038,7 @@ class stock_picking_type(osv.osv):
_order = 'sequence'
def open_barcode_interface(self, cr, uid, ids, context=None):
- final_url = "/barcode/web/#action=stock.ui&picking_type_id=" + str(ids[0]) if len(ids) else '0'
+ final_url = "/stock/barcode/#action=stock.ui&picking_type_id=" + str(ids[0]) if len(ids) else '0'
return {'type': 'ir.actions.act_url', 'url': final_url, 'target': 'self'}
def _get_tristate_values(self, cr, uid, ids, field_name, arg, context=None):
diff --git a/addons/stock/views/stock.xml b/addons/stock/views/stock.xml
index a38fe9bb9fe..f5bca7a8f7c 100644
--- a/addons/stock/views/stock.xml
+++ b/addons/stock/views/stock.xml
@@ -3,11 +3,64 @@
-->
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+<!DOCTYPE html>
+
+
+ Barcode Scanner
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/addons/website_forum/views/website_forum.xml b/addons/website_forum/views/website_forum.xml
index 0799949b3ed..7fafd93cc7b 100644
--- a/addons/website_forum/views/website_forum.xml
+++ b/addons/website_forum/views/website_forum.xml
@@ -311,16 +311,29 @@
- Ask your Question
+ Ask Your Question
+
+ To improve your chance getting an answer:
+
- - please, try to make your question interesting to others
- - provide enough details and, if possible, give an example
- - be clear and concise, avoid unnecessary introductions (Hi, ... Thanks...)
+ - Set a clear, explicit and concise question title
+ (check
+ bad examples
+ and
+ good examples
+ ),
+
+ - Avoid unnecessary introductions (Hi,... Please... Thanks...),
+ - Provide enough details and, if possible, give an example.
+