nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 23:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Multiple fixes related to payment terms (#12115)

Browse Source
This commit is contained in:
Nabin Hait
2017-12-20 12:24:59 +05:30
committed by GitHub
parent 8413f76c19
commit 2f9f4f9c01
10 changed files with 51 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
erpnext/stock/doctype/delivery_trip/delivery_trip.json
View File

@@ -539,8 +539,8 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2017-11-13 03:56:09.885801",
"modified_by": "Administrator",
"modified": "2017-12-19 12:00:49.226226",
"modified_by": "nabinhait@gmail.com",
"module": "Stock",
"name": "Delivery Trip",
"name_case": "",
@@ -565,6 +565,26 @@
"share": 1,
"submit": 1,
"write": 1
},
{
"amend": 1,
"apply_user_permissions": 0,
"cancel": 1,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Stock User",
"set_user_permissions": 0,
"share": 1,
"submit": 1,
"write": 1
}
],
"quick_entry": 0,

2
erpnext/stock/doctype/stock_entry/test_stock_entry.py
View File

@@ -496,10 +496,10 @@ class TestStockEntry(unittest.TestCase):
frappe.get_doc("User", "test2@example.com")\
.add_roles("Sales User", "Sales Manager", "Stock User", "Stock Manager")
frappe.set_user("test@example.com")
st1 = frappe.copy_doc(test_records[0])
st1.company = "_Test Company 1"
set_perpetual_inventory(0, st1.company)
frappe.set_user("test@example.com")
st1.get("items")[0].t_warehouse="_Test Warehouse 2 - _TC1"
self.assertRaises(frappe.PermissionError, st1.insert)