Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21204 from rohitwaghchaure/fixed_internal_issue_develop

Browse Source 
fix: minor issues
This commit is contained in:
rohitwaghchaure 2020-04-18 02:08:26 +05:30 committed by GitHub
commit 866867661e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.py
View File

@ -152,10 +152,9 @@ def build_forest(data):
return [parent_account] return [parent_account]
elif account_name == child: elif account_name == child:
parent_account_list = return_parent(data, parent_account) parent_account_list = return_parent(data, parent_account)
if not parent_account_list: if not parent_account_list and parent_account:
frappe.throw(_("The parent account {0} does not exists in the uploaded template").format( frappe.throw(_("The parent account {0} does not exists in the uploaded template").format(
frappe.bold(parent_account))) frappe.bold(parent_account)))
return [child] + parent_account_list return [child] + parent_account_list
charts_map, paths = {}, [] charts_map, paths = {}, []

1
erpnext/stock/doctype/pick_list/test_pick_list.py
View File

@ -111,6 +111,7 @@ class TestPickList(unittest.TestCase):
stock_reconciliation = frappe.get_doc({ stock_reconciliation = frappe.get_doc({
'doctype': 'Stock Reconciliation', 'doctype': 'Stock Reconciliation',
'purpose': 'Stock Reconciliation',
'company': '_Test Company', 'company': '_Test Company',
'items': [{ 'items': [{
'item_code': '_Test Serialized Item', 'item_code': '_Test Serialized Item',

7
erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
View File

@ -4,6 +4,7 @@
"description": "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.", "description": "This tool helps you to update or fix the quantity and valuation of stock in the system. It is typically used to synchronise the system values and what actually exists in your warehouses.",
"doctype": "DocType", "doctype": "DocType",
"document_type": "Document", "document_type": "Document",
"engine": "InnoDB",
"field_order": [ "field_order": [
"naming_series", "naming_series",
"company", "company",
@ -44,11 +45,11 @@
"reqd": 1 "reqd": 1
}, },
{ {
"default": "Stock Reconciliation",
"fieldname": "purpose", "fieldname": "purpose",
"fieldtype": "Select", "fieldtype": "Select",
"label": "Purpose", "label": "Purpose",
"options": "Opening Stock\nStock Reconciliation" "options": "\nOpening Stock\nStock Reconciliation",
"reqd": 1
}, },
{ {
"fieldname": "col1", "fieldname": "col1",
@ -153,7 +154,7 @@
"idx": 1, "idx": 1,
"is_submittable": 1, "is_submittable": 1,
"max_attachments": 1, "max_attachments": 1,
"modified": "2019-05-26 09:03:09.542141", "modified": "2020-04-08 17:02:47.196206",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Stock Reconciliation", "name": "Stock Reconciliation",

1
erpnext/stock/doctype/stock_reconciliation/test_stock_reconciliation.py
View File

@ -240,6 +240,7 @@ def create_batch_or_serial_no_items():
def create_stock_reconciliation(**args): def create_stock_reconciliation(**args):
args = frappe._dict(args) args = frappe._dict(args)
sr = frappe.new_doc("Stock Reconciliation") sr = frappe.new_doc("Stock Reconciliation")
sr.purpose = args.purpose or "Stock Reconciliation"
sr.posting_date = args.posting_date or nowdate() sr.posting_date = args.posting_date or nowdate()
sr.posting_time = args.posting_time or nowtime() sr.posting_time = args.posting_time or nowtime()
sr.set_posting_time = 1 sr.set_posting_time = 1