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

fix: add returns field to cashier closing (#16911)

Browse Source
This commit is contained in:
Bassam Ramadan
2019-03-14 11:31:50 +02:00
committed by Sagar Vora
parent 947d573276
commit e14758c897
2 changed files with 435 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

858
erpnext/accounts/doctype/cashier_closing/cashier_closing.json
View File

@@ -1,426 +1,434 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_events_in_timeline": 0, "allow_guest_to_view": 0,
"allow_guest_to_view": 0, "allow_import": 0,
"allow_import": 0, "allow_rename": 0,
"allow_rename": 0, "autoname": "naming_series:",
"autoname": "naming_series:", "beta": 0,
"beta": 0, "creation": "2018-06-18 16:51:49.994750",
"creation": "2018-06-18 16:51:49.994750", "custom": 0,
"custom": 0, "docstatus": 0,
"docstatus": 0, "doctype": "DocType",
"doctype": "DocType", "document_type": "",
"document_type": "", "editable_grid": 1,
"editable_grid": 1, "engine": "InnoDB",
"engine": "InnoDB", "fields": [
"fields": [ {
{ "allow_bulk_edit": 0,
"allow_bulk_edit": 0, "allow_on_submit": 0,
"allow_in_quick_entry": 0, "bold": 0,
"allow_on_submit": 0, "collapsible": 0,
"bold": 0, "columns": 0,
"collapsible": 0, "default": "POS-CLO-",
"columns": 0, "fieldname": "naming_series",
"default": "Cashier-closing-", "fieldtype": "Select",
"fieldname": "naming_series", "hidden": 0,
"fieldtype": "Select", "ignore_user_permissions": 0,
"hidden": 0, "ignore_xss_filter": 0,
"ignore_user_permissions": 0, "in_filter": 1,
"ignore_xss_filter": 0, "in_global_search": 1,
"in_filter": 1, "in_list_view": 0,
"in_global_search": 1, "in_standard_filter": 1,
"in_list_view": 0, "label": "Series",
"in_standard_filter": 1, "length": 0,
"label": "Series", "no_copy": 0,
"length": 0, "options": "POS-CLO-",
"no_copy": 0, "permlevel": 0,
"options": "Cashier-closing-", "precision": "",
"permlevel": 0, "print_hide": 0,
"precision": "", "print_hide_if_no_value": 0,
"print_hide": 0, "read_only": 1,
"print_hide_if_no_value": 0, "remember_last_selected_value": 0,
"read_only": 1, "report_hide": 0,
"remember_last_selected_value": 0, "reqd": 0,
"report_hide": 0, "search_index": 0,
"reqd": 0, "set_only_once": 0,
"search_index": 0, "unique": 0
"set_only_once": 0, },
"translatable": 0, {
"unique": 0 "allow_bulk_edit": 0,
}, "allow_on_submit": 0,
{ "bold": 0,
"allow_bulk_edit": 0, "collapsible": 0,
"allow_in_quick_entry": 0, "columns": 0,
"allow_on_submit": 0, "fieldname": "user",
"bold": 0, "fieldtype": "Link",
"collapsible": 0, "hidden": 0,
"columns": 0, "ignore_user_permissions": 0,
"fieldname": "user", "ignore_xss_filter": 0,
"fieldtype": "Link", "in_filter": 1,
"hidden": 0, "in_global_search": 0,
"ignore_user_permissions": 0, "in_list_view": 1,
"ignore_xss_filter": 0, "in_standard_filter": 1,
"in_filter": 1, "label": "User",
"in_global_search": 0, "length": 0,
"in_list_view": 1, "no_copy": 0,
"in_standard_filter": 1, "options": "User",
"label": "User", "permlevel": 0,
"length": 0, "precision": "",
"no_copy": 0, "print_hide": 0,
"options": "User", "print_hide_if_no_value": 0,
"permlevel": 0, "read_only": 1,
"precision": "", "remember_last_selected_value": 0,
"print_hide": 0, "report_hide": 0,
"print_hide_if_no_value": 0, "reqd": 1,
"read_only": 1, "search_index": 0,
"remember_last_selected_value": 0, "set_only_once": 0,
"report_hide": 0, "unique": 0
"reqd": 1, },
"search_index": 0, {
"set_only_once": 0, "allow_bulk_edit": 0,
"translatable": 0, "allow_on_submit": 0,
"unique": 0 "bold": 0,
}, "collapsible": 0,
{ "columns": 0,
"allow_bulk_edit": 0, "default": "Today",
"allow_in_quick_entry": 0, "fieldname": "date",
"allow_on_submit": 0, "fieldtype": "Date",
"bold": 0, "hidden": 0,
"collapsible": 0, "ignore_user_permissions": 0,
"columns": 0, "ignore_xss_filter": 0,
"default": "Today", "in_filter": 1,
"fieldname": "date", "in_global_search": 0,
"fieldtype": "Date", "in_list_view": 0,
"hidden": 0, "in_standard_filter": 1,
"ignore_user_permissions": 0, "label": "Date",
"ignore_xss_filter": 0, "length": 0,
"in_filter": 1, "no_copy": 0,
"in_global_search": 0, "permlevel": 0,
"in_list_view": 0, "precision": "",
"in_standard_filter": 1, "print_hide": 0,
"label": "Date", "print_hide_if_no_value": 0,
"length": 0, "read_only": 1,
"no_copy": 0, "remember_last_selected_value": 0,
"permlevel": 0, "report_hide": 0,
"precision": "", "reqd": 0,
"print_hide": 0, "search_index": 0,
"print_hide_if_no_value": 0, "set_only_once": 0,
"read_only": 1, "unique": 0
"remember_last_selected_value": 0, },
"report_hide": 0, {
"reqd": 0, "allow_bulk_edit": 0,
"search_index": 0, "allow_on_submit": 0,
"set_only_once": 0, "bold": 0,
"translatable": 0, "collapsible": 0,
"unique": 0 "columns": 0,
}, "fieldname": "from_time",
{ "fieldtype": "Time",
"allow_bulk_edit": 0, "hidden": 0,
"allow_in_quick_entry": 0, "ignore_user_permissions": 0,
"allow_on_submit": 0, "ignore_xss_filter": 0,
"bold": 0, "in_filter": 1,
"collapsible": 0, "in_global_search": 0,
"columns": 0, "in_list_view": 0,
"fieldname": "from_time", "in_standard_filter": 1,
"fieldtype": "Time", "label": "From Time",
"hidden": 0, "length": 0,
"ignore_user_permissions": 0, "no_copy": 0,
"ignore_xss_filter": 0, "permlevel": 0,
"in_filter": 1, "precision": "",
"in_global_search": 0, "print_hide": 0,
"in_list_view": 0, "print_hide_if_no_value": 0,
"in_standard_filter": 1, "read_only": 0,
"label": "From Time", "remember_last_selected_value": 0,
"length": 0, "report_hide": 0,
"no_copy": 0, "reqd": 1,
"permlevel": 0, "search_index": 0,
"precision": "", "set_only_once": 0,
"print_hide": 0, "unique": 0
"print_hide_if_no_value": 0, },
"read_only": 0, {
"remember_last_selected_value": 0, "allow_bulk_edit": 0,
"report_hide": 0, "allow_on_submit": 0,
"reqd": 1, "bold": 0,
"search_index": 0, "collapsible": 0,
"set_only_once": 0, "columns": 0,
"translatable": 0, "default": "",
"unique": 0 "fieldname": "time",
}, "fieldtype": "Time",
{ "hidden": 0,
"allow_bulk_edit": 0, "ignore_user_permissions": 0,
"allow_in_quick_entry": 0, "ignore_xss_filter": 0,
"allow_on_submit": 0, "in_filter": 1,
"bold": 0, "in_global_search": 0,
"collapsible": 0, "in_list_view": 0,
"columns": 0, "in_standard_filter": 1,
"default": "", "label": "To Time",
"fieldname": "time", "length": 0,
"fieldtype": "Time", "no_copy": 0,
"hidden": 0, "permlevel": 0,
"ignore_user_permissions": 0, "precision": "",
"ignore_xss_filter": 0, "print_hide": 0,
"in_filter": 1, "print_hide_if_no_value": 0,
"in_global_search": 0, "read_only": 0,
"in_list_view": 0, "remember_last_selected_value": 0,
"in_standard_filter": 1, "report_hide": 0,
"label": "To Time", "reqd": 1,
"length": 0, "search_index": 0,
"no_copy": 0, "set_only_once": 0,
"permlevel": 0, "unique": 0
"precision": "", },
"print_hide": 0, {
"print_hide_if_no_value": 0, "allow_bulk_edit": 0,
"read_only": 0, "allow_on_submit": 0,
"remember_last_selected_value": 0, "bold": 0,
"report_hide": 0, "collapsible": 0,
"reqd": 1, "columns": 0,
"search_index": 0, "default": "0.00",
"set_only_once": 0, "fieldname": "expense",
"translatable": 0, "fieldtype": "Float",
"unique": 0 "hidden": 0,
}, "ignore_user_permissions": 0,
{ "ignore_xss_filter": 0,
"allow_bulk_edit": 0, "in_filter": 1,
"allow_in_quick_entry": 0, "in_global_search": 0,
"allow_on_submit": 0, "in_list_view": 0,
"bold": 0, "in_standard_filter": 0,
"collapsible": 0, "label": "Expense",
"columns": 0, "length": 0,
"default": "0.00", "no_copy": 0,
"fieldname": "expense", "permlevel": 0,
"fieldtype": "Float", "precision": "2",
"hidden": 0, "print_hide": 0,
"ignore_user_permissions": 0, "print_hide_if_no_value": 0,
"ignore_xss_filter": 0, "read_only": 0,
"in_filter": 1, "remember_last_selected_value": 0,
"in_global_search": 0, "report_hide": 0,
"in_list_view": 0, "reqd": 0,
"in_standard_filter": 0, "search_index": 0,
"label": "Expense", "set_only_once": 0,
"length": 0, "unique": 0
"no_copy": 0, },
"permlevel": 0, {
"precision": "", "allow_bulk_edit": 0,
"print_hide": 0, "allow_on_submit": 0,
"print_hide_if_no_value": 0, "bold": 0,
"read_only": 0, "collapsible": 0,
"remember_last_selected_value": 0, "columns": 0,
"report_hide": 0, "default": "0.00",
"reqd": 0, "fieldname": "custody",
"search_index": 0, "fieldtype": "Float",
"set_only_once": 0, "hidden": 0,
"translatable": 0, "ignore_user_permissions": 0,
"unique": 0 "ignore_xss_filter": 0,
}, "in_filter": 1,
{ "in_global_search": 0,
"allow_bulk_edit": 0, "in_list_view": 0,
"allow_in_quick_entry": 0, "in_standard_filter": 0,
"allow_on_submit": 0, "label": "Custody",
"bold": 0, "length": 0,
"collapsible": 0, "no_copy": 0,
"columns": 0, "permlevel": 0,
"default": "0.00", "precision": "2",
"fieldname": "custody", "print_hide": 0,
"fieldtype": "Float", "print_hide_if_no_value": 0,
"hidden": 0, "read_only": 0,
"ignore_user_permissions": 0, "remember_last_selected_value": 0,
"ignore_xss_filter": 0, "report_hide": 0,
"in_filter": 1, "reqd": 0,
"in_global_search": 0, "search_index": 0,
"in_list_view": 0, "set_only_once": 0,
"in_standard_filter": 0, "unique": 0
"label": "Custody", },
"length": 0, {
"no_copy": 0, "allow_bulk_edit": 0,
"permlevel": 0, "allow_on_submit": 0,
"precision": "", "bold": 0,
"print_hide": 0, "collapsible": 0,
"print_hide_if_no_value": 0, "columns": 0,
"read_only": 0, "default": "0.00",
"remember_last_selected_value": 0, "fieldname": "returns",
"report_hide": 0, "fieldtype": "Float",
"reqd": 0, "hidden": 0,
"search_index": 0, "ignore_user_permissions": 0,
"set_only_once": 0, "ignore_xss_filter": 0,
"translatable": 0, "in_filter": 1,
"unique": 0 "in_global_search": 0,
}, "in_list_view": 0,
{ "in_standard_filter": 0,
"allow_bulk_edit": 0, "label": "Returns",
"allow_in_quick_entry": 0, "length": 0,
"allow_on_submit": 0, "no_copy": 0,
"bold": 0, "permlevel": 0,
"collapsible": 0, "precision": "2",
"columns": 0, "print_hide": 0,
"default": "0.00", "print_hide_if_no_value": 0,
"fieldname": "outstanding_amount", "read_only": 0,
"fieldtype": "Float", "remember_last_selected_value": 0,
"hidden": 0, "report_hide": 0,
"ignore_user_permissions": 0, "reqd": 0,
"ignore_xss_filter": 0, "search_index": 0,
"in_filter": 0, "set_only_once": 0,
"in_global_search": 0, "unique": 0
"in_list_view": 0, },
"in_standard_filter": 0, {
"label": "Outstanding Amount", "allow_bulk_edit": 0,
"length": 0, "allow_on_submit": 0,
"no_copy": 0, "bold": 0,
"permlevel": 0, "collapsible": 0,
"precision": "", "columns": 0,
"print_hide": 0, "default": "0.00",
"print_hide_if_no_value": 0, "fieldname": "outstanding_amount",
"read_only": 1, "fieldtype": "Float",
"remember_last_selected_value": 0, "hidden": 0,
"report_hide": 0, "ignore_user_permissions": 0,
"reqd": 0, "ignore_xss_filter": 0,
"search_index": 0, "in_filter": 0,
"set_only_once": 0, "in_global_search": 0,
"translatable": 0, "in_list_view": 0,
"unique": 0 "in_standard_filter": 0,
}, "label": "Outstanding Amount",
{ "length": 0,
"allow_bulk_edit": 0, "no_copy": 0,
"allow_in_quick_entry": 0, "permlevel": 0,
"allow_on_submit": 0, "precision": "2",
"bold": 0, "print_hide": 0,
"collapsible": 0, "print_hide_if_no_value": 0,
"columns": 0, "read_only": 1,
"default": "0.0", "remember_last_selected_value": 0,
"fieldname": "payments", "report_hide": 0,
"fieldtype": "Table", "reqd": 0,
"hidden": 0, "search_index": 0,
"ignore_user_permissions": 0, "set_only_once": 0,
"ignore_xss_filter": 0, "unique": 0
"in_filter": 1, },
"in_global_search": 0, {
"in_list_view": 0, "allow_bulk_edit": 0,
"in_standard_filter": 0, "allow_on_submit": 0,
"label": "Payments", "bold": 0,
"length": 0, "collapsible": 0,
"no_copy": 0, "columns": 0,
"options": "Cashier Closing Payments", "default": "0.0",
"permlevel": 0, "fieldname": "payments",
"precision": "", "fieldtype": "Table",
"print_hide": 0, "hidden": 0,
"print_hide_if_no_value": 0, "ignore_user_permissions": 0,
"read_only": 0, "ignore_xss_filter": 0,
"remember_last_selected_value": 0, "in_filter": 1,
"report_hide": 0, "in_global_search": 0,
"reqd": 0, "in_list_view": 0,
"search_index": 0, "in_standard_filter": 0,
"set_only_once": 0, "label": "Payments",
"translatable": 0, "length": 0,
"unique": 0 "no_copy": 0,
}, "options": "Cashier Closing Payments",
{ "permlevel": 0,
"allow_bulk_edit": 0, "precision": "",
"allow_in_quick_entry": 0, "print_hide": 0,
"allow_on_submit": 0, "print_hide_if_no_value": 0,
"bold": 0, "read_only": 0,
"collapsible": 0, "remember_last_selected_value": 0,
"columns": 0, "report_hide": 0,
"fieldname": "net_amount", "reqd": 0,
"fieldtype": "Float", "search_index": 0,
"hidden": 0, "set_only_once": 0,
"ignore_user_permissions": 0, "unique": 0
"ignore_xss_filter": 0, },
"in_filter": 1, {
"in_global_search": 0, "allow_bulk_edit": 0,
"in_list_view": 1, "allow_on_submit": 0,
"in_standard_filter": 1, "bold": 0,
"label": "Net Amount", "collapsible": 0,
"length": 0, "columns": 0,
"no_copy": 0, "fieldname": "net_amount",
"permlevel": 0, "fieldtype": "Float",
"precision": "", "hidden": 0,
"print_hide": 0, "ignore_user_permissions": 0,
"print_hide_if_no_value": 0, "ignore_xss_filter": 0,
"read_only": 1, "in_filter": 1,
"remember_last_selected_value": 0, "in_global_search": 0,
"report_hide": 0, "in_list_view": 1,
"reqd": 0, "in_standard_filter": 1,
"search_index": 0, "label": "Net Amount",
"set_only_once": 0, "length": 0,
"translatable": 0, "no_copy": 0,
"unique": 0 "permlevel": 0,
}, "precision": "",
{ "print_hide": 0,
"allow_bulk_edit": 0, "print_hide_if_no_value": 0,
"allow_in_quick_entry": 0, "read_only": 1,
"allow_on_submit": 0, "remember_last_selected_value": 0,
"bold": 0, "report_hide": 0,
"collapsible": 0, "reqd": 0,
"columns": 0, "search_index": 0,
"fieldname": "amended_from", "set_only_once": 0,
"fieldtype": "Link", "unique": 0
"hidden": 0, },
"ignore_user_permissions": 0, {
"ignore_xss_filter": 0, "allow_bulk_edit": 0,
"in_filter": 0, "allow_on_submit": 0,
"in_global_search": 0, "bold": 0,
"in_list_view": 0, "collapsible": 0,
"in_standard_filter": 0, "columns": 0,
"label": "Amended From", "fieldname": "amended_from",
"length": 0, "fieldtype": "Link",
"no_copy": 1, "hidden": 0,
"options": "Cashier Closing", "ignore_user_permissions": 0,
"permlevel": 0, "ignore_xss_filter": 0,
"print_hide": 1, "in_filter": 0,
"print_hide_if_no_value": 0, "in_global_search": 0,
"read_only": 1, "in_list_view": 0,
"remember_last_selected_value": 0, "in_standard_filter": 0,
"report_hide": 0, "label": "Amended From",
"reqd": 0, "length": 0,
"search_index": 0, "no_copy": 1,
"set_only_once": 0, "options": "Cashier Closing",
"translatable": 0, "permlevel": 0,
"unique": 0 "print_hide": 1,
} "print_hide_if_no_value": 0,
], "read_only": 1,
"has_web_view": 0, "remember_last_selected_value": 0,
"hide_heading": 0, "report_hide": 0,
"hide_toolbar": 0, "reqd": 0,
"idx": 0, "search_index": 0,
"image_view": 0, "set_only_once": 0,
"in_create": 0, "unique": 0
"is_submittable": 1, }
"issingle": 0, ],
"istable": 0, "has_web_view": 0,
"max_attachments": 0, "hide_heading": 0,
"modified": "2019-02-19 08:35:23.157327", "hide_toolbar": 0,
"modified_by": "Administrator", "idx": 0,
"module": "Accounts", "image_view": 0,
"name": "Cashier Closing", "in_create": 0,
"name_case": "", "is_submittable": 1,
"owner": "Administrator", "issingle": 0,
"permissions": [ "istable": 0,
{ "max_attachments": 0,
"amend": 0, "modified": "2019-03-14 09:14:26.727129",
"cancel": 0, "modified_by": "Administrator",
"create": 1, "module": "Accounts",
"delete": 1, "name": "Cashier Closing",
"email": 1, "name_case": "",
"export": 1, "owner": "Administrator",
"if_owner": 0, "permissions": [
"import": 0, {
"permlevel": 0, "amend": 0,
"print": 1, "apply_user_permissions": 0,
"read": 1, "cancel": 0,
"report": 1, "create": 1,
"role": "System Manager", "delete": 1,
"set_user_permissions": 0, "email": 1,
"share": 1, "export": 1,
"submit": 1, "if_owner": 0,
"write": 1 "import": 0,
} "permlevel": 0,
], "print": 1,
"quick_entry": 0, "read": 1,
"read_only": 0, "report": 1,
"read_only_onload": 0, "role": "System Manager",
"show_name_in_global_search": 0, "set_user_permissions": 0,
"sort_field": "modified", "share": 1,
"sort_order": "DESC", "submit": 1,
"track_changes": 1, "write": 1
"track_seen": 0, }
"track_views": 0 ],
} "quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"show_name_in_global_search": 0,
"sort_field": "modified",
"sort_order": "DESC",
"track_changes": 1,
"track_seen": 0
}

2
erpnext/accounts/doctype/cashier_closing/cashier_closing.py
View File

@@ -29,7 +29,7 @@ class CashierClosing(Document):
for i in self.payments: for i in self.payments:
total += flt(i.amount) total += flt(i.amount)
self.net_amount = total + self.outstanding_amount + self.expense - self.custody self.net_amount = total + self.outstanding_amount + self.expense - self.custody + self.returns
def validate_time(self): def validate_time(self):
if self.from_time >= self.time: if self.from_time >= self.time: