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

Merge with upstream

Browse Source
This commit is contained in:
Prateeksha Singh 2018-08-30 16:15:27 +05:30
commit 5797565dd0
74 changed files with 27643 additions and 26821 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -6,7 +6,7 @@
</p> </p>
</div> </div>
[![Build Status](https://travis-ci.com/frappe/erpnext.png)](https://travis-ci.com/frappe/erpnext) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/frappe/erpnext?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Build Status](https://travis-ci.com/frappe/erpnext.png)](https://travis-ci.com/frappe/erpnext) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/frappe/erpnext?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Open Source Helpers](https://www.codetriage.com/frappe/erpnext/badges/users.svg)](https://www.codetriage.com/frappe/erpnext)
[https://erpnext.com](https://erpnext.com) [https://erpnext.com](https://erpnext.com)

2
erpnext/__init__.py
View File

@ -5,7 +5,7 @@ import frappe
from erpnext.hooks import regional_overrides from erpnext.hooks import regional_overrides
from frappe.utils import getdate from frappe.utils import getdate
__version__ = '10.1.48' __version__ = '10.1.49'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

5
erpnext/accounts/doctype/account/account.py
View File

@ -212,10 +212,13 @@ def validate_account_number(name, account_number, company):
@frappe.whitelist() @frappe.whitelist()
def update_account_number(name, account_name, account_number=None): def update_account_number(name, account_name, account_number=None):
account = frappe.db.get_value("Account", name, ["company"], as_dict=True) account = frappe.db.get_value("Account", name, "company", as_dict=True)
if not account: return
validate_account_number(name, account_number, account.company) validate_account_number(name, account_number, account.company)
if account_number: if account_number:
frappe.db.set_value("Account", name, "account_number", account_number.strip()) frappe.db.set_value("Account", name, "account_number", account_number.strip())
else:
frappe.db.set_value("Account", name, "account_number", "")
frappe.db.set_value("Account", name, "account_name", account_name.strip()) frappe.db.set_value("Account", name, "account_name", account_name.strip())
new_name = get_account_autoname(account_number, account_name, account.company) new_name = get_account_autoname(account_number, account_name, account.company)

22
erpnext/accounts/doctype/budget/budget.py
View File

@ -29,13 +29,21 @@ class Budget(Document):
def validate_duplicate(self): def validate_duplicate(self):
budget_against_field = frappe.scrub(self.budget_against) budget_against_field = frappe.scrub(self.budget_against)
budget_against = self.get(budget_against_field) budget_against = self.get(budget_against_field)
existing_budget = frappe.db.get_value("Budget", {budget_against_field: budget_against,
"fiscal_year": self.fiscal_year, "company": self.company, accounts = [d.account for d in self.accounts] or []
"name": ["!=", self.name], "docstatus": ["!=", 2]}) existing_budget = frappe.db.sql("""
if existing_budget: select
frappe.throw(_("Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3}") b.name, ba.account from `tabBudget` b, `tabBudget Account` ba
.format(existing_budget, self.budget_against, budget_against, self.fiscal_year), DuplicateBudgetError) where
ba.parent = b.name and b.company = %s and %s=%s and
b.fiscal_year=%s and b.name != %sand ba.account in (%s) """
% ('%s', budget_against_field, '%s', '%s', '%s', ','.join(['%s'] * len(accounts))),
(self.company, budget_against, self.fiscal_year, self.name) + tuple(accounts), as_dict=1)
for d in existing_budget:
frappe.throw(_("Another Budget record '{0}' already exists against {1} '{2}' and account '{3}' for fiscal year {4}")
.format(d.name, self.budget_against, budget_against, d.account, self.fiscal_year), DuplicateBudgetError)
def validate_accounts(self): def validate_accounts(self):
account_list = [] account_list = []
for d in self.get('accounts'): for d in self.get('accounts'):

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

@ -139,7 +139,7 @@
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 1,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
@ -777,7 +777,7 @@
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 1,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
@ -827,7 +827,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-08-21 16:15:44.156222", "modified": "2018-08-21 16:15:45.156222",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "GL Entry", "name": "GL Entry",

3204
erpnext/accounts/doctype/journal_entry/journal_entry.json
View File

File diff suppressed because it is too large Load Diff

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

@ -204,7 +204,7 @@
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 1,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
@ -853,7 +853,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-05-05 17:50:25.961397", "modified": "2018-05-07 17:50:25.961397",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Journal Entry Account", "name": "Journal Entry Account",

7
erpnext/accounts/doctype/loyalty_point_entry/loyalty_point_entry.json
View File

@ -344,12 +344,12 @@
"hide_toolbar": 0, "hide_toolbar": 0,
"idx": 0, "idx": 0,
"image_view": 0, "image_view": 0,
"in_create": 0, "in_create": 1,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-08-21 16:15:49.911384", "modified": "2018-08-29 16:05:22.810347",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Loyalty Point Entry", "name": "Loyalty Point Entry",
@ -422,6 +422,5 @@
"sort_order": "DESC", "sort_order": "DESC",
"title_field": "customer", "title_field": "customer",
"track_changes": 1, "track_changes": 1,
"track_seen": 0, "track_seen": 0
"track_views": 0
} }

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

@ -18,7 +18,7 @@ def get_loyalty_point_entries(customer, loyalty_program, company, expiry_date=No
date = today() date = today()
return frappe.db.sql(''' return frappe.db.sql('''
select name, loyalty_points, expiry_date, loyalty_program_tier select name, loyalty_points, expiry_date, loyalty_program_tier, sales_invoice
from `tabLoyalty Point Entry` from `tabLoyalty Point Entry`
where customer=%s and loyalty_program=%s where customer=%s and loyalty_program=%s
and expiry_date>=%s and loyalty_points>0 and company=%s and expiry_date>=%s and loyalty_points>0 and company=%s

3
erpnext/accounts/doctype/loyalty_program/test_loyalty_program.py
View File

@ -188,6 +188,9 @@ def create_sales_invoice_record(qty=1):
def create_records(): def create_records():
# create a new loyalty Account # create a new loyalty Account
if frappe.db.exists("Account", "Loyalty - _TC"):
return
frappe.get_doc({ frappe.get_doc({
"doctype": "Account", "doctype": "Account",
"account_name": "Loyalty", "account_name": "Loyalty",

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

@ -304,7 +304,7 @@
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 1,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
@ -1531,7 +1531,7 @@
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 1,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
@ -1906,7 +1906,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-08-21 14:44:28.647566", "modified": "2018-08-21 15:44:28.647566",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Entry", "name": "Payment Entry",

34
erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
View File

@ -604,6 +604,38 @@
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "discount_percentage",
"fieldname": "discount_amount",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Discount Amount",
"length": 0,
"no_copy": 0,
"options": "currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
@ -2291,7 +2323,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-07-22 18:00:51.377605", "modified": "2018-08-06 05:18:38.205356",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice Item", "name": "Purchase Invoice Item",

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

@ -101,7 +101,7 @@
"no_copy": 1, "no_copy": 1,
"oldfieldname": "naming_series", "oldfieldname": "naming_series",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "ACC-SINV-.YYYY.-", "options": "ACC-SINV-.YYYY.-\n",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
@ -2575,6 +2575,7 @@
"label": "Loyalty Amount", "label": "Loyalty Amount",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 1, "print_hide": 1,
@ -2807,7 +2808,7 @@
"label": "Apply Additional Discount On", "label": "Apply Additional Discount On",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nGrand Total\nNet Total", "options": "\nGrand Total\nNet Total\n",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 1, "print_hide": 1,
@ -4661,7 +4662,7 @@
"label": "Status", "label": "Status",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
"options": "\nDraft\nReturn\nCredit Note Issued\nSubmitted\nPaid\nUnpaid\nOverdue\nCancelled", "options": "\nDraft\nReturn\nCredit Note Issued\nSubmitted\nPaid\nUnpaid\nOverdue\nCancelled\n",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 1, "print_hide": 1,
@ -4833,7 +4834,7 @@
"no_copy": 0, "no_copy": 0,
"oldfieldname": "is_opening", "oldfieldname": "is_opening",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "No\nYes", "options": "No\nYes\n",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
@ -4865,7 +4866,7 @@
"label": "C-Form Applicable", "label": "C-Form Applicable",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
"options": "No\nYes", "options": "No\nYes\n",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
@ -5480,7 +5481,7 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2018-08-21 14:44:47.783382", "modified": "2018-08-29 16:23:03.940415",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",
@ -5574,6 +5575,5 @@
"timeline_field": "customer", "timeline_field": "customer",
"title_field": "title", "title_field": "title",
"track_changes": 1, "track_changes": 1,
"track_seen": 1, "track_seen": 1
"track_views": 0
} }

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

@ -1035,6 +1035,8 @@ class SalesInvoice(SellingController):
points_to_redeem = self.loyalty_points points_to_redeem = self.loyalty_points
for lp_entry in loyalty_point_entries: for lp_entry in loyalty_point_entries:
if lp_entry.sales_invoice == self.name:
continue
available_points = lp_entry.loyalty_points - flt(redemption_details.get(lp_entry.name)) available_points = lp_entry.loyalty_points - flt(redemption_details.get(lp_entry.name))
if available_points > points_to_redeem: if available_points > points_to_redeem:
redeemed_points = points_to_redeem redeemed_points = points_to_redeem

34
erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
View File

@ -830,6 +830,38 @@
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "discount_percentage",
"fieldname": "discount_amount",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Discount Amount",
"length": 0,
"no_copy": 0,
"options": "currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
@ -2616,7 +2648,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-05-14 06:26:59.609228", "modified": "2018-08-06 05:18:07.578350",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice Item", "name": "Sales Invoice Item",

1203
erpnext/accounts/doctype/shipping_rule/shipping_rule.json
View File

File diff suppressed because it is too large Load Diff

125
erpnext/accounts/report/accounts_receivable/accounts_receivable.py
View File

@ -124,9 +124,6 @@ class ReceivablePayableReport(object):
currency_precision = get_currency_precision() or 2 currency_precision = get_currency_precision() or 2
dr_or_cr = "debit" if args.get("party_type") == "Customer" else "credit" dr_or_cr = "debit" if args.get("party_type") == "Customer" else "credit"
dn_details = get_dn_details(args.get("party_type"))
voucher_details = self.get_voucher_details(args.get("party_type"), dn_details)
future_vouchers = self.get_entries_after(self.filters.report_date, args.get("party_type")) future_vouchers = self.get_entries_after(self.filters.report_date, args.get("party_type"))
if not self.filters.get("company"): if not self.filters.get("company"):
@ -139,7 +136,14 @@ class ReceivablePayableReport(object):
data = [] data = []
pdc_details = get_pdc_details(args.get("party_type"), self.filters.report_date) pdc_details = get_pdc_details(args.get("party_type"), self.filters.report_date)
for gle in self.get_entries_till(self.filters.report_date, args.get("party_type")): gl_entries_data = self.get_entries_till(self.filters.report_date, args.get("party_type"))
if gl_entries_data:
voucher_nos = [d.voucher_no for d in gl_entries_data] or []
dn_details = get_dn_details(args.get("party_type"), voucher_nos)
voucher_details = get_voucher_details(args.get("party_type"), voucher_nos, dn_details)
for gle in gl_entries_data:
if self.is_receivable_or_payable(gle, dr_or_cr, future_vouchers): if self.is_receivable_or_payable(gle, dr_or_cr, future_vouchers):
outstanding_amount, credit_note_amount = self.get_outstanding_amount(gle, outstanding_amount, credit_note_amount = self.get_outstanding_amount(gle,
self.filters.report_date, dr_or_cr, return_entries, currency_precision) self.filters.report_date, dr_or_cr, return_entries, currency_precision)
@ -172,7 +176,7 @@ class ReceivablePayableReport(object):
if self.filters.ageing_based_on == "Due Date": if self.filters.ageing_based_on == "Due Date":
entry_date = due_date entry_date = due_date
elif self.filters.ageing_based_on == "Supplier Invoice Date": elif self.filters.ageing_based_on == "Supplier Invoice Date":
entry_date = bill_date entry_date = bill_date
else: else:
entry_date = gle.posting_date entry_date = gle.posting_date
@ -221,12 +225,11 @@ class ReceivablePayableReport(object):
def get_entries_after(self, report_date, party_type): def get_entries_after(self, report_date, party_type):
# returns a distinct list # returns a distinct list
return list(set([(e.voucher_type, e.voucher_no) for e in self.get_gl_entries(party_type) return list(set([(e.voucher_type, e.voucher_no) for e in self.get_gl_entries(party_type, report_date, for_future=True)]))
if getdate(e.posting_date) > report_date]))
def get_entries_till(self, report_date, party_type): def get_entries_till(self, report_date, party_type):
# returns a generator # returns a generator
return (e for e in self.get_gl_entries(party_type) if getdate(e.posting_date) <= report_date) return self.get_gl_entries(party_type, report_date)
def is_receivable_or_payable(self, gle, dr_or_cr, future_vouchers): def is_receivable_or_payable(self, gle, dr_or_cr, future_vouchers):
return ( return (
@ -289,42 +292,31 @@ class ReceivablePayableReport(object):
return self.party_map return self.party_map
def get_voucher_details(self, party_type, dn_details): def get_gl_entries(self, party_type, date=None, for_future=False):
voucher_details = frappe._dict() conditions, values = self.prepare_conditions(party_type)
if party_type == "Customer": if self.filters.get(scrub(party_type)):
for si in frappe.db.sql("""select name, due_date, po_no select_fields = "sum(debit_in_account_currency) as debit, sum(credit_in_account_currency) as credit"
from `tabSales Invoice` where docstatus=1""", as_dict=1): else:
si['delivery_note'] = dn_details.get(si.name) select_fields = "sum(debit) as debit, sum(credit) as credit"
voucher_details.setdefault(si.name, si)
if party_type == "Supplier": if date and not for_future:
for pi in frappe.db.sql("""select name, due_date, bill_no, bill_date conditions += " and posting_date <= '%s'" % date
from `tabPurchase Invoice` where docstatus = 1
union
select name, due_date, bill_no, bill_date from `tabJournal Entry`
where docstatus = 1 and bill_no is not NULL""", as_dict=1):
voucher_details.setdefault(pi.name, pi)
return voucher_details if date and for_future:
conditions += " and posting_date > '%s'" % date
def get_gl_entries(self, party_type): self.gl_entries = frappe.db.sql("""
if not hasattr(self, "gl_entries"): select
conditions, values = self.prepare_conditions(party_type) name, posting_date, account, party_type, party, voucher_type, voucher_no,
against_voucher_type, against_voucher, account_currency, remarks, {0}
if self.filters.get(scrub(party_type)): from
select_fields = "sum(debit_in_account_currency) as debit, sum(credit_in_account_currency) as credit" `tabGL Entry`
else: where
select_fields = "sum(debit) as debit, sum(credit) as credit" docstatus < 2 and party_type=%s and (party is not null and party != '') {1}
self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party,
voucher_type, voucher_no, against_voucher_type, against_voucher,
account_currency, remarks, {0}
from `tabGL Entry`
where docstatus < 2 and party_type=%s and (party is not null and party != '') {1}
group by voucher_type, voucher_no, against_voucher_type, against_voucher, party group by voucher_type, voucher_no, against_voucher_type, against_voucher, party
order by posting_date, party""" order by posting_date, party"""
.format(select_fields, conditions), values, as_dict=True) .format(select_fields, conditions), values, as_dict=True)
return self.gl_entries return self.gl_entries
@ -492,18 +484,57 @@ def get_pdc_details(party_type, report_date):
return pdc_details return pdc_details
def get_dn_details(party_type): def get_dn_details(party_type, voucher_nos):
dn_details = frappe._dict() dn_details = frappe._dict()
if party_type == "Customer": if party_type == "Customer":
for si in frappe.db.sql("""select parent, GROUP_CONCAT(delivery_note SEPARATOR ', ') as dn for si in frappe.db.sql("""
from `tabSales Invoice Item` select
where docstatus=1 and delivery_note is not null and delivery_note != '' group by parent parent, GROUP_CONCAT(delivery_note SEPARATOR ', ') as dn
Union from
select against_sales_invoice as parent, GROUP_CONCAT(parent SEPARATOR ', ') as dn `tabSales Invoice Item`
from `tabDelivery Note Item` where
where docstatus=1 and against_sales_invoice is not null docstatus=1 and delivery_note is not null and delivery_note != ''
and against_sales_invoice != '' group by against_sales_invoice""", as_dict=1): and parent in (%s) group by parent
""" %(','.join(['%s'] * len(voucher_nos))), tuple(voucher_nos) , as_dict=1):
dn_details.setdefault(si.parent, si.dn)
for si in frappe.db.sql("""
select
against_sales_invoice as parent, GROUP_CONCAT(parent SEPARATOR ', ') as dn
from
`tabDelivery Note Item`
where
docstatus=1 and against_sales_invoice is not null and against_sales_invoice != ''
and against_sales_invoice in (%s)
group by against_sales_invoice
""" %(','.join(['%s'] * len(voucher_nos))), tuple(voucher_nos) , as_dict=1):
if si.parent in dn_details:
dn_details[si.parent] += ', %s' %(si.dn)
else:
dn_details.setdefault(si.parent, si.dn) dn_details.setdefault(si.parent, si.dn)
return dn_details return dn_details
def get_voucher_details(party_type, voucher_nos, dn_details):
voucher_details = frappe._dict()
if party_type == "Customer":
for si in frappe.db.sql("""select name, due_date, po_no
from `tabSales Invoice` where docstatus=1 and name in (%s)
""" %(','.join(['%s'] *len(voucher_nos))), (tuple(voucher_nos)), as_dict=1):
si['delivery_note'] = dn_details.get(si.name)
voucher_details.setdefault(si.name, si)
if party_type == "Supplier":
for pi in frappe.db.sql("""select name, due_date, bill_no, bill_date
from `tabPurchase Invoice` where docstatus = 1 and name in (%s)
""" %(','.join(['%s'] *len(voucher_nos))), (tuple(voucher_nos)), as_dict=1):
voucher_details.setdefault(pi.name, pi)
for pi in frappe.db.sql("""select name, due_date, bill_no, bill_date from
`tabJournal Entry` where docstatus = 1 and bill_no is not NULL and name in (%s)
""" %(','.join(['%s'] *len(voucher_nos))), (tuple(voucher_nos)), as_dict=1):
voucher_details.setdefault(pi.name, pi)
return voucher_details

4
erpnext/assets/doctype/asset_category/asset_category.js
View File

@ -22,7 +22,7 @@ frappe.ui.form.on('Asset Category', {
var d = locals[cdt][cdn]; var d = locals[cdt][cdn];
return { return {
"filters": { "filters": {
"root_type": "Asset", "account_type": "Accumulated Depreciation",
"is_group": 0, "is_group": 0,
"company": d.company_name "company": d.company_name
} }
@ -52,4 +52,4 @@ frappe.ui.form.on('Asset Category', {
}); });
} }
}); });

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

@ -2666,6 +2666,70 @@
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "rounded_total",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Rounded Total",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "disable_rounded_total",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Disable Rounded Total",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
@ -3672,8 +3736,8 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-08-27 08:35:10.345286", "modified": "2018-08-29 12:16:12.886021",
"modified_by": "Administrator", "modified_by": "nabinhait@gmail.com",
"module": "Buying", "module": "Buying",
"name": "Purchase Order", "name": "Purchase Order",
"owner": "Administrator", "owner": "Administrator",
@ -3765,6 +3829,5 @@
"timeline_field": "supplier", "timeline_field": "supplier",
"title_field": "title", "title_field": "title",
"track_changes": 0, "track_changes": 0,
"track_seen": 0, "track_seen": 0
"track_views": 0
} }

34
erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
View File

@ -676,6 +676,38 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "discount_percentage",
"fieldname": "discount_amount",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Discount Amount",
"length": 0,
"no_copy": 0,
"options": "currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "col_break3", "fieldname": "col_break3",
"fieldtype": "Column Break", "fieldtype": "Column Break",
"hidden": 0, "hidden": 0,
@ -2309,7 +2341,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-07-18 07:53:54.677844", "modified": "2018-08-06 05:16:58.258276",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order Item", "name": "Purchase Order Item",

2834
erpnext/buying/doctype/supplier/supplier.json
View File

File diff suppressed because it is too large Load Diff

71
erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
View File

@ -2145,6 +2145,38 @@
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "rounded_total",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Rounded Total",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
@ -2178,6 +2210,38 @@
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "disable_rounded_total",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Disable Rounded Total",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
@ -2780,8 +2844,8 @@
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2018-08-21 14:44:35.742480", "modified": "2018-08-29 12:14:31.329035",
"modified_by": "Administrator", "modified_by": "nabinhait@gmail.com",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation", "name": "Supplier Quotation",
"owner": "Administrator", "owner": "Administrator",
@ -2892,6 +2956,5 @@
"timeline_field": "supplier", "timeline_field": "supplier",
"title_field": "title", "title_field": "title",
"track_changes": 0, "track_changes": 0,
"track_seen": 0, "track_seen": 0
"track_views": 0
} }

34
erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
View File

@ -470,6 +470,38 @@
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "discount_percentage",
"fieldname": "discount_amount",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Discount Amount",
"length": 0,
"no_copy": 0,
"options": "currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
@ -1645,7 +1677,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-01-25 15:04:40.171617", "modified": "2018-08-06 05:33:07.404385",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation Item", "name": "Supplier Quotation Item",

26
erpnext/config/hr.py
View File

@ -33,24 +33,6 @@ def get_data():
{ {
"label": _("Leaves and Holiday"), "label": _("Leaves and Holiday"),
"items": [ "items": [
{
"type": "doctype",
"name": "Leave Period",
},
{
"type": "doctype",
"name": "Leave Policy",
},
{
"type": "doctype",
"name": "Job Opening",
"description": _("Opening for a Job."),
},
{
"type": "doctype",
"name": "Job Applicant",
"description": _("Applicant for a Job."),
},
{ {
"type": "doctype", "type": "doctype",
"name": "Leave Application", "name": "Leave Application",
@ -67,6 +49,14 @@ def get_data():
"type": "doctype", "type": "doctype",
"name": "Leave Encashment", "name": "Leave Encashment",
}, },
{
"type": "doctype",
"name": "Leave Period",
},
{
"type": "doctype",
"name": "Leave Policy",
},
{ {
"type": "doctype", "type": "doctype",
"name":"Leave Type", "name":"Leave Type",

13
erpnext/controllers/buying_controller.py
View File

@ -115,14 +115,17 @@ class BuyingController(StockController):
def set_total_in_words(self): def set_total_in_words(self):
from frappe.utils import money_in_words from frappe.utils import money_in_words
if self.meta.get_field("base_in_words"): if self.meta.get_field("base_in_words"):
amount = (self.base_rounded_total if self.meta.get_field("base_rounded_total") and not self.is_rounded_total_disabled():
if not self.get("disable_rounded_total") else self.base_grand_total) amount = self.base_rounded_total
else:
amount = self.base_grand_total
self.base_in_words = money_in_words(amount, self.company_currency) self.base_in_words = money_in_words(amount, self.company_currency)
if self.meta.get_field("in_words"): if self.meta.get_field("in_words"):
amount = (self.rounded_total if self.meta.get_field("rounded_total") and not self.is_rounded_total_disabled():
if not self.get("disable_rounded_total") else self.grand_total) amount = self.rounded_total
else:
amount = self.grand_total
self.in_words = money_in_words(amount, self.currency) self.in_words = money_in_words(amount, self.currency)

3
erpnext/controllers/queries.py
View File

@ -219,7 +219,8 @@ def bom(doctype, txt, searchfield, start, page_len, filters):
def get_project_name(doctype, txt, searchfield, start, page_len, filters): def get_project_name(doctype, txt, searchfield, start, page_len, filters):
cond = '' cond = ''
if filters.get('customer'): if filters.get('customer'):
cond = '(`tabProject`.customer = "' + filters['customer'] + '" or ifnull(`tabProject`.customer,"")="") and' cond = """(`tabProject`.customer = '%s' or
ifnull(`tabProject`.customer,"")="") and""" %(frappe.db.escape(filters.get("customer")))
return frappe.db.sql("""select `tabProject`.name from `tabProject` return frappe.db.sql("""select `tabProject`.name from `tabProject`
where `tabProject`.status not in ("Completed", "Cancelled") where `tabProject`.status not in ("Completed", "Cancelled")

1
erpnext/controllers/sales_and_purchase_return.py
View File

@ -149,6 +149,7 @@ def get_ref_item_dict(valid_items, ref_item_row):
"rejected_qty": 0, "rejected_qty": 0,
"received_qty": 0, "received_qty": 0,
"serial_no": [], "serial_no": [],
"conversion_factor": ref_item_row.get("conversion_factor", 1),
"batch_no": [] "batch_no": []
})) }))
item_dict = valid_items[ref_item_row.item_code] item_dict = valid_items[ref_item_row.item_code]

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

File diff suppressed because it is too large Load Diff

2478
erpnext/crm/doctype/opportunity/opportunity.json
View File

File diff suppressed because it is too large Load Diff

4
erpnext/education/doctype/assessment_result/assessment_result.json
View File

@ -1,7 +1,7 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_guest_to_view": 0, "allow_guest_to_view": 0,
"allow_import": 0, "allow_import": 1,
"allow_rename": 0, "allow_rename": 0,
"autoname": "EDU-RES-.YYYY.-.#####", "autoname": "EDU-RES-.YYYY.-.#####",
"beta": 0, "beta": 0,
@ -704,7 +704,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-08-21 16:15:55.372499", "modified": "2018-08-21 17:15:55.372499",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Education", "module": "Education",
"name": "Assessment Result", "name": "Assessment Result",

9
erpnext/education/doctype/course_schedule/test_course_schedule.py
View File

@ -9,6 +9,7 @@ import unittest
import datetime import datetime
from frappe.utils import today, to_timedelta from frappe.utils import today, to_timedelta
from erpnext.education.utils import OverlapError from erpnext.education.utils import OverlapError
from frappe.utils.make_random import get_random
# test_records = frappe.get_test_records('Course Schedule') # test_records = frappe.get_test_records('Course Schedule')
@ -17,14 +18,14 @@ class TestCourseSchedule(unittest.TestCase):
cs1 = make_course_schedule_test_record(simulate= True) cs1 = make_course_schedule_test_record(simulate= True)
cs2 = make_course_schedule_test_record(schedule_date=cs1.schedule_date, from_time= cs1.from_time, cs2 = make_course_schedule_test_record(schedule_date=cs1.schedule_date, from_time= cs1.from_time,
to_time= cs1.to_time, instructor="_Test Instructor 2", room="RM0002", do_not_save= 1) to_time= cs1.to_time, instructor="_Test Instructor 2", room=frappe.get_all("Room")[1].name, do_not_save= 1)
self.assertRaises(OverlapError, cs2.save) self.assertRaises(OverlapError, cs2.save)
def test_instructor_conflict(self): def test_instructor_conflict(self):
cs1 = make_course_schedule_test_record(simulate= True) cs1 = make_course_schedule_test_record(simulate= True)
cs2 = make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time, cs2 = make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time,
student_group="Course-TC101-2014-2015 (_Test Academic Term)", room="RM0002", do_not_save= 1) student_group="Course-TC101-2014-2015 (_Test Academic Term)", room=frappe.get_all("Room")[1].name, do_not_save= 1)
self.assertRaises(OverlapError, cs2.save) self.assertRaises(OverlapError, cs2.save)
def test_room_conflict(self): def test_room_conflict(self):
@ -38,7 +39,7 @@ class TestCourseSchedule(unittest.TestCase):
cs1 = make_course_schedule_test_record(simulate= True) cs1 = make_course_schedule_test_record(simulate= True)
make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time, make_course_schedule_test_record(from_time= cs1.from_time, to_time= cs1.to_time,
student_group="Course-TC102-2014-2015 (_Test Academic Term)", instructor="_Test Instructor 2", room="RM0002") student_group="Course-TC102-2014-2015 (_Test Academic Term)", instructor="_Test Instructor 2", room=frappe.get_all("Room")[1].name)
def make_course_schedule_test_record(**args): def make_course_schedule_test_record(**args):
args = frappe._dict(args) args = frappe._dict(args)
@ -47,7 +48,7 @@ def make_course_schedule_test_record(**args):
course_schedule.student_group = args.student_group or "Course-TC101-2014-2015 (_Test Academic Term)" course_schedule.student_group = args.student_group or "Course-TC101-2014-2015 (_Test Academic Term)"
course_schedule.course = args.course or "TC101" course_schedule.course = args.course or "TC101"
course_schedule.instructor = args.instructor or "_Test Instructor" course_schedule.instructor = args.instructor or "_Test Instructor"
course_schedule.room = args.room or "RM0001" course_schedule.room = args.room or frappe.get_all("Room")[0].name
course_schedule.schedule_date = args.schedule_date or today() course_schedule.schedule_date = args.schedule_date or today()
course_schedule.from_time = args.from_time or to_timedelta("01:00:00") course_schedule.from_time = args.from_time or to_timedelta("01:00:00")

936
erpnext/hr/doctype/attendance/attendance.json
View File

@ -1,505 +1,505 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_guest_to_view": 0, "allow_guest_to_view": 0,
"allow_import": 1, "allow_import": 1,
"allow_rename": 0, "allow_rename": 0,
"autoname": "naming_series:", "autoname": "naming_series:",
"beta": 0, "beta": 0,
"creation": "2013-01-10 16:34:13", "creation": "2013-01-10 16:34:13",
"custom": 0, "custom": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Setup", "document_type": "Setup",
"editable_grid": 0, "editable_grid": 0,
"fields": [ "fields": [
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "attendance_details", "fieldname": "attendance_details",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"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": "", "label": "",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "Simple", "options": "Simple",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"default": "", "default": "",
"fieldname": "naming_series", "fieldname": "naming_series",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"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": "Series", "label": "Series",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "naming_series", "oldfieldname": "naming_series",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "HR-ATT-.YYYY.-", "options": "HR-ATT-.YYYY.-",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 1, "reqd": 1,
"search_index": 0, "search_index": 0,
"set_only_once": 1, "set_only_once": 1,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "employee", "fieldname": "employee",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_global_search": 1, "in_global_search": 1,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 1, "in_standard_filter": 1,
"label": "Employee", "label": "Employee",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "employee", "oldfieldname": "employee",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Employee", "options": "Employee",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 1, "reqd": 1,
"search_index": 1, "search_index": 1,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "employee_name", "fieldname": "employee_name",
"fieldtype": "Read Only", "fieldtype": "Read Only",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_global_search": 1, "in_global_search": 1,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Employee Name", "label": "Employee Name",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "employee_name", "oldfieldname": "employee_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"default": "Present", "default": "Present",
"fieldname": "status", "fieldname": "status",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 1, "in_standard_filter": 1,
"label": "Status", "label": "Status",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "status", "oldfieldname": "status",
"oldfieldtype": "Select", "oldfieldtype": "Select",
"options": "\nPresent\nAbsent\nOn Leave\nHalf Day", "options": "\nPresent\nAbsent\nOn Leave\nHalf Day",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 1, "reqd": 1,
"search_index": 1, "search_index": 1,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "eval:doc.status==\"On Leave\"", "depends_on": "eval:doc.status==\"On Leave\"",
"fieldname": "leave_type", "fieldname": "leave_type",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 1, "in_standard_filter": 1,
"label": "Leave Type", "label": "Leave Type",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "leave_type", "oldfieldname": "leave_type",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Leave Type", "options": "Leave Type",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "column_break0", "fieldname": "column_break0",
"fieldtype": "Column Break", "fieldtype": "Column Break",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0, "unique": 0,
"width": "50%" "width": "50%"
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "attendance_date", "fieldname": "attendance_date",
"fieldtype": "Date", "fieldtype": "Date",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Attendance Date", "label": "Attendance Date",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "attendance_date", "oldfieldname": "attendance_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 1, "reqd": 1,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "company", "fieldname": "company",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"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": "Company", "label": "Company",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
"options": "Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 1, "remember_last_selected_value": 1,
"report_hide": 0, "report_hide": 0,
"reqd": 1, "reqd": 1,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fetch_from": "employee.department", "fetch_from": "employee.department",
"fieldname": "department", "fieldname": "department",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"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": "Department", "label": "Department",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Department", "options": "Department",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 1, "read_only": 1,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "attendance_request", "fieldname": "attendance_request",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"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": "Attendance Request", "label": "Attendance Request",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Attendance Request", "options": "Attendance Request",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 1, "read_only": 1,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "amended_from", "fieldname": "amended_from",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 1, "ignore_user_permissions": 1,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"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": "Amended From", "label": "Amended From",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Attendance", "options": "Attendance",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 1, "read_only": 1,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
} }
], ],
"has_web_view": 0, "has_web_view": 0,
"hide_heading": 0, "hide_heading": 0,
"hide_toolbar": 0, "hide_toolbar": 0,
"icon": "fa fa-ok", "icon": "fa fa-ok",
"idx": 1, "idx": 1,
"image_view": 0, "image_view": 0,
"in_create": 0, "in_create": 0,
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-08-21 14:44:20.989143", "modified": "2018-08-29 06:27:04.865541",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Attendance", "name": "Attendance",
"owner": "ashwini@webnotestech.com", "owner": "ashwini@webnotestech.com",
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 0, "export": 0,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "System Manager", "role": "System Manager",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 1, "share": 1,
"submit": 1, "submit": 1,
"write": 1 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 0, "export": 1,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 1,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "HR User", "role": "HR User",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 1, "share": 1,
"submit": 1, "submit": 1,
"write": 1 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 0, "export": 0,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "HR Manager", "role": "HR Manager",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 1, "share": 1,
"submit": 1, "submit": 1,
"write": 1 "write": 1
} }
], ],
"quick_entry": 0, "quick_entry": 0,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"search_fields": "employee, employee_name, attendance_date, status", "search_fields": "employee, employee_name, attendance_date, status",
"show_name_in_global_search": 0, "show_name_in_global_search": 0,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"title_field": "employee_name", "title_field": "employee_name",
"track_changes": 0, "track_changes": 0,
"track_seen": 0, "track_seen": 0,
"track_views": 0 "track_views": 0
} }

1012
erpnext/hr/doctype/department/department.json
View File

File diff suppressed because it is too large Load Diff

5910
erpnext/hr/doctype/employee/employee.json
View File

File diff suppressed because it is too large Load Diff

201
erpnext/hr/doctype/employment_type/employment_type.json
View File

@ -1,110 +1,113 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_import": 1, "allow_guest_to_view": 0,
"allow_rename": 1, "allow_import": 1,
"autoname": "field:employee_type_name", "allow_rename": 1,
"beta": 0, "autoname": "field:employee_type_name",
"creation": "2013-01-10 16:34:14", "beta": 0,
"custom": 0, "creation": "2013-01-10 16:34:14",
"docstatus": 0, "custom": 0,
"doctype": "DocType", "docstatus": 0,
"document_type": "Setup", "doctype": "DocType",
"editable_grid": 0, "document_type": "Setup",
"editable_grid": 0,
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"fieldname": "employee_type_name", "collapsible": 0,
"fieldtype": "Data", "columns": 0,
"hidden": 0, "fieldname": "employee_type_name",
"ignore_user_permissions": 0, "fieldtype": "Data",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 1, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "Employment Type", "in_list_view": 1,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "Employment Type",
"oldfieldname": "employee_type_name", "length": 0,
"oldfieldtype": "Data", "no_copy": 0,
"permlevel": 0, "oldfieldname": "employee_type_name",
"print_hide": 0, "oldfieldtype": "Data",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 1, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 1,
"unique": 0 "search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 1
} }
], ],
"hide_heading": 0, "has_web_view": 0,
"hide_toolbar": 0, "hide_heading": 0,
"icon": "fa fa-flag", "hide_toolbar": 0,
"idx": 1, "icon": "fa fa-flag",
"image_view": 0, "idx": 1,
"in_create": 0, "image_view": 0,
"in_create": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-02-17 16:51:15.218646", "modified": "2018-08-29 06:37:02.041245",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Employment Type", "name": "Employment Type",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 1,
"create": 1, "delete": 1,
"delete": 1, "email": 1,
"email": 1, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "HR User",
"role": "HR User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 1,
"share": 1, "submit": 0,
"submit": 0,
"write": 1 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 1,
"create": 1, "delete": 1,
"delete": 1, "email": 1,
"email": 1, "export": 1,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 1,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "HR Manager",
"role": "HR Manager", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 1,
"share": 1, "submit": 0,
"submit": 0,
"write": 1 "write": 1
} }
], ],
"quick_entry": 1, "quick_entry": 1,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 0, "track_changes": 0,
"track_seen": 0 "track_seen": 0,
"track_views": 0
} }

1368
erpnext/hr/doctype/leave_allocation/leave_allocation.json
View File

File diff suppressed because it is too large Load Diff

330
erpnext/hr/doctype/leave_policy/leave_policy.json
View File

@ -1,166 +1,198 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_guest_to_view": 0, "allow_guest_to_view": 0,
"allow_import": 0, "allow_import": 0,
"allow_rename": 0, "allow_rename": 0,
"autoname": "HR-LPOL-.YYYY.-.#####", "autoname": "HR-LPOL-.YYYY.-.#####",
"beta": 0, "beta": 0,
"creation": "2018-04-13 16:06:19.507624", "creation": "2018-04-13 16:06:19.507624",
"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_in_quick_entry": 0, "allow_in_quick_entry": 1,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "leave_policy_details", "fieldname": "leave_allocations_section",
"fieldtype": "Table", "fieldtype": "Section Break",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"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": "Leave Policy Details", "label": "Leave Allocations",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Leave Policy Detail", "permlevel": 0,
"permlevel": 0, "precision": "",
"precision": "", "print_hide": 0,
"print_hide": 0, "print_hide_if_no_value": 0,
"print_hide_if_no_value": 0, "read_only": 0,
"read_only": 0, "remember_last_selected_value": 0,
"remember_last_selected_value": 0, "report_hide": 0,
"report_hide": 0, "reqd": 0,
"reqd": 1, "search_index": 0,
"search_index": 0, "set_only_once": 0,
"set_only_once": 0, "translatable": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "amended_from", "fieldname": "leave_policy_details",
"fieldtype": "Link", "fieldtype": "Table",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"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": "Amended From", "label": "Leave Policy Details",
"length": 0, "length": 0,
"no_copy": 1, "no_copy": 0,
"options": "Leave Policy", "options": "Leave Policy Detail",
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "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": 0,
"report_hide": 0, "remember_last_selected_value": 0,
"reqd": 0, "report_hide": 0,
"search_index": 0, "reqd": 1,
"set_only_once": 0, "search_index": 0,
"translatable": 0, "set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "amended_from",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
"options": "Leave Policy",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
} }
], ],
"has_web_view": 0, "has_web_view": 0,
"hide_heading": 0, "hide_heading": 0,
"hide_toolbar": 0, "hide_toolbar": 0,
"idx": 0, "idx": 0,
"image_view": 0, "image_view": 0,
"in_create": 0, "in_create": 0,
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-08-21 16:15:37.591840", "modified": "2018-08-29 08:42:53.363088",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Leave Policy", "name": "Leave Policy",
"name_case": "", "name_case": "",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 1, "amend": 1,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 1, "export": 1,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "System Manager", "role": "System Manager",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 1, "share": 1,
"submit": 1, "submit": 1,
"write": 1 "write": 1
}, },
{ {
"amend": 1, "amend": 1,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 1, "export": 1,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "HR Manager", "role": "HR Manager",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 1, "share": 1,
"submit": 1, "submit": 1,
"write": 1 "write": 1
}, },
{ {
"amend": 1, "amend": 1,
"cancel": 1, "cancel": 1,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 1, "export": 1,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "HR User", "role": "HR User",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 1, "share": 1,
"submit": 1, "submit": 1,
"write": 1 "write": 1
} }
], ],
"quick_entry": 1, "quick_entry": 0,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"show_name_in_global_search": 0, "show_name_in_global_search": 0,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 1, "track_changes": 1,
"track_seen": 0, "track_seen": 0,
"track_views": 0 "track_views": 0
} }

0
erpnext/hub_node/page/__init__.py
View File

3174
erpnext/manufacturing/doctype/work_order/work_order.json
View File

File diff suppressed because it is too large Load Diff

4
erpnext/patches.txt
View File

@ -559,4 +559,6 @@ erpnext.patches.v11_0.add_item_group_defaults
erpnext.patches.v10_0.update_address_template_for_india erpnext.patches.v10_0.update_address_template_for_india
execute:frappe.delete_doc("Page", "hub") execute:frappe.delete_doc("Page", "hub")
erpnext.patches.v11_0.reset_publish_in_hub_for_all_items erpnext.patches.v11_0.reset_publish_in_hub_for_all_items
erpnext.patches.v11_0.update_hub_url erpnext.patches.v11_0.update_hub_url
erpnext.patches.v10_0.set_discount_amount
erpnext.patches.v10_0.recalculate_gross_margin_for_project

14
erpnext/patches/v10_0/recalculate_gross_margin_for_project.py Normal file
View File

@ -0,0 +1,14 @@
# Copyright (c) 2017, Frappe and Contributors
# License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals
import frappe
def execute():
frappe.reload_doc('projects', 'doctype', 'project')
for d in frappe.db.sql(""" select name from `tabProject` where
ifnull(total_consumed_material_cost, 0 ) > 0 and ifnull(total_billed_amount, 0) > 0""", as_dict=1):
doc = frappe.get_doc("Project", d.name)
doc.calculate_gross_margin()
doc.db_set('gross_margin', doc.gross_margin)
doc.db_set('per_gross_margin', doc.per_gross_margin)

56
erpnext/patches/v10_0/set_discount_amount.py Normal file
View File

@ -0,0 +1,56 @@
import frappe
def execute():
frappe.reload_doc("accounts", "doctype", "sales_invoice_item")
frappe.reload_doc('accounts', 'doctype', 'purchase_invoice_item')
frappe.reload_doc('buying', 'doctype', 'purchase_order_item')
frappe.reload_doc('buying', 'doctype', 'supplier_quotation_item')
frappe.reload_doc('selling', 'doctype', 'sales_order_item')
frappe.reload_doc('selling', 'doctype', 'quotation_item')
frappe.reload_doc('stock', 'doctype', 'delivery_note_item')
frappe.reload_doc('stock', 'doctype', 'purchase_receipt_item')
selling_doctypes = ["Sales Order Item", "Sales Invoice Item", "Delivery Note Item", "Quotation Item"]
buying_doctypes = ["Purchase Order Item", "Purchase Invoice Item", "Purchase Receipt Item", "Supplier Quotation Item"]
for doctype in selling_doctypes:
values = frappe.db.sql('''
SELECT
discount_percentage, rate_with_margin, price_list_rate, name
FROM
`tab%s`
WHERE
ifnull(discount_percentage, 0) > 0
''' % (doctype), as_dict=True)
calculate_discount(doctype, values)
for doctype in buying_doctypes:
values = frappe.db.sql('''
SELECT
discount_percentage, price_list_rate, name
FROM
`tab%s`
WHERE
discount_percentage > 0
''' % (doctype), as_dict=True)
calculate_discount(doctype, values)
def calculate_discount(doctype, values):
rate = None
if not values: return
for d in values:
if d.rate_with_margin and d.rate_with_margin > 0:
rate = d.rate_with_margin
else:
rate = d.price_list_rate
discount_value = rate * d.get('discount_percentage') / 100
frappe.db.sql('''
UPDATE
`tab%s`
SET
discount_amount = %s
WHERE
name = '%s'
''' % (doctype, discount_value, d.get('name')))

102
erpnext/portal/doctype/products_settings/products_settings.json
View File

@ -14,6 +14,7 @@
"fields": [ "fields": [
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
@ -41,10 +42,43 @@
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
@ -71,10 +105,75 @@
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "show_availability_status",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Show Availability Status",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "section_break_5",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
@ -103,6 +202,7 @@
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
} }
], ],
@ -116,7 +216,7 @@
"issingle": 1, "issingle": 1,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-11-07 19:34:33.055048", "modified": "2018-08-14 17:59:58.473100",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Portal", "module": "Portal",
"name": "Products Settings", "name": "Products Settings",

8
erpnext/projects/doctype/project/project.py
View File

@ -72,6 +72,7 @@ class Project(Document):
self.tasks = [] self.tasks = []
self.load_tasks() self.load_tasks()
self.send_welcome_email() self.send_welcome_email()
self.update_percent_complete()
def validate_project_name(self): def validate_project_name(self):
if self.get("__islocal") and frappe.db.exists("Project", self.project_name): if self.get("__islocal") and frappe.db.exists("Project", self.project_name):
@ -239,10 +240,13 @@ class Project(Document):
self.update_purchase_costing() self.update_purchase_costing()
self.update_sales_amount() self.update_sales_amount()
self.update_billed_amount() self.update_billed_amount()
self.calculate_gross_margin()
self.gross_margin = flt(self.total_billed_amount) - ( def calculate_gross_margin(self):
flt(self.total_costing_amount) + flt(self.total_expense_claim) + flt(self.total_purchase_cost)) expense_amount = (flt(self.total_costing_amount) + flt(self.total_expense_claim)
+ flt(self.total_purchase_cost) + flt(self.get('total_consumed_material_cost', 0)))
self.gross_margin = flt(self.total_billed_amount) - expense_amount
if self.total_billed_amount: if self.total_billed_amount:
self.per_gross_margin = (self.gross_margin / flt(self.total_billed_amount)) * 100 self.per_gross_margin = (self.gross_margin / flt(self.total_billed_amount)) * 100

3
erpnext/public/js/controllers/buying.js
View File

@ -119,7 +119,8 @@ erpnext.buying.BuyingController = erpnext.TransactionController.extend({
if (doc.doctype == "Purchase Order" && item.blanket_order_rate) { if (doc.doctype == "Purchase Order" && item.blanket_order_rate) {
item_rate = item.blanket_order_rate; item_rate = item.blanket_order_rate;
} }
item.rate = flt(item_rate * (1 - item.discount_percentage / 100.0), precision("rate", item)); item.discount_amount = flt(item_rate) * flt(item.discount_percentage) / 100;
item.rate = flt((item.price_list_rate) - (item.discount_amount), precision('rate', item));
this.calculate_taxes_and_totals(); this.calculate_taxes_and_totals();
}, },

4
erpnext/public/js/controllers/taxes_and_totals.js
View File

@ -19,8 +19,8 @@ erpnext.taxes_and_totals = erpnext.payments.extend({
item.rate = flt(item.rate_with_margin , precision("rate", item)); item.rate = flt(item.rate_with_margin , precision("rate", item));
if(item.discount_percentage){ if(item.discount_percentage){
var discount_value = flt(item.rate_with_margin) * flt(item.discount_percentage) / 100; item.discount_amount = flt(item.rate_with_margin) * flt(item.discount_percentage) / 100;
item.rate = flt((item.rate_with_margin) - (discount_value), precision('rate', item)); item.rate = flt((item.rate_with_margin) - (item.discount_amount), precision('rate', item));
} }
}, },

422
erpnext/selling/doctype/campaign/campaign.json
View File

@ -1,231 +1,231 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_guest_to_view": 0, "allow_guest_to_view": 0,
"allow_import": 1, "allow_import": 1,
"allow_rename": 1, "allow_rename": 1,
"autoname": "naming_series:", "autoname": "naming_series:",
"beta": 0, "beta": 0,
"creation": "2013-01-10 16:34:18", "creation": "2013-01-10 16:34:18",
"custom": 0, "custom": 0,
"description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ", "description": "Keep Track of Sales Campaigns. Keep track of Leads, Quotations, Sales Order etc from Campaigns to gauge Return on Investment. ",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Setup", "document_type": "Setup",
"editable_grid": 0, "editable_grid": 0,
"fields": [ "fields": [
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "campaign", "fieldname": "campaign",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"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": "Campaign", "label": "Campaign",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "campaign_name", "fieldname": "campaign_name",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"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": "Campaign Name", "label": "Campaign Name",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "campaign_name", "oldfieldname": "campaign_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 1, "reqd": 1,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"default": "", "default": "",
"fieldname": "naming_series", "fieldname": "naming_series",
"fieldtype": "Select", "fieldtype": "Select",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"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": "Naming Series", "label": "Naming Series",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "SAL-CAM-.YYYY.-", "options": "SAL-CAM-.YYYY.-",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 1, "set_only_once": 1,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0, "allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "description", "fieldname": "description",
"fieldtype": "Text", "fieldtype": "Text",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_global_search": 0, "in_global_search": 0,
"in_list_view": 1, "in_list_view": 1,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Description", "label": "Description",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "description", "oldfieldname": "description",
"oldfieldtype": "Text", "oldfieldtype": "Text",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0, "unique": 0,
"width": "300px" "width": "300px"
} }
], ],
"has_web_view": 0, "has_web_view": 0,
"hide_heading": 0, "hide_heading": 0,
"hide_toolbar": 0, "hide_toolbar": 0,
"icon": "fa fa-bullhorn", "icon": "fa fa-bullhorn",
"idx": 1, "idx": 1,
"image_view": 0, "image_view": 0,
"in_create": 0, "in_create": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-08-21 14:44:45.296636", "modified": "2018-08-29 06:31:30.263842",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Campaign", "name": "Campaign",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 1,
"delete": 0, "delete": 1,
"email": 1, "email": 1,
"export": 0, "export": 1,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 1,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 0, "report": 1,
"role": "Sales Manager", "role": "Sales Manager",
"set_user_permissions": 0, "set_user_permissions": 1,
"share": 0, "share": 0,
"submit": 0, "submit": 0,
"write": 0 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
"email": 1, "email": 1,
"export": 0, "export": 0,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "Sales User", "role": "Sales User",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 0, "share": 0,
"submit": 0, "submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 0, "export": 0,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "Sales Master Manager", "role": "Sales Master Manager",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 1, "share": 1,
"submit": 0, "submit": 0,
"write": 1 "write": 1
} }
], ],
"quick_entry": 1, "quick_entry": 1,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"show_name_in_global_search": 0, "show_name_in_global_search": 0,
"track_changes": 0, "track_changes": 0,
"track_seen": 0, "track_seen": 0,
"track_views": 0 "track_views": 0
} }

3672
erpnext/selling/doctype/customer/customer.json
View File

File diff suppressed because it is too large Load Diff

6258
erpnext/selling/doctype/quotation/quotation.json
View File

File diff suppressed because it is too large Load Diff

34
erpnext/selling/doctype/quotation_item/quotation_item.json
View File

@ -847,6 +847,38 @@
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "discount_percentage",
"fieldname": "discount_amount",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Discount Amount",
"length": 0,
"no_copy": 0,
"options": "currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "eval:doc.margin_type && doc.price_list_rate && doc.margin_rate_or_amount", "depends_on": "eval:doc.margin_type && doc.price_list_rate && doc.margin_rate_or_amount",
"fieldname": "base_rate_with_margin", "fieldname": "base_rate_with_margin",
"fieldtype": "Currency", "fieldtype": "Currency",
@ -1878,7 +1910,7 @@
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2018-08-21 16:15:52.750381", "modified": "2018-08-22 16:15:52.750381",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Quotation Item", "name": "Quotation Item",

34
erpnext/selling/doctype/sales_order_item/sales_order_item.json
View File

@ -878,6 +878,38 @@
"unique": 0, "unique": 0,
"width": "70px" "width": "70px"
}, },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "discount_percentage",
"fieldname": "discount_amount",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Discount Amount",
"length": 0,
"no_copy": 0,
"options": "currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
@ -2370,7 +2402,7 @@
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"menu_index": 0, "menu_index": 0,
"modified": "2018-07-26 05:52:36.908884", "modified": "2018-08-08 05:17:51.297862",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Selling", "module": "Selling",
"name": "Sales Order Item", "name": "Sales Order Item",

9
erpnext/selling/sales_common.js
View File

@ -146,6 +146,15 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
this.set_gross_profit(item); this.set_gross_profit(item);
}, },
discount_amount: function(doc, cdt, cdn) {
var item = frappe.get_doc(cdt, cdn);
if(!item.price_list_rate) {
item.discount_amount = 0.0;
} else {
this.price_list_rate(doc, cdt, cdn);
}
},
commission_rate: function() { commission_rate: function() {
this.calculate_commission(); this.calculate_commission();
refresh_field("total_commission"); refresh_field("total_commission");

367
erpnext/setup/doctype/brand/brand.json
View File

@ -1,201 +1,204 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_import": 1, "allow_guest_to_view": 0,
"allow_rename": 1, "allow_import": 1,
"autoname": "field:brand", "allow_rename": 1,
"beta": 0, "autoname": "field:brand",
"creation": "2013-02-22 01:27:54", "beta": 0,
"custom": 0, "creation": "2013-02-22 01:27:54",
"docstatus": 0, "custom": 0,
"doctype": "DocType", "docstatus": 0,
"document_type": "Setup", "doctype": "DocType",
"editable_grid": 0, "document_type": "Setup",
"editable_grid": 0,
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"fieldname": "brand", "collapsible": 0,
"fieldtype": "Data", "columns": 0,
"hidden": 0, "fieldname": "brand",
"ignore_user_permissions": 0, "fieldtype": "Data",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 0, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "Brand Name", "in_list_view": 0,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "Brand Name",
"oldfieldname": "brand", "length": 0,
"oldfieldtype": "Data", "no_copy": 0,
"permlevel": 0, "oldfieldname": "brand",
"print_hide": 0, "oldfieldtype": "Data",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 1, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 1,
"unique": 0 "search_index": 0,
}, "set_only_once": 0,
"translatable": 0,
"unique": 1
},
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"fieldname": "description", "collapsible": 0,
"fieldtype": "Text", "columns": 0,
"hidden": 0, "fieldname": "description",
"ignore_user_permissions": 0, "fieldtype": "Text",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 1, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "Description", "in_list_view": 1,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "Description",
"oldfieldname": "description", "length": 0,
"oldfieldtype": "Text", "no_copy": 0,
"permlevel": 0, "oldfieldname": "description",
"print_hide": 0, "oldfieldtype": "Text",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"unique": 0, "search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0,
"width": "300px" "width": "300px"
} }
], ],
"hide_heading": 0, "has_web_view": 0,
"hide_toolbar": 0, "hide_heading": 0,
"icon": "fa fa-certificate", "hide_toolbar": 0,
"idx": 1, "icon": "fa fa-certificate",
"image_view": 0, "idx": 1,
"in_create": 0, "image_view": 0,
"in_create": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-02-20 13:24:33.616809", "modified": "2018-08-29 06:35:44.740318",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Brand", "name": "Brand",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 1,
"create": 1, "delete": 1,
"delete": 1, "email": 1,
"email": 1, "export": 1,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 1,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Item Manager",
"role": "Item Manager", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 1,
"share": 1, "submit": 0,
"submit": 0,
"write": 1 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 1,
"email": 1, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Stock User",
"role": "Stock User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 1,
"email": 1, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Sales User",
"role": "Sales User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 1,
"email": 1, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Purchase User",
"role": "Purchase User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 1,
"email": 1, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Accounts User",
"role": "Accounts User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
} }
], ],
"quick_entry": 1, "quick_entry": 1,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_order": "ASC", "sort_order": "ASC",
"track_changes": 0, "track_changes": 0,
"track_seen": 0 "track_seen": 0,
"track_views": 0
} }

993
erpnext/setup/doctype/customer_group/customer_group.json
View File

File diff suppressed because it is too large Load Diff

10
erpnext/setup/doctype/item_group/item_group.json
View File

@ -616,7 +616,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 3, "max_attachments": 3,
"modified": "2018-08-16 10:50:41.011806", "modified": "2018-08-29 06:26:53.956949",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Item Group", "name": "Item Group",
@ -629,7 +629,7 @@
"create": 0, "create": 0,
"delete": 0, "delete": 0,
"email": 1, "email": 1,
"export": 0, "export": 1,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 0, "permlevel": 0,
@ -667,15 +667,15 @@
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 0, "export": 1,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 1,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "Item Manager", "role": "Item Manager",
"set_user_permissions": 0, "set_user_permissions": 1,
"share": 1, "share": 1,
"submit": 0, "submit": 0,
"write": 1 "write": 1

3
erpnext/setup/doctype/item_group/item_group.py
View File

@ -166,6 +166,9 @@ def get_item_for_list_in_html(context):
if (context.get("website_image") or "").startswith("files/"): if (context.get("website_image") or "").startswith("files/"):
context["website_image"] = "/" + urllib.quote(context["website_image"]) context["website_image"] = "/" + urllib.quote(context["website_image"])
context["show_availability_status"] = cint(frappe.db.get_single_value('Products Settings',
'show_availability_status'))
products_template = 'templates/includes/products_as_grid.html' products_template = 'templates/includes/products_as_grid.html'
if cint(frappe.db.get_single_value('Products Settings', 'products_as_list')): if cint(frappe.db.get_single_value('Products Settings', 'products_as_list')):
products_template = 'templates/includes/products_as_list.html' products_template = 'templates/includes/products_as_list.html'

593
erpnext/setup/doctype/supplier_group/supplier_group.json
View File

@ -1,51 +1,53 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_guest_to_view": 0, "allow_guest_to_view": 0,
"allow_import": 1, "allow_import": 1,
"allow_rename": 1, "allow_rename": 1,
"autoname": "field:supplier_group_name", "autoname": "field:supplier_group_name",
"beta": 0, "beta": 0,
"creation": "2013-01-10 16:34:24", "creation": "2013-01-10 16:34:24",
"custom": 0, "custom": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Setup", "document_type": "Setup",
"editable_grid": 0, "editable_grid": 0,
"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,
"fieldname": "supplier_group_name", "columns": 0,
"fieldtype": "Data", "fieldname": "supplier_group_name",
"hidden": 0, "fieldtype": "Data",
"ignore_user_permissions": 0, "hidden": 0,
"ignore_xss_filter": 0, "ignore_user_permissions": 0,
"in_filter": 0, "ignore_xss_filter": 0,
"in_global_search": 0, "in_filter": 0,
"in_global_search": 0,
"in_list_view": 0, "in_list_view": 0,
"in_standard_filter": 0, "in_standard_filter": 0,
"label": "Supplier Group Name", "label": "Supplier Group Name",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "supplier_type", "oldfieldname": "supplier_type",
"oldfieldtype": "Data", "oldfieldtype": "Data",
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 1, "reqd": 1,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 1
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 1, "bold": 1,
"collapsible": 0, "collapsible": 0,
@ -78,6 +80,7 @@
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 1, "bold": 1,
"collapsible": 0, "collapsible": 0,
@ -108,133 +111,138 @@
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_in_quick_entry": 0,
"bold": 0, "allow_on_submit": 0,
"collapsible": 1, "bold": 0,
"columns": 0, "collapsible": 1,
"fieldname": "section_credit_limit", "columns": 0,
"fieldtype": "Section Break", "fieldname": "section_credit_limit",
"hidden": 0, "fieldtype": "Section Break",
"ignore_user_permissions": 0, "hidden": 0,
"ignore_xss_filter": 0, "ignore_user_permissions": 0,
"in_filter": 0, "ignore_xss_filter": 0,
"in_global_search": 0, "in_filter": 0,
"in_list_view": 0, "in_global_search": 0,
"in_standard_filter": 0, "in_list_view": 0,
"label": "Credit Limit", "in_standard_filter": 0,
"length": 0, "label": "Credit Limit",
"no_copy": 0, "length": 0,
"permlevel": 0, "no_copy": 0,
"precision": "", "permlevel": 0,
"print_hide": 0, "precision": "",
"print_hide_if_no_value": 0, "print_hide": 0,
"read_only": 0, "print_hide_if_no_value": 0,
"remember_last_selected_value": 0, "read_only": 0,
"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,
"translatable": 0, "set_only_once": 0,
"unique": 0 "translatable": 0,
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "payment_terms",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Default Payment Terms Template",
"length": 0,
"no_copy": 0,
"options": "Payment Terms Template",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "default_payable_account",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Default Payable Account",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "eval:!doc.__islocal",
"description": "Mention if non-standard receivable account applicable",
"fieldname": "accounts",
"fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Accounts",
"length": 0,
"no_copy": 0,
"options": "Party Account",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "payment_terms",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Default Payment Terms Template",
"length": 0,
"no_copy": 0,
"options": "Payment Terms Template",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "default_payable_account",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Default Payable Account",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "eval:!doc.__islocal",
"description": "Mention if non-standard receivable account applicable",
"fieldname": "accounts",
"fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Accounts",
"length": 0,
"no_copy": 0,
"options": "Party Account",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0
},
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
@ -266,6 +274,7 @@
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
@ -297,6 +306,7 @@
}, },
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
@ -327,144 +337,145 @@
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
} }
], ],
"has_web_view": 0, "has_web_view": 0,
"hide_heading": 0, "hide_heading": 0,
"hide_toolbar": 0, "hide_toolbar": 0,
"icon": "fa fa-flag", "icon": "fa fa-flag",
"idx": 1, "idx": 1,
"image_view": 0, "image_view": 0,
"in_create": 0, "in_create": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-04-20 00:54:48.724120", "modified": "2018-08-29 06:25:57.589824",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Supplier Group", "name": "Supplier Group",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
"email": 1, "email": 1,
"export": 0, "export": 0,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "Purchase Manager", "role": "Purchase Manager",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 0, "share": 0,
"submit": 0, "submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
"email": 1, "email": 1,
"export": 0, "export": 0,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "Purchase User", "role": "Purchase User",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 0, "share": 0,
"submit": 0, "submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 0, "export": 1,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 1,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
"read": 1, "read": 1,
"report": 1, "report": 1,
"role": "Purchase Master Manager", "role": "Purchase Master Manager",
"set_user_permissions": 0, "set_user_permissions": 1,
"share": 1, "share": 1,
"submit": 0, "submit": 0,
"write": 1 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
"email": 0, "email": 0,
"export": 0, "export": 0,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 1, "permlevel": 1,
"print": 0, "print": 0,
"read": 1, "read": 1,
"report": 0, "report": 0,
"role": "Purchase Master Manager", "role": "Purchase Master Manager",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 0, "share": 0,
"submit": 0, "submit": 0,
"write": 1 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
"email": 0, "email": 0,
"export": 0, "export": 0,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 1, "permlevel": 1,
"print": 0, "print": 0,
"read": 1, "read": 1,
"report": 0, "report": 0,
"role": "Purchase Manager", "role": "Purchase Manager",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 0, "share": 0,
"submit": 0, "submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"cancel": 0, "cancel": 0,
"create": 0, "create": 0,
"delete": 0, "delete": 0,
"email": 0, "email": 0,
"export": 0, "export": 0,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 1, "permlevel": 1,
"print": 0, "print": 0,
"read": 1, "read": 1,
"report": 0, "report": 0,
"role": "Purchase User", "role": "Purchase User",
"set_user_permissions": 0, "set_user_permissions": 0,
"share": 0, "share": 0,
"submit": 0, "submit": 0,
"write": 0 "write": 0
} }
], ],
"quick_entry": 0, "quick_entry": 0,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_order": "ASC", "sort_order": "ASC",
"track_changes": 0, "track_changes": 0,
"track_seen": 0 "track_seen": 0,
"track_views": 0
} }

518
erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
View File

@ -1,280 +1,288 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_import": 1, "allow_guest_to_view": 0,
"allow_rename": 1, "allow_import": 1,
"autoname": "field:title", "allow_rename": 1,
"beta": 0, "autoname": "field:title",
"creation": "2013-01-10 16:34:24", "beta": 0,
"custom": 0, "creation": "2013-01-10 16:34:24",
"description": "Standard Terms and Conditions that can be added to Sales and Purchases.\n\nExamples:\n\n1. Validity of the offer.\n1. Payment Terms (In Advance, On Credit, part advance etc).\n1. What is extra (or payable by the Customer).\n1. Safety / usage warning.\n1. Warranty if any.\n1. Returns Policy.\n1. Terms of shipping, if applicable.\n1. Ways of addressing disputes, indemnity, liability, etc.\n1. Address and Contact of your Company.", "custom": 0,
"docstatus": 0, "description": "Standard Terms and Conditions that can be added to Sales and Purchases.\n\nExamples:\n\n1. Validity of the offer.\n1. Payment Terms (In Advance, On Credit, part advance etc).\n1. What is extra (or payable by the Customer).\n1. Safety / usage warning.\n1. Warranty if any.\n1. Returns Policy.\n1. Terms of shipping, if applicable.\n1. Ways of addressing disputes, indemnity, liability, etc.\n1. Address and Contact of your Company.",
"doctype": "DocType", "docstatus": 0,
"document_type": "Setup", "doctype": "DocType",
"editable_grid": 0, "document_type": "Setup",
"editable_grid": 0,
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"fieldname": "title", "collapsible": 0,
"fieldtype": "Data", "columns": 0,
"hidden": 0, "fieldname": "title",
"ignore_user_permissions": 0, "fieldtype": "Data",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 0, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "Title", "in_list_view": 0,
"length": 0, "in_standard_filter": 0,
"no_copy": 1, "label": "Title",
"oldfieldname": "title", "length": 0,
"oldfieldtype": "Data", "no_copy": 1,
"permlevel": 0, "oldfieldname": "title",
"print_hide": 0, "oldfieldtype": "Data",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 1, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 1,
"unique": 0 "search_index": 0,
}, "set_only_once": 0,
"translatable": 0,
"unique": 1
},
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"fieldname": "disabled", "collapsible": 0,
"fieldtype": "Check", "columns": 0,
"hidden": 0, "fieldname": "disabled",
"ignore_user_permissions": 0, "fieldtype": "Check",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 1, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "Disabled", "in_list_view": 1,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "Disabled",
"permlevel": 0, "length": 0,
"precision": "", "no_copy": 0,
"print_hide": 0, "permlevel": 0,
"print_hide_if_no_value": 0, "precision": "",
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"fieldname": "terms", "collapsible": 0,
"fieldtype": "Text Editor", "columns": 0,
"hidden": 0, "fieldname": "terms",
"ignore_user_permissions": 0, "fieldtype": "Text Editor",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 1, "ignore_xss_filter": 0,
"in_list_view": 0, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 1,
"label": "Terms and Conditions", "in_list_view": 0,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "Terms and Conditions",
"oldfieldname": "terms", "length": 0,
"oldfieldtype": "Text Editor", "no_copy": 0,
"permlevel": 0, "oldfieldname": "terms",
"print_hide": 0, "oldfieldtype": "Text Editor",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"fieldname": "terms_and_conditions_help", "collapsible": 0,
"fieldtype": "HTML", "columns": 0,
"hidden": 0, "fieldname": "terms_and_conditions_help",
"ignore_user_permissions": 0, "fieldtype": "HTML",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 0, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "Terms and Conditions Help", "in_list_view": 0,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "Terms and Conditions Help",
"options": "<h4>Standard Terms and Conditions Example</h4>\n\n<pre>Delivery Terms for Order number {{ name }}\n\n-Order Date : {{ transaction_date }} \n-Expected Delivery Date : {{ delivery_date }}\n</pre>\n\n<h4>How to get fieldnames</h4>\n\n<p>The fieldnames you can use in your email template are the fields in the document from which you are sending the email. You can find out the fields of any documents via Setup &gt; Customize Form View and selecting the document type (e.g. Sales Invoice)</p>\n\n<h4>Templating</h4>\n\n<p>Templates are compiled using the Jinja Templating Langauge. To learn more about Jinja, <a class=\"strong\" href=\"http://jinja.pocoo.org/docs/dev/templates/\">read this documentation.</a></p>", "length": 0,
"permlevel": 0, "no_copy": 0,
"precision": "", "options": "<h4>Standard Terms and Conditions Example</h4>\n\n<pre>Delivery Terms for Order number {{ name }}\n\n-Order Date : {{ transaction_date }} \n-Expected Delivery Date : {{ delivery_date }}\n</pre>\n\n<h4>How to get fieldnames</h4>\n\n<p>The fieldnames you can use in your email template are the fields in the document from which you are sending the email. You can find out the fields of any documents via Setup &gt; Customize Form View and selecting the document type (e.g. Sales Invoice)</p>\n\n<h4>Templating</h4>\n\n<p>Templates are compiled using the Jinja Templating Langauge. To learn more about Jinja, <a class=\"strong\" href=\"http://jinja.pocoo.org/docs/dev/templates/\">read this documentation.</a></p>",
"print_hide": 0, "permlevel": 0,
"print_hide_if_no_value": 0, "precision": "",
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
} }
], ],
"hide_heading": 0, "has_web_view": 0,
"hide_toolbar": 0, "hide_heading": 0,
"icon": "icon-legal", "hide_toolbar": 0,
"idx": 1, "icon": "icon-legal",
"image_view": 0, "idx": 1,
"in_create": 0, "image_view": 0,
"in_create": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-02-20 13:26:07.730118", "modified": "2018-08-29 06:36:33.131473",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Terms and Conditions", "name": "Terms and Conditions",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 1,
"create": 1, "delete": 1,
"delete": 1, "email": 1,
"email": 1, "export": 1,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 1,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Sales Master Manager",
"role": "Sales Master Manager", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 1,
"share": 1, "submit": 0,
"submit": 0,
"write": 1 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 0,
"email": 0, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 0,
"print": 0, "read": 1,
"read": 1, "report": 0,
"report": 0, "role": "Sales User",
"role": "Sales User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 0,
"email": 0, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 0,
"print": 0, "read": 1,
"read": 1, "report": 0,
"report": 0, "role": "Purchase User",
"role": "Purchase User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 1,
"create": 1, "delete": 1,
"delete": 1, "email": 1,
"email": 1, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "System Manager",
"role": "System Manager", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 1,
"share": 1, "submit": 0,
"submit": 0,
"write": 1 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 1,
"create": 1, "delete": 1,
"delete": 1, "email": 1,
"email": 1, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Accounts User",
"role": "Accounts User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 1,
"share": 1, "submit": 0,
"submit": 0,
"write": 1 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 0,
"email": 0, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 0,
"print": 0, "read": 1,
"read": 1, "report": 0,
"report": 0, "role": "Stock User",
"role": "Stock User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
} }
], ],
"quick_entry": 1, "quick_entry": 1,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_order": "ASC", "sort_order": "ASC",
"track_changes": 0, "track_changes": 0,
"track_seen": 0 "track_seen": 0,
"track_views": 0
} }

920
erpnext/setup/doctype/territory/territory.json
View File

@ -1,481 +1,511 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_import": 1, "allow_guest_to_view": 0,
"allow_rename": 1, "allow_import": 1,
"autoname": "field:territory_name", "allow_rename": 1,
"beta": 0, "autoname": "field:territory_name",
"creation": "2013-01-10 16:34:24", "beta": 0,
"custom": 0, "creation": "2013-01-10 16:34:24",
"description": "Classification of Customers by region", "custom": 0,
"docstatus": 0, "description": "Classification of Customers by region",
"doctype": "DocType", "docstatus": 0,
"document_type": "Setup", "doctype": "DocType",
"editable_grid": 0, "document_type": "Setup",
"editable_grid": 0,
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"fieldname": "territory_name", "collapsible": 0,
"fieldtype": "Data", "columns": 0,
"hidden": 0, "fieldname": "territory_name",
"ignore_user_permissions": 0, "fieldtype": "Data",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 1, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "Territory Name", "in_list_view": 1,
"length": 0, "in_standard_filter": 0,
"no_copy": 1, "label": "Territory Name",
"oldfieldname": "territory_name", "length": 0,
"oldfieldtype": "Data", "no_copy": 1,
"permlevel": 0, "oldfieldname": "territory_name",
"print_hide": 0, "oldfieldtype": "Data",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 1, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 1,
"unique": 0 "search_index": 0,
}, "set_only_once": 0,
"translatable": 0,
"unique": 1
},
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 1, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 1,
"description": "", "collapsible": 0,
"fieldname": "parent_territory", "columns": 0,
"fieldtype": "Link", "description": "",
"hidden": 0, "fieldname": "parent_territory",
"ignore_user_permissions": 1, "fieldtype": "Link",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 1,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 1, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "Parent Territory", "in_list_view": 1,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "Parent Territory",
"oldfieldname": "parent_territory", "length": 0,
"oldfieldtype": "Link", "no_copy": 0,
"options": "Territory", "oldfieldname": "parent_territory",
"permlevel": 0, "oldfieldtype": "Link",
"print_hide": 0, "options": "Territory",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 1, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 1,
"description": "", "collapsible": 0,
"fieldname": "is_group", "columns": 0,
"fieldtype": "Check", "description": "",
"hidden": 0, "fieldname": "is_group",
"ignore_user_permissions": 0, "fieldtype": "Check",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 1, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "Is Group", "in_list_view": 1,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "Is Group",
"oldfieldname": "is_group", "length": 0,
"oldfieldtype": "Select", "no_copy": 0,
"options": "", "oldfieldname": "is_group",
"permlevel": 0, "oldfieldtype": "Select",
"print_hide": 0, "options": "",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"fieldname": "cb0", "collapsible": 0,
"fieldtype": "Column Break", "columns": 0,
"hidden": 0, "fieldname": "cb0",
"ignore_user_permissions": 0, "fieldtype": "Column Break",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 0, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"length": 0, "in_list_view": 0,
"no_copy": 0, "in_standard_filter": 0,
"permlevel": 0, "length": 0,
"print_hide": 0, "no_copy": 0,
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"description": "For reference", "collapsible": 0,
"fieldname": "territory_manager", "columns": 0,
"fieldtype": "Link", "description": "For reference",
"hidden": 0, "fieldname": "territory_manager",
"ignore_user_permissions": 0, "fieldtype": "Link",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 1, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "Territory Manager", "in_list_view": 1,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "Territory Manager",
"oldfieldname": "territory_manager", "length": 0,
"oldfieldtype": "Link", "no_copy": 0,
"options": "Sales Person", "oldfieldname": "territory_manager",
"permlevel": 0, "oldfieldtype": "Link",
"print_hide": 0, "options": "Sales Person",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 1, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"search_index": 1,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"fieldname": "lft", "collapsible": 0,
"fieldtype": "Int", "columns": 0,
"hidden": 1, "fieldname": "lft",
"ignore_user_permissions": 0, "fieldtype": "Int",
"ignore_xss_filter": 0, "hidden": 1,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 0, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "lft", "in_list_view": 0,
"length": 0, "in_standard_filter": 0,
"no_copy": 1, "label": "lft",
"oldfieldname": "lft", "length": 0,
"oldfieldtype": "Int", "no_copy": 1,
"permlevel": 0, "oldfieldname": "lft",
"print_hide": 1, "oldfieldtype": "Int",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 1,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 1, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"search_index": 1,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"fieldname": "rgt", "collapsible": 0,
"fieldtype": "Int", "columns": 0,
"hidden": 1, "fieldname": "rgt",
"ignore_user_permissions": 0, "fieldtype": "Int",
"ignore_xss_filter": 0, "hidden": 1,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 0, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "rgt", "in_list_view": 0,
"length": 0, "in_standard_filter": 0,
"no_copy": 1, "label": "rgt",
"oldfieldname": "rgt", "length": 0,
"oldfieldtype": "Int", "no_copy": 1,
"permlevel": 0, "oldfieldname": "rgt",
"print_hide": 1, "oldfieldtype": "Int",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 1,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 1, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"search_index": 1,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"description": "", "collapsible": 0,
"fieldname": "old_parent", "columns": 0,
"fieldtype": "Link", "description": "",
"hidden": 1, "fieldname": "old_parent",
"ignore_user_permissions": 1, "fieldtype": "Link",
"ignore_xss_filter": 0, "hidden": 1,
"in_filter": 0, "ignore_user_permissions": 1,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 0, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "old_parent", "in_list_view": 0,
"length": 0, "in_standard_filter": 0,
"no_copy": 1, "label": "old_parent",
"oldfieldname": "old_parent", "length": 0,
"oldfieldtype": "Data", "no_copy": 1,
"options": "Territory", "oldfieldname": "old_parent",
"permlevel": 0, "oldfieldtype": "Data",
"print_hide": 1, "options": "Territory",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 1,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 1, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 1,
"set_only_once": 0, "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"description": "Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.", "collapsible": 0,
"fieldname": "target_details_section_break", "columns": 0,
"fieldtype": "Section Break", "description": "Set Item Group-wise budgets on this Territory. You can also include seasonality by setting the Distribution.",
"hidden": 0, "fieldname": "target_details_section_break",
"ignore_user_permissions": 0, "fieldtype": "Section Break",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 0, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "Territory Targets", "in_list_view": 0,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "Territory Targets",
"oldfieldtype": "Section Break", "length": 0,
"permlevel": 0, "no_copy": 0,
"print_hide": 0, "oldfieldtype": "Section Break",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"fieldname": "targets", "collapsible": 0,
"fieldtype": "Table", "columns": 0,
"hidden": 0, "fieldname": "targets",
"ignore_user_permissions": 0, "fieldtype": "Table",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 0, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "Targets", "in_list_view": 0,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "Targets",
"oldfieldname": "target_details", "length": 0,
"oldfieldtype": "Table", "no_copy": 0,
"options": "Target Detail", "oldfieldname": "target_details",
"permlevel": 0, "oldfieldtype": "Table",
"print_hide": 0, "options": "Target Detail",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"description": "Select Monthly Distribution to unevenly distribute targets across months.", "collapsible": 0,
"fieldname": "distribution_id", "columns": 0,
"fieldtype": "Link", "description": "Select Monthly Distribution to unevenly distribute targets across months.",
"hidden": 0, "fieldname": "distribution_id",
"ignore_user_permissions": 0, "fieldtype": "Link",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 0, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "Target Distribution", "in_list_view": 0,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "Target Distribution",
"oldfieldname": "distribution_id", "length": 0,
"oldfieldtype": "Link", "no_copy": 0,
"options": "Monthly Distribution", "oldfieldname": "distribution_id",
"permlevel": 0, "oldfieldtype": "Link",
"print_hide": 0, "options": "Monthly Distribution",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
} }
], ],
"hide_heading": 0, "has_web_view": 0,
"hide_toolbar": 0, "hide_heading": 0,
"icon": "fa fa-map-marker", "hide_toolbar": 0,
"idx": 1, "icon": "fa fa-map-marker",
"image_view": 0, "idx": 1,
"in_create": 0, "image_view": 0,
"in_create": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-02-20 13:24:53.794688", "modified": "2018-08-29 06:26:38.918259",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "Territory", "name": "Territory",
"name_case": "Title Case", "name_case": "Title Case",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 1,
"create": 1, "delete": 1,
"delete": 1, "email": 1,
"email": 1, "export": 1,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 1,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Sales Master Manager",
"role": "Sales Master Manager", "set_user_permissions": 1,
"set_user_permissions": 0, "share": 1,
"share": 1, "submit": 0,
"submit": 0,
"write": 1 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 1,
"email": 1, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Sales Manager",
"role": "Sales Manager", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 1,
"email": 1, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Sales User",
"role": "Sales User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 0,
"email": 0, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 0,
"print": 0, "read": 1,
"read": 1, "report": 0,
"report": 0, "role": "Stock User",
"role": "Stock User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 0,
"email": 0, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 0,
"print": 0, "read": 1,
"read": 1, "report": 0,
"report": 0, "role": "Maintenance User",
"role": "Maintenance User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
} }
], ],
"quick_entry": 1, "quick_entry": 1,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"search_fields": "parent_territory,territory_manager", "search_fields": "parent_territory,territory_manager",
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_order": "DESC", "sort_order": "DESC",
"track_changes": 0, "track_changes": 0,
"track_seen": 0 "track_seen": 0,
} "track_views": 0
}

293
erpnext/setup/doctype/uom/uom.json
View File

@ -1,159 +1,164 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_import": 1, "allow_guest_to_view": 0,
"allow_rename": 1, "allow_import": 1,
"autoname": "field:uom_name", "allow_rename": 1,
"beta": 0, "autoname": "field:uom_name",
"creation": "2013-01-10 16:34:24", "beta": 0,
"custom": 0, "creation": "2013-01-10 16:34:24",
"docstatus": 0, "custom": 0,
"doctype": "DocType", "docstatus": 0,
"document_type": "Setup", "doctype": "DocType",
"editable_grid": 0, "document_type": "Setup",
"editable_grid": 0,
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"fieldname": "uom_name", "collapsible": 0,
"fieldtype": "Data", "columns": 0,
"hidden": 0, "fieldname": "uom_name",
"ignore_user_permissions": 0, "fieldtype": "Data",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 0, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "UOM Name", "in_list_view": 1,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "UOM Name",
"oldfieldname": "uom_name", "length": 0,
"oldfieldtype": "Data", "no_copy": 0,
"permlevel": 0, "oldfieldname": "uom_name",
"print_hide": 0, "oldfieldtype": "Data",
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 1, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 1,
"unique": 0 "search_index": 0,
}, "set_only_once": 0,
"translatable": 0,
"unique": 1
},
{ {
"allow_on_submit": 0, "allow_bulk_edit": 0,
"bold": 0, "allow_in_quick_entry": 0,
"collapsible": 0, "allow_on_submit": 0,
"columns": 0, "bold": 0,
"description": "Check this to disallow fractions. (for Nos)", "collapsible": 0,
"fieldname": "must_be_whole_number", "columns": 0,
"fieldtype": "Check", "description": "Check this to disallow fractions. (for Nos)",
"hidden": 0, "fieldname": "must_be_whole_number",
"ignore_user_permissions": 0, "fieldtype": "Check",
"ignore_xss_filter": 0, "hidden": 0,
"in_filter": 0, "ignore_user_permissions": 0,
"in_global_search": 0, "ignore_xss_filter": 0,
"in_list_view": 0, "in_filter": 0,
"in_standard_filter": 0, "in_global_search": 0,
"label": "Must be Whole Number", "in_list_view": 0,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "Must be Whole Number",
"permlevel": 0, "length": 0,
"print_hide": 0, "no_copy": 0,
"print_hide_if_no_value": 0, "permlevel": 0,
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
} }
], ],
"hide_heading": 0, "has_web_view": 0,
"hide_toolbar": 0, "hide_heading": 0,
"icon": "fa fa-compass", "hide_toolbar": 0,
"idx": 1, "icon": "fa fa-compass",
"image_view": 0, "idx": 1,
"in_create": 0, "image_view": 0,
"in_create": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-02-20 13:24:25.456634", "modified": "2018-08-29 06:35:56.143361",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Setup", "module": "Setup",
"name": "UOM", "name": "UOM",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 1,
"create": 1, "delete": 1,
"delete": 1, "email": 1,
"email": 1, "export": 1,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 1,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Item Manager",
"role": "Item Manager", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 1,
"share": 1, "submit": 0,
"submit": 0,
"write": 1 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 1,
"email": 1, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Stock Manager",
"role": "Stock Manager", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 1,
"email": 1, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 1,
"print": 1, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Stock User",
"role": "Stock User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
} }
], ],
"quick_entry": 1, "quick_entry": 1,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_order": "ASC", "sort_order": "ASC",
"track_changes": 0, "track_changes": 0,
"track_seen": 0 "track_seen": 0,
"track_views": 0
} }

1030
erpnext/stock/doctype/batch/batch.json
View File

File diff suppressed because it is too large Load Diff

34
erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
View File

@ -845,6 +845,38 @@
"unique": 0, "unique": 0,
"width": "100px" "width": "100px"
}, },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "discount_percentage",
"fieldname": "discount_amount",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Discount Amount",
"length": 0,
"no_copy": 0,
"options": "currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
@ -2207,7 +2239,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-04-11 14:05:39.905947", "modified": "2018-08-07 05:18:26.132899",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Delivery Note Item", "name": "Delivery Note Item",

24
erpnext/stock/doctype/item/item.json
View File

@ -3951,7 +3951,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 1, "max_attachments": 1,
"modified": "2018-08-21 11:28:16.631848", "modified": "2018-08-29 06:27:10.198002",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Item", "name": "Item",
@ -3965,25 +3965,6 @@
"email": 1, "email": 1,
"export": 1, "export": 1,
"if_owner": 0, "if_owner": 0,
"import": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 0,
"write": 1
},
{
"amend": 0,
"cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 0,
"if_owner": 0,
"import": 1, "import": 1,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,
@ -4138,5 +4119,6 @@
"sort_order": "DESC", "sort_order": "DESC",
"title_field": "item_name", "title_field": "item_name",
"track_changes": 1, "track_changes": 1,
"track_seen": 0 "track_seen": 0,
"track_views": 0
} }

1776
erpnext/stock/doctype/item_price/item_price.json
View File

File diff suppressed because it is too large Load Diff

1658
erpnext/stock/doctype/material_request/material_request.json
View File

File diff suppressed because it is too large Load Diff

779
erpnext/stock/doctype/price_list/price_list.json
View File

@ -1,419 +1,424 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_guest_to_view": 0, "allow_guest_to_view": 0,
"allow_import": 1, "allow_import": 1,
"allow_rename": 1, "allow_rename": 1,
"autoname": "field:price_list_name", "autoname": "field:price_list_name",
"beta": 0, "beta": 0,
"creation": "2013-01-25 11:35:09", "creation": "2013-01-25 11:35:09",
"custom": 0, "custom": 0,
"description": "Price List Master", "description": "Price List Master",
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Setup", "document_type": "Setup",
"editable_grid": 0, "editable_grid": 0,
"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": "1", "columns": 0,
"fieldname": "enabled", "default": "1",
"fieldtype": "Check", "fieldname": "enabled",
"hidden": 0, "fieldtype": "Check",
"ignore_user_permissions": 0, "hidden": 0,
"ignore_xss_filter": 0, "ignore_user_permissions": 0,
"in_filter": 0, "ignore_xss_filter": 0,
"in_global_search": 0, "in_filter": 0,
"in_list_view": 0, "in_global_search": 0,
"in_standard_filter": 0, "in_list_view": 0,
"label": "Enabled", "in_standard_filter": 0,
"length": 0, "label": "Enabled",
"no_copy": 0, "length": 0,
"permlevel": 0, "no_copy": 0,
"print_hide": 0, "permlevel": 0,
"print_hide_if_no_value": 0, "print_hide": 0,
"read_only": 0, "print_hide_if_no_value": 0,
"remember_last_selected_value": 0, "read_only": 0,
"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,
"translatable": 0, "set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"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,
"fieldname": "sb_1", "columns": 0,
"fieldtype": "Section Break", "fieldname": "sb_1",
"hidden": 0, "fieldtype": "Section Break",
"ignore_user_permissions": 0, "hidden": 0,
"ignore_xss_filter": 0, "ignore_user_permissions": 0,
"in_filter": 0, "ignore_xss_filter": 0,
"in_global_search": 0, "in_filter": 0,
"in_list_view": 0, "in_global_search": 0,
"in_standard_filter": 0, "in_list_view": 0,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "length": 0,
"permlevel": 0, "no_copy": 0,
"print_hide": 0, "permlevel": 0,
"print_hide_if_no_value": 0, "print_hide": 0,
"read_only": 0, "print_hide_if_no_value": 0,
"remember_last_selected_value": 0, "read_only": 0,
"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,
"translatable": 0, "set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"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,
"fieldname": "price_list_name", "columns": 0,
"fieldtype": "Data", "fieldname": "price_list_name",
"hidden": 0, "fieldtype": "Data",
"ignore_user_permissions": 0, "hidden": 0,
"ignore_xss_filter": 0, "ignore_user_permissions": 0,
"in_filter": 0, "ignore_xss_filter": 0,
"in_global_search": 0, "in_filter": 0,
"in_list_view": 0, "in_global_search": 0,
"in_standard_filter": 0, "in_list_view": 0,
"label": "Price List Name", "in_standard_filter": 0,
"length": 0, "label": "Price List Name",
"no_copy": 1, "length": 0,
"oldfieldname": "price_list_name", "no_copy": 1,
"oldfieldtype": "Data", "oldfieldname": "price_list_name",
"permlevel": 0, "oldfieldtype": "Data",
"print_hide": 0, "permlevel": 0,
"print_hide_if_no_value": 0, "print_hide": 0,
"read_only": 0, "print_hide_if_no_value": 0,
"remember_last_selected_value": 0, "read_only": 0,
"report_hide": 0, "remember_last_selected_value": 0,
"reqd": 1, "report_hide": 0,
"search_index": 0, "reqd": 1,
"set_only_once": 0, "search_index": 0,
"translatable": 0, "set_only_once": 0,
"translatable": 0,
"unique": 1
},
{
"allow_bulk_edit": 0,
"allow_in_quick_entry": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "currency",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Currency",
"length": 0,
"no_copy": 0,
"options": "Currency",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"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,
"fieldname": "currency", "columns": 0,
"fieldtype": "Link", "fieldname": "buying",
"hidden": 0, "fieldtype": "Check",
"ignore_user_permissions": 0, "hidden": 0,
"ignore_xss_filter": 0, "ignore_user_permissions": 0,
"in_filter": 0, "ignore_xss_filter": 0,
"in_global_search": 0, "in_filter": 0,
"in_list_view": 1, "in_global_search": 0,
"in_standard_filter": 1, "in_list_view": 1,
"label": "Currency", "in_standard_filter": 0,
"length": 0, "label": "Buying",
"no_copy": 0, "length": 0,
"options": "Currency", "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"remember_last_selected_value": 0, "remember_last_selected_value": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 1, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"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,
"fieldname": "buying", "columns": 0,
"fieldtype": "Check", "fieldname": "selling",
"hidden": 0, "fieldtype": "Check",
"ignore_user_permissions": 0, "hidden": 0,
"ignore_xss_filter": 0, "ignore_user_permissions": 0,
"in_filter": 0, "ignore_xss_filter": 0,
"in_global_search": 0, "in_filter": 0,
"in_list_view": 1, "in_global_search": 0,
"in_standard_filter": 0, "in_list_view": 1,
"label": "Buying", "in_standard_filter": 0,
"length": 0, "label": "Selling",
"no_copy": 0, "length": 0,
"permlevel": 0, "no_copy": 0,
"print_hide": 0, "permlevel": 0,
"print_hide_if_no_value": 0, "print_hide": 0,
"read_only": 0, "print_hide_if_no_value": 0,
"remember_last_selected_value": 0, "read_only": 0,
"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,
"translatable": 0, "set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"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,
"fieldname": "selling", "columns": 0,
"fieldtype": "Check", "fieldname": "price_not_uom_dependant",
"hidden": 0, "fieldtype": "Check",
"ignore_user_permissions": 0, "hidden": 0,
"ignore_xss_filter": 0, "ignore_user_permissions": 0,
"in_filter": 0, "ignore_xss_filter": 0,
"in_global_search": 0, "in_filter": 0,
"in_list_view": 1, "in_global_search": 0,
"in_standard_filter": 0, "in_list_view": 0,
"label": "Selling", "in_standard_filter": 0,
"length": 0, "label": "Price Not UOM Dependant",
"no_copy": 0, "length": 0,
"permlevel": 0, "no_copy": 0,
"print_hide": 0, "permlevel": 0,
"print_hide_if_no_value": 0, "precision": "",
"read_only": 0, "print_hide": 0,
"remember_last_selected_value": 0, "print_hide_if_no_value": 0,
"report_hide": 0, "read_only": 0,
"reqd": 0, "remember_last_selected_value": 0,
"search_index": 0, "report_hide": 0,
"set_only_once": 0, "reqd": 0,
"translatable": 0, "search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"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,
"fieldname": "price_not_uom_dependant", "columns": 0,
"fieldtype": "Check", "fieldname": "column_break_3",
"hidden": 0, "fieldtype": "Column Break",
"ignore_user_permissions": 0, "hidden": 0,
"ignore_xss_filter": 0, "ignore_user_permissions": 0,
"in_filter": 0, "ignore_xss_filter": 0,
"in_global_search": 0, "in_filter": 0,
"in_list_view": 0, "in_global_search": 0,
"in_standard_filter": 0, "in_list_view": 0,
"label": "Price Not UOM Dependant", "in_standard_filter": 0,
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "print_hide": 0,
"print_hide": 0, "print_hide_if_no_value": 0,
"print_hide_if_no_value": 0, "read_only": 0,
"read_only": 0, "remember_last_selected_value": 0,
"remember_last_selected_value": 0, "report_hide": 0,
"report_hide": 0, "reqd": 0,
"reqd": 0, "search_index": 0,
"search_index": 0, "set_only_once": 0,
"set_only_once": 0, "translatable": 0,
"translatable": 0,
"unique": 0 "unique": 0
}, },
{ {
"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,
"fieldname": "column_break_3", "columns": 0,
"fieldtype": "Column Break", "fieldname": "countries",
"hidden": 0, "fieldtype": "Table",
"ignore_user_permissions": 0, "hidden": 0,
"ignore_xss_filter": 0, "ignore_user_permissions": 0,
"in_filter": 0, "ignore_xss_filter": 0,
"in_global_search": 0, "in_filter": 0,
"in_list_view": 0, "in_global_search": 0,
"in_standard_filter": 0, "in_list_view": 0,
"length": 0, "in_standard_filter": 0,
"no_copy": 0, "label": "Applicable for Countries",
"permlevel": 0, "length": 0,
"print_hide": 0, "no_copy": 0,
"print_hide_if_no_value": 0, "options": "Price List Country",
"read_only": 0, "permlevel": 0,
"remember_last_selected_value": 0, "precision": "",
"report_hide": 0, "print_hide": 0,
"reqd": 0, "print_hide_if_no_value": 0,
"search_index": 0, "read_only": 0,
"set_only_once": 0, "remember_last_selected_value": 0,
"translatable": 0, "report_hide": 0,
"unique": 0 "reqd": 0,
}, "search_index": 0,
{ "set_only_once": 0,
"allow_bulk_edit": 0, "translatable": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"fieldname": "countries",
"fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Applicable for Countries",
"length": 0,
"no_copy": 0,
"options": "Price List Country",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"translatable": 0,
"unique": 0 "unique": 0
} }
], ],
"has_web_view": 0, "has_web_view": 0,
"hide_heading": 0, "hide_heading": 0,
"hide_toolbar": 0, "hide_toolbar": 0,
"icon": "fa fa-tags", "icon": "fa fa-tags",
"idx": 1, "idx": 1,
"image_view": 0, "image_view": 0,
"in_create": 0, "in_create": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 1, "max_attachments": 1,
"modified": "2018-03-30 11:56:28.243161", "modified": "2018-08-29 06:35:16.546274",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Price List", "name": "Price List",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 0,
"email": 0, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 0,
"print": 0, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Sales User",
"role": "Sales User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 1,
"create": 1, "delete": 1,
"delete": 1, "email": 0,
"email": 0, "export": 1,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 1,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 0,
"print": 0, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Sales Master Manager",
"role": "Sales Master Manager", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 1,
"share": 1, "submit": 0,
"submit": 0,
"write": 1 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 0,
"email": 0, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 0,
"print": 0, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Purchase User",
"role": "Purchase User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "cancel": 0,
"cancel": 0, "create": 1,
"create": 1, "delete": 1,
"delete": 1, "email": 0,
"email": 0, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 0,
"print": 0, "read": 1,
"read": 1, "report": 1,
"report": 1, "role": "Purchase Master Manager",
"role": "Purchase Master Manager", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 1,
"share": 1, "submit": 0,
"submit": 0,
"write": 1 "write": 1
}, },
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 1, "cancel": 0,
"cancel": 0, "create": 0,
"create": 0, "delete": 0,
"delete": 0, "email": 0,
"email": 0, "export": 0,
"export": 0, "if_owner": 0,
"if_owner": 0, "import": 0,
"import": 0, "permlevel": 0,
"permlevel": 0, "print": 0,
"print": 0, "read": 1,
"read": 1, "report": 0,
"report": 0, "role": "Manufacturing User",
"role": "Manufacturing User", "set_user_permissions": 0,
"set_user_permissions": 0, "share": 0,
"share": 0, "submit": 0,
"submit": 0,
"write": 0 "write": 0
} }
], ],
"quick_entry": 0, "quick_entry": 0,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"search_fields": "currency", "search_fields": "currency",
"show_name_in_global_search": 1, "show_name_in_global_search": 1,
"sort_order": "ASC", "sort_order": "ASC",
"track_changes": 0, "track_changes": 0,
"track_seen": 0 "track_seen": 0,
"track_views": 0
} }

34
erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
View File

@ -785,6 +785,38 @@
"translatable": 0, "translatable": 0,
"unique": 0 "unique": 0
}, },
{
"allow_bulk_edit": 0,
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"columns": 0,
"depends_on": "discount_percentage",
"fieldname": "discount_amount",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_global_search": 0,
"in_list_view": 0,
"in_standard_filter": 0,
"label": "Discount Amount",
"length": 0,
"no_copy": 0,
"options": "currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{ {
"allow_bulk_edit": 0, "allow_bulk_edit": 0,
"allow_on_submit": 0, "allow_on_submit": 0,
@ -2496,7 +2528,7 @@
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"max_attachments": 0, "max_attachments": 0,
"modified": "2018-08-08 06:56:45.396664", "modified": "2018-08-09 06:56:45.396664",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Stock", "module": "Stock",
"name": "Purchase Receipt Item", "name": "Purchase Receipt Item",

3101
erpnext/stock/doctype/serial_no/serial_no.json
View File

File diff suppressed because it is too large Load Diff

3954
erpnext/stock/doctype/stock_entry/stock_entry.json
View File

File diff suppressed because it is too large Load Diff

5
erpnext/stock/doctype/stock_entry/stock_entry.py
View File

@ -99,6 +99,7 @@ class StockEntry(StockController):
self.update_stock_ledger() self.update_stock_ledger()
self.make_gl_entries_on_cancel() self.make_gl_entries_on_cancel()
self.update_cost_in_project()
def validate_work_order_status(self): def validate_work_order_status(self):
pro_doc = frappe.get_doc("Work Order", self.work_order) pro_doc = frappe.get_doc("Work Order", self.work_order)
@ -129,8 +130,8 @@ class StockEntry(StockController):
se.docstatus = 1 and se.project = %s and sed.parent = se.name se.docstatus = 1 and se.project = %s and sed.parent = se.name
and (sed.t_warehouse is null or sed.t_warehouse = '')""", self.project, as_list=1) and (sed.t_warehouse is null or sed.t_warehouse = '')""", self.project, as_list=1)
if amount: amount = amount[0][0] if amount else 0
frappe.db.set_value('Project', self.project, 'total_consumed_material_cost', amount[0][0]) frappe.db.set_value('Project', self.project, 'total_consumed_material_cost', amount)
def validate_item(self): def validate_item(self):
stock_items = self.get_stock_items() stock_items = self.get_stock_items()

1821
erpnext/stock/doctype/warehouse/warehouse.json
View File

File diff suppressed because it is too large Load Diff

4
erpnext/stock/get_item_details.py
View File

@ -645,8 +645,8 @@ def get_projected_qty(item_code, warehouse):
@frappe.whitelist() @frappe.whitelist()
def get_bin_details(item_code, warehouse): def get_bin_details(item_code, warehouse):
return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse}, return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse},
["projected_qty", "actual_qty"], as_dict=True, cache=True) \ ["projected_qty", "actual_qty", "reserved_qty"], as_dict=True, cache=True) \
or {"projected_qty": 0, "actual_qty": 0} or {"projected_qty": 0, "actual_qty": 0, "reserved_qty": 0}
@frappe.whitelist() @frappe.whitelist()
def get_serial_no_details(item_code, warehouse, stock_qty, serial_no): def get_serial_no_details(item_code, warehouse, stock_qty, serial_no):

8
erpnext/stock/utils.py
View File

@ -11,8 +11,7 @@ from six import string_types
class InvalidWarehouseCompany(frappe.ValidationError): pass class InvalidWarehouseCompany(frappe.ValidationError): pass
def get_stock_value_from_bin (warehouse=None, item_code=None): def get_stock_value_from_bin(warehouse=None, item_code=None):
values = {} values = {}
conditions = "" conditions = ""
if warehouse: if warehouse:
@ -28,14 +27,13 @@ def get_stock_value_from_bin (warehouse=None, item_code=None):
if item_code: if item_code:
conditions += " and item_code = %(item_code)s" conditions += " and item_code = %(item_code)s"
values['item_code'] = item_code values['item_code'] = item_code
query = "select sum(stock_value) from `tabBin` where 1 = 1" + conditions query = "select sum(stock_value) from `tabBin` where 1 = 1 %s" % conditions
stock_value = frappe.db.sql(query, values) stock_value = frappe.db.sql(query, values)
return stock_value; return stock_value
def get_stock_value_on(warehouse=None, posting_date=None, item_code=None): def get_stock_value_on(warehouse=None, posting_date=None, item_code=None):
if not posting_date: posting_date = nowdate() if not posting_date: posting_date = nowdate()

5
erpnext/templates/includes/products_as_grid.html
View File

@ -12,8 +12,9 @@
<div>&nbsp</div> <div>&nbsp</div>
<div style='font-size: small; margin-bottom: 10px;'>&nbsp</div> <div style='font-size: small; margin-bottom: 10px;'>&nbsp</div>
{% endif %} {% endif %}
{% if show_stock_qty %}
{% if in_stock %} {% if show_availability_status %}
{% if in_stock or not is_stock_item %}
<div style='color: green'> <i class='fa fa-check'></i> {{ _("In stock") }}</div> <div style='color: green'> <i class='fa fa-check'></i> {{ _("In stock") }}</div>
{% else %} {% else %}
<div style='color: red'> <i class='fa fa-close'></i> {{ _("Not in stock") }}</div> <div style='color: red'> <i class='fa fa-close'></i> {{ _("Not in stock") }}</div>