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

Merge pull request #7398 from nabinhait/filter_dashboard

Browse Source 
Reload in_standard_filter property
This commit is contained in:
Nabin Hait 2017-01-09 15:43:30 +05:30 committed by GitHub
commit 07b524ee50
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/buying/doctype/purchase_order/purchase_order.json
View File

@ -2212,7 +2212,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 1,
"label": "Status", "label": "Status",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
@ -2360,7 +2360,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 1, "in_standard_filter": 0,
"label": "% Billed", "label": "% Billed",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
@ -3062,7 +3062,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-11-07 06:01:00.233621", "modified": "2017-01-06 12:51:56.556331",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",

2
erpnext/patches/v5_0/portal_fixes.py
View File

@ -2,5 +2,5 @@ import frappe
import erpnext.setup.install import erpnext.setup.install
def execute(): def execute():
frappe.reload_doc("website", "doctype", "web_form_field", force=True) frappe.reload_doc("website", "doctype", "web_form_field", force=True, reset_permissions=True)
#erpnext.setup.install.add_web_forms() #erpnext.setup.install.add_web_forms()

12
erpnext/selling/doctype/sales_order/sales_order.json
View File

@ -2580,7 +2580,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 1,
"label": "Delivery Status", "label": "Delivery Status",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
@ -2610,7 +2610,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 1, "in_standard_filter": 0,
"label": "% Delivered", "label": "% Delivered",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
@ -2668,7 +2668,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 1, "in_standard_filter": 0,
"label": "% Amount Billed", "label": "% Amount Billed",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
@ -2698,7 +2698,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 1,
"label": "Billing Status", "label": "Billing Status",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
@ -3369,7 +3369,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-11-16 04:06:28.675876", "modified": "2017-01-06 12:51:17.847227",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",
@ -3383,7 +3383,7 @@
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 0, "export": 0,
"if_owner": 1, "if_owner": 0,
"import": 0, "import": 0,
"is_custom": 0, "is_custom": 0,
"permlevel": 0, "permlevel": 0,

4
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@ -2705,7 +2705,7 @@
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 1,
"label": "Status", "label": "Status",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
@ -3120,7 +3120,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2016-12-16 03:56:08.745185", "modified": "2017-01-06 12:52:48.960308",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note", "name": "Delivery Note",