nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-13 10:11:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22400 from AfshanKhan/FR_ISS_204290

Browse Source 
fix: removed condition that considered "Standard working hours" while…
This commit is contained in:
rohitwaghchaure
2020-06-25 23:23:33 +05:30
committed by GitHub
parent 2eb452f3bb a462e29172
commit cc7e1b0ec5
4 changed files with 8 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/setup/doctype/company/company.json
View File

@@ -22,7 +22,6 @@
"default_letter_head",
"default_holiday_list",
"default_finance_book",
"standard_working_hours",
"default_selling_terms",
"default_buying_terms",
"default_warehouse_for_sales_return",
@@ -240,11 +239,6 @@
"label": "Default Holiday List",
"options": "Holiday List"
},
{
"fieldname": "standard_working_hours",
"fieldtype": "Float",
"label": "Standard Working Hours"
},
{
"fieldname": "default_warehouse_for_sales_return",
"fieldtype": "Link",
@@ -746,7 +740,7 @@
"image_field": "company_logo",
"is_tree": 1,
"links": [],
"modified": "2020-06-20 11:38:43.178970",
"modified": "2020-06-24 12:45:31.462195",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",