mirror of
https://github.com/frappe/erpnext.git
synced 2026-06-08 23:52:57 +00:00
Fix travis (#11882)
* fieldname wrong * bifurcated test into two - error when both were running async * minor fixes with link and route * move school domain rename up * fix async creation of operations test * edit-in-full-page is button, not link * set_route issue in production order test * minor changes * fix task tree test * more fixes * fix server side issue * improvising ui tests
This commit is contained in:
@@ -11,7 +11,7 @@ QUnit.test("test delivery note with margin", function(assert) {
|
||||
{currency: 'USD'},
|
||||
{items: [
|
||||
[
|
||||
{'item_code': 'Test Product 3'},
|
||||
{'item_code': 'Test Product 4'},
|
||||
{'qty': 1},
|
||||
{'margin_type': 'Amount'},
|
||||
{'margin_rate_or_amount': 10}
|
||||
|
||||
@@ -7,13 +7,13 @@ QUnit.test("test item price", function(assert) {
|
||||
() => {
|
||||
return frappe.tests.make('Item Price', [
|
||||
{price_list:'Test-Selling-USD'},
|
||||
{item_code: 'Test Product 3'},
|
||||
{item_code: 'Test Product 4'},
|
||||
{price_list_rate: 200}
|
||||
]);
|
||||
},
|
||||
() => cur_frm.save(),
|
||||
() => {
|
||||
assert.ok(cur_frm.doc.item_name == 'Test Product 3', "Item name correct");
|
||||
assert.ok(cur_frm.doc.item_name == 'Test Product 4', "Item name correct");
|
||||
assert.ok(cur_frm.doc.price_list_rate == 200, "Price list rate correct");
|
||||
},
|
||||
() => frappe.timeout(0.3),
|
||||
|
||||
@@ -312,7 +312,7 @@ def get_price_list_rate(args, item_doc, out):
|
||||
|
||||
out.price_list_rate = flt(price_list_rate) * flt(args.plc_conversion_rate) \
|
||||
/ flt(args.conversion_rate)
|
||||
if args.price_list_uom_dependant == 0:
|
||||
if not args.price_list_uom_dependant:
|
||||
out.price_list_rate = flt(out.price_list_rate * (args.conversion_factor or 1.0))
|
||||
|
||||
if not out.price_list_rate and args.transaction_type=="buying":
|
||||
|
||||
Reference in New Issue
Block a user