Merge branch 'hotfix' into leave-application-naming
diff --git a/.travis.yml b/.travis.yml
index 448cd40..e21d595 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,17 +30,16 @@
- cd ~/frappe-bench
- bench get-app erpnext $TRAVIS_BUILD_DIR
- bench use test_site
- - bench reinstall --yes
- - bench build
- - bench scheduler disable
- - sed -i 's/9000/9001/g' sites/common_site_config.json
- - bench start &
- - sleep 10
jobs:
include:
- stage: test
script:
+ - bench reinstall --yes
+ - bench scheduler disable
+ - sed -i 's/9000/9001/g' sites/common_site_config.json
+ - bench start &
+ - sleep 10
- set -e
- bench run-tests
env: Server Side Test
diff --git a/erpnext/__init__.py b/erpnext/__init__.py
index b9d86a8..26755dd 100644
--- a/erpnext/__init__.py
+++ b/erpnext/__init__.py
@@ -5,7 +5,7 @@
from erpnext.hooks import regional_overrides
from frappe.utils import getdate
-__version__ = '10.1.76'
+__version__ = '10.1.77'
def get_default_company(user=None):
'''Get default company for user'''
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index bc6f99d..9d5b331 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -1,5 +1,6 @@
execute:import unidecode # new requirement
erpnext.patches.v8_0.move_perpetual_inventory_setting
+erpnext.patches.v8_9.set_print_zero_amount_taxes
erpnext.patches.v10_0.rename_schools_to_education
erpnext.patches.v4_0.validate_v3_patch
erpnext.patches.v4_0.fix_employee_user_id
@@ -442,7 +443,6 @@
erpnext.patches.v8_9.rename_company_sales_target_field
erpnext.patches.v8_8.set_bom_rate_as_per_uom
erpnext.patches.v8_8.add_new_fields_in_accounts_settings
-erpnext.patches.v8_9.set_print_zero_amount_taxes
erpnext.patches.v8_9.set_default_customer_group
erpnext.patches.v8_9.remove_employee_from_salary_structure_parent
erpnext.patches.v8_9.delete_gst_doctypes_for_outside_india_accounts
diff --git a/erpnext/selling/doctype/quotation/test_quotation.py b/erpnext/selling/doctype/quotation/test_quotation.py
index e79d46a..909442a 100644
--- a/erpnext/selling/doctype/quotation/test_quotation.py
+++ b/erpnext/selling/doctype/quotation/test_quotation.py
@@ -31,6 +31,26 @@
self.assertFalse(sales_order.get('payment_schedule'))
+ def test_make_sales_order_with_different_currency(self):
+ from erpnext.selling.doctype.quotation.quotation import make_sales_order
+
+ quotation = frappe.copy_doc(test_records[0])
+ quotation.transaction_date = nowdate()
+ quotation.valid_till = add_months(quotation.transaction_date, 1)
+ quotation.insert()
+ quotation.submit()
+
+ sales_order = make_sales_order(quotation.name)
+ sales_order.currency = "USD"
+ sales_order.conversion_rate = 20.0
+ sales_order.delivery_date = "2019-01-01"
+ sales_order.naming_series = "_T-Quotation-"
+ sales_order.transaction_date = nowdate()
+ sales_order.insert()
+
+ self.assertEquals(sales_order.currency, "USD")
+ self.assertNotEqual(sales_order.currency, quotation.currency)
+
def test_make_sales_order(self):
from erpnext.selling.doctype.quotation.quotation import make_sales_order
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index b2c6ccc..a30f2fa 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -141,7 +141,7 @@
super(SalesOrder, self).validate_with_previous_doc({
"Quotation": {
"ref_dn_field": "prevdoc_docname",
- "compare_fields": [["company", "="], ["currency", "="]]
+ "compare_fields": [["company", "="]]
}
})
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
index 257434f..561868f 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.py
@@ -270,24 +270,27 @@
@frappe.whitelist()
def get_items(warehouse, posting_date, posting_time):
- items = frappe.get_list("Bin", fields=["item_code"], filters={"warehouse": warehouse}, as_list=1)
+ lft, rgt = frappe.db.get_value("Warehouse", warehouse, ["lft", "rgt"])
+ items = frappe.db.sql("""select item_code, warehouse from tabBin
+ where exists(select name from `tabWarehouse` where lft >= %s and rgt <= %s and name=`tabBin`.warehouse)
+ """, (lft, rgt))
- items += frappe.get_list("Item", fields=["name"], filters= {"is_stock_item": 1, "has_serial_no": 0,
- "has_batch_no": 0, "has_variants": 0, "disabled": 0, "default_warehouse": warehouse},
- as_list=1)
+ items += frappe.db.sql("""select name, default_warehouse from tabItem
+ where exists(select name from `tabWarehouse` where lft >= %s and rgt <= %s and name=`tabItem`.default_warehouse)
+ and is_stock_item = 1 and has_serial_no = 0 and has_batch_no = 0 and has_variants = 0 and disabled = 0
+ """, (lft, rgt))
res = []
- for item in set(items):
- stock_bal = get_stock_balance(item[0], warehouse, posting_date, posting_time,
+ for item, wh in set(items):
+ stock_bal = get_stock_balance(item, wh, posting_date, posting_time,
with_valuation_rate=True)
- if frappe.db.get_value("Item",item[0],"disabled") == 0:
-
+ if frappe.db.get_value("Item", item, "disabled") == 0:
res.append({
- "item_code": item[0],
- "warehouse": warehouse,
+ "item_code": item,
+ "warehouse": wh,
"qty": stock_bal[0],
- "item_name": frappe.db.get_value('Item', item[0], 'item_name'),
+ "item_name": frappe.db.get_value('Item', item, 'item_name'),
"valuation_rate": stock_bal[1],
"current_qty": stock_bal[0],
"current_valuation_rate": stock_bal[1]
diff --git a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
index 212bb51..bc991b4 100644
--- a/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
+++ b/erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
@@ -10,7 +10,9 @@
from erpnext.accounts.utils import get_stock_and_account_difference
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
from erpnext.stock.stock_ledger import get_previous_sle, update_entries_after
-from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import EmptyStockReconciliationItemsError
+from erpnext.stock.doctype.stock_reconciliation.stock_reconciliation import EmptyStockReconciliationItemsError, get_items
+from erpnext.stock.doctype.warehouse.test_warehouse import create_warehouse
+from erpnext.stock.doctype.item.test_item import make_item
class TestStockReconciliation(unittest.TestCase):
def setUp(self):
@@ -79,6 +81,17 @@
set_perpetual_inventory(0)
+ def test_get_items(self):
+ create_warehouse("_Test Warehouse Group 1", {"is_group": 1})
+ create_warehouse("_Test Warehouse Ledger 1", {"is_group": 0, "parent_warehouse": "_Test Warehouse Group 1 - _TC"})
+ make_item("_Test Stock Reco Item", {"default_warehouse": "_Test Warehouse Ledger 1 - _TC",
+ "is_stock_item": 1, "opening_stock": 100, "valuation_rate": 100})
+
+ items = get_items("_Test Warehouse Group 1 - _TC", nowdate(), nowtime())
+
+ self.assertEqual(["_Test Stock Reco Item", "_Test Warehouse Ledger 1 - _TC", 100],
+ [items[0]["item_code"], items[0]["warehouse"], items[0]["qty"]])
+
def insert_existing_sle(self):
from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
diff --git a/erpnext/stock/doctype/warehouse/test_warehouse.py b/erpnext/stock/doctype/warehouse/test_warehouse.py
index d010313..961d0a7 100644
--- a/erpnext/stock/doctype/warehouse/test_warehouse.py
+++ b/erpnext/stock/doctype/warehouse/test_warehouse.py
@@ -90,7 +90,7 @@
self.assertTrue(frappe.db.get_value("Warehouse",
filters={"account": "Test Warehouse for Merging 2 - _TC"}))
-def create_warehouse(warehouse_name):
+def create_warehouse(warehouse_name, properties=None):
if not frappe.db.exists("Warehouse", warehouse_name + " - _TC"):
w = frappe.new_doc("Warehouse")
w.warehouse_name = warehouse_name
@@ -98,11 +98,13 @@
w.company = "_Test Company"
make_account_for_warehouse(warehouse_name, w)
w.account = warehouse_name + " - _TC"
+ if properties:
+ w.update(properties)
w.save()
def make_account_for_warehouse(warehouse_name, warehouse_obj):
if not frappe.db.exists("Account", warehouse_name + " - _TC"):
- parent_account = frappe.db.get_value('Account',
+ parent_account = frappe.db.get_value('Account',
{'company': warehouse_obj.company, 'is_group':1, 'account_type': 'Stock'},'name')
account = create_account(account_name=warehouse_name, \
account_type="Stock", parent_account= parent_account, company=warehouse_obj.company)
\ No newline at end of file