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

Merge pull request #7830 from mbauskar/develop

Browse Source 
[minor] eval conditions for recurring sections and lead fields
This commit is contained in:
Nabin Hait
2017-02-23 16:54:20 +05:30
committed by GitHub
parent 8ec1b565f5 ddb9f0bf78
commit 5278da8901
5 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
View File

@@ -3098,7 +3098,7 @@
"collapsible": 1, "collapsible": 1,
"collapsible_depends_on": "is_recurring", "collapsible_depends_on": "is_recurring",
"columns": 0, "columns": 0,
"depends_on": "eval:doc.docstatus<2", "depends_on": "eval:doc.docstatus<2 && !doc.__islocal",
"fieldname": "recurring_invoice", "fieldname": "recurring_invoice",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0, "hidden": 0,
@@ -3527,7 +3527,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2017-02-17 16:30:09.952106", "modified": "2017-02-22 18:16:09.890488",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",

6
erpnext/accounts/doctype/sales_invoice/sales_invoice.json
View File

@@ -3836,7 +3836,7 @@
"collapsible": 1, "collapsible": 1,
"collapsible_depends_on": "is_recurring", "collapsible_depends_on": "is_recurring",
"columns": 0, "columns": 0,
"depends_on": "eval:doc.docstatus<2", "depends_on": "eval:doc.docstatus<2 && !doc.__islocal",
"fieldname": "recurring_invoice", "fieldname": "recurring_invoice",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0, "hidden": 0,
@@ -3846,7 +3846,7 @@
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Recurring", "label": "Recurring Invoice",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "fa fa-time", "options": "fa fa-time",
@@ -4327,7 +4327,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2017-02-17 16:12:30.694315", "modified": "2017-02-22 18:20:35.085909",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

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

@@ -2710,6 +2710,7 @@
"collapsible": 1, "collapsible": 1,
"collapsible_depends_on": "is_recurring", "collapsible_depends_on": "is_recurring",
"columns": 0, "columns": 0,
"depends_on": "eval:doc.docstatus<2 && !doc.__islocal",
"fieldname": "recurring_order", "fieldname": "recurring_order",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0, "hidden": 0,
@@ -2719,7 +2720,7 @@
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Recurring", "label": "Recurring Order",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "fa fa-time", "options": "fa fa-time",
@@ -3167,7 +3168,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-02-17 16:46:02.996638", "modified": "2017-02-22 18:20:15.650815",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",

7
erpnext/crm/doctype/lead/lead.json
View File

@@ -227,6 +227,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "",
"fieldname": "source", "fieldname": "source",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
@@ -258,7 +259,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "eval:doc.source == 'Customer'", "depends_on": "eval:doc.source == 'Existing Customer'",
"fieldname": "customer", "fieldname": "customer",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
@@ -290,7 +291,7 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "", "depends_on": "eval: doc.source==\"Campaign\"",
"description": "", "description": "",
"fieldname": "campaign_name", "fieldname": "campaign_name",
"fieldtype": "Link", "fieldtype": "Link",
@@ -1048,7 +1049,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-02-17 16:38:16.833577", "modified": "2017-02-22 18:53:16.231035",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Lead", "name": "Lead",

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

@@ -3026,6 +3026,7 @@
"collapsible": 1, "collapsible": 1,
"collapsible_depends_on": "is_recurring", "collapsible_depends_on": "is_recurring",
"columns": 0, "columns": 0,
"depends_on": "eval:doc.docstatus<2 && !doc.__islocal",
"fieldname": "recurring_order", "fieldname": "recurring_order",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0, "hidden": 0,
@@ -3484,7 +3485,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-02-20 13:22:41.755708", "modified": "2017-02-22 18:17:15.293694",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order", "name": "Sales Order",