Merge pull request #3730 from nabinhait/fix1
minor fixes
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.py b/erpnext/accounts/doctype/gl_entry/gl_entry.py
index edee122..43c4213 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.py
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.py
@@ -4,11 +4,13 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import flt, fmt_money, getdate, formatdate, cstr, cint
+from frappe.utils import flt, fmt_money, getdate, formatdate, cstr
from frappe import _
from frappe.model.document import Document
+class CustomerFrozen(frappe.ValidationError): pass
+
class GLEntry(Document):
def validate(self):
self.flags.ignore_submit_comment = True
@@ -17,6 +19,7 @@
self.validate_posting_date()
self.check_pl_account()
self.validate_cost_center()
+ self.validate_party()
def on_update_with_args(self, adv_adj, update_outstanding = 'Yes'):
self.validate_account_details(adv_adj)
@@ -88,6 +91,13 @@
if self.cost_center and _get_cost_center_company() != self.company:
frappe.throw(_("Cost Center {0} does not belong to Company {1}").format(self.cost_center, self.company))
+
+ def validate_party(self):
+ if self.party_type and self.party:
+ frozen_accounts_modifier = frappe.db.get_value( 'Accounts Settings', None,'frozen_accounts_modifier')
+ if not frozen_accounts_modifier in frappe.get_roles():
+ if frappe.db.get_value(self.party_type, self.party, "is_frozen"):
+ frappe.throw("{0} {1} is frozen".format(self.party_type, self.party), CustomerFrozen)
def validate_balance_type(account, adv_adj=False):
if not adv_adj and account:
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index a1a38d5..c3128a5 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -55,6 +55,13 @@
"reqd": 1
},
{
+ "fieldname": "is_frozen",
+ "fieldtype": "Check",
+ "label": "Is Frozen",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"depends_on": "eval:!doc.__islocal",
"fieldname": "address_contacts",
"fieldtype": "Section Break",
@@ -172,7 +179,7 @@
],
"icon": "icon-user",
"idx": 1,
- "modified": "2015-07-13 05:28:29.121285",
+ "modified": "2015-07-17 09:39:05.318826",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier",
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 7610042..55e9e3d 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -11,11 +11,14 @@
from erpnext.controllers.recurring_document import convert_to_recurring, validate_recurring_document
from erpnext.controllers.sales_and_purchase_return import validate_return
+class CustomerFrozen(frappe.ValidationError): pass
+
class AccountsController(TransactionBase):
def validate(self):
if self.get("_action") and self._action != "update_after_submit":
self.set_missing_values(for_validate=True)
self.validate_date_with_fiscal_year()
+
if self.meta.get_field("currency"):
self.calculate_taxes_and_totals()
if not self.meta.get_field("is_return") or not self.is_return:
@@ -32,6 +35,8 @@
if self.meta.get_field("taxes_and_charges"):
self.validate_enabled_taxes_and_charges()
+
+ self.validate_party()
def on_submit(self):
if self.meta.get_field("is_recurring"):
@@ -340,6 +345,23 @@
return self._abbr
+ def validate_party(self):
+ frozen_accounts_modifier = frappe.db.get_value( 'Accounts Settings', None,'frozen_accounts_modifier')
+ if frozen_accounts_modifier in frappe.get_roles():
+ return
+
+ party_type = None
+ if self.meta.get_field("customer"):
+ party_type = 'Customer'
+
+ elif self.meta.get_field("supplier"):
+ party_type = 'Supplier'
+
+ if party_type:
+ party = self.get(party_type.lower())
+ if frappe.db.get_value(party_type, party, "is_frozen"):
+ frappe.throw("{0} {1} is frozen".format(party_type, party), CustomerFrozen)
+
@frappe.whitelist()
def get_tax_rate(account_head):
return frappe.db.get_value("Account", account_head, "tax_rate")
diff --git a/erpnext/hr/doctype/offer_letter/offer_letter.json b/erpnext/hr/doctype/offer_letter/offer_letter.json
index ec93bb0..6f60a33 100644
--- a/erpnext/hr/doctype/offer_letter/offer_letter.json
+++ b/erpnext/hr/doctype/offer_letter/offer_letter.json
@@ -1,193 +1,193 @@
{
- "allow_copy": 0,
- "allow_import": 1,
- "allow_rename": 0,
- "autoname": "Offer-.#####",
- "creation": "2015-03-04 14:20:17.662207",
- "custom": 0,
- "default_print_format": "Offer Letter",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Transaction",
+ "allow_copy": 0,
+ "allow_import": 1,
+ "allow_rename": 0,
+ "autoname": "Offer-.#####",
+ "creation": "2015-03-04 14:20:17.662207",
+ "custom": 0,
+ "default_print_format": "Offer Letter",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Transaction",
"fields": [
{
- "allow_on_submit": 0,
- "fieldname": "job_applicant",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Job Applicant",
- "no_copy": 0,
- "options": "Job Applicant",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
+ "allow_on_submit": 0,
+ "fieldname": "job_applicant",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Job Applicant",
+ "no_copy": 0,
+ "options": "Job Applicant",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
"set_only_once": 0
- },
+ },
{
- "fieldname": "applicant_name",
- "fieldtype": "Data",
- "label": "Applicant Name",
- "options": "job_applicant.applicant_name",
- "permlevel": 0,
- "precision": "",
- "read_only": 1,
+ "fieldname": "applicant_name",
+ "fieldtype": "Data",
+ "label": "Applicant Name",
+ "options": "job_applicant.applicant_name",
+ "permlevel": 0,
+ "precision": "",
+ "read_only": 1,
"reqd": 1
- },
+ },
{
- "fieldname": "column_break_3",
- "fieldtype": "Column Break",
- "permlevel": 0,
+ "fieldname": "column_break_3",
+ "fieldtype": "Column Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "allow_on_submit": 1,
- "fieldname": "status",
- "fieldtype": "Select",
- "label": "Status",
- "options": "Awaiting Response\nAccepted\nRejected ",
- "permlevel": 0,
- "precision": "",
+ "allow_on_submit": 1,
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "label": "Status",
+ "options": "Awaiting Response\nAccepted\nRejected",
+ "permlevel": 0,
+ "precision": "",
"print_hide": 1
- },
+ },
{
- "default": "",
- "fieldname": "offer_date",
- "fieldtype": "Date",
- "label": "Offer Date",
- "permlevel": 0,
+ "default": "",
+ "fieldname": "offer_date",
+ "fieldtype": "Date",
+ "label": "Offer Date",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "allow_on_submit": 0,
- "fieldname": "designation",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Designation",
- "no_copy": 0,
- "options": "Designation",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
+ "allow_on_submit": 0,
+ "fieldname": "designation",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Designation",
+ "no_copy": 0,
+ "options": "Designation",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
"set_only_once": 0
- },
+ },
{
- "fieldname": "company",
- "fieldtype": "Link",
- "label": "Company",
- "options": "Company",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "label": "Company",
+ "options": "Company",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
"reqd": 1
- },
+ },
{
- "fieldname": "section_break_4",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "fieldname": "section_break_4",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "offer_terms",
- "fieldtype": "Table",
- "label": "Offer Letter Terms",
- "options": "Offer Letter Term",
- "permlevel": 0,
+ "fieldname": "offer_terms",
+ "fieldtype": "Table",
+ "label": "Offer Letter Terms",
+ "options": "Offer Letter Term",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "section_break_14",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "fieldname": "section_break_14",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "allow_on_submit": 0,
- "fieldname": "select_terms",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Select Terms and Conditions",
- "no_copy": 0,
- "options": "Terms and Conditions",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
+ "allow_on_submit": 0,
+ "fieldname": "select_terms",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Select Terms and Conditions",
+ "no_copy": 0,
+ "options": "Terms and Conditions",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
"set_only_once": 0
- },
+ },
{
- "fieldname": "terms",
- "fieldtype": "Text Editor",
- "label": "Terms and Conditions",
- "options": "",
- "permlevel": 0,
+ "fieldname": "terms",
+ "fieldtype": "Text Editor",
+ "label": "Terms and Conditions",
+ "options": "",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "label": "Amended From",
- "no_copy": 1,
- "options": "Offer Letter",
- "permlevel": 0,
- "print_hide": 1,
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "label": "Amended From",
+ "no_copy": 1,
+ "options": "Offer Letter",
+ "permlevel": 0,
+ "print_hide": 1,
"read_only": 1
}
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 1,
- "issingle": 0,
- "istable": 0,
- "modified": "2015-04-01 05:51:39.841591",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Offer Letter",
- "name_case": "",
- "owner": "Administrator",
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 1,
+ "issingle": 0,
+ "istable": 0,
+ "modified": "2015-07-29 05:51:39.841591",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Offer Letter",
+ "name_case": "",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "import": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "HR User",
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "import": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR User",
+ "share": 1,
+ "submit": 1,
"write": 1
}
- ],
- "read_only": 0,
- "read_only_onload": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
+ ],
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
"title_field": "applicant_name"
-}
\ No newline at end of file
+}
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index cced319..a3bcc8a 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -102,6 +102,13 @@
"reqd": 1
},
{
+ "fieldname": "is_frozen",
+ "fieldtype": "Check",
+ "label": "Is Frozen",
+ "permlevel": 0,
+ "precision": ""
+ },
+ {
"depends_on": "eval:!doc.__islocal",
"fieldname": "address_contacts",
"fieldtype": "Section Break",
@@ -278,7 +285,7 @@
],
"icon": "icon-user",
"idx": 1,
- "modified": "2015-07-13 05:28:25.753684",
+ "modified": "2015-07-17 09:38:50.086978",
"modified_by": "Administrator",
"module": "Selling",
"name": "Customer",
diff --git a/erpnext/selling/doctype/customer/test_customer.py b/erpnext/selling/doctype/customer/test_customer.py
index 1db6c6a..dca4bb7 100644
--- a/erpnext/selling/doctype/customer/test_customer.py
+++ b/erpnext/selling/doctype/customer/test_customer.py
@@ -7,6 +7,7 @@
import unittest
from frappe.test_runner import make_test_records
+from erpnext.controllers.accounts_controller import CustomerFrozen
test_ignore = ["Price List"]
@@ -65,5 +66,15 @@
{"comment_doctype": "Customer", "comment_docname": "_Test Customer 1 Renamed"}), comment.name)
frappe.rename_doc("Customer", "_Test Customer 1 Renamed", "_Test Customer 1")
-
-
+
+ def test_freezed_customer(self):
+ frappe.db.set_value("Customer", "_Test Customer", "is_frozen", 1)
+
+ from erpnext.selling.doctype.sales_order.test_sales_order import make_sales_order
+
+ so = make_sales_order(do_not_save= True)
+ self.assertRaises(CustomerFrozen, so.save)
+
+ frappe.db.set_value("Customer", "_Test Customer", "is_frozen", 0)
+
+ so.save()
\ No newline at end of file
diff --git a/erpnext/setup/doctype/naming_series/naming_series.js b/erpnext/setup/doctype/naming_series/naming_series.js
index e781754..5917f52 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.js
+++ b/erpnext/setup/doctype/naming_series/naming_series.js
@@ -1,7 +1,10 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
+
cur_frm.cscript.onload_post_render = function(doc, cdt, cdn) {
+ cur_frm.disable_save();
+ cur_frm.toolbar.print_icon.addClass("hide");
return cur_frm.call({
doc: cur_frm.doc,
method: 'get_transactions',
@@ -18,7 +21,7 @@
}
cur_frm.cscript.select_doc_for_series = function(doc, cdt, cdn) {
- cur_frm.toggle_display(['help_html','set_options', 'user_must_always_select', 'update'],
+ cur_frm.toggle_display(['help_html','set_options', 'user_must_always_select', 'update'],
doc.select_doc_for_series);
var callback = function(r, rt){
@@ -40,4 +43,4 @@
return cur_frm.call_server('get_current', '', function(r) {
refresh_field('current_value');
});
-}
\ No newline at end of file
+}
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.js b/erpnext/setup/page/setup_wizard/setup_wizard.js
index b38bd1c..ac720c9 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.js
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.js
@@ -29,7 +29,7 @@
erpnext.wiz.taxes.slide,
erpnext.wiz.customers.slide,
erpnext.wiz.suppliers.slide,
- erpnext.wiz.items.slide,
+ erpnext.wiz.items.slide
]
}
@@ -406,7 +406,6 @@
description: __('Your financial year begins on'), reqd:1},
{fieldname:'fy_end_date', label:__('Financial Year End Date'), fieldtype:'Date',
description: __('Your financial year ends on'), reqd:1},
-
],
help: __('The name of your company for which you are setting up this system.'),
@@ -510,7 +509,7 @@
slide: {
icon: "icon-money",
"title": __("Add Users"),
- "help": __("Add users to your organization"),
+ "help": __("Add users to your organization, other than yourself"),
"fields": [],
before_load: function(slide) {
slide.fields = [];
@@ -635,6 +634,11 @@
])
}
slide.fields[1].reqd = 1;
+
+ // dummy data
+ slide.fields.push({fieldtype: "Section Break"});
+ slide.fields.push({fieldtype: "Check", fieldname: "add_sample_data",
+ label: __("Add a few sample records"), "default": 1});
},
css_class: "two-column"
},
diff --git a/erpnext/setup/page/setup_wizard/setup_wizard.py b/erpnext/setup/page/setup_wizard/setup_wizard.py
index 812a9f1..e8c7699 100644
--- a/erpnext/setup/page/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/page/setup_wizard/setup_wizard.py
@@ -86,10 +86,11 @@
frappe.clear_cache()
- try:
- make_sample_data()
- except FiscalYearError:
- pass
+ if args.get("add_sample_data"):
+ try:
+ make_sample_data()
+ except FiscalYearError:
+ pass
except:
if args:
traceback = frappe.get_traceback()
diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json
index b4e84f1..546723a 100644
--- a/erpnext/stock/doctype/item_price/item_price.json
+++ b/erpnext/stock/doctype/item_price/item_price.json
@@ -1,157 +1,158 @@
{
- "allow_import": 1,
- "autoname": "ITEM-PRICE-.#####",
- "creation": "2013-05-02 16:29:48",
- "description": "Multiple Item prices.",
- "docstatus": 0,
- "doctype": "DocType",
+ "allow_import": 1,
+ "autoname": "ITEM-PRICE-.#####",
+ "creation": "2013-05-02 16:29:48",
+ "description": "Multiple Item prices.",
+ "docstatus": 0,
+ "doctype": "DocType",
"document_type": "Master",
"fields": [
{
- "fieldname": "price_list_details",
- "fieldtype": "Section Break",
- "label": "Price List",
- "options": "icon-tags",
+ "fieldname": "price_list_details",
+ "fieldtype": "Section Break",
+ "label": "Price List",
+ "options": "icon-tags",
"permlevel": 0
- },
+ },
{
- "fieldname": "price_list",
- "fieldtype": "Link",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Price List",
- "options": "Price List",
- "permlevel": 0,
+ "fieldname": "price_list",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Price List",
+ "options": "Price List",
+ "permlevel": 0,
"reqd": 1
- },
+ },
{
- "fieldname": "buying",
- "fieldtype": "Check",
- "in_list_view": 0,
- "label": "Buying",
- "permlevel": 0,
+ "fieldname": "buying",
+ "fieldtype": "Check",
+ "in_list_view": 0,
+ "label": "Buying",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "selling",
- "fieldtype": "Check",
- "in_list_view": 0,
- "label": "Selling",
- "permlevel": 0,
+ "fieldname": "selling",
+ "fieldtype": "Check",
+ "in_list_view": 0,
+ "label": "Selling",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "item_details",
- "fieldtype": "Section Break",
- "label": "",
- "options": "icon-tag",
+ "fieldname": "item_details",
+ "fieldtype": "Section Break",
+ "label": "",
+ "options": "icon-tag",
"permlevel": 0
- },
+ },
{
- "fieldname": "item_code",
- "fieldtype": "Link",
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Item Code",
- "oldfieldname": "price_list_name",
- "oldfieldtype": "Select",
- "options": "Item",
- "permlevel": 0,
- "reqd": 1,
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "in_list_view": 0,
+ "label": "Item Code",
+ "oldfieldname": "price_list_name",
+ "oldfieldtype": "Select",
+ "options": "Item",
+ "permlevel": 0,
+ "reqd": 1,
"search_index": 1
- },
+ },
{
- "fieldname": "price_list_rate",
- "fieldtype": "Currency",
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Rate",
- "oldfieldname": "ref_rate",
- "oldfieldtype": "Currency",
- "options": "currency",
- "permlevel": 0,
- "reqd": 1,
+ "fieldname": "price_list_rate",
+ "fieldtype": "Currency",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Rate",
+ "oldfieldname": "ref_rate",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "reqd": 1,
"search_index": 0
- },
+ },
{
- "fieldname": "currency",
- "fieldtype": "Link",
- "hidden": 0,
- "label": "Currency",
- "options": "Currency",
- "permlevel": 0,
+ "fieldname": "currency",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "in_list_view": 1,
+ "label": "Currency",
+ "options": "Currency",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "col_br_1",
- "fieldtype": "Column Break",
+ "fieldname": "col_br_1",
+ "fieldtype": "Column Break",
"permlevel": 0
- },
+ },
{
- "fieldname": "item_name",
- "fieldtype": "Data",
- "label": "Item Name",
- "permlevel": 0,
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "label": "Item Name",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "item_description",
- "fieldtype": "Text",
- "label": "Item Description",
- "permlevel": 0,
+ "fieldname": "item_description",
+ "fieldtype": "Text",
+ "label": "Item Description",
+ "permlevel": 0,
"read_only": 1
- },
+ },
{
- "fieldname": "section_break_12",
- "fieldtype": "Section Break",
- "permlevel": 0,
+ "fieldname": "section_break_12",
+ "fieldtype": "Section Break",
+ "permlevel": 0,
"precision": ""
- },
+ },
{
- "fieldname": "bulk_import_help",
- "fieldtype": "HTML",
- "label": "Bulk Import Help",
- "permlevel": 0,
+ "fieldname": "bulk_import_help",
+ "fieldtype": "HTML",
+ "label": "Bulk Import Help",
+ "permlevel": 0,
"precision": ""
}
- ],
- "icon": "icon-flag",
- "idx": 1,
- "in_create": 0,
- "istable": 0,
- "modified": "2015-05-26 03:15:02.324161",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Item Price",
- "owner": "Administrator",
+ ],
+ "icon": "icon-flag",
+ "idx": 1,
+ "in_create": 0,
+ "istable": 0,
+ "modified": "2015-07-29 14:53:58.851413",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item Price",
+ "owner": "Administrator",
"permissions": [
{
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Sales Master Manager",
- "share": 1,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Sales Master Manager",
+ "share": 1,
"write": 1
- },
+ },
{
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Purchase Master Manager",
- "share": 1,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Purchase Master Manager",
+ "share": 1,
"write": 1
}
- ],
- "read_only": 0,
+ ],
+ "read_only": 0,
"title_field": "item_code"
-}
\ No newline at end of file
+}
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json
index cabbdae..fd36d47 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.json
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -222,6 +222,7 @@
"permlevel": 0
},
{
+ "depends_on": "customer",
"fieldname": "contact_info",
"fieldtype": "Section Break",
"label": "Contact Info",
@@ -396,7 +397,7 @@
"icon": "icon-bug",
"idx": 1,
"is_submittable": 0,
- "modified": "2015-02-21 04:11:40.653543",
+ "modified": "2015-07-28 11:59:38.762393",
"modified_by": "Administrator",
"module": "Support",
"name": "Warranty Claim",