Fixed merge conflict
diff --git a/README.md b/README.md
index dbb88ac..4f59339 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
ERPNext is built on the [Frappe](https://github.com/frappe/frappe) Framework, a full-stack web app framework in Python & JavaScript.
-- [User Guide](https://manual.erpnext.com)
+- [User Guide](https://frappe.github.io/erpnext/)
- [Getting Help](http://erpnext.org/getting-help.html)
- [Discussion Forum](https://discuss.erpnext.com/)
diff --git a/erpnext/accounts/doctype/account/account.js b/erpnext/accounts/doctype/account/account.js
index 2450a8a..4c04fc6 100644
--- a/erpnext/accounts/doctype/account/account.js
+++ b/erpnext/accounts/doctype/account/account.js
@@ -51,7 +51,7 @@
if (doc.is_group == 1) {
cur_frm.add_custom_button(__('Group to Non-Group'),
- function() { cur_frm.cscript.convert_to_ledger(); }, 'icon-retweet', 'btn-default');
+ function() { cur_frm.cscript.convert_to_ledger(); }, 'fa fa-retweet', 'btn-default');
} else if (cint(doc.is_group) == 0) {
cur_frm.add_custom_button(__('Ledger'), function() {
frappe.route_options = {
@@ -64,7 +64,7 @@
});
cur_frm.add_custom_button(__('Non-Group to Group'),
- function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet', 'btn-default')
+ function() { cur_frm.cscript.convert_to_group(); }, 'fa fa-retweet', 'btn-default')
}
}
diff --git a/erpnext/accounts/doctype/account/account.json b/erpnext/accounts/doctype/account/account.json
index bb37e3a..7a845ce 100644
--- a/erpnext/accounts/doctype/account/account.json
+++ b/erpnext/accounts/doctype/account/account.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -76,6 +78,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Account Name",
"length": 0,
"no_copy": 1,
@@ -105,6 +108,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Group",
"length": 0,
"no_copy": 0,
@@ -132,6 +136,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -161,6 +166,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Root Type",
"length": 0,
"no_copy": 0,
@@ -188,6 +194,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Report Type",
"length": 0,
"no_copy": 0,
@@ -216,6 +223,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency",
"length": 0,
"no_copy": 0,
@@ -244,6 +252,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -270,6 +279,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Parent Account",
"length": 0,
"no_copy": 0,
@@ -300,6 +310,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Account Type",
"length": 0,
"no_copy": 0,
@@ -330,6 +341,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rate",
"length": 0,
"no_copy": 0,
@@ -359,6 +371,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Frozen",
"length": 0,
"no_copy": 0,
@@ -388,6 +401,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Warehouse",
"length": 0,
"no_copy": 0,
@@ -415,6 +429,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Balance must be",
"length": 0,
"no_copy": 0,
@@ -442,6 +457,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Lft",
"length": 0,
"no_copy": 0,
@@ -468,6 +484,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rgt",
"length": 0,
"no_copy": 0,
@@ -494,6 +511,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Old Parent",
"length": 0,
"no_copy": 0,
@@ -511,7 +529,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-money",
+ "icon": "fa fa-money",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -520,7 +538,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 14:58:35.124421",
+ "modified": "2016-12-15 14:43:50.121671",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Account",
diff --git a/erpnext/accounts/doctype/account/account_tree.js b/erpnext/accounts/doctype/account/account_tree.js
index 8b2f14d..1fbbf4f 100644
--- a/erpnext/accounts/doctype/account/account_tree.js
+++ b/erpnext/accounts/doctype/account/account_tree.js
@@ -30,7 +30,9 @@
options: ['Asset', 'Liability', 'Equity', 'Income', 'Expense'].join('\n'),
depends_on: 'eval:doc.is_group && !doc.parent_account'},
{fieldtype:'Select', fieldname:'account_type', label:__('Account Type'),
- options: ['', 'Bank', 'Cash', 'Stock', 'Tax', 'Chargeable', 'Fixed Asset'].join('\n'),
+ options: ['', 'Accumulated Depreciation', 'Bank', 'Cash', 'Chargeable', 'Cost of Goods Sold', 'Depreciation',
+ 'Equity', 'Expense Account', 'Expenses Included In Valuation', 'Fixed Asset', 'Income Account', 'Payable', 'Receivable',
+ 'Round Off', 'Stock', 'Stock Adjustment', 'Stock Received But Not Billed', 'Tax', 'Temporary'].join('\n'),
description: __("Optional. This setting will be used to filter in various transactions.")
},
{fieldtype:'Float', fieldname:'tax_rate', label:__('Tax Rate'),
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
index 5c82142..ac6240a 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/chart_of_accounts.py
@@ -6,9 +6,8 @@
from frappe.utils import cstr
from unidecode import unidecode
-def create_charts(chart_name, company):
- chart = get_chart(chart_name)
-
+def create_charts(company, chart_template=None, existing_company=None):
+ chart = get_chart(chart_template, existing_company)
if chart:
accounts = []
@@ -17,7 +16,7 @@
if root_account:
root_type = child.get("root_type")
- if account_name not in ["account_type", "root_type", "is_group"]:
+ if account_name not in ["account_type", "root_type", "is_group", "tax_rate"]:
account_name_in_db = unidecode(account_name.strip().lower())
if account_name_in_db in accounts:
@@ -57,16 +56,19 @@
def identify_is_group(child):
if child.get("is_group"):
is_group = child.get("is_group")
- elif len(set(child.keys()) - set(["account_type", "root_type", "is_group"])):
+ elif len(set(child.keys()) - set(["account_type", "root_type", "is_group", "tax_rate"])):
is_group = 1
else:
is_group = 0
return is_group
-def get_chart(chart_name):
+def get_chart(chart_template, existing_company=None):
chart = {}
- if chart_name == "Standard":
+ if existing_company:
+ return get_account_tree_from_existing_company(existing_company)
+
+ elif chart_template == "Standard":
from erpnext.accounts.doctype.account.chart_of_accounts.verified import standard_chart_of_accounts
return standard_chart_of_accounts.get()
else:
@@ -79,7 +81,7 @@
if fname.endswith(".json"):
with open(os.path.join(path, fname), "r") as f:
chart = f.read()
- if chart and json.loads(chart).get("name") == chart_name:
+ if chart and json.loads(chart).get("name") == chart_template:
return json.loads(chart).get("tree")
@frappe.whitelist()
@@ -103,7 +105,7 @@
path = os.path.join(os.path.dirname(__file__), folder)
for fname in os.listdir(path):
- if fname.startswith(country_code) and fname.endswith(".json"):
+ if (fname.startswith(country_code) or fname.startswith(country)) and fname.endswith(".json"):
with open(os.path.join(path, fname), "r") as f:
_get_chart_name(f.read())
@@ -111,3 +113,47 @@
charts.append("Standard")
return charts
+
+
+def get_account_tree_from_existing_company(existing_company):
+ all_accounts = frappe.get_all('Account',
+ filters={'company': existing_company},
+ fields = ["name", "account_name", "parent_account", "account_type",
+ "is_group", "root_type", "tax_rate"],
+ order_by="lft, rgt")
+
+ account_tree = {}
+
+ # fill in tree starting with root accounts (those with no parent)
+ build_account_tree(account_tree, None, all_accounts)
+
+ return account_tree
+
+def build_account_tree(tree, parent, all_accounts):
+ # find children
+ parent_account = parent.name if parent else None
+ children = [acc for acc in all_accounts if acc.parent_account == parent_account]
+
+ # if no children, but a group account
+ if not children and parent.is_group:
+ tree["is_group"] = 1
+
+ # build a subtree for each child
+ for child in children:
+ if child.account_type == "Stock" and not child.is_group:
+ tree["is_group"] = 1
+ continue
+
+ # start new subtree
+ tree[child.account_name] = {}
+
+ # assign account_type and root_type
+ if child.account_type:
+ tree[child.account_name]["account_type"] = child.account_type
+ if child.tax_rate:
+ tree[child.account_name]["tax_rate"] = child.tax_rate
+ if not parent:
+ tree[child.account_name]["root_type"] = child.root_type
+
+ # call recursively to build a subtree for current account
+ build_account_tree(tree[child.account_name], child, all_accounts)
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/br_l10n_br_account_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/br_l10n_br_account_chart_template.json
deleted file mode 100644
index 0ac6588..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/br_l10n_br_account_chart_template.json
+++ /dev/null
@@ -1,797 +0,0 @@
-{
- "country_code": "br",
- "name": "Brasileira - Planilha de Contas",
- "tree": {
- "ATIVO": {
- "CIRCULANTE": {
- "CONTAS RETIFICADORAS": {
- "(-) Duplicatas Descontadas": {},
- "(-) Outras Contas Retificadoras": {},
- "(-) Provis\u00e3o para Ajuste do Estoque ao Valor de Mercado": {},
- "(-) Provis\u00f5es para Ajuste ao Valor Prov\u00e1vel de Realiza\u00e7\u00e3o": {},
- "(-) Provis\u00f5es para Cr\u00e9ditos de Liquida\u00e7\u00e3o Duvidosa": {}
- },
- "CR\u00c9DITOS": {
- "Adiantamentos a Fornecedores": {},
- "CSLL a Recuperar": {},
- "Clientes": {
- "account_type": "Receivable"
- },
- "Cr\u00e9ditos Fiscais CSLL \u2013 Diferen\u00e7as Tempor\u00e1rias e Base de C\u00e1lculo Negativa": {},
- "Cr\u00e9ditos Fiscais IRPJ \u2013 Diferen\u00e7as Tempor\u00e1rias e Preju\u00edzos Fiscais": {},
- "Cr\u00e9ditos por Contribui\u00e7\u00f5es e Doa\u00e7\u00f5es": {},
- "ICMS e Contribui\u00e7\u00f5es a Recuperar": {},
- "IPI a Recuperar": {},
- "Imposto de Renda a Recuperar": {},
- "Outras": {},
- "Outros Impostos e Contribui\u00e7\u00f5es a Recuperar": {},
- "PIS e COFINS a Recuperar": {},
- "Tributos Municipais a Recuperar": {}
- },
- "DESPESAS DO EXERC\u00cdCIO SEGUINTE": {
- "Despesas do Exerc\u00edcio Seguinte": {},
- "Outras Contas": {}
- },
- "DISPONIBILIDADES": {
- "Bancos": {
- "account_type": "Cash"
- },
- "Caixa": {
- "account_type": "Bank"
- },
- "Contas Banc\u00e1rias \u2013 Doa\u00e7\u00f5es": {},
- "Contas Banc\u00e1rias \u2013 Outros Recursos Sujeitos a Restri\u00e7\u00f5es": {},
- "Contas Banc\u00e1rias \u2013 Subven\u00e7\u00f5es": {},
- "Outras": {},
- "Recursos no Exterior Decorrentes de Exporta\u00e7\u00e3o": {},
- "Valores Mobili\u00e1rios - Mercado de Capitais Externo": {},
- "Valores Mobili\u00e1rios - Mercado de Capitais Interno": {},
- "Valores Mobili\u00e1rios \u2013 Aplica\u00e7\u00f5es de Doa\u00e7\u00f5es": {},
- "Valores Mobili\u00e1rios \u2013 Aplica\u00e7\u00f5es de Outros Recursos Sujeitos a Restri\u00e7\u00f5es": {},
- "Valores Mobili\u00e1rios \u2013 Aplica\u00e7\u00f5es de Subven\u00e7\u00f5es": {}
- },
- "ESTOQUES": {
- "Constru\u00e7\u00f5es em Andamento de Im\u00f3veis Destinados \u00e0 Venda": {},
- "Estoques Destinados \u00e0 Doa\u00e7\u00e3o": {},
- "Im\u00f3veis Destinados \u00e0 Venda": {},
- "Insumos (materiais diretos)": {},
- "Insumos Agropecu\u00e1rios": {},
- "Mercadorias para Revenda": {},
- "Outras": {},
- "Produtos Acabados": {},
- "Produtos Agropecu\u00e1rios Acabados": {},
- "Produtos Agropecu\u00e1rios em Forma\u00e7\u00e3o": {},
- "Produtos em Elabora\u00e7\u00e3o": {},
- "Servi\u00e7os em andamento": {}
- }
- },
- "N\u00c3O CIRCULANTE": {
- "DIFERIDO": {
- "(-) Amortiza\u00e7\u00e3o do Diferido": {},
- "Corre\u00e7\u00e3o Monet\u00e1ria - Diferen\u00e7a IPC/BTNF (Lei no 8.200/1991)": {},
- "Corre\u00e7\u00e3o Monet\u00e1ria Especial (Lei no 8.200/1991)": {},
- "Demais Aplica\u00e7\u00f5es em Despesas Amortiz\u00e1veis": {},
- "Despesas Pr\u00e9-Operacionais ou Pr\u00e9-Industriais": {},
- "Despesas com Pesquisas Cient\u00edficas ou Tecnol\u00f3gicas": {}
- },
- "IMOBILIZADO": {
- "(-) Deprecia\u00e7\u00f5es, Amortiza\u00e7\u00f5es e Quotas de Exaust\u00e3o": {},
- "(-) Outras Contas Redutoras do Imobilizado": {},
- "Aeronaves": {},
- "Constru\u00e7\u00f5es em Andamento": {},
- "Corre\u00e7\u00e3o Monet\u00e1ria - Diferen\u00e7a IPC/BTNF (Lei no 8.200/1991)": {},
- "Corre\u00e7\u00e3o Monet\u00e1ria Especial (Lei no 8.200/1991)": {},
- "Direitos Contratuais de Explora\u00e7\u00e3o de Florestas": {},
- "Edif\u00edcios e Constru\u00e7\u00f5es": {},
- "Embarca\u00e7\u00f5es": {},
- "Equipamentos, M\u00e1quinas e Instala\u00e7\u00f5es Industriais": {},
- "Florestamento e Reflorestamento": {},
- "M\u00f3veis, Utens\u00edlios e Instala\u00e7\u00f5es Comerciais": {},
- "Outras Imobiliza\u00e7\u00f5es": {},
- "Recursos Minerais": {},
- "Terrenos": {},
- "Ve\u00edculos": {}
- },
- "INTANG\u00cdVEL": {
- "(-) Amortiza\u00e7\u00e3o do Intang\u00edvel": {},
- "(-) Outras Contas Redutoras do Intang\u00edvel": {},
- "Concess\u00f5es": {},
- "Desenvolvimento de Produtos": {},
- "Direitos Autorais": {},
- "Franquias": {},
- "Fundo de Com\u00e9rcio": {},
- "Marcas e Patentes": {},
- "Outras": {},
- "Software ou Programas de Computador": {}
- },
- "INVESTIMENTOS": {
- "(-) Des\u00e1gios e Provis\u00e3o para Perdas Prov\u00e1veis em Investimentos": {},
- "(-) Outras Contas Retificadoras": {},
- "Corre\u00e7\u00e3o Monet\u00e1ria - Diferen\u00e7a IPC/BTNF (Lei no 8.200/1991)": {},
- "Corre\u00e7\u00e3o Monet\u00e1ria Especial (Lei no 8.200/1991)": {},
- "Investimentos Decorrentes de Incentivos Fiscais": {},
- "Outras Contas": {},
- "Outros Investimentos": {},
- "Participa\u00e7\u00f5es Permanentes em Coligadas ou Controladas": {},
- "\u00c1gios em Investimentos": {}
- },
- "REALIZ\u00c1VEL A LONGO PRAZO": {
- "(-) Duplicatas Descontadas": {},
- "(-) Outras Contas Retificadoras": {},
- "(-) Provis\u00f5es para Ajuste ao Valor Prov\u00e1vel de Realiza\u00e7\u00e3o": {},
- "(-) Provis\u00f5es para Cr\u00e9ditos de Liquida\u00e7\u00e3o Duvidosa": {},
- "Clientes": {
- "account_type": "Receivable"
- },
- "Cr\u00e9ditos Fiscais CSLL \u2013 Diferen\u00e7as Tempor\u00e1rias e Base de C\u00e1lculo Negativa": {},
- "Cr\u00e9ditos Fiscais IRPJ \u2013 Diferen\u00e7as Tempor\u00e1rias e Preju\u00edzos Fiscais": {},
- "Cr\u00e9ditos com Pessoas Ligadas (F\u00edsicas/Jur\u00eddicas)": {},
- "Cr\u00e9ditos por Contribui\u00e7\u00f5es e Doa\u00e7\u00f5es": {},
- "Dep\u00f3sitos Judiciais": {},
- "Outras Contas": {},
- "Valores Mobili\u00e1rios": {}
- }
- },
- "root_type": "Asset"
- },
- "CUSTOS DE PRODU\u00c7\u00c3O": {
- "CUSTO DOS BENS E SERVI\u00c7OS PRODUZIDOS": {
- "CUSTO DOS PRODUTOS DE FABRICA\u00c7\u00c3O PR\u00d3PRIA PRODUZIDOS": {
- "Alimenta\u00e7\u00e3o do Trabalhador": {},
- "Arrendamento Mercantil": {},
- "Constitui\u00e7\u00e3o de Provis\u00f5es": {},
- "Consumo de Insumos": {},
- "Custo do Pessoal Aplicado na Produ\u00e7\u00e3o": {},
- "Encargos Sociais \u2013 FGTS": {},
- "Encargos Sociais \u2013 Outros": {},
- "Encargos Sociais \u2013 Previd\u00eancia Social": {},
- "Encargos de Deprecia\u00e7\u00e3o, Amortiza\u00e7\u00e3o e Exaust\u00e3o": {},
- "Fundo de Aposentadoria Programada Individual de Empregados Ligados \u00e0 Produ\u00e7\u00e3o": {},
- "Loca\u00e7\u00e3o de M\u00e3o-de-obra": {},
- "Manuten\u00e7\u00e3o e Reparo de Bens Aplicados na Produ\u00e7\u00e3o": {},
- "Outros Custos": {},
- "Outros Gastos com Pessoal Ligado \u00e0 Produ\u00e7\u00e3o": {},
- "Plano de Previd\u00eancia Privada de Empregados Ligados \u00e0 Produ\u00e7\u00e3o": {},
- "Planos de Poupan\u00e7a e Investimentos de Empregados Ligados \u00e0 Produ\u00e7\u00e3o": {},
- "Presta\u00e7\u00e3o de Servi\u00e7o Pessoa Jur\u00eddica": {},
- "Presta\u00e7\u00e3o de Servi\u00e7os por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio": {},
- "Remunera\u00e7\u00e3o a Dirigentes de Ligados \u00e0 Produ\u00e7\u00e3o": {},
- "Royalties e Assist\u00eancia T\u00e9cnica \u2013 EXTERIOR": {},
- "Royalties e Assist\u00eancia T\u00e9cnica \u2013 PA\u00cdS": {},
- "Servi\u00e7os Prestados Pessoa Jur\u00eddica": {},
- "Servi\u00e7os Prestados por Cooperativa de Trabalho": {},
- "Servi\u00e7os Prestados por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio": {}
- },
- "CUSTO DOS PRODUTOS DE FABRICA\u00c7\u00c3O PR\u00d3PRIA PRODUZIDOS DA ATIVIDADE RURAL": {
- "Alimenta\u00e7\u00e3o do Trabalhador": {},
- "Arrendamento Mercantil": {},
- "Constitui\u00e7\u00e3o de Provis\u00f5es": {},
- "Consumo de Insumos": {},
- "Custo do Pessoal Aplicado na Produ\u00e7\u00e3o": {},
- "Encargos Sociais \u2013 FGTS": {},
- "Encargos Sociais \u2013 Outros": {},
- "Encargos Sociais \u2013 Previd\u00eancia Social": {},
- "Encargos de Deprecia\u00e7\u00e3o, Amortiza\u00e7\u00e3o e Exaust\u00e3o": {},
- "Fundo de Aposentadoria Programada Individual de Empregados Ligados \u00e0 Produ\u00e7\u00e3o": {},
- "Loca\u00e7\u00e3o de M\u00e3o-de-obra": {},
- "Manuten\u00e7\u00e3o e Reparo de Bens Aplicados na Produ\u00e7\u00e3o": {},
- "Outros Custos": {},
- "Outros Gastos com Pessoal Ligado \u00e0 Produ\u00e7\u00e3o": {},
- "Plano de Previd\u00eancia Privada de Empregados Ligados \u00e0 Produ\u00e7\u00e3o": {},
- "Planos de Poupan\u00e7a e Investimentos de Empregados Ligados \u00e0 Produ\u00e7\u00e3o": {},
- "Presta\u00e7\u00e3o de Servi\u00e7o Pessoa Jur\u00eddica": {},
- "Presta\u00e7\u00e3o de Servi\u00e7os por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio": {},
- "Remunera\u00e7\u00e3o a Dirigentes de Ligados \u00e0 Produ\u00e7\u00e3o": {},
- "Royalties e Assist\u00eancia T\u00e9cnica \u2013 EXTERIOR": {},
- "Royalties e Assist\u00eancia T\u00e9cnica \u2013 PA\u00cdS": {},
- "Servi\u00e7os Prestados Pessoa Jur\u00eddica": {},
- "Servi\u00e7os Prestados por Cooperativa de Trabalho": {},
- "Servi\u00e7os Prestados por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio": {}
- },
- "CUSTO DOS SERVI\u00c7OS PRODUZIDOS": {
- "Alimenta\u00e7\u00e3o do Trabalhador": {},
- "Arrendamento Mercantil": {},
- "Constitui\u00e7\u00e3o de Provis\u00f5es": {},
- "Custo do Pessoal Aplicado na Produ\u00e7\u00e3o de Servi\u00e7os": {},
- "Encargos Sociais \u2013 FGTS": {},
- "Encargos Sociais \u2013 Outros": {},
- "Encargos Sociais \u2013 Previd\u00eancia Social": {},
- "Encargos de Deprecia\u00e7\u00e3o, Amortiza\u00e7\u00e3o e Exaust\u00e3o": {},
- "Fundo de Aposentadoria Programada Individual de Empregados Ligados \u00e0 Produ\u00e7\u00e3o de Servi\u00e7os": {},
- "Loca\u00e7\u00e3o de M\u00e3o-de-obra": {},
- "Manuten\u00e7\u00e3o e Reparo de Bens Aplicados na Produ\u00e7\u00e3o de Servi\u00e7os": {},
- "Material Aplicado na Produ\u00e7\u00e3o de Servi\u00e7os": {},
- "Outros Custos": {},
- "Outros Gastos com Pessoal Ligado \u00e0 Produ\u00e7\u00e3o de Servi\u00e7os": {},
- "Plano de Previd\u00eancia Privada de Empregados Ligados \u00e0 Produ\u00e7\u00e3o de Servi\u00e7os": {},
- "Planos de Poupan\u00e7a e Investimentos de Empregados Ligados \u00e0 Produ\u00e7\u00e3o de Servi\u00e7os": {},
- "Presta\u00e7\u00e3o de Servi\u00e7o Pessoa Jur\u00eddica": {},
- "Presta\u00e7\u00e3o de Servi\u00e7os por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio": {},
- "Remunera\u00e7\u00e3o a Dirigentes ligados \u00e0 Produ\u00e7\u00e3o de Servi\u00e7os": {},
- "Royalties e Assist\u00eancia T\u00e9cnica \u2013 EXTERIOR": {},
- "Royalties e Assist\u00eancia T\u00e9cnica \u2013 PA\u00cdS": {},
- "Servi\u00e7os Prestados Pessoa Jur\u00eddica": {},
- "Servi\u00e7os Prestados por Cooperativa de Trabalho": {},
- "Servi\u00e7os Prestados por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio": {}
- }
- },
- "root_type": "Expense"
- },
- "PASSIVO": {
- "CIRCULANTE": {
- "OBRIGA\u00c7\u00d5ES DE CURTO PRAZO": {
- "(-) Contas Retificadoras": {},
- "Adiantamentos de Clientes": {},
- "Arrendamento Mercantil (Financeiro) a Curto Prazo - Exterior": {},
- "Arrendamento Mercantil (Financeiro) a Curto Prazo - Sistema Financeiro Nacional": {},
- "Contribui\u00e7\u00f5es Previdenci\u00e1rias a Recolher": {},
- "Dividendos Propostos ou Lucros Creditados": {},
- "Doa\u00e7\u00f5es e Subven\u00e7\u00f5es para Investimentos": {},
- "D\u00e9bitos Fiscais CSLL \u2013 Diferen\u00e7as Tempor\u00e1rias": {},
- "D\u00e9bitos Fiscais IRPJ \u2013 Diferen\u00e7as Tempor\u00e1rias": {},
- "FGTS a Recolher": {},
- "Financiamentos a Curto Prazo - Exterior": {},
- "Financiamentos a Curto Prazo - Outros": {},
- "Financiamentos a Curto Prazo - Sistema Financeiro Nacional": {},
- "Fornecedores": {
- "account_type": "Payable"
- },
- "ICMS e Contribui\u00e7\u00f5es a Recolher": {},
- "IPI a Recolher": {},
- "Outras Contas": {},
- "Outros tributos a recolher": {},
- "PIS e COFINS a Recolher": {},
- "Provis\u00e3o para a Contribui\u00e7\u00e3o Social sobre o Lucro L\u00edquido": {},
- "Provis\u00e3o para o Imposto de Renda": {},
- "Provis\u00f5es de Natureza C\u00edvel": {},
- "Provis\u00f5es de Natureza Fiscal": {},
- "Provis\u00f5es de Natureza Trabalhista": {},
- "Sal\u00e1rios a Pagar": {},
- "Tributos Municipais a Recolher": {}
- }
- },
- "N\u00c3O-CIRCULANTE": {
- "OBRIGA\u00c7\u00d5ES A LONGO PRAZO": {
- "(-) Contas Retificadoras": {},
- "Arrendamento Mercantil (Financeiro) a Longo Prazo - Sistema Financeiro Nacional": {},
- "Arrendamento Mercantil (Financeiro) a Longo Prazo \u2013 Exterior": {},
- "Cr\u00e9ditos de Pessoas Ligadas (F\u00edsicas/Jur\u00eddicas)": {},
- "Doa\u00e7\u00f5es e Subven\u00e7\u00f5es para Investimentos": {},
- "D\u00e9bitos Fiscais CSLL - Diferen\u00e7as Tempor\u00e1rias": {},
- "D\u00e9bitos Fiscais IRPJ - Diferen\u00e7as Tempor\u00e1rias": {},
- "Empr\u00e9stimos de S\u00f3cios/Acionistas N\u00e3o Administradores": {},
- "Financiamentos a Longo Prazo - Sistema Financeiro Nacional": {},
- "Financiamentos a Longo Prazo \u2013 Brasil - Outros": {},
- "Financiamentos a Longo Prazo \u2013 Exterior": {},
- "Fornecedores": {
- "account_type": "Payable"
- },
- "Outras Contas": {},
- "Outras Provis\u00f5es de Natureza C\u00edvel": {},
- "Outras Provis\u00f5es de Natureza Fiscal": {},
- "Outras Provis\u00f5es de Natureza Trabalhista": {},
- "Provis\u00e3o para o Imposto de Renda sobre Lucros Diferidos": {}
- },
- "RECEITAS DIFERIDAS": {
- "(-) Custos Correspondentes \u00e0s Receitas Diferidas": {},
- "Receitas Diferidas": {}
- }
- },
- "PATRIM\u00d4NIO L\u00cdQUIDO": {
- "AJUSTES DE AVALIA\u00c7\u00c3O PATRIMONIAL": {
- "(-) Ajustes \u00e0s Normas Internacionais de Contabilidade": {},
- "Ajustes \u00e0s Normas Internacionais de Contabilidade": {}
- },
- "CAPITAL REALIZADO": {
- "(-) Capital a Integralizar de Domiciliados e Residentes no Exterior": {},
- "(-) Capital a Integralizar de Domiciliados e Residentes no Pa\u00eds": {},
- "Capital Subscrito de Domiciliados e Residentes no Exterior": {},
- "Capital Subscrito de Domiciliados e Residentes no Pa\u00eds": {}
- },
- "OUTRAS CONTAS": {
- "(-) A\u00e7\u00f5es em Tesouraria": {},
- "(-) Preju\u00edzos Acumulados": {},
- "Lucros Acumulados e/ou Saldo \u00e0 Disposi\u00e7\u00e3o da Assembl\u00e9ia": {},
- "Outras": {}
- },
- "RESERVAS": {
- "Outras Reservas": {},
- "Reserva para Aumento de Capital (Lei no 9.249/1995, art. 9o, \u00a7 9o)": {},
- "Reservas de Capital": {},
- "Reservas de Lucros": {},
- "Reservas de Lucros - Doa\u00e7\u00f5es e Subven\u00e7\u00f5es para Investimentos": {},
- "Reservas de Lucros - Pr\u00eamio na Emiss\u00e3o de Deb\u00eantures": {},
- "Reservas de Reavalia\u00e7\u00e3o": {}
- }
- },
- "PATRIM\u00d4NIO SOCIAL": {
- "FUNDO PATRIMONIAL": {
- "Fundo Patrimonial": {}
- },
- "OUTRAS CONTAS": {
- "D\u00e9ficits Acumulados": {},
- "Super\u00e1vits Acumulados": {}
- },
- "RESERVAS": {
- "Reservas Estatut\u00e1rias": {},
- "Reservas Patrimoniais": {}
- }
- },
- "root_type": "Liability"
- },
- "RESULTADO L\u00cdQUIDO DO PER\u00cdODO": {
- "PROVIS\u00c3O PARA CSLL E IRPJ (ATIVIDADE RURAL)": {
- "PROVIS\u00c3O PARA CSLL E IRPJ": {
- "PROVIS\u00c3O PARA CSLL E IRPJ": {
- "PROVIS\u00c3O PARA CSLL E IRPJ": {
- "(-) Contribui\u00e7\u00e3o Social sobre o Lucro L\u00edquido": {},
- "(-) Provis\u00e3o para Imposto de Renda - Pessoa Jur\u00eddica": {}
- }
- }
- }
- },
- "PROVIS\u00c3O PARA CSLL E IRPJ (ATIVIDADES EM GERAL)": {
- "PROVIS\u00c3O PARA CSLL E IRPJ": {
- "PROVIS\u00c3O PARA CSLL E IRPJ": {
- "PROVIS\u00c3O PARA CSLL E IRPJ": {
- "(-) Contribui\u00e7\u00e3o Social sobre o Lucro L\u00edquido": {},
- "(-) Provis\u00e3o para Imposto de Renda - Pessoa Jur\u00eddica": {}
- }
- }
- }
- },
- "RESULTADO ANTES DO IRPJ E DA CSLL - ATIVIDADE RURAL": {
- "PARTICIPA\u00c7\u00d5ES": {
- "PARTICIPA\u00c7\u00d5ES NOS LUCROS": {
- "OUTRAS PARTICIPA\u00c7\u00d5ES": {
- "(-) Outras": {},
- "(-) Participa\u00e7\u00f5es de Administradores e Partes Benefici\u00e1rias": {},
- "(-) Participa\u00e7\u00f5es de Deb\u00eantures": {}
- },
- "PARTICIPA\u00c7\u00d5ES DE EMPREGADOS": {
- "(-) Contribui\u00e7\u00f5es para Assist\u00eancia ou Previd\u00eancia de Empregados": {},
- "(-) Outras Participa\u00e7\u00f5es de Empregados": {},
- "(-) Participa\u00e7\u00f5es de Empregados": {}
- }
- }
- },
- "RESULTADO OPERACIONAL DA ATIVIDADE RURAL": {
- "CUSTO DOS BENS E SERVI\u00c7OS VENDIDOS": {
- "CUSTO DOS PRODUTOS DA ATIVIDADE RURAL VENDIDOS": {
- "AJUSTES DE ESTOQUES DECORRENTES DE ARBITRAMENTO": {},
- "Custo dos Produtos Vendidos da Atividade Rural": {}
- }
- },
- "DESPESAS OPERACIONAIS": {
- "DESPESAS OPERACIONAIS DA ATIVIDADE RURAL": {
- "Alimenta\u00e7\u00e3o do Trabalhador": {},
- "Alugu\u00e9is": {},
- "Arrendamento Mercantil": {},
- "Assist\u00eancia M\u00e9dica, Odontol\u00f3gica e Farmac\u00eautica a Empregados": {},
- "Bens de Natureza Permanente Deduzidos como Despesa": {},
- "CPMF": {},
- "Cofins": {},
- "Demais Impostos, Taxas e Contribui\u00e7\u00f5es, exceto IR e CSLL": {},
- "Demais Provis\u00f5es": {},
- "Despesas com Ve\u00edculos e de Conserva\u00e7\u00e3o de Bens e Instala\u00e7\u00f5es": {},
- "Despesas com viagens, di\u00e1rias e ajusta de custo": {},
- "Doa\u00e7\u00f5es a Entidades Civis": {},
- "Doa\u00e7\u00f5es a Institui\u00e7\u00f5es de Ensino e Pesquisa (Lei no 9.249/1995, art.13, \u00a7 2o)": {},
- "Doa\u00e7\u00f5es e Patroc\u00ednios de Car\u00e1ter Cultural e Art\u00edstico (Lei no 8.313/1991)": {},
- "Encargos Sociais - Previd\u00eancia Social": {},
- "Encargos Sociais \u2013 FGTS": {},
- "Encargos Sociais \u2013 Outros": {},
- "Encargos de Deprecia\u00e7\u00e3o e Amortiza\u00e7\u00e3o": {},
- "Fundo de Aposentadoria Programada Individual de Empregados": {},
- "Gratifica\u00e7\u00f5es a Administradores": {},
- "Loca\u00e7\u00e3o de M\u00e3o-de-obra": {},
- "Multas": {},
- "Ordenados, Sal\u00e1rios Gratifica\u00e7\u00f5es e Outras Remunera\u00e7\u00f5es a Empregados": {},
- "Outras Contribui\u00e7\u00f5es e Doa\u00e7\u00f5es": {},
- "Outras Despesas Operacionais": {},
- "Outros Gastos com Pessoal": {},
- "PIS/Pasep": {},
- "Perdas em Opera\u00e7\u00f5es de Cr\u00e9dito": {},
- "Pesquisas Cient\u00edficas e Tecnol\u00f3gicas": {},
- "Plano de Previd\u00eancia Privada de Empregados": {},
- "Planos de Poupan\u00e7a e Investimentos de Empregados": {},
- "Presta\u00e7\u00e3o de Servi\u00e7o Pessoa Jur\u00eddica": {},
- "Presta\u00e7\u00e3o de Servi\u00e7os por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio": {},
- "Propaganda, Publicidade e Patroc\u00ednio": {},
- "Propaganda, Publicidade e Patroc\u00ednio (Associa\u00e7\u00f5es Desportivas que Mantenham Equipe de Futebol Profissional)": {},
- "Provis\u00e3o para Perda de Estoque": {},
- "Provis\u00f5es para F\u00e9rias e 13o Sal\u00e1rio de Empregados": {},
- "Remunera\u00e7\u00e3o a Dirigentes e a Conselho de Administra\u00e7\u00e3o": {},
- "Royalties e Assist\u00eancia T\u00e9cnica \u2013 EXTERIOR": {},
- "Royalties e Assist\u00eancia T\u00e9cnica \u2013 PA\u00cdS": {},
- "Servi\u00e7os Prestados por Cooperativa de Trabalho": {}
- }
- },
- "OUTRAS DESPESAS OPERACIONAIS": {
- "OUTRAS DESPESAS OPERACIONAIS": {
- "(-) Amortiza\u00e7\u00e3o de \u00c1gio nas Aquisi\u00e7\u00f5es de Investimentos Avaliados pelo Patrim\u00f4nio L\u00edquido": {},
- "(-) Contrapartida de outros Ajustes \u00e0s Normas Internacionais de Contabilidade": {},
- "(-) Contrapartida dos Ajustes ao Valor Presente": {},
- "(-) Contrapartida dos ajustes de valor do imobilizado e intang\u00edvel": {},
- "(-) Juros sobre o Capital Pr\u00f3prio": {},
- "(-) Outras Despesas Financeiras": {},
- "(-) Perdas Incorridas no Mercado de Renda Vari\u00e1vel, exceto Day-Trade": {},
- "(-) Perdas em Opera\u00e7\u00f5es Day-Trade": {},
- "(-) Perdas em Opera\u00e7\u00f5es Realizadas no Exterior": {},
- "(-) Preju\u00edzos na Aliena\u00e7\u00e3o de Participa\u00e7\u00f5es N\u00e3o Integrantes do Ativo Permanente": {},
- "(-) Resultados Negativos em Participa\u00e7\u00f5es Societ\u00e1rias": {},
- "(-) Resultados Negativos em SCP": {},
- "(-) Varia\u00e7\u00f5es Cambiais Passivas": {}
- }
- },
- "OUTRAS RECEITAS OPERACIONAIS": {
- "OUTRAS RECEITAS OPERACIONAIS": {
- "Amortiza\u00e7\u00e3o de Des\u00e1gio nas Aquisi\u00e7\u00f5es de Investimentos Avaliados pelo Patrim\u00f4nio L\u00edquido": {},
- "Contrapartida de outros Ajustes \u00e0s Normas Internacionais de Contabilidade": {},
- "Contrapartida dos Ajustes ao Valor Presente": {},
- "Doa\u00e7\u00f5es e Subven\u00e7\u00f5es para Investimentos": {},
- "Ganhos Auferidos no Mercado de Renda Vari\u00e1vel, exceto Day-Trade": {},
- "Ganhos em Opera\u00e7\u00f5es Day-Trade": {},
- "Ganhos na Aliena\u00e7\u00e3o de Participa\u00e7\u00f5es N\u00e3o Integrantes do Ativo Permanente": {},
- "Outras Receitas Financeiras": {},
- "Outras Receitas Operacionais": {},
- "Pr\u00eamios Recebidos na Emiss\u00e3o de Deb\u00eantures": {},
- "Receitas de Juros sobre o Capital Pr\u00f3prio": {},
- "Rendimentos e Ganhos de Capital Auferidos no Exterior": {},
- "Resultados Positivos em Participa\u00e7\u00f5es Societ\u00e1rias": {},
- "Resultados Positivos em SCP": {},
- "Revers\u00e3o dos Saldos das Provis\u00f5es Operacionais": {},
- "Varia\u00e7\u00f5es Cambiais Ativas": {}
- }
- },
- "RECEITA OPERACIONAL L\u00cdQUIDA DA ATIVIDADE RURAL": {
- "DEDU\u00c7\u00d5ES DA RECEITA BRUTA": {
- "(-) Cofins": {},
- "(-) Demais Impostos e Contribui\u00e7\u00f5es Incidentes sobre Vendas e Servi\u00e7os": {},
- "(-) ICMS": {},
- "(-) ISS": {},
- "(-) PIS/Pasep": {},
- "(-) Vendas Canceladas, Devolu\u00e7\u00f5es e Descontos Incondicionais": {}
- },
- "RECEITA BRUTA DA ATIVIDADE RURAL": {
- "Receita da Atividade Rural": {}
- }
- }
- }
- },
- "RESULTADO L\u00cdQUIDO DO PER\u00cdODO ANTES DO IRPJ E DA CSLL - ATIVIDADE GERAL": {
- "OUTRAS RECEITAS E OUTRAS DESPESAS": {
- "RECEITAS E DESPESAS N\u00c3O OPERACIONAIS": {
- "DESPESAS N\u00c3O OPERACIONAIS": {
- "(-) Outras Despesas N\u00e3o Operacionais": {},
- "(-) Perdas de Capital por Varia\u00e7\u00e3o Percentual em Participa\u00e7\u00e3o Societ\u00e1ria Avaliada pelo Patrim\u00f4nio L\u00edquido": {},
- "(-) Valor Cont\u00e1bil dos Bens e Direitos Alienados": {}
- },
- "RECEITAS N\u00c3O OPERACIONAIS": {
- "Ganhos de Capital por Varia\u00e7\u00e3o Percentual em Participa\u00e7\u00e3o Societ\u00e1ria Avaliada pelo Patrim\u00f4nio L\u00edquido": {},
- "Outras Receitas N\u00e3o Operacionais": {},
- "Receitas de Aliena\u00e7\u00f5es de Bens e Direitos do Ativo Permanente": {}
- }
- }
- },
- "PARTICIPA\u00c7\u00d5ES": {
- "PARTICIPA\u00c7\u00d5ES NOS LUCROS": {
- "OUTRAS PARTICIPA\u00c7\u00d5ES": {
- "(-) Outras": {},
- "(-) Participa\u00e7\u00f5es de Administradores e Partes Benefici\u00e1rias": {},
- "(-) Participa\u00e7\u00f5es de Deb\u00eantures": {}
- },
- "PARTICIPA\u00c7\u00d5ES DE EMPREGADOS": {
- "(-) Contribui\u00e7\u00f5es para Assist\u00eancia ou Previd\u00eancia de Empregados": {},
- "(-) Outras Participa\u00e7\u00f5es de Empregados": {},
- "(-) Participa\u00e7\u00f5es de Empregados": {}
- }
- }
- },
- "RESULTADO OPERACIONAL": {
- "CUSTO DOS BENS E SERVI\u00c7OS VENDIDOS": {
- "AJUSTES DE ESTOQUES DECORRENTES DE ARBITRAMENTO": {},
- "CUSTO DAS MERCADORIAS REVENDIDAS": {
- "Custo das Mercadorias Revendidas": {},
- "Custo dos Servi\u00e7os Vendidos": {}
- },
- "CUSTO DAS UNIDADES IMOBILI\u00c1RIAS VENDIDAS": {
- "Custo das Unidades Imobili\u00e1rias Vendidas": {}
- },
- "CUSTO DOS PRODUTOS DE FABRICA\u00c7\u00c3O PR\u00d3PRIA VENDIDOS": {
- "Custo dos Produtos de Fabrica\u00e7\u00e3o Pr\u00f3pria Vendidos": {}
- }
- },
- "DESPESAS OPERACIONAIS": {
- "DESPESAS OPERACIONAIS DAS ATIVIDADES EM GERAL": {
- "Alimenta\u00e7\u00e3o do Trabalhador": {},
- "Alugu\u00e9is": {},
- "Arrendamento Mercantil": {},
- "Assist\u00eancia M\u00e9dica, Odontol\u00f3gica e Farmac\u00eautica a Empregados": {},
- "Bens de Natureza Permanente Deduzidos como Despesa": {},
- "CPMF": {},
- "Cofins": {},
- "Demais Impostos, Taxas e Contribui\u00e7\u00f5es, exceto IR e CSLL": {},
- "Demais Provis\u00f5es": {},
- "Despesas com Ve\u00edculos e de Conserva\u00e7\u00e3o de Bens e Instala\u00e7\u00f5es": {},
- "Despesas com viagens, di\u00e1rias e ajusta de custo": {},
- "Doa\u00e7\u00f5es a Entidades Civis": {},
- "Doa\u00e7\u00f5es a Institui\u00e7\u00f5es de Ensino e Pesquisa (Lei n\u00ba 9.249/1995, art.13, \u00a7 2\u00ba)": {},
- "Doa\u00e7\u00f5es e Patroc\u00ednios de Car\u00e1ter Cultural e Art\u00edstico (Lei no 8.313/1991)": {},
- "Encargos Sociais \u2013 FGTS": {},
- "Encargos Sociais \u2013 Outros": {},
- "Encargos Sociais \u2013 Previd\u00eancia Social": {},
- "Encargos de Deprecia\u00e7\u00e3o e Amortiza\u00e7\u00e3o": {},
- "Fundo de Aposentadoria Programada Individual de Empregados": {},
- "Gratifica\u00e7\u00f5es a Administradores": {},
- "Loca\u00e7\u00e3o de M\u00e3o-de-obra": {},
- "Multas": {},
- "Ordenados, Sal\u00e1rios Gratifica\u00e7\u00f5es e Outras Remunera\u00e7\u00f5es a Empregados": {},
- "Outras Contribui\u00e7\u00f5es e Doa\u00e7\u00f5es": {},
- "Outras Despesas Operacionais": {},
- "Outros Gastos com Pessoal": {},
- "PIS/Pasep": {},
- "Perdas em Opera\u00e7\u00f5es de Cr\u00e9dito": {},
- "Pesquisas Cient\u00edficas e Tecnol\u00f3gicas": {},
- "Plano de Previd\u00eancia Privada de Empregados": {},
- "Planos de Poupan\u00e7a e Investimentos de Empregados": {},
- "Presta\u00e7\u00e3o de Servi\u00e7o Pessoa Jur\u00eddica": {},
- "Presta\u00e7\u00e3o de Servi\u00e7os por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio": {},
- "Propaganda, Publicidade e Patroc\u00ednio": {},
- "Propaganda, Publicidade e Patroc\u00ednio (Associa\u00e7\u00f5es Desportivas que Mantenham Equipe de Futebol Profissional)": {},
- "Provis\u00e3o para Perda de Estoque": {},
- "Provis\u00f5es para F\u00e9rias e 13o Sal\u00e1rio de Empregados": {},
- "Remunera\u00e7\u00e3o a Dirigentes e a Conselho de Administra\u00e7\u00e3o": {},
- "Royalties e Assist\u00eancia T\u00e9cnica \u2013 EXTERIOR": {},
- "Royalties e Assist\u00eancia T\u00e9cnica \u2013 PA\u00cdS": {},
- "Servi\u00e7os Prestados por Cooperativa de Trabalho": {}
- }
- },
- "OUTRAS DESPESAS OPERACIONAIS": {
- "OUTRAS DESPESAS OPERACIONAIS": {
- "(-) Amortiza\u00e7\u00e3o de \u00c1gio nas Aquisi\u00e7\u00f5es de Investimentos Avaliados pelo Patrim\u00f4nio L\u00edquido": {},
- "(-) Contrapartida de outros Ajustes \u00e0s Normas Internacionais de Contabilidade": {},
- "(-) Contrapartida dos Ajustes ao Valor Presente": {},
- "(-) Contrapartida dos Ajustes de Valor do Imobilizado e Intang\u00edvel": {},
- "(-) Juros sobre o Capital Pr\u00f3prio": {},
- "(-) Outras Despesas Financeiras": {},
- "(-) Perdas Incorridas no Mercado de Renda Vari\u00e1vel, exceto Day-Trade": {},
- "(-) Perdas em Opera\u00e7\u00f5es Day-Trade": {},
- "(-) Perdas em Opera\u00e7\u00f5es Realizadas no Exterior": {},
- "(-) Preju\u00edzos na Aliena\u00e7\u00e3o de Participa\u00e7\u00f5es N\u00e3o Integrantes do Ativo Permanente": {},
- "(-) Resultados Negativos em Participa\u00e7\u00f5es Societ\u00e1rias": {},
- "(-) Resultados Negativos em SCP": {},
- "(-) Varia\u00e7\u00f5es Cambiais Passivas": {}
- }
- },
- "OUTRAS RECEITAS OPERACIONAIS": {
- "OUTRAS RECEITAS OPERACIONAIS": {
- "Amortiza\u00e7\u00e3o de Des\u00e1gio nas Aquisi\u00e7\u00f5es de Investimentos Avaliados pelo Patrim\u00f4nio L\u00edquido": {},
- "Contrapartida de outros Ajustes \u00e0s Normas Internacionais de Contabilidade": {},
- "Contrapartida dos Ajustes ao Valor Presente": {},
- "Doa\u00e7\u00f5es e Subven\u00e7\u00f5es para Investimentos": {},
- "Ganhos Auferidos no Mercado de Renda Vari\u00e1vel, exceto Day-Trade": {},
- "Ganhos em Opera\u00e7\u00f5es Day-Trade": {},
- "Ganhos na Aliena\u00e7\u00e3o de Participa\u00e7\u00f5es N\u00e3o Integrantes do Ativo Permanente": {},
- "Outras Receitas Financeiras": {},
- "Outras Receitas Operacionais": {},
- "Pr\u00eamios Recebidos na Emiss\u00e3o de Deb\u00eantures": {},
- "Receitas de Juros sobre o Capital Pr\u00f3prio": {},
- "Rendimentos e Ganhos de Capital Auferidos no Exterior": {},
- "Resultados Positivos em Participa\u00e7\u00f5es Societ\u00e1rias": {},
- "Resultados Positivos em SCP": {},
- "Revers\u00e3o dos Saldos das Provis\u00f5es Operacionais": {},
- "Varia\u00e7\u00f5es Cambiais Ativas": {}
- }
- },
- "RECEITA LIQUIDA": {
- "DEDU\u00c7\u00d5ES DA RECEITA BRUTA": {
- "(-) Cofins": {},
- "(-) Demais Impostos e Contribui\u00e7\u00f5es Incidentes sobre Vendas e Servi\u00e7os": {},
- "(-) ICMS": {},
- "(-) ISS": {},
- "(-) PIS/Pasep": {},
- "(-) Vendas Canceladas, Devolu\u00e7\u00f5es e Descontos Incondicionais": {}
- },
- "RECEITA BRUTA": {
- "Outras": {},
- "Receita da Presta\u00e7\u00e3o de Servi\u00e7os \u2013 Mercado Interno": {},
- "Receita da Revenda de Mercadorias no Mercado Interno": {},
- "Receita da Venda no Mercado Interno de Produtos de Fabrica\u00e7\u00e3o Pr\u00f3pria": {},
- "Receita das Unidades Imobili\u00e1rias Vendidas": {},
- "Receita de Exporta\u00e7\u00e3o Direta de Mercadorias e Produtos": {},
- "Receita de Exporta\u00e7\u00e3o de Servi\u00e7os": {},
- "Receita de Loca\u00e7\u00e3o de Bens M\u00f3veis e Im\u00f3veis": {},
- "Receita de Vendas de Mercadorias e Produtos a Comercial Exportadora com Fim Espec\u00edfico de Exporta\u00e7\u00e3o": {}
- }
- }
- }
- },
- "root_type": "Income"
- },
- "SUPER\u00c1VIT/D\u00c9FICIT L\u00cdQUIDO DO PER\u00cdODO": {
- "OUTRAS RECEITAS E DESPESAS": {
- "RECEITAS E DESPESAS N\u00c3O OPERACIONAIS": {
- "RECEITAS E DESPESAS N\u00c3O OPERACIONAIS": {
- "DESPESAS N\u00c3O OPERACIONAIS": {
- "(-) Outras Despesas N\u00e3o Operacionais": {},
- "(-) Valor Cont\u00e1bil dos Bens e Direitos Alienados": {}
- },
- "RECEITAS N\u00c3O OPERACIONAIS": {
- "Outras Receitas N\u00e3o Operacionais": {},
- "Receitas de Aliena\u00e7\u00f5es de Bens e Direitos do Ativo Permanente.": {}
- }
- }
- }
- },
- "RESULTADO OPERACIONAL": {
- "CUSTO DOS PRODUTOS E SERVI\u00c7OS VENDIDOS": {
- "CUSTO DOS PRODUTOS VENDIDOS": {
- "CUSTO DOS PRODUTOS VENDIDOS PARA AS DEMAIS ATIVIDADES": {
- "Custos dos Produtos Vendidos em Geral": {},
- "Outros Custos": {}
- },
- "CUSTO DOS PRODUTOS VENDIDOS PARA ASSIST\u00caNCIA SOCIAL": {
- "Custos dos Produtos para Assist\u00eancia Social - Gratuidades": {},
- "Custos dos Produtos para Assist\u00eancia Social - Vendidos": {},
- "Outras": {}
- },
- "CUSTO DOS PRODUTOS VENDIDOS PARA EDUCA\u00c7\u00c3O": {
- "Custos dos Produtos para Educa\u00e7\u00e3o - Gratuidades": {},
- "Custos dos Produtos para Educa\u00e7\u00e3o - Vendidos": {},
- "Outros Custos": {}
- },
- "CUSTO DOS PRODUTOS VENDIDOS PARA SA\u00daDE": {
- "Custos dos Produtos para Sa\u00fade - Gratuidades": {},
- "Custos dos Produtos para Sa\u00fade \u2013 Vendidos": {},
- "Outros Custos": {}
- }
- },
- "CUSTO DOS SERVI\u00c7OS PRESTADOS": {
- "CUSTO DOS SERVI\u00c7OS PRESTADOS PARA AS DEMAIS ATIVIDADES": {
- "Custo dos Servi\u00e7os Prestados em Geral": {},
- "Outros Custos": {}
- },
- "CUSTO DOS SERVI\u00c7OS PRESTADOS PARA ASSIST\u00caNCIA SOCIAL": {
- "Custo dos Servi\u00e7os Prestados a Conv\u00eanios/Contratos/Parcerias": {},
- "Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es": {},
- "Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas": {},
- "Custo dos Servi\u00e7os Prestados a Gratuidade": {},
- "Custo dos Servi\u00e7os Prestados a Pacientes Particulares": {},
- "Outros Custos": {}
- },
- "CUSTO DOS SERVI\u00c7OS PRESTADOS PARA EDUCA\u00c7\u00c3O": {
- "Custo dos Servi\u00e7os Prestados a Alunos N\u00e3o Bolsistas": {},
- "Custo dos Servi\u00e7os Prestados a Conv\u00eanios/Contratos/Parcerias (Exceto PROUNI)": {},
- "Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es": {},
- "Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas": {},
- "Custo dos Servi\u00e7os Prestados a Gratuidade": {},
- "Custo dos Servi\u00e7os Prestados ao PROUNI": {},
- "Outros Custos": {}
- },
- "CUSTO DOS SERVI\u00c7OS PRESTADOS PARA SA\u00daDE": {
- "Custo dos Servi\u00e7os Prestados a Conv\u00eanios SUS": {},
- "Custo dos Servi\u00e7os Prestados a Conv\u00eanios/Contratos/Parcerias": {},
- "Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es": {},
- "Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas": {},
- "Custo dos Servi\u00e7os Prestados a Gratuidade": {},
- "Custo dos Servi\u00e7os Prestados a Pacientes Particulares": {},
- "Outros Custos": {}
- }
- }
- },
- "DESPESAS OPERACIONAIS": {
- "DESPESAS OPERACIONAIS": {
- "DESPESAS OPERACIONAIS": {
- "Alugu\u00e9is": {},
- "Arrendamento Mercantil": {},
- "Assist\u00eancia M\u00e9dica, Odontol\u00f3gica, Medicamentos, Aparelhos Ortop\u00e9dicos e Similares": {},
- "COFINS": {},
- "CPMF": {},
- "CSLL": {},
- "Contribui\u00e7\u00f5es Previdenci\u00e1rias Patronais": {},
- "Demais Impostos, Taxas e Contribui\u00e7\u00f5es, exceto as citadas acima.": {},
- "Demais Provis\u00f5es": {},
- "Despesas com Ve\u00edculos e de Conserva\u00e7\u00e3o de Bens e Instala\u00e7\u00f5es": {},
- "Doa\u00e7\u00f5es a Entidades Civis": {},
- "Doa\u00e7\u00f5es a Institui\u00e7\u00f5es de Ensino e Pesquisa (Lei no 9.249/1995, art.13, \u00a7 2o)": {},
- "Doa\u00e7\u00f5es e Patroc\u00ednios de Car\u00e1ter Cultural e Art\u00edstico (Lei no 8.313/1991)": {},
- "Encargos de Deprecia\u00e7\u00e3o e Amortiza\u00e7\u00e3o": {},
- "FGTS (sem indeniza\u00e7\u00e3o 40%)": {},
- "Indeniza\u00e7\u00f5es Trabalhistas": {},
- "Multas": {},
- "Outras Contribui\u00e7\u00f5es e Doa\u00e7\u00f5es": {},
- "Outras Despesas Operacionais": {},
- "PIS/PASEP": {},
- "Presta\u00e7\u00e3o de Servi\u00e7o por Pessoa Jur\u00eddica": {},
- "Presta\u00e7\u00e3o de Servi\u00e7os por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio": {},
- "Propaganda e Publicidade": {},
- "Provis\u00f5es para F\u00e9rias e 13o Sal\u00e1rio de Empregados": {},
- "Remunera\u00e7\u00e3o a Dirigentes e a Conselho de Administra\u00e7\u00e3o/Fiscal": {},
- "Remunera\u00e7\u00f5es a Empregados": {},
- "Repasses para Outras Entidades (Sindicatos/Federa\u00e7\u00f5es/Confedera\u00e7\u00f5es)": {}
- }
- }
- },
- "OUTRAS DESPESAS OPERACIONAIS": {
- "OUTRAS DESPESAS OPERACIONAIS": {
- "OUTRAS DESPESAS OPERACIONAIS": {
- "(-) Outras Despesas de Aplica\u00e7\u00f5es": {},
- "(-) Perdas Incorridas no Mercado de Renda Vari\u00e1vel, exceto Day-Trade": {},
- "(-) Perdas em Opera\u00e7\u00f5es Day-Trade": {},
- "(-) Perdas em Opera\u00e7\u00f5es Realizadas no Exterior": {},
- "(-) Preju\u00edzos na Aliena\u00e7\u00e3o de Participa\u00e7\u00f5es N\u00e3o Integrantes do Ativo Permanente": {},
- "(-) Resultados Negativos em Participa\u00e7\u00f5es Societ\u00e1rias": {},
- "(-) Varia\u00e7\u00f5es Cambiais Passivas": {},
- "Outras Despesas Operacionais": {}
- }
- }
- },
- "OUTRAS RECEITAS OPERACIONAIS": {
- "OUTRAS RECEITAS OPERACIONAIS": {
- "OUTRAS RECEITAS OPERACIONAIS": {
- "Ganhos Auferidos no Mercado de Renda Vari\u00e1vel, exceto Day-Trade": {},
- "Ganhos em Opera\u00e7\u00f5es Day-Trade": {},
- "Ganhos na Aliena\u00e7\u00e3o de Participa\u00e7\u00f5es N\u00e3o Integrantes do Ativo Permanente": {},
- "Outras": {},
- "Outras Receitas Operacionais": {},
- "Outras Receitas de Aplica\u00e7\u00f5es Financeiras": {},
- "Rendimentos e Ganhos de Capital Auferidos no Exterior": {},
- "Resultados Positivos em Participa\u00e7\u00f5es Societ\u00e1rias": {},
- "Revers\u00e3o dos Saldos das Provis\u00f5es Operacionais": {},
- "Varia\u00e7\u00f5es Cambiais Ativas": {}
- }
- }
- },
- "RECEITA OPERACIONAL L\u00cdQUIDA": {
- "RECEITA BRUTA": {
- "DEDU\u00c7\u00d5ES DA RECEITA BRUTA": {
- "(-) Devolu\u00e7\u00f5es e Descontos Incondicionais": {},
- "(-) Vendas Canceladas": {},
- "Outras": {}
- },
- "RECEITA DE PRESTA\u00c7\u00c3O DOS SERVI\u00c7OS": {
- "Contribui\u00e7\u00f5es": {},
- "Doa\u00e7\u00f5es": {},
- "Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas": {},
- "Outras": {},
- "Servi\u00e7os Educacionais": {}
- },
- "RECEITA DE SERVI\u00c7OS DE SA\u00daDE": {
- "Contribui\u00e7\u00f5es": {},
- "Conv\u00eanios \u2013 Outros": {},
- "Conv\u00eanios \u2013 SUS": {},
- "Doa\u00e7\u00f5es": {},
- "Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas": {},
- "Outras": {},
- "Pacientes Particulares": {}
- },
- "RECEITA DE VENDA DE PRODUTOS": {
- "Da atividade de Assist\u00eancia Social": {},
- "Da atividade de Educa\u00e7\u00e3o": {},
- "Da atividade de Sa\u00fade": {},
- "Outras": {}
- },
- "RECEITAS DE OUTRAS ATIVIDADES": {
- "Contribui\u00e7\u00f5es Confederativas/Associativas": {},
- "Contribui\u00e7\u00f5es Sindicais": {},
- "Doa\u00e7\u00f5es/Subven\u00e7\u00f5es": {},
- "Mensalidades": {},
- "Outras": {},
- "Outras Contribui\u00e7\u00f5es": {}
- },
- "RECEITAS DE SERVI\u00c7OS DE ASSIST\u00caNCIA SOCIAL": {
- "Contribui\u00e7\u00f5es": {},
- "Conv\u00eanios - Outros": {},
- "Doa\u00e7\u00f5es": {},
- "Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas": {},
- "Outras": {},
- "Pacientes Particulares": {}
- }
- }
- }
- },
- "root_type": ""
- }
- }
-}
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_fr_chart_template_fr.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_fr_chart_template_fr.json
deleted file mode 100644
index de3ad67..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/ca_ca_fr_chart_template_fr.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
- "country_code": "ca",
- "name": "Canada - Plan comptable pour les provinces francophones",
- "tree": {
- "ACTIF": {
- "ACTIFS COURANTS": {
- "CERTIFICATS DE D\u00c9P\u00d4TS": {},
- "COMPTES CLIENTS": {
- "Comptes clients": {
- "account_type": "Receivable"
- },
- "PROVISION POUR CR\u00c9ANCES DOUTEUSES": {}
- },
- "ENCAISSE": {},
- "FRAIS PAY\u00c9S D'AVANCE": {},
- "IMP\u00d4TS \u00c0 RECEVOIR": {
- "TPS \u00e0 recevoir": {},
- "TVH \u00e0 recevoir": {
- "TVH \u00e0 recevoir - 13%": {},
- "TVH \u00e0 recevoir - 14%": {},
- "TVH \u00e0 recevoir - 15%": {}
- },
- "TVP/TVQ \u00e0 recevoir": {}
- },
- "PLACEMENTS D\u00c9TENUS \u00c0 DES FINS DE TRANSACTION": {},
- "STOCKS": {
- "Stock": {},
- "Stock exp\u00e9di\u00e9 non-factur\u00e9": {}
- },
- "TR\u00c9SORERIE OU \u00c9QUIVALENTS DE TR\u00c9SORERIE": {}
- },
- "ACTIFS NON-COURANTS": {
- "IMMOBILISATIONS CORPORELLES": {
- "AMORTISSEMENTS CUMUL\u00c9S": {}
- },
- "IMMOBILISATIONS INCORPORELLES": {
- "BREVETS, MARQUES DE COMMERCE ET DROITS D'AUTEURS": {}
- },
- "PLACEMENTS DISPONIBLES \u00c0 LA VENTE": {}
- },
- "root_type": "Asset"
- },
- "CAPITAUX PROPRES": {
- "AUTRES \u00c9L\u00c9MENTS DU R\u00c9SULTAT GLOBAL": {},
- "B\u00c9N\u00c9FICES NON R\u00c9PARTIS": {},
- "CAPITAL-ACTIONS": {},
- "DIVIDENDES": {},
- "PRIMES": {},
- "SURPLUS D'APPORT": {},
- "root_type": "Equity",
- "\u00c9CARTS DE CONVERSION": {}
- },
- "CHARGES": {
- "CHARGES D'EXPLOITATION": {
- "AUTRES FRAIS D'EXPLOITATION": {},
- "CO\u00dbT DES PRODUITS VENDUS": {
- "Achats": {},
- "Achats dans des provinces harmonis\u00e9es": {},
- "Achats dans des provinces non-harmonis\u00e9es": {},
- "Achats \u00e0 l'\u00e9tranger": {}
- },
- "FRAIS DE RECHERCHE ET D\u00c9VELOPPEMENT": {},
- "FRAIS G\u00c9N\u00c9RAUX": {},
- "FRAIS SUR VENTE": {},
- "SALAIRES ET CHARGES SOCIALES": {
- "Assurance Emploi": {},
- "Assurance parentale": {},
- "Fonds des services de sant\u00e9": {},
- "Imp\u00f4t f\u00e9d\u00e9ral": {},
- "Imp\u00f4t provincial": {},
- "Normes du travail": {},
- "Rentes": {},
- "Salaires": {},
- "Sant\u00e9 et s\u00e9curit\u00e9 au travail": {},
- "Vacances": {}
- }
- },
- "FRAIS NON LI\u00c9S \u00c0 L'EXPLOITATION": {
- "AUTRES FRAIS NON LI\u00c9S \u00c0 L'EXPLOITATION": {},
- "INT\u00c9R\u00caTS D\u00c9BITEURS": {}
- },
- "root_type": "Expense"
- },
- "PASSIF": {
- "PASSIFS COURANTS": {
- "AUTRES COMPTES CR\u00c9DITEURS": {},
- "DETTES FINANCI\u00c8RES COURANTES": {},
- "FOURNISSEURS ET COMPTES RATTACH\u00c9S": {
- "Comptes fournisseurs": {
- "account_type": "Payable"
- }
- },
- "IMP\u00d4TS LI\u00c9S AUX SALAIRES \u00c0 PAYER": {
- "AGENCE DU REVENU DU CANADA": {
- "ASSURANCE EMPLOI \u00c0 PAYER": {
- "AE - Contribution de l'employeur": {},
- "AE - Contribution des employ\u00e9s": {}
- },
- "Imp\u00f4t f\u00e9d\u00e9ral sur les revenus": {}
- },
- "AGENCE DU REVENU PROVINCIAL": {
- "ASSURANCE PARENTALE \u00c0 PAYER": {
- "AP - Contribution de l'employeur": {},
- "AP - Contribution des employ\u00e9s": {}
- },
- "Fond des Services de Sant\u00e9 \u00e0 payer": {},
- "Imp\u00f4t provincial sur les revenus": {},
- "Normes du Travail \u00e0 payer": {},
- "RENTES \u00c0 PAYER": {
- "Rentes - Contribution de l'employeur": {},
- "Rentes - Contribution des employ\u00e9s": {}
- },
- "Sant\u00e9 et S\u00e9curit\u00e9 au Travail \u00e0 payer": {}
- }
- },
- "IMP\u00d4TS \u00c0 PAYER": {
- "TPS \u00e0 payer": {},
- "TVH \u00e0 payer": {
- "TVH \u00e0 payer - 13%": {},
- "TVH \u00e0 payer - 14%": {},
- "TVH \u00e0 payer - 15%": {}
- },
- "TVP/TVQ \u00e0 payer": {}
- },
- "PASSIFS DE STOCK": {
- "Stock re\u00e7u non factur\u00e9": {}
- },
- "PASSIFS LI\u00c9S AUX ACTIFS D\u00c9TENUS EN VUE DE LEUR CESSION": {}
- },
- "PASSIFS NON-COURANTS": {
- "AUTRES PASSIFS NON-COURANTS": {},
- "DETTES FINANCI\u00c8RES NON-COURANTES": {},
- "IMP\u00d4TS DIFF\u00c9R\u00c9S": {},
- "PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POST\u00c9RIEURS \u00c0 L'EMPLOI": {}
- },
- "root_type": "Liability"
- },
- "PRODUITS": {
- "PRODUITS D'EXPLOITATION": {
- "AUTRES PRODUITS D'EXPLOITATION": {},
- "Ventes": {},
- "Ventes avec des provinces harmonis\u00e9es": {},
- "Ventes avec des provinces non-harmonis\u00e9es": {},
- "Ventes \u00e0 l'\u00e9tranger": {}
- },
- "PRODUITS NON LI\u00c9S \u00c0 L'EXPLOITATION": {
- "AUTRES PRODUITS NON LI\u00c9S \u00c0 L'EXPLOITATION": {},
- "INT\u00c9R\u00caTS": {}
- },
- "root_type": "Income"
- }
- }
-}
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_chart_de_skr04.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_chart_de_skr04.json
deleted file mode 100644
index 5ff76e6..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/de_l10n_chart_de_skr04.json
+++ /dev/null
@@ -1,1686 +0,0 @@
-{
- "country_code": "de",
- "name": "Germany - Kontenplan SKR04",
- "tree": {
- "Bilanz - Aktiva": {
- "Anlageverm\u00f6gen": {
- "Anlageverm\u00f6gen Immaterielle Verm\u00f6gensgegenst\u00e4nde": {
- "Geleistete Anzahlungen": {
- "Anzahlungen auf Gesch\u00e4fts- oder Firmenwert": {},
- "Geleistete Anzahlungen auf immaterielle Verm\u00f6gensgegenst\u00e4nde": {}
- },
- "Gesch\u00e4fts- oder Firmenwert": {
- "Gesch\u00e4fts- oder Firmenwert": {}
- },
- "Konzessionen- gewerbliche Schutzrechte und \u00e4hnliche Rechte und Werte sowie Lizenzen an solchen Rechten und Werten": {
- "Konzessionen- gewerbliche Schutzrechte und \u00e4hnliche Rechte und Werte sowie Lizenzen an solchen Rechten und Werten": {
- "EDV-Software": {},
- "Gewerbliche Schutzrechte": {},
- "Konzessionen ": {},
- "Lizenzen an gewerblichen Schutzrechten und \u00e4hnlichen Rechten und Werten ": {},
- "\u00e4hnliche Rechte und Werte ": {}
- }
- },
- "Verschmelzungsmehrwert": {
- "Verschmelzungsmehrwert": {}
- }
- },
- "Aufwendungen f\u00fcr die Ingangsetzung und Erweiterung des Gesch\u00e4ftsbetriebs": {
- "Aufwendungen f\u00fcr die Ingangsetzung und Erweiterung des Gesch\u00e4ftsbetriebs": {
- "Aufwendungen f\u00fcr die Ingangsetzung und Erweiterung des Gesch\u00e4ftsbetriebs": {}
- },
- "Aufwendungen f\u00fcr die W\u00e4hrungsumstellung auf den Euro": {
- "Aufwendungen f\u00fcr die W\u00e4hrungsumstellung auf den Euro": {}
- }
- },
- "Ausstehende Einlagen auf das gezeichnete Kapital": {
- "Ausstehende Einlagen auf das gezeichnete Kapital": {
- "Ausstehende Einlagen auf das gezeichnete Kapital- eingefordert (Aktivausweis)": {},
- "Ausstehende Einlagen auf das gezeichnete Kapital- nichteingefordert (Aktivausweis)": {}
- },
- "Sonstige Aktiva oder sonstige Passiva": {
- "Ausstehende Einlagen auf das Kommandit-Kapital- eingefordert": {},
- "Ausstehende Einlagen auf das Kommandit-Kapital- nicht eingefordert": {},
- "Ausstehende Einlagen auf das Komplement\u00e4r-Kapital- eingefordert": {},
- "Ausstehende Einlagen auf das Komplement\u00e4r-Kapital- nicht eingefordert": {}
- }
- },
- "Finanzanlagen": {
- "Anteile an verbundenen Unternehmen": {
- "Anteile an herrschender oder mit Mehrheit beteiligter Gesellschaft": {},
- "Anteile an verbundenen Unternehmen": {}
- },
- "Ausleihungen an Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
- "Ausleihungen an Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht": {}
- },
- "Ausleihungen an verbundene Unternehmen": {
- "Ausleihungen an verbundene Unternehmen": {}
- },
- "Beteiligungen": {
- "Beteiligungen": {
- "Andere Beteilgungen an Personengesellschaften": {},
- "Andere Beteiligungen an Kapitalgesellschaften": {},
- "Atypisch stille Beteiligungen": {},
- "Beteiligungen einer GmbH Co. KG an einer Komplement\u00e4r GmbH": {},
- "Typisch stille Beteiligungen": {}
- }
- },
- "Genossenschaftsanteile": {
- "Genossenschaftsanteile zum langfristigen Verbleib": {}
- },
- "R\u00fcckdeckungsanspr\u00fcche aus Lebensversicherungen": {
- "R\u00fcckdeckungsanspr\u00fcche aus Lebensversicherungen zum langfristigen Verbleib": {}
- },
- "Sonstige Ausleihungen": {
- "Sonstige Ausleihungen": {
- "Ausleihungen an Gesellschafter": {},
- "Ausleihungen an nahe stehende Personen": {},
- "Darlehen": {}
- }
- },
- "Wertpapiere des Anlageverm\u00f6gens": {
- "Wertpapiere des Anlageverm\u00f6gens": {
- "Festverzinsliche Wertpapiere": {},
- "Wertpapiere mit Gewinnbeteiligungsanspr\u00fcchen- die dem Halbeink\u00fcnfteverfahren unterliegen": {}
- }
- }
- },
- "Sachanlagen": {
- "Andere Anlagen- Betriebs- und Gesch\u00e4ftsaustattung": {
- "Andere Anlagen- Betriebs- und Gesch\u00e4ftsaustattung": {
- "Andere Anlagen ": {},
- "B\u00fcroeinrichtungen": {},
- "Einbauten in fremde Grundst\u00fccke": {},
- "Geringwertige Wirtschaftsg\u00fcter bis 410 Euro": {},
- "Ger\u00fcst- und Schalungsmaterial": {},
- "Ladeneinrichtungen": {},
- "Lkw": {},
- "Pkw": {},
- "Sonstige Betriebs- und Gesch\u00e4ftsausstattung": {},
- "Sonstige Transportmittel": {},
- "Werkzeuge": {}
- }
- },
- "Geleistete Anzahlungen und Anlagen im Bau": {
- "Geleistete Anzahlungen und Anlagen im Bau": {
- "Andere Anlagen- Betriebs- und Gesch\u00e4ftsaustattung im Bau": {},
- "Anzahlungen auf Gesch\u00e4fts- Fabrik- und andere Bauten auf fremden Grundst\u00fccken": {},
- "Anzahlungen auf Gesch\u00e4fts- Fabrik-und andere Bauten auf eigenen Grundst\u00fccken und grundst\u00fccksgleichen Rechten ": {},
- "Anzahlungen auf Grundst\u00fccke und grundst\u00fccksgleiche Rechte ohne Bauten": {},
- "Anzahlungen auf Wohnbauten auf eigenen Grundst\u00fccken und grundst\u00fccksgleichen Rechten": {},
- "Anzahlungen auf Wohnbauten auf fremden Grundst\u00fccken ": {},
- "Anzahlungen auf andere Anlagen- Betriebs und Gesch\u00e4ftsausstattung": {},
- "Anzahlungen auf technische Anlagen und Maschinen": {},
- "Gesch\u00e4fts- Fabrik- und andere Bauten im Bau auf eingenen Grundst\u00fccken": {},
- "Gesch\u00e4fts- Fabrik- und andere Bauten im Bau auf fremden Grundst\u00fccken": {},
- "Technische Anlagen und Maschinen im Bau ": {},
- "Wohnbauten im Bau": {}
- }
- },
- "Grundst\u00fccke- grundst\u00fccksgleiche Rechte und Bauten einschlie\u00dflich der Bauten auf fremden Grundst\u00fccken": {
- "Grundst\u00fccke- grundst\u00fccksgleiche Rechte und Bauten einschlie\u00dflich der Bauten auf fremden Grundst\u00fccken": {
- "Andere Bauten": {},
- "Au\u00dfenanlagen": {},
- "Au\u00dfenanlagen ": {},
- "Au\u00dfenanlagen f\u00fcr Gesch\u00e4fts- Fabrik- und andere Bauten ": {},
- "Bauten auf eigenen Grundst\u00fccken und grundst\u00fccksgleichen Rechten": {},
- "Bauten auf fremden Grundst\u00fccken": {},
- "Einrichtungen f\u00fcr Gesch\u00e4fts-Fabrik und andere Bauten": {},
- "Einrichtungen f\u00fcr Wohnbauten": {},
- "Fabrikbauten": {},
- "Garagen": {},
- "Geb\u00e4udeteile des h\u00e4uslischen Arbeitszimmers": {},
- "Gesch\u00e4ftsbauten": {},
- "Grundst\u00fccke mit Substanzverzehr": {},
- "Grundst\u00fccke und grundst\u00fccksgleiche Rechte ohne Bauten": {},
- "Grundst\u00fccksanteil des h\u00e4uslichen Arbeitszimmers": {},
- "Grundst\u00fccksgleiche Rechte (Erbbaurecht- Dauerwohnrecht)": {},
- "Grundst\u00fcckswerte eigener bebauter Grundst\u00fccke": {},
- "Hof- und Wegebefestigungen": {},
- "Unbebaute Grundst\u00fccke": {},
- "Wohnbauten": {}
- }
- },
- "Technische Anlagen und Maschinen": {
- "Technische Anlagen und Maschinen": {
- "Betriebsvorrichtungen": {},
- "Maschinen": {},
- "Maschinen gebundene Werkzeuge": {},
- "Technische Anlagen ": {}
- }
- }
- }
- },
- "Umlaufverm\u00f6gen": {
- "Abgrenzungsposten": {
- "Abgrenzung latenter Steuern": {
- "Abgrenzung aktive latente Steuern ": {}
- },
- "Rechnungsabgrenzungsposten": {
- "Aktive Rechnungsabgrenzung": {
- "Als Aufwand ber\u00fccksichtigte Umstazsteuer auf Anzahlungen": {},
- "Als Aufwand ber\u00fccksichtigte Z\u00f6lle und Verbrauchsteuern auf Vorr\u00e4te": {},
- "Damnum/Disagio": {}
- }
- }
- },
- "Forderungen und sonstige Verm\u00f6gensgegenst\u00e4nde": {
- "Eingeforderte Nachsch\u00fcsse": {
- "Eingeforderte Nachsch\u00fcsse (gegenkonto 2929)": {}
- },
- "Eingeforderte- noch ausstehende Kapitaleinlagen": {
- "Ausstehende Einlagen auf das gezeichnete Kapital- eingefordert (Forderungen- nicht eingeforderte ausstehende Einlagen s. Konto 2910)": {}
- },
- "Forderungen aus Lieferungen und Leistungen H-Saldo": {
- "Einzelwertberechtigungen zu Forderungen mit einer Restlaufzeit bis zu 1 Jahr": {},
- "Einzelwertberechtigungen zu Forderungen mit einer Restlaufzeit von mehr als 1 Jahr": {},
- "Gegenkonto zu sonstigen Verm\u00f6gensgegenst\u00e4nden bei Buchungen \u00fcber Debitorenkonto": {},
- "Pauschalwertberichtigung zu Forderung mit einer Restlaufzeit bis zu 1 Jahr": {},
- "Pauschalwertberichtigung zu Forderung mit einer Restlaufzeit von mehr als 1 Jahr": {}
- },
- "Forderungen aus Lieferungen und Leistungen H-Saldo oder sonstige Verbindlichkeiten S-Saldo": {
- "Gegenkonto 1221-1229- 1240-1245- 1250-1257- 1270-1279- 1290-1297 bei Aufteilung Debitorenkonto": {}
- },
- "Forderungen aus Lieferungen und Leistungen oder sonstige Verbindlichkeiten": {
- "Forderungen aus Lieferungen und Leistungen ": {
- "Forderungen aus Dienstleistungen": {
- "account_type": "Receivable"
- },
- "Forderungen aus Lieferungen und Leistungen nach Durchschnittss\u00e4tzen gem\u00e4\u00df \u00a724 UStG (E\u00fcR)": {
- "account_type": "Receivable"
- },
- "Forderungen aus Lieferungen und Leistungen ohne Kontokorent": {},
- "Forderungen aus Lieferungen und Leistungen ohne Kontokorent - Restlaufzeit bis 1 Jahr": {},
- "Forderungen aus Lieferungen und Leistungen ohne Kontokorent - Restlaufzeit gr\u00f6\u00dfer 1 Jahr.": {},
- "Forderungen aus Lieferungen und Leistungen zum allgemeinen Umsatzsteuersatz oder eines Kleinunternehmers (E\u00fcR)": {
- "account_type": "Receivable"
- },
- "Forderungen aus Lieferungen und Leistungen zum erm\u00e4\u00dfigten Umsatzsteuersatz (E\u00fcR)": {
- "account_type": "Receivable"
- },
- "Forderungen aus steuerfreien oder nicht steuerbaren Lieferungen und Leistungen (E\u00fcR)": {
- "account_type": "Receivable"
- },
- "Forderungen nach \u00a711 Abs. 1 Satz 2 EStG f\u00fcr \u00a7 4/3 EStG": {
- "account_type": "Receivable"
- },
- "Gegenkonto 1215-1218 bei Aufteilung der Forderungen nach Steuers\u00e4tzen (E\u00fcR)": {
- "account_type": "Receivable"
- },
- "Wechsel aus Lieferungen und Leistungen": {},
- "Wechsel aus Lieferungen und Leistungen Restlaufzeit bis 1 Jahr": {},
- "Wechsel aus Lieferungen und Leistungen Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
- "Wechsel aus Lieferungen und Leistungen- bundesbankf\u00e4hig.": {},
- "Zweifelhafte Forderungen": {},
- "Zweifelhafte Forderungen - Restlaufzeit bis 1 Jahr": {},
- "Zweifelhafte Forderungen - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {}
- },
- "Forderungen aus Lieferungen und Leistungen gegen Gesellschafter": {
- "account_type": "Receivable"
- },
- "Forderungen aus Lieferungen und Leistungen gegen Gesellschafter - Restlaufzeit bis 1 Jahr": {},
- "Forderungen aus Lieferungen und Leistungen gegen Gesellschafter - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {}
- },
- "Forderungen gegen Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht H-Saldo": {
- "is_group": 1
- },
- "Forderungen gegen verbundene Unternehmen H-Saldo": {
- "Wertberichtigungen zu Forderungen mit einer Restlaufzeit bis zu 1 Jahr gegen verbundene Unternehmen": {},
- "Wertberichtigungen zu Forderungen mit einer Restlaufzeit von mehr als 1 Jahr gegen verbundene Unternehmen": {}
- },
- "Forderungen gegen verbundene Unternehmen oder Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen": {
- "Forderungen gegen verbundene Unternehmen ": {
- "Besitzwechsel gegen verbundene Unternehmen": {},
- "Besitzwechsel gegen verbundene Unternehmen - Restlaufzeit bis 1 Jahr": {},
- "Besitzwechsel gegen verbundene Unternehmen - Restlaufzeit gr\u00f6\u00dfer Jahr": {},
- "Besitzwechsel gegen verbundene Unternehmen- bundesbankf\u00e4hig": {},
- "Forderungen aus Lieferungen und Leistungen gegen verbundenen Unternehmen": {
- "account_type": "Receivable"
- },
- "Forderungen aus Lieferungen und Leistungen gegen verbundenen Unternehmen - Restlaufzeit bis 1 Jahr": {},
- "Forderungen aus Lieferungen und Leistungen gegen verbundenen Unternehmen - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
- "Forderungen gegen verbundene Unternehmen - Restlaufzeit bis 1 Jahr. ": {},
- "Forderungen gegen verbundene Unternehmen - Restlaufzeit gr\u00f6\u00dfer 1 Jahr. ": {}
- }
- },
- "Sonstige Verbindlichkeiten S-Saldo": {
- "Verrechnungskonto erhaltene Anzahlungen bei Buchungen \u00fcber Debitorenkonto": {}
- },
- "Sonstige Verm\u00f6gensgegenst\u00e4nde": {
- "Agenturwarenabrechnung": {},
- "Anspr\u00fcche aus R\u00fcckdeckungsversicherungen": {},
- "Forderungen an das Finanzamt aus abgef\u00fchrtem Bauabzugsbetrag": {},
- "Forderungen aus einrichteten Verbrauchsteuern": {},
- "Genossenschaftsanteile zum kurzfristigen Verbleib": {},
- "GmbH-Anteile zum kurzfristigen Verbleib": {},
- "K\u00f6rperschaftsteuerguthaben nach \u00a7 37 KStG - Restlaufzeit bis 1 Jahr": {},
- "K\u00f6rperschaftsteuerguthaben nach \u00a7 37 KStG - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
- "K\u00f6rperschaftsteuerr\u00fcckforderung": {},
- "Sonstige Verm\u00f6gensgegenst\u00e4nde": {
- "Darlehen": {},
- "Darlehen - Restlaufzeit bis 1 jahr": {},
- "Darlehen - Restlaufzeit gr\u00f6\u00dfer 1 jahr": {},
- "Forderung gegen Aufsichtsrats- und Beirats- Mitglieder": {},
- "Forderung gegen Aufsichtsrats- und Beirats- Mitglieder - Restlaufzeit bis 1 Jahr": {},
- "Forderung gegen Aufsichtsrats- und Beirats- Mitglieder - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
- "Forderungen gegen Gesellschafter": {},
- "Forderungen gegen Gesellschafter - Restlaufzeit bis 1 Jahr": {},
- "Forderungen gegen Gesellschafter - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
- "Forderungen gegen Personal aus Lohn- und Gehaltsabrechnung": {},
- "Forderungen gegen Personal aus Lohn- und Gehaltsabrechnung - Restlaufzeit bis 1 Jahr": {},
- "Forderungen gegen Personal aus Lohn- und Gehaltsabrechnung - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
- "Forderungen gegen Vorstandsmitglieder und Gesch\u00e4ftsf\u00fchrer": {},
- "Forderungen gegen Vorstandsmitglieder und Gesch\u00e4ftsf\u00fchrer - Restlaufzeit bis 1 Jahr": {},
- "Forderungen gegen Vorstandsmitglieder und Gesch\u00e4ftsf\u00fchrer - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
- "Kautionen ": {},
- "Kautionen - Restlaufzeit bis 1 Jahr": {},
- "Kautionen - Restlaufzeit gr\u00f6\u00dfer 1 Jar": {},
- "Sonstige Verm\u00f6gensgegenst\u00e4nde - Restlaufzeit bis 1 Jahr": {},
- "Sonstige Verm\u00f6gensgegenst\u00e4nde - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {}
- },
- "Steuererstattungsanspruch gegen\u00fcber andere EG-L\u00e4ndern": {},
- "Steuer\u00fcberzahlungen": {},
- "Umsatzsteuerforderung": {},
- "Umsatzsteuerforderungen Vorjahr": {},
- "Umsatzsteuerforderungen fr\u00fchere Jahre": {}
- },
- "Sonstige Verm\u00f6gensgegenst\u00e4nde oder sonstige Verbindlichkeiten": {
- "Abziehbare Vorsteuer": {},
- "Abziehbare Vorsteuer 16%": {},
- "Abziehbare Vorsteuer 19%": {},
- "Abziehbare Vorsteuer 7%": {},
- "Abziehbare Vorsteuer aus der Auslagerung von Gegenst\u00e4nden aus einem Unsatzsteuerlager": {},
- "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb": {},
- "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb 16%": {},
- "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb 19%": {},
- "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb von Neufahrzeugen von Lieferanten ohne Ust-Identifikationsnummer": {},
- "Abziehbare Vorsteuer nach \u00a7 13b UStG ": {},
- "Abziehbare Vorsteuer nach \u00a7 13b UStG 16%": {},
- "Abziehbare Vorsteuer nach \u00a7 13b UStG 19%": {},
- "Aufl\u00f6sung Vorsteuer aus Vorjahr \u00a7 4/3 EStG": {},
- "Aufzuteilende Vorsteuer": {},
- "Aufzuteilende Vorsteuer 16%": {},
- "Aufzuteilende Vorsteuer 19%": {},
- "Aufzuteilende Vorsteuer 7%": {},
- "Aufzuteilende Vorsteuer aus innergemeinschaftlichem Erwerb": {},
- "Aufzuteilende Vorsteuer aus innergemeinschaftlichem Erwerb 19%": {},
- "Aufzuteilende Vorsteuer nach \u00a7\u00a7 13a/13b UStG": {},
- "Aufzuteilende Vorsteuer nach \u00a7\u00a7 13a/13b UStG 16%": {},
- "Aufzuteilende Vorsteuer nach \u00a7\u00a7 13a/13b UStG 19%": {},
- "Bezahlte Einfuhrumsatzsteuer": {},
- "Durchlaufende Posten": {},
- "Fremdgeld": {},
- "Gegenkonto Vorsteuer \u00a7 4/3 EStG": {},
- "Gegenkonto f\u00fcr Vorsteuer nach Durchschnittss\u00e4tzen f\u00fcr \u00a7 4 Abs. 3 EStG": {},
- "Geldtransit": {},
- "Nachtr\u00e4glich abziehbare Vorsteuer- \u00a7 15a Abs. 1 UStG- bewegliche Wirtschaftsg\u00fcter": {},
- "Nachtr\u00e4glich abziehbare Vorsteuer- \u00a7 15a Abs. 2 UStG": {},
- "Nat\u00fcrlich abziehbare Vorsteuer- \u00a7 15a Abs. 1 UStG- unbewegliche Wirtschaftsg\u00fcter": {},
- "Umsatzsteuerforderungen laufendes Jahr": {},
- "Verrechnungskonto Gewinnermittlung \u00a7 4/3 EStG- ergebniswirksam": {},
- "Verrechnungskonto Gewinnermittlung \u00a7 4/3 EStG- nicht ergebniswirksam": {},
- "Verrechnungskonto Ist-Versteuerung": {},
- "Vorsteuer aus Investitionen \u00a7 4/3 EStG": {},
- "Vorsteuer im Folgejahr abziehbar": {},
- "Vorsteuer nach allgemeinen Durchschnittss\u00e4tzen UStVA Kz. 63": {},
- "Wirtschaftsg\u00fcter des Umlaufverm\u00f6gens gem\u00e4\u00df \u00a74 Abs. 3 Satz 4 EStG": {},
- "Zur\u00fcckzahlende Vorsteuer- \u00a7 15a Abs. 1 UStG- unbewegliche Wirtschaftsg\u00fcter": {},
- "Zur\u00fcckzuzahlende Vorsteuer- \u00a7 15a Abs. 1 UStG- bewegliche Wirtschaftsg\u00fcter": {},
- "Zur\u00fcckzuzahlende Vorsteuer- \u00a7 15a Abs. 2 UStG": {},
- "\u00fcberleitungskonto Kostenstellen": {}
- }
- },
- "Kassenbestand- Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks": {
- "Kassenbestand - Bundesbankguthaben - Guthaben b. Kreditinstit. u. Schecks o. Verbindlichk. geg. Kreditinstituten": {
- "Bank": {},
- "Bank 1": {},
- "Bank 2": {},
- "Bank 3": {},
- "Bank 4": {},
- "Bank 5": {},
- "Bundesbankguthaben": {},
- "Finanzmittelanlagen im Rahmen der Kurzfristigen Finanzdisposition": {},
- "LZB-Guthaben": {},
- "Postbank": {},
- "Postbank 1": {},
- "Postbank 2": {},
- "Postbank 3": {},
- "Verbindlichkeiten gegen\u00fcber Kreditinstituten (nicht im Finanzmittelfonds enthalten)": {}
- },
- "Kassenbestand- Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks": {
- "Kasse ": {
- "Nebenkasse 1": {},
- "Nebenkasse 2": {}
- },
- "Schecks": {}
- }
- },
- "Vorr\u00e4te": {
- "Erhaltene Anzahlungen auf Bestellungen": {
- "Erhaltene Anzahlungen auf Bestellungen (": {}
- },
- "Fertige Erzeugnisse und Waren": {
- "* Lager Bestand Zwischenkonto": {},
- "* Lager Bestandswert Korrektur": {},
- "* Lager Differenzkorrektur Gewinn / Verlust": {},
- "* Lager Differenzkorrektur Marktwert": {},
- "Fertige Erzeugnisse (Bestand)": {},
- "Fertige Erzeugnisse und Waren (Bestand)": {},
- "Waren (Bestand)": {}
- },
- "Geleistete Anzahlungen ": {
- "Geleistete Anzahlungen auf Vorr\u00e4te": {
- "Geleistete Anzahlungen 15% Vorsteuer": {},
- "Geleistete Anzahlungen 16% Vorsteuer": {},
- "Geleistete Anzahlungen 19% Vorsteuer": {},
- "Geleistete Anzahlungen 7% Vorsteuer": {}
- }
- },
- "In Arbeit befindliche Auftr\u00e4ge ": {
- "In Arbeit befindliche Auftr\u00e4ge ": {}
- },
- "In Ausf\u00fchrung befindliche Bauauftr\u00e4ge": {
- "In Ausf\u00fchrung befindliche Bauauftr\u00e4ge": {}
- },
- "Roh- Hilfs- und Betriebsstoffe": {
- "Roh- Hilfs- und Betriebsstoffe (Bestand)": {}
- },
- "Unfertige Erzeugnisse- unfertige Leistungen": {
- "Unfertige Erzeugnisse": {},
- "Unfertige Erzeugnisse- unfertige Leistungen (Bestand)": {},
- "Unfertige Leistungen": {}
- }
- },
- "Wertpapiere": {
- "Anteile an verbundenen Unternehmen": {
- "Anteile an herrschender oder mit Mehrheit beteiligter Gesellschaft": {},
- "Anteile an verbundenen Unternehmen (Umlaufverm\u00f6gen)": {}
- },
- "Eigene Anteile ": {
- "Eigene Anteile ": {}
- },
- "Sonstige Wertpapiere": {
- "Sonstige Wertpapiere": {
- "Andere Wertpapiere mit unwesentlichen Wertschwankungen im Sinne Textziffer 18 DRS 2": {},
- "Finanzwechsel": {},
- "Wertpapieranlagen im Rahmen der Kurzfristigen Finanzdisposition ": {}
- }
- }
- }
- },
- "root_type": "Asset"
- },
- "Bilanz - Passiva": {
- "Eigenkapital": {
- "Gewinnr\u00fccklagen": {
- "Andere Gewinnr\u00fccklagen": {
- "Andere Gewinnr\u00fccklagen ": {
- "Eigenkapitalanteil von Wertaufholungen": {}
- }
- },
- "Gesetzliche R\u00fccklagen": {
- "Gesetzliche R\u00fccklagen": {}
- },
- "R\u00fccklage f\u00fcr Eigene Anteile": {
- "R\u00fccklage f\u00fcr Eigene Anteile": {}
- },
- "Satzungsm\u00e4\u00dfige R\u00fccklagen": {
- "Satzungsm\u00e4\u00dfige R\u00fccklagen": {}
- }
- },
- "Gewinnvortrag / Verlustvortrag vor Verwendung": {
- "Gewinnvortrag / Verlustvortrag": {
- "Gewinnvortrag vor Verwendung": {},
- "Verlustvortrag vor Verwendung": {}
- },
- "Vortrag auf neue Rechnung ": {
- "Vortrag auf neue Rechnung (Bilanz)": {}
- }
- },
- "Gezeichnetes Kapital": {
- "Gezeichnetes Kapital": {
- "Gezeichnetes Kapital": {}
- },
- "Nicht eingeforderte ausstehende Einlagen": {
- "is_group": 1
- }
- },
- "Kapital Teilhaber": {
- "(zur freien Verf\u00fcgung )": {},
- "Gesellschafter-Darlehen": {},
- "Kommandit-Kapital": {},
- "Verlustausgleichskonto": {}
- },
- "Kapital Vollhafter / Einzelunternehmer": {
- "(zur freien Verf\u00fcgung )": {},
- "Festkapital": {},
- "Gesellschafter-Darlehen": {},
- "Variables Kapital": {}
- },
- "Kapitalr\u00fccklage": {
- "Kapitalr\u00fccklage": {
- "Kapitalr\u00fccklage": {
- "Andere Zuzahlungen in das Eigenkapital ": {},
- "Eingefordertes Nachschusskapital (Gegenkonto 1299)": {},
- "Kapitalr\u00fccklage durch Ausgabe von Anteilen \u00fcber Nennbetrag": {},
- "Kapitalr\u00fccklage durch Ausgabe von Schuldverschreibungen f\u00fcr Wandlungsrechte und Optionsrechte zum Erwerb von Anteilen": {},
- "Kapitalr\u00fccklage durch Zuzahlungen gegen Gew\u00e4hrung eines Vorzugs f\u00fcr Anteile": {}
- }
- }
- },
- "Privat Teilhafter": {
- "Ausgew\u00f6hnliche Belastungen": {},
- "Grundst\u00fccksaufwand": {},
- "Grundst\u00fccksertrag": {},
- "Privateinlagen": {},
- "Privatentnahmen allgemein": {},
- "Privatsteuern": {},
- "Sonderausgaben beschr\u00e4nkt abzugsf\u00e4hig": {},
- "Sonderausgaben unbeschr\u00e4nkt abzugsf\u00e4hig ": {},
- "Unentgeltliche Wertabgaben": {},
- "Zuwendungen- Spenden": {}
- },
- "Privat Vollhafter/ Einzelunternehmer": {
- "Ausgew\u00f6hnliche Belastungen": {},
- "Grundst\u00fccksaufwand": {},
- "Grundst\u00fccksaufwand (Umsatzsteuerschl\u00fcssel m\u00f6glich)": {},
- "Grundst\u00fccksertrag": {},
- "Grundst\u00fccksertrag ( Umsatzsteuerschl\u00fcssel m\u00f6glich)": {},
- "Privateinlagen": {},
- "Privatentnahmen allgemein": {},
- "Privatsteuern": {},
- "Sonderausgaben beschr\u00e4nkt abzugsf\u00e4hig": {},
- "Sonderausgaben unbeschr\u00e4nkt abzugsf\u00e4hig ": {},
- "Unentgeltliche Wertabgaben": {},
- "Zuwendungen- Spenden": {}
- },
- "Sonderposten mit R\u00fccklageanteil": {
- "Sonderposten aus der W\u00e4hrungsumstellung auf den Euro": {
- "Sonderposten aus der W\u00e4hrungsumstellung auf den Euro": {}
- },
- "Sonderposten f\u00fcr Zusch\u00fcsse und Zulagen": {
- "Sonderposten f\u00fcr Zusch\u00fcsse und Zulagen": {}
- },
- "Sonderposten mit R\u00fccklageanteil": {
- "Sonderposten mit R\u00fccklageanteil f\u00fcr F\u00f6rderung nach \u00a7 3 ZonenRFG / \u00a74-6 F\u00f6rdergebietsG": {},
- "Sonderposten mit R\u00fccklageanteil nach Abschnitt 35 EStG": {},
- "Sonderposten mit R\u00fccklageanteil nach \u00a7 1 EntwLStG": {},
- "Sonderposten mit R\u00fccklageanteil nach \u00a7 14 BerlinFG": {},
- "Sonderposten mit R\u00fccklageanteil nach \u00a7 4d EStG": {},
- "Sonderposten mit R\u00fccklageanteil nach \u00a7 52 Abs. 16 EStG": {},
- "Sonderposten mit R\u00fccklageanteil nach \u00a7 6b EStG": {},
- "Sonderposten mit R\u00fccklageanteil nach \u00a7 6d EStG": {},
- "Sonderposten mit R\u00fccklageanteil nach \u00a7 79 EStDV": {},
- "Sonderposten mit R\u00fccklageanteil nach \u00a7 7d EStG": {},
- "Sonderposten mit R\u00fccklageanteil nach \u00a7 7g Abs. 1 EStG": {},
- "Sonderposten mit R\u00fccklageanteil nach \u00a7 7g Abs. 3 u. 7 EStG": {},
- "Sonderposten mit R\u00fccklageanteil nach \u00a7 80 EStDV": {},
- "Sonderposten mit R\u00fccklageanteil nach \u00a7 82a EStDV": {},
- "Sonderposten mit R\u00fccklageanteil nach \u00a7 82d EStDV": {},
- "Sonderposten mit R\u00fccklageanteil nach \u00a7 82e EStDV": {},
- "Sonderposten mit R\u00fccklageanteil steuerfreie R\u00fccklagen": {},
- "Sonderposten mit R\u00fccklageanteil- Sonderabschreibung": {}
- }
- }
- },
- "Fremdkapital": {
- "Rechnungsabgrenzungsposten": {
- "Rechnungsabgrenzungsposten": {
- "Passive Rechnungsabgrenzung": {}
- },
- "Sonstige Passiva oder sontige Aktiva": {
- "Abgrenzungen zur unterj\u00e4hrigen Kostenverrechnung f\u00fcr BWA": {}
- }
- },
- "R\u00fcckstellungen ": {
- "R\u00fcckstellungen f\u00fcr Pensionen und \u00e4hnliche Verpflichtungen": {
- "R\u00fcckstellungen f\u00fcr Pensionen und \u00e4hnliche Verpflichtungen": {
- "Pensionsr\u00fcckstellungen": {},
- "R\u00fcckstellungen f\u00fcr Pensions\u00e4hnliche Verpflichtungen": {}
- }
- },
- "Sonstige R\u00fcckstellungen": {
- "Sonstige R\u00fcckstellungen": {
- "Aufwandsr\u00fcckstellungen gem\u00e4\u00df \u00a7 249 Abs. 2 HGB": {},
- "R\u00fcckstellungen f\u00fcr Abraum- und Abfallbeseitigung": {},
- "R\u00fcckstellungen f\u00fcr Abschluss- und Pr\u00fcfungskosten": {},
- "R\u00fcckstellungen f\u00fcr Gew\u00e4hrleistungen (Gegenkonto 6790)": {},
- "R\u00fcckstellungen f\u00fcr Personelkosten": {},
- "R\u00fcckstellungen f\u00fcr Umweltschutz": {},
- "R\u00fcckstellungen f\u00fcr drohende Verluste aus schwebenden Gesch\u00e4ften": {},
- "R\u00fcckstellungen f\u00fcr unterlassene Aufwendungenn f\u00fcr Instandhaltung- Nachholung in den ersten drei Monaten": {},
- "R\u00fcckstellungen f\u00fcr unterlassene Aufwendungenn f\u00fcr Instandhaltung- Nachholung innerhalb des 4. bis 12. Monats": {},
- "R\u00fcckstellungen zur Erf\u00fcllung der Aufbewahrungspflichten": {}
- }
- },
- "Steuerr\u00fcckstellungen": {
- "Steuerr\u00fcckstellungen": {
- "Gewerbesteuerr\u00fcckstellung": {},
- "K\u00f6rperschaftsteuerr\u00fcckstellung": {},
- "R\u00fcckstellung f\u00fcr latente Steuern ": {}
- }
- }
- },
- "Verbindlichkeiten ": {
- "Anleihen": {
- "Anleihen- nicht konvertibel": {
- "Anleihen- konvertibel": {},
- "Anleihen- konvertibel Restlaufzeit 1 bis 5 Jahre": {},
- "Anleihen- konvertibel Restlaufzeit bis 1 Jahr": {},
- "Anleihen- konvertibel Restlaufzeit gr\u00f6\u00dfer 5 Jahr": {},
- "Anleihen- nicht konvertibel Restlaufzeit 1 bis 5 Jahre": {},
- "Anleihen- nicht konvertibel Restlaufzeit bis 1 Jahr": {},
- "Anleihen- nicht konvertibel Restlaufzeit gr\u00f6\u00dfer 5 Jahre ": {}
- }
- },
- "Erhaltene Anzahlungen auf Bestellungen": {
- "Erhaltene Anzahlungen auf Bestellungen": {
- "Erhaltene Anzahlungen 15% USt": {},
- "Erhaltene Anzahlungen 16% USt": {},
- "Erhaltene Anzahlungen 7% USt": {},
- "Erhaltene Anzahlungen Restlaufzeit 1 bis 5 Jahre": {},
- "Erhaltene Anzahlungen Restlaufzeit bis 1 Jahr": {},
- "Erhaltene Anzahlungen Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
- "Erhaltene- versteuerte Anzahlungen 19% Ust (Verbindlichkeiten)": {}
- }
- },
- "Sonstige Verbindlichkeiten ": {
- "Sonstige Verbindlichkeiten": {
- "(frei- in Bilanz kein Restlaufzeit vermerkt)": {},
- "Agenturwarenabrechnungen": {},
- "Darlehen": {},
- "Darlehen - Restlaufzeit 1 bis 5 jahre": {},
- "Darlehen - Restlaufzeit bis 1 jahr": {},
- "Darlehen - Restlaufzeit gr\u00f6\u00dfer 5 jahre": {},
- "Darlehen atypisch stiller Gesellschaftler ": {},
- "Darlehen atypisch stiller Gesellschaftler - Restlaufzeit 1 bis 5 Jahre": {},
- "Darlehen atypisch stiller Gesellschaftler - Restlaufzeit bis 1 Jahr": {},
- "Darlehen atypisch stiller Gesellschaftler - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
- "Darlehen typisch stiller Gesellschaftler": {},
- "Darlehen typisch stiller Gesellschaftler - Restlaufzeit 1 bis 5 Jahre": {},
- "Darlehen typisch stiller Gesellschaftler - Restlaufzeit bis 1 Jahr": {},
- "Darlehen typisch stiller Gesellschaftler - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
- "Erhaltene Kautionen": {},
- "Erhaltene Kautionen - Restlaufzeit 1 bis 5 Jahre": {},
- "Erhaltene Kautionen - Restlaufzeit bis 1 Jahr": {},
- "Erhaltene Kautionen - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
- "Gegenkonto 3500-3569 bei Aufteilung der Konten 3570-3598": {},
- "Kreditkartenabrechnung": {},
- "Partiarische Darlehen": {},
- "Partiarische Darlehen - Restlaufzeit 1 bis 5 Jahre": {},
- "Partiarische Darlehen - Restlaufzeit bis 1 Jahr": {},
- "Partiarische Darlehen - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
- "Sonstige Verbindlichkeiten - Restlaufzeit 1 bis 5 Jahre": {},
- "Sonstige Verbindlichkeiten - Restlaufzeit bis 1 Jahr": {},
- "Sonstige Verbindlichkeiten - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
- "Sonstige Verbindlichkeiten z.B. nach \u00a7 11 Abs. 2 Satz 2 EStG f\u00fcr \u00a7 4/3 EStG": {},
- "Verbindlichkeiten gegen\u00fcber Gesellschaftern ": {},
- "Verbindlichkeiten gegen\u00fcber Gesellschaftern - Restlaufzeit 1 bis 5 Jahre": {},
- "Verbindlichkeiten gegen\u00fcber Gesellschaftern - Restlaufzeit bis 1 Jahr": {},
- "Verbindlichkeiten gegen\u00fcber Gesellschaftern - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
- "Verbindlichkeiten gegen\u00fcber Gesellschaftern f\u00fcr offene Aussch\u00fcttungen": {}
- },
- "Steuerzahlungen an andere EG-L\u00e4nder": {},
- "Umsatzsteuer aus im anderen EG-Land steuerpflichtigen Lieferungen": {},
- "Umsatzsteuer aus im anderen EG-Land steuerpflichtigen sonstigen Leistungen/Werlieferungen": {},
- "Verbindlichkeiten an das Finanzamt aus abzuf\u00fchrendem Bauabzugsbetrag": {},
- "Verbindlichkeiten aus Betriebssteuern und -abgaben": {},
- "Verbindlichkeiten aus Betriebssteuern und -abgaben - Restlaufzeit 1 bis 5 Jahre": {},
- "Verbindlichkeiten aus Betriebssteuern und -abgaben - Restlaufzeit bis 1 Jahr": {},
- "Verbindlichkeiten aus Betriebssteuern und -abgaben - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
- "Verbindlichkeiten aus Einbehaltungen (KapESt und Solz auf KapESt)": {},
- "Verbindlichkeiten aus Lohn und Gehalt": {},
- "Verbindlichkeiten aus Verm\u00f6gensbildung ": {},
- "Verbindlichkeiten aus Verm\u00f6gensbildung - Restlaufzeit 1 bis 5 Jahre": {},
- "Verbindlichkeiten aus Verm\u00f6gensbildung - Restlaufzeit bis 1 Jahr": {},
- "Verbindlichkeiten aus Verm\u00f6gensbildung - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
- "Verbindlichkeiten f\u00fcr Einbehaltungen von Arbeitnehmern": {},
- "Verbindlichkeiten f\u00fcr Verbrauchsteuern": {},
- "Verbindlichkeiten im Rahmen der sozialen Sicherheit": {},
- "Verbindlichkeiten im Rahmen der sozialen Sicherheit (f\u00fcr \u00a7 4/3 EStG)": {},
- "Verbindlichkeiten im Rahmen der sozialen Sicherheit - Restlaufzeit 1 bis 5 Jahre": {},
- "Verbindlichkeiten im Rahmen der sozialen Sicherheit - Restlaufzeit bis 1 Jahr": {},
- "Verbindlichkeiten im Rahmen der sozialen Sicherheit - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
- "Voraussichtliche Beitragsschuld gegen\u00fcber den Sozialversicherungstr\u00e4gern": {}
- },
- "Sonstige Verm\u00f6gensgegenst\u00e4nde H-Saldo": {
- "Verrechnungskonto geleistete Anzahlungen bei Buchung \u00fcber Kreditorenkonto": {}
- },
- "Sonstige Verm\u00f6gensgegenst\u00e4nde oder sonstige Verbindlichkeiten": {
- "Einfuhrumsatzsteuer aufgeschoben bis": {},
- "Gewinnverf\u00fcgungskonto stille Gesellschafter": {},
- "In Rechnung unrichtig oder unberechtigt ausgewiesene Steuerbetr\u00e4ge- UStVA Kz. 69": {},
- "Lohn- und Gehaltsverrechnungskonto": {
- "Lohn- und Gehaltsverrechnung \u00a7 11 Abs. 2 EStG f\u00fcr \u00a7 a Abs. 3 EStG": {}
- },
- "Nachsteuer- UStVA Kz. 65": {},
- "Sonstige Verrechnungskonten (Interimskonto)": {},
- "Umsatzsteuer": {},
- "Umsatzsteuer 16%": {},
- "Umsatzsteuer 19%": {},
- "Umsatzsteuer 7%": {},
- "Umsatzsteuer Vorjahr": {},
- "Umsatzsteuer aus der Auslagerung von Gegenst\u00e4nden aus einem Umsatzsteuerlager": {},
- "Umsatzsteuer aus im Inland steuerpflichtigen EG-Lieferungen": {},
- "Umsatzsteuer aus im Inland steuerpflichtigen EG-Lieferungen 19%": {},
- "Umsatzsteuer aus innergemeinschaftlichem Erwerb ": {},
- "Umsatzsteuer aus innergemeinschaftlichem Erwerb 16%": {},
- "Umsatzsteuer aus innergemeinschaftlichem Erwerb 19%": {},
- "Umsatzsteuer aus innergemeinschaftlichem Erwerb ohne Vorsteuerabzug": {},
- "Umsatzsteuer aus innergemeinschaftlichem Erwerb von Neufahrzeugen von Lieferanten ohne Umsatzsteuer-Identifikationsnummer": {},
- "Umsatzsteuer fr\u00fchere Jahre": {},
- "Umsatzsteuer laufendes Jahr": {},
- "Umsatzsteuer nach \u00a713b UStG": {},
- "Umsatzsteuer nach \u00a713b UStG 16%": {},
- "Umsatzsteuer nach \u00a713b UStG 19%": {},
- "Umsatzsteuer- Vorauszahlungen": {},
- "Umsatzsteuer- Vorauszahlungen 1/11": {},
- "Verbindlichkeiten aus Lohn- und Kirchensteuer": {}
- },
- "Steuerr\u00fcckstellungen oder sonstige Verm\u00f6gensgegenst\u00e4nde ": {
- "Umsatzsteuer nicht f\u00e4llig": {},
- "Umsatzsteuer nicht f\u00e4llig 16%": {},
- "Umsatzsteuer nicht f\u00e4llig 19%": {},
- "Umsatzsteuer nicht f\u00e4llig 7%": {},
- "Umsatzsteuer nicht f\u00e4llig aus im Inland steuerpflichtigen EG-Lieferungen": {},
- "Umsatzsteuer nicht f\u00e4llig aus im Inland steuerpflichtigen EG-Lieferungen 16%": {},
- "Umsatzsteuer nicht f\u00e4llig aus im Inland steuerpflichtigen EG-Lieferungen 19%": {}
- },
- "Verbindlichkeiten aus Lieferungen und Leistungen S-Saldo oder sonstige Verm\u00f6gensgegenst\u00e4nde H-Saldo": {
- "Gegenkonto 3335-3348- 3420-3449- 3470-3499 bei Aufteilung Kreditorenkonto": {}
- },
- "Verbindlichkeiten aus Lieferungen und Leistungen oder sonstige Verm\u00f6gensgegenst\u00e4nde": {
- "Verbindlichkeiten aus Lieferungen und Leistungen ": {
- "Gegenkonto 3305-3307 bei Aufteilung der Verbindlichkeiten nach Steuers\u00e4tzen (E\u00fcR)": {},
- "Lieferanten Verbindlichkeiten Dienstleistungen": {
- "account_type": "Payable"
- },
- "Verbindlichkeiten aus Lieferungen und Leistungen f\u00fcr Investitionen f\u00fcr \u00a7 4/3 EStG": {
- "account_type": "Payable"
- },
- "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber Gesellschaftern ": {
- "account_type": "Payable"
- },
- "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber Gesellschaftern Restlaufzeit 1 bis 5 Jahre": {},
- "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber Gesellschaftern Restlaufzeit bis 1 Jahr": {},
- "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber Gesellschaftern Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
- "Verbindlichkeiten aus Lieferungen und Leistungen ohne Kontokorrent ": {},
- "Verbindlichkeiten aus Lieferungen und Leistungen ohne Kontokorrent Restlaufzeit 1 bis 5 Jahre": {},
- "Verbindlichkeiten aus Lieferungen und Leistungen ohne Kontokorrent Restlaufzeit bis 1 Jahr": {},
- "Verbindlichkeiten aus Lieferungen und Leistungen ohne Kontokorrent Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
- "Verbindlichkeiten aus Lieferungen und Leistungen ohne Vorsteuer (E\u00fcR)": {
- "account_type": "Payable"
- },
- "Verbindlichkeiten aus Lieferungen und Leistungen zum allgemeinen Umsatzsteuersatz (E\u00fcR)": {
- "account_type": "Payable"
- },
- "Verbindlichkeiten aus Lieferungen und Leistungen zum erm\u00e4\u00dfigten Umsatzsteuersatz (E\u00fcR)": {
- "account_type": "Payable"
- }
- }
- },
- "Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel": {
- "Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel": {
- "Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel Restlaufzeit 1 bis 5 Jahre": {},
- "Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel Restlaufzeit bis 1 Jahr": {},
- "Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {}
- }
- },
- "Verbindlichkeiten gegen\u00fcber Kreditinstituten ": {
- "Gegenkonto 3159-3209 bei Aufteilung der Konten 3210-3248": {}
- },
- "Verbindlichkeiten gegen\u00fcber Kreditinstituten oder Kassenbestand- Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks": {
- "Verbindlichkeiten gegen\u00fcber Kreditinstituten ": {
- "(frei- in Bilanz kein Restlaufzeit vermerkt)": {},
- "Verbindlichkeiten gegen\u00fcber Kreditinstituten Restlaufzeit 1 bis 5 Jahre": {},
- "Verbindlichkeiten gegen\u00fcber Kreditinstituten Restlaufzeit bis 1 Jahr": {},
- "Verbindlichkeiten gegen\u00fcber Kreditinstituten Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
- "Verbindlichkeiten gegen\u00fcber Kreditinstituten aus Teilzahlungsvertr\u00e4gen": {},
- "Verbindlichkeiten gegen\u00fcber Kreditinstituten aus Teilzahlungsvertr\u00e4gen Restlaufzeit 1 bis 5 Jahre": {},
- "Verbindlichkeiten gegen\u00fcber Kreditinstituten aus Teilzahlungsvertr\u00e4gen Restlaufzeit bis 1 Jahr": {},
- "Verbindlichkeiten gegen\u00fcber Kreditinstituten aus Teilzahlungsvertr\u00e4gen Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {}
- }
- },
- "Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen oder Forderungen gegen verbundene Unternehmen": {
- "Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen": {
- "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber verbundenen Unternehmen": {
- "account_type": "Payable"
- },
- "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber verbundenen Unternehmen Restlaufzeit 1 bis 5 Jahre": {},
- "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber verbundenen Unternehmen Restlaufzeit bis 1 Jahr": {},
- "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber verbundenen Unternehmen Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
- "Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen Restlaufzeit 1 bis 5 Jahre": {},
- "Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen Restlaufzeit bis 1 Jahr": {},
- "Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {}
- }
- }
- }
- },
- "root_type": "Liability"
- },
- "Vortrags- Kapital- und Statistische Konten": {
- "Aufgliederung der R\u00fcckstellungen": {
- "Gegenkonto zu Konto 9260 - 9268": {},
- "Kurzfristige R\u00fcckstellungen": {},
- "Langfristige R\u00fcckstellungen- au\u00dfer Pensionen": {},
- "Mittelfristige R\u00fcckstellungen": {}
- },
- "Ausgleichsposten f\u00fcr aktivierte eigene Anteile und Bilanzierungshilfen": {
- "Ausgleichsposten f\u00fcr aktivierte Bilanzierungshilfen": {},
- "Ausgleichsposten f\u00fcr aktivierte eigene Anteile ": {}
- },
- "Eigenkapitalersetzende Gesellschafterdarlehen ": {
- "Eigenkapitalersetzende Gesellschafterdarlehen ": {},
- "Gegenkonto zu 9250 und 9255": {},
- "Ungesicherte Gesellschafterdarlehen mit Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {}
- },
- "Einzahlungsverpflichtungen im Bereich der Forderungen": {
- "Einzahlungsverpflichtungen Kommanditisten": {},
- "Einzahlungsverpflichtungen pers\u00f6nlich haftender Gesellschafter": {}
- },
- "Kapital Personenhandelsgesellschaft Teilhafter": {
- "Gesellschafter-Darlehen": {},
- "Verrechnungskonto f\u00fcr Einzahlungsverpflichtungen": {}
- },
- "Kapital Personenhandelsgesellschaft Vollhafter": {
- "Gesellschafter-Darlehen": {},
- "Verlust-/ Vortragskonto": {},
- "Verrechnungskonto f\u00fcr Einzahlungsverpflichtungen": {}
- },
- "Nicht durch Verm\u00f6genseinlagen gedeckte Entnahmen": {
- "Nicht durch Verm\u00f6genseinlagen gedeckte Entnahmen Kommanditisten": {},
- "Nicht durch Verm\u00f6genseinlagen gedeckte Entnahmen pers\u00f6nlich haftender Gesellschafter": {}
- },
- "Passive Rechnungsabgrenzung": {
- "Baukostenzusch\u00fcsse": {},
- "Forderungen aus Sachanlagenverk\u00e4ufen bei sonstigen Verm\u00f6gensgegenst\u00e4nden": {},
- "Forderungen aus Verk\u00e4ufen immaterielle Verm\u00f6gensgegenst\u00e4nde bei sonstigen Verm\u00f6gensgegenst\u00e4nden": {},
- "Forderungen aus Verk\u00e4ufen von Finanzanlagen bei sonstigen Verm\u00f6gensgegenst\u00e4nden": {},
- "Gegenkonto zu Konten 9230- 9238": {},
- "Gegenkonto zu Konto 9240-43": {},
- "Gegenkonto zu Konto 9245-47": {},
- "Investitionsverbindlichkeiten aus K\u00e4ufen von Finanzanlagen bei Leistungsverbindlichkeiten": {},
- "Investitionsverbindlichkeiten aus K\u00e4ufen von immateriellen Verm\u00f6gensgegenst\u00e4nden bei Leistungsverbindlichkeiten": {},
- "Investitionsverbindlichkeiten aus Sachanlagenk\u00e4ufen bei Leistungsverbindlichkeiten": {},
- "Investitionsverbindlichkeiten bei den Leistungsverbindlichkeiten": {},
- "Investitionszulagen ": {},
- "Investitionszusch\u00fcsse ": {}
- },
- "Privat Teilhafter (f\u00fcr Verrechnung Gesellschafterdarlehen mit Eigenkapitalcharakter- Konto 9840-9849)": {
- "Au\u00dfergew\u00f6hnliche Belastungen": {},
- "Grundst\u00fccksaufwand": {},
- "Grundst\u00fccksertrag": {},
- "Privateinlagen": {},
- "Privatentnahmen allgemein": {},
- "Privatsteuern": {},
- "Sonderausgaben beschr\u00e4nkt abzugsf\u00e4hig": {},
- "Sonderausgaben unbeschr\u00e4nkt abzugsf\u00e4hig": {},
- "Unentgeltliche Wertabgaben": {},
- "Zuwendungen- Spenden": {}
- },
- "Statistische Konten f\u00fcr 4 Abs. 3 EStG": {
- "Einlagen stiller Gesellschafter": {
- "Einlagen stiller Gesellschafter": {}
- },
- "Gegenkonto zu 9287 und 9288": {},
- "Gegenkonto zu 9290": {},
- "Gegenkonto zu 9292": {},
- "Mahngeb\u00fchren bei Buchungen \u00fcber Debitoren bei \u00a7 4 Abs. 3 EStG": {},
- "Statistisches Konto Fremdgeld": {},
- "Statistisches Konto steuerfreie Auslagen": {},
- "Steuerrechtlicher Ausgleichsposten": {
- "Steuerrechtlicher Ausgleichsposten": {}
- },
- "Zinsen bei Buchungen \u00fcber Debitoren bei \u00a7 4 Abs. 3 EStG": {}
- },
- "Statistische Konten f\u00fcr Betriebswirtschaftliche Auswertungen (BWA)": {
- "Anzahl Kreditkunden aufgelaufen": {},
- "Anzahl Kreditkunden monatlich": {},
- "Anzahl Rechnungen": {},
- "Anzahl der Barkunden": {},
- "Auftragsbestand": {},
- "Auftragseingang im Gesch\u00e4ftsjahr": {},
- "Besch\u00e4ftigte Personen": {},
- "Erweiterungsinvestitionen": {},
- "Gegenkonto f\u00fcr statistische Mengeneinheiten Konten 9101-9107 und Konten 9116-9118": {},
- "Gegenkonto zu Konten 9120- 9135-9140": {},
- "Gesch\u00e4ftsraum m2": {},
- "Unbezahlte Personen": {},
- "Verkaufskr\u00e4fte": {},
- "Verkaufsraum m2": {},
- "Verkaufstage": {}
- },
- "Statistische Konten f\u00fcr Gewinnzuschlag": {
- "Statistische Konten f\u00fcr den Gewinnzuschlag nach \u00a7\u00a7 6b- 6c und 7g EStG (Haben-Buchung)": {},
- "Statistische Konten f\u00fcr den Gewinnzuschlag- Gegenkonto zu 9890": {}
- },
- "Statistische Konten f\u00fcr den Kennziffernteil der Bilanz": {
- "Besch\u00e4ftigte Personen": {},
- "Gegenkonto zu 9200": {},
- "Gegenkonto zu 9210": {},
- "Produktive L\u00f6hne": {}
- },
- "Statistische Konten f\u00fcr die Kapitalkontenentwicklung": {
- "Anteil f\u00fcr Konto 9840-49 Teilhafter": {},
- "Anteil f\u00fcr Konto Teilhafter 0080 ": {},
- "Anteil f\u00fcr Konto Teilhafter 0081": {},
- "Anteil f\u00fcr Konto Teilhafter 0082": {},
- "Anteil f\u00fcr Konto Teilhafter 0083": {},
- "Anteil f\u00fcr Konto Teilhafter 0084": {},
- "Anteil f\u00fcr Konto Teilhafter 0085": {},
- "Anteil f\u00fcr Konto Teilhafter 0086": {},
- "Anteil f\u00fcr Konto Teilhafter 0087": {},
- "Anteil f\u00fcr Konto Teilhafter 0088": {},
- "Anteil f\u00fcr Konto Teilhafter 0089": {},
- "Anteil f\u00fcr Konto Teilhafter 2050": {},
- "Anteil f\u00fcr Konto Teilhafter 2051": {},
- "Anteil f\u00fcr Konto Teilhafter 2052": {},
- "Anteil f\u00fcr Konto Teilhafter 2053": {},
- "Anteil f\u00fcr Konto Teilhafter 2054": {},
- "Anteil f\u00fcr Konto Teilhafter 2055": {},
- "Anteil f\u00fcr Konto Teilhafter 2056": {},
- "Anteil f\u00fcr Konto Teilhafter 2057": {},
- "Anteil f\u00fcr Konto Teilhafter 2058": {},
- "Anteil f\u00fcr Konto Teilhafter 2059": {},
- "Anteil f\u00fcr Konto Teilhafter 2060": {},
- "Anteil f\u00fcr Konto Teilhafter 2061": {},
- "Anteil f\u00fcr Konto Teilhafter 2062": {},
- "Anteil f\u00fcr Konto Teilhafter 2063": {},
- "Anteil f\u00fcr Konto Teilhafter 2064": {},
- "Anteil f\u00fcr Konto Teilhafter 2065": {},
- "Anteil f\u00fcr Konto Teilhafter 2066": {},
- "Anteil f\u00fcr Konto Teilhafter 2067": {},
- "Anteil f\u00fcr Konto Teilhafter 2068": {},
- "Anteil f\u00fcr Konto Teilhafter 2069": {},
- "Anteil f\u00fcr Konto Teilhafter 2070 ": {},
- "Anteil f\u00fcr Konto Teilhafter 2071": {},
- "Anteil f\u00fcr Konto Teilhafter 2072": {},
- "Anteil f\u00fcr Konto Teilhafter 2073": {},
- "Anteil f\u00fcr Konto Teilhafter 2074": {},
- "Anteil f\u00fcr Konto Teilhafter 2075": {},
- "Anteil f\u00fcr Konto Teilhafter 2076": {},
- "Anteil f\u00fcr Konto Teilhafter 2077": {},
- "Anteil f\u00fcr Konto Teilhafter 2078": {},
- "Anteil f\u00fcr Konto Teilhafter 2079": {},
- "Anteil f\u00fcr Konto Vollhafter 0060": {},
- "Anteil f\u00fcr Konto Vollhafter 0061": {},
- "Anteil f\u00fcr Konto Vollhafter 0062": {},
- "Anteil f\u00fcr Konto Vollhafter 0063": {},
- "Anteil f\u00fcr Konto Vollhafter 0064": {},
- "Anteil f\u00fcr Konto Vollhafter 0065": {},
- "Anteil f\u00fcr Konto Vollhafter 0066": {},
- "Anteil f\u00fcr Konto Vollhafter 0067": {},
- "Anteil f\u00fcr Konto Vollhafter 0068": {},
- "Anteil f\u00fcr Konto Vollhafter 0069": {},
- "Anteil f\u00fcr Konto Vollhafter 2000": {},
- "Anteil f\u00fcr Konto Vollhafter 2001": {},
- "Anteil f\u00fcr Konto Vollhafter 2002": {},
- "Anteil f\u00fcr Konto Vollhafter 2003": {},
- "Anteil f\u00fcr Konto Vollhafter 2004": {},
- "Anteil f\u00fcr Konto Vollhafter 2005": {},
- "Anteil f\u00fcr Konto Vollhafter 2006": {},
- "Anteil f\u00fcr Konto Vollhafter 2007": {},
- "Anteil f\u00fcr Konto Vollhafter 2008": {},
- "Anteil f\u00fcr Konto Vollhafter 2009": {},
- "Anteil f\u00fcr Konto Vollhafter 2010": {},
- "Anteil f\u00fcr Konto Vollhafter 2011": {},
- "Anteil f\u00fcr Konto Vollhafter 2012": {},
- "Anteil f\u00fcr Konto Vollhafter 2013": {},
- "Anteil f\u00fcr Konto Vollhafter 2014": {},
- "Anteil f\u00fcr Konto Vollhafter 2015": {},
- "Anteil f\u00fcr Konto Vollhafter 2016": {},
- "Anteil f\u00fcr Konto Vollhafter 2017": {},
- "Anteil f\u00fcr Konto Vollhafter 2018": {},
- "Anteil f\u00fcr Konto Vollhafter 2019": {},
- "Anteil f\u00fcr Konto Vollhafter 2020": {},
- "Anteil f\u00fcr Konto Vollhafter 2021": {},
- "Anteil f\u00fcr Konto Vollhafter 2022": {},
- "Anteil f\u00fcr Konto Vollhafter 2023": {},
- "Anteil f\u00fcr Konto Vollhafter 2024": {},
- "Anteil f\u00fcr Konto Vollhafter 2025": {},
- "Anteil f\u00fcr Konto Vollhafter 2026": {},
- "Anteil f\u00fcr Konto Vollhafter 2027": {},
- "Anteil f\u00fcr Konto Vollhafter 2028": {},
- "Anteil f\u00fcr Konto Vollhafter 2029": {},
- "Anteil f\u00fcr Konto Vollhafter 9810": {},
- "Anteil f\u00fcr Konto Vollhafter 9811": {},
- "Anteil f\u00fcr Konto Vollhafter 9812": {},
- "Anteil f\u00fcr Konto Vollhafter 9813": {},
- "Anteil f\u00fcr Konto Vollhafter 9814": {},
- "Anteil f\u00fcr Konto Vollhafter 9815": {},
- "Anteil f\u00fcr Konto Vollhafter 9816": {},
- "Anteil f\u00fcr Konto Vollhafter 9817": {},
- "Anteil f\u00fcr Konto Vollhafter 9818": {},
- "Anteil f\u00fcr Konto Vollhafter 9819": {},
- "Anteil f\u00fcr Konto Vollhafter 9820 ": {},
- "Anteil f\u00fcr Konto Vollhafter 9821": {},
- "Anteil f\u00fcr Konto Vollhafter 9822": {},
- "Anteil f\u00fcr Konto Vollhafter 9823": {},
- "Anteil f\u00fcr Konto Vollhafter 9824": {},
- "Anteil f\u00fcr Konto Vollhafter 9825": {},
- "Anteil f\u00fcr Konto Vollhafter 9826": {},
- "Anteil f\u00fcr Konto Vollhafter 9827": {},
- "Anteil f\u00fcr Konto Vollhafter 9828": {},
- "Anteil f\u00fcr Konto Vollhafter 9829": {},
- "Darlehensverzinsung Teillhafter": {},
- "Darlehensverzinsung Vollhafter": {},
- "Gebrauchs\u00fcberlassung Teillhafter": {},
- "Gebrauchs\u00fcberlassung Vollhafter": {},
- "L\u00f6sch- und Korrekturschl\u00fcssel": {},
- "Name des Gesellschafters Teillhafter": {},
- "Name des Gesellschafters Vollhafter": {},
- "Restanteil Teillhafter": {},
- "Restanteil Vollhafter": {},
- "Sonstige Verg\u00fctungen Teillhafter": {},
- "Sonstige Verg\u00fctungen Vollhafter": {},
- "Tantieme Teillhafter": {},
- "Tantieme Vollhafter": {},
- "T\u00e4tigkeitsverg\u00fctung Teillhafter": {},
- "T\u00e4tigkeitsverg\u00fctung Vollhafter": {}
- },
- "Statistische Konten f\u00fcr die im Anhang anzugebenden sonstigen finanziellen Verpflichtungen": {
- "Andere Verpflichtungen gem\u00e4\u00df \u00a7 285 Nr. 3 HGB": {},
- "Andere Verpflichtungen gem\u00e4\u00df \u00a7 285 Nr. 3 HGB gegen\u00fcber verbundenen Unternehmen": {},
- "Gegenkonto zu 9281-9284": {},
- "Verpflichtungen aus Miet- und Leasingsvertr\u00e4gen": {},
- "Verpflichtungen aus Miet- und Leasingsvertr\u00e4gen gegen\u00fcber verbundenen Unternehmen": {}
- },
- "Statistische Konten f\u00fcr in der Bilanz auszuweisende Haftungsverh\u00e4ltnisse": {
- "Gegenkonto zu 9271 - 9279 (Soll-Buchung)": {},
- "Haftung aus der Bestellung von Sicherheiten f\u00fcr fremde Verbindlichkeiten": {},
- "Haftung aus der Bestellung von Sicherheiten f\u00fcr fremde Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen": {},
- "Verbindlichkeiten aus B\u00fcrgschaften- Wechsel- und Scheckb\u00fcrgschaften": {},
- "Verbindlichkeiten aus B\u00fcrgschaften- Wechsel- und Scheckb\u00fcrgschaften gegen\u00fcber verbundenen Unternehmen": {},
- "Verbindlichkeiten aus Gew\u00e4hrleistungsvertr\u00e4gen": {},
- "Verbindlichkeiten aus Gew\u00e4hrleistungsvertr\u00e4gen gegen\u00fcber verbundenen Unternehmen": {},
- "Verbindlichkeiten aus der Begebung und \u00fcbertragung von Wechseln": {},
- "Verpflichtungen aus Treuhandverm\u00f6gen": {}
- },
- "Statistische Konten zu \u00a7 4 (4a) EStG": {
- "Erh\u00f6hung der Entnahmen \u00a74 (4a) EStG": {},
- "Gegenkonto zur Erh\u00f6hung der Entnahmen \u00a74 (4a) EStG (Haben)": {},
- "Gegenkonto zur Minderung der Entnahmen \u00a74 (4a) EStG": {},
- "Minderung der Entnahmen \u00a74 (4a) EStG (Haben)": {}
- },
- "Statistische Konten zur informativen Angabe des gezeichneten Kapitals in anderer W\u00e4hrung": {
- "Gezeichnetes Kapital in DM": {
- "Gezeichnetes Kapital in DM (Art. 42 Abs. 3 S. 1 EGHGB)": {}
- },
- "Gezeichnetes Kapital in Euro": {
- "Gegenkonto zu 9220-9221": {},
- "Gezeichnetes Kapital in Euro (Art. 42 Abs. 3 S. 2 EGHGB)": {}
- }
- },
- "Statistische konten f\u00fcr Kinderbetreuungskosten": {
- "Gegenkonto zu 9918 (Haben)": {},
- "Kinderbetreuungskosten (wie Betriebsausgaben steuerlich anzusetzender Betrag)": {}
- },
- "Steueraufwand der Gesellschafter": {
- "Gegenkonto zu 9887": {},
- "Steueraufwand der Gesellschafter ": {}
- },
- "Verrechnungskonto f\u00fcr nicht durch Verm\u00f6genseinlagen gedeckte Entnahmen": {
- "Verrechnungskonto f\u00fcr nicht durch Verm\u00f6genseinlagen gedeckte Entnahmen Kommanditisten": {},
- "Verrechnungskonto f\u00fcr nicht durch Verm\u00f6genseinlagen gedeckte Entnahmen pers\u00f6nlich haftender Gesellschafter": {}
- },
- "Vorsteuer-/Umsatzsteuerkonten zur Korrektur der Forderungen/ Verbindlichkeiten (E\u00fcR)": {
- "Gegenkonto 9893-9894 f\u00fcr die Aufteilung der Umsatzsteuersatz (E\u00fcR)": {},
- "Gegenkonto 9896-9897 f\u00fcr die Aufteilung der Vorsteuer (E\u00fcR)": {},
- "SO Commitment": {},
- "Umsatzsteuer in den Forderungen zum allgemeinen Umsatzsteuersatz (E\u00fcR)": {},
- "Umsatzsteuer in den Forderungen zum erm\u00e4\u00dfigten Umsatzsteuersatz (E\u00fcR)": {},
- "Vorsteuer in den Verbindlichkeiten zum allgemeinen Umsatzsteuersatz (E\u00fcR)": {},
- "Vorsteuer in den Verbindlichkeiten zum erm\u00e4\u00dfigten Umsatzsteuersatz (E\u00fcR)": {}
- },
- "Vortragskonten": {
- "Offene Posten aus 1990": {},
- "Offene Posten aus 1991": {},
- "Offene Posten aus 1992": {},
- "Offene Posten aus 1993": {},
- "Offene Posten aus 1994": {},
- "Offene Posten aus 1995": {},
- "Offene Posten aus 1996": {},
- "Offene Posten aus 1997": {},
- "Offene Posten aus 1998": {},
- "Offene Posten aus 1999": {},
- "Offene Posten aus 2000": {},
- "Offene Posten aus 2001": {},
- "Offene Posten aus 2002": {},
- "Offene Posten aus 2003": {},
- "Offene Posten aus 2004": {},
- "Offene Posten aus 2005": {},
- "Offene Posten aus 2006": {},
- "Offene Posten aus 2007": {},
- "Offene Posten aus 2008": {},
- "Offene Posten aus 2009": {},
- "Saldenvortr\u00e4ge": {},
- "Saldenvortr\u00e4ge Debitoren": {},
- "Saldenvortr\u00e4ge Kreditoren": {},
- "Saldenvortr\u00e4ge- Sachkonten": {},
- "Summenvortragskonto": {}
- },
- "root_type": "Asset"
- },
- "Gewinn u. Verlust - Aufwendungen": {
- "Betriebliche Aufwendungen": {
- "Abschreibungen a. Verm\u00f6gensgeg. d. Umlaufverm\u00f6gens- soweit diese die in der Kapitalgesellschaft \u00fcblichen Abschreibungen \u00fcberschreiten": {
- "Abschreibungen a. Verm\u00f6gensgeg. d. Umlaufverm\u00f6gens- soweit diese die in der Kapitalgesellschaft \u00fcblichen Abschreibungen \u00fcberschreiten": {
- "Abschreibungen auf Umlaufverm\u00f6gen- steuerrechtlich bedingt (soweit un\u00fcblich hoch)": {},
- "Abschreibungen auf Verm\u00f6gensgegenst\u00e4nde des Umlaufverm\u00f6gens (soweit un\u00fcblich hoch)": {},
- "Forderungsverluste (soweit un\u00fcblich hoch)": {},
- "Forderungsverluste 15% USt (soweit un\u00fcblich hoch)": {},
- "Forderungsverluste 16% USt (soweit un\u00fcblich hoch)": {},
- "Forderungsverluste 19% USt (soweit un\u00fcblich hoch)": {},
- "Forderungsverluste 7% USt (soweit un\u00fcblich hoch)": {},
- "Vorwegnahme k\u00fcnftiger Wertschwankungen im Umlaufverm\u00f6gen (soweit un\u00fcblich hoch)": {}
- }
- },
- "Kalkulatorische Kosten": {
- "Sonstige betriebliche Aufwendungen": {
- "Kalkulatorische Abschreibungen": {},
- "Kalkulatorische Miete/Pacht": {},
- "Kalkulatorische Wagnisse": {},
- "Kalkulatorische Zinsen": {},
- "Kalkulatorischer Lohn f\u00fcr unentgeltliche Mitarbeiter": {},
- "Kalkulatorischer Unternehmerlohn": {},
- "Verrechnete kalkulatorische Abschreibungen": {},
- "Verrechnete kalkulatorische Miete/Pacht": {},
- "Verrechnete kalkulatorische Wagnisse": {},
- "Verrechnete kalkulatorische Zinsen": {},
- "Verrechneter kalkulatorischer Lohn f\u00fcr unentgeltliche Mitarbeiter": {},
- "Verrechneter kalkulatorischer Unternehmerlohn": {}
- }
- },
- "Kosten bei Anwendung des Umsatzkostenverfahrens": {
- "Sonstige betriebliche Aufwendungen": {
- "Gegenkonto 6990-6998": {},
- "Herstellungskosten": {},
- "Vertriebskosten": {},
- "Verwaltungskosten": {}
- }
- },
- "Personalaufwand": {
- "L\u00f6hne und Geh\u00e4lter": {
- "Aushilfsl\u00f6hne": {},
- "Bedienungsgelder": {},
- "Ehegattengehalt": {},
- "Fahrkostenerstattung Wohnung/Arbeitsst\u00e4tte": {},
- "Freiwillige soziale Aufwendungen- lohnsteuerpflichtig": {},
- "Geh\u00e4lter": {},
- "Gesch\u00e4ftsf\u00fchrergeh\u00e4lter ": {},
- "Gesch\u00e4ftsf\u00fchrergeh\u00e4lter der GmbH-Gesellschafter": {},
- "Krankengeldzusch\u00fcsse": {},
- "L\u00f6hne ": {},
- "L\u00f6hne und Geh\u00e4lter": {},
- "Pauschale Steuer auf sonstige Bez\u00fcge (z.B. Fahrkosten Zusch\u00fcsse)": {},
- "Pauschale Steuer f\u00fcr Aushilfen": {},
- "Tantiemen": {},
- "Verg\u00fctungen an angestellte Mitunternehmer \u00a7 15 EStG": {},
- "Verm\u00f6genswirksame Leistungen": {},
- "Zusch\u00fcsse der Agenturen f\u00fcr Arbeit (Haben)": {}
- },
- "Soziale Abgaben und Aufwendungen f\u00fcr Altersversorgung und f\u00fcr Unterst\u00fctzung": {
- "Soziale Abgaben und Aufwendungen f\u00fcr Altersversorgung und f\u00fcr Unterst\u00fctzung": {
- "Aufwendungen f\u00fcr Altersversorgung": {},
- "Aufwendungen f\u00fcr Altersversorgung f\u00fcr Mitunternehmer \u00a7 15 EStG": {},
- "Aufwendungen f\u00fcr Unterst\u00fctzung": {},
- "Beitr\u00e4ge zur Berufsgenossenschaft": {},
- "Freiwillige soziale Aufwendungen- lohnsteuerfrei": {},
- "Gesetzliche soziale Aufwendungen": {},
- "Gesetzliche soziale Aufwendungen f\u00fcr Mitunternehmer \u00a7 15 EStG": {},
- "Pauschale Steuer auf sonstige Bez\u00fcge (z.B. Direktversicherungen)": {},
- "Sonstige soziale Abgaben": {},
- "Versorgungskassen": {}
- }
- }
- },
- "Sonstige betriebliche Aufwendungen": {
- "Sonstige betriebliche Aufwendungen": {
- "Abgaben f\u00fcr betrieblich genutzten Grundbesitz": {},
- "Abgang von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig (inlandische Kap. Ges.) nach \u00a7 4 Abs. 3 Satz 4 EStG": {},
- "Abgang von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens nach \u00a7 4 Abs. 3 Satz 4 EStG": {},
- "Abschluss- und Pr\u00fcfungskosten": {},
- "Abschreibung auf Umlaufverm\u00f6gen au\u00dfer Vorr\u00e4te und Wertpapieren des UV (\u00fcbliche H\u00f6he)": {},
- "Abschreibung auf Umlaufverm\u00f6gen au\u00dfer Vorr\u00e4te und Wertpapieren des UV- steuerlich bedingt (\u00fcbliche H\u00f6he)": {},
- "Abziehbare Aufsichtsratsverg\u00fctungen": {},
- "Anlagenabg\u00e4nge Finanzanlagen (Restbuchwert bei Buchverlust)": {},
- "Anlagenabg\u00e4nge Finanzanlagen 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)(Restbuchwert bei Buchverlust)": {},
- "Anlagenabg\u00e4nge Sachanlagen (Restbuchwert bei Buchverlust)": {},
- "Anlagenabg\u00e4nge immaterielle Verm\u00f6gensgegenst\u00e4nde (Restbuchwert bei Buchverlust)": {},
- "Aufmerksamkeiten": {},
- "Aufwand f\u00fcr Gew\u00e4hrleistung": {},
- "Aufwendungen aus Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inlandische Kap. Ges.)": {},
- "Aufwendungen aus Bewertung Finanzmittelfonds": {},
- "Aufwendungen aus Kursdifferenzen": {},
- "Aufwendungen aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
- "Aufwendungen aus der Zuschreibung von steuertlich niedriger bewerteten R\u00fcckstellungen": {},
- "Aufwendungen aus der Zuschreibung von steuertlich niedriger bewerteten Verbindlichkeiten": {},
- "Aufwendungen f\u00fcr Abraum- und Abfallbeseitigung": {},
- "Aufwendungen f\u00fcr ein h\u00e4usliches Arbeitszimmer (abziehbarer Anteil)": {},
- "Aufwendungen f\u00fcr ein h\u00e4usliches Arbeitszimmer (nicht abziehbarer Anteil)": {},
- "Ausgangsfrachten": {},
- "Ausgleichsabgabe i. S. d. Schwerbehindertengesetzes": {},
- "Beitr\u00e4ge ": {},
- "Bewirtungskosten": {},
- "Buchf\u00fchrungskosten": {},
- "B\u00fcrobedarf": {},
- "Einstellungen in Sonderposten mit R\u00fccklageanteil (Ansparabschreibungen)": {},
- "Einstellungen in Sonderposten mit R\u00fccklageanteil (Existenzgr\u00fcnderr\u00fccklage)": {},
- "Einstellungen in Sonderposten mit R\u00fccklageanteil (Sonderabschreibungen)": {},
- "Einstellungen in Sonderposten mit R\u00fccklageanteil (Steuerfreie R\u00fccklagen)": {},
- "Einstellungen in Sonderposten mit R\u00fccklageanteil (\u00a7 52 Abs. 16 EStG)": {},
- "Einstellungen in die Einzelwertberichtigung zu Forderungen": {},
- "Einstellungen in die Pauschalwertberichtigung zu Forderungen": {},
- "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (bei Buchverlust)": {},
- "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen 100% / 50% steuerfrei (inlandische Kap.Ges.)(bei Buchverlust)": {},
- "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen (bei Buchverlust)": {},
- "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen 16% USt (bei Buchverlust)": {},
- "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen 19% USt (bei Buchverlust)": {},
- "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen steuerfrei \u00a7 4 Nr. 1a UStG (bei Buchverlust)": {},
- "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen steuerfrei \u00a7 4 Nr. 1b UStG (bei Buchverlust)": {},
- "Erl\u00f6se aus Verk\u00e4ufen immaterieller Verm\u00f6gensgegenst\u00e4nde (bei Buchverlust)": {},
- "Fahrten zwischen Wohnung und Arbeitsst\u00e4tte (Haben)": {},
- "Fahrten zwischen Wohnung und Arbeitsst\u00e4tte (abziehbarer Anteil)": {},
- "Fahrten zwischen Wohnung und Arbeitsst\u00e4tte (nicht abziehbarer Anteil)": {},
- "Fahrzeugkosten": {},
- "Forderungsverluste (\u00fcbliche H\u00f6he)": {},
- "Forderungsverluste 15% USt (\u00fcbliche H\u00f6he)": {},
- "Forderungsverluste 16% USt (\u00fcbliche H\u00f6he)": {},
- "Forderungsverluste 19% USt (\u00fcbliche H\u00f6he)": {},
- "Forderungsverluste 7 % USt (\u00fcbliche H\u00f6he)": {},
- "Forderungsverluste aus im Inland steuerpflichtigen EG-Lieferungen 15% USt (\u00fcbliche H\u00f6he)": {},
- "Forderungsverluste aus im Inland steuerpflichtigen EG-Lieferungen 16% USt (\u00fcbliche H\u00f6he)": {},
- "Forderungsverluste aus im Inland steuerpflichtigen EG-Lieferungen 19% USt (\u00fcbliche H\u00f6he)": {},
- "Forderungsverluste aus im Inland steuerpflichtigen EG-Lieferungen 7% USt (\u00fcbliche H\u00f6he)": {},
- "Forderungsverluste aus steuerfreien EG-Lieferungen (\u00fcbliche H\u00f6he)": {},
- "Fortbildungskosten": {},
- "Freiwillige Sozialleistungen": {},
- "Fremdarbeiten (Vertrieb)": {},
- "Fremdfahrzeugkosten": {},
- "Fremdleistungen / Fremdarbeiten": {},
- "Garagenmiete": {},
- "Gas- Strom- Wasser": {},
- "Geschenke abzugsf\u00e4hig": {},
- "Geschenke ausschlie\u00dflich betrieblich genutzt": {},
- "Geschenke nicht abzugsf\u00e4hig": {},
- "Gewerbesteuerlich zu ber\u00fccksichtigende Miete f\u00fcr Einrichtungen \u00a7 8 GewStG": {},
- "Gewerbesteuerlich zu ber\u00fccksichtigende Miete \u00a7 8 GewStG": {},
- "Gewerbesteuerlich zu ber\u00fccksichtigende Pacht \u00a7 8 GewStG": {},
- "Gewerbesteuerlich zu ber\u00fccksichtigendes Mietleasing \u00a7 8 GewStG": {},
- "Grundst\u00fcckaufwendungen- betrieblich": {},
- "Grundst\u00fcckaufwendungen- sonstige neutrale": {},
- "Haftungsverg\u00fctung an Mitunternehmer \u00a7 15 EStG": {},
- "Heizung": {},
- "Instandhaltung betrieblicher R\u00e4ume": {},
- "Kfz-Kosten f\u00fcr betrieblich genutzte zum Privatverm\u00f6gen geh\u00f6rende Kraftfahrzeuge": {},
- "Kfz-Versicherungen": {},
- "Kilometergelderstattung Arbeitnehmer": {},
- "Kosten der Warenabgabe": {},
- "Laufende Kfz-Betriebskosten": {},
- "Leasingfahrzeugkosten": {},
- "Mautgeb\u00fchren": {},
- "Mietekosten": {},
- "Mieten f\u00fcr Einrichtungen": {},
- "Mietleasing": {},
- "Nebenkosten des Geldverkehrs": {},
- "Netto-Pr\u00e4mie f\u00fcr R\u00fcckdeckung k\u00fcnftiger Versorgungsleistungen": {},
- "Nicht Abzugsf\u00e4hige Betriebsausgaben aus Werbe- und Repr\u00e4sentationskosten (nicht abziehbarer Anteil)": {},
- "Nicht Abzugsf\u00e4hige Bewirtungskosten": {},
- "Nicht abziehbare H\u00e4lfte der Aufsichtsratsverg\u00fctungen": {},
- "Nicht abziehbare Vorsteuer": {},
- "Nicht abziehbare Vorsteuer 16% ": {},
- "Nicht abziehbare Vorsteuer 19% ": {},
- "Nicht abziehbare Vorsteuer 7% ": {},
- "Pacht": {},
- "Periodenfremde Aufwendungen soweit nicht au\u00dferordentlich": {},
- "Porto": {},
- "Raumkosten": {},
- "Rechts- und Beratungskosten": {},
- "Reinigung": {},
- "Reisekosten Arbeitnehmer": {},
- "Reisekosten Arbeitnehmer (nicht abziehbarer Anteil)": {},
- "Reisekosten Arbeitnehmer Fahrkosten": {},
- "Reisekosten Arbeitnehmer Verpflegungsmehraufwand": {},
- "Reisekosten Arbeitnehmer \u00fcbernachtungsaufwand": {},
- "Reisekosten Unternehmer": {},
- "Reisekosten Unternehmer (nicht abziehbarer anteil)": {},
- "Reisekosten Unternehmer Fahrkosten": {},
- "Reisekosten Unternehmer Verpflegungsmehraufwand": {},
- "Reisekosten Unternehmer \u00fcbernachtungsaufwand": {},
- "Reparaturen und Instandhaltung von Bauten": {},
- "Reparaturen und Instandhaltung von Betriebs- und Gesch\u00e4ftsausstattung": {},
- "Reparaturen und Instandhaltung von anderen Anlagen": {},
- "Reparaturen und Instandhaltung von technischen Anlagen und Maschinen": {},
- "Repr\u00e4sentationskosten": {},
- "Sonstige Abgaben": {},
- "Sonstige Aufwendungen betrieblich und Regelm\u00e4\u00dfig": {},
- "Sonstige Aufwendungen betrieblich und regelm\u00e4\u00dfig": {},
- "Sonstige Aufwendungen unregelm\u00e4\u00dfig": {},
- "Sonstige Kfz-kosten": {},
- "Sonstige Raumkosten": {},
- "Sonstige Reparaturen und Instandhaltung ": {},
- "Sonstige betriebliche Aufwendungen": {},
- "Sonstige eingeschr\u00e4nkt abziehbare Betriebsausgaben (abziehbarer Anteil)": {},
- "Sonstige eingeschr\u00e4nkt abziehbare Betriebsausgaben (nicht abziehbarer Anteil)": {},
- "Sonstiger Betriebsbedarf": {},
- "Steuerlich abzugsf\u00e4hige Versp\u00e4tungszuschl\u00e4ge und Zwangsgelder": {},
- "Telefax und Internetkosten": {},
- "Telefon": {},
- "Transportversicherungen": {},
- "Verg\u00fctungen an Mitunternehmer f\u00fcr die Pachtweise \u00fcberlassung ihrer Wirtschaftsg\u00fcter \u00a7 15 EStG": {},
- "Verg\u00fctungen an Mitunternehmer f\u00fcr die mietweise \u00fcberlassung ihrer Wirtschaftsg\u00fcter \u00a7 15 EStG": {},
- "Verg\u00fctungen an Mitunternehmer \u00a7 15 EStG": {},
- "Verkaufsprovisionen": {},
- "Verluste aus dem Abgang von Gegenst\u00e4nden des Anlageverm\u00f6gens": {},
- "Verluste aus dem Abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens (au\u00dfer Vorr\u00e4te) 100% / 50% nicht anzugsf\u00e4hig (inlandische Kap. Ges.)": {},
- "Verluste aus dem Abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens au\u00dfer Vorr\u00e4te": {},
- "Verluste aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
- "Verpackungsmaterial": {},
- "Versicherungen": {},
- "Versicherungen f\u00fcr Geb\u00e4ude": {},
- "Vorwegnahme k\u00fcnftiger Wertschwankungen im Umlaufverm\u00f6gen au\u00dfer Vorr\u00e4te und Wertpapiere": {},
- "Wartungskosten f\u00fcr Hard- und Software": {},
- "Werbekosten": {},
- "Werkzeuge und Kleinger\u00e4te": {},
- "Zeitschriften und B\u00fccher": {},
- "Zuwendungen- Spenden an Stiftungen f\u00fcr Kirchliche- religi\u00f6se und gemeinn\u00fctzige Zwecke": {},
- "Zuwendungen- Spenden an Stiftungen f\u00fcr gemeinn\u00fctzige Zwecke i. S. d. \u00a7 52 Abs. 2 Nr. 1-3 AO": {},
- "Zuwendungen- Spenden an Stiftungen f\u00fcr gemeinn\u00fctzige Zwecke i. S. d. \u00a7 52 Abs. 2 Nr. 4 AO": {},
- "Zuwendungen- Spenden an Stiftungen f\u00fcr wissenschaftliche- mitdt\u00e4tige- kulturelle Zwecke": {},
- "Zuwendungen- Spenden an politische Parteien": {},
- "Zuwendungen- Spenden f\u00fcr kirchliche- religi\u00f6se und gemeinn\u00fctzige Zwecke": {},
- "Zuwendungen- Spenden f\u00fcr mildt\u00e4tige Zwecke": {},
- "Zuwendungen- Spenden f\u00fcr wissenschaftliche und kulturelle Zwecke": {},
- "Zuwendungen- Spenden- steuerlich nicht abziehbar": {},
- "kfz-Reparaturen": {},
- "steuerlich nicht abzugsf\u00e4hige Versp\u00e4tungszuschl\u00e4ge und Zwangsgelder": {}
- }
- }
- },
- "Weitere Aufwendungen": {
- "Abschreibungen auf Finanzanlagen und auf Wertpapiere des Umlaufverm\u00f6gens": {
- "Abschreibungen auf Finanzanlagen und auf Wertpapiere des Umlaufverm\u00f6gens": {
- "Abschreibungen auf Finanzanlagen ": {},
- "Abschreibungen auf Finanzanlagen 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
- "Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften": {},
- "Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
- "Abschreibungen auf Grund von Verlustanteilen an Mitunternehmerschaften \u00a7 8 GewStG": {},
- "Abschreibungen auf Wertpapiere des Umlaufverm\u00f6gens": {},
- "Abschreibungen auf Wertpapiere des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
- "Vorwegnahme k\u00fcnftiger Wertschwankungen bei Wertpapieren des Umlaufverm\u00f6gens": {}
- }
- },
- "Au\u00dferordentliche Aufwendungen": {
- "Au\u00dferordentliche Aufwendungen": {
- "Au\u00dferordentliche Aufwendungen": {},
- "Au\u00dferordentliche Aufwendungen finanzwirksam": {},
- "Au\u00dferordentliche Aufwendungen nicht finanzwirksam": {}
- }
- },
- "Einstellung in Gewinnr\u00fccklagen ": {
- "Aussch\u00fcttung": {
- "Vorabaussch\u00fcttung": {}
- },
- "Einstellung in Gewinnr\u00fccklagen in andere Gewinnr\u00fccklagen ": {
- "Einstellung in andere Gewinnr\u00fccklagen ": {}
- },
- "Einstellung in Gewinnr\u00fccklagen in die R\u00fccklage f\u00fcr eigene Anteile": {
- "Einstellung in die R\u00fccklage f\u00fcr eigene Anteile": {}
- },
- "Einstellung in Gewinnr\u00fccklagen in die gesetzliche R\u00fccklage ": {
- "Einstellung in die gesetzliche R\u00fccklage ": {}
- },
- "Einstellung in Gewinnr\u00fccklagen in satzungm\u00e4\u00dfige R\u00fccklage ": {
- "Einstellung in satzungm\u00e4\u00dfige R\u00fccklage ": {}
- },
- "Sonstige betriebliche Aufwendungen": {
- "(zu freien Verf\u00fcgung)": {}
- },
- "Sonstige betriebliche Ertr\u00e4ge oder sonstige betriebliche Aufwendungen": {
- "Aufwendungen/Ertr\u00e4ge aus Umrechnungsdifferenzen": {}
- },
- "Vortrag auf neue Rechnung": {
- "Vortrag auf neue Rechnung (GuV)": {}
- }
- },
- "Steuern vom Einkommen und Ertrag": {
- "Steuern vom Einkommen und Ertrag": {
- "Anrechenbarer Solidarit\u00e4tszuschlag auf Kapitalertragsteuer 20%": {},
- "Anrechenbarer Solidarit\u00e4tszuschlag auf Kapitalertragsteuer 25%": {},
- "Anrechenbarer Solidarit\u00e4tszuschlag auf Zinsabschlagsteuer": {},
- "Anzurechnende ausl\u00e4ndische Quellensteuer": {},
- "Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen f\u00fcr Steuern vom Einkommen und Ertrag": {},
- "Gewerbesteuer ": {},
- "Kapitalertragsteuer 20%": {},
- "Kapitalertragsteuer 25%": {},
- "K\u00f6rperschaftssteuer": {},
- "K\u00f6rperschaftssteuer f\u00fcr Vorjahr": {},
- "K\u00f6rperschaftssteuererstattung f\u00fcr Vorjahre nach \u00a737 KStG": {},
- "K\u00f6rperschaftssteuererstattungen f\u00fcr Vorjahre": {},
- "Solidarit\u00e4tszuschlag": {},
- "Solidarit\u00e4tszuschlag f\u00fcr Vorjahre": {},
- "Solidarit\u00e4tszuschlagerstattungen f\u00fcr Vorjahre": {},
- "Steuererstattungen Vorjahre f\u00fcr Steuern vom Einkommen und Ertrag": {},
- "Steuernachzahlungen Vorjahre f\u00fcr Steuern vom Einkommen und Ertrag": {},
- "Zinsabschlagsteuer": {}
- }
- },
- "Verlustvortrag": {
- "Verlustvortrag nach Verwendung": {}
- },
- "Zinsen und \u00e4hnliche Aufwendungen": {
- "Zinsen und \u00e4hnliche Aufwendungen": {
- "Diskontaufwendungen": {},
- "Diskontaufwendungen an verbundene Unternehmen": {},
- "In Dauerschuldzinsen unqualifizierte Zinsen auf kurzfristige Verbindlichkeiten": {},
- "Nicht abzugsf\u00e4hige Schuldzinsen gem\u00e4\u00df \u00a7 4 Abs. 4a EStG (Hinzurechnungsbetrag)": {},
- "Renten und dauernde Lasten aus Gr\u00fcndung/Erwerb \u00a78 GewStG": {},
- "Steuerlich abzugsf\u00e4hige- andere Nebenleistungen zu steuern ": {},
- "Steuerlich nicht abzugsf\u00e4hige- andere Nebenleistungen zu steuern ": {},
- "Zinsaufwendungen an Mitunternehmer f\u00fcr die Hingabe von Kapital \u00a7 15 EStG": {},
- "Zinsaufwendungen f\u00fcr Geb\u00e4ude- die zum Betriebsverm\u00f6gen geh\u00f6ren": {},
- "Zinsaufwendungen f\u00fcr kurzfristige Verbindlichkeiten": {},
- "Zinsaufwendungen f\u00fcr kurzfristige Verbindlichkeiten an verbundene Unternehmen": {},
- "Zinsaufwendungen f\u00fcr langfristige Verbindlichkeiten": {},
- "Zinsaufwendungen f\u00fcr langfristige Verbindlichkeiten an verbundene Unternehmen": {},
- "Zinsaufwendungen \u00a7\u00a7 233a AO betriebliche Steuern": {},
- "Zinsaufwendungen \u00a7\u00a7 233a bis 237 AO Personensteuern": {},
- "Zinsen und \u00e4hnliche Aufwendungen": {},
- "Zinsen und \u00e4hnliche Aufwendungen 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
- "Zinsen und \u00e4hnliche Aufwendungen an verbundene Unternehmen": {},
- "Zinsen und \u00e4hnliche Aufwendungen an verbundene Unternehmen 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
- "Zinsen zur Finanzierung des Anlageverm\u00f6gens": {},
- "Zins\u00e4hnliche Aufwendungen": {},
- "Zins\u00e4hnliche Aufwendungen an verbundene Unternehmen": {}
- }
- }
- },
- "root_type": "Expense"
- },
- "Gewinn u. Verlust - Ertr\u00e4ge": {
- "Betriebliche Ertr\u00e4ge": {
- "Andere aktivierte Eigenleistungen": {
- "Andere aktivierte Eigenleistungen": {
- "Andere aktivierte Eigenleistungen": {}
- }
- },
- "Erh\u00f6hung oder Verminderung des Bestands an fertigen und unfertige Erzeugnissen": {
- "Erh\u00f6hung des Bestands an fertigen und unfertigen Erzeugnissen oder Verminderung des Bestands an fertigen und unfertigen Erzeugnissen": {
- "Bestandsver\u00e4nderungen - fertige Erzeugnisse": {},
- "Bestandsver\u00e4nderungen - unfertige Erzeugnisse": {},
- "Bestandsver\u00e4nderungen - unfertige Leistungen": {}
- },
- "Erh\u00f6hung des Bestands in Arbeit befindlicher Auftr\u00e4ge oder Verminderung des Bestands in Arbeit befindlicher Auftr\u00e4ge": {
- "Bestandsver\u00e4nderungen in Arbeit befindlicher Auftr\u00e4ge": {}
- },
- "Erh\u00f6hung des Bestands in Ausf\u00fchrung befindlicher Bauaftr\u00e4ge oder Verminderung des Bestands in Ausf\u00fchrung befindlicher Bauauftr\u00e4ge": {
- "Bestandsver\u00e4nderungen in Ausf\u00fchrung befindliche Bauauftr\u00e4ge": {}
- }
- },
- "Sonstige betriebliche Ertr\u00e4ge": {
- "Sonstige betriebliche Ertr\u00e4ge": {
- "Anlagenabg\u00e4nge Finanzanlagen (Restbuchwert bei Buchgewinn)": {},
- "Anlagenabg\u00e4nge Finanzanlagen 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)(Restbuchwert bei Buchgewinn)": {},
- "Anlagenabg\u00e4nge Sachanlagen (Restbuchwert bei Buchgewinn)": {},
- "Anlagenabg\u00e4nge immaterielle Verm\u00f6gensgegenst\u00e4nde (Restbuchwert bei Buchgewinn)": {},
- "Bank Bewertungsertrag": {},
- "Bank Waehrungsverlust (Konto)": {},
- "Erl\u00f6se aus Verkauf immaterieller Verm\u00f6gensgegenst\u00e4nde (bei Buchgewinn)": {},
- "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (bei Buchgewinn)": {},
- "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen (bei Buchgewinn)": {},
- "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen 16% USt (bei Buchgewinn)": {},
- "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen 19% USt (bei Buchgewinn)": {},
- "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen steuerfrei \u00a7 4 Nr. 1a UStG (bei Buchgewinn)": {},
- "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen steuerfrei \u00a7 4 Nr. 1b UStG (bei Buchgewinn)": {},
- "Ertraege a. Waehrungsumstellung auf Euro": {},
- "Ertr\u00e4ge aus Bewertung Finanzmittelfonds": {},
- "Ertr\u00e4ge aus Kursdifferenzen": {},
- "Ertr\u00e4ge aus Zuschreibungen des Finanzanlageverm\u00f6gens": {},
- "Ertr\u00e4ge aus Zuschreibungen des Finanzanlageverm\u00f6gens 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {},
- "Ertr\u00e4ge aus Zuschreibungen des Sachanlageverm\u00f6gens": {},
- "Ertr\u00e4ge aus Zuschreibungen des Umlaufverm\u00f6gens 100% / 50% steuerfrei (inlandische Kap. Ges.)": {},
- "Ertr\u00e4ge aus Zuschreibungen des Umlaufverm\u00f6gens au\u00dfer Vorr\u00e4ten": {},
- "Ertr\u00e4ge aus Zuschreibungen des anderen Anlageverm\u00f6gens 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {},
- "Ertr\u00e4ge aus Zuschreibungen des immateriellen Anlageverm\u00f6gens": {},
- "Ertr\u00e4ge aus abgeschriebenen Forderungen": {},
- "Ertr\u00e4ge aus dem Abgang von Gegenst\u00e4nden des Anlageverm\u00f6gens": {},
- "Ertr\u00e4ge aus dem abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens (au\u00dfer Vorr\u00e4te) 100% / 50%steuerfrei (inlandische Kap.Ges.)": {},
- "Ertr\u00e4ge aus dem abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens au\u00dfer Vorr\u00e4te": {},
- "Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen": {},
- "Ertr\u00e4ge aus der Aufl\u00f6sung von Sonderposten mit R\u00fccklageanteil (Ansparabschreibungen)": {},
- "Ertr\u00e4ge aus der Aufl\u00f6sung von Sonderposten mit R\u00fccklageanteil (Existenzgr\u00fcnderr\u00fccklage)": {},
- "Ertr\u00e4ge aus der Aufl\u00f6sung von Sonderposten mit R\u00fccklageanteil (Sonderabschreibungen)": {},
- "Ertr\u00e4ge aus der Aufl\u00f6sung von Sonderposten mit R\u00fccklageanteil (aus der W\u00e4hrungsumstellung auf den Euro)": {},
- "Ertr\u00e4ge aus der Aufl\u00f6sung von Sonderposten mit R\u00fccklageanteil (steuerfreie R\u00fccklage)": {},
- "Ertr\u00e4ge aus der Aufl\u00f6sung von Sonderposten mit R\u00fccklageanteil nach \u00a7 52 Abs. 16 EStG": {},
- "Ertr\u00e4ge aus der Herabsetzung der Einzelwertberichtigung zu Forderungen": {},
- "Ertr\u00e4ge aus der Herabsetzung der Pauschalwertberichtigung zu Forderungen": {},
- "Ertr\u00e4ge aus der Ver\u00e4u\u00dferung vo Anteilen an Kapitalgesellschaften 100% / 50% steuerfrei (inlandische Kap. Ges.)": {},
- "Ertr\u00e4ge aus der steuerlich niedrigeren Bewertung von R\u00fcckstellungen": {},
- "Ertr\u00e4ge aus der steuerlich niedrigeren Bewertung von Verbindlichkeiten": {},
- "Grundst\u00fccksertr\u00e4ge": {},
- "Investitionszulagen (steuerfrei)": {},
- "Investitionszusch\u00fcsse (steuerpflichtig)": {},
- "Kassendifferenzen": {},
- "Nicht realisierbare Waehrungsdifferenzen": {},
- "Periodenfremde Ertr\u00e4ge (soweit nicht au\u00dferordentlich)": {},
- "Produkt Rechnung Preisdifferenz": {},
- "Realisierte Waehrungsdifferenzen": {},
- "Rundungsdifferenzen": {},
- "Sachbez\u00fcge 16% USt (Waren)": {},
- "Sachbez\u00fcge 19% USt (Waren)": {},
- "Sachbez\u00fcge 7% USt (Waren)": {},
- "Sonstige Ertr\u00e4ge betrieblich und regelm\u00e4\u00dfig ": {},
- "Sonstige Ertr\u00e4ge betrieblich und regelm\u00e4\u00dfig 16% USt": {},
- "Sonstige Ertr\u00e4ge betrieblich und regelm\u00e4\u00dfig 19% USt ": {},
- "Sonstige Ertr\u00e4ge betriebsfremd und regelm\u00e4\u00dfig": {},
- "Sonstige Ertr\u00e4ge unregelm\u00dfig": {},
- "Sonstige betriebliche Ertr\u00e4ge": {},
- "Sonstige steuerfreie Betriebseinnahmen": {},
- "Verrechnete sonstige Sachbez\u00fcge ": {},
- "Verrechnete sonstige Sachbez\u00fcge (keine Waren)": {},
- "Verrechnete sonstige Sachbez\u00fcge 16 % USt ( z.B. Kfz-Gestellung)": {},
- "Verrechnete sonstige Sachbez\u00fcge 19 % USt ( z.B. Kfz-Gestellung)": {},
- "Verrechnete sonstige Sachbez\u00fcge ohne Umsatzsteuer": {},
- "Versicherungsentsch\u00e4digungen": {},
- "Waehrungsdifferenz zum Kontenausgleich": {},
- "steuerfreie Ertr\u00e4ge aus der Aufl\u00f6sung von Sonderposten mit R\u00fccklageanteil": {}
- }
- },
- "Statistische Konten E\u00fcR": {
- "Sonstige betriebliche Ertr\u00e4ge": {
- "Unentgeltliche Erbringung einer sonstigen Leistung 7% USt": {},
- "Unentgeltliche Erbringung einer sostigen Leistung 16% USt": {},
- "Unentgeltliche Erbringung einer sostigen Leistung 19% USt": {},
- "Unentgeltliche Erbringung einer sostigen Leistung ohne USt": {},
- "Unentgeltliche Zuwendung von Gegenst\u00e4nden 16% USt": {},
- "Unentgeltliche Zuwendung von Gegenst\u00e4nden 19% USt": {},
- "Unentgeltliche Zuwendung von Gegenst\u00e4nden ohne USt": {},
- "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens 16% USt": {},
- "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens 16% USt (Kfz-Nutzung)": {},
- "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens 16% USt (Telefon-Nutzung)": {},
- "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens 19% USt": {},
- "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens 19% USt (Kfz-Nutzung)": {},
- "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens 19% USt (Telefon-Nutzung)": {},
- "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens 7% USt": {},
- "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens ohne USt": {},
- "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens ohne USt (Kfz-Nutzung)": {},
- "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens ohne USt (Telefon-Nutzung)": {}
- },
- "Umsatzerl\u00f6se": {
- "Entnahme durch Unternehmer f\u00fcr Zwecke au\u00dferhalb des Unternehmens (Waren) ohne USt": {},
- "Entnahme durch den Unternehmer f\u00fcr Zwecke au\u00dferhalb des Unternehmens (Waren) 16% USt": {},
- "Entnahme durch den Unternehmer f\u00fcr Zwecke au\u00dferhalb des Unternehmens (Waren) 19% USt": {},
- "Entnahme durh Unternehmer f\u00fcr Zwecke au\u00dferhalb des Unternehmens (Waren) 7% USt": {},
- "Entnahme von Gegens\u00e4nden ohne USt": {},
- "Erl\u00f6sschm\u00e4lerung aus im Inland steuerpflichtigen EG-lieferungen 16% USt": {},
- "Erl\u00f6sschm\u00e4lerung aus im Inland steuerpflichtigen EG-lieferungen 19% USt": {},
- "Erl\u00f6sschm\u00e4lerung aus im Inland steuerpflichtigen EG-lieferungen 7 % USt": {},
- "Erl\u00f6sschm\u00e4lerung aus im anderen EG-lieferungen steuerpflichtigen Lieferungen": {},
- "Erl\u00f6sschm\u00e4lerungen": {},
- "Erl\u00f6sschm\u00e4lerungen 16 % USt": {},
- "Erl\u00f6sschm\u00e4lerungen 19 % USt": {},
- "Erl\u00f6sschm\u00e4lerungen 7 % USt": {},
- "Erl\u00f6sschm\u00e4lerungen aus steuerfreien Ums\u00e4tzen \u00a7 4 Nr. 1a UStG": {},
- "Erl\u00f6sschm\u00e4lerungen aus steuerfreien innergemeinschaftlichen Lieferungen": {},
- "Gegenkonto 4580-4582 bei Aufteilung der Erl\u00f6se nach Steuers\u00e4tzen (E\u00fcR)": {},
- "Gew\u00e4hrte Boni ": {},
- "Gew\u00e4hrte Boni 16 % USt": {},
- "Gew\u00e4hrte Boni 19 % USt": {},
- "Gew\u00e4hrte Boni 7 % USt": {},
- "Gew\u00e4hrte Rabatte": {},
- "Gew\u00e4hrte Rabatte 16 % USt": {},
- "Gew\u00e4hrte Rabatte 19 % USt": {},
- "Gew\u00e4hrte Rabatte 7 % USt": {},
- "Gew\u00e4hrte Skonti": {},
- "Gew\u00e4hrte Skonti 16 % USt": {},
- "Gew\u00e4hrte Skonti 19 % USt": {},
- "Gew\u00e4hrte Skonti 7 % USt": {},
- "Gew\u00e4hrte Skonti aus Leistungen- f\u00fcr die der Leistungsempf\u00e4nger die umsatzsteuer nach \u00a7 13b UStG schuldet": {},
- "Gew\u00e4hrte Skonti aus im Inland steuerpflichtigen EG-Lieferungen": {},
- "Gew\u00e4hrte Skonti aus im Inland steuerpflichtigen EG-Lieferungen 16 % USt": {},
- "Gew\u00e4hrte Skonti aus im Inland steuerpflichtigen EG-Lieferungen 19 % USt": {},
- "Gew\u00e4hrte Skonti aus im Inland steuerpflichtigen EG-Lieferungen 7 % USt": {},
- "Gew\u00e4hrte Skonti aus steuerfreien innergemeinschaftlichen Lieferungen \u00a7 4 Nr. 1b UStG": {},
- "Nicht steuerbare ums\u00e4tze (Innenums\u00e4tze)": {},
- "Statistisches Konto Erl\u00f6se zum allgemeinen Umsatzsteuersatz (E\u00fcR)": {},
- "Statistisches Konto Erl\u00f6se zum erm\u00e4\u00dfigten Umsatzsteuersatz (E\u00fcR)": {},
- "Statistisches konto Erl\u00f6se steuerfrei und nicht steuerbar (E\u00fcR)": {},
- "Umsatzsteuerverg\u00fctung": {},
- "Unentgeltliche Wertabgaben": {},
- "Unentgeltliche Zuwendung von Waren 16% USt": {},
- "Unentgeltliche Zuwendung von Waren 19% USt": {},
- "Unentgeltliche Zuwendung von Waren 7% USt": {},
- "Unentgeltliche Zuwendung von Waren ohne USt": {}
- }
- },
- "Umsatzerl\u00f6se": {
- "Sotige betriebliche Ertr\u00e4ge": {
- "Provision- sonstige Ertr\u00e4ge": {},
- "Provision- sonstige Ertr\u00e4ge 16% USt": {},
- "Provision- sonstige Ertr\u00e4ge 19% USt": {},
- "Provision- sonstige Ertr\u00e4ge 7% USt": {},
- "Provision- sonstige Ertr\u00e4ge steuerfrei (\u00a7 4 Nr. 5 UStG)": {},
- "Provision- sonstige Ertr\u00e4ge steuerfrei (\u00a7 4 Nr. 8 ff. UStG)": {}
- },
- "Umsatzerl\u00f6se": {
- "* Konto Kasse Ertrag": {},
- "* Sonstige Einnahmen": {},
- "* Vorausberechnete Einnahmen": {},
- "Erl\u00f6se": {},
- "Erl\u00f6se 16% USt": {},
- "Erl\u00f6se 19% USt": {},
- "Erl\u00f6se 7% USt": {},
- "Erl\u00f6se Abfallverwertung": {},
- "Erl\u00f6se Leergut": {},
- "Erl\u00f6se als Kleinunternehmer i.S.d. \u00a7 19 Abs. 1 UStG": {},
- "Erl\u00f6se aus Geldspielautomaten 16% USt": {},
- "Erl\u00f6se aus Geldspielautomaten 19% USt": {},
- "Erl\u00f6se aus Leistungen- f\u00fcr die der Leistungsempf\u00e4nger die Umsatzsteuer nach \u00a7 13b UStG schuldet": {},
- "Erl\u00f6se aus im Drittland steuerbaren Leistungen- im Inland ncht steuerbare Ums\u00e4tze": {},
- "Erl\u00f6se aus im Inland steuerpflichtigen EG-Lieferungen 16% USt": {},
- "Erl\u00f6se aus im Inland steuerpflichtigen EG-Lieferungen 19% USt": {},
- "Erl\u00f6se aus im Inland steuerpflichtigen EG-Lieferungen 7% USt": {},
- "Erl\u00f6se aus im anderen EG-Land steuerbaren Leistungen- im Inland nicht steuerbare Ums\u00e4tze": {},
- "Erl\u00f6se aus im anderen EG-Land steuerpflichtigen Lieferungen": {},
- "Erl\u00f6se. Die mit den Durchschnittss\u00e4tzen des \u00a7 24 UStG versteuert werden": {},
- "Lieferungen des ersten Abnehmers bei innergemeinschaftlichen Dreiecksgesch\u00e4ften \u00a7 25b abs. UStG": {},
- "Nicht abgerechnete Einnahmen": {},
- "Provisionsums\u00e4tze": {},
- "Provisionsums\u00e4tze 16% USt": {},
- "Provisionsums\u00e4tze 19% USt": {},
- "Provisionsums\u00e4tze 7% USt": {},
- "Provisionsums\u00e4tze- steuerfrei (\u00a74 Nr. 5 UStG)": {},
- "Provisionsums\u00e4tze- steuerfrei (\u00a74 Nr. 8 ff. UStG)": {},
- "Sonstige steuerfreie Ums\u00e4tze (z.B. \u00a7 4 Nr. 2-7 UStG)": {},
- "Sonstige steuerfreie Ums\u00e4tze Inland": {},
- "Steuerfreie Ums\u00e4tze nach \u00a7 4 Nr. 12 UStG (Vermietung und Verpackung)": {},
- "Steuerfreie Ums\u00e4tze offshore etc.": {},
- "Steuerfreie Ums\u00e4tze ohne Vorsteuerabzug zum Gesamtumsatz geh\u00f6rend": {},
- "Steuerfreie Ums\u00e4tze \u00a74 Nr. 1a UStG": {},
- "Steuerfreie Ums\u00e4tze \u00a74 Nr. 8 ff. UStG": {},
- "Steuerfreie innergemeinschaftliche Lieferungen von Neufahrzeugen an Abnehmer ohne Umsatzsteuer-Identifikationsnummer": {},
- "Steuerfreie innergemeinschaftliche Lieferungen \u00a74 Nr. 1b UStG": {},
- "Umsatzerl\u00f6se (zur fr. Verf\u00fcgung)": {}
- }
- }
- },
- "Weitere Ertr\u00e4ge": {
- "Au\u00dferordentliche Ertr\u00e4ge": {
- "Au\u00dferordentliche Ertr\u00e4ge": {
- "Au\u00dferordentliche Ertr\u00e4ge": {},
- "Au\u00dferordentliche Ertr\u00e4ge finanzwirksam": {},
- "Au\u00dferordentliche Ertr\u00e4ge nicht finanzwirksam": {}
- }
- },
- "Entnahme aus Gewinnr\u00fccklagen": {
- "Einstellungen in die Kapitalr\u00fccklage nach den Vorschriften \u00fcber die Vereinfachte Kapitalherabsetzung": {
- "Einstellungen in die Kapitalr\u00fccklage nach den Vorschriften \u00fcber die Vereinfachte Kapitalherabsetzung": {}
- },
- "Entnahme aus Gewinnr\u00fccklagen aus anderen Gewinnr\u00fccklagen": {
- "Entnahme aus Gewinnr\u00fccklagen aus anderen Gewinnr\u00fccklagen": {}
- },
- "Entnahme aus Gewinnr\u00fccklagen aus der R\u00fccklage f\u00fcr eigene Anteile ": {
- "Entnahme aus Gewinnr\u00fccklagen aus der R\u00fccklage f\u00fcr eigene Anteile ": {}
- },
- "Entnahme aus Gewinnr\u00fccklagen aus der gesetzlichen R\u00fccklage": {
- "Entnahme aus Gewinnr\u00fccklagen aus der gesetzlichen R\u00fccklage": {}
- },
- "Entnahme aus Gewinnr\u00fccklagen aus satzungsm\u00e4\u00dfigen R\u00fccklage ": {
- "Entnahme aus Gewinnr\u00fccklagen aus satzungsm\u00e4\u00dfigen R\u00fccklage ": {}
- },
- "Ertr\u00e4ge aus Kapitalherabsetzung": {
- "Ertr\u00e4ge aus Kapitalherabsetzung": {}
- }
- },
- "Entnahme aus der Kapitalr\u00fccklage": {
- "Entnahme aus der Kapitalr\u00fccklage": {}
- },
- "Ertr\u00e4ge aus Beteiligungen": {
- "Ertr\u00e4ge aus Beteiligungen": {
- "Ertr\u00e4ge aus Beteiligungen": {},
- "Ertr\u00e4ge aus Beteiligungen an verbundenen Unternehmen": {},
- "Gewinnanteile aus Mitunternehmerschaften \u00a7 9 GewStG": {},
- "Gewinne aus Anteilen an nicht steuerbefreiten inl\u00e4ndischen Kapitalgesellschaften \u00a7 9 Nr. 2a GewStG": {}
- }
- },
- "Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens": {
- "Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens": {}
- },
- "Gewinnvortrag": {
- "Gewinnvortrag nach Verwendung": {}
- },
- "Sonstige Steuern ": {
- "Sonstige Steuern ": {
- "Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen f\u00fcr sonstige Steuern": {},
- "Grundsteuer": {},
- "Kfz-Steuer": {},
- "Sonstige Steuern ": {},
- "Steuererstattungen Vorjahre f\u00fcr sonstige Steuern ": {},
- "Steuernachzahkungen Vorjahre f\u00fcr sonstige Steuern ": {},
- "Verbrauchsteuer": {},
- "\u00f6kosteuer": {}
- }
- },
- "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge": {
- "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge": {
- "Diskontertr\u00e4ge": {},
- "Diskontertr\u00e4ge aus verbundenen Unternehmen": {},
- "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften (Umlaufverm\u00f6gen) 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {},
- "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften (verbundene Unternehmen) 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {},
- "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge": {},
- "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge aus verbundenen Unternehmen": {},
- "Sonstige Zinsertr\u00e4ge": {},
- "Sonstige Zinsertr\u00e4ge aus verbundenen Unternehmen": {},
- "Steuerfreie Aufzinsung des K\u00f6rperschaftsteuerguthabens nach \u00a737 KStG": {},
- "Zinsertr\u00e4ge \u00a7 233a AO": {},
- "Zinsertr\u00e4ge \u00a7 233a AO Sonderfall anlage A KSt": {},
- "Zins\u00e4hnliche Ertr\u00e4ge": {},
- "Zins\u00e4hnliche Ertr\u00e4ge aus verbundenen Unternehmen": {}
- }
- }
- },
- "root_type": "Income"
- }
- }
-}
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/fr_l10n_fr_pcg_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/unverified/fr_l10n_fr_pcg_chart_template.json
deleted file mode 100644
index d98a6a0..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/fr_l10n_fr_pcg_chart_template.json
+++ /dev/null
@@ -1,1288 +0,0 @@
-{
- "country_code": "fr",
- "name": "France - Plan Comptable G\u00e9n\u00e9ral",
- "tree": {
- "Comptes de bilan": {
- "Comptes d'immobilisations": {
- "Amortissement des immobilisations": {
- "Amortissements des immobilisations corporelles": {
- "Agencements am\u00e9nagements de terrains (m\u00eame ventilation que celle du compte 212)": {},
- "Autres immobilisations corporelles (m\u00eame ventilation que celle du compte 218)": {},
- "Constructions (m\u00eame ventilation que celle du compte 213)": {},
- "Constructions sur sol d'autrui (m\u00eame ventilation que celle du compte 214)": {},
- "Installations mat\u00e9riel et outillage industriels (m\u00eame ventilation que celle du compte 215)": {},
- "Terrains de gisement": {}
- },
- "Amortissements des immobilisations incorporelles": {
- "Autres immobilisations incorporelles": {},
- "Concessions et droits similaires, brevets, licences, logiciels, droits et valeurs similaires": {},
- "Fonds commercial": {},
- "Frais d'\u00e9tablissement (m\u00eame ventilation que celle du compte 201) ": {},
- "Frais de recherche et de d\u00e9veloppement ": {}
- },
- "Amortissements des immobilisations mises en concession": {}
- },
- "Autres immobilisations financi\u00e8res": {
- "Actions propres ou parts propres": {
- "Actions propres ou parts propres": {},
- "Actions propres ou parts propres en voie d'annulation": {}
- },
- "Autres cr\u00e9ances immobilis\u00e9es": {
- "Cr\u00e9ances diverses": {},
- "Int\u00e9r\u00eats courus": {
- "Sur cr\u00e9ances diverses": {},
- "Sur d\u00e9p\u00f4ts et cautionnements": {},
- "Sur pr\u00eats": {},
- "Sur titres immobilis\u00e9s (droits de cr\u00e9ance)": {}
- }
- },
- "D\u00e9p\u00f4ts et cautionnements vers\u00e9s": {
- "Cautionnements": {},
- "D\u00e9p\u00f4ts": {}
- },
- "Pr\u00eats": {
- "Autres pr\u00eats": {},
- "Pr\u00eats au personnel": {},
- "Pr\u00eats aux associ\u00e9s": {},
- "Pr\u00eats participatifs": {}
- },
- "Titres immobilis\u00e9s (droit de cr\u00e9ance)": {
- "Bons": {},
- "Obligations": {}
- },
- "Titres immobilis\u00e9s autres que les titres immobilis\u00e9s de l'activit\u00e9 de portefeuille (droit de propri\u00e9t\u00e9)": {
- "Actions": {},
- "Autres titres": {}
- },
- "Titres immobilis\u00e9s de l'activit\u00e9 de portefeuille (TIAP)": {},
- "Versements restant \u00e0 effectuer sur titres immobilis\u00e9s non lib\u00e9r\u00e9s": {}
- },
- "D\u00e9pr\u00e9ciation des immobilisations": {
- "D\u00e9pr\u00e9ciations des autres immobilisations financi\u00e8res": {
- "Autres cr\u00e9ances immobilis\u00e9es (m\u00eame ventilation que celle du compte 276)": {},
- "D\u00e9p\u00f4ts et cautionnements vers\u00e9s (m\u00eame ventilation que celle du compte 275)": {},
- "Pr\u00eats (m\u00eame ventilation que celle du compte 274)": {},
- "Titres immobilis\u00e9s - droit de cr\u00e9ance (m\u00eame ventilation que celle du compte 272) ": {},
- "Titres immobilis\u00e9s autres que les titres immobilis\u00e9s de l'activit\u00e9 de portefeuille - droit de propri\u00e9t\u00e9 (ventilation : 271)": {},
- "Titres immobilis\u00e9s de l'activit\u00e9 de portefeuille": {}
- },
- "D\u00e9pr\u00e9ciations des immobilisations corporelles (m\u00eame ventilation que celle du compte 21)": {
- "Terrains (autres que terrains de gisement)": {}
- },
- "D\u00e9pr\u00e9ciations des immobilisations en cours": {
- "Immobilisations corporelles en cours": {},
- "Immobilisations incorporelles en cours": {}
- },
- "D\u00e9pr\u00e9ciations des immobilisations incorporelles": {
- "Autres immobilisations incorporelles": {},
- "Droit au bail": {},
- "Fonds commercial": {},
- "Marques, proc\u00e9d\u00e9s, droits et valeurs similaires": {}
- },
- "D\u00e9pr\u00e9ciations des immobilisations mises en concession": {},
- "Provisions pour d\u00e9pr\u00e9ciation des participations et cr\u00e9ances rattach\u00e9es \u00e0 des participations": {
- "Autres formes de participation": {},
- "Cr\u00e9ances rattach\u00e9es \u00e0 des participations (m\u00eame ventilation que celle du compte 267)": {},
- "Cr\u00e9ances rattach\u00e9es \u00e0 des soci\u00e9t\u00e9s en participation (m\u00eame ventilation que celle du compte 268)": {},
- "Titres de participation": {}
- }
- },
- "Immobilisations corporelles": {
- "Agencements et am\u00e9nagements de terrains (m\u00eame ventilation que celle du compte 211)": {},
- "Autres immobilisations corporelles": {
- "Cheptel": {},
- "Emballages r\u00e9cup\u00e9rables": {},
- "Installations g\u00e9n\u00e9rales agencements am\u00e9nagements divers": {},
- "Mat\u00e9riel de bureau et mat\u00e9riel informatique ": {},
- "Mat\u00e9riel de transport": {},
- "Mobilier": {}
- },
- "Constructions": {
- "B\u00e2timents": {
- "Autres ensembles immobiliers": {
- "Affect\u00e9s aux op\u00e9rations non professionnelles (A, B, ...)": {},
- "Affect\u00e9s aux op\u00e9rations professionnelles (A, B, ...)": {}
- },
- "Ensembles immobiliers administratifs et commerciaux (A, B, ...)": {},
- "Ensembles immobiliers industriels (A, B, ...)": {}
- },
- "Installations g\u00e9n\u00e9rales agencements am\u00e9nagements des constructions (m\u00eame ventilation que celle du compte 2131)": {},
- "Ouvrages d'infrastructure": {
- "Barrages": {},
- "Pistes d'a\u00e9rodromes": {},
- "Voies d'eau": {},
- "Voies de fer": {},
- "Voies de terre": {}
- }
- },
- "Constructions sur sol d'autrui (m\u00eame ventilation que celle du compte 213)": {},
- "Installations techniques mat\u00e9riels et outillages industriels": {
- "Agencements et am\u00e9nagements du mat\u00e9riel et outillage industriels": {},
- "Installations complexes sp\u00e9cialis\u00e9es": {
- "Sur sol d'autrui": {},
- "Sur sol propre": {}
- },
- "Installations \u00e0 caract\u00e8re sp\u00e9cifique": {
- "Sur sol d'autrui": {},
- "Sur sol propre": {}
- },
- "Mat\u00e9riel industriel": {},
- "Outillage industriel": {}
- },
- "Terrains": {
- "Compte d'ordre sur immobilisations": {},
- "Sous-sols et sur-sols": {},
- "Terrains am\u00e9nag\u00e9s": {},
- "Terrains b\u00e2tis": {
- "Autres ensembles immobiliers": {
- "Affect\u00e9s aux op\u00e9rations non professionnelles (A, B, ...)": {},
- "Affect\u00e9s aux op\u00e9rations professionnelles (A, B, ...)": {}
- },
- "Ensembles immobiliers administratifs et commerciaux (A, B, ...)": {},
- "Ensembles immobiliers industriels (A, B, ...)": {}
- },
- "Terrains de gisement": {
- "Carri\u00e8res": {}
- },
- "Terrains nus": {}
- }
- },
- "Immobilisations en cours": {
- "Avances et acomptes vers\u00e9s sur commandes d'immobilisations corporelles": {
- "Autres immobilisations corporelles": {},
- "Constructions": {},
- "Installations techniques mat\u00e9riel et outillage industriels": {},
- "Terrains": {}
- },
- "Avances et acomptes vers\u00e9s sur commandes d'immobilisations incorporelles": {},
- "Immobilisations corporelles en cours": {
- "Autres immobilisations corporelles": {},
- "Constructions": {},
- "Installations techniques mat\u00e9riel et outillage industriels": {},
- "Terrains": {}
- },
- "Immobilisations incorporelles en cours ": {}
- },
- "Immobilisations incorporelles": {
- "Autres immobilisations incorporelles": {},
- "Concessions et droits similaires, brevets, licences, marques, proc\u00e9d\u00e9s, logiciels, droits et valeurs similaires": {},
- "Droit au bail": {},
- "Fonds commercial": {},
- "Frais d'\u00e9tablissement": {
- "Frais d'augmentation de capital et d'op\u00e9rations diverses (fusions, scissions, transformations)": {},
- "Frais de constitution": {},
- "Frais de premier \u00e9tablissement": {
- "Frais de prospection": {},
- "Frais de publicit\u00e9": {}
- }
- },
- "Frais de recherche et de d\u00e9veloppement": {}
- },
- "Immobilisations mises en concession": {},
- "Participations et cr\u00e9ances rattach\u00e9es \u00e0 des participations": {
- "Autres formes de participation": {},
- "Cr\u00e9ances rattach\u00e9es \u00e0 des participations": {
- "Autres cr\u00e9ances rattach\u00e9es \u00e0 des participations ": {},
- "Avances consolidables": {},
- "Cr\u00e9ances rattach\u00e9es \u00e0 des participations (groupe)": {},
- "Cr\u00e9ances rattach\u00e9es \u00e0 des participations (hors groupe)": {},
- "Int\u00e9r\u00eats courus": {},
- "Versements repr\u00e9sentatifs d'apports non capitalis\u00e9s (appel de fonds)": {}
- },
- "Cr\u00e9ances rattach\u00e9es \u00e0 des soci\u00e9t\u00e9s en participation": {
- "Int\u00e9r\u00eats courus": {},
- "Principal": {}
- },
- "Titres de participation": {
- "Actions": {},
- "Autres titres": {}
- },
- "Titres \u00e9valu\u00e9s par \u00e9quivalence": {},
- "Versements restant \u00e0 effectuer sur titres de participation non lib\u00e9r\u00e9s": {}
- },
- "Parts dans des entreprises li\u00e9es et cr\u00e9ances dans des entreprises li\u00e9es": {}
- },
- "Comptes de capitaux": {
- "Capital et r\u00e9serves": {
- "Actionnaires: capital souscrit - non appel\u00e9": {},
- "Capital": {
- "Capital souscrit - appel\u00e9 non vers\u00e9": {},
- "Capital souscrit - appel\u00e9 vers\u00e9": {
- "Capital amorti": {},
- "Capital non amorti": {}
- },
- "Capital souscrit - non appel\u00e9": {},
- "Capital souscrit soumis \u00e0 des r\u00e9glementations particuli\u00e8res": {}
- },
- "Compte de l'exploitant": {},
- "Primes li\u00e9es au capital social": {
- "Bons de souscription d'actions": {},
- "Primes d'apport": {},
- "Primes d'\u00e9mission": {},
- "Primes de conversion d'obligations en actions": {},
- "Primes de fusion": {}
- },
- "R\u00e9serves": {
- "Autres r\u00e9serves": {
- "R\u00e9serve de propre assureur": {},
- "R\u00e9serves diverses": {}
- },
- "R\u00e9serve l\u00e9gale": {
- "Plus-values nettes \u00e0 long terme": {},
- "R\u00e9serve l\u00e9gale proprement dite": {}
- },
- "R\u00e9serves indisponibles": {},
- "R\u00e9serves r\u00e9glement\u00e9es": {
- "Autres r\u00e9serves r\u00e9glement\u00e9es": {},
- "Plus-values nettes \u00e0 long terme": {},
- "R\u00e9serves cons\u00e9cutives \u00e0 l'octroi de subventions d'investissement": {}
- },
- "R\u00e9serves statutaires ou contractuelles": {}
- },
- "\u00c9carts d'\u00e9quivalence": {},
- "\u00c9carts de r\u00e9\u00e9valuation": {
- "Autres \u00e9carts de r\u00e9\u00e9valuation en France": {},
- "Autres \u00e9carts de r\u00e9\u00e9valuation \u00e0 l'\u00e9tranger": {},
- "R\u00e9serve de r\u00e9\u00e9valuation": {},
- "R\u00e9serve sp\u00e9ciale de r\u00e9\u00e9valuation": {},
- "\u00c9cart de r\u00e9\u00e9valuation libre": {},
- "\u00c9carts de r\u00e9\u00e9valuation (autres op\u00e9rations l\u00e9gales)": {}
- }
- },
- "Comptes de liaison des \u00e9tablissements et soci\u00e9t\u00e9s en participation": {
- "Biens et prestations de services \u00e9chang\u00e9s entre \u00e9tablissements (charges)": {},
- "Biens et prestations de services \u00e9chang\u00e9s entre \u00e9tablissements (produits)": {},
- "Comptes de liaison des soci\u00e9t\u00e9s en participation": {},
- "Comptes de liaison des \u00e9tablissements": {}
- },
- "Dettes rattach\u00e9es \u00e0 des participations": {
- "Dettes rattach\u00e9es \u00e0 des participations (groupe)": {},
- "Dettes rattach\u00e9es \u00e0 des participations (hors groupe)": {},
- "Dettes rattach\u00e9es \u00e0 des soci\u00e9t\u00e9s en participation": {
- "Int\u00e9r\u00eats courus": {},
- "Principal": {}
- }
- },
- "Emprunts et dettes assimil\u00e9es": {
- "Autres emprunts et dettes assimil\u00e9es": {
- "Autres dettes": {},
- "Autres emprunts": {},
- "Int\u00e9r\u00eats courus": {
- "Sur autres emprunts et dettes assimil\u00e9es": {},
- "Sur autres emprunts obligataires": {},
- "Sur d\u00e9p\u00f4ts et cautionnements re\u00e7us": {},
- "Sur emprunts aupr\u00e8s des \u00e9tablissements de cr\u00e9dit": {},
- "Sur emprunts et dettes assortis de conditions particuli\u00e8res": {},
- "Sur emprunts obligataires convertibles ": {},
- "Sur participation des salari\u00e9s aux r\u00e9sultats": {}
- },
- "Rentes viag\u00e8res capitalis\u00e9es": {}
- },
- "Autres emprunts obligataires ": {},
- "D\u00e9p\u00f4ts et cautionnements re\u00e7us": {
- "Cautionnements": {},
- "D\u00e9p\u00f4ts": {}
- },
- "Emprunts aupr\u00e8s des \u00e9tablissements de cr\u00e9dit": {},
- "Emprunts et dettes assortis de conditions particuli\u00e8res": {
- "Avances conditionn\u00e9es de l'\u00c9tat": {},
- "Emissions de titres participatifs": {},
- "Emprunts participatifs": {}
- },
- "Emprunts obligataires convertibles": {},
- "Participation des salari\u00e9s aux r\u00e9sultats": {
- "Comptes bloqu\u00e9s": {},
- "Fonds de participation": {}
- },
- "Primes de remboursement des obligations": {}
- },
- "Provisions": {
- "Autres provisions pour charges": {
- "Provisions pour remises en \u00e9tat": {}
- },
- "Provisions pour charges \u00e0 r\u00e9partir sur plusieurs exercices": {
- "Provisions pour gros entretien ou grandes r\u00e9visions ": {}
- },
- "Provisions pour imp\u00f4ts": {},
- "Provisions pour pensions et obligations similaires": {},
- "Provisions pour renouvellement des immobilisations (entreprises concessionnaires)": {},
- "Provisions pour restructurations": {},
- "Provisions pour risques": {
- "Autres provisions pour risques": {},
- "Provisions pour amendes et p\u00e9nalit\u00e9s": {},
- "Provisions pour garanties donn\u00e9es aux clients": {},
- "Provisions pour litiges": {},
- "Provisions pour pertes de change": {},
- "Provisions pour pertes sur contrats": {},
- "Provisions pour pertes sur march\u00e9s \u00e0 terme": {}
- }
- },
- "Provisions r\u00e9glement\u00e9es": {
- "Amortissements d\u00e9rogatoires": {},
- "Autres provisions r\u00e9glement\u00e9es": {},
- "Plus-values r\u00e9investies": {},
- "Provision sp\u00e9ciale de r\u00e9\u00e9valuation": {},
- "Provisions r\u00e9glement\u00e9es relatives aux autres \u00e9l\u00e9ments de l'actif": {},
- "Provisions r\u00e9glement\u00e9es relatives aux immobilisations": {
- "Provisions pour investissement (participation des salari\u00e9s)": {},
- "Provisions reconstitution des gisements miniers et p\u00e9troliers": {}
- },
- "Provisions r\u00e9glement\u00e9es relatives aux stocks": {
- "Fluctuation des cours": {},
- "Hausse des prix": {}
- }
- },
- "Report \u00e0 nouveau (solde cr\u00e9diteur ou d\u00e9biteur)": {
- "Report \u00e0 nouveau (solde cr\u00e9diteur)": {},
- "Report \u00e0 nouveau (solde d\u00e9biteur)": {}
- },
- "R\u00e9sultat de l'exercice (b\u00e9n\u00e9fice ou perte)": {
- "R\u00e9sultat de l'exercice (b\u00e9n\u00e9fice)": {},
- "R\u00e9sultat de l'exercice (perte)": {}
- },
- "Subventions d'investissement": {
- "Autres subventions d'investissement (m\u00eame ventilation que celle du compte 131)": {},
- "Subventions d'investissement inscrites au compte de r\u00e9sultat": {
- "Autres subventions d'investissement (m\u00eame ventilation que celle du compte 1391)": {},
- "Subventions d'\u00e9quipement": {
- "Autres": {},
- "Collectivit\u00e9s publiques": {},
- "Communes": {},
- "D\u00e9partements": {},
- "Entreprises et organismes priv\u00e9s ": {},
- "Entreprises publiques": {},
- "Etat": {},
- "R\u00e9gions": {}
- }
- },
- "Subventions d'\u00e9quipement": {
- "Autres": {},
- "Collectivit\u00e9s publiques": {},
- "Communes": {},
- "D\u00e9partements": {},
- "Entreprises et organismes priv\u00e9s": {},
- "Entreprises publiques": {},
- "R\u00e9gions": {},
- "\u00c9tat": {}
- }
- }
- },
- "Comptes de stocks et d'en-cours": {
- "Autres approvisionnements": {
- "Emballages": {
- "Emballages perdus": {},
- "Emballages r\u00e9cup\u00e9rables non identifiables": {},
- "Emballages \u00e0 usage mixte": {}
- },
- "Fournitures consommables": {
- "Combustibles": {},
- "Fournitures d'atelier et d usine": {},
- "Fournitures de bureau": {},
- "Fournitures de magasin": {},
- "Produits d'entretien": {}
- },
- "Mati\u00e8res consommables": {
- "Mati\u00e8re (ou groupe) C": {},
- "Mati\u00e8re (ou groupe) D": {}
- }
- },
- "En-cours de production de biens": {
- "Produits en cours": {
- "Produit en cours P 1": {},
- "Produit en cours P 2": {}
- },
- "Travaux en cours": {
- "Travaux en cours T 1": {},
- "Travaux en cours T 2": {}
- }
- },
- "En-cours de production de services": {
- "Prestations de services en cours": {
- "Prestations de services S 1": {},
- "Prestations de services S 2": {}
- },
- "\u00c9tudes en cours": {
- "\u00c9tudes en cours E 1": {},
- "\u00c9tudes en cours E 2": {}
- }
- },
- "Mati\u00e8res premi\u00e8res (et fourniture)": {
- "Fournitures A, B, C, ..": {},
- "Mati\u00e8re (ou groupe) A": {},
- "Mati\u00e8re (ou groupe) B": {}
- },
- "Provisions pour d\u00e9pr\u00e9ciation des stocks et en-cours": {
- "Provisions pour d\u00e9pr\u00e9ciation des autres approvisionnements": {
- "Emballages (m\u00eame ventilation que celle du compte 326)": {},
- "Fournitures consommables (m\u00eame ventilation que celle du compte 322)": {},
- "Mati\u00e8res consommables (m\u00eame ventilation que celle du compte 321)": {}
- },
- "Provisions pour d\u00e9pr\u00e9ciation des en-cours de production de biens": {
- "Produits en cours (m\u00eame ventilation que celle du compte 331)": {},
- "Travaux en cours (m\u00eame ventilation que celle du compte 335)": {}
- },
- "Provisions pour d\u00e9pr\u00e9ciation des en-cours de production de services": {
- "Prestations de services en cours (m\u00eame ventilation que celle du compte 345)": {},
- "\u00c9tudes en cours (m\u00eame ventilation que celle du compte 341)": {}
- },
- "Provisions pour d\u00e9pr\u00e9ciation des mati\u00e8res premi\u00e8res (et fournitures)": {
- "Fournitures A, B, C, ..": {},
- "Mati\u00e8res (ou groupe) A": {},
- "Mati\u00e8res (ou groupe) B": {}
- },
- "Provisions pour d\u00e9pr\u00e9ciation des stocks de marchandises": {
- "Marchandises (ou groupe) A": {},
- "Marchandises (ou groupe) B": {}
- },
- "Provisions pour d\u00e9pr\u00e9ciation des stocks de produits": {
- "Produits finis (m\u00eame ventilation que celle du compte 355)": {},
- "Produits interm\u00e9diaires (m\u00eame ventilation que celle du compte 351)": {}
- }
- },
- "Stocks de marchandises": {
- "Marchandises (ou groupe) A": {},
- "Marchandises (ou groupe) B": {}
- },
- "Stocks de produits": {
- "Produits finis": {
- "Produits finis (ou groupe) A": {},
- "Produits finis (ou groupe) B": {}
- },
- "Produits interm\u00e9diaires": {
- "Produits interm\u00e9diaires (ou groupe) A ": {},
- "Produits interm\u00e9diaires (ou groupe) B": {}
- },
- "Produits r\u00e9siduels (ou mati\u00e8res de r\u00e9cup\u00e9ration)": {
- "D\u00e9chets": {},
- "Mati\u00e8res de r\u00e9cup\u00e9ration": {},
- "Rebuts": {}
- }
- },
- "Stocks en voie d'acheminement": {},
- "Stocks provenant d'immobilisations": {}
- },
- "Comptes de tiers": {
- "Clients et comptes rattach\u00e9s": {
- "Clients": {
- "Clients - Retenues de garantie": {
- "account_type": "Receivable"
- },
- "Clients - Ventes de biens ou de prestations de services": {
- "account_type": "Receivable"
- }
- },
- "Clients - Effets \u00e0 recevoir": {
- "account_type": "Receivable"
- },
- "Clients - Produits non encore factur\u00e9s": {
- "Clients - Factures \u00e0 \u00e9tablir ": {
- "account_type": "Receivable"
- },
- "Clients - Int\u00e9r\u00eats courus": {
- "account_type": "Receivable"
- }
- },
- "Clients cr\u00e9diteurs": {
- "Clients - Autres avoirs ": {},
- "Clients - Avances et acomptes re\u00e7us sur commandes": {},
- "Clients - Dettes pour emballages et mat\u00e9riels consign\u00e9s ": {},
- "Rabais, remises, ristournes \u00e0 accorder et autres avoirs \u00e0 \u00e9tablir": {}
- },
- "Clients douteux ou litigieux": {
- "account_type": "Receivable"
- },
- "Clients et comptes rattach\u00e9s ": {
- "account_type": "Receivable"
- }
- },
- "Comptes de r\u00e9gularisation": {
- "Charges constat\u00e9es d'avance": {
- "account_type": "Receivable"
- },
- "Charges \u00e0 r\u00e9partir sur plusieurs exercices ": {
- "Frais d'\u00e9mission des emprunts": {
- "account_type": "Receivable"
- }
- },
- "Comptes de r\u00e9partition p\u00e9riodique des charges et des produits": {
- "Charges": {},
- "Produits": {
- "account_type": "Receivable"
- }
- },
- "Produits constat\u00e9s d'avance": {},
- "Quotas d'\u00e9mission allou\u00e9s par l'\u00c9tat": {
- "account_type": "Receivable"
- }
- },
- "Comptes transitoires ou d'attente": {
- "Autres comptes transitoires": {},
- "Comptes d'attente 1": {
- "account_type": "Receivable"
- },
- "Comptes d'attente 2": {
- "account_type": "Receivable"
- },
- "Comptes d'attente 3": {
- "account_type": "Receivable"
- },
- "Comptes d'attente 4": {
- "account_type": "Receivable"
- },
- "Comptes d'attente 5": {
- "account_type": "Receivable"
- },
- "Diff\u00e9rences de conversion - ACTIF": {
- "Augmentation des dettes": {
- "account_type": "Receivable"
- },
- "Diff\u00e9rences compens\u00e9es par couverture de change": {
- "account_type": "Receivable"
- },
- "Diminution des cr\u00e9ances": {
- "account_type": "Receivable"
- }
- },
- "Diff\u00e9rences de conversion - PASSIF": {
- "Augmentation des cr\u00e9ances": {},
- "Diff\u00e9rences compens\u00e9es par couverture de change": {},
- "Diminution des dettes": {}
- }
- },
- "D\u00e9biteurs divers et cr\u00e9diteurs divers": {
- "Autres comptes d\u00e9biteurs ou cr\u00e9diteurs": {},
- "Cr\u00e9ances sur cessions d'immobilisations": {
- "account_type": "Receivable"
- },
- "Cr\u00e9ances sur cessions de valeurs mobili\u00e8res de placement": {
- "account_type": "Receivable"
- },
- "Dettes sur acquisitions de valeurs mobili\u00e8res de placement": {},
- "Divers - Charges \u00e0 payer et produits \u00e0 recevoir": {
- "Charges \u00e0 payer": {},
- "Produits \u00e0 recevoir": {
- "account_type": "Receivable"
- }
- }
- },
- "D\u00e9pr\u00e9ciations des comptes de tiers": {
- "D\u00e9pr\u00e9ciation des comptes de clients": {},
- "D\u00e9pr\u00e9ciation des comptes du groupe et des associ\u00e9s": {
- "Comptes courants des associ\u00e9s": {},
- "Comptes du groupe": {},
- "Op\u00e9rations faites en commun et en GIE": {}
- },
- "D\u00e9pr\u00e9ciations des comptes de d\u00e9biteurs divers": {
- "Autres comptes d\u00e9biteurs": {
- "account_type": "Receivable"
- },
- "Cr\u00e9ances sur cessions d'immobilisations": {
- "account_type": "Receivable"
- },
- "Cr\u00e9ances sur cessions de valeurs mobili\u00e8res de placement": {
- "account_type": "Receivable"
- }
- }
- },
- "Etat et autres collectivit\u00e9s publiques": {
- "Autres imp\u00f4ts, taxes et versements assimil\u00e9s": {},
- "Obligations cautionn\u00e9es": {},
- "Op\u00e9rations particuli\u00e8res avec l'\u00c9tat, les collectivit\u00e9s publiques, les organismes internationaux": {
- "Cr\u00e9ances sur l'\u00c9tat r\u00e9sultant de la suppression de la r\u00e8gle du d\u00e9calage d'un mois en mati\u00e8re de TVA": {
- "account_type": "Receivable"
- },
- "Int\u00e9r\u00eats courus sur cr\u00e9ances figurant au compte 4431": {}
- },
- "Quotas d'\u00e9mission \u00e0 restituer \u00e0 l'\u00c9tat": {},
- "\u00c9tat - Charges \u00e0 payer et produits \u00e0 recevoir": {
- "Charges fiscales sur cong\u00e9s \u00e0 payer ": {},
- "Charges \u00e0 payer": {},
- "Produits \u00e0 recevoir": {}
- },
- "\u00c9tat - Imp\u00f4ts sur les b\u00e9n\u00e9fices": {},
- "\u00c9tat - Subventions \u00e0 recevoir": {
- "Avances sur subventions": {
- "account_type": "Receivable"
- },
- "Subventions d'exploitation": {
- "account_type": "Receivable"
- },
- "Subventions d'investissement": {
- "account_type": "Receivable"
- },
- "Subventions d'\u00e9quilibre": {
- "account_type": "Receivable"
- }
- },
- "\u00c9tat - Taxes sur le chiffre d'affaires": {
- "TVA due intracommunautaire": {
- "TVA due intracommunautaire (Autre taux)": {},
- "TVA due intracommunautaire (Taux Interm\u00e9diaire)": {},
- "TVA due intracommunautaire (Taux Normal)": {}
- },
- "Taxes sur le chiffre d'affaires collect\u00e9es par l'entreprise": {
- "TVA collect\u00e9e": {
- "TVA collect\u00e9e (Autre taux)": {},
- "TVA collect\u00e9e (Taux Interm\u00e9diaire)": {},
- "TVA collect\u00e9e (Taux Normal)": {}
- },
- "Taxes assimil\u00e9es \u00e0 la TVA": {}
- },
- "Taxes sur le chiffre d'affaires d\u00e9ductibles": {
- "Cr\u00e9dit de TVA \u00e0 reporter": {},
- "TVA d\u00e9ductible intracommunautaire": {},
- "TVA sur autres biens et services": {},
- "TVA sur immobilisations": {},
- "TVA transf\u00e9r\u00e9e par d'autres entreprises": {},
- "Taxes assimil\u00e9es \u00e0 la TVA": {}
- },
- "Taxes sur le chiffre d'affaires \u00e0 d\u00e9caisser": {
- "TVA \u00e0 d\u00e9caisser": {},
- "Taxes assimil\u00e9es \u00e0 la TVA": {}
- },
- "Taxes sur le chiffre d'affaires \u00e0 r\u00e9gulariser ou en attente": {
- "Acomptes - R\u00e9gime du forfait": {},
- "Acomptes - R\u00e9gime simplifi\u00e9 d'imposition": {},
- "Remboursement de taxes sur le chiffre d'affaires demand\u00e9": {},
- "TVA r\u00e9cup\u00e9r\u00e9e d'avance": {},
- "Taxes sur le chiffre d'affaires sur factures non parvenues": {},
- "Taxes sur le chiffre d'affaires sur factures \u00e0 \u00e9tablir": {}
- }
- },
- "\u00c9tat -Imp\u00f4ts et taxes recouvrables sur des tiers ": {
- "Associ\u00e9s": {},
- "Obligataires": {}
- }
- },
- "Fournisseurs et comptes rattach\u00e9s": {
- "Fournisseurs": {
- "Fournisseurs - Achats de biens et prestations de services": {
- "account_type": "Payable"
- },
- "Fournisseurs - Retenues de garantie": {
- "account_type": "Payable"
- }
- },
- "Fournisseurs - Effets \u00e0 payer": {
- "account_type": "Payable"
- },
- "Fournisseurs - Factures non parvenues": {
- "Fournisseurs": {
- "account_type": "Payable"
- },
- "Fournisseurs - Int\u00e9r\u00eats courus": {
- "account_type": "Payable"
- },
- "Fournisseurs d'immobilisations ": {
- "account_type": "Payable"
- }
- },
- "Fournisseurs d'immobilisations": {
- "Fournisseurs - Achats d'immobilisations": {
- "account_type": "Payable"
- },
- "Fournisseurs d'immobilisations - Retenues de garantie": {
- "account_type": "Payable"
- }
- },
- "Fournisseurs d'immobilisations - Effets \u00e0 payer": {
- "account_type": "Payable"
- },
- "Fournisseurs d\u00e9biteurs": {
- "Fournisseurs - Autres avoirs": {
- "Fournisseurs d'exploitation": {},
- "Fournisseurs d'immobilisations": {}
- },
- "Fournisseurs - Avances et acomptes vers\u00e9s sur commandes": {},
- "Fournisseurs - Cr\u00e9ances pour emballages et mat\u00e9riel \u00e0 rendre": {},
- "Rabais, remises, ristournes \u00e0 obtenir et autres avoirs non encore re\u00e7us": {}
- },
- "Fournisseurs et comptes rattach\u00e9s ": {
- "account_type": "Payable"
- }
- },
- "Groupe et associ\u00e9s": {
- "Associ\u00e9s - Comptes courants": {
- "Int\u00e9r\u00eats courus": {
- "account_type": "Payable"
- },
- "Principal": {
- "account_type": "Payable"
- },
- "account_type": "Payable"
- },
- "Associ\u00e9s - Dividendes \u00e0 payer": {},
- "Associ\u00e9s - Op\u00e9rations faites en commun et en GIE": {
- "Int\u00e9r\u00eats courus": {
- "account_type": "Receivable"
- },
- "Op\u00e9rations courantes": {
- "account_type": "Receivable"
- }
- },
- "Associ\u00e9s - Op\u00e9rations sur le capital": {
- "Actionnaires d\u00e9faillants": {
- "account_type": "Receivable"
- },
- "Apporteurs - Capital appel\u00e9, non vers\u00e9": {
- "Actionnaires - Capital souscrit et appel\u00e9, non vers\u00e9": {
- "account_type": "Receivable"
- },
- "Associ\u00e9s - Capital appel\u00e9, non vers\u00e9": {
- "account_type": "Receivable"
- }
- },
- "Associ\u00e9s - Capital \u00e0 rembourser": {
- "account_type": "Receivable"
- },
- "Associ\u00e9s - Comptes d'apport en soci\u00e9t\u00e9": {
- "Apports en nature": {
- "account_type": "Receivable"
- },
- "Apports en num\u00e9raire": {
- "account_type": "Receivable"
- }
- },
- "Associ\u00e9s - Versements anticip\u00e9s": {
- "account_type": "Receivable"
- },
- "Associ\u00e9s - Versements re\u00e7us sur augmentation de capital": {
- "account_type": "Receivable"
- }
- },
- "Groupe": {
- "account_type": "Receivable"
- }
- },
- "Personnel et comptes rattach\u00e9s": {
- "Comit\u00e9s d'entreprise d'\u00e9tablissement ": {},
- "Participation des salari\u00e9s aux r\u00e9sultats": {
- "Comptes courants": {},
- "R\u00e9serve sp\u00e9ciale": {}
- },
- "Personnel - Avances et acomptes": {
- "account_type": "Receivable"
- },
- "Personnel - Charges \u00e0 payer et produits \u00e0 recevoir": {
- "Autres charges \u00e0 payer": {},
- "Dettes provisionn\u00e9es pour cong\u00e9s \u00e0 payer": {},
- "Dettes provisionn\u00e9es pour participation des salari\u00e9s aux r\u00e9sultats": {},
- "Produits \u00e0 recevoir": {
- "account_type": "Receivable"
- }
- },
- "Personnel - D\u00e9p\u00f4ts": {},
- "Personnel - Oppositions": {},
- "Personnel - R\u00e9mun\u00e9rations dues": {}
- },
- "S\u00e9curit\u00e9 Sociale et autres organismes sociaux": {
- "Autres organismes sociaux": {},
- "Organismes sociaux - Charges \u00e0 payer et produits \u00e0 recevoir": {
- "Autres charges \u00e0 payer": {},
- "Charges sociales sur cong\u00e9s \u00e0 payer ": {},
- "Produits \u00e0 recevoir": {
- "account_type": "Receivable"
- }
- },
- "S\u00e9curit\u00e9 Sociale": {}
- }
- },
- "Comptes financiers": {
- "Banques \u00e9tablissements financiers et assimil\u00e9s": {
- "Autres organismes financiers": {
- "account_type": "Cash"
- },
- "Banques": {
- "Comptes en devises": {
- "account_type": "Cash"
- },
- "Comptes en monnaie nationale": {}
- },
- "Caisses du Tr\u00e9sor et des \u00e9tablissements publics": {
- "account_type": "Cash"
- },
- "Ch\u00e8ques postaux": {
- "account_type": "Cash"
- },
- "Concours bancaires courants": {
- "Cr\u00e9dit de mobilisation de cr\u00e9ances commerciales (CMCC)": {
- "account_type": "Cash"
- },
- "Int\u00e9r\u00eats courus sur concours bancaires courants": {
- "account_type": "Cash"
- },
- "Mobilisation de cr\u00e9ances n\u00e9es \u00e0 l'\u00e9tranger": {
- "account_type": "Cash"
- }
- },
- "Int\u00e9r\u00eats courus": {
- "Int\u00e9r\u00eats courus \u00e0 payer": {
- "account_type": "Cash"
- },
- "Int\u00e9r\u00eats courus \u00e0 recevoir": {
- "account_type": "Cash"
- }
- },
- "Soci\u00e9t\u00e9s de bourse": {
- "account_type": "Cash"
- },
- "Valeurs \u00e0 l'encaissement": {
- "Ch\u00e8ques \u00e0 encaisser": {
- "account_type": "Cash"
- },
- "Coupons \u00e9chus \u00e0 l'encaissement": {
- "account_type": "Cash"
- },
- "Effets \u00e0 l'encaissement": {
- "account_type": "Cash"
- },
- "Effets \u00e0 l'escompte": {
- "account_type": "Cash"
- }
- }
- },
- "Caisse": {
- "Caisse si\u00e8ge social": {
- "Caisse en devises": {
- "account_type": "Cash"
- },
- "Caisse en monnaie nationale": {
- "account_type": "Cash"
- }
- },
- "Caisse succursale (ou usine) A": {
- "account_type": "Cash"
- },
- "Caisse succursale (ou usine) B": {
- "account_type": "Cash"
- }
- },
- "Instruments de tr\u00e9sorerie": {},
- "Provisions pour d\u00e9pr\u00e9ciation des comptes financiers": {
- "Provisions pour d\u00e9pr\u00e9ciation des valeurs mobili\u00e8res de placement": {
- "Actions": {
- "account_type": "Cash"
- },
- "Autres titres conf\u00e9rant un droit de propri\u00e9t\u00e9 ": {
- "account_type": "Cash"
- },
- "Autres valeurs mobili\u00e8res de placement et cr\u00e9ances assimil\u00e9es (provisions)": {
- "account_type": "Cash"
- },
- "Obligations": {
- "account_type": "Cash"
- }
- }
- },
- "R\u00e9gies d'avances et accr\u00e9ditifs": {},
- "Valeurs mobili\u00e8res de placement": {
- "Actions": {
- "Titres cot\u00e9s": {
- "account_type": "Cash"
- },
- "Titres non cot\u00e9s": {
- "account_type": "Cash"
- }
- },
- "Actions propres": {
- "account_type": "Cash"
- },
- "Autres titres conf\u00e9rant un droit de propri\u00e9t\u00e9": {
- "account_type": "Cash"
- },
- "Autres valeurs mobili\u00e8res de placement et autres cr\u00e9ances assimil\u00e9es": {
- "Autres valeurs mobili\u00e8res": {
- "account_type": "Cash"
- },
- "Bons de souscription": {
- "account_type": "Cash"
- },
- "Int\u00e9r\u00eats courus sur obligations, bons et valeurs assimil\u00e9es": {
- "account_type": "Cash"
- }
- },
- "Bons du Tr\u00e9sor et bons de caisse \u00e0 court terme": {
- "account_type": "Cash"
- },
- "Obligations": {
- "Titres cot\u00e9s": {
- "account_type": "Cash"
- },
- "Titres non cot\u00e9s": {
- "account_type": "Cash"
- }
- },
- "Obligations et bons \u00e9mis par la soci\u00e9t\u00e9 et rachet\u00e9s par elle": {
- "account_type": "Cash"
- },
- "Parts dans entreprises li\u00e9es": {
- "account_type": "Cash"
- },
- "Versements restant \u00e0 effectuer sur valeurs mobili\u00e8res de placement non lib\u00e9r\u00e9es": {
- "account_type": "Cash"
- }
- },
- "Virements internes": {}
- },
- "root_type": ""
- },
- "Comptes de gestion": {
- "Comptes de charges": {
- "Achats(sauf 603)": {},
- "Autres charges de gestion courante": {
- "Charges diverses de gestion courante": {},
- "Jetons de pr\u00e9sence": {},
- "Pertes sur cr\u00e9ances irr\u00e9couvrables": {
- "Cr\u00e9ances de l'exercice": {},
- "Cr\u00e9ances des exercices ant\u00e9rieurs": {}
- },
- "Quotes-parts de r\u00e9sultat sur op\u00e9rations faites en commun": {
- "Quote-part de b\u00e9n\u00e9fice transf\u00e9r\u00e9e (comptabilit\u00e9 du g\u00e9rant)": {},
- "Quote-part de perte support\u00e9e (comptabilit\u00e9 des associ\u00e9s non g\u00e9rants)": {}
- },
- "Redevances pour concessions, brevets, licences, marques, proc\u00e9d\u00e9s, logiciels, droits et valeurs similaires": {
- "Autres droits et valeurs similaires": {},
- "Droits d'auteur et de reproduction": {},
- "Redevances pour concessions brevets, licences, marques, proc\u00e9d\u00e9s, logiciels ": {}
- }
- },
- "Autres services ext\u00e9rieurs": {
- "Divers": {
- "Concours divers (cotisations...)": {},
- "Frais de recrutement de personnel": {}
- },
- "D\u00e9placements missions et r\u00e9ceptions": {
- "Frais de d\u00e9m\u00e9nagement": {},
- "Missions": {},
- "R\u00e9ceptions": {},
- "Voyages et d\u00e9placements": {}
- },
- "Frais postaux et frais de t\u00e9l\u00e9communications": {},
- "Personnel ext\u00e9rieur \u00e0 l'entreprise": {
- "Personnel d\u00e9tach\u00e9 ou pr\u00eat\u00e9 \u00e0 l'entreprise": {},
- "Personnel int\u00e9rimaire": {}
- },
- "Rabais, remises et ristournes obtenus sur autres services ext\u00e9rieurs": {},
- "R\u00e9mun\u00e9rations d'interm\u00e9diaires et honoraires ": {
- "Commissions et courtages sur achats ": {},
- "Commissions et courtages sur ventes": {},
- "R\u00e9mun\u00e9rations des transitaires": {}
- },
- "Services bancaires et assimil\u00e9s": {
- "Autres frais et commissions sur prestations de services": {},
- "Commissions et frais sur \u00e9mission d'emprunts": {},
- "Frais sur effets": {},
- "Frais sur titres (achat, vente, garde)": {},
- "Location de coffres": {}
- }
- },
- "Charges de personnel": {
- "Autres charges de personnel": {},
- "Autres charges sociales": {
- "M\u00e9decine du travail pharmacie": {},
- "Prestations directes": {},
- "Versements aux autres oeuvres sociales": {},
- "Versements aux comit\u00e9s d'entreprise et d'\u00e9tablissement": {},
- "Versements aux comit\u00e9s d'hygi\u00e8ne et de s\u00e9curit\u00e9": {}
- },
- "Charges de S\u00e9curit\u00e9 sociale et de pr\u00e9voyance": {
- "Cotisations aux ASSEDIC": {},
- "Cotisations aux autres organismes sociaux": {},
- "Cotisations aux caisses de retraites": {},
- "Cotisations aux mutuelles": {},
- "Cotisations \u00e0 l'URSSAF": {}
- },
- "Cotisations sociales personnelles de l'exploitant": {},
- "R\u00e9mun\u00e9ration du travail de l'exploitant": {},
- "R\u00e9mun\u00e9rations du personnel": {
- "Cong\u00e9s pay\u00e9s": {},
- "Indemnit\u00e9s et avantages divers": {},
- "Primes et gratifications": {},
- "Salaires et appointements": {},
- "Suppl\u00e9ment familial": {}
- }
- },
- "Charges exceptionnelles": {
- "Autres charges exceptionnelles": {
- "Charges exceptionnelles diverses": {},
- "Lots": {},
- "Malis provenant de clauses d'indexation ": {},
- "Malis provenant du rachat par l'entreprise d'actions et obligations \u00e9mises par elle-m\u00eame": {}
- },
- "Charges exceptionnelles sur op\u00e9rations de gestion": {
- "Autres charges exceptionnelles sur op\u00e9ration de gestion": {},
- "Cr\u00e9ances devenues irr\u00e9couvrables dans l'exercice": {},
- "Dons, lib\u00e9ralit\u00e9s": {},
- "P\u00e9nalit\u00e9s sur march\u00e9s (et d\u00e9dits pay\u00e9s sur achats et ventes)": {},
- "P\u00e9nalit\u00e9s, amendes fiscales et p\u00e9nales ": {},
- "Rappels d'imp\u00f4ts (autres qu'imp\u00f4ts sur les b\u00e9n\u00e9fices)": {},
- "Subventions accord\u00e9es": {}
- },
- "Charges sur exercices ant\u00e9rieurs (en cours d'exercice seulement)": {},
- "Valeurs comptables des \u00e9l\u00e9ments d'actif c\u00e9d\u00e9s": {
- "Autres \u00e9l\u00e9ments d'actif": {},
- "Immobilisations corporelles": {},
- "Immobilisations financi\u00e8res": {},
- "Immobilisations incorporelles": {}
- }
- },
- "Charges financi\u00e8res": {
- "Autres charges financi\u00e8res": {},
- "Charges d'int\u00e9r\u00eat": {
- "Int\u00e9r\u00eats bancaires et sur op\u00e9rations de financement (escompte, ...)": {},
- "Int\u00e9r\u00eats des autres dettes": {
- "Int\u00e9r\u00eats des dettes commerciales": {},
- "Int\u00e9r\u00eats des dettes diverses": {}
- },
- "Int\u00e9r\u00eats des comptes courants et des d\u00e9p\u00f4ts cr\u00e9diteurs": {},
- "Int\u00e9r\u00eats des emprunts et dettes": {
- "Int\u00e9r\u00eats des dettes rattach\u00e9es \u00e0 des participations": {},
- "Int\u00e9r\u00eats des emprunts et dettes assimil\u00e9es": {}
- },
- "Int\u00e9r\u00eats des obligations cautionn\u00e9es": {}
- },
- "Charges nettes sur cessions de valeurs mobili\u00e8res de placement": {},
- "Escomptes accord\u00e9s": {},
- "Pertes de change": {},
- "Pertes sur cr\u00e9ances li\u00e9es \u00e0 des participations": {}
- },
- "Dotations aux amortissements, d\u00e9pr\u00e9ciations et provisions": {
- "Dotations aux amortissements, d\u00e9pr\u00e9ciations et provisions - Charges d'exploitation": {
- "Dotations aux amortissements des charges d'exploitation \u00e0 r\u00e9partir": {},
- "Dotations aux amortissements des immobilisations incorporelles et corporelles ": {
- "Immobilisations corporelles": {},
- "Immobilisations incorporelles": {}
- },
- "Dotations aux provisions pour d\u00e9pr\u00e9ciation des actifs circulants": {
- "Cr\u00e9ances": {},
- "Stocks et en-cours": {}
- },
- "Dotations aux provisions pour risques et charges d'exploitation": {},
- "Dotations pour d\u00e9pr\u00e9ciations des immobilisations incorporelles et corporelles": {
- "Immobilisations corporelles": {},
- "Immobilisations incorporelles": {}
- }
- },
- "Dotations aux amortissements, d\u00e9pr\u00e9ciations et provisions - Charges exceptionnelles": {
- "Dotations aux amortissements exceptionnels des immobilisations": {},
- "Dotations aux autres provisions r\u00e9glement\u00e9es": {},
- "Dotations aux d\u00e9pr\u00e9ciations exceptionnelles": {},
- "Dotations aux provisions exceptionnelles": {},
- "Dotations aux provisions r\u00e9glement\u00e9es (immobilisations)": {
- "Amortissements d\u00e9rogatoires": {}
- },
- "Dotations aux provisions r\u00e9glement\u00e9es (stocks)": {}
- },
- "Dotations aux amortissements, d\u00e9pr\u00e9ciations et provisions - Charges financi\u00e8res": {
- "Autres dotations": {},
- "Dotations aux amortissements des primes de remboursement des obligations": {},
- "Dotations aux d\u00e9pr\u00e9ciation des \u00e9l\u00e9ments financiers": {
- "Immobilisations financi\u00e8res": {},
- "Valeurs mobili\u00e8res de placement": {}
- },
- "Dotations aux provisions pour risques et charges financiers": {}
- }
- },
- "Imp\u00f4ts, taxes et versements assimil\u00e9s": {
- "Autres imp\u00f4ts, taxes et versements assimil\u00e9s (administration des imp\u00f4ts)": {
- "Autres droits": {},
- "Droits d'enregistrement et de timbre": {
- "Droits de mutation": {}
- },
- "Imp\u00f4ts directs (sauf imp\u00f4ts sur les b\u00e9n\u00e9fices)": {
- "Autres imp\u00f4ts locaux": {},
- "Taxe professionnelle": {},
- "Taxe sur les v\u00e9hicules des soci\u00e9t\u00e9s": {},
- "Taxes fonci\u00e8res": {}
- },
- "Imp\u00f4ts indirects": {},
- "Taxes sur le chiffre d'affaires non r\u00e9cup\u00e9rables ": {}
- },
- "Autres imp\u00f4ts, taxes et versements assimil\u00e9s (autres organismes)": {
- "Contribution sociale de solidarit\u00e9 \u00e0 la charge des soci\u00e9t\u00e9s": {},
- "Imp\u00f4ts et taxes exigibles \u00e0 l'\u00e9tranger": {},
- "Taxes diverses": {},
- "Taxes per\u00e7ues par les organismes publics internationaux": {}
- },
- "Imp\u00f4ts, taxes et versements assimil\u00e9s sur r\u00e9mun\u00e9rations (administration des imp\u00f4ts) ": {
- "Autres": {},
- "Cotisation pour d\u00e9faut d'investissement obligatoire dans la construction": {},
- "Participation des employeurs \u00e0 la formation professionnelle continue": {},
- "Taxe d'apprentissage": {},
- "Taxe sur les salaires": {}
- },
- "Imp\u00f4ts, taxes et versements assimil\u00e9s sur r\u00e9mun\u00e9rations (autres organismes)": {
- "Allocation logement": {},
- "Autres": {},
- "Participation des employeurs \u00e0 l'effort de construction": {},
- "Participation des employeurs \u00e0 la formation professionnelle continue": {},
- "Versement de transport": {},
- "Versements lib\u00e9ratoires ouvrant droit \u00e0 l'exon\u00e9ration de la taxe d'apprentissage": {}
- }
- },
- "Participation des salari\u00e9s - Imp\u00f4ts sur les b\u00e9n\u00e9fices et assimil\u00e9s": {
- "Imposition forfaitaire annuelle des soci\u00e9t\u00e9s": {},
- "Imp\u00f4ts sur les b\u00e9n\u00e9fices": {
- "Contribution additionnelle \u00e0 l'imp\u00f4t sur les b\u00e9n\u00e9fices": {},
- "Imp\u00f4ts dus en France": {},
- "Imp\u00f4ts dus \u00e0 l'\u00e9tranger": {}
- },
- "Int\u00e9gration fiscale": {
- "Int\u00e9gration fiscale - Charges": {},
- "Int\u00e9gration fiscale - Produits": {}
- },
- "Participation des salari\u00e9s aux r\u00e9sultats": {},
- "Produits, Reports en arri\u00e8re des d\u00e9ficits": {},
- "Suppl\u00e9ment d'imp\u00f4t sur les soci\u00e9t\u00e9s li\u00e9 aux distributions": {}
- }
- },
- "Comptes de produits": {
- "Autres produits de gestion courante": {
- "Jetons de pr\u00e9sence et r\u00e9mun\u00e9rations d'administrateurs, g\u00e9rants..": {},
- "Produits divers de gestion courante": {},
- "Quotes-parts de r\u00e9sultats sur op\u00e9rations faites en commun": {
- "Quote-part de b\u00e9n\u00e9fice attribu\u00e9e (comptabilit\u00e9 des associ\u00e9s non-g\u00e9rants)": {},
- "Quote-part de perte transf\u00e9r\u00e9e (comptabilit\u00e9 du g\u00e9rant)": {}
- },
- "Redevances pour concessions, brevets, licences, marques, proc\u00e9d\u00e9s, logiciels, droits et valeurs similaires": {
- "Autres droits et valeurs similaires": {},
- "Droits d'auteur et de reproduction": {},
- "Redevances pour concessions, brevets, licences, marques, proc\u00e9d\u00e9s, logiciels ": {}
- },
- "Revenus des immeubles non affect\u00e9s aux activit\u00e9s professionnelles": {},
- "Ristournes per\u00e7ues des coop\u00e9ratives (provenant des exc\u00e9dents)": {}
- },
- "Production immobilis\u00e9e": {
- "Immobilisations corporelles": {},
- "Immobilisations incorporelles ": {}
- },
- "Production stock\u00e9e (ou d\u00e9stockage)": {
- "Variation des stocks (en-cours de production, produits)": {
- "Variation des en-cours de production de biens": {
- "Produits en cours": {},
- "Travaux en cours": {}
- },
- "Variation des en-cours de production de services": {
- "Prestations de services en cours": {},
- "\u00c9tudes en cours": {}
- },
- "Variation des stocks de produits": {
- "Produits finis": {},
- "Produits interm\u00e9diaires ": {},
- "Produits r\u00e9siduels": {}
- }
- }
- },
- "Produits exceptionnels": {
- "Autres produits exceptionnels": {
- "Bonis provenant de clauses d'indexation ": {},
- "Bonis provenant du rachat par l'entreprise d'actions et d'obligations \u00e9mises par elle-m\u00eame": {},
- "Lots": {},
- "Produits exceptionnels divers": {}
- },
- "Produits des cessions d'\u00e9l\u00e9ments d'actif": {
- "Autres \u00e9l\u00e9ments d'actif": {},
- "Immobilisations corporelles": {},
- "Immobilisations financi\u00e8res": {},
- "Immobilisations incorporelles": {}
- },
- "Produits exceptionnels sur op\u00e9rations de gestion": {
- "Autres produits exceptionnels sur op\u00e9rations de gestion": {},
- "D\u00e9dits et p\u00e9nalit\u00e9s per\u00e7us sur achats et sur ventes": {},
- "D\u00e9gr\u00e8vements d'imp\u00f4ts autres qu'imp\u00f4ts sur les b\u00e9n\u00e9fices": {},
- "Lib\u00e9ralit\u00e9s re\u00e7ues": {},
- "Rentr\u00e9es sur cr\u00e9ances amorties": {},
- "Subventions d'\u00e9quilibre": {}
- },
- "Produits sur exercices ant\u00e9rieurs (en cours d'exercice seulement)": {},
- "Quote-part des subventions d'investissement vir\u00e9e au r\u00e9sultat de l'exercice": {}
- },
- "Produits financiers": {
- "Autres produits financiers": {},
- "Escomptes obtenus": {},
- "Gains de change": {},
- "Produits de participations": {
- "Revenus des cr\u00e9ances rattach\u00e9es \u00e0 des participations": {},
- "Revenus des titres de participation": {},
- "Revenus sur autres formes de participation ": {}
- },
- "Produits des autres immobilisations financi\u00e8res": {
- "Revenus des cr\u00e9ances immobilis\u00e9es": {},
- "Revenus des pr\u00eats": {},
- "Revenus des titres immobilis\u00e9s": {}
- },
- "Produits nets sur cessions de valeurs mobili\u00e8res de placement": {},
- "Revenus des autres cr\u00e9ances": {
- "Revenus des cr\u00e9ances commerciales ": {},
- "Revenus des cr\u00e9ances diverses": {}
- },
- "Revenus des valeurs mobili\u00e8res de placement": {}
- },
- "Reprises sur amortissements, d\u00e9pr\u00e9ciations et provisions": {
- "Reprises sur amortissements, d\u00e9pr\u00e9ciations et provisions (\u00e0 inscrire dans les produits d'exploitation)": {
- "Reprises sur amortissements des immobilisations incorporelles et corporelles ": {
- "Immobilisations corporelles": {},
- "Immobilisations incorporelles": {}
- },
- "Reprises sur d\u00e9pr\u00e9ciations des actifs circulants": {
- "Cr\u00e9ances": {},
- "Stocks et en-cours": {}
- },
- "Reprises sur d\u00e9pr\u00e9ciations des immobilisations corporelles et incorporelles": {
- "Immobilisations corporelles": {},
- "Immobilisations incorporelles": {}
- },
- "Reprises sur provisions d'exploitation": {}
- },
- "Reprises sur d\u00e9pr\u00e9ciations et provisions (\u00e0 inscrire dans les produits exceptionnels)": {
- "Reprises pour d\u00e9pr\u00e9ciations exceptionnelles": {},
- "Reprises sur autres provisions r\u00e9glement\u00e9es ": {},
- "Reprises sur provisions exceptionnelles": {},
- "Reprises sur provisions r\u00e9glement\u00e9es (immobilisations)": {
- "Amortissements d\u00e9rogatoires": {},
- "Plus-values r\u00e9investies": {},
- "Provision sp\u00e9ciale de r\u00e9\u00e9valuation": {}
- },
- "Reprises sur provisions r\u00e9glement\u00e9es (stocks) ": {}
- },
- "Reprises sur d\u00e9pr\u00e9ciations et provisions (\u00e0 inscrire dans les produits financiers)": {
- "Reprises sur d\u00e9pr\u00e9ciations des \u00e9l\u00e9ments financiers": {
- "Immobilisations financi\u00e8res": {},
- "Valeurs mobili\u00e8res de placement": {}
- },
- "Reprises sur provisions financiers": {}
- }
- },
- "Subventions d'exploitation": {},
- "Transferts de charges": {
- "Transferts de charges d'exploitation": {},
- "Transferts de charges exceptionnelles": {},
- "Transferts de charges financi\u00e8res": {}
- },
- "Ventes de produits fabriqu\u00e9s - Prestations de service - Marchandises": {
- "Produits des activit\u00e9s annexes": {
- "Autres produits d'activit\u00e9s annexes (cessions d'approvisionnements...)": {},
- "Bonifications obtenues des clients et primes sur ventes": {},
- "Bonis sur reprises d'emballages consign\u00e9s": {},
- "Commissions et courtages": {},
- "Locations diverses": {},
- "Mise \u00e0 disposition de personnel factur\u00e9e ": {},
- "Ports et frais accessoires factur\u00e9s": {},
- "Produits des services exploit\u00e9s dans l'int\u00e9r\u00eat du personnel": {}
- },
- "Rabais, remises et ristournes accord\u00e9s par l'entreprise": {
- "- sur prestations de services": {},
- "- sur produits des activit\u00e9s annexes": {},
- "- sur travaux": {},
- "- sur ventes de marchandises": {},
- "- sur ventes de produits finis": {},
- "- sur ventes de produits interm\u00e9diaires ": {},
- "- sur \u00e9tudes": {}
- },
- "Ventes de produits finis": {}
- }
- },
- "root_type": ""
- }
- }
-}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
index 4fa889d..68ab3fc 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ae_uae_chart_template_standard.json
@@ -1,437 +1,472 @@
{
- "country_code": "ae",
- "name": "U.A.E - Chart of Accounts",
+ "country_code": "ae",
+ "name": "U.A.E - Chart of Accounts",
"tree": {
"Assets": {
"Current Assets": {
"Accounts Receivable": {
"Corporate Credit Cards": {
"account_type": "Receivable"
- },
+ },
"Other Receivable": {
"Accrued Rebates Due from Suppliers": {
"account_type": "Receivable"
- },
+ },
"Accured Income from Suppliers": {
"account_type": "Receivable"
- },
+ },
"Other Debtors": {
"account_type": "Receivable"
- },
+ },
"account_type": "Receivable"
- },
+ },
"Post Dated Cheques Received": {
"account_type": "Receivable"
- },
+ },
"Staff Receivable": {
"account_type": "Receivable"
- },
+ },
"Trade Receivable": {
"account_type": "Receivable"
- },
+ },
"Trade in Opening Fees": {
"account_type": "Receivable"
- },
+ },
"account_type": "Receivable"
- },
+ },
"Cash in Hand & Banks": {
"Banks": {
- "Bank Margin On LC & LG": {},
- "Banks Blocked Deposits": {},
- "Banks Call Deposit Accounts": {},
- "Banks Current Accounts": {},
- "account_type": "Bank"
- },
+ "Bank Margin On LC & LG": {},
+ "Banks Blocked Deposits": {},
+ "Banks Call Deposit Accounts": {},
+ "Banks Current Accounts": {
+ "account_type": "Bank"
+ },
+ "account_type": "Bank"
+ },
"Cash in Hand": {
"Cash in Safe": {
"Main Safe": {
"account_type": "Cash"
- },
+ },
"Main Safe - Foreign Currency": {
"account_type": "Cash"
}
- },
+ },
"Petty Cash": {
"Petty Cash - Admininistration": {
"account_type": "Cash"
- },
+ },
"Petty Cash - Others": {
"account_type": "Cash"
}
- }
- },
+ },
+ "account_type": "Cash"
+ },
"Cash in Transit": {
"Credit Cards": {
"Gateway Credit Cards": {
"account_type": "Bank"
- },
+ },
"Manual Visa & Master Cards": {
"account_type": "Bank"
- },
+ },
"PayPal Account": {
"account_type": "Bank"
- },
+ },
"Visa & Master Credit Cards": {
"account_type": "Bank"
}
}
}
- },
+ },
"Inventory": {
"Consigned Stock": {
- "Handling Difference in Inventory": {},
+ "Handling Difference in Inventory": {
+ "account_type": "Stock Adjustment"
+ },
"Items Delivered to Customs on temprary Base": {}
- },
+ },
"Stock in Hand": {
- "account_type": "Stock",
- "is_group": 1
+ "All Warehouses": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "account_type": "Stock"
}
- },
+ },
"Perliminary and Preoperating Expenses": {
"Preoperating Expenses": {}
- },
+ },
"Prepayments & Deposits": {
"Deposits": {
- "Deposit - Office Rent": {},
- "Deposit Others": {},
- "Deposit to Immigration (Visa)": {},
+ "Deposit - Office Rent": {},
+ "Deposit Others": {},
+ "Deposit to Immigration (Visa)": {},
"Deposits - Customs": {}
- },
+ },
"Prepaid Taxes": {
- "Sales Taxes Receivables": {},
+ "Sales Taxes Receivables": {},
"Withholding Tax Receivables": {}
- },
+ },
"Prepayments": {
- "Other Prepayments": {},
- "PrePaid Advertisement Expenses": {},
- "Prepaid Bank Guarantee": {},
- "Prepaid Consultancy Fees": {},
- "Prepaid Employees Housing": {},
- "Prepaid Finance charge for Loans": {},
- "Prepaid Legal Fees": {},
- "Prepaid License Fees": {},
- "Prepaid Life Insurance": {},
- "Prepaid Maintenance": {},
- "Prepaid Medical Insurance": {},
- "Prepaid Office Rent": {},
- "Prepaid Other Insurance": {},
- "Prepaid Schooling Fees": {},
- "Prepaid Site Hosting Fees": {},
+ "Other Prepayments": {},
+ "PrePaid Advertisement Expenses": {},
+ "Prepaid Bank Guarantee": {},
+ "Prepaid Consultancy Fees": {},
+ "Prepaid Employees Housing": {},
+ "Prepaid Finance charge for Loans": {},
+ "Prepaid Legal Fees": {},
+ "Prepaid License Fees": {},
+ "Prepaid Life Insurance": {},
+ "Prepaid Maintenance": {},
+ "Prepaid Medical Insurance": {},
+ "Prepaid Office Rent": {},
+ "Prepaid Other Insurance": {},
+ "Prepaid Schooling Fees": {},
+ "Prepaid Site Hosting Fees": {},
"Prepaid Sponsorship Fees": {}
}
}
- },
+ },
"Long Term Assets": {
"Fixed Assets": {
"Accumulated Depreciation": {
- "Acc. Depreciation of Motor Vehicles": {},
- "Acc. Deprn.Computer Hardware & Software": {},
- "Acc.Deprn.of Furniture & Office Equipment": {},
- "Amortisation on Leasehold Improvement": {}
- },
+ "Acc. Depreciation of Motor Vehicles": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "Acc. Deprn.Computer Hardware & Software": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "Acc.Deprn.of Furniture & Office Equipment": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "Amortisation on Leasehold Improvement": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "account_type": "Accumulated Depreciation"
+ },
"Fixed Assets (Cost Price)": {
- "Computer Hardware & Software": {},
- "Furniture and Equipment": {},
- "Leasehold Improvement": {},
- "Motor Vehicules": {},
- "Work In Progrees": {}
+ "Computer Hardware & Software": {
+ "account_type": "Fixed Asset"
+ },
+ "Furniture and Equipment": {
+ "account_type": "Fixed Asset"
+ },
+ "Leasehold Improvement": {},
+ "Motor Vehicules": {
+ "account_type": "Fixed Asset"
+ },
+ "Work In Progrees": {},
+ "account_type": "Fixed Asset"
}
- },
+ },
"Intangible Assets": {
- "Computer Card Renewal": {},
- "Dispoal of Outlets": {},
+ "Computer Card Renewal": {},
+ "Dispoal of Outlets": {},
"Registration of Trademarks": {}
- },
- "Intercompany Accounts": {},
+ },
+ "Intercompany Accounts": {},
"Investments": {
"Investments in Subsidiaries": {}
}
- },
+ },
"root_type": "Asset"
- },
+ },
"Closing And Temporary Accounts": {
"Closing Accounts": {
"Closing Account": {}
- },
+ },
"root_type": "Liability"
- },
+ },
"Expenses": {
"Commercial Expenses": {
- "Consultancy Fees": {},
+ "Consultancy Fees": {},
"Provision for Doubtful Debts": {}
- },
+ },
"Cost of Sale": {
"Cost Of Goods Sold": {
- "Cost Of Goods Sold I/C Sales": {},
- "Cost of Goods Sold in Trading": {},
- "account_type": "Cost of Goods Sold"
- },
+ "Cost Of Goods Sold I/C Sales": {},
+ "Cost of Goods Sold in Trading": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "account_type": "Cost of Goods Sold"
+ },
"Expenses Included In Valuation": {
"account_type": "Expenses Included In Valuation"
}
- },
+ },
"Depreciation": {
"Depreciation & Amortization": {
- "Amortization on Leasehold Improvement": {},
- "Depreciation Of Computer Hard & Soft": {},
- "Depreciation Of Furniture & Office Equipment\n\t\t\t": {},
- "Depreciation Of Motor Vehicles": {}
+ "Amortization on Leasehold Improvement": {},
+ "Depreciation Of Computer Hard & Soft": {
+ "account_type": "Depreciation"
+ },
+ "Depreciation Of Furniture & Office Equipment\n\t\t\t": {
+ "account_type": "Depreciation"
+ },
+ "Depreciation Of Motor Vehicles": {
+ "account_type": "Depreciation"
+ }
}
- },
+ },
"Direct Expenses": {
"Financial Charges": {
- "Air Miles Card Charges": {},
- "Amex Credit Cards Charges": {},
- "Bank Finance & Loan Charges": {},
- "Credit Card Charges": {},
- "Credit Card Swipe Charges": {},
+ "Air Miles Card Charges": {},
+ "Amex Credit Cards Charges": {},
+ "Bank Finance & Loan Charges": {},
+ "Credit Card Charges": {},
+ "Credit Card Swipe Charges": {},
"PayPal Charges": {}
}
- },
+ },
"MISC Charges": {
"Other Charges": {
"Captial Loss": {
- "Disposal of Business Branch": {},
- "Loss On Fixed Assets Disposal": {},
+ "Disposal of Business Branch": {},
+ "Loss On Fixed Assets Disposal": {},
"Loss on Difference on Exchange": {}
- },
+ },
"Other Non Operating Exp": {
"Other Non Operating Expenses": {}
- },
+ },
"Previous Year Adjustments": {
"Previous Year Adjustments Account": {}
- },
+ },
"Royalty Fees": {
"Royalty to Parent Co.": {}
- },
+ },
"Tax / Zakat Expenses": {
- "Income Tax": {},
- "Zakat": {}
+ "Income Tax": {
+ "account_type": "Tax"
+ },
+ "Zakat": {},
+ "account_type": "Tax"
}
}
- },
+ },
"Share Resources": {
"Share Resource Expenses Account": {}
- },
+ },
"Store Operating Expenses": {
"Selling, General & Admin Expenses": {
"Advertising Expenses": {
"Other - Advertising Expenses": {}
- },
+ },
"Bank & Finance Charges": {
"Other Bank Charges": {}
- },
+ },
"Communications": {
- "Courrier": {},
- "Others - Communication": {},
- "Telephone": {},
+ "Courrier": {},
+ "Others - Communication": {},
+ "Telephone": {},
"Web Site Hosting Fees": {}
- },
+ },
"Office & Various Expenses": {
- "Cleaning": {},
- "Convoyance Expenses": {},
- "Gifts & Donations": {},
- "Insurance": {},
- "Kitchen and Buffet Expenses": {},
- "Maintenance": {},
- "Others - Office Various Expenses": {},
- "Security & Guard": {},
- "Stationary From Suppliers": {},
- "Stationary Out Of Stock": {},
- "Subscriptions": {},
- "Training": {},
+ "Cleaning": {},
+ "Convoyance Expenses": {},
+ "Gifts & Donations": {},
+ "Insurance": {},
+ "Kitchen and Buffet Expenses": {},
+ "Maintenance": {},
+ "Others - Office Various Expenses": {},
+ "Security & Guard": {},
+ "Stationary From Suppliers": {},
+ "Stationary Out Of Stock": {},
+ "Subscriptions": {},
+ "Training": {},
"Vehicle Expenses": {}
- },
+ },
"Personnel Cost": {
- "Basic Salary": {},
- "End Of Service Indemnity": {},
- "Housing Allowance": {},
- "Leave Salary": {},
- "Leave Ticket": {},
- "Life Insurance": {},
- "Medical Insurance": {},
- "Personnel Cost Others": {},
- "Sales Commission": {},
- "Staff School Allowances": {},
- "Transportation Allowance": {},
- "Uniform": {},
+ "Basic Salary": {},
+ "End Of Service Indemnity": {},
+ "Housing Allowance": {},
+ "Leave Salary": {},
+ "Leave Ticket": {},
+ "Life Insurance": {},
+ "Medical Insurance": {},
+ "Personnel Cost Others": {},
+ "Sales Commission": {},
+ "Staff School Allowances": {},
+ "Transportation Allowance": {},
+ "Uniform": {},
"Visa Expenses": {}
- },
+ },
"Professional & Legal Fees": {
- "Audit Fees": {},
- "Legal fees": {},
- "Others - Professional Fees": {},
- "Sponsorship Fees": {},
+ "Audit Fees": {},
+ "Legal fees": {},
+ "Others - Professional Fees": {},
+ "Sponsorship Fees": {},
"Trade License Fees": {}
- },
+ },
"Provision & Write Off": {
- "Amortisation of Preoperating Expenses": {},
- "Cash Shortage": {},
- "Others - Provision & Write off": {},
- "Write Off Inventory": {},
+ "Amortisation of Preoperating Expenses": {},
+ "Cash Shortage": {},
+ "Others - Provision & Write off": {},
+ "Write Off Inventory": {},
"Write Off Receivables & Payables": {}
- },
+ },
"Rent Expenses": {
- "Office Rent": {},
+ "Office Rent": {},
"Warehouse Rent": {}
- },
+ },
"Travel Expenses": {
- "Air tickets": {},
- "Hotel": {},
- "Meals": {},
- "Others": {},
+ "Air tickets": {},
+ "Hotel": {},
+ "Meals": {},
+ "Others": {},
"Per Diem": {}
- },
+ },
"Utilities": {
- "Other Utility Cahrges": {},
+ "Other Utility Cahrges": {},
"Water & Electricity": {}
}
}
- },
+ },
"root_type": "Expense"
- },
+ },
"Liabilities": {
"Current Liabilities": {
"Accounts Payable": {
"Payables": {
"Advance Paybale to Suppliers": {
"account_type": "Payable"
- },
+ },
"Consigned Payable": {
"account_type": "Payable"
- },
+ },
"Other Payable": {
"account_type": "Payable"
- },
+ },
"Post Dated Cheques Paid": {
"account_type": "Payable"
- },
+ },
"Staff Payable": {
"account_type": "Payable"
- },
+ },
"Suppliers Price Protection": {
"account_type": "Payable"
- },
+ },
"Trade Payable": {
"account_type": "Payable"
- },
+ },
"account_type": "Payable"
}
- },
- "Stock Liabilities": {
- "Stock Received But Not Billed": {
- "account_type": "Stock Received But Not Billed"
- }
- },
- "Duties and Taxes": {
- "account_type": "Tax",
- "is_group": 1
- },
+ },
"Accruals & Provisions": {
"Accruals": {
"Accrued Personnel Cost": {
- "Accrued - Commissions": {},
- "Accrued - Leave Salary": {},
- "Accrued - Leave Tickets": {},
- "Accrued - Salaries": {},
- "Accrued Other Personnel Cost": {},
- "Accrued Salaries Increment": {},
+ "Accrued - Commissions": {},
+ "Accrued - Leave Salary": {},
+ "Accrued - Leave Tickets": {},
+ "Accrued - Salaries": {},
+ "Accrued Other Personnel Cost": {},
+ "Accrued Salaries Increment": {},
"Accrued-Staff Bonus": {}
}
- },
+ },
"Accrued Expenses": {
"Accrued Other Expenses": {
- "Accrued - Audit Fees": {},
- "Accrued - Office Rent": {},
- "Accrued - Sponsorship": {},
- "Accrued - Telephone": {},
- "Accrued - Utilities": {},
+ "Accrued - Audit Fees": {},
+ "Accrued - Office Rent": {},
+ "Accrued - Sponsorship": {},
+ "Accrued - Telephone": {},
+ "Accrued - Utilities": {},
"Accrued Others": {}
}
- },
+ },
"Other Current Liabilities": {
- "Accrued Dubai Customs": {},
- "Deferred income": {},
+ "Accrued Dubai Customs": {},
+ "Deferred income": {},
"Shipping & Handling": {}
- },
+ },
"Provisions": {
"Tax Payables": {
- "Income Tax Payable": {},
- "Sales Tax Payable": {},
+ "Income Tax Payable": {},
+ "Sales Tax Payable": {},
"Withholding Tax Payable": {}
}
- },
+ },
"Short Term Loan": {}
- },
+ },
+ "Duties and Taxes": {
+ "account_type": "Tax",
+ "is_group": 1
+ },
"Reservations & Credit Notes": {
"Credit Notes": {
- "Credit Notes to Customers": {},
+ "Credit Notes to Customers": {},
"Reservations": {}
}
- },
+ },
+ "Stock Liabilities": {
+ "Stock Received But Not Billed": {
+ "account_type": "Stock Received But Not Billed"
+ }
+ },
"Unearned Income": {}
- },
+ },
"Long Term Liabilities": {
"Long Term Loans & Provisions": {}
- },
+ },
"root_type": "Liability"
- },
+ },
"Revenue": {
"Direct Revenue": {
"Other Direct Revenue": {
"Other Revenue - Operating": {
- "Advertising Income": {},
- "Branding Income": {},
- "Early Setmt Margin from Suppliers": {},
- "Marketing Rebate from Suppliers": {},
- "Rebate from Suppliers": {},
- "Service Income": {},
+ "Advertising Income": {},
+ "Branding Income": {},
+ "Early Setmt Margin from Suppliers": {},
+ "Marketing Rebate from Suppliers": {},
+ "Rebate from Suppliers": {},
+ "Service Income": {},
"Space Rental Income": {}
}
}
- },
+ },
"Indirect Revenue": {
"Other Indirect Revenue": {
- "Capital Gain": {},
- "Excess In Till": {},
- "Gain On Difference Of Exchange": {},
- "Management Consultancy Fees": {},
+ "Capital Gain": {},
+ "Excess In Till": {},
+ "Gain On Difference Of Exchange": {},
+ "Management Consultancy Fees": {},
"Other Income": {}
- },
+ },
"Other Revenue - Non Operating": {
- "Interest Revenue": {},
- "Interest from FD": {},
- "Products Listing Fees from Suppliers": {},
+ "Interest Revenue": {},
+ "Interest from FD": {},
+ "Products Listing Fees from Suppliers": {},
"Trade Opening Fees from suppliers": {}
}
- },
+ },
"Sales": {
"Sales from Other Regions": {
"Sales from Other Region": {}
- },
+ },
"Sales of same region": {
- "Management Consultancy Fees": {},
- "Sales Account": {},
+ "Management Consultancy Fees 1": {},
+ "Sales Account": {},
"Sales of I/C": {}
}
- },
+ },
"root_type": "Income"
- },
+ },
"Share Holder Equity": {
"Capital": {
- "Contributed Capital": {},
- "Share Capital": {},
- "Shareholders Current A/c": {},
- "Sub Ordinated Loan": {},
+ "Contributed Capital": {},
+ "Share Capital": {},
+ "Shareholders Current A/c": {},
+ "Sub Ordinated Loan": {},
"Treasury Stocks": {}
- },
+ },
"Retained Earnings": {
- "Current Year Results": {},
- "Dividends Paid": {},
+ "Current Year Results": {},
+ "Dividends Paid": {},
"Previous Years Results": {}
- },
- "account_type": "Equity",
+ },
+ "account_type": "Equity",
"root_type": "Equity"
}
}
-}
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/at_austria_chart_Einheitskontenrahmen.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/at_austria_chart_Einheitskontenrahmen.json
deleted file mode 100644
index 3b9dce0..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/at_austria_chart_Einheitskontenrahmen.json
+++ /dev/null
@@ -1,414 +0,0 @@
-{
- "country_code": "at",
- "name": "Austria - Chart of Accounts - Einheitskontenrahmen",
- "tree": {
- "Klasse 0 Aktiva: Anlageverm\u00f6gen": {
- "0100 Konzessionen ": {"account_type": "Fixed Asset"},
- "0110 Patentrechte und Lizenzen ": {"account_type": "Fixed Asset"},
- "0120 Datenverarbeitungsprogramme ": {"account_type": "Fixed Asset"},
- "0130 Marken, Warenzeichen und Musterschutzrechte, sonstige Urheberrechte ": {"account_type": "Fixed Asset"},
- "0140 Pacht- und Mietrechte ": {"account_type": "Fixed Asset"},
- "0150 Bezugs- und ähnliche Rechte ": {"account_type": "Fixed Asset"},
- "0160 Geschäfts-/Firmenwert ": {"account_type": "Fixed Asset"},
- "0170 Umgründungsmehrwert ": {"account_type": "Fixed Asset"},
- "0180 Geleistete Anzahlungen auf immaterielle Vermögensgegenstände": {"account_type": "Fixed Asset"},
- "0190 Kumulierte Abschreibungen zu immateriellen Vermögensgegenständen ": {"account_type": "Fixed Asset"},
- "0200 Unbebaute Grundstücke, soweit nicht landwirtschaftlich genutzt ": {"account_type": "Fixed Asset"},
- "0210 Bebaute Grundstücke (Grundwert) ": {"account_type": "Fixed Asset"},
- "0220 Landwirtschaftlich genutzte Grundstücke ": {"account_type": "Fixed Asset"},
- "0230 Grundstücksgleiche Rechte ": {"account_type": "Fixed Asset"},
- "0300 Betriebs- und Geschäftsgebäude auf eigenem Grund ": {"account_type": "Fixed Asset"},
- "0310 Wohn- und Sozialgebäude auf eigenem Grund ": {"account_type": "Fixed Asset"},
- "0320 Betriebs- und Geschäftsgebäude auf fremdem Grund ": {"account_type": "Fixed Asset"},
- "0330 Wohn- und Sozialgebäude auf fremdem Grund ": {"account_type": "Fixed Asset"},
- "0340 Grundstückseinrichtungen auf eigenem Grund ": {"account_type": "Fixed Asset"},
- "0350 Grundstückseinrichtungen auf fremdem Grund ": {"account_type": "Fixed Asset"},
- "0360 Bauliche Investitionen in fremden (gepachteten) Betriebs- und Geschäftsgebäuden": {"account_type": "Fixed Asset"},
- "0370 Bauliche Investitionen in fremden (gepachteten) Wohn- und Sozialgebäuden": {"account_type": "Fixed Asset"},
- "0390 Kumulierte Abschreibungen zu Grundstücken ": {"account_type": "Fixed Asset"},
- "0400 Maschinen und Geräte ": {"account_type": "Fixed Asset"},
- "0500 Maschinenwerkzeuge ": {"account_type": "Fixed Asset"},
- "0510 Allgemeine Werkzeuge und Handwerkzeuge ": {"account_type": "Fixed Asset"},
- "0520 Prototypen, Formen, Modelle ": {"account_type": "Fixed Asset"},
- "0530 Andere Erzeugungshilfsmittel (auch Softwarewerkzeuge)": {"account_type": "Fixed Asset"},
- "0540 Hebezeuge und Montageanlagen ": {"account_type": "Fixed Asset"},
- "0550 Geringwertige Vermögensgegenstände, soweit im Erzeugungsprozess ": {"account_type": "Fixed Asset"},
- "0560 Festwerte technische Anlagen und Maschinen ": {"account_type": "Fixed Asset"},
- "0590 Kumulierte Abschreibungen zu technischen Anlagen und Maschinen ": {"account_type": "Fixed Asset"},
- "0600 Betriebs- und Geschäftsausstattung, soweit nicht gesondert angeführt ": {"account_type": "Fixed Asset"},
- "0610 Andere Anlagen, soweit nicht gesondert angeführt ": {"account_type": "Fixed Asset"},
- "0620 Büromaschinen, EDV-Anlagen ": {"account_type": "Fixed Asset"},
- "0630 PKW und Kombis ": {"account_type": "Fixed Asset"},
- "0640 LKW ": {"account_type": "Fixed Asset"},
- "0650 Andere Beförderungsmittel ": {"account_type": "Fixed Asset"},
- "0660 Gebinde ": {"account_type": "Fixed Asset"},
- "0670 Geringwertige Vermögensgegenstände, soweit nicht im Erzeugungssprozess verwendet": {"account_type": "Fixed Asset"},
- "0680 Festwerte außer technische Anlagen und Maschinen ": {"account_type": "Fixed Asset"},
- "0690 Kumulierte Abschreibungen zu anderen Anlagen, Betriebs- und Geschäftsausstattung": {"account_type": "Fixed Asset"},
- "0700 Geleistete Anzahlungen auf Sachanlagen ": {"account_type": "Fixed Asset"},
- "0710 Anlagen in Bau ": {"account_type": "Fixed Asset"},
- "0790 Kumulierte Abschreibungen zu geleisteten Anzahlungen auf Sachanlagen ": {"account_type": "Fixed Asset"},
- "0800 Anteile an verbundenen Unternehmen ": {"account_type": "Fixed Asset"},
- "0810 Beteiligungen an Gemeinschaftsunternehmen ": {"account_type": "Fixed Asset"},
- "0820 Beteiligungen an angeschlossenen (assoziierten) Unternehmen ": {"account_type": "Fixed Asset"},
- "0830 Eigene Anteile, Anteile an herrschenden oder mit Mehrheit beteiligten ": {"account_type": "Fixed Asset"},
- "0840 Sonstige Beteiligungen ": {"account_type": "Fixed Asset"},
- "0850 Ausleihungen an verbundene Unternehmen ": {"account_type": "Fixed Asset"},
- "0860 Ausleihungen an Unternehmen mit Beteiligungsverhältnis": {"account_type": "Fixed Asset"},
- "0870 Ausleihungen an Gesellschafter ": {"account_type": "Fixed Asset"},
- "0880 Sonstige Ausleihungen ": {"account_type": "Fixed Asset"},
- "0890 Anteile an Kapitalgesellschaften ohne Beteiligungscharakter ": {"account_type": "Fixed Asset"},
- "0900 Anteile an Personengesellschaften ohne Beteiligungscharakter ": {"account_type": "Fixed Asset"},
- "0910 Genossenschaftsanteile ohne Beteiligungscharakter ": {"account_type": "Fixed Asset"},
- "0920 Anteile an Investmentfonds ": {"account_type": "Fixed Asset"},
- "0930 Festverzinsliche Wertpapiere des Anlagevermögens ": {"account_type": "Fixed Asset"},
- "0980 Geleistete Anzahlungen auf Finanzanlagen ": {"account_type": "Fixed Asset"},
- "0990 Kumulierte Abschreibungen zu Finanzanlagen ": {"account_type": "Fixed Asset"},
- "root_type": "Asset"
- },
- "Klasse 1 Aktiva: Vorr\u00e4te": {
- "1000 Bezugsverrechnung": {"account_type": "Stock"},
- "1100 Rohstoffe": {"account_type": "Stock"},
- "1200 Bezogene Teile": {"account_type": "Stock"},
- "1300 Hilfsstoffe": {"account_type": "Stock"},
- "1350 Betriebsstoffe": {"account_type": "Stock"},
- "1360 Vorrat Energietraeger": {"account_type": "Stock"},
- "1400 Unfertige Erzeugnisse": {"account_type": "Stock"},
- "1500 Fertige Erzeugnisse": {"account_type": "Stock"},
- "1600 Handelswarenvorrat": {"account_type": "Stock Received But Not Billed"},
- "1700 Noch nicht abrechenbare Leistungen": {"account_type": "Stock"},
- "1900 Wertberichtigungen": {"account_type": "Stock"},
- "1800 Geleistete Anzahlungen": {"account_type": "Stock"},
- "root_type": "Asset"
- },
- "Klasse 3 Passiva: Verbindlichkeiten": {
- "3020 Steuerr\u00fcckstellungen": {"account_type": "Tax"},
- "3040 Sonstige R\u00fcckstellungen": {"account_type": "Payable"},
- "3110 Verbindlichkeiten gegen\u00fcber Bank": {"account_type": "Payable"},
- "3150 Verbindlichkeiten Darlehen": {"account_type": "Payable"},
- "3185 Verbindlichkeiten Kreditkarte": {"account_type": "Payable"},
- "3380 Verbindlichkeiten aus der Annahme gezogener Wechsel u. d. Ausstellungen eigener Wechsel": {
- "account_type": "Payable"
- },
- "3400 Verbindlichkeiten gegen\u00fc. verb. Untern., Verbindl. gegen\u00fc. Untern., mit denen eine Beteiligungsverh\u00e4lnis besteht": {},
- "3460 Verbindlichkeiten gegenueber Gesellschaftern": {"account_type": "Payable"},
- "3470 Einlagen stiller Gesellschafter": {"account_type": "Payable"},
- "3590 Verbindlichkeiten Kommunalabgaben": {"account_type": "Tax"},
- "3600 Verbindlichkeiten Sozialversicherung": {"account_type": "Payable"},
- "3000 Allgemeine Verbindlichkeiten (Schuld)": {"account_type": "Payable"},
- "3700 Sonstige Verbindlichkeiten": {"account_type": "Payable"},
- "3900 Passive Rechnungsabgrenzungsposten": {"account_type": "Payable"},
- "3100 Anleihen (einschlie\u00dflich konvertibler)": {"account_type": "Payable"},
- "3200 Erhaltene Anzahlungen auf Bestellungen": {"account_type": "Payable"},
- "3040 R\u00fcckstellungen f\u00fcr Abfertigung": {"account_type": "Payable"},
- "3010 R\u00fcckstellungen f\u00fcr Pensionen": {"account_type": "Payable"},
- "3530 USt. \u00a719 (reverse charge)": {
- "account_type": "Tax"
- },
- "3500 Verbindlichkeiten aus Umsatzsteuer": {"account_type": "Tax"},
- "3580 Umsatzsteuer Zahllast": {
- "account_type": "Tax"
- },
- "3510 Umsatzsteuer aus i.g. Erwerb 10%": {
- "account_type": "Tax"
- },
- "3520 Umsatzsteuer aus i.g. Erwerb 20%": {
- "account_type": "Tax"
- },
- "3560 Umsatzsteuer-Evidenzkonto f\u00fcr erhaltene Anzahlungen auf Bestellungen": {},
- "3360 Verbindlichkeiten aus Lieferungen u. Leistungen EU": {
- "account_type": "Payable"
- },
- "3000 Verbindlichkeiten aus Lieferungen u. Leistungen Inland": {
- "account_type": "Payable"
- },
- "3370 Verbindlichkeiten aus Lieferungen u. Leistungen sonst. Ausland": {
- "account_type": "Payable"
- },
- "3400 Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen": {},
- "3570 Verrechnung Finanzamt": {
- "account_type": "Tax"
- },
- "root_type": "Liability"
- },
- "Klasse 2 Aktiva: Umlaufverm\u00f6gen, Rechnungsabgrenzungen": {
- "2030 Forderungen aus Lieferungen und Leistungen Inland (0% USt, umsatzsteuerfrei)": {
- "account_type": "Receivable"
- },
- "2010 Forderungen aus Lieferungen und Leistungen Inland (10% USt, umsatzsteuerfrei)": {
- "account_type": "Receivable"
- },
- "2000 Forderungen aus Lieferungen und Leistungen Inland (20% USt, umsatzsteuerfrei)": {
- "account_type": "Receivable"
- },
- "2040 Forderungen aus Lieferungen und Leistungen Inland (sonstiger USt-Satz)": {
- "account_type": "Receivable"
- },
- "2100 Forderungen aus Lieferungen und Leistungen EU": {
- "account_type": "Receivable"
- },
- "2150 Forderungen aus Lieferungen und Leistungen Ausland (Nicht-EU)": {
- "account_type": "Receivable"
- },
- "2200 Forderungen gegen\u00fcber verbundenen Unternehmen": {
- "account_type": "Receivable"
- },
- "2250 Forderungen gegen\u00fcber Unternehmen, mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
- "account_type": "Receivable"
- },
- "2300 Sonstige Forderungen und Verm\u00f6gensgegenst\u00e4nde": {
- "account_type": "Receivable"
- },
- "2630 Sonstige Wertpapiere": {
- "account_type": "Stock"
- },
- "2750 Kassenbest\u00e4nde in Fremdw\u00e4hrung": {
- "account_type": "Cash"
- },
- "2900 Aktive Rechnungsabrenzungsposten": {
- "account_type": "Receivable"
- },
- "2600 Anteile an verbundenen Unternehmen": {
- "account_type": "Equity"
- },
- "2680 Besitzwechsel ohne Forderungen": {
- "account_type": "Receivable"
- },
- "2950 Aktiviertes Disagio": {
- "account_type": "Receivable"
- },
- "2610 Eigene Anteile und Wertpapiere an mit Mehrheit beteiligten Unternehmen": {
- "account_type": "Receivable"
- },
- "2570 Einfuhrumsatzsteuer (bezahlt)": {"account_type": "Tax"},
-
- "2460 Eingeforderte aber noch nicht eingezahlte Einlagen": {
- "account_type": "Receivable"
- },
- "2180 Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. Ausland": {
- "account_type": "Receivable"
- },
- "2130 Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. EU": {
- "account_type": "Receivable"
- },
- "2080 Einzelwertberichtigungen zu Forderungen aus Lief. und Leist. Inland ": {
- "account_type": "Receivable"
- },
- "2270 Einzelwertberichtigungen zu Forderungen gegen\u00fcber Unternehmen mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
- "account_type": "Receivable"
- },
- "2230 Einzelwertberichtigungen zu Forderungen gegen\u00fcber verbundenen Unternehmen": {
- "account_type": "Receivable"
- },
- "2470 Einzelwertberichtigungen zu sonstigen Forderungen und Verm\u00f6gensgegenst\u00e4nden": {
- "account_type": "Receivable"
- },
- "2700 Kassenbestand": {
- "account_type": "Cash"
- },
- "2190 Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. sonstiges Ausland": {
- "account_type": "Receivable"
- },
- "2130 Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. EU": {
- "account_type": "Receivable"
- },
- "2100 Pauschalwertberichtigungen zu Forderungen aus Lief. und Leist. Inland ": {
- "account_type": "Receivable"
- },
- "2280 Pauschalwertberichtigungen zu Forderungen gegen\u00fcber Unternehmen mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
- "account_type": "Receivable"
- },
- "2240 Pauschalwertberichtigungen zu Forderungen gegen\u00fcber verbundenen Unternehmen": {
- "account_type": "Receivable"
- },
- "2480 Pauschalwertberichtigungen zu sonstigen Forderungen und Verm\u00f6gensgegenst\u00e4nden": {
- "account_type": "Receivable"
- },
- "2740 Postwertzeichen": {
- "account_type": "Cash"
- },
- "2780 Schecks in Euro": {
- "account_type": "Cash"
- },
- "2800 Guthaben bei Kreditinstitut": {
- "account_type": "Bank"
- },
- "2810 Guthaben bei Paypal": {
- "account_type": "Bank"
- },
- "2930 Mietvorauszahlungen": {
- "account_type": "Receivable"
- },
- "2980 Abgrenzung latenter Steuern": {
- "account_type": "Receivable"
- },
- "2500 Vorsteuer": {
- "account_type": "Receivable"
- },
- "2510 Vorsteuer aus innergemeinschaftlichem Erwerb 10%": {
- "account_type": "Tax"
- },
- "2520 Vorsteuer aus innergemeinschaftlichem Erwerb 20%": {
- "account_type": "Tax"
- },
- "2530 Vorsteuer \u00a719/Art 19 ( reverse charge ) ": {
- "account_type": "Tax"
- },
- "2690 Wertberichtigungen zu Wertpapieren und Anteilen": {
- "account_type": "Receivable"
- },
- "root_type": "Asset"
- },
- "Klasse 4: Betriebliche Erträge": {
- "4000 Erlöse 20 %": {"account_type": "Income Account"},
- "4020 Erl\u00f6se 0 % steuerbefreit": {"account_type": "Income Account"},
- "4010 Erl\u00f6se 10 %": {"account_type": "Income Account"},
- "4030 Erl\u00f6se 13 %": {"account_type": "Income Account"},
- "4040 Erl\u00f6se 0 % innergemeinschaftliche Lieferungen": {"account_type": "Income Account"},
- "4400 Erl\u00f6sreduktion 0 % steuerbefreit": {"account_type": "Expense Account"},
- "4410 Erl\u00f6sreduktion 10 %": {"account_type": "Expense Account"},
- "4420 Erl\u00f6sreduktion 20 %": {"account_type": "Expense Account"},
- "4430 Erl\u00f6sreduktion 13 %": {"account_type": "Expense Account"},
- "4440 Erl\u00f6sreduktion 0 % innergemeinschaftliche Lieferungen": {"account_type": "Expense Account"},
- "4500 Ver\u00e4nderungen des Bestandes an fertigen und unfertigen Erzeugn. sowie an noch nicht abrechenbaren Leistungen": {"account_type": "Income Account"},
- "4580 Aktivierte Eigenleistungen": {"account_type": "Income Account"},
- "4600 Erl\u00f6se aus dem Abgang vom Anlageverm\u00f6gen, ausgen. Finanzanlagen": {"account_type": "Income Account"},
- "4630 Ertr\u00e4ge aus dem Abgang vom Anlageverm\u00f6gen, ausgen. Finanzanlagen": {"account_type": "Income Account"},
- "4660 Ertr\u00e4ge aus der Zuschreibung zum Anlageverm\u00f6gen, ausgen. Finanzanlagen": {"account_type": "Income Account"},
- "4700 Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen": {"account_type": "Income Account"},
- "4800 \u00dcbrige betriebliche Ertr\u00e4ge": {"account_type": "Income Account"},
- "root_type": "Income"
- },
- "Klasse 5: Aufwand f\u00fcr Material und Leistungen": {
- "5000 Einkauf Partnerleistungen": {"account_type": "Cost of Goods Sold"},
- "5100 Verbrauch an Rohstoffen": {"account_type": "Cost of Goods Sold"},
- "5200 Verbrauch von bezogenen Fertig- und Einzelteilen": {"account_type": "Cost of Goods Sold"},
- "5300 Verbrauch von Hilfsstoffen": {"account_type": "Cost of Goods Sold"},
- "5340 Verbrauch Verpackungsmaterial": {"account_type": "Cost of Goods Sold"},
- "5470 Verbrauch von Kleinmaterial": {"account_type": "Cost of Goods Sold"},
- "5450 Verbrauch von Reinigungsmaterial": {"account_type": "Cost of Goods Sold"},
- "5400 Verbrauch von Betriebsstoffen": {"account_type": "Cost of Goods Sold"},
- "5500 Verbrauch von Werkzeugen und anderen Erzeugungshilfsmittel": {"account_type": "Cost of Goods Sold"},
- "5600 Verbrauch von Brenn- und Treibstoffen, Energie und Wasser": {"account_type": "Cost of Goods Sold"},
- "5700 Bearbeitung durch Dritte": {"account_type": "Cost of Goods Sold"},
- "5900 Aufwandsstellenrechnung Material": {"account_type": "Cost of Goods Sold"},
- "5820 Skontoertr\u00e4ge (20% USt.)": {"account_type": "Income Account"},
- "5810 Skontoertr\u00e4ge (10% USt.)": {"account_type": "Income Account"},
- "5010 Handelswareneinkauf 10 %": {"account_type": "Cost of Goods Sold"},
- "5020 Handelswareneinkauf 20 %": {"account_type": "Cost of Goods Sold"},
- "5040 Handelswareneinkauf innergemeinschaftlicher Erwerb 10 % VSt/10 % USt": {"account_type": "Cost of Goods Sold"},
- "5050 Handelswareneinkauf innergemeinschaftlicher Erwerb 20 % VSt/20 % USt": {"account_type": "Cost of Goods Sold"},
- "5070 Handelswareneinkauf innergemeinschaftlicher Erwerb ohne Vorsteuerabzug und 10 % USt": {"account_type": "Cost of Goods Sold"},
- "5080 Handelswareneinkauf innergemeinschaftlicher Erwerb ohne Vorsteuerabzug und 20 % USt": {"account_type": "Cost of Goods Sold"},
- "root_type": "Expense"
- },
- "Klasse 6: Personalaufwand": {
- "6000 L\u00f6hne": {"account_type": "Payable"},
- "6200 Geh\u00e4lter": {"account_type": "Payable"},
- "6400 Aufwendungen f\u00fcr Abfertigungen": {"account_type": "Payable"},
- "6450 Aufwendungen f\u00fcr Altersversorgung": {"account_type": "Payable"},
- "6500 Gesetzlicher Sozialaufwand Arbeiter": {"account_type": "Payable"},
- "6560 Gesetzlicher Sozialaufwand Angestellte": {"account_type": "Payable"},
- "6600 Lohnabh\u00e4ngige Abgaben und Pflichtbeitr\u00e4gte": {"account_type": "Payable"},
- "6660 Gehaltsabh\u00e4ngige Abgaben und Pflichtbeitr\u00e4gte": {"account_type": "Payable"},
- "6700 Sonstige Sozialaufwendungen": {"account_type": "Payable"},
- "6900 Aufwandsstellenrechnung Personal": {"account_type": "Payable"},
- "root_type": "Expense"
- },
- "Klasse 7: Abschreibungen und sonstige betriebliche Aufwendungen": {
- "7010 Abschreibungen auf das Anlageverm\u00f6gen (ausgenommen Finanzanlagen)": {"account_type": "Depreciation"},
- "7100 Sonstige Steuern und Geb\u00fchren": {"account_type": "Tax"},
- "7200 Instandhaltung u. Reinigung durch Dritte, Entsorgung, Energie": {"account_type": "Expense Account"},
- "7300 Transporte durch Dritte": {"account_type": "Expense Account"},
- "7310 Fahrrad - Aufwand": {"account_type": "Expense Account"},
- "7320 Kfz - Aufwand": {"account_type": "Expense Account"},
- "7330 LKW - Aufwand": {"account_type": "Expense Account"},
- "7340 Lastenrad - Aufwand": {"account_type": "Expense Account"},
- "7350 Reise- und Fahraufwand": {"account_type": "Expense Account"},
- "7360 Tag- und N\u00e4chtigungsgelder": {"account_type": "Expense Account"},
- "7380 Nachrichtenaufwand": {"account_type": "Expense Account"},
- "7400 Miet- und Pachtaufwand": {"account_type": "Expense Account"},
- "7440 Leasingaufwand": {"account_type": "Expense Account"},
- "7480 Lizenzaufwand": {"account_type": "Expense Account"},
- "7500 Aufwand f\u00fcr beigestelltes Personal": {"account_type": "Expense Account"},
- "7540 Provisionen an Dritte": {"account_type": "Expense Account"},
- "7580 Aufsichtsratsverg\u00fctungen": {"account_type": "Expense Account"},
- "7610 Druckerzeugnisse und Vervielf\u00e4ltigungen": {"account_type": "Expense Account"},
- "7650 Werbung und Repr\u00e4sentationen": {"account_type": "Expense Account"},
- "7700 Versicherungen": {"account_type": "Expense Account"},
- "7750 Beratungs- und Pr\u00fcfungsaufwand": {"account_type": "Expense Account"},
- "7800 Forderungsverluste und Schadensf\u00e4lle": {"account_type": "Expense Account"},
- "7840 Verschiedene betriebliche Aufwendungen": {"account_type": "Expense Account"},
- "7910 Aufwandsstellenrechung der Hersteller": {"account_type": "Expense Account"},
- "7060 Sofortabschreibungen geringwertig": {"account_type": "Expense Account"},
- "7070 Abschreibungen vom Umlaufverm\u00f6gen, soweit diese die im Unternehmen \u00fcblichen Abschreibungen \u00fcbersteigen": {"account_type": "Depreciation"},
- "7900 Aufwandsstellenrechnung": {"account_type": "Expense Account"},
- "7770 Aus- und Fortbildung": {"account_type": "Expense Account"},
- "7820 Buchwert abgegangener Anlagen, ausgenommen Finanzanlagen": {"account_type": "Expense Account"},
- "7600 B\u00fcromaterial und Drucksorten": {"account_type": "Expense Account"},
- "7630 Fachliteratur und Zeitungen ": {"account_type": "Expense Account"},
- "7960 Herstellungskosten der zur Erzielung der Umsatzerl\u00f6se erbrachten Leistungen": {"account_type": "Expense Account"},
- "7780 Mitgliedsbeitr\u00e4ge": {"account_type": "Expense Account"},
- "7880 Skontoertr\u00e4ge auf sonstige betriebliche Aufwendungen": {"account_type": "Expense Account"},
- "7990 Sonstige betrieblichen Aufwendungen": {"account_type": "Expense Account"},
- "7680 Spenden und Trinkgelder": {"account_type": "Expense Account"},
- "7790 Spesen des Geldverkehrs": {"account_type": "Expense Account"},
- "7830 Verluste aus dem Abgang vom Anlageverm\u00f6gen, ausgenommen Finanzanlagen": {"account_type": "Expense Account"},
- "7970 Vertriebskosten": {"account_type": "Expense Account"},
- "7980 Verwaltungskosten": {"account_type": "Expense Account"},
- "root_type": "Expense"
- },
- "Klasse 8: Finanz- und ausserordentliche Ertr\u00e4ge und Aufwendungen": {
- "8000 Ertr\u00e4ge aus Beteiligungen": {"account_type": "Income Account"},
- "8050 Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens": {"account_type": "Income Account"},
- "8100 Zinsen aus Bankguthaben": {"account_type": "Income Account"},
- "8110 Zinsen aus gewaehrten Darlehen": {"account_type": "Income Account"},
- "8130 Verzugszinsenertraege": {"account_type": "Income Account"},
- "8220 Aufwendungen aus Beteiligungen": {"account_type": "Expense Account"},
- "8260 Aufwendungen aus sonst. Fiananzanlagen und aus Wertpapieren des Umlaufverm\u00f6gens": {},
- "8280 Zinsen und \u00e4hnliche Aufwendungem": {"account_type": "Expense Account"},
- "8400 Au\u00dferordentliche Ertr\u00e4ge": {"account_type": "Income Account"},
- "8450 Au\u00dferordentliche Aufwendungen": {"account_type": "Expense Account"},
- "8500 Steuern vom Einkommen und vom Ertrag": {
- "account_type": "Tax"
- },
- "8600 Aufl\u00f6sung unversteuerten R\u00fccklagen": {"account_type": "Income Account"},
- "8700 Aufl\u00f6sung von Kapitalr\u00fccklagen": {"account_type": "Income Account"},
- "8750 Aufl\u00f6sung von Gewinnr\u00fccklagen": {"account_type": "Income Account"},
- "8800 Zuweisung zu unversteuerten R\u00fccklagen": {"account_type": "Expense Account"},
- "8900 Zuweisung zu Gewinnr\u00fccklagen": {"account_type": "Expense Account"},
- "8100 Buchwert abgegangener Beteiligungen": {"account_type": "Expense Account"},
- "8130 Buchwert abgegangener Wertpapiere des Umlaufverm\u00f6gens": {"account_type": "Expense Account"},
- "8120 Buchwert abgegangener sonstiger Finanzanlagen": {"account_type": "Expense Account"},
- "8990 Gewinnabfuhr bzw. Verlust\u00fcberrechnung aus Ergebnisabf\u00fchrungsvertr\u00e4gen": {"account_type": "Expense Account"},
- "8350 nicht ausgenutzte Lieferantenskonti": {"account_type": "Expense Account"},
- "root_type": "Income"
- },
- "Klasse 9 Passiva: Eigenkapital, R\u00fccklagen, stille Einlagen, Abschlusskonten": {
- "9000 Gezeichnetes bzw. gewidmetes Kapital": {
- "account_type": "Equity"
- },
- "9200 Kapitalr\u00fccklagen": {
- "account_type": "Equity"
- },
- "9300 Gewinnr\u00fccklagen": {
- "account_type": "Equity"
- },
- "9400 Bewertungsreserven uns sonst. unversteuerte R\u00fccklagen": {
- "account_type": "Equity"
- },
- "9600 Private Entnahmen": {"account_type": "Equity"},
- "9610 Privatsteuern": {"account_type": "Equity"},
- "9700 Einlagen stiller Gesellschafter ": {"account_type": "Equity"},
- "9900 Evidenzkonto": {"account_type": "Equity"},
- "9800 Er\u00f6ffnungsbilanzkonto (EBK)": {"account_type": "Equity"},
- "9880 Jahresergebnis laut Gewinn- und Verlustrechnung (G+V)": {"account_type": "Equity"},
- "9850 Schlussbilanzkonto (SBK)": {"account_type": "Round Off"},
- "9190 nicht eingeforderte ausstehende Einlagen und berechtigte Entnahmen von Gesellschaftern": {
- "account_type": "Equity"
- },
- "root_type": "Equity"
- }
- }
- }
-
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/br_planilha_de_contas.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/br_planilha_de_contas.json
new file mode 100644
index 0000000..490635d
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/br_planilha_de_contas.json
@@ -0,0 +1,817 @@
+{
+ "country_code": "br",
+ "name": "Brasileira - Planilha de Contas",
+ "tree": {
+ "ATIVO": {
+ "CIRCULANTE 1": {
+ "CONTAS RETIFICADORAS": {
+ "(-) Duplicatas Descontadas": {},
+ "(-) Outras Contas Retificadoras": {},
+ "(-) Provis\u00e3o para Ajuste do Estoque ao Valor de Mercado": {},
+ "(-) Provis\u00f5es para Ajuste ao Valor Prov\u00e1vel de Realiza\u00e7\u00e3o": {},
+ "(-) Provis\u00f5es para Cr\u00e9ditos de Liquida\u00e7\u00e3o Duvidosa": {}
+ },
+ "CR\u00c9DITOS": {
+ "Adiantamentos a Fornecedores": {},
+ "CSLL a Recuperar": {},
+ "Clientes": {
+ "account_type": "Receivable"
+ },
+ "Cr\u00e9ditos Fiscais CSLL \u2013 Diferen\u00e7as Tempor\u00e1rias e Base de C\u00e1lculo Negativa": {},
+ "Cr\u00e9ditos Fiscais IRPJ \u2013 Diferen\u00e7as Tempor\u00e1rias e Preju\u00edzos Fiscais": {},
+ "Cr\u00e9ditos por Contribui\u00e7\u00f5es e Doa\u00e7\u00f5es": {},
+ "ICMS e Contribui\u00e7\u00f5es a Recuperar": {},
+ "IPI a Recuperar": {},
+ "Imposto de Renda a Recuperar": {},
+ "Outras 9": {},
+ "Outros Impostos e Contribui\u00e7\u00f5es a Recuperar": {},
+ "PIS e COFINS a Recuperar": {},
+ "Tributos Municipais a Recuperar": {}
+ },
+ "DESPESAS DO EXERC\u00cdCIO SEGUINTE": {
+ "Despesas do Exerc\u00edcio Seguinte 1": {},
+ "Outras Contas 4": {}
+ },
+ "DISPONIBILIDADES": {
+ "Bancos": {
+ "account_type": "Bank"
+ },
+ "Caixa": {
+ "account_type": "Bank"
+ },
+ "Contas Banc\u00e1rias \u2013 Doa\u00e7\u00f5es": {
+ "account_type": "Bank"
+ },
+ "account_type": "Bank"
+ },
+ "Dinheiro": {
+ "account_type": "Cash",
+ "is_group": 1
+ },
+ "ESTOQUES": {
+ "Constru\u00e7\u00f5es em Andamento de Im\u00f3veis Destinados \u00e0 Venda": {},
+ "Estoques Destinados \u00e0 Doa\u00e7\u00e3o": {},
+ "Im\u00f3veis Destinados \u00e0 Venda": {},
+ "Insumos (materiais diretos)": {},
+ "Insumos Agropecu\u00e1rios": {},
+ "Mercadorias para Revenda": {},
+ "Outras 11": {},
+ "Produtos Acabados": {},
+ "Produtos Agropecu\u00e1rios Acabados": {},
+ "Produtos Agropecu\u00e1rios em Forma\u00e7\u00e3o": {},
+ "Produtos em Elabora\u00e7\u00e3o": {},
+ "Servi\u00e7os em andamento": {},
+ "account_type": "Stock"
+ }
+ },
+ "N\u00c3O CIRCULANTE": {
+ "DIFERIDO": {
+ "(-) Amortiza\u00e7\u00e3o do Diferido": {},
+ "Corre\u00e7\u00e3o Monet\u00e1ria - Diferen\u00e7a IPC/BTNF (Lei no 8.200/1991) 1": {},
+ "Corre\u00e7\u00e3o Monet\u00e1ria Especial (Lei no 8.200/1991) 1": {},
+ "Demais Aplica\u00e7\u00f5es em Despesas Amortiz\u00e1veis": {},
+ "Despesas Pr\u00e9-Operacionais ou Pr\u00e9-Industriais": {},
+ "Despesas com Pesquisas Cient\u00edficas ou Tecnol\u00f3gicas": {}
+ },
+ "IMOBILIZADO": {
+ "(-) Deprecia\u00e7\u00f5es, Amortiza\u00e7\u00f5es e Quotas de Exaust\u00e3o": {},
+ "(-) Outras Contas Redutoras do Imobilizado": {},
+ "Aeronaves": {},
+ "Constru\u00e7\u00f5es em Andamento": {},
+ "Corre\u00e7\u00e3o Monet\u00e1ria - Diferen\u00e7a IPC/BTNF (Lei no 8.200/1991)": {},
+ "Corre\u00e7\u00e3o Monet\u00e1ria Especial (Lei no 8.200/1991)": {},
+ "Direitos Contratuais de Explora\u00e7\u00e3o de Florestas": {},
+ "Edif\u00edcios e Constru\u00e7\u00f5es": {
+ "account_type": "Fixed Asset"
+ },
+ "Embarca\u00e7\u00f5es": {
+ "account_type": "Fixed Asset"
+ },
+ "Equipamentos, M\u00e1quinas e Instala\u00e7\u00f5es Industriais": {},
+ "Florestamento e Reflorestamento": {},
+ "M\u00f3veis, Utens\u00edlios e Instala\u00e7\u00f5es Comerciais": {
+ "account_type": "Fixed Asset"
+ },
+ "Outras Imobiliza\u00e7\u00f5es": {},
+ "Recursos Minerais": {},
+ "Terrenos": {},
+ "Ve\u00edculos": {
+ "account_type": "Fixed Asset"
+ }
+ },
+ "INTANG\u00cdVEL": {
+ "(-) Amortiza\u00e7\u00e3o do Intang\u00edvel": {},
+ "(-) Outras Contas Redutoras do Intang\u00edvel": {},
+ "Concess\u00f5es": {},
+ "Desenvolvimento de Produtos": {},
+ "Direitos Autorais": {},
+ "Franquias": {},
+ "Fundo de Com\u00e9rcio": {},
+ "Marcas e Patentes": {},
+ "Outras 12": {},
+ "Software ou Programas de Computador": {}
+ },
+ "INVESTIMENTOS": {
+ "(-) Des\u00e1gios e Provis\u00e3o para Perdas Prov\u00e1veis em Investimentos": {},
+ "(-) Outras Contas Retificadoras 1": {},
+ "Corre\u00e7\u00e3o Monet\u00e1ria - Diferen\u00e7a IPC/BTNF (Lei no 8.200/1991) 2": {},
+ "Corre\u00e7\u00e3o Monet\u00e1ria Especial (Lei no 8.200/1991) 2": {},
+ "Investimentos Decorrentes de Incentivos Fiscais": {},
+ "Outras Contas 5": {},
+ "Outros Investimentos": {},
+ "Participa\u00e7\u00f5es Permanentes em Coligadas ou Controladas": {},
+ "\u00c1gios em Investimentos": {}
+ },
+ "REALIZ\u00c1VEL A LONGO PRAZO": {
+ "(-) Duplicatas Descontadas 1": {},
+ "(-) Outras Contas Retificadoras 2": {},
+ "(-) Provis\u00f5es para Ajuste ao Valor Prov\u00e1vel de Realiza\u00e7\u00e3o 1": {},
+ "(-) Provis\u00f5es para Cr\u00e9ditos de Liquida\u00e7\u00e3o Duvidosa 1": {},
+ "Clientes 1": {
+ "account_type": "Receivable"
+ },
+ "Cr\u00e9ditos Fiscais CSLL \u2013 Diferen\u00e7as Tempor\u00e1rias e Base de C\u00e1lculo Negativa 1": {},
+ "Cr\u00e9ditos Fiscais IRPJ \u2013 Diferen\u00e7as Tempor\u00e1rias e Preju\u00edzos Fiscais 1": {},
+ "Cr\u00e9ditos com Pessoas Ligadas (F\u00edsicas/Jur\u00eddicas)": {},
+ "Cr\u00e9ditos por Contribui\u00e7\u00f5es e Doa\u00e7\u00f5es 1": {},
+ "Dep\u00f3sitos Judiciais": {},
+ "Outras Contas 6": {},
+ "Valores Mobili\u00e1rios": {}
+ }
+ },
+ "root_type": "Asset"
+ },
+ "CUSTOS DE PRODU\u00c7\u00c3O": {
+ "CUSTO DOS BENS E SERVI\u00c7OS PRODUZIDOS": {
+ "CUSTO DOS PRODUTOS DE FABRICA\u00c7\u00c3O PR\u00d3PRIA PRODUZIDOS": {
+ "Alimenta\u00e7\u00e3o do Trabalhador": {},
+ "Arrendamento Mercantil 1": {},
+ "Constitui\u00e7\u00e3o de Provis\u00f5es": {},
+ "Consumo de Insumos": {},
+ "Custo do Pessoal Aplicado na Produ\u00e7\u00e3o": {},
+ "Encargos Sociais \u2013 FGTS": {},
+ "Encargos Sociais \u2013 Outros": {},
+ "Encargos Sociais \u2013 Previd\u00eancia Social": {},
+ "Encargos de Deprecia\u00e7\u00e3o, Amortiza\u00e7\u00e3o e Exaust\u00e3o": {},
+ "Fundo de Aposentadoria Programada Individual de Empregados Ligados \u00e0 Produ\u00e7\u00e3o": {},
+ "Loca\u00e7\u00e3o de M\u00e3o-de-obra": {},
+ "Manuten\u00e7\u00e3o e Reparo de Bens Aplicados na Produ\u00e7\u00e3o": {},
+ "Outros Custos 7": {
+ "account_type": "Expenses Included In Valuation"
+ },
+ "Outros Gastos com Pessoal Ligado \u00e0 Produ\u00e7\u00e3o": {},
+ "Plano de Previd\u00eancia Privada de Empregados Ligados \u00e0 Produ\u00e7\u00e3o": {},
+ "Planos de Poupan\u00e7a e Investimentos de Empregados Ligados \u00e0 Produ\u00e7\u00e3o": {},
+ "Presta\u00e7\u00e3o de Servi\u00e7o Pessoa Jur\u00eddica": {},
+ "Presta\u00e7\u00e3o de Servi\u00e7os por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio 1": {},
+ "Remunera\u00e7\u00e3o a Dirigentes de Ligados \u00e0 Produ\u00e7\u00e3o": {},
+ "Royalties e Assist\u00eancia T\u00e9cnica \u2013 EXTERIOR": {},
+ "Royalties e Assist\u00eancia T\u00e9cnica \u2013 PA\u00cdS": {},
+ "Servi\u00e7os Prestados Pessoa Jur\u00eddica": {},
+ "Servi\u00e7os Prestados por Cooperativa de Trabalho": {},
+ "Servi\u00e7os Prestados por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio": {}
+ },
+ "CUSTO DOS PRODUTOS DE FABRICA\u00c7\u00c3O PR\u00d3PRIA PRODUZIDOS DA ATIVIDADE RURAL": {
+ "Alimenta\u00e7\u00e3o do Trabalhador 2": {},
+ "Arrendamento Mercantil 3": {},
+ "Constitui\u00e7\u00e3o de Provis\u00f5es 2": {},
+ "Consumo de Insumos 1": {},
+ "Custo do Pessoal Aplicado na Produ\u00e7\u00e3o 1": {},
+ "Encargos Sociais \u2013 FGTS 2": {},
+ "Encargos Sociais \u2013 Outros 2": {},
+ "Encargos Sociais \u2013 Previd\u00eancia Social 2": {},
+ "Encargos de Deprecia\u00e7\u00e3o, Amortiza\u00e7\u00e3o e Exaust\u00e3o 2": {},
+ "Fundo de Aposentadoria Programada Individual de Empregados Ligados \u00e0 Produ\u00e7\u00e3o 1": {},
+ "Loca\u00e7\u00e3o de M\u00e3o-de-obra 2": {},
+ "Manuten\u00e7\u00e3o e Reparo de Bens Aplicados na Produ\u00e7\u00e3o 1": {},
+ "Outros Custos 9": {},
+ "Outros Gastos com Pessoal Ligado \u00e0 Produ\u00e7\u00e3o 1": {},
+ "Plano de Previd\u00eancia Privada de Empregados Ligados \u00e0 Produ\u00e7\u00e3o 1": {},
+ "Planos de Poupan\u00e7a e Investimentos de Empregados Ligados \u00e0 Produ\u00e7\u00e3o 1": {},
+ "Presta\u00e7\u00e3o de Servi\u00e7o Pessoa Jur\u00eddica 2": {},
+ "Presta\u00e7\u00e3o de Servi\u00e7os por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio 3": {},
+ "Remunera\u00e7\u00e3o a Dirigentes de Ligados \u00e0 Produ\u00e7\u00e3o 1": {},
+ "Royalties e Assist\u00eancia T\u00e9cnica \u2013 EXTERIOR 2": {},
+ "Royalties e Assist\u00eancia T\u00e9cnica \u2013 PA\u00cdS 2": {},
+ "Servi\u00e7os Prestados Pessoa Jur\u00eddica 2": {},
+ "Servi\u00e7os Prestados por Cooperativa de Trabalho 2": {},
+ "Servi\u00e7os Prestados por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio 2": {}
+ },
+ "CUSTO DOS SERVI\u00c7OS PRODUZIDOS": {
+ "Alimenta\u00e7\u00e3o do Trabalhador 1": {},
+ "Arrendamento Mercantil 2": {},
+ "Constitui\u00e7\u00e3o de Provis\u00f5es 1": {},
+ "Custo do Pessoal Aplicado na Produ\u00e7\u00e3o de Servi\u00e7os": {},
+ "Encargos Sociais \u2013 FGTS 1": {},
+ "Encargos Sociais \u2013 Outros 1": {},
+ "Encargos Sociais \u2013 Previd\u00eancia Social 1": {},
+ "Encargos de Deprecia\u00e7\u00e3o, Amortiza\u00e7\u00e3o e Exaust\u00e3o 1": {},
+ "Fundo de Aposentadoria Programada Individual de Empregados Ligados \u00e0 Produ\u00e7\u00e3o de Servi\u00e7os": {},
+ "Loca\u00e7\u00e3o de M\u00e3o-de-obra 1": {},
+ "Manuten\u00e7\u00e3o e Reparo de Bens Aplicados na Produ\u00e7\u00e3o de Servi\u00e7os": {},
+ "Material Aplicado na Produ\u00e7\u00e3o de Servi\u00e7os": {},
+ "Outros Custos 8": {},
+ "Outros Gastos com Pessoal Ligado \u00e0 Produ\u00e7\u00e3o de Servi\u00e7os": {},
+ "Plano de Previd\u00eancia Privada de Empregados Ligados \u00e0 Produ\u00e7\u00e3o de Servi\u00e7os": {},
+ "Planos de Poupan\u00e7a e Investimentos de Empregados Ligados \u00e0 Produ\u00e7\u00e3o de Servi\u00e7os": {},
+ "Presta\u00e7\u00e3o de Servi\u00e7o Pessoa Jur\u00eddica 1": {},
+ "Presta\u00e7\u00e3o de Servi\u00e7os por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio 2": {},
+ "Remunera\u00e7\u00e3o a Dirigentes ligados \u00e0 Produ\u00e7\u00e3o de Servi\u00e7os": {},
+ "Royalties e Assist\u00eancia T\u00e9cnica \u2013 EXTERIOR 1": {},
+ "Royalties e Assist\u00eancia T\u00e9cnica \u2013 PA\u00cdS 1": {},
+ "Servi\u00e7os Prestados Pessoa Jur\u00eddica 1": {},
+ "Servi\u00e7os Prestados por Cooperativa de Trabalho 1": {},
+ "Servi\u00e7os Prestados por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio 1": {}
+ }
+ },
+ "root_type": "Expense"
+ },
+ "PASSIVO": {
+ "CIRCULANTE": {
+ "OBRIGA\u00c7\u00d5ES DE CURTO PRAZO": {
+ " Gastos incluidos en la valoraci\u00f3n": {
+ "account_type": "Stock Received But Not Billed"
+ },
+ "(-) Contas Retificadoras": {},
+ "Adiantamentos de Clientes": {},
+ "Arrendamento Mercantil (Financeiro) a Curto Prazo - Exterior": {},
+ "Arrendamento Mercantil (Financeiro) a Curto Prazo - Sistema Financeiro Nacional": {},
+ "Contribui\u00e7\u00f5es Previdenci\u00e1rias a Recolher": {},
+ "Dividendos Propostos ou Lucros Creditados": {},
+ "Doa\u00e7\u00f5es e Subven\u00e7\u00f5es para Investimentos": {},
+ "D\u00e9bitos Fiscais CSLL \u2013 Diferen\u00e7as Tempor\u00e1rias": {},
+ "D\u00e9bitos Fiscais IRPJ \u2013 Diferen\u00e7as Tempor\u00e1rias": {},
+ "FGTS a Recolher": {},
+ "Financiamentos a Curto Prazo - Exterior": {},
+ "Financiamentos a Curto Prazo - Outros": {},
+ "Financiamentos a Curto Prazo - Sistema Financeiro Nacional": {},
+ "Fornecedores": {
+ "account_type": "Payable"
+ },
+ "ICMS e Contribui\u00e7\u00f5es a Recolher": {},
+ "IPI a Recolher": {},
+ "Outras Contas": {},
+ "Outros tributos a recolher": {},
+ "PIS e COFINS a Recolher": {},
+ "Provis\u00e3o para a Contribui\u00e7\u00e3o Social sobre o Lucro L\u00edquido": {},
+ "Provis\u00e3o para o Imposto de Renda": {},
+ "Provis\u00f5es de Natureza C\u00edvel": {},
+ "Provis\u00f5es de Natureza Fiscal": {},
+ "Provis\u00f5es de Natureza Trabalhista": {},
+ "Sal\u00e1rios a Pagar": {},
+ "Tributos Municipais a Recolher": {}
+ }
+ },
+ "N\u00c3O-CIRCULANTE": {
+ "OBRIGA\u00c7\u00d5ES A LONGO PRAZO": {
+ "(-) Contas Retificadoras 1": {},
+ "Arrendamento Mercantil (Financeiro) a Longo Prazo - Sistema Financeiro Nacional": {},
+ "Arrendamento Mercantil (Financeiro) a Longo Prazo \u2013 Exterior": {},
+ "Cr\u00e9ditos de Pessoas Ligadas (F\u00edsicas/Jur\u00eddicas)": {},
+ "Doa\u00e7\u00f5es e Subven\u00e7\u00f5es para Investimentos 1": {},
+ "D\u00e9bitos Fiscais CSLL - Diferen\u00e7as Tempor\u00e1rias 1": {},
+ "D\u00e9bitos Fiscais IRPJ - Diferen\u00e7as Tempor\u00e1rias 1": {},
+ "Empr\u00e9stimos de S\u00f3cios/Acionistas N\u00e3o Administradores": {},
+ "Financiamentos a Longo Prazo - Sistema Financeiro Nacional": {},
+ "Financiamentos a Longo Prazo \u2013 Brasil - Outros": {},
+ "Financiamentos a Longo Prazo \u2013 Exterior": {},
+ "Fornecedores 1": {
+ "account_type": "Payable"
+ },
+ "Outras Contas 1": {},
+ "Outras Provis\u00f5es de Natureza C\u00edvel": {},
+ "Outras Provis\u00f5es de Natureza Fiscal": {},
+ "Outras Provis\u00f5es de Natureza Trabalhista": {},
+ "Provis\u00e3o para o Imposto de Renda sobre Lucros Diferidos": {}
+ },
+ "RECEITAS DIFERIDAS": {
+ "(-) Custos Correspondentes \u00e0s Receitas Diferidas": {},
+ "Receitas Diferidas 1": {}
+ }
+ },
+ "PATRIM\u00d4NIO L\u00cdQUIDO": {
+ "AJUSTES DE AVALIA\u00c7\u00c3O PATRIMONIAL": {
+ "(-) Ajustes \u00e0s Normas Internacionais de Contabilidade": {},
+ "Ajustes \u00e0s Normas Internacionais de Contabilidade": {}
+ },
+ "CAPITAL REALIZADO": {
+ "(-) Capital a Integralizar de Domiciliados e Residentes no Exterior": {},
+ "(-) Capital a Integralizar de Domiciliados e Residentes no Pa\u00eds": {},
+ "Capital Subscrito de Domiciliados e Residentes no Exterior": {},
+ "Capital Subscrito de Domiciliados e Residentes no Pa\u00eds": {}
+ },
+ "OUTRAS CONTAS 2": {
+ "(-) A\u00e7\u00f5es em Tesouraria": {},
+ "(-) Preju\u00edzos Acumulados": {},
+ "Lucros Acumulados e/ou Saldo \u00e0 Disposi\u00e7\u00e3o da Assembl\u00e9ia": {},
+ "Outras 8": {}
+ },
+ "RESERVAS": {
+ "Outras Reservas": {},
+ "Reserva para Aumento de Capital (Lei no 9.249/1995, art. 9o, \u00a7 9o)": {},
+ "Reservas de Capital": {},
+ "Reservas de Lucros": {},
+ "Reservas de Lucros - Doa\u00e7\u00f5es e Subven\u00e7\u00f5es para Investimentos": {},
+ "Reservas de Lucros - Pr\u00eamio na Emiss\u00e3o de Deb\u00eantures": {},
+ "Reservas de Reavalia\u00e7\u00e3o": {}
+ }
+ },
+ "PATRIM\u00d4NIO SOCIAL": {
+ "FUNDO PATRIMONIAL": {
+ "Fundo Patrimonial 1": {}
+ },
+ "OUTRAS CONTAS 3": {
+ "D\u00e9ficits Acumulados": {},
+ "Super\u00e1vits Acumulados": {}
+ },
+ "RESERVAS 1": {
+ "Reservas Estatut\u00e1rias": {},
+ "Reservas Patrimoniais": {}
+ }
+ },
+ "root_type": "Liability"
+ },
+ "RESULTADO L\u00cdQUIDO DO PER\u00cdODO": {
+ "PROVIS\u00c3O PARA CSLL E IRPJ (ATIVIDADE RURAL)": {
+ "PROVIS\u00c3O PARA CSLL E IRPJ 3": {
+ "PROVIS\u00c3O PARA CSLL E IRPJ 4": {
+ "PROVIS\u00c3O PARA CSLL E IRPJ 5": {
+ "(-) Contribui\u00e7\u00e3o Social sobre o Lucro L\u00edquido 1": {},
+ "(-) Provis\u00e3o para Imposto de Renda - Pessoa Jur\u00eddica 1": {}
+ }
+ }
+ }
+ },
+ "PROVIS\u00c3O PARA CSLL E IRPJ (ATIVIDADES EM GERAL)": {
+ "PROVIS\u00c3O PARA CSLL E IRPJ": {
+ "PROVIS\u00c3O PARA CSLL E IRPJ 1": {
+ "PROVIS\u00c3O PARA CSLL E IRPJ 2": {
+ "(-) Contribui\u00e7\u00e3o Social sobre o Lucro L\u00edquido": {},
+ "(-) Provis\u00e3o para Imposto de Renda - Pessoa Jur\u00eddica": {}
+ }
+ }
+ }
+ },
+ "RESULTADO ANTES DO IRPJ E DA CSLL - ATIVIDADE RURAL": {
+ "PARTICIPA\u00c7\u00d5ES": {
+ "PARTICIPA\u00c7\u00d5ES NOS LUCROS": {
+ "OUTRAS PARTICIPA\u00c7\u00d5ES": {
+ "(-) Outras": {},
+ "(-) Participa\u00e7\u00f5es de Administradores e Partes Benefici\u00e1rias": {},
+ "(-) Participa\u00e7\u00f5es de Deb\u00eantures": {}
+ },
+ "PARTICIPA\u00c7\u00d5ES DE EMPREGADOS": {
+ "(-) Contribui\u00e7\u00f5es para Assist\u00eancia ou Previd\u00eancia de Empregados": {},
+ "(-) Outras Participa\u00e7\u00f5es de Empregados": {},
+ "(-) Participa\u00e7\u00f5es de Empregados": {}
+ }
+ }
+ },
+ "RESULTADO OPERACIONAL DA ATIVIDADE RURAL": {
+ "CUSTO DOS BENS E SERVI\u00c7OS VENDIDOS": {
+ "CUSTO DOS PRODUTOS DA ATIVIDADE RURAL VENDIDOS": {
+ "AJUSTES DE ESTOQUES DECORRENTES DE ARBITRAMENTO": {
+ "account_type": "Stock Adjustment"
+ },
+ "Custo dos Produtos Vendidos da Atividade Rural": {}
+ }
+ },
+ "DESPESAS OPERACIONAIS 3": {
+ "DESPESAS OPERACIONAIS DA ATIVIDADE RURAL": {
+ "Alimenta\u00e7\u00e3o do Trabalhador 3": {},
+ "Alugu\u00e9is 1": {},
+ "Arrendamento Mercantil 4": {},
+ "Assist\u00eancia M\u00e9dica, Odontol\u00f3gica e Farmac\u00eautica a Empregados": {},
+ "Bens de Natureza Permanente Deduzidos como Despesa": {},
+ "CPMF 1": {},
+ "Cofins 1": {},
+ "Demais Impostos, Taxas e Contribui\u00e7\u00f5es, exceto IR e CSLL": {},
+ "Demais Provis\u00f5es 1": {},
+ "Despesas com Ve\u00edculos e de Conserva\u00e7\u00e3o de Bens e Instala\u00e7\u00f5es 1": {},
+ "Despesas com viagens, di\u00e1rias e ajusta de custo": {},
+ "Doa\u00e7\u00f5es a Entidades Civis 1": {},
+ "Doa\u00e7\u00f5es a Institui\u00e7\u00f5es de Ensino e Pesquisa (Lei no 9.249/1995, art.13, \u00a7 2o) 1": {},
+ "Doa\u00e7\u00f5es e Patroc\u00ednios de Car\u00e1ter Cultural e Art\u00edstico (Lei no 8.313/1991) 1": {},
+ "Encargos Sociais - Previd\u00eancia Social 3": {},
+ "Encargos Sociais \u2013 FGTS 3": {},
+ "Encargos Sociais \u2013 Outros 3": {},
+ "Encargos de Deprecia\u00e7\u00e3o e Amortiza\u00e7\u00e3o 1": {
+ "account_type": "Depreciation"
+ },
+ "Fundo de Aposentadoria Programada Individual de Empregados": {},
+ "Gratifica\u00e7\u00f5es a Administradores": {},
+ "Loca\u00e7\u00e3o de M\u00e3o-de-obra 3": {},
+ "Multas 1": {},
+ "Ordenados, Sal\u00e1rios Gratifica\u00e7\u00f5es e Outras Remunera\u00e7\u00f5es a Empregados": {},
+ "Outras Contribui\u00e7\u00f5es e Doa\u00e7\u00f5es 1": {},
+ "Outras Despesas Operacionais 5": {},
+ "Outros Gastos com Pessoal": {},
+ "PIS/Pasep 1": {},
+ "Perdas em Opera\u00e7\u00f5es de Cr\u00e9dito": {},
+ "Pesquisas Cient\u00edficas e Tecnol\u00f3gicas": {},
+ "Plano de Previd\u00eancia Privada de Empregados": {},
+ "Planos de Poupan\u00e7a e Investimentos de Empregados": {},
+ "Presta\u00e7\u00e3o de Servi\u00e7o Pessoa Jur\u00eddica 3": {},
+ "Presta\u00e7\u00e3o de Servi\u00e7os por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio 4": {},
+ "Propaganda, Publicidade e Patroc\u00ednio": {},
+ "Propaganda, Publicidade e Patroc\u00ednio (Associa\u00e7\u00f5es Desportivas que Mantenham Equipe de Futebol Profissional)": {},
+ "Provis\u00e3o para Perda de Estoque": {},
+ "Provis\u00f5es para F\u00e9rias e 13o Sal\u00e1rio de Empregados 1": {},
+ "Remunera\u00e7\u00e3o a Dirigentes e a Conselho de Administra\u00e7\u00e3o": {},
+ "Royalties e Assist\u00eancia T\u00e9cnica \u2013 EXTERIOR 3": {},
+ "Royalties e Assist\u00eancia T\u00e9cnica \u2013 PA\u00cdS 3": {},
+ "Servi\u00e7os Prestados por Cooperativa de Trabalho 3": {}
+ }
+ },
+ "OUTRAS DESPESAS OPERACIONAIS 6": {
+ "OUTRAS DESPESAS OPERACIONAIS 7": {
+ "(-) Amortiza\u00e7\u00e3o de \u00c1gio nas Aquisi\u00e7\u00f5es de Investimentos Avaliados pelo Patrim\u00f4nio L\u00edquido": {},
+ "(-) Contrapartida de outros Ajustes \u00e0s Normas Internacionais de Contabilidade": {},
+ "(-) Contrapartida dos Ajustes ao Valor Presente": {},
+ "(-) Contrapartida dos ajustes de valor do imobilizado e intang\u00edvel": {},
+ "(-) Juros sobre o Capital Pr\u00f3prio": {},
+ "(-) Outras Despesas Financeiras": {},
+ "(-) Perdas Incorridas no Mercado de Renda Vari\u00e1vel, exceto Day-Trade 1": {},
+ "(-) Perdas em Opera\u00e7\u00f5es Day-Trade 1": {},
+ "(-) Perdas em Opera\u00e7\u00f5es Realizadas no Exterior 1": {},
+ "(-) Preju\u00edzos na Aliena\u00e7\u00e3o de Participa\u00e7\u00f5es N\u00e3o Integrantes do Ativo Permanente 1": {},
+ "(-) Resultados Negativos em Participa\u00e7\u00f5es Societ\u00e1rias 1": {},
+ "(-) Resultados Negativos em SCP": {},
+ "(-) Varia\u00e7\u00f5es Cambiais Passivas 1": {}
+ }
+ },
+ "OUTRAS RECEITAS OPERACIONAIS 4": {
+ "OUTRAS RECEITAS OPERACIONAIS 5": {
+ "Amortiza\u00e7\u00e3o de Des\u00e1gio nas Aquisi\u00e7\u00f5es de Investimentos Avaliados pelo Patrim\u00f4nio L\u00edquido": {},
+ "Contrapartida de outros Ajustes \u00e0s Normas Internacionais de Contabilidade": {},
+ "Contrapartida dos Ajustes ao Valor Presente": {},
+ "Doa\u00e7\u00f5es e Subven\u00e7\u00f5es para Investimentos 2": {},
+ "Ganhos Auferidos no Mercado de Renda Vari\u00e1vel, exceto Day-Trade 1": {},
+ "Ganhos em Opera\u00e7\u00f5es Day-Trade 1": {},
+ "Ganhos na Aliena\u00e7\u00e3o de Participa\u00e7\u00f5es N\u00e3o Integrantes do Ativo Permanente 1": {},
+ "Outras Receitas Financeiras": {},
+ "Outras Receitas Operacionais 6": {},
+ "Pr\u00eamios Recebidos na Emiss\u00e3o de Deb\u00eantures": {},
+ "Receitas de Juros sobre o Capital Pr\u00f3prio": {},
+ "Rendimentos e Ganhos de Capital Auferidos no Exterior 1": {},
+ "Resultados Positivos em Participa\u00e7\u00f5es Societ\u00e1rias 1": {},
+ "Resultados Positivos em SCP": {},
+ "Revers\u00e3o dos Saldos das Provis\u00f5es Operacionais 1": {},
+ "Varia\u00e7\u00f5es Cambiais Ativas 1": {}
+ }
+ },
+ "RECEITA OPERACIONAL L\u00cdQUIDA DA ATIVIDADE RURAL": {
+ "DEDU\u00c7\u00d5ES DA RECEITA BRUTA 1": {
+ "(-) Cofins": {},
+ "(-) Demais Impostos e Contribui\u00e7\u00f5es Incidentes sobre Vendas e Servi\u00e7os": {},
+ "(-) ICMS": {},
+ "(-) ISS": {},
+ "(-) PIS/Pasep": {},
+ "(-) Vendas Canceladas, Devolu\u00e7\u00f5es e Descontos Incondicionais": {}
+ },
+ "RECEITA BRUTA DA ATIVIDADE RURAL": {
+ "Receita da Atividade Rural": {}
+ }
+ }
+ }
+ },
+ "RESULTADO L\u00cdQUIDO DO PER\u00cdODO ANTES DO IRPJ E DA CSLL - ATIVIDADE GERAL": {
+ "OUTRAS RECEITAS E OUTRAS DESPESAS": {
+ "RECEITAS E DESPESAS N\u00c3O OPERACIONAIS 2": {
+ "DESPESAS N\u00c3O OPERACIONAIS 1": {
+ "(-) Outras Despesas N\u00e3o Operacionais 1": {},
+ "(-) Perdas de Capital por Varia\u00e7\u00e3o Percentual em Participa\u00e7\u00e3o Societ\u00e1ria Avaliada pelo Patrim\u00f4nio L\u00edquido": {},
+ "(-) Valor Cont\u00e1bil dos Bens e Direitos Alienados 1": {}
+ },
+ "RECEITAS N\u00c3O OPERACIONAIS 1": {
+ "Ganhos de Capital por Varia\u00e7\u00e3o Percentual em Participa\u00e7\u00e3o Societ\u00e1ria Avaliada pelo Patrim\u00f4nio L\u00edquido": {},
+ "Outras Receitas N\u00e3o Operacionais 1": {},
+ "Receitas de Aliena\u00e7\u00f5es de Bens e Direitos do Ativo Permanente": {}
+ }
+ }
+ },
+ "PARTICIPA\u00c7\u00d5ES 1": {
+ "PARTICIPA\u00c7\u00d5ES NOS LUCROS 1": {
+ "OUTRAS PARTICIPA\u00c7\u00d5ES 1": {
+ "(-) Outras 1": {},
+ "(-) Participa\u00e7\u00f5es de Administradores e Partes Benefici\u00e1rias 1": {},
+ "(-) Participa\u00e7\u00f5es de Deb\u00eantures 1": {}
+ },
+ "PARTICIPA\u00c7\u00d5ES DE EMPREGADOS 1": {
+ "(-) Contribui\u00e7\u00f5es para Assist\u00eancia ou Previd\u00eancia de Empregados 1": {},
+ "(-) Outras Participa\u00e7\u00f5es de Empregados 1": {},
+ "(-) Participa\u00e7\u00f5es de Empregados 1": {}
+ }
+ }
+ },
+ "RESULTADO OPERACIONAL 1": {
+ "CUSTO DOS BENS E SERVI\u00c7OS VENDIDOS 1": {
+ "AJUSTES DE ESTOQUES DECORRENTES DE ARBITRAMENTO 1": {},
+ "CUSTO DAS MERCADORIAS REVENDIDAS": {
+ "Custo das Mercadorias Revendidas 1": {},
+ "Custo dos Servi\u00e7os Vendidos": {}
+ },
+ "CUSTO DAS UNIDADES IMOBILI\u00c1RIAS VENDIDAS": {
+ "Custo das Unidades Imobili\u00e1rias Vendidas 1": {}
+ },
+ "CUSTO DOS PRODUTOS DE FABRICA\u00c7\u00c3O PR\u00d3PRIA VENDIDOS": {
+ "Custo dos Produtos de Fabrica\u00e7\u00e3o Pr\u00f3pria Vendidos 1": {}
+ }
+ },
+ "DESPESAS OPERACIONAIS 4": {
+ "DESPESAS OPERACIONAIS DAS ATIVIDADES EM GERAL": {
+ "Alimenta\u00e7\u00e3o do Trabalhador 4": {},
+ "Alugu\u00e9is 2": {},
+ "Arrendamento Mercantil 5": {},
+ "Assist\u00eancia M\u00e9dica, Odontol\u00f3gica e Farmac\u00eautica a Empregados 1": {},
+ "Bens de Natureza Permanente Deduzidos como Despesa 1": {},
+ "CPMF 2": {},
+ "Cofins 2": {},
+ "Demais Impostos, Taxas e Contribui\u00e7\u00f5es, exceto IR e CSLL 1": {},
+ "Demais Provis\u00f5es 2": {},
+ "Despesas com Ve\u00edculos e de Conserva\u00e7\u00e3o de Bens e Instala\u00e7\u00f5es 2": {},
+ "Despesas com viagens, di\u00e1rias e ajusta de custo 1": {},
+ "Doa\u00e7\u00f5es a Entidades Civis 2": {},
+ "Doa\u00e7\u00f5es a Institui\u00e7\u00f5es de Ensino e Pesquisa (Lei n\u00ba 9.249/1995, art.13, \u00a7 2\u00ba) 2": {},
+ "Doa\u00e7\u00f5es e Patroc\u00ednios de Car\u00e1ter Cultural e Art\u00edstico (Lei no 8.313/1991) 2": {},
+ "Encargos Sociais \u2013 FGTS 4": {},
+ "Encargos Sociais \u2013 Outros 4": {},
+ "Encargos Sociais \u2013 Previd\u00eancia Social 4": {},
+ "Encargos de Deprecia\u00e7\u00e3o e Amortiza\u00e7\u00e3o 2": {},
+ "Fundo de Aposentadoria Programada Individual de Empregados 1": {},
+ "Gratifica\u00e7\u00f5es a Administradores 1": {},
+ "Loca\u00e7\u00e3o de M\u00e3o-de-obra 4": {},
+ "Multas 2": {},
+ "Ordenados, Sal\u00e1rios Gratifica\u00e7\u00f5es e Outras Remunera\u00e7\u00f5es a Empregados 1": {},
+ "Outras Contribui\u00e7\u00f5es e Doa\u00e7\u00f5es 2": {},
+ "Outras Despesas Operacionais 8": {},
+ "Outros Gastos com Pessoal 1": {},
+ "PIS/Pasep 2": {},
+ "Perdas em Opera\u00e7\u00f5es de Cr\u00e9dito 1": {},
+ "Pesquisas Cient\u00edficas e Tecnol\u00f3gicas 1": {},
+ "Plano de Previd\u00eancia Privada de Empregados 1": {},
+ "Planos de Poupan\u00e7a e Investimentos de Empregados 1": {},
+ "Presta\u00e7\u00e3o de Servi\u00e7o Pessoa Jur\u00eddica 4": {},
+ "Presta\u00e7\u00e3o de Servi\u00e7os por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio 5": {},
+ "Propaganda, Publicidade e Patroc\u00ednio (Associa\u00e7\u00f5es Desportivas que Mantenham Equipe de Futebol Profissional) 1": {},
+ "Propaganda, Publicidade e Patroc\u00ednio 1": {},
+ "Provis\u00e3o para Perda de Estoque 1": {},
+ "Provis\u00f5es para F\u00e9rias e 13o Sal\u00e1rio de Empregados 2": {},
+ "Remunera\u00e7\u00e3o a Dirigentes e a Conselho de Administra\u00e7\u00e3o 1": {},
+ "Royalties e Assist\u00eancia T\u00e9cnica \u2013 EXTERIOR 4": {},
+ "Royalties e Assist\u00eancia T\u00e9cnica \u2013 PA\u00cdS 4": {},
+ "Servi\u00e7os Prestados por Cooperativa de Trabalho 4": {}
+ }
+ },
+ "OUTRAS DESPESAS OPERACIONAIS 9": {
+ "OUTRAS DESPESAS OPERACIONAIS 10": {
+ "(-) Amortiza\u00e7\u00e3o de \u00c1gio nas Aquisi\u00e7\u00f5es de Investimentos Avaliados pelo Patrim\u00f4nio L\u00edquido 1": {},
+ "(-) Contrapartida de outros Ajustes \u00e0s Normas Internacionais de Contabilidade 1": {},
+ "(-) Contrapartida dos Ajustes ao Valor Presente 1": {},
+ "(-) Contrapartida dos Ajustes de Valor do Imobilizado e Intang\u00edvel 1": {},
+ "(-) Juros sobre o Capital Pr\u00f3prio 1": {},
+ "(-) Outras Despesas Financeiras 1": {},
+ "(-) Perdas Incorridas no Mercado de Renda Vari\u00e1vel, exceto Day-Trade 2": {},
+ "(-) Perdas em Opera\u00e7\u00f5es Day-Trade 2": {},
+ "(-) Perdas em Opera\u00e7\u00f5es Realizadas no Exterior 2": {},
+ "(-) Preju\u00edzos na Aliena\u00e7\u00e3o de Participa\u00e7\u00f5es N\u00e3o Integrantes do Ativo Permanente 2": {},
+ "(-) Resultados Negativos em Participa\u00e7\u00f5es Societ\u00e1rias 2": {},
+ "(-) Resultados Negativos em SCP 1": {},
+ "(-) Varia\u00e7\u00f5es Cambiais Passivas 2": {}
+ }
+ },
+ "OUTRAS RECEITAS OPERACIONAIS 7": {
+ "OUTRAS RECEITAS OPERACIONAIS 8": {
+ "Amortiza\u00e7\u00e3o de Des\u00e1gio nas Aquisi\u00e7\u00f5es de Investimentos Avaliados pelo Patrim\u00f4nio L\u00edquido 1": {},
+ "Contrapartida de outros Ajustes \u00e0s Normas Internacionais de Contabilidade 1": {},
+ "Contrapartida dos Ajustes ao Valor Presente 1": {},
+ "Doa\u00e7\u00f5es e Subven\u00e7\u00f5es para Investimentos 3": {},
+ "Ganhos Auferidos no Mercado de Renda Vari\u00e1vel, exceto Day-Trade 2": {},
+ "Ganhos em Opera\u00e7\u00f5es Day-Trade 2": {},
+ "Ganhos na Aliena\u00e7\u00e3o de Participa\u00e7\u00f5es N\u00e3o Integrantes do Ativo Permanente 2": {},
+ "Outras Receitas Financeiras 1": {},
+ "Outras Receitas Operacionais 9": {},
+ "Pr\u00eamios Recebidos na Emiss\u00e3o de Deb\u00eantures 1": {},
+ "Receitas de Juros sobre o Capital Pr\u00f3prio 1": {},
+ "Rendimentos e Ganhos de Capital Auferidos no Exterior 2": {},
+ "Resultados Positivos em Participa\u00e7\u00f5es Societ\u00e1rias 2": {},
+ "Resultados Positivos em SCP 1": {},
+ "Revers\u00e3o dos Saldos das Provis\u00f5es Operacionais 2": {},
+ "Varia\u00e7\u00f5es Cambiais Ativas 2": {}
+ }
+ },
+ "RECEITA LIQUIDA": {
+ "DEDU\u00c7\u00d5ES DA RECEITA BRUTA 2": {
+ "(-) Cofins 1": {},
+ "(-) Demais Impostos e Contribui\u00e7\u00f5es Incidentes sobre Vendas e Servi\u00e7os 1": {},
+ "(-) ICMS 1": {},
+ "(-) ISS 1": {},
+ "(-) PIS/Pasep 1": {},
+ "(-) Vendas Canceladas, Devolu\u00e7\u00f5es e Descontos Incondicionais 1": {}
+ },
+ "RECEITA BRUTA 1": {
+ "Outras 13": {},
+ "Receita da Presta\u00e7\u00e3o de Servi\u00e7os \u2013 Mercado Interno": {},
+ "Receita da Revenda de Mercadorias no Mercado Interno": {},
+ "Receita da Venda no Mercado Interno de Produtos de Fabrica\u00e7\u00e3o Pr\u00f3pria": {},
+ "Receita das Unidades Imobili\u00e1rias Vendidas": {},
+ "Receita de Exporta\u00e7\u00e3o Direta de Mercadorias e Produtos": {},
+ "Receita de Exporta\u00e7\u00e3o de Servi\u00e7os": {},
+ "Receita de Loca\u00e7\u00e3o de Bens M\u00f3veis e Im\u00f3veis": {},
+ "Receita de Vendas de Mercadorias e Produtos a Comercial Exportadora com Fim Espec\u00edfico de Exporta\u00e7\u00e3o": {}
+ }
+ }
+ }
+ },
+ "root_type": "Income"
+ },
+ "SUPER\u00c1VIT/D\u00c9FICIT L\u00cdQUIDO DO PER\u00cdODO": {
+ "OUTRAS RECEITAS E DESPESAS": {
+ "RECEITAS E DESPESAS N\u00c3O OPERACIONAIS": {
+ "RECEITAS E DESPESAS N\u00c3O OPERACIONAIS 1": {
+ "DESPESAS N\u00c3O OPERACIONAIS": {
+ "(-) Outras Despesas N\u00e3o Operacionais": {},
+ "(-) Valor Cont\u00e1bil dos Bens e Direitos Alienados": {}
+ },
+ "RECEITAS N\u00c3O OPERACIONAIS": {
+ "Outras Receitas N\u00e3o Operacionais": {},
+ "Receitas de Aliena\u00e7\u00f5es de Bens e Direitos do Ativo Permanente.": {}
+ }
+ }
+ }
+ },
+ "RESULTADO OPERACIONAL": {
+ "CUSTO DOS PRODUTOS E SERVI\u00c7OS VENDIDOS": {
+ "CUSTO DOS PRODUTOS VENDIDOS": {
+ "CUSTO DOS PRODUTOS VENDIDOS PARA AS DEMAIS ATIVIDADES": {
+ "Custos dos Produtos Vendidos em Geral": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "Outros Custos 4": {},
+ "account_type": "Cost of Goods Sold"
+ },
+ "CUSTO DOS PRODUTOS VENDIDOS PARA ASSIST\u00caNCIA SOCIAL": {
+ "Custos dos Produtos para Assist\u00eancia Social - Gratuidades": {},
+ "Custos dos Produtos para Assist\u00eancia Social - Vendidos": {},
+ "Outras": {}
+ },
+ "CUSTO DOS PRODUTOS VENDIDOS PARA EDUCA\u00c7\u00c3O": {
+ "Custos dos Produtos para Educa\u00e7\u00e3o - Gratuidades": {},
+ "Custos dos Produtos para Educa\u00e7\u00e3o - Vendidos": {},
+ "Outros Custos 6": {}
+ },
+ "CUSTO DOS PRODUTOS VENDIDOS PARA SA\u00daDE": {
+ "Custos dos Produtos para Sa\u00fade - Gratuidades": {},
+ "Custos dos Produtos para Sa\u00fade \u2013 Vendidos": {},
+ "Outros Custos 5": {}
+ },
+ "account_type": "Cost of Goods Sold"
+ },
+ "CUSTO DOS SERVI\u00c7OS PRESTADOS": {
+ "CUSTO DOS SERVI\u00c7OS PRESTADOS PARA AS DEMAIS ATIVIDADES": {
+ "Custo dos Servi\u00e7os Prestados em Geral": {},
+ "Outros Custos": {}
+ },
+ "CUSTO DOS SERVI\u00c7OS PRESTADOS PARA ASSIST\u00caNCIA SOCIAL": {
+ "Custo dos Servi\u00e7os Prestados a Conv\u00eanios/Contratos/Parcerias": {},
+ "Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es 1": {},
+ "Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas 1": {},
+ "Custo dos Servi\u00e7os Prestados a Gratuidade 1": {},
+ "Custo dos Servi\u00e7os Prestados a Pacientes Particulares": {},
+ "Outros Custos 2": {}
+ },
+ "CUSTO DOS SERVI\u00c7OS PRESTADOS PARA EDUCA\u00c7\u00c3O": {
+ "Custo dos Servi\u00e7os Prestados a Alunos N\u00e3o Bolsistas": {},
+ "Custo dos Servi\u00e7os Prestados a Conv\u00eanios/Contratos/Parcerias (Exceto PROUNI)": {},
+ "Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es": {},
+ "Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas": {},
+ "Custo dos Servi\u00e7os Prestados a Gratuidade": {},
+ "Custo dos Servi\u00e7os Prestados ao PROUNI": {},
+ "Outros Custos 1": {}
+ },
+ "CUSTO DOS SERVI\u00c7OS PRESTADOS PARA SA\u00daDE": {
+ "Custo dos Servi\u00e7os Prestados a Conv\u00eanios SUS": {},
+ "Custo dos Servi\u00e7os Prestados a Conv\u00eanios/Contratos/Parcerias 1": {},
+ "Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es 2": {},
+ "Custo dos Servi\u00e7os Prestados a Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas 2": {},
+ "Custo dos Servi\u00e7os Prestados a Gratuidade 2": {},
+ "Custo dos Servi\u00e7os Prestados a Pacientes Particulares 1": {},
+ "Outros Custos 3": {}
+ }
+ }
+ },
+ "DESPESAS OPERACIONAIS": {
+ "DESPESAS OPERACIONAIS 1": {
+ "DESPESAS OPERACIONAIS 2": {
+ "Alugu\u00e9is": {},
+ "Arrendamento Mercantil": {},
+ "Assist\u00eancia M\u00e9dica, Odontol\u00f3gica, Medicamentos, Aparelhos Ortop\u00e9dicos e Similares": {},
+ "COFINS": {},
+ "CPMF": {},
+ "CSLL": {},
+ "Contribui\u00e7\u00f5es Previdenci\u00e1rias Patronais": {},
+ "Demais Impostos, Taxas e Contribui\u00e7\u00f5es, exceto as citadas acima.": {},
+ "Demais Provis\u00f5es": {},
+ "Despesas com Ve\u00edculos e de Conserva\u00e7\u00e3o de Bens e Instala\u00e7\u00f5es": {},
+ "Doa\u00e7\u00f5es a Entidades Civis": {},
+ "Doa\u00e7\u00f5es a Institui\u00e7\u00f5es de Ensino e Pesquisa (Lei no 9.249/1995, art.13, \u00a7 2o)": {},
+ "Doa\u00e7\u00f5es e Patroc\u00ednios de Car\u00e1ter Cultural e Art\u00edstico (Lei no 8.313/1991)": {},
+ "Encargos de Deprecia\u00e7\u00e3o e Amortiza\u00e7\u00e3o": {},
+ "FGTS (sem indeniza\u00e7\u00e3o 40%)": {},
+ "Indeniza\u00e7\u00f5es Trabalhistas": {},
+ "Multas": {},
+ "Outras Contribui\u00e7\u00f5es e Doa\u00e7\u00f5es": {},
+ "Outras Despesas Operacionais 4": {},
+ "PIS/PASEP": {},
+ "Presta\u00e7\u00e3o de Servi\u00e7o por Pessoa Jur\u00eddica": {},
+ "Presta\u00e7\u00e3o de Servi\u00e7os por Pessoa F\u00edsica sem V\u00ednculo Empregat\u00edcio": {},
+ "Propaganda e Publicidade": {},
+ "Provis\u00f5es para F\u00e9rias e 13o Sal\u00e1rio de Empregados": {},
+ "Remunera\u00e7\u00e3o a Dirigentes e a Conselho de Administra\u00e7\u00e3o/Fiscal": {},
+ "Remunera\u00e7\u00f5es a Empregados": {},
+ "Repasses para Outras Entidades (Sindicatos/Federa\u00e7\u00f5es/Confedera\u00e7\u00f5es)": {}
+ }
+ }
+ },
+ "OUTRAS DESPESAS OPERACIONAIS": {
+ "OUTRAS DESPESAS OPERACIONAIS 1": {
+ "OUTRAS DESPESAS OPERACIONAIS 2": {
+ "(-) Outras Despesas de Aplica\u00e7\u00f5es": {},
+ "(-) Perdas Incorridas no Mercado de Renda Vari\u00e1vel, exceto Day-Trade": {},
+ "(-) Perdas em Opera\u00e7\u00f5es Day-Trade": {},
+ "(-) Perdas em Opera\u00e7\u00f5es Realizadas no Exterior": {},
+ "(-) Preju\u00edzos na Aliena\u00e7\u00e3o de Participa\u00e7\u00f5es N\u00e3o Integrantes do Ativo Permanente": {},
+ "(-) Resultados Negativos em Participa\u00e7\u00f5es Societ\u00e1rias": {},
+ "(-) Varia\u00e7\u00f5es Cambiais Passivas": {},
+ "Outras Despesas Operacionais 3": {}
+ }
+ }
+ },
+ "OUTRAS RECEITAS OPERACIONAIS": {
+ "OUTRAS RECEITAS OPERACIONAIS 1": {
+ "OUTRAS RECEITAS OPERACIONAIS 2": {
+ "Ganhos Auferidos no Mercado de Renda Vari\u00e1vel, exceto Day-Trade": {},
+ "Ganhos em Opera\u00e7\u00f5es Day-Trade": {},
+ "Ganhos na Aliena\u00e7\u00e3o de Participa\u00e7\u00f5es N\u00e3o Integrantes do Ativo Permanente": {},
+ "Outras 7": {},
+ "Outras Receitas Operacionais 3": {},
+ "Outras Receitas de Aplica\u00e7\u00f5es Financeiras": {},
+ "Rendimentos e Ganhos de Capital Auferidos no Exterior": {},
+ "Resultados Positivos em Participa\u00e7\u00f5es Societ\u00e1rias": {},
+ "Revers\u00e3o dos Saldos das Provis\u00f5es Operacionais": {},
+ "Varia\u00e7\u00f5es Cambiais Ativas": {}
+ }
+ }
+ },
+ "RECEITA OPERACIONAL L\u00cdQUIDA": {
+ "RECEITA BRUTA": {
+ "DEDU\u00c7\u00d5ES DA RECEITA BRUTA": {
+ "(-) Devolu\u00e7\u00f5es e Descontos Incondicionais": {},
+ "(-) Vendas Canceladas": {},
+ "Outras 5": {}
+ },
+ "RECEITA DE PRESTA\u00c7\u00c3O DOS SERVI\u00c7OS": {
+ "Contribui\u00e7\u00f5es 2": {},
+ "Doa\u00e7\u00f5es 2": {},
+ "Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas 2": {},
+ "Outras 6": {},
+ "Servi\u00e7os Educacionais": {}
+ },
+ "RECEITA DE SERVI\u00c7OS DE SA\u00daDE": {
+ "Contribui\u00e7\u00f5es": {},
+ "Conv\u00eanios \u2013 Outros": {},
+ "Conv\u00eanios \u2013 SUS": {},
+ "Doa\u00e7\u00f5es": {},
+ "Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas": {},
+ "Outras 2": {},
+ "Pacientes Particulares": {}
+ },
+ "RECEITA DE VENDA DE PRODUTOS": {
+ "Da atividade de Assist\u00eancia Social": {},
+ "Da atividade de Educa\u00e7\u00e3o": {},
+ "Da atividade de Sa\u00fade": {},
+ "Outras 1": {}
+ },
+ "RECEITAS DE OUTRAS ATIVIDADES": {
+ "Contribui\u00e7\u00f5es Confederativas/Associativas": {},
+ "Contribui\u00e7\u00f5es Sindicais": {},
+ "Doa\u00e7\u00f5es/Subven\u00e7\u00f5es": {},
+ "Mensalidades": {},
+ "Outras 4": {},
+ "Outras Contribui\u00e7\u00f5es": {}
+ },
+ "RECEITAS DE SERVI\u00c7OS DE ASSIST\u00caNCIA SOCIAL": {
+ "Contribui\u00e7\u00f5es 1": {},
+ "Conv\u00eanios - Outros 1": {},
+ "Doa\u00e7\u00f5es 1": {},
+ "Doa\u00e7\u00f5es/Subven\u00e7\u00f5es Vinculadas 1": {},
+ "Outras 3": {},
+ "Pacientes Particulares 1": {}
+ }
+ }
+ }
+ },
+ "root_type": "Asset"
+ }
+ }
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ca_plan_comptable_pour_les_provinces_francophones.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ca_plan_comptable_pour_les_provinces_francophones.json
new file mode 100644
index 0000000..2811fc5
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ca_plan_comptable_pour_les_provinces_francophones.json
@@ -0,0 +1,412 @@
+{
+ "country_code": "ca",
+ "name": "Canada - Plan comptable pour les provinces francophones",
+ "tree": {
+ "Actif": {
+ "Actif \u00e0 court terme": {
+ "Avances": {
+ "Avances aux actionnaires": {},
+ "Avances aux employ\u00e9s": {},
+ "Avances sur commissions": {}
+ },
+ "Banque": {
+ "account_type": "Bank",
+ "is_group": 1
+ },
+ "Comptes \u00e0 recevoir": {
+ "Comptes clients": {
+ "account_type": "Receivable"
+ },
+ "Provision pour cr\u00e9ances douteuses": {}
+ },
+ "Encaisse": {
+ "is_group": 1
+ },
+ "Frais pay\u00e9s d\u2019avance": {
+ "Assurances pay\u00e9s d'avance": {},
+ "Publicit\u00e9 pay\u00e9 d'avance": {},
+ "Taxes pay\u00e9s d'avance": {}
+ },
+ "Petite caisse": {
+ "account_type": "Cash",
+ "is_group": 1
+ },
+ "Stocks": {
+ "Mati\u00e8res premi\u00e8res": {},
+ "Stock de produits fini": {},
+ "Stock exp\u00e9di\u00e9 non-factur\u00e9": {},
+ "Travaux en cours": {},
+ "account_type": "Stock"
+ },
+ "Subventions \u00e0 recevoir": {},
+ "TR\u00c9SORERIE OU \u00c9QUIVALENTS DE TR\u00c9SORERIE": {},
+ "Taxes \u00e0 recevoir": {
+ "TPS \u00e0 recevoir": {},
+ "TVH \u00e0 recevoir": {
+ "TVH \u00e0 recevoir - 13%": {},
+ "TVH \u00e0 recevoir - 14%": {},
+ "TVH \u00e0 recevoir - 15%": {}
+ },
+ "TVP/TVQ \u00e0 recevoir": {}
+ }
+ },
+ "Autres actifs": {
+ " Frais de premier \u00e9tablissement": {},
+ "Achalandage": {},
+ "Brevets, droits": {},
+ "Frais de recherche et de d\u00e9veloppement - actif": {}
+ },
+ "Immobilisations": {
+ " Amortissement accumul\u00e9 - b\u00e2timent": {},
+ " Amortissement accumul\u00e9 - entrep\u00f4t": {},
+ " Amortissement accumul\u00e9 - logiciels": {},
+ " Amortissement accumul\u00e9 - machinerie et \u00e9quipement": {},
+ " Amortissement accumul\u00e9 - \u00e9quipement informatique": {},
+ "Amortissement accumul\u00e9 - am\u00e9liorations locatives": {},
+ "Amortissement accumul\u00e9 - biens lou\u00e9s en vertu d\u2019un contrat de location - acquisition": {},
+ "Amortissement accumul\u00e9 - mat\u00e9riel roulant": {},
+ "Amortissement accumul\u00e9 - mobilier et \u00e9quipement de bureau": {},
+ "Am\u00e9liorations locatives": {
+ "account_type": "Fixed Asset"
+ },
+ "Biens lou\u00e9s en vertu d\u2019un contrat de location - acquisition": {
+ "account_type": "Fixed Asset"
+ },
+ "B\u00e2timent": {
+ "account_type": "Fixed Asset"
+ },
+ "Entrep\u00f4t": {
+ "account_type": "Fixed Asset"
+ },
+ "Logiciels": {
+ "account_type": "Fixed Asset"
+ },
+ "Machinerie et \u00e9quipement": {
+ "account_type": "Fixed Asset"
+ },
+ "Mat\u00e9riel roulant": {
+ "account_type": "Fixed Asset"
+ },
+ "Mobilier et \u00e9quipement de bureau": {
+ "account_type": "Fixed Asset"
+ },
+ "Terrain": {
+ "account_type": "Fixed Asset"
+ },
+ "account_type": "Fixed Asset",
+ "\u00c9quipement informatique": {
+ "account_type": "Fixed Asset"
+ }
+ },
+ "Placements": {
+ "D\u00e9p\u00f4ts": {},
+ "Placement": {}
+ },
+ "root_type": "Asset"
+ },
+ "Avoir des actionnaires": {
+ " B\u00e9n\u00e9fice de la p\u00e9riode": {},
+ "Bonis": {},
+ "B\u00e9n\u00e9fices non r\u00e9partis": {},
+ "Capital - actions ordinaire": {},
+ "Capital - actions privil\u00e9gi\u00e9": {},
+ "Dividendes": {},
+ "Surplus d\u2019apport": {},
+ "root_type": "Equity"
+ },
+ "Charges": {
+ "Charges d'exploitation": {
+ "Salaires et charges sociales": {
+ "Assurance - emploi": {
+ "account_type": "Chargeable"
+ },
+ "Assurance parentale": {},
+ "Fonds des services de sant\u00e9": {},
+ "Imp\u00f4t f\u00e9d\u00e9ral": {},
+ "Imp\u00f4t provincial": {},
+ "Normes du travail": {},
+ "Rentes": {},
+ "Salaires": {
+ "account_type": "Chargeable"
+ },
+ "sant\u00e9 et s\u00e9curit\u00e9 du travail CSST": {
+ "account_type": "Chargeable"
+ }
+ }
+ },
+ "Frais fixes": {
+ "Frais de fabrication": {
+ " R\u00e9parations et entretien - moules et matrices": {},
+ "Ammortissements": {
+ "Amortissements - am\u00e9liorations locatives": {
+ "account_type": "Depreciation"
+ },
+ "Amortissements - biens lou\u00e9s contrat de location - acquisition": {
+ "account_type": "Depreciation"
+ },
+ "Amortissements - b\u00e2timent": {
+ "account_type": "Depreciation"
+ },
+ "Amortissements - entrep\u00f4t": {
+ "account_type": "Depreciation"
+ },
+ "Amortissements - machinerie et \u00e9quipement": {
+ "account_type": "Depreciation"
+ },
+ "Amortissements - mat\u00e9riel roulant": {
+ "account_type": "Depreciation"
+ },
+ "Amortissements - moules et matrices": {
+ "account_type": "Depreciation"
+ },
+ "account_type": "Depreciation"
+ },
+ "Assurances": {
+ " Assurances - feu": {},
+ " Assurances - responsabilit\u00e9": {},
+ " Assurances - vol": {}
+ },
+ "Avantages sociaux - frais de fabrication": {},
+ "D\u00e9penses - mat\u00e9riel roulant": {},
+ "Entretien du terrain \u00e0 contrat": {},
+ "Fournitures d\u2019emballage": {},
+ "Fournitures d\u2019usine": {},
+ "Location de machinerie": {},
+ "Loyer - b\u00e2timent": {},
+ "Loyer - entrep\u00f4t": {},
+ "Op\u00e9rations indirectes de la main-d\u2019\u0153uvre directe": {
+ "is_group": 1
+ },
+ "R\u00e9parations et entretien - b\u00e2timent": {},
+ "R\u00e9parations et entretien - machinerie et \u00e9quipement": {},
+ "Salaires de soutien": {},
+ "Salaires de supervision": {},
+ "Taxes fonci\u00e8res": {},
+ "\u00c9nergie": {}
+ },
+ "Frais de formation": {
+ " Salaires - administration - frais fixe formation": {},
+ "Avantages sociaux - frais fixe formation": {},
+ "Cr\u00e9dits d\u2019imp\u00f4ts \u00e0 la formation": {},
+ "Honoraires": {},
+ "Main-d\u2019\u0153uvre directe - frais fixe formation": {},
+ "Main-d\u2019\u0153uvre indirecte - frais fixe formation": {},
+ "Salaires - bureau - frais fixe formation": {},
+ "Salaires - vente": {}
+ },
+ "Frais de non-qualit\u00e9": {
+ " Avantages sociaux - non-qualit\u00e9": {},
+ " Main-d\u2019\u0153uvre directe - non-qualit\u00e9": {
+ "Main-d\u2019\u0153uvre directe - gaspillage": {},
+ "Main-d\u2019\u0153uvre directe - r\u00e9parations de garantie": {},
+ "Main-d\u2019\u0153uvre directe - travail a reprendre": {}
+ },
+ "Mat\u00e9riel - non-qualit\u00e9": {
+ "Mat\u00e9riel - gaspillage": {},
+ "Mat\u00e9riel - r\u00e9parations de garantie": {},
+ "Mat\u00e9riel - travail a reprendre": {}
+ },
+ "Salaire - inspecteur (contr\u00f4le de la qualit\u00e9)": {}
+ },
+ "Frais de recherche et de d\u00e9veloppement - charge": {
+ " Mati\u00e8res premi\u00e8res - R&D": {},
+ "Avantages sociaux - R&D": {},
+ "Cr\u00e9dits d\u2019imp\u00f4ts - R&D": {},
+ "Honoraires professionnels - R&D": {},
+ "Main-d\u2019\u0153uvre directe - R&D": {},
+ "Sous-traitance - R&D": {}
+ },
+ "Frais financiers": {
+ " Escomptes de caisse sur achats": {},
+ " Int\u00e9r\u00eats et frais de banque": {},
+ " Int\u00e9r\u00eats sur emprunts - actionnaires": {},
+ " Int\u00e9r\u00eats sur emprunts - machinerie": {},
+ " Int\u00e9r\u00eats sur emprunts - mat\u00e9riel roulant": {},
+ "Escomptes de caisse sur ventes": {},
+ "Int\u00e9r\u00eats sur hypoth\u00e8que": {}
+ },
+ "Frais fixe de vente": {
+ " Frais de voyages - camionneurs": {},
+ " Frais de voyages - service apr\u00e8s-vente": {},
+ "Amortissement - camions": {},
+ "Amortissements - frais fixe de vente": {
+ " Amortissements - autos": {},
+ " Amortissements - bureau de vente": {}
+ },
+ "Assurances - camions": {},
+ "Assurances d\u2019autos - vendeurs": {},
+ "Avantages sociaux - frais fixe de vente": {},
+ "Catalogues": {},
+ "D\u00e9penses - bureau de vente": {},
+ "Emballage \u00e0 la livraison": {},
+ "Entretien et r\u00e9parations - camions": {},
+ "Frais de repr\u00e9sentation": {},
+ "Frais de voyages - vendeurs": {},
+ "Frais d\u2019autos - service apr\u00e8s-vente": {},
+ "Frais d\u2019autos - vendeurs": {},
+ "Loyer - bureau de vente": {},
+ "Prototypes et \u00e9chantillons": {},
+ "Publicit\u00e9": {},
+ "Salaires - camionneurs": {},
+ "Salaires - frais fixe de vente": {
+ "Salaires - exp\u00e9diteurs": {},
+ "Salaires - g\u00e9rants": {},
+ "Salaires - service apr\u00e8s-vente": {},
+ "Salaires - vendeurs": {}
+ }
+ },
+ "Frais fixe d\u2019administration": {
+ " Assurances d\u2019autos - administration": {},
+ "Amortissements - frais fixe d'administration": {
+ "Amortissements - autos - frais fixe d'administration": {},
+ "Amortissements - logiciels": {},
+ "Amortissements - mobilier de bureau": {},
+ "Amortissements - \u00e9quipement informatique": {}
+ },
+ "Avantages sociaux - frais fixe d'administration": {},
+ "Dons et associations": {},
+ "Entretien et r\u00e9parations - bureau": {},
+ "Frais de perception": {},
+ "Frais de voyages - administration": {},
+ "Frais de v\u00e9rification": {},
+ "Frais d\u2019autos - administration": {},
+ "Frais juridiques": {},
+ "Location - \u00e9quipement de bureau": {},
+ "Mauvaises cr\u00e9ances": {},
+ "Papeterie et d\u00e9penses de bureau": {},
+ "Salaires - frais fixe d'administration": {
+ "Salaires - administration": {},
+ "Salaires - bureau": {}
+ },
+ "Taxe sur le capital": {},
+ "Taxes, licences, permis": {},
+ "Timbres": {},
+ "T\u00e9l\u00e9communications": {}
+ }
+ },
+ "Frais variables": {
+ "Frais variables de fabrication": {
+ " Emballage \u00e0 la production": {
+ "account_type": "Cost of Goods Sold"
+ },
+ " Sous-traitance": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "Achats de mati\u00e8res premi\u00e8res": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "Achats de mat\u00e9riel direct": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "Achats de produits non fabriqu\u00e9s": {
+ "account_type": "Expenses Included In Valuation"
+ },
+ "Avantages sociaux": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "Main-d\u2019\u0153uvre directe": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "Variation des stocks": {
+ "account_type": "Stock Adjustment"
+ },
+ "account_type": "Cost of Goods Sold"
+ },
+ "Frais variables de vente": {
+ "Commissions": {},
+ "Redevances": {},
+ "Transport (\u00e0 contrat)": {}
+ }
+ },
+ "root_type": "Expense"
+ },
+ "Passif": {
+ "PASSIFS NON-COURANTS": {
+ "AUTRES PASSIFS NON-COURANTS": {},
+ "DETTES FINANCI\u00c8RES NON-COURANTES": {},
+ "IMP\u00d4TS DIFF\u00c9R\u00c9S": {},
+ "PROVISIONS POUR RETRAITES ET AUTRES AVANTAGES POST\u00c9RIEURS \u00c0 L'EMPLOI": {}
+ },
+ "Passif \u00e0 court terme": {
+ " Commissions \u00e0 payer": {},
+ "Assurance collective \u00e0 payer": {},
+ "Autres comptes cr\u00e9diteurs": {},
+ "Comptes \u00e0 payer": {
+ "Comptes fournisseurs": {
+ "account_type": "Payable"
+ }
+ },
+ "D\u00e9p\u00f4ts de clients": {},
+ "Emprunt de banque": {},
+ "Imp\u00f4ts li\u00e9s aux salaires \u00e0 payer": {
+ "Agence du revenu du Canada": {
+ "Assurance - emploi \u00e0 payer": {
+ "AE - Contribution de l'employeur": {},
+ "AE - Contribution des employ\u00e9s": {}
+ },
+ "Imp\u00f4t f\u00e9d\u00e9ral sur salaires \u00e0 payer": {}
+ },
+ "Agence du revenu du Qu\u00e9bec": {
+ "Fond des Services de Sant\u00e9 \u00e0 payer": {},
+ "Imp\u00f4t provincial sur salaires \u00e0 payer": {},
+ "Normes du Travail \u00e0 payer": {},
+ "Provision pour sant\u00e9 et s\u00e9curit\u00e9 du travail CSST": {},
+ "R\u00e9gime des rentes du Qu\u00e9bec \u00e0 payer": {
+ "Rentes - Contribution de l'employeur": {},
+ "Rentes - Contribution des employ\u00e9s": {}
+ },
+ "R\u00e9gime qu\u00e9becois d'assurance parentale": {
+ "AP - Contribution de l'employeur": {},
+ "AP - Contribution des employ\u00e9s": {}
+ }
+ },
+ "Caisse de retraite \u00e0 payer": {}
+ },
+ "Imp\u00f4ts \u00e0 payer": {
+ "Imp\u00f4t f\u00e9d\u00e9ral sur le revenu \u00e0 payer": {},
+ "Imp\u00f4t provincial sur le revenu \u00e0 payer": {},
+ "TPS \u00e0 payer": {},
+ "TVH \u00e0 payer": {
+ "TVH \u00e0 payer - 13%": {},
+ "TVH \u00e0 payer - 14%": {},
+ "TVH \u00e0 payer - 15%": {}
+ },
+ "TVP/TVQ \u00e0 payer": {}
+ },
+ "Passifs de stock": {
+ "Stock re\u00e7u non factur\u00e9": {
+ "account_type": "Stock Received But Not Billed"
+ }
+ },
+ "Provision pour vacances et cong\u00e9s": {},
+ "Revenus per\u00e7us d\u2019avance": {},
+ "Salaires \u00e0 payer": {}
+ },
+ "Passif \u00e0 long terme": {
+ "Avances des actionnaires": {},
+ "Cr\u00e9dits d\u2019imp\u00f4ts report\u00e9s": {},
+ "Hypoth\u00e8que \u00e0 payer": {},
+ "Liens sur machinerie": {},
+ "Liens sur mat\u00e9riel roulant": {},
+ "Obligation d\u00e9coulant d\u2019un contrat de location - acquisition": {},
+ "Passif d\u2019imp\u00f4ts futurs": {}
+ },
+ "root_type": "Liability"
+ },
+ "Produits": {
+ "Revenus de ventes": {
+ " Escomptes de volume sur ventes": {},
+ "Autres produits d'exploitation": {},
+ "Ventes": {},
+ "Ventes avec des provinces harmonis\u00e9es": {},
+ "Ventes avec des provinces non-harmonis\u00e9es": {},
+ "Ventes \u00e0 l'\u00e9tranger": {}
+ },
+ "Revenus non li\u00e9 \u00e0 la vente": {
+ "Autres revenus non li\u00e9s \u00e0 la vente": {},
+ "Revenues d'int\u00e9r\u00eats": {}
+ },
+ "root_type": "Income"
+ }
+ }
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json
new file mode 100644
index 0000000..e109a3a
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/de_kontenplan_SKR04.json
@@ -0,0 +1,1707 @@
+{
+ "country_code": "de",
+ "name": "Germany - Kontenplan SKR04",
+ "tree": {
+ "Bilanz - Aktiva": {
+ "Anlageverm\u00f6gen": {
+ "Anlageverm\u00f6gen Immaterielle Verm\u00f6gensgegenst\u00e4nde": {
+ "Geleistete Anzahlungen 1": {
+ "Anzahlungen auf Gesch\u00e4fts- oder Firmenwert": {},
+ "Geleistete Anzahlungen auf immaterielle Verm\u00f6gensgegenst\u00e4nde": {}
+ },
+ "Gesch\u00e4fts- oder Firmenwert": {
+ "Gesch\u00e4fts- oder Firmenwert 1": {}
+ },
+ "Konzessionen- gewerbliche Schutzrechte und \u00e4hnliche Rechte und Werte sowie Lizenzen an solchen Rechten und Werten": {
+ "Konzessionen- gewerbliche Schutzrechte und \u00e4hnliche Rechte und Werte sowie Lizenzen an solchen Rechten und Werten 1": {
+ "EDV-Software": {},
+ "Gewerbliche Schutzrechte": {},
+ "Konzessionen ": {},
+ "Lizenzen an gewerblichen Schutzrechten und \u00e4hnlichen Rechten und Werten ": {},
+ "\u00e4hnliche Rechte und Werte ": {}
+ }
+ },
+ "Verschmelzungsmehrwert": {
+ "Verschmelzungsmehrwert 1": {}
+ }
+ },
+ "Aufwendungen f\u00fcr die Ingangsetzung und Erweiterung des Gesch\u00e4ftsbetriebs": {
+ "Aufwendungen f\u00fcr die Ingangsetzung und Erweiterung des Gesch\u00e4ftsbetriebs 1": {
+ "Aufwendungen f\u00fcr die Ingangsetzung und Erweiterung des Gesch\u00e4ftsbetriebs 2": {}
+ },
+ "Aufwendungen f\u00fcr die W\u00e4hrungsumstellung auf den Euro": {
+ "Aufwendungen f\u00fcr die W\u00e4hrungsumstellung auf den Euro 1": {}
+ }
+ },
+ "Ausstehende Einlagen auf das gezeichnete Kapital": {
+ "Ausstehende Einlagen auf das gezeichnete Kapital 1": {
+ "Ausstehende Einlagen auf das gezeichnete Kapital- eingefordert (Aktivausweis)": {},
+ "Ausstehende Einlagen auf das gezeichnete Kapital- nichteingefordert (Aktivausweis)": {}
+ },
+ "Sonstige Aktiva oder sonstige Passiva": {
+ "Ausstehende Einlagen auf das Kommandit-Kapital- eingefordert": {},
+ "Ausstehende Einlagen auf das Kommandit-Kapital- nicht eingefordert": {},
+ "Ausstehende Einlagen auf das Komplement\u00e4r-Kapital- eingefordert": {},
+ "Ausstehende Einlagen auf das Komplement\u00e4r-Kapital- nicht eingefordert": {}
+ }
+ },
+ "Finanzanlagen": {
+ "Anteile an verbundenen Unternehmen 1": {
+ "Anteile an herrschender oder mit Mehrheit beteiligter Gesellschaft 1": {},
+ "Anteile an verbundenen Unternehmen 2": {}
+ },
+ "Ausleihungen an Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht": {
+ "Ausleihungen an Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht 1": {}
+ },
+ "Ausleihungen an verbundene Unternehmen": {
+ "Ausleihungen an verbundene Unternehmen 1": {}
+ },
+ "Beteiligungen": {
+ "Beteiligungen 1": {
+ "Andere Beteilgungen an Personengesellschaften": {},
+ "Andere Beteiligungen an Kapitalgesellschaften": {},
+ "Atypisch stille Beteiligungen": {},
+ "Beteiligungen einer GmbH Co. KG an einer Komplement\u00e4r GmbH": {},
+ "Typisch stille Beteiligungen": {}
+ }
+ },
+ "Genossenschaftsanteile": {
+ "Genossenschaftsanteile zum langfristigen Verbleib": {}
+ },
+ "R\u00fcckdeckungsanspr\u00fcche aus Lebensversicherungen": {
+ "R\u00fcckdeckungsanspr\u00fcche aus Lebensversicherungen zum langfristigen Verbleib": {}
+ },
+ "Sonstige Ausleihungen": {
+ "Sonstige Ausleihungen 1": {
+ "Ausleihungen an Gesellschafter": {},
+ "Ausleihungen an nahe stehende Personen": {},
+ "Darlehen 1": {}
+ }
+ },
+ "Wertpapiere des Anlageverm\u00f6gens": {
+ "Wertpapiere des Anlageverm\u00f6gens 1": {
+ "Festverzinsliche Wertpapiere": {},
+ "Wertpapiere mit Gewinnbeteiligungsanspr\u00fcchen- die dem Halbeink\u00fcnfteverfahren unterliegen": {}
+ }
+ }
+ },
+ "Sachanlagen": {
+ "Andere Anlagen- Betriebs- und Gesch\u00e4ftsaustattung": {
+ "Andere Anlagen- Betriebs- und Gesch\u00e4ftsaustattung 1": {
+ "Andere Anlagen ": {
+ "account_type": "Fixed Asset"
+ },
+ "B\u00fcroeinrichtungen": {},
+ "Einbauten in fremde Grundst\u00fccke": {},
+ "Geringwertige Wirtschaftsg\u00fcter bis 410 Euro": {},
+ "Ger\u00fcst- und Schalungsmaterial": {},
+ "Ladeneinrichtungen": {},
+ "Lkw": {},
+ "Pkw": {},
+ "Sonstige Betriebs- und Gesch\u00e4ftsausstattung": {},
+ "Sonstige Transportmittel": {},
+ "Werkzeuge": {}
+ }
+ },
+ "Geleistete Anzahlungen und Anlagen im Bau": {
+ "Geleistete Anzahlungen und Anlagen im Bau 1": {
+ "Andere Anlagen- Betriebs- und Gesch\u00e4ftsaustattung im Bau": {},
+ "Anzahlungen auf Gesch\u00e4fts- Fabrik- und andere Bauten auf fremden Grundst\u00fccken": {},
+ "Anzahlungen auf Gesch\u00e4fts- Fabrik-und andere Bauten auf eigenen Grundst\u00fccken und grundst\u00fccksgleichen Rechten ": {},
+ "Anzahlungen auf Grundst\u00fccke und grundst\u00fccksgleiche Rechte ohne Bauten": {},
+ "Anzahlungen auf Wohnbauten auf eigenen Grundst\u00fccken und grundst\u00fccksgleichen Rechten": {},
+ "Anzahlungen auf Wohnbauten auf fremden Grundst\u00fccken ": {},
+ "Anzahlungen auf andere Anlagen- Betriebs und Gesch\u00e4ftsausstattung": {},
+ "Anzahlungen auf technische Anlagen und Maschinen": {},
+ "Gesch\u00e4fts- Fabrik- und andere Bauten im Bau auf eingenen Grundst\u00fccken": {},
+ "Gesch\u00e4fts- Fabrik- und andere Bauten im Bau auf fremden Grundst\u00fccken": {},
+ "Technische Anlagen und Maschinen im Bau ": {},
+ "Wohnbauten im Bau": {}
+ }
+ },
+ "Grundst\u00fccke- grundst\u00fccksgleiche Rechte und Bauten einschlie\u00dflich der Bauten auf fremden Grundst\u00fccken": {
+ "Grundst\u00fccke- grundst\u00fccksgleiche Rechte und Bauten einschlie\u00dflich der Bauten auf fremden Grundst\u00fccken 1": {
+ "Andere Bauten": {},
+ "Au\u00dfenanlagen ": {},
+ "Au\u00dfenanlagen 1": {},
+ "Au\u00dfenanlagen f\u00fcr Gesch\u00e4fts- Fabrik- und andere Bauten ": {},
+ "Bauten auf eigenen Grundst\u00fccken und grundst\u00fccksgleichen Rechten": {},
+ "Bauten auf fremden Grundst\u00fccken": {},
+ "Einrichtungen f\u00fcr Gesch\u00e4fts-Fabrik und andere Bauten": {},
+ "Einrichtungen f\u00fcr Wohnbauten": {},
+ "Fabrikbauten": {
+ "account_type": "Fixed Asset"
+ },
+ "Garagen": {},
+ "Geb\u00e4udeteile des h\u00e4uslischen Arbeitszimmers": {},
+ "Gesch\u00e4ftsbauten": {},
+ "Grundst\u00fccke mit Substanzverzehr": {},
+ "Grundst\u00fccke und grundst\u00fccksgleiche Rechte ohne Bauten": {},
+ "Grundst\u00fccksanteil des h\u00e4uslichen Arbeitszimmers": {},
+ "Grundst\u00fccksgleiche Rechte (Erbbaurecht- Dauerwohnrecht)": {},
+ "Grundst\u00fcckswerte eigener bebauter Grundst\u00fccke": {},
+ "Hof- und Wegebefestigungen": {},
+ "Unbebaute Grundst\u00fccke": {},
+ "Wohnbauten": {}
+ }
+ },
+ "Technische Anlagen und Maschinen": {
+ "Technische Anlagen und Maschinen 1": {
+ "Betriebsvorrichtungen": {},
+ "Maschinen": {
+ "account_type": "Fixed Asset"
+ },
+ "Maschinen gebundene Werkzeuge": {},
+ "Technische Anlagen ": {}
+ }
+ }
+ },
+ "account_type": "Fixed Asset"
+ },
+ "Umlaufverm\u00f6gen": {
+ "Abgrenzungsposten": {
+ "Abgrenzung latenter Steuern": {
+ "Abgrenzung aktive latente Steuern ": {}
+ },
+ "Rechnungsabgrenzungsposten": {
+ "Aktive Rechnungsabgrenzung": {
+ "Als Aufwand ber\u00fccksichtigte Umstazsteuer auf Anzahlungen": {},
+ "Als Aufwand ber\u00fccksichtigte Z\u00f6lle und Verbrauchsteuern auf Vorr\u00e4te": {},
+ "Damnum/Disagio": {}
+ }
+ }
+ },
+ "Forderungen und sonstige Verm\u00f6gensgegenst\u00e4nde": {
+ "Eingeforderte Nachsch\u00fcsse": {
+ "Eingeforderte Nachsch\u00fcsse (gegenkonto 2929)": {}
+ },
+ "Eingeforderte- noch ausstehende Kapitaleinlagen": {
+ "Ausstehende Einlagen auf das gezeichnete Kapital- eingefordert (Forderungen- nicht eingeforderte ausstehende Einlagen s. Konto 2910)": {}
+ },
+ "Forderungen aus Lieferungen und Leistungen H-Saldo": {
+ "Einzelwertberechtigungen zu Forderungen mit einer Restlaufzeit bis zu 1 Jahr": {},
+ "Einzelwertberechtigungen zu Forderungen mit einer Restlaufzeit von mehr als 1 Jahr": {},
+ "Gegenkonto zu sonstigen Verm\u00f6gensgegenst\u00e4nden bei Buchungen \u00fcber Debitorenkonto": {},
+ "Pauschalwertberichtigung zu Forderung mit einer Restlaufzeit bis zu 1 Jahr": {},
+ "Pauschalwertberichtigung zu Forderung mit einer Restlaufzeit von mehr als 1 Jahr": {}
+ },
+ "Forderungen aus Lieferungen und Leistungen H-Saldo oder sonstige Verbindlichkeiten S-Saldo": {
+ "Gegenkonto 1221-1229- 1240-1245- 1250-1257- 1270-1279- 1290-1297 bei Aufteilung Debitorenkonto": {}
+ },
+ "Forderungen aus Lieferungen und Leistungen oder sonstige Verbindlichkeiten": {
+ "Forderungen aus Lieferungen und Leistungen ": {
+ "Forderungen aus Dienstleistungen": {
+ "account_type": "Receivable"
+ },
+ "Forderungen aus Lieferungen und Leistungen nach Durchschnittss\u00e4tzen gem\u00e4\u00df \u00a724 UStG (E\u00fcR)": {
+ "account_type": "Receivable"
+ },
+ "Forderungen aus Lieferungen und Leistungen ohne Kontokorent": {},
+ "Forderungen aus Lieferungen und Leistungen ohne Kontokorent - Restlaufzeit bis 1 Jahr": {},
+ "Forderungen aus Lieferungen und Leistungen ohne Kontokorent - Restlaufzeit gr\u00f6\u00dfer 1 Jahr.": {},
+ "Forderungen aus Lieferungen und Leistungen zum allgemeinen Umsatzsteuersatz oder eines Kleinunternehmers (E\u00fcR)": {
+ "account_type": "Receivable"
+ },
+ "Forderungen aus Lieferungen und Leistungen zum erm\u00e4\u00dfigten Umsatzsteuersatz (E\u00fcR)": {
+ "account_type": "Receivable"
+ },
+ "Forderungen aus steuerfreien oder nicht steuerbaren Lieferungen und Leistungen (E\u00fcR)": {
+ "account_type": "Receivable"
+ },
+ "Forderungen nach \u00a711 Abs. 1 Satz 2 EStG f\u00fcr \u00a7 4/3 EStG": {
+ "account_type": "Receivable"
+ },
+ "Gegenkonto 1215-1218 bei Aufteilung der Forderungen nach Steuers\u00e4tzen (E\u00fcR)": {
+ "account_type": "Receivable"
+ },
+ "Wechsel aus Lieferungen und Leistungen": {},
+ "Wechsel aus Lieferungen und Leistungen Restlaufzeit bis 1 Jahr": {},
+ "Wechsel aus Lieferungen und Leistungen Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
+ "Wechsel aus Lieferungen und Leistungen- bundesbankf\u00e4hig.": {},
+ "Zweifelhafte Forderungen": {},
+ "Zweifelhafte Forderungen - Restlaufzeit bis 1 Jahr": {},
+ "Zweifelhafte Forderungen - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {}
+ },
+ "Forderungen aus Lieferungen und Leistungen gegen Gesellschafter": {
+ "account_type": "Receivable"
+ },
+ "Forderungen aus Lieferungen und Leistungen gegen Gesellschafter - Restlaufzeit bis 1 Jahr": {},
+ "Forderungen aus Lieferungen und Leistungen gegen Gesellschafter - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {}
+ },
+ "Forderungen gegen Unternehmen- mit denen ein Beteiligungsverh\u00e4ltnis besteht H-Saldo": {
+ "is_group": 1
+ },
+ "Forderungen gegen verbundene Unternehmen H-Saldo": {
+ "Wertberichtigungen zu Forderungen mit einer Restlaufzeit bis zu 1 Jahr gegen verbundene Unternehmen": {},
+ "Wertberichtigungen zu Forderungen mit einer Restlaufzeit von mehr als 1 Jahr gegen verbundene Unternehmen": {}
+ },
+ "Forderungen gegen verbundene Unternehmen oder Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen": {
+ "Forderungen gegen verbundene Unternehmen ": {
+ "Besitzwechsel gegen verbundene Unternehmen": {},
+ "Besitzwechsel gegen verbundene Unternehmen - Restlaufzeit bis 1 Jahr": {},
+ "Besitzwechsel gegen verbundene Unternehmen - Restlaufzeit gr\u00f6\u00dfer Jahr": {},
+ "Besitzwechsel gegen verbundene Unternehmen- bundesbankf\u00e4hig": {},
+ "Forderungen aus Lieferungen und Leistungen gegen verbundenen Unternehmen": {
+ "account_type": "Receivable"
+ },
+ "Forderungen aus Lieferungen und Leistungen gegen verbundenen Unternehmen - Restlaufzeit bis 1 Jahr": {},
+ "Forderungen aus Lieferungen und Leistungen gegen verbundenen Unternehmen - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
+ "Forderungen gegen verbundene Unternehmen - Restlaufzeit bis 1 Jahr. ": {},
+ "Forderungen gegen verbundene Unternehmen - Restlaufzeit gr\u00f6\u00dfer 1 Jahr. ": {}
+ }
+ },
+ "Sonstige Verbindlichkeiten S-Saldo": {
+ "Verrechnungskonto erhaltene Anzahlungen bei Buchungen \u00fcber Debitorenkonto": {}
+ },
+ "Sonstige Verm\u00f6gensgegenst\u00e4nde": {
+ "Agenturwarenabrechnung": {},
+ "Anspr\u00fcche aus R\u00fcckdeckungsversicherungen": {},
+ "Forderungen an das Finanzamt aus abgef\u00fchrtem Bauabzugsbetrag": {},
+ "Forderungen aus einrichteten Verbrauchsteuern": {},
+ "Genossenschaftsanteile zum kurzfristigen Verbleib": {},
+ "GmbH-Anteile zum kurzfristigen Verbleib": {},
+ "K\u00f6rperschaftsteuerguthaben nach \u00a7 37 KStG - Restlaufzeit bis 1 Jahr": {},
+ "K\u00f6rperschaftsteuerguthaben nach \u00a7 37 KStG - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
+ "K\u00f6rperschaftsteuerr\u00fcckforderung": {},
+ "Sonstige Verm\u00f6gensgegenst\u00e4nde 1": {
+ "Darlehen": {},
+ "Darlehen - Restlaufzeit bis 1 jahr": {},
+ "Darlehen - Restlaufzeit gr\u00f6\u00dfer 1 jahr": {},
+ "Forderung gegen Aufsichtsrats- und Beirats- Mitglieder": {},
+ "Forderung gegen Aufsichtsrats- und Beirats- Mitglieder - Restlaufzeit bis 1 Jahr": {},
+ "Forderung gegen Aufsichtsrats- und Beirats- Mitglieder - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
+ "Forderungen gegen Gesellschafter": {},
+ "Forderungen gegen Gesellschafter - Restlaufzeit bis 1 Jahr": {},
+ "Forderungen gegen Gesellschafter - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
+ "Forderungen gegen Personal aus Lohn- und Gehaltsabrechnung": {},
+ "Forderungen gegen Personal aus Lohn- und Gehaltsabrechnung - Restlaufzeit bis 1 Jahr": {},
+ "Forderungen gegen Personal aus Lohn- und Gehaltsabrechnung - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
+ "Forderungen gegen Vorstandsmitglieder und Gesch\u00e4ftsf\u00fchrer": {},
+ "Forderungen gegen Vorstandsmitglieder und Gesch\u00e4ftsf\u00fchrer - Restlaufzeit bis 1 Jahr": {},
+ "Forderungen gegen Vorstandsmitglieder und Gesch\u00e4ftsf\u00fchrer - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {},
+ "Kautionen ": {},
+ "Kautionen - Restlaufzeit bis 1 Jahr": {},
+ "Kautionen - Restlaufzeit gr\u00f6\u00dfer 1 Jar": {},
+ "Sonstige Verm\u00f6gensgegenst\u00e4nde - Restlaufzeit bis 1 Jahr": {},
+ "Sonstige Verm\u00f6gensgegenst\u00e4nde - Restlaufzeit gr\u00f6\u00dfer 1 Jahr": {}
+ },
+ "Steuererstattungsanspruch gegen\u00fcber andere EG-L\u00e4ndern": {},
+ "Steuer\u00fcberzahlungen": {},
+ "Umsatzsteuerforderung": {},
+ "Umsatzsteuerforderungen Vorjahr": {},
+ "Umsatzsteuerforderungen fr\u00fchere Jahre": {}
+ },
+ "Sonstige Verm\u00f6gensgegenst\u00e4nde oder sonstige Verbindlichkeiten": {
+ "Abziehbare Vorsteuer": {},
+ "Abziehbare Vorsteuer 16%": {},
+ "Abziehbare Vorsteuer 19%": {},
+ "Abziehbare Vorsteuer 7%": {},
+ "Abziehbare Vorsteuer aus der Auslagerung von Gegenst\u00e4nden aus einem Unsatzsteuerlager": {},
+ "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb": {},
+ "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb 16%": {},
+ "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb 19%": {},
+ "Abziehbare Vorsteuer aus innergemeinschaftlichem Erwerb von Neufahrzeugen von Lieferanten ohne Ust-Identifikationsnummer": {},
+ "Abziehbare Vorsteuer nach \u00a7 13b UStG ": {},
+ "Abziehbare Vorsteuer nach \u00a7 13b UStG 16%": {},
+ "Abziehbare Vorsteuer nach \u00a7 13b UStG 19%": {},
+ "Aufl\u00f6sung Vorsteuer aus Vorjahr \u00a7 4/3 EStG": {},
+ "Aufzuteilende Vorsteuer": {},
+ "Aufzuteilende Vorsteuer 16%": {},
+ "Aufzuteilende Vorsteuer 19%": {},
+ "Aufzuteilende Vorsteuer 7%": {},
+ "Aufzuteilende Vorsteuer aus innergemeinschaftlichem Erwerb": {},
+ "Aufzuteilende Vorsteuer aus innergemeinschaftlichem Erwerb 19%": {},
+ "Aufzuteilende Vorsteuer nach \u00a7\u00a7 13a/13b UStG": {},
+ "Aufzuteilende Vorsteuer nach \u00a7\u00a7 13a/13b UStG 16%": {},
+ "Aufzuteilende Vorsteuer nach \u00a7\u00a7 13a/13b UStG 19%": {},
+ "Bezahlte Einfuhrumsatzsteuer": {},
+ "Durchlaufende Posten": {},
+ "Fremdgeld": {},
+ "Gegenkonto Vorsteuer \u00a7 4/3 EStG": {},
+ "Gegenkonto f\u00fcr Vorsteuer nach Durchschnittss\u00e4tzen f\u00fcr \u00a7 4 Abs. 3 EStG": {},
+ "Geldtransit": {},
+ "Nachtr\u00e4glich abziehbare Vorsteuer- \u00a7 15a Abs. 1 UStG- bewegliche Wirtschaftsg\u00fcter": {},
+ "Nachtr\u00e4glich abziehbare Vorsteuer- \u00a7 15a Abs. 2 UStG": {},
+ "Nat\u00fcrlich abziehbare Vorsteuer- \u00a7 15a Abs. 1 UStG- unbewegliche Wirtschaftsg\u00fcter": {},
+ "Umsatzsteuerforderungen laufendes Jahr": {},
+ "Verrechnungskonto Gewinnermittlung \u00a7 4/3 EStG- ergebniswirksam": {},
+ "Verrechnungskonto Gewinnermittlung \u00a7 4/3 EStG- nicht ergebniswirksam": {},
+ "Verrechnungskonto Ist-Versteuerung": {},
+ "Vorsteuer aus Investitionen \u00a7 4/3 EStG": {},
+ "Vorsteuer im Folgejahr abziehbar": {},
+ "Vorsteuer nach allgemeinen Durchschnittss\u00e4tzen UStVA Kz. 63": {},
+ "Wirtschaftsg\u00fcter des Umlaufverm\u00f6gens gem\u00e4\u00df \u00a74 Abs. 3 Satz 4 EStG": {},
+ "Zur\u00fcckzahlende Vorsteuer- \u00a7 15a Abs. 1 UStG- unbewegliche Wirtschaftsg\u00fcter": {},
+ "Zur\u00fcckzuzahlende Vorsteuer- \u00a7 15a Abs. 1 UStG- bewegliche Wirtschaftsg\u00fcter": {},
+ "Zur\u00fcckzuzahlende Vorsteuer- \u00a7 15a Abs. 2 UStG": {},
+ "\u00fcberleitungskonto Kostenstellen": {}
+ }
+ },
+ "Kassenbestand- Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks": {
+ "Kassenbestand - Bundesbankguthaben - Guthaben b. Kreditinstit. u. Schecks o. Verbindlichk. geg. Kreditinstituten": {
+ "Bank": {},
+ "Bank 1": {},
+ "Bank 2": {},
+ "Bank 3": {},
+ "Bank 4": {},
+ "Bank 5": {},
+ "Bundesbankguthaben": {},
+ "Finanzmittelanlagen im Rahmen der Kurzfristigen Finanzdisposition": {},
+ "LZB-Guthaben": {},
+ "Postbank": {},
+ "Postbank 1": {},
+ "Postbank 2": {},
+ "Postbank 3": {},
+ "Verbindlichkeiten gegen\u00fcber Kreditinstituten (nicht im Finanzmittelfonds enthalten)": {},
+ "account_type": "Bank"
+ },
+ "Kassenbestand- Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks 1": {
+ "Kasse ": {
+ "Nebenkasse 1": {},
+ "Nebenkasse 2": {},
+ "account_type": "Cash"
+ },
+ "Schecks": {}
+ }
+ },
+ "Vorr\u00e4te": {
+ "Erhaltene Anzahlungen auf Bestellungen": {
+ "Erhaltene Anzahlungen auf Bestellungen (": {}
+ },
+ "Fertige Erzeugnisse und Waren": {
+ "* Lager Bestand Zwischenkonto": {
+ "account_type": "Stock Adjustment"
+ },
+ "* Lager Bestandswert Korrektur": {
+ "account_type": "Expenses Included In Valuation"
+ },
+ "* Lager Differenzkorrektur Gewinn / Verlust": {},
+ "* Lager Differenzkorrektur Marktwert": {},
+ "Fertige Erzeugnisse (Bestand)": {},
+ "Fertige Erzeugnisse und Waren (Bestand)": {},
+ "Waren (Bestand)": {}
+ },
+ "Geleistete Anzahlungen ": {
+ "Geleistete Anzahlungen auf Vorr\u00e4te": {
+ "Geleistete Anzahlungen 15% Vorsteuer": {},
+ "Geleistete Anzahlungen 16% Vorsteuer": {},
+ "Geleistete Anzahlungen 19% Vorsteuer": {},
+ "Geleistete Anzahlungen 7% Vorsteuer": {}
+ }
+ },
+ "In Arbeit befindliche Auftr\u00e4ge ": {
+ "In Arbeit befindliche Auftr\u00e4ge 1": {}
+ },
+ "In Ausf\u00fchrung befindliche Bauauftr\u00e4ge": {
+ "In Ausf\u00fchrung befindliche Bauauftr\u00e4ge 1": {}
+ },
+ "Roh- Hilfs- und Betriebsstoffe": {
+ "Roh- Hilfs- und Betriebsstoffe (Bestand)": {
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "Unfertige Erzeugnisse- unfertige Leistungen": {
+ "Unfertige Erzeugnisse": {},
+ "Unfertige Erzeugnisse- unfertige Leistungen (Bestand)": {},
+ "Unfertige Leistungen": {}
+ },
+ "account_type": "Stock"
+ },
+ "Wertpapiere": {
+ "Anteile an verbundenen Unternehmen": {
+ "Anteile an herrschender oder mit Mehrheit beteiligter Gesellschaft": {},
+ "Anteile an verbundenen Unternehmen (Umlaufverm\u00f6gen)": {}
+ },
+ "Eigene Anteile ": {
+ "Eigene Anteile 1": {}
+ },
+ "Sonstige Wertpapiere": {
+ "Sonstige Wertpapiere 1": {
+ "Andere Wertpapiere mit unwesentlichen Wertschwankungen im Sinne Textziffer 18 DRS 2": {},
+ "Finanzwechsel": {},
+ "Wertpapieranlagen im Rahmen der Kurzfristigen Finanzdisposition ": {}
+ }
+ }
+ }
+ },
+ "root_type": "Asset"
+ },
+ "Bilanz - Passiva": {
+ "Eigenkapital": {
+ "Gewinnr\u00fccklagen": {
+ "Andere Gewinnr\u00fccklagen": {
+ "Andere Gewinnr\u00fccklagen 1": {
+ "Eigenkapitalanteil von Wertaufholungen": {}
+ }
+ },
+ "Gesetzliche R\u00fccklagen": {
+ "Gesetzliche R\u00fccklagen 1": {}
+ },
+ "R\u00fccklage f\u00fcr Eigene Anteile": {
+ "R\u00fccklage f\u00fcr Eigene Anteile 1": {}
+ },
+ "Satzungsm\u00e4\u00dfige R\u00fccklagen": {
+ "Satzungsm\u00e4\u00dfige R\u00fccklagen 1": {}
+ }
+ },
+ "Gewinnvortrag / Verlustvortrag vor Verwendung": {
+ "Gewinnvortrag / Verlustvortrag": {
+ "Gewinnvortrag vor Verwendung": {},
+ "Verlustvortrag vor Verwendung": {}
+ },
+ "Vortrag auf neue Rechnung ": {
+ "Vortrag auf neue Rechnung (Bilanz)": {}
+ }
+ },
+ "Gezeichnetes Kapital": {
+ "Gezeichnetes Kapital 1": {
+ "Gezeichnetes Kapital 2": {}
+ },
+ "Nicht eingeforderte ausstehende Einlagen": {
+ "is_group": 1
+ }
+ },
+ "Kapital Teilhaber": {
+ "(zur freien Verf\u00fcgung ) 1": {},
+ "Gesellschafter-Darlehen 3": {},
+ "Kommandit-Kapital": {},
+ "Verlustausgleichskonto": {}
+ },
+ "Kapital Vollhafter / Einzelunternehmer": {
+ "(zur freien Verf\u00fcgung )": {},
+ "Festkapital": {},
+ "Gesellschafter-Darlehen 2": {},
+ "Variables Kapital": {}
+ },
+ "Kapitalr\u00fccklage": {
+ "Kapitalr\u00fccklage 1": {
+ "Kapitalr\u00fccklage 2": {
+ "Andere Zuzahlungen in das Eigenkapital ": {},
+ "Eingefordertes Nachschusskapital (Gegenkonto 1299)": {},
+ "Kapitalr\u00fccklage durch Ausgabe von Anteilen \u00fcber Nennbetrag": {},
+ "Kapitalr\u00fccklage durch Ausgabe von Schuldverschreibungen f\u00fcr Wandlungsrechte und Optionsrechte zum Erwerb von Anteilen": {},
+ "Kapitalr\u00fccklage durch Zuzahlungen gegen Gew\u00e4hrung eines Vorzugs f\u00fcr Anteile": {}
+ }
+ }
+ },
+ "Privat Teilhafter": {
+ "Ausgew\u00f6hnliche Belastungen": {},
+ "Grundst\u00fccksaufwand 1": {},
+ "Grundst\u00fccksertrag 1": {},
+ "Privateinlagen 1": {},
+ "Privatentnahmen allgemein 1": {},
+ "Privatsteuern 1": {},
+ "Sonderausgaben beschr\u00e4nkt abzugsf\u00e4hig 1": {},
+ "Sonderausgaben unbeschr\u00e4nkt abzugsf\u00e4hig 1": {},
+ "Unentgeltliche Wertabgaben 1": {},
+ "Zuwendungen- Spenden 1": {}
+ },
+ "Privat Vollhafter/ Einzelunternehmer": {
+ "Ausgew\u00f6hnliche Belastungen 1": {},
+ "Grundst\u00fccksaufwand (Umsatzsteuerschl\u00fcssel m\u00f6glich)": {},
+ "Grundst\u00fccksaufwand 2": {},
+ "Grundst\u00fccksertrag ( Umsatzsteuerschl\u00fcssel m\u00f6glich)": {},
+ "Grundst\u00fccksertrag 2": {},
+ "Privateinlagen 2": {},
+ "Privatentnahmen allgemein 2": {},
+ "Privatsteuern 2": {},
+ "Sonderausgaben beschr\u00e4nkt abzugsf\u00e4hig 2": {},
+ "Sonderausgaben unbeschr\u00e4nkt abzugsf\u00e4hig 2": {},
+ "Unentgeltliche Wertabgaben 2": {},
+ "Zuwendungen- Spenden 2": {}
+ },
+ "Sonderposten mit R\u00fccklageanteil": {
+ "Sonderposten aus der W\u00e4hrungsumstellung auf den Euro": {
+ "Sonderposten aus der W\u00e4hrungsumstellung auf den Euro 1": {}
+ },
+ "Sonderposten f\u00fcr Zusch\u00fcsse und Zulagen": {
+ "Sonderposten f\u00fcr Zusch\u00fcsse und Zulagen 1": {}
+ },
+ "Sonderposten mit R\u00fccklageanteil 1": {
+ "Sonderposten mit R\u00fccklageanteil f\u00fcr F\u00f6rderung nach \u00a7 3 ZonenRFG / \u00a74-6 F\u00f6rdergebietsG": {},
+ "Sonderposten mit R\u00fccklageanteil nach Abschnitt 35 EStG": {},
+ "Sonderposten mit R\u00fccklageanteil nach \u00a7 1 EntwLStG": {},
+ "Sonderposten mit R\u00fccklageanteil nach \u00a7 14 BerlinFG": {},
+ "Sonderposten mit R\u00fccklageanteil nach \u00a7 4d EStG": {},
+ "Sonderposten mit R\u00fccklageanteil nach \u00a7 52 Abs. 16 EStG": {},
+ "Sonderposten mit R\u00fccklageanteil nach \u00a7 6b EStG": {},
+ "Sonderposten mit R\u00fccklageanteil nach \u00a7 6d EStG": {},
+ "Sonderposten mit R\u00fccklageanteil nach \u00a7 79 EStDV": {},
+ "Sonderposten mit R\u00fccklageanteil nach \u00a7 7d EStG": {},
+ "Sonderposten mit R\u00fccklageanteil nach \u00a7 7g Abs. 1 EStG": {},
+ "Sonderposten mit R\u00fccklageanteil nach \u00a7 7g Abs. 3 u. 7 EStG": {},
+ "Sonderposten mit R\u00fccklageanteil nach \u00a7 80 EStDV": {},
+ "Sonderposten mit R\u00fccklageanteil nach \u00a7 82a EStDV": {},
+ "Sonderposten mit R\u00fccklageanteil nach \u00a7 82d EStDV": {},
+ "Sonderposten mit R\u00fccklageanteil nach \u00a7 82e EStDV": {},
+ "Sonderposten mit R\u00fccklageanteil steuerfreie R\u00fccklagen": {},
+ "Sonderposten mit R\u00fccklageanteil- Sonderabschreibung": {}
+ }
+ }
+ },
+ "Fremdkapital": {
+ "Rechnungsabgrenzungsposten 1": {
+ "Rechnungsabgrenzungsposten 2": {
+ "Passive Rechnungsabgrenzung 1": {}
+ },
+ "Sonstige Passiva oder sontige Aktiva": {
+ "Abgrenzungen zur unterj\u00e4hrigen Kostenverrechnung f\u00fcr BWA": {}
+ }
+ },
+ "R\u00fcckstellungen ": {
+ "R\u00fcckstellungen f\u00fcr Pensionen und \u00e4hnliche Verpflichtungen": {
+ "R\u00fcckstellungen f\u00fcr Pensionen und \u00e4hnliche Verpflichtungen 1": {
+ "Pensionsr\u00fcckstellungen": {},
+ "R\u00fcckstellungen f\u00fcr Pensions\u00e4hnliche Verpflichtungen": {}
+ }
+ },
+ "Sonstige R\u00fcckstellungen": {
+ "Sonstige R\u00fcckstellungen 1": {
+ "Aufwandsr\u00fcckstellungen gem\u00e4\u00df \u00a7 249 Abs. 2 HGB": {},
+ "R\u00fcckstellungen f\u00fcr Abraum- und Abfallbeseitigung": {},
+ "R\u00fcckstellungen f\u00fcr Abschluss- und Pr\u00fcfungskosten": {},
+ "R\u00fcckstellungen f\u00fcr Gew\u00e4hrleistungen (Gegenkonto 6790)": {},
+ "R\u00fcckstellungen f\u00fcr Personelkosten": {},
+ "R\u00fcckstellungen f\u00fcr Umweltschutz": {},
+ "R\u00fcckstellungen f\u00fcr drohende Verluste aus schwebenden Gesch\u00e4ften": {},
+ "R\u00fcckstellungen f\u00fcr unterlassene Aufwendungenn f\u00fcr Instandhaltung- Nachholung in den ersten drei Monaten": {},
+ "R\u00fcckstellungen f\u00fcr unterlassene Aufwendungenn f\u00fcr Instandhaltung- Nachholung innerhalb des 4. bis 12. Monats": {},
+ "R\u00fcckstellungen zur Erf\u00fcllung der Aufbewahrungspflichten": {}
+ }
+ },
+ "Steuerr\u00fcckstellungen": {
+ "Steuerr\u00fcckstellungen 1": {
+ "Gewerbesteuerr\u00fcckstellung": {},
+ "K\u00f6rperschaftsteuerr\u00fcckstellung": {},
+ "R\u00fcckstellung f\u00fcr latente Steuern ": {}
+ }
+ }
+ },
+ "Verbindlichkeiten ": {
+ "Anleihen": {
+ "Anleihen- nicht konvertibel": {
+ "Anleihen- konvertibel": {},
+ "Anleihen- konvertibel Restlaufzeit 1 bis 5 Jahre": {},
+ "Anleihen- konvertibel Restlaufzeit bis 1 Jahr": {},
+ "Anleihen- konvertibel Restlaufzeit gr\u00f6\u00dfer 5 Jahr": {},
+ "Anleihen- nicht konvertibel Restlaufzeit 1 bis 5 Jahre": {},
+ "Anleihen- nicht konvertibel Restlaufzeit bis 1 Jahr": {},
+ "Anleihen- nicht konvertibel Restlaufzeit gr\u00f6\u00dfer 5 Jahre ": {}
+ }
+ },
+ "Erhaltene Anzahlungen auf Bestellungen 1": {
+ "Erhaltene Anzahlungen auf Bestellungen 2": {
+ "Erhaltene Anzahlungen 15% USt": {},
+ "Erhaltene Anzahlungen 16% USt": {},
+ "Erhaltene Anzahlungen 7% USt": {},
+ "Erhaltene Anzahlungen Restlaufzeit 1 bis 5 Jahre": {},
+ "Erhaltene Anzahlungen Restlaufzeit bis 1 Jahr": {},
+ "Erhaltene Anzahlungen Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
+ "Erhaltene- versteuerte Anzahlungen 19% Ust (Verbindlichkeiten)": {}
+ }
+ },
+ "Sonstige Verbindlichkeiten ": {
+ "Sonstige Verbindlichkeiten 1": {
+ "(frei- in Bilanz kein Restlaufzeit vermerkt)": {},
+ "Agenturwarenabrechnungen": {},
+ "Darlehen - Restlaufzeit 1 bis 5 jahre": {},
+ "Darlehen - Restlaufzeit bis 1 jahr 1": {},
+ "Darlehen - Restlaufzeit gr\u00f6\u00dfer 5 jahre": {},
+ "Darlehen 2": {},
+ "Darlehen atypisch stiller Gesellschaftler ": {},
+ "Darlehen atypisch stiller Gesellschaftler - Restlaufzeit 1 bis 5 Jahre": {},
+ "Darlehen atypisch stiller Gesellschaftler - Restlaufzeit bis 1 Jahr": {},
+ "Darlehen atypisch stiller Gesellschaftler - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
+ "Darlehen typisch stiller Gesellschaftler": {},
+ "Darlehen typisch stiller Gesellschaftler - Restlaufzeit 1 bis 5 Jahre": {},
+ "Darlehen typisch stiller Gesellschaftler - Restlaufzeit bis 1 Jahr": {},
+ "Darlehen typisch stiller Gesellschaftler - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
+ "Erhaltene Kautionen": {},
+ "Erhaltene Kautionen - Restlaufzeit 1 bis 5 Jahre": {},
+ "Erhaltene Kautionen - Restlaufzeit bis 1 Jahr": {},
+ "Erhaltene Kautionen - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
+ "Gegenkonto 3500-3569 bei Aufteilung der Konten 3570-3598": {},
+ "Kreditkartenabrechnung": {},
+ "Partiarische Darlehen": {},
+ "Partiarische Darlehen - Restlaufzeit 1 bis 5 Jahre": {},
+ "Partiarische Darlehen - Restlaufzeit bis 1 Jahr": {},
+ "Partiarische Darlehen - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
+ "Sonstige Verbindlichkeiten - Restlaufzeit 1 bis 5 Jahre": {},
+ "Sonstige Verbindlichkeiten - Restlaufzeit bis 1 Jahr": {},
+ "Sonstige Verbindlichkeiten - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
+ "Sonstige Verbindlichkeiten z.B. nach \u00a7 11 Abs. 2 Satz 2 EStG f\u00fcr \u00a7 4/3 EStG": {},
+ "Verbindlichkeiten gegen\u00fcber Gesellschaftern ": {},
+ "Verbindlichkeiten gegen\u00fcber Gesellschaftern - Restlaufzeit 1 bis 5 Jahre": {},
+ "Verbindlichkeiten gegen\u00fcber Gesellschaftern - Restlaufzeit bis 1 Jahr": {},
+ "Verbindlichkeiten gegen\u00fcber Gesellschaftern - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
+ "Verbindlichkeiten gegen\u00fcber Gesellschaftern f\u00fcr offene Aussch\u00fcttungen": {}
+ },
+ "Steuerzahlungen an andere EG-L\u00e4nder": {},
+ "Umsatzsteuer aus im anderen EG-Land steuerpflichtigen Lieferungen": {},
+ "Umsatzsteuer aus im anderen EG-Land steuerpflichtigen sonstigen Leistungen/Werlieferungen": {},
+ "Verbindlichkeiten an das Finanzamt aus abzuf\u00fchrendem Bauabzugsbetrag": {},
+ "Verbindlichkeiten aus Betriebssteuern und -abgaben": {},
+ "Verbindlichkeiten aus Betriebssteuern und -abgaben - Restlaufzeit 1 bis 5 Jahre": {},
+ "Verbindlichkeiten aus Betriebssteuern und -abgaben - Restlaufzeit bis 1 Jahr": {},
+ "Verbindlichkeiten aus Betriebssteuern und -abgaben - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
+ "Verbindlichkeiten aus Einbehaltungen (KapESt und Solz auf KapESt)": {},
+ "Verbindlichkeiten aus Lohn und Gehalt": {},
+ "Verbindlichkeiten aus Verm\u00f6gensbildung ": {},
+ "Verbindlichkeiten aus Verm\u00f6gensbildung - Restlaufzeit 1 bis 5 Jahre": {},
+ "Verbindlichkeiten aus Verm\u00f6gensbildung - Restlaufzeit bis 1 Jahr": {},
+ "Verbindlichkeiten aus Verm\u00f6gensbildung - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
+ "Verbindlichkeiten f\u00fcr Einbehaltungen von Arbeitnehmern": {},
+ "Verbindlichkeiten f\u00fcr Verbrauchsteuern": {},
+ "Verbindlichkeiten im Rahmen der sozialen Sicherheit": {},
+ "Verbindlichkeiten im Rahmen der sozialen Sicherheit (f\u00fcr \u00a7 4/3 EStG)": {},
+ "Verbindlichkeiten im Rahmen der sozialen Sicherheit - Restlaufzeit 1 bis 5 Jahre": {},
+ "Verbindlichkeiten im Rahmen der sozialen Sicherheit - Restlaufzeit bis 1 Jahr": {},
+ "Verbindlichkeiten im Rahmen der sozialen Sicherheit - Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
+ "Voraussichtliche Beitragsschuld gegen\u00fcber den Sozialversicherungstr\u00e4gern": {}
+ },
+ "Sonstige Verm\u00f6gensgegenst\u00e4nde H-Saldo": {
+ "Verrechnungskonto geleistete Anzahlungen bei Buchung \u00fcber Kreditorenkonto": {}
+ },
+ "Sonstige Verm\u00f6gensgegenst\u00e4nde oder sonstige Verbindlichkeiten 1": {
+ "Einfuhrumsatzsteuer aufgeschoben bis": {},
+ "Gewinnverf\u00fcgungskonto stille Gesellschafter": {},
+ "In Rechnung unrichtig oder unberechtigt ausgewiesene Steuerbetr\u00e4ge- UStVA Kz. 69": {},
+ "Lohn- und Gehaltsverrechnungskonto": {
+ "Lohn- und Gehaltsverrechnung \u00a7 11 Abs. 2 EStG f\u00fcr \u00a7 a Abs. 3 EStG": {}
+ },
+ "Nachsteuer- UStVA Kz. 65": {},
+ "Sonstige Verrechnungskonten (Interimskonto)": {
+ "account_type": "Stock Received But Not Billed"
+ },
+ "Umsatzsteuer": {},
+ "Umsatzsteuer 16%": {},
+ "Umsatzsteuer 19%": {},
+ "Umsatzsteuer 7%": {},
+ "Umsatzsteuer Vorjahr": {},
+ "Umsatzsteuer aus der Auslagerung von Gegenst\u00e4nden aus einem Umsatzsteuerlager": {},
+ "Umsatzsteuer aus im Inland steuerpflichtigen EG-Lieferungen": {},
+ "Umsatzsteuer aus im Inland steuerpflichtigen EG-Lieferungen 19%": {},
+ "Umsatzsteuer aus innergemeinschaftlichem Erwerb ": {},
+ "Umsatzsteuer aus innergemeinschaftlichem Erwerb 16%": {},
+ "Umsatzsteuer aus innergemeinschaftlichem Erwerb 19%": {},
+ "Umsatzsteuer aus innergemeinschaftlichem Erwerb ohne Vorsteuerabzug": {},
+ "Umsatzsteuer aus innergemeinschaftlichem Erwerb von Neufahrzeugen von Lieferanten ohne Umsatzsteuer-Identifikationsnummer": {},
+ "Umsatzsteuer fr\u00fchere Jahre": {},
+ "Umsatzsteuer laufendes Jahr": {},
+ "Umsatzsteuer nach \u00a713b UStG": {},
+ "Umsatzsteuer nach \u00a713b UStG 16%": {},
+ "Umsatzsteuer nach \u00a713b UStG 19%": {},
+ "Umsatzsteuer- Vorauszahlungen": {},
+ "Umsatzsteuer- Vorauszahlungen 1/11": {},
+ "Verbindlichkeiten aus Lohn- und Kirchensteuer": {}
+ },
+ "Steuerr\u00fcckstellungen oder sonstige Verm\u00f6gensgegenst\u00e4nde ": {
+ "Umsatzsteuer nicht f\u00e4llig": {},
+ "Umsatzsteuer nicht f\u00e4llig 16%": {},
+ "Umsatzsteuer nicht f\u00e4llig 19%": {},
+ "Umsatzsteuer nicht f\u00e4llig 7%": {},
+ "Umsatzsteuer nicht f\u00e4llig aus im Inland steuerpflichtigen EG-Lieferungen": {},
+ "Umsatzsteuer nicht f\u00e4llig aus im Inland steuerpflichtigen EG-Lieferungen 16%": {},
+ "Umsatzsteuer nicht f\u00e4llig aus im Inland steuerpflichtigen EG-Lieferungen 19%": {}
+ },
+ "Verbindlichkeiten aus Lieferungen und Leistungen S-Saldo oder sonstige Verm\u00f6gensgegenst\u00e4nde H-Saldo": {
+ "Gegenkonto 3335-3348- 3420-3449- 3470-3499 bei Aufteilung Kreditorenkonto": {}
+ },
+ "Verbindlichkeiten aus Lieferungen und Leistungen oder sonstige Verm\u00f6gensgegenst\u00e4nde": {
+ "Verbindlichkeiten aus Lieferungen und Leistungen ": {
+ "Gegenkonto 3305-3307 bei Aufteilung der Verbindlichkeiten nach Steuers\u00e4tzen (E\u00fcR)": {},
+ "Lieferanten Verbindlichkeiten Dienstleistungen": {
+ "account_type": "Payable"
+ },
+ "Verbindlichkeiten aus Lieferungen und Leistungen f\u00fcr Investitionen f\u00fcr \u00a7 4/3 EStG": {
+ "account_type": "Payable"
+ },
+ "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber Gesellschaftern ": {
+ "account_type": "Payable"
+ },
+ "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber Gesellschaftern Restlaufzeit 1 bis 5 Jahre": {},
+ "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber Gesellschaftern Restlaufzeit bis 1 Jahr": {},
+ "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber Gesellschaftern Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
+ "Verbindlichkeiten aus Lieferungen und Leistungen ohne Kontokorrent ": {},
+ "Verbindlichkeiten aus Lieferungen und Leistungen ohne Kontokorrent Restlaufzeit 1 bis 5 Jahre": {},
+ "Verbindlichkeiten aus Lieferungen und Leistungen ohne Kontokorrent Restlaufzeit bis 1 Jahr": {},
+ "Verbindlichkeiten aus Lieferungen und Leistungen ohne Kontokorrent Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
+ "Verbindlichkeiten aus Lieferungen und Leistungen ohne Vorsteuer (E\u00fcR)": {
+ "account_type": "Payable"
+ },
+ "Verbindlichkeiten aus Lieferungen und Leistungen zum allgemeinen Umsatzsteuersatz (E\u00fcR)": {
+ "account_type": "Payable"
+ },
+ "Verbindlichkeiten aus Lieferungen und Leistungen zum erm\u00e4\u00dfigten Umsatzsteuersatz (E\u00fcR)": {
+ "account_type": "Payable"
+ }
+ }
+ },
+ "Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel": {
+ "Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel 1": {
+ "Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel Restlaufzeit 1 bis 5 Jahre": {},
+ "Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel Restlaufzeit bis 1 Jahr": {},
+ "Verbindlichkeiten aus der Annahme gezogener Wechsel und aus der Ausstellung eigener Wechsel Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {}
+ }
+ },
+ "Verbindlichkeiten gegen\u00fcber Kreditinstituten ": {
+ "Gegenkonto 3159-3209 bei Aufteilung der Konten 3210-3248": {}
+ },
+ "Verbindlichkeiten gegen\u00fcber Kreditinstituten oder Kassenbestand- Bundesbankguthaben- Guthaben bei Kreditinstituten und Schecks": {
+ "Verbindlichkeiten gegen\u00fcber Kreditinstituten 1": {
+ "(frei- in Bilanz kein Restlaufzeit vermerkt) 1": {},
+ "Verbindlichkeiten gegen\u00fcber Kreditinstituten Restlaufzeit 1 bis 5 Jahre": {},
+ "Verbindlichkeiten gegen\u00fcber Kreditinstituten Restlaufzeit bis 1 Jahr": {},
+ "Verbindlichkeiten gegen\u00fcber Kreditinstituten Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
+ "Verbindlichkeiten gegen\u00fcber Kreditinstituten aus Teilzahlungsvertr\u00e4gen": {},
+ "Verbindlichkeiten gegen\u00fcber Kreditinstituten aus Teilzahlungsvertr\u00e4gen Restlaufzeit 1 bis 5 Jahre": {},
+ "Verbindlichkeiten gegen\u00fcber Kreditinstituten aus Teilzahlungsvertr\u00e4gen Restlaufzeit bis 1 Jahr": {},
+ "Verbindlichkeiten gegen\u00fcber Kreditinstituten aus Teilzahlungsvertr\u00e4gen Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {}
+ }
+ },
+ "Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen oder Forderungen gegen verbundene Unternehmen": {
+ "Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen": {
+ "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber verbundenen Unternehmen": {
+ "account_type": "Payable"
+ },
+ "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber verbundenen Unternehmen Restlaufzeit 1 bis 5 Jahre": {},
+ "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber verbundenen Unternehmen Restlaufzeit bis 1 Jahr": {},
+ "Verbindlichkeiten aus Lieferungen und Leistungen gegen\u00fcber verbundenen Unternehmen Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {},
+ "Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen Restlaufzeit 1 bis 5 Jahre": {},
+ "Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen Restlaufzeit bis 1 Jahr": {},
+ "Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {}
+ }
+ }
+ }
+ },
+ "root_type": "Liability"
+ },
+ "Gewinn u. Verlust - Aufwendungen": {
+ "Betriebliche Aufwendungen": {
+ "Abschreibungen a. Verm\u00f6gensgeg. d. Umlaufverm\u00f6gens- soweit diese die in der Kapitalgesellschaft \u00fcblichen Abschreibungen \u00fcberschreiten": {
+ "Abschreibungen a. Verm\u00f6gensgeg. d. Umlaufverm\u00f6gens- soweit diese die in der Kapitalgesellschaft \u00fcblichen Abschreibungen \u00fcberschreiten": {
+ "Abschreibungen auf Umlaufverm\u00f6gen- steuerrechtlich bedingt (soweit un\u00fcblich hoch)": {},
+ "Abschreibungen auf Verm\u00f6gensgegenst\u00e4nde des Umlaufverm\u00f6gens (soweit un\u00fcblich hoch)": {},
+ "Forderungsverluste (soweit un\u00fcblich hoch)": {},
+ "Forderungsverluste 15% USt (soweit un\u00fcblich hoch)": {},
+ "Forderungsverluste 16% USt (soweit un\u00fcblich hoch)": {},
+ "Forderungsverluste 19% USt (soweit un\u00fcblich hoch)": {},
+ "Forderungsverluste 7% USt (soweit un\u00fcblich hoch)": {},
+ "Vorwegnahme k\u00fcnftiger Wertschwankungen im Umlaufverm\u00f6gen (soweit un\u00fcblich hoch)": {}
+ }
+ },
+ "Kalkulatorische Kosten": {
+ "Sonstige betriebliche Aufwendungen 2": {
+ "Kalkulatorische Abschreibungen": {},
+ "Kalkulatorische Miete/Pacht": {},
+ "Kalkulatorische Wagnisse": {},
+ "Kalkulatorische Zinsen": {},
+ "Kalkulatorischer Lohn f\u00fcr unentgeltliche Mitarbeiter": {},
+ "Kalkulatorischer Unternehmerlohn": {},
+ "Verrechnete kalkulatorische Abschreibungen": {},
+ "Verrechnete kalkulatorische Miete/Pacht": {},
+ "Verrechnete kalkulatorische Wagnisse": {},
+ "Verrechnete kalkulatorische Zinsen": {},
+ "Verrechneter kalkulatorischer Lohn f\u00fcr unentgeltliche Mitarbeiter": {},
+ "Verrechneter kalkulatorischer Unternehmerlohn": {}
+ }
+ },
+ "Kosten bei Anwendung des Umsatzkostenverfahrens": {
+ "Sonstige betriebliche Aufwendungen 1": {
+ "Gegenkonto 6990-6998": {},
+ "Herstellungskosten": {},
+ "Vertriebskosten": {},
+ "Verwaltungskosten": {}
+ }
+ },
+ "Personalaufwand": {
+ "L\u00f6hne und Geh\u00e4lter": {
+ "Aushilfsl\u00f6hne": {},
+ "Bedienungsgelder": {},
+ "Ehegattengehalt": {},
+ "Fahrkostenerstattung Wohnung/Arbeitsst\u00e4tte": {},
+ "Freiwillige soziale Aufwendungen- lohnsteuerpflichtig": {},
+ "Geh\u00e4lter": {},
+ "Gesch\u00e4ftsf\u00fchrergeh\u00e4lter ": {},
+ "Gesch\u00e4ftsf\u00fchrergeh\u00e4lter der GmbH-Gesellschafter": {},
+ "Krankengeldzusch\u00fcsse": {},
+ "L\u00f6hne ": {},
+ "L\u00f6hne und Geh\u00e4lter 1": {},
+ "Pauschale Steuer auf sonstige Bez\u00fcge (z.B. Fahrkosten Zusch\u00fcsse)": {},
+ "Pauschale Steuer f\u00fcr Aushilfen": {},
+ "Tantiemen": {},
+ "Verg\u00fctungen an angestellte Mitunternehmer \u00a7 15 EStG": {},
+ "Verm\u00f6genswirksame Leistungen": {},
+ "Zusch\u00fcsse der Agenturen f\u00fcr Arbeit (Haben)": {}
+ },
+ "Soziale Abgaben und Aufwendungen f\u00fcr Altersversorgung und f\u00fcr Unterst\u00fctzung": {
+ "Soziale Abgaben und Aufwendungen f\u00fcr Altersversorgung und f\u00fcr Unterst\u00fctzung 1": {
+ "Aufwendungen f\u00fcr Altersversorgung": {},
+ "Aufwendungen f\u00fcr Altersversorgung f\u00fcr Mitunternehmer \u00a7 15 EStG": {},
+ "Aufwendungen f\u00fcr Unterst\u00fctzung": {},
+ "Beitr\u00e4ge zur Berufsgenossenschaft": {},
+ "Freiwillige soziale Aufwendungen- lohnsteuerfrei": {},
+ "Gesetzliche soziale Aufwendungen": {},
+ "Gesetzliche soziale Aufwendungen f\u00fcr Mitunternehmer \u00a7 15 EStG": {},
+ "Pauschale Steuer auf sonstige Bez\u00fcge (z.B. Direktversicherungen)": {},
+ "Sonstige soziale Abgaben": {},
+ "Versorgungskassen": {}
+ }
+ }
+ },
+ "Sonstige betriebliche Aufwendungen 3": {
+ "Sonstige betriebliche Aufwendungen 4": {
+ "Abgaben f\u00fcr betrieblich genutzten Grundbesitz": {},
+ "Abgang von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig (inlandische Kap. Ges.) nach \u00a7 4 Abs. 3 Satz 4 EStG": {},
+ "Abgang von Wirtschaftsg\u00fctern des Umlaufverm\u00f6gens nach \u00a7 4 Abs. 3 Satz 4 EStG": {},
+ "Abschluss- und Pr\u00fcfungskosten": {},
+ "Abschreibung auf Umlaufverm\u00f6gen au\u00dfer Vorr\u00e4te und Wertpapieren des UV (\u00fcbliche H\u00f6he)": {},
+ "Abschreibung auf Umlaufverm\u00f6gen au\u00dfer Vorr\u00e4te und Wertpapieren des UV- steuerlich bedingt (\u00fcbliche H\u00f6he)": {},
+ "Abziehbare Aufsichtsratsverg\u00fctungen": {},
+ "Anlagenabg\u00e4nge Finanzanlagen (Restbuchwert bei Buchverlust)": {},
+ "Anlagenabg\u00e4nge Finanzanlagen 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)(Restbuchwert bei Buchverlust)": {},
+ "Anlagenabg\u00e4nge Sachanlagen (Restbuchwert bei Buchverlust)": {},
+ "Anlagenabg\u00e4nge immaterielle Verm\u00f6gensgegenst\u00e4nde (Restbuchwert bei Buchverlust)": {},
+ "Aufmerksamkeiten": {},
+ "Aufwand f\u00fcr Gew\u00e4hrleistung": {},
+ "Aufwendungen aus Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inlandische Kap. Ges.)": {},
+ "Aufwendungen aus Bewertung Finanzmittelfonds": {},
+ "Aufwendungen aus Kursdifferenzen": {},
+ "Aufwendungen aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
+ "Aufwendungen aus der Zuschreibung von steuertlich niedriger bewerteten R\u00fcckstellungen": {},
+ "Aufwendungen aus der Zuschreibung von steuertlich niedriger bewerteten Verbindlichkeiten": {},
+ "Aufwendungen f\u00fcr Abraum- und Abfallbeseitigung": {},
+ "Aufwendungen f\u00fcr ein h\u00e4usliches Arbeitszimmer (abziehbarer Anteil)": {},
+ "Aufwendungen f\u00fcr ein h\u00e4usliches Arbeitszimmer (nicht abziehbarer Anteil)": {},
+ "Ausgangsfrachten": {},
+ "Ausgleichsabgabe i. S. d. Schwerbehindertengesetzes": {},
+ "Beitr\u00e4ge ": {},
+ "Bewirtungskosten": {},
+ "Buchf\u00fchrungskosten": {},
+ "B\u00fcrobedarf": {},
+ "Einstellungen in Sonderposten mit R\u00fccklageanteil (Ansparabschreibungen)": {},
+ "Einstellungen in Sonderposten mit R\u00fccklageanteil (Existenzgr\u00fcnderr\u00fccklage)": {},
+ "Einstellungen in Sonderposten mit R\u00fccklageanteil (Sonderabschreibungen)": {},
+ "Einstellungen in Sonderposten mit R\u00fccklageanteil (Steuerfreie R\u00fccklagen)": {},
+ "Einstellungen in Sonderposten mit R\u00fccklageanteil (\u00a7 52 Abs. 16 EStG)": {},
+ "Einstellungen in die Einzelwertberichtigung zu Forderungen": {},
+ "Einstellungen in die Pauschalwertberichtigung zu Forderungen": {},
+ "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (bei Buchverlust)": {},
+ "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen 100% / 50% steuerfrei (inlandische Kap.Ges.)(bei Buchverlust)": {},
+ "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen (bei Buchverlust)": {},
+ "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen 16% USt (bei Buchverlust)": {},
+ "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen 19% USt (bei Buchverlust)": {},
+ "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen steuerfrei \u00a7 4 Nr. 1a UStG (bei Buchverlust)": {},
+ "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen steuerfrei \u00a7 4 Nr. 1b UStG (bei Buchverlust)": {},
+ "Erl\u00f6se aus Verk\u00e4ufen immaterieller Verm\u00f6gensgegenst\u00e4nde (bei Buchverlust)": {},
+ "Fahrten zwischen Wohnung und Arbeitsst\u00e4tte (Haben)": {},
+ "Fahrten zwischen Wohnung und Arbeitsst\u00e4tte (abziehbarer Anteil)": {},
+ "Fahrten zwischen Wohnung und Arbeitsst\u00e4tte (nicht abziehbarer Anteil)": {},
+ "Fahrzeugkosten": {},
+ "Forderungsverluste (\u00fcbliche H\u00f6he)": {},
+ "Forderungsverluste 15% USt (\u00fcbliche H\u00f6he)": {},
+ "Forderungsverluste 16% USt (\u00fcbliche H\u00f6he)": {},
+ "Forderungsverluste 19% USt (\u00fcbliche H\u00f6he)": {},
+ "Forderungsverluste 7 % USt (\u00fcbliche H\u00f6he)": {},
+ "Forderungsverluste aus im Inland steuerpflichtigen EG-Lieferungen 15% USt (\u00fcbliche H\u00f6he)": {},
+ "Forderungsverluste aus im Inland steuerpflichtigen EG-Lieferungen 16% USt (\u00fcbliche H\u00f6he)": {},
+ "Forderungsverluste aus im Inland steuerpflichtigen EG-Lieferungen 19% USt (\u00fcbliche H\u00f6he)": {},
+ "Forderungsverluste aus im Inland steuerpflichtigen EG-Lieferungen 7% USt (\u00fcbliche H\u00f6he)": {},
+ "Forderungsverluste aus steuerfreien EG-Lieferungen (\u00fcbliche H\u00f6he)": {},
+ "Fortbildungskosten": {},
+ "Freiwillige Sozialleistungen": {},
+ "Fremdarbeiten (Vertrieb)": {},
+ "Fremdfahrzeugkosten": {},
+ "Fremdleistungen / Fremdarbeiten": {},
+ "Garagenmiete": {},
+ "Gas- Strom- Wasser": {},
+ "Geschenke abzugsf\u00e4hig": {},
+ "Geschenke ausschlie\u00dflich betrieblich genutzt": {},
+ "Geschenke nicht abzugsf\u00e4hig": {},
+ "Gewerbesteuerlich zu ber\u00fccksichtigende Miete f\u00fcr Einrichtungen \u00a7 8 GewStG": {},
+ "Gewerbesteuerlich zu ber\u00fccksichtigende Miete \u00a7 8 GewStG": {},
+ "Gewerbesteuerlich zu ber\u00fccksichtigende Pacht \u00a7 8 GewStG": {},
+ "Gewerbesteuerlich zu ber\u00fccksichtigendes Mietleasing \u00a7 8 GewStG": {},
+ "Grundst\u00fcckaufwendungen- betrieblich": {},
+ "Grundst\u00fcckaufwendungen- sonstige neutrale": {},
+ "Haftungsverg\u00fctung an Mitunternehmer \u00a7 15 EStG": {},
+ "Heizung": {},
+ "Instandhaltung betrieblicher R\u00e4ume": {},
+ "Kfz-Kosten f\u00fcr betrieblich genutzte zum Privatverm\u00f6gen geh\u00f6rende Kraftfahrzeuge": {},
+ "Kfz-Versicherungen": {},
+ "Kilometergelderstattung Arbeitnehmer": {},
+ "Kosten der Warenabgabe": {},
+ "Laufende Kfz-Betriebskosten": {},
+ "Leasingfahrzeugkosten": {},
+ "Mautgeb\u00fchren": {},
+ "Mietekosten": {},
+ "Mieten f\u00fcr Einrichtungen": {},
+ "Mietleasing": {},
+ "Nebenkosten des Geldverkehrs": {},
+ "Netto-Pr\u00e4mie f\u00fcr R\u00fcckdeckung k\u00fcnftiger Versorgungsleistungen": {},
+ "Nicht Abzugsf\u00e4hige Betriebsausgaben aus Werbe- und Repr\u00e4sentationskosten (nicht abziehbarer Anteil)": {},
+ "Nicht Abzugsf\u00e4hige Bewirtungskosten": {},
+ "Nicht abziehbare H\u00e4lfte der Aufsichtsratsverg\u00fctungen": {},
+ "Nicht abziehbare Vorsteuer": {},
+ "Nicht abziehbare Vorsteuer 16% ": {},
+ "Nicht abziehbare Vorsteuer 19% ": {},
+ "Nicht abziehbare Vorsteuer 7% ": {},
+ "Pacht": {},
+ "Periodenfremde Aufwendungen soweit nicht au\u00dferordentlich": {},
+ "Porto": {},
+ "Raumkosten": {},
+ "Rechts- und Beratungskosten": {},
+ "Reinigung": {},
+ "Reisekosten Arbeitnehmer": {},
+ "Reisekosten Arbeitnehmer (nicht abziehbarer Anteil)": {},
+ "Reisekosten Arbeitnehmer Fahrkosten": {},
+ "Reisekosten Arbeitnehmer Verpflegungsmehraufwand": {},
+ "Reisekosten Arbeitnehmer \u00fcbernachtungsaufwand": {},
+ "Reisekosten Unternehmer": {},
+ "Reisekosten Unternehmer (nicht abziehbarer anteil)": {},
+ "Reisekosten Unternehmer Fahrkosten": {},
+ "Reisekosten Unternehmer Verpflegungsmehraufwand": {},
+ "Reisekosten Unternehmer \u00fcbernachtungsaufwand": {},
+ "Reparaturen und Instandhaltung von Bauten": {},
+ "Reparaturen und Instandhaltung von Betriebs- und Gesch\u00e4ftsausstattung": {},
+ "Reparaturen und Instandhaltung von anderen Anlagen": {},
+ "Reparaturen und Instandhaltung von technischen Anlagen und Maschinen": {},
+ "Repr\u00e4sentationskosten": {},
+ "Sonstige Abgaben": {},
+ "Sonstige Aufwendungen betrieblich und Regelm\u00e4\u00dfig 1": {},
+ "Sonstige Aufwendungen betrieblich und regelm\u00e4\u00dfig": {},
+ "Sonstige Aufwendungen unregelm\u00e4\u00dfig": {},
+ "Sonstige Kfz-kosten": {},
+ "Sonstige Raumkosten": {},
+ "Sonstige Reparaturen und Instandhaltung ": {},
+ "Sonstige betriebliche Aufwendungen 5": {},
+ "Sonstige eingeschr\u00e4nkt abziehbare Betriebsausgaben (abziehbarer Anteil)": {},
+ "Sonstige eingeschr\u00e4nkt abziehbare Betriebsausgaben (nicht abziehbarer Anteil)": {},
+ "Sonstiger Betriebsbedarf": {},
+ "Steuerlich abzugsf\u00e4hige Versp\u00e4tungszuschl\u00e4ge und Zwangsgelder": {},
+ "Telefax und Internetkosten": {},
+ "Telefon": {},
+ "Transportversicherungen": {},
+ "Verg\u00fctungen an Mitunternehmer f\u00fcr die Pachtweise \u00fcberlassung ihrer Wirtschaftsg\u00fcter \u00a7 15 EStG": {},
+ "Verg\u00fctungen an Mitunternehmer f\u00fcr die mietweise \u00fcberlassung ihrer Wirtschaftsg\u00fcter \u00a7 15 EStG": {},
+ "Verg\u00fctungen an Mitunternehmer \u00a7 15 EStG": {},
+ "Verkaufsprovisionen": {},
+ "Verluste aus dem Abgang von Gegenst\u00e4nden des Anlageverm\u00f6gens": {},
+ "Verluste aus dem Abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens (au\u00dfer Vorr\u00e4te) 100% / 50% nicht anzugsf\u00e4hig (inlandische Kap. Ges.)": {},
+ "Verluste aus dem Abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens au\u00dfer Vorr\u00e4te": {},
+ "Verluste aus der Ver\u00e4u\u00dferung von Anteilen an Kapitalgesellschaften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
+ "Verpackungsmaterial": {},
+ "Versicherungen": {},
+ "Versicherungen f\u00fcr Geb\u00e4ude": {},
+ "Vorwegnahme k\u00fcnftiger Wertschwankungen im Umlaufverm\u00f6gen au\u00dfer Vorr\u00e4te und Wertpapiere": {},
+ "Wartungskosten f\u00fcr Hard- und Software": {},
+ "Werbekosten": {},
+ "Werkzeuge und Kleinger\u00e4te": {},
+ "Zeitschriften und B\u00fccher": {},
+ "Zuwendungen- Spenden an Stiftungen f\u00fcr Kirchliche- religi\u00f6se und gemeinn\u00fctzige Zwecke": {},
+ "Zuwendungen- Spenden an Stiftungen f\u00fcr gemeinn\u00fctzige Zwecke i. S. d. \u00a7 52 Abs. 2 Nr. 1-3 AO": {},
+ "Zuwendungen- Spenden an Stiftungen f\u00fcr gemeinn\u00fctzige Zwecke i. S. d. \u00a7 52 Abs. 2 Nr. 4 AO": {},
+ "Zuwendungen- Spenden an Stiftungen f\u00fcr wissenschaftliche- mitdt\u00e4tige- kulturelle Zwecke": {},
+ "Zuwendungen- Spenden an politische Parteien": {},
+ "Zuwendungen- Spenden f\u00fcr kirchliche- religi\u00f6se und gemeinn\u00fctzige Zwecke": {},
+ "Zuwendungen- Spenden f\u00fcr mildt\u00e4tige Zwecke": {},
+ "Zuwendungen- Spenden f\u00fcr wissenschaftliche und kulturelle Zwecke": {},
+ "Zuwendungen- Spenden- steuerlich nicht abziehbar": {},
+ "kfz-Reparaturen": {},
+ "steuerlich nicht abzugsf\u00e4hige Versp\u00e4tungszuschl\u00e4ge und Zwangsgelder": {}
+ }
+ }
+ },
+ "Weitere Aufwendungen": {
+ "Abschreibungen auf Finanzanlagen und auf Wertpapiere des Umlaufverm\u00f6gens": {
+ "Abschreibungen auf Finanzanlagen und auf Wertpapiere des Umlaufverm\u00f6gens 1": {
+ "Abschreibungen auf Finanzanlagen ": {
+ "account_type": "Depreciation"
+ },
+ "Abschreibungen auf Finanzanlagen 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
+ "Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften": {},
+ "Abschreibungen auf Finanzanlagen auf Grund steuerlicher Sondervorschriften 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
+ "Abschreibungen auf Grund von Verlustanteilen an Mitunternehmerschaften \u00a7 8 GewStG": {},
+ "Abschreibungen auf Wertpapiere des Umlaufverm\u00f6gens": {},
+ "Abschreibungen auf Wertpapiere des Umlaufverm\u00f6gens 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
+ "Vorwegnahme k\u00fcnftiger Wertschwankungen bei Wertpapieren des Umlaufverm\u00f6gens": {}
+ },
+ "account_type": "Depreciation"
+ },
+ "Au\u00dferordentliche Aufwendungen": {
+ "Au\u00dferordentliche Aufwendungen 1": {
+ "Au\u00dferordentliche Aufwendungen 2": {},
+ "Au\u00dferordentliche Aufwendungen finanzwirksam": {},
+ "Au\u00dferordentliche Aufwendungen nicht finanzwirksam": {}
+ }
+ },
+ "Einstellung in Gewinnr\u00fccklagen ": {
+ "Aussch\u00fcttung": {
+ "Vorabaussch\u00fcttung": {}
+ },
+ "Einstellung in Gewinnr\u00fccklagen in andere Gewinnr\u00fccklagen ": {
+ "Einstellung in andere Gewinnr\u00fccklagen ": {}
+ },
+ "Einstellung in Gewinnr\u00fccklagen in die R\u00fccklage f\u00fcr eigene Anteile": {
+ "Einstellung in die R\u00fccklage f\u00fcr eigene Anteile": {}
+ },
+ "Einstellung in Gewinnr\u00fccklagen in die gesetzliche R\u00fccklage ": {
+ "Einstellung in die gesetzliche R\u00fccklage ": {}
+ },
+ "Einstellung in Gewinnr\u00fccklagen in satzungm\u00e4\u00dfige R\u00fccklage ": {
+ "Einstellung in satzungm\u00e4\u00dfige R\u00fccklage ": {}
+ },
+ "Sonstige betriebliche Aufwendungen": {
+ "(zu freien Verf\u00fcgung)": {}
+ },
+ "Sonstige betriebliche Ertr\u00e4ge oder sonstige betriebliche Aufwendungen": {
+ "Aufwendungen/Ertr\u00e4ge aus Umrechnungsdifferenzen": {}
+ },
+ "Vortrag auf neue Rechnung 1": {
+ "Vortrag auf neue Rechnung (GuV)": {}
+ }
+ },
+ "Steuern vom Einkommen und Ertrag": {
+ "Steuern vom Einkommen und Ertrag 1": {
+ "Anrechenbarer Solidarit\u00e4tszuschlag auf Kapitalertragsteuer 20%": {},
+ "Anrechenbarer Solidarit\u00e4tszuschlag auf Kapitalertragsteuer 25%": {},
+ "Anrechenbarer Solidarit\u00e4tszuschlag auf Zinsabschlagsteuer": {},
+ "Anzurechnende ausl\u00e4ndische Quellensteuer": {},
+ "Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen f\u00fcr Steuern vom Einkommen und Ertrag": {},
+ "Gewerbesteuer ": {},
+ "Kapitalertragsteuer 20%": {},
+ "Kapitalertragsteuer 25%": {},
+ "K\u00f6rperschaftssteuer": {},
+ "K\u00f6rperschaftssteuer f\u00fcr Vorjahr": {},
+ "K\u00f6rperschaftssteuererstattung f\u00fcr Vorjahre nach \u00a737 KStG": {},
+ "K\u00f6rperschaftssteuererstattungen f\u00fcr Vorjahre": {},
+ "Solidarit\u00e4tszuschlag": {},
+ "Solidarit\u00e4tszuschlag f\u00fcr Vorjahre": {},
+ "Solidarit\u00e4tszuschlagerstattungen f\u00fcr Vorjahre": {},
+ "Steuererstattungen Vorjahre f\u00fcr Steuern vom Einkommen und Ertrag": {},
+ "Steuernachzahlungen Vorjahre f\u00fcr Steuern vom Einkommen und Ertrag": {},
+ "Zinsabschlagsteuer": {}
+ }
+ },
+ "Verlustvortrag": {
+ "Verlustvortrag nach Verwendung": {}
+ },
+ "Zinsen und \u00e4hnliche Aufwendungen": {
+ "Zinsen und \u00e4hnliche Aufwendungen 1": {
+ "Diskontaufwendungen": {},
+ "Diskontaufwendungen an verbundene Unternehmen": {},
+ "In Dauerschuldzinsen unqualifizierte Zinsen auf kurzfristige Verbindlichkeiten": {},
+ "Nicht abzugsf\u00e4hige Schuldzinsen gem\u00e4\u00df \u00a7 4 Abs. 4a EStG (Hinzurechnungsbetrag)": {},
+ "Renten und dauernde Lasten aus Gr\u00fcndung/Erwerb \u00a78 GewStG": {},
+ "Steuerlich abzugsf\u00e4hige- andere Nebenleistungen zu steuern ": {},
+ "Steuerlich nicht abzugsf\u00e4hige- andere Nebenleistungen zu steuern ": {},
+ "Zinsaufwendungen an Mitunternehmer f\u00fcr die Hingabe von Kapital \u00a7 15 EStG": {},
+ "Zinsaufwendungen f\u00fcr Geb\u00e4ude- die zum Betriebsverm\u00f6gen geh\u00f6ren": {},
+ "Zinsaufwendungen f\u00fcr kurzfristige Verbindlichkeiten": {},
+ "Zinsaufwendungen f\u00fcr kurzfristige Verbindlichkeiten an verbundene Unternehmen": {},
+ "Zinsaufwendungen f\u00fcr langfristige Verbindlichkeiten": {},
+ "Zinsaufwendungen f\u00fcr langfristige Verbindlichkeiten an verbundene Unternehmen": {},
+ "Zinsaufwendungen \u00a7\u00a7 233a AO betriebliche Steuern": {},
+ "Zinsaufwendungen \u00a7\u00a7 233a bis 237 AO Personensteuern": {},
+ "Zinsen und \u00e4hnliche Aufwendungen 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
+ "Zinsen und \u00e4hnliche Aufwendungen 2": {},
+ "Zinsen und \u00e4hnliche Aufwendungen an verbundene Unternehmen": {},
+ "Zinsen und \u00e4hnliche Aufwendungen an verbundene Unternehmen 100% / 50% nicht abzugsf\u00e4hig (inl\u00e4ndische Kap. Ges.)": {},
+ "Zinsen zur Finanzierung des Anlageverm\u00f6gens": {},
+ "Zins\u00e4hnliche Aufwendungen": {},
+ "Zins\u00e4hnliche Aufwendungen an verbundene Unternehmen": {}
+ }
+ }
+ },
+ "root_type": "Expense"
+ },
+ "Gewinn u. Verlust - Ertr\u00e4ge": {
+ "Betriebliche Ertr\u00e4ge": {
+ "Andere aktivierte Eigenleistungen": {
+ "Andere aktivierte Eigenleistungen 1": {
+ "Andere aktivierte Eigenleistungen 2": {}
+ }
+ },
+ "Erh\u00f6hung oder Verminderung des Bestands an fertigen und unfertige Erzeugnissen": {
+ "Erh\u00f6hung des Bestands an fertigen und unfertigen Erzeugnissen oder Verminderung des Bestands an fertigen und unfertigen Erzeugnissen": {
+ "Bestandsver\u00e4nderungen - fertige Erzeugnisse": {},
+ "Bestandsver\u00e4nderungen - unfertige Erzeugnisse": {},
+ "Bestandsver\u00e4nderungen - unfertige Leistungen": {}
+ },
+ "Erh\u00f6hung des Bestands in Arbeit befindlicher Auftr\u00e4ge oder Verminderung des Bestands in Arbeit befindlicher Auftr\u00e4ge": {
+ "Bestandsver\u00e4nderungen in Arbeit befindlicher Auftr\u00e4ge": {}
+ },
+ "Erh\u00f6hung des Bestands in Ausf\u00fchrung befindlicher Bauaftr\u00e4ge oder Verminderung des Bestands in Ausf\u00fchrung befindlicher Bauauftr\u00e4ge": {
+ "Bestandsver\u00e4nderungen in Ausf\u00fchrung befindliche Bauauftr\u00e4ge": {}
+ }
+ },
+ "Sonstige betriebliche Ertr\u00e4ge 1": {
+ "Sonstige betriebliche Ertr\u00e4ge 2": {
+ "Anlagenabg\u00e4nge Finanzanlagen (Restbuchwert bei Buchgewinn)": {},
+ "Anlagenabg\u00e4nge Finanzanlagen 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)(Restbuchwert bei Buchgewinn)": {},
+ "Anlagenabg\u00e4nge Sachanlagen (Restbuchwert bei Buchgewinn)": {},
+ "Anlagenabg\u00e4nge immaterielle Verm\u00f6gensgegenst\u00e4nde (Restbuchwert bei Buchgewinn)": {},
+ "Bank Bewertungsertrag": {},
+ "Bank Waehrungsverlust (Konto)": {},
+ "Erl\u00f6se aus Verkauf immaterieller Verm\u00f6gensgegenst\u00e4nde (bei Buchgewinn)": {},
+ "Erl\u00f6se aus Verk\u00e4ufen Finanzanlagen (bei Buchgewinn)": {},
+ "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen (bei Buchgewinn)": {},
+ "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen 16% USt (bei Buchgewinn)": {},
+ "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen 19% USt (bei Buchgewinn)": {},
+ "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen steuerfrei \u00a7 4 Nr. 1a UStG (bei Buchgewinn)": {},
+ "Erl\u00f6se aus Verk\u00e4ufen Sachanlageverm\u00f6gen steuerfrei \u00a7 4 Nr. 1b UStG (bei Buchgewinn)": {},
+ "Ertraege a. Waehrungsumstellung auf Euro": {},
+ "Ertr\u00e4ge aus Bewertung Finanzmittelfonds": {},
+ "Ertr\u00e4ge aus Kursdifferenzen": {},
+ "Ertr\u00e4ge aus Zuschreibungen des Finanzanlageverm\u00f6gens": {},
+ "Ertr\u00e4ge aus Zuschreibungen des Finanzanlageverm\u00f6gens 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {},
+ "Ertr\u00e4ge aus Zuschreibungen des Sachanlageverm\u00f6gens": {},
+ "Ertr\u00e4ge aus Zuschreibungen des Umlaufverm\u00f6gens 100% / 50% steuerfrei (inlandische Kap. Ges.)": {},
+ "Ertr\u00e4ge aus Zuschreibungen des Umlaufverm\u00f6gens au\u00dfer Vorr\u00e4ten": {},
+ "Ertr\u00e4ge aus Zuschreibungen des anderen Anlageverm\u00f6gens 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {},
+ "Ertr\u00e4ge aus Zuschreibungen des immateriellen Anlageverm\u00f6gens": {},
+ "Ertr\u00e4ge aus abgeschriebenen Forderungen": {},
+ "Ertr\u00e4ge aus dem Abgang von Gegenst\u00e4nden des Anlageverm\u00f6gens": {},
+ "Ertr\u00e4ge aus dem abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens (au\u00dfer Vorr\u00e4te) 100% / 50%steuerfrei (inlandische Kap.Ges.)": {},
+ "Ertr\u00e4ge aus dem abgang von Gegenst\u00e4nden des Umlaufverm\u00f6gens au\u00dfer Vorr\u00e4te": {},
+ "Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen": {},
+ "Ertr\u00e4ge aus der Aufl\u00f6sung von Sonderposten mit R\u00fccklageanteil (Ansparabschreibungen)": {},
+ "Ertr\u00e4ge aus der Aufl\u00f6sung von Sonderposten mit R\u00fccklageanteil (Existenzgr\u00fcnderr\u00fccklage)": {},
+ "Ertr\u00e4ge aus der Aufl\u00f6sung von Sonderposten mit R\u00fccklageanteil (Sonderabschreibungen)": {},
+ "Ertr\u00e4ge aus der Aufl\u00f6sung von Sonderposten mit R\u00fccklageanteil (aus der W\u00e4hrungsumstellung auf den Euro)": {},
+ "Ertr\u00e4ge aus der Aufl\u00f6sung von Sonderposten mit R\u00fccklageanteil (steuerfreie R\u00fccklage)": {},
+ "Ertr\u00e4ge aus der Aufl\u00f6sung von Sonderposten mit R\u00fccklageanteil nach \u00a7 52 Abs. 16 EStG": {},
+ "Ertr\u00e4ge aus der Herabsetzung der Einzelwertberichtigung zu Forderungen": {},
+ "Ertr\u00e4ge aus der Herabsetzung der Pauschalwertberichtigung zu Forderungen": {},
+ "Ertr\u00e4ge aus der Ver\u00e4u\u00dferung vo Anteilen an Kapitalgesellschaften 100% / 50% steuerfrei (inlandische Kap. Ges.)": {},
+ "Ertr\u00e4ge aus der steuerlich niedrigeren Bewertung von R\u00fcckstellungen": {},
+ "Ertr\u00e4ge aus der steuerlich niedrigeren Bewertung von Verbindlichkeiten": {},
+ "Grundst\u00fccksertr\u00e4ge": {},
+ "Investitionszulagen (steuerfrei)": {},
+ "Investitionszusch\u00fcsse (steuerpflichtig)": {},
+ "Kassendifferenzen": {},
+ "Nicht realisierbare Waehrungsdifferenzen": {},
+ "Periodenfremde Ertr\u00e4ge (soweit nicht au\u00dferordentlich)": {},
+ "Produkt Rechnung Preisdifferenz": {},
+ "Realisierte Waehrungsdifferenzen": {},
+ "Rundungsdifferenzen": {},
+ "Sachbez\u00fcge 16% USt (Waren)": {},
+ "Sachbez\u00fcge 19% USt (Waren)": {},
+ "Sachbez\u00fcge 7% USt (Waren)": {},
+ "Sonstige Ertr\u00e4ge betrieblich und regelm\u00e4\u00dfig ": {},
+ "Sonstige Ertr\u00e4ge betrieblich und regelm\u00e4\u00dfig 16% USt": {},
+ "Sonstige Ertr\u00e4ge betrieblich und regelm\u00e4\u00dfig 19% USt ": {},
+ "Sonstige Ertr\u00e4ge betriebsfremd und regelm\u00e4\u00dfig": {},
+ "Sonstige Ertr\u00e4ge unregelm\u00dfig": {},
+ "Sonstige betriebliche Ertr\u00e4ge 3": {},
+ "Sonstige steuerfreie Betriebseinnahmen": {},
+ "Verrechnete sonstige Sachbez\u00fcge ": {},
+ "Verrechnete sonstige Sachbez\u00fcge (keine Waren)": {},
+ "Verrechnete sonstige Sachbez\u00fcge 16 % USt ( z.B. Kfz-Gestellung)": {},
+ "Verrechnete sonstige Sachbez\u00fcge 19 % USt ( z.B. Kfz-Gestellung)": {},
+ "Verrechnete sonstige Sachbez\u00fcge ohne Umsatzsteuer": {},
+ "Versicherungsentsch\u00e4digungen": {},
+ "Waehrungsdifferenz zum Kontenausgleich": {},
+ "steuerfreie Ertr\u00e4ge aus der Aufl\u00f6sung von Sonderposten mit R\u00fccklageanteil": {}
+ }
+ },
+ "Statistische Konten E\u00fcR": {
+ "Sonstige betriebliche Ertr\u00e4ge": {
+ "Unentgeltliche Erbringung einer sonstigen Leistung 7% USt": {},
+ "Unentgeltliche Erbringung einer sostigen Leistung 16% USt": {},
+ "Unentgeltliche Erbringung einer sostigen Leistung 19% USt": {},
+ "Unentgeltliche Erbringung einer sostigen Leistung ohne USt": {},
+ "Unentgeltliche Zuwendung von Gegenst\u00e4nden 16% USt": {},
+ "Unentgeltliche Zuwendung von Gegenst\u00e4nden 19% USt": {},
+ "Unentgeltliche Zuwendung von Gegenst\u00e4nden ohne USt": {},
+ "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens 16% USt": {},
+ "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens 16% USt (Kfz-Nutzung)": {},
+ "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens 16% USt (Telefon-Nutzung)": {},
+ "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens 19% USt": {},
+ "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens 19% USt (Kfz-Nutzung)": {},
+ "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens 19% USt (Telefon-Nutzung)": {},
+ "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens 7% USt": {},
+ "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens ohne USt": {},
+ "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens ohne USt (Kfz-Nutzung)": {},
+ "Verwendung von Gegenst\u00e4nden f\u00fcr Zwecke au\u00dferhalb des Unternehmens ohne USt (Telefon-Nutzung)": {}
+ },
+ "Umsatzerl\u00f6se": {
+ "Entnahme durch Unternehmer f\u00fcr Zwecke au\u00dferhalb des Unternehmens (Waren) ohne USt": {},
+ "Entnahme durch den Unternehmer f\u00fcr Zwecke au\u00dferhalb des Unternehmens (Waren) 16% USt": {},
+ "Entnahme durch den Unternehmer f\u00fcr Zwecke au\u00dferhalb des Unternehmens (Waren) 19% USt": {},
+ "Entnahme durh Unternehmer f\u00fcr Zwecke au\u00dferhalb des Unternehmens (Waren) 7% USt": {},
+ "Entnahme von Gegens\u00e4nden ohne USt": {},
+ "Erl\u00f6sschm\u00e4lerung aus im Inland steuerpflichtigen EG-lieferungen 16% USt": {},
+ "Erl\u00f6sschm\u00e4lerung aus im Inland steuerpflichtigen EG-lieferungen 19% USt": {},
+ "Erl\u00f6sschm\u00e4lerung aus im Inland steuerpflichtigen EG-lieferungen 7 % USt": {},
+ "Erl\u00f6sschm\u00e4lerung aus im anderen EG-lieferungen steuerpflichtigen Lieferungen": {},
+ "Erl\u00f6sschm\u00e4lerungen": {},
+ "Erl\u00f6sschm\u00e4lerungen 16 % USt": {},
+ "Erl\u00f6sschm\u00e4lerungen 19 % USt": {},
+ "Erl\u00f6sschm\u00e4lerungen 7 % USt": {},
+ "Erl\u00f6sschm\u00e4lerungen aus steuerfreien Ums\u00e4tzen \u00a7 4 Nr. 1a UStG": {},
+ "Erl\u00f6sschm\u00e4lerungen aus steuerfreien innergemeinschaftlichen Lieferungen": {},
+ "Gegenkonto 4580-4582 bei Aufteilung der Erl\u00f6se nach Steuers\u00e4tzen (E\u00fcR)": {},
+ "Gew\u00e4hrte Boni ": {},
+ "Gew\u00e4hrte Boni 16 % USt": {},
+ "Gew\u00e4hrte Boni 19 % USt": {},
+ "Gew\u00e4hrte Boni 7 % USt": {},
+ "Gew\u00e4hrte Rabatte": {},
+ "Gew\u00e4hrte Rabatte 16 % USt": {},
+ "Gew\u00e4hrte Rabatte 19 % USt": {},
+ "Gew\u00e4hrte Rabatte 7 % USt": {},
+ "Gew\u00e4hrte Skonti": {},
+ "Gew\u00e4hrte Skonti 16 % USt": {},
+ "Gew\u00e4hrte Skonti 19 % USt": {},
+ "Gew\u00e4hrte Skonti 7 % USt": {},
+ "Gew\u00e4hrte Skonti aus Leistungen- f\u00fcr die der Leistungsempf\u00e4nger die umsatzsteuer nach \u00a7 13b UStG schuldet": {},
+ "Gew\u00e4hrte Skonti aus im Inland steuerpflichtigen EG-Lieferungen": {},
+ "Gew\u00e4hrte Skonti aus im Inland steuerpflichtigen EG-Lieferungen 16 % USt": {},
+ "Gew\u00e4hrte Skonti aus im Inland steuerpflichtigen EG-Lieferungen 19 % USt": {},
+ "Gew\u00e4hrte Skonti aus im Inland steuerpflichtigen EG-Lieferungen 7 % USt": {},
+ "Gew\u00e4hrte Skonti aus steuerfreien innergemeinschaftlichen Lieferungen \u00a7 4 Nr. 1b UStG": {},
+ "Nicht steuerbare ums\u00e4tze (Innenums\u00e4tze)": {},
+ "Statistisches Konto Erl\u00f6se zum allgemeinen Umsatzsteuersatz (E\u00fcR)": {},
+ "Statistisches Konto Erl\u00f6se zum erm\u00e4\u00dfigten Umsatzsteuersatz (E\u00fcR)": {},
+ "Statistisches konto Erl\u00f6se steuerfrei und nicht steuerbar (E\u00fcR)": {},
+ "Umsatzsteuerverg\u00fctung": {},
+ "Unentgeltliche Wertabgaben 3": {},
+ "Unentgeltliche Zuwendung von Waren 16% USt": {},
+ "Unentgeltliche Zuwendung von Waren 19% USt": {},
+ "Unentgeltliche Zuwendung von Waren 7% USt": {},
+ "Unentgeltliche Zuwendung von Waren ohne USt": {}
+ }
+ },
+ "Umsatzerl\u00f6se 1": {
+ "Sotige betriebliche Ertr\u00e4ge": {
+ "Provision- sonstige Ertr\u00e4ge": {},
+ "Provision- sonstige Ertr\u00e4ge 16% USt": {},
+ "Provision- sonstige Ertr\u00e4ge 19% USt": {},
+ "Provision- sonstige Ertr\u00e4ge 7% USt": {},
+ "Provision- sonstige Ertr\u00e4ge steuerfrei (\u00a7 4 Nr. 5 UStG)": {},
+ "Provision- sonstige Ertr\u00e4ge steuerfrei (\u00a7 4 Nr. 8 ff. UStG)": {}
+ },
+ "Umsatzerl\u00f6se 2": {
+ "* Konto Kasse Ertrag": {},
+ "* Sonstige Einnahmen": {},
+ "* Vorausberechnete Einnahmen": {},
+ "Erl\u00f6se": {},
+ "Erl\u00f6se 16% USt": {},
+ "Erl\u00f6se 19% USt": {},
+ "Erl\u00f6se 7% USt": {},
+ "Erl\u00f6se Abfallverwertung": {},
+ "Erl\u00f6se Leergut": {},
+ "Erl\u00f6se als Kleinunternehmer i.S.d. \u00a7 19 Abs. 1 UStG": {},
+ "Erl\u00f6se aus Geldspielautomaten 16% USt": {},
+ "Erl\u00f6se aus Geldspielautomaten 19% USt": {},
+ "Erl\u00f6se aus Leistungen- f\u00fcr die der Leistungsempf\u00e4nger die Umsatzsteuer nach \u00a7 13b UStG schuldet": {},
+ "Erl\u00f6se aus im Drittland steuerbaren Leistungen- im Inland ncht steuerbare Ums\u00e4tze": {},
+ "Erl\u00f6se aus im Inland steuerpflichtigen EG-Lieferungen 16% USt": {},
+ "Erl\u00f6se aus im Inland steuerpflichtigen EG-Lieferungen 19% USt": {},
+ "Erl\u00f6se aus im Inland steuerpflichtigen EG-Lieferungen 7% USt": {},
+ "Erl\u00f6se aus im anderen EG-Land steuerbaren Leistungen- im Inland nicht steuerbare Ums\u00e4tze": {},
+ "Erl\u00f6se aus im anderen EG-Land steuerpflichtigen Lieferungen": {},
+ "Erl\u00f6se. Die mit den Durchschnittss\u00e4tzen des \u00a7 24 UStG versteuert werden": {},
+ "Lieferungen des ersten Abnehmers bei innergemeinschaftlichen Dreiecksgesch\u00e4ften \u00a7 25b abs. UStG": {},
+ "Nicht abgerechnete Einnahmen": {},
+ "Provisionsums\u00e4tze": {},
+ "Provisionsums\u00e4tze 16% USt": {},
+ "Provisionsums\u00e4tze 19% USt": {},
+ "Provisionsums\u00e4tze 7% USt": {},
+ "Provisionsums\u00e4tze- steuerfrei (\u00a74 Nr. 5 UStG)": {},
+ "Provisionsums\u00e4tze- steuerfrei (\u00a74 Nr. 8 ff. UStG)": {},
+ "Sonstige steuerfreie Ums\u00e4tze (z.B. \u00a7 4 Nr. 2-7 UStG)": {},
+ "Sonstige steuerfreie Ums\u00e4tze Inland": {},
+ "Steuerfreie Ums\u00e4tze nach \u00a7 4 Nr. 12 UStG (Vermietung und Verpackung)": {},
+ "Steuerfreie Ums\u00e4tze offshore etc.": {},
+ "Steuerfreie Ums\u00e4tze ohne Vorsteuerabzug zum Gesamtumsatz geh\u00f6rend": {},
+ "Steuerfreie Ums\u00e4tze \u00a74 Nr. 1a UStG": {},
+ "Steuerfreie Ums\u00e4tze \u00a74 Nr. 8 ff. UStG": {},
+ "Steuerfreie innergemeinschaftliche Lieferungen von Neufahrzeugen an Abnehmer ohne Umsatzsteuer-Identifikationsnummer": {},
+ "Steuerfreie innergemeinschaftliche Lieferungen \u00a74 Nr. 1b UStG": {},
+ "Umsatzerl\u00f6se (zur fr. Verf\u00fcgung)": {}
+ }
+ }
+ },
+ "Weitere Ertr\u00e4ge": {
+ "Au\u00dferordentliche Ertr\u00e4ge": {
+ "Au\u00dferordentliche Ertr\u00e4ge 1": {
+ "Au\u00dferordentliche Ertr\u00e4ge 2": {},
+ "Au\u00dferordentliche Ertr\u00e4ge finanzwirksam": {},
+ "Au\u00dferordentliche Ertr\u00e4ge nicht finanzwirksam": {}
+ }
+ },
+ "Entnahme aus Gewinnr\u00fccklagen": {
+ "Einstellungen in die Kapitalr\u00fccklage nach den Vorschriften \u00fcber die Vereinfachte Kapitalherabsetzung": {
+ "Einstellungen in die Kapitalr\u00fccklage nach den Vorschriften \u00fcber die Vereinfachte Kapitalherabsetzung 1": {}
+ },
+ "Entnahme aus Gewinnr\u00fccklagen aus anderen Gewinnr\u00fccklagen": {
+ "Entnahme aus Gewinnr\u00fccklagen aus anderen Gewinnr\u00fccklagen 1": {}
+ },
+ "Entnahme aus Gewinnr\u00fccklagen aus der R\u00fccklage f\u00fcr eigene Anteile ": {
+ "Entnahme aus Gewinnr\u00fccklagen aus der R\u00fccklage f\u00fcr eigene Anteile 1": {}
+ },
+ "Entnahme aus Gewinnr\u00fccklagen aus der gesetzlichen R\u00fccklage": {
+ "Entnahme aus Gewinnr\u00fccklagen aus der gesetzlichen R\u00fccklage 1": {}
+ },
+ "Entnahme aus Gewinnr\u00fccklagen aus satzungsm\u00e4\u00dfigen R\u00fccklage ": {
+ "Entnahme aus Gewinnr\u00fccklagen aus satzungsm\u00e4\u00dfigen R\u00fccklage 1": {}
+ },
+ "Ertr\u00e4ge aus Kapitalherabsetzung": {
+ "Ertr\u00e4ge aus Kapitalherabsetzung 1": {}
+ }
+ },
+ "Entnahme aus der Kapitalr\u00fccklage": {
+ "Entnahme aus der Kapitalr\u00fccklage 1": {}
+ },
+ "Ertr\u00e4ge aus Beteiligungen": {
+ "Ertr\u00e4ge aus Beteiligungen 1": {
+ "Ertr\u00e4ge aus Beteiligungen 2": {},
+ "Ertr\u00e4ge aus Beteiligungen an verbundenen Unternehmen": {},
+ "Gewinnanteile aus Mitunternehmerschaften \u00a7 9 GewStG": {},
+ "Gewinne aus Anteilen an nicht steuerbefreiten inl\u00e4ndischen Kapitalgesellschaften \u00a7 9 Nr. 2a GewStG": {}
+ }
+ },
+ "Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens": {
+ "Ertr\u00e4ge aus anderen Wertpapieren und Ausleihungen des Finanzanlageverm\u00f6gens 1": {}
+ },
+ "Gewinnvortrag": {
+ "Gewinnvortrag nach Verwendung": {}
+ },
+ "Sonstige Steuern ": {
+ "Sonstige Steuern 1": {
+ "Ertr\u00e4ge aus der Aufl\u00f6sung von R\u00fcckstellungen f\u00fcr sonstige Steuern": {},
+ "Grundsteuer": {},
+ "Kfz-Steuer": {},
+ "Sonstige Steuern 2": {},
+ "Steuererstattungen Vorjahre f\u00fcr sonstige Steuern ": {},
+ "Steuernachzahkungen Vorjahre f\u00fcr sonstige Steuern ": {},
+ "Verbrauchsteuer": {},
+ "\u00f6kosteuer": {}
+ }
+ },
+ "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge": {
+ "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge 1": {
+ "Diskontertr\u00e4ge": {},
+ "Diskontertr\u00e4ge aus verbundenen Unternehmen": {},
+ "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften (Umlaufverm\u00f6gen) 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {},
+ "Laufende Ertr\u00e4ge aus Anteilen an Kapitalgesellschaften (verbundene Unternehmen) 100% / 50% steuerfrei (inl\u00e4ndische Kap. Ges.)": {},
+ "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge 2": {},
+ "Sonstige Zinsen und \u00e4hnliche Ertr\u00e4ge aus verbundenen Unternehmen": {},
+ "Sonstige Zinsertr\u00e4ge": {},
+ "Sonstige Zinsertr\u00e4ge aus verbundenen Unternehmen": {},
+ "Steuerfreie Aufzinsung des K\u00f6rperschaftsteuerguthabens nach \u00a737 KStG": {},
+ "Zinsertr\u00e4ge \u00a7 233a AO": {},
+ "Zinsertr\u00e4ge \u00a7 233a AO Sonderfall anlage A KSt": {},
+ "Zins\u00e4hnliche Ertr\u00e4ge": {},
+ "Zins\u00e4hnliche Ertr\u00e4ge aus verbundenen Unternehmen": {}
+ }
+ }
+ },
+ "root_type": "Income"
+ },
+ "Vortrags- Kapital- und Statistische Konten": {
+ "Aufgliederung der R\u00fcckstellungen": {
+ "Gegenkonto zu Konto 9260 - 9268": {},
+ "Kurzfristige R\u00fcckstellungen": {},
+ "Langfristige R\u00fcckstellungen- au\u00dfer Pensionen": {},
+ "Mittelfristige R\u00fcckstellungen": {}
+ },
+ "Ausgleichsposten f\u00fcr aktivierte eigene Anteile und Bilanzierungshilfen": {
+ "Ausgleichsposten f\u00fcr aktivierte Bilanzierungshilfen": {},
+ "Ausgleichsposten f\u00fcr aktivierte eigene Anteile ": {}
+ },
+ "Eigenkapitalersetzende Gesellschafterdarlehen ": {
+ "Eigenkapitalersetzende Gesellschafterdarlehen 1": {},
+ "Gegenkonto zu 9250 und 9255": {},
+ "Ungesicherte Gesellschafterdarlehen mit Restlaufzeit gr\u00f6\u00dfer 5 Jahre": {}
+ },
+ "Einzahlungsverpflichtungen im Bereich der Forderungen": {
+ "Einzahlungsverpflichtungen Kommanditisten": {},
+ "Einzahlungsverpflichtungen pers\u00f6nlich haftender Gesellschafter": {}
+ },
+ "Kapital Personenhandelsgesellschaft Teilhafter": {
+ "Gesellschafter-Darlehen 1": {},
+ "Verrechnungskonto f\u00fcr Einzahlungsverpflichtungen 1": {}
+ },
+ "Kapital Personenhandelsgesellschaft Vollhafter": {
+ "Gesellschafter-Darlehen": {},
+ "Verlust-/ Vortragskonto": {},
+ "Verrechnungskonto f\u00fcr Einzahlungsverpflichtungen": {}
+ },
+ "Nicht durch Verm\u00f6genseinlagen gedeckte Entnahmen": {
+ "Nicht durch Verm\u00f6genseinlagen gedeckte Entnahmen Kommanditisten": {},
+ "Nicht durch Verm\u00f6genseinlagen gedeckte Entnahmen pers\u00f6nlich haftender Gesellschafter": {}
+ },
+ "Passive Rechnungsabgrenzung": {
+ "Baukostenzusch\u00fcsse": {},
+ "Forderungen aus Sachanlagenverk\u00e4ufen bei sonstigen Verm\u00f6gensgegenst\u00e4nden": {},
+ "Forderungen aus Verk\u00e4ufen immaterielle Verm\u00f6gensgegenst\u00e4nde bei sonstigen Verm\u00f6gensgegenst\u00e4nden": {},
+ "Forderungen aus Verk\u00e4ufen von Finanzanlagen bei sonstigen Verm\u00f6gensgegenst\u00e4nden": {},
+ "Gegenkonto zu Konten 9230- 9238": {},
+ "Gegenkonto zu Konto 9240-43": {},
+ "Gegenkonto zu Konto 9245-47": {},
+ "Investitionsverbindlichkeiten aus K\u00e4ufen von Finanzanlagen bei Leistungsverbindlichkeiten": {},
+ "Investitionsverbindlichkeiten aus K\u00e4ufen von immateriellen Verm\u00f6gensgegenst\u00e4nden bei Leistungsverbindlichkeiten": {},
+ "Investitionsverbindlichkeiten aus Sachanlagenk\u00e4ufen bei Leistungsverbindlichkeiten": {},
+ "Investitionsverbindlichkeiten bei den Leistungsverbindlichkeiten": {},
+ "Investitionszulagen ": {},
+ "Investitionszusch\u00fcsse ": {}
+ },
+ "Privat Teilhafter (f\u00fcr Verrechnung Gesellschafterdarlehen mit Eigenkapitalcharakter- Konto 9840-9849)": {
+ "Au\u00dfergew\u00f6hnliche Belastungen": {},
+ "Grundst\u00fccksaufwand": {},
+ "Grundst\u00fccksertrag": {},
+ "Privateinlagen": {},
+ "Privatentnahmen allgemein": {},
+ "Privatsteuern": {},
+ "Sonderausgaben beschr\u00e4nkt abzugsf\u00e4hig": {},
+ "Sonderausgaben unbeschr\u00e4nkt abzugsf\u00e4hig": {},
+ "Unentgeltliche Wertabgaben": {},
+ "Zuwendungen- Spenden": {}
+ },
+ "Statistische Konten f\u00fcr 4 Abs. 3 EStG": {
+ "Einlagen stiller Gesellschafter": {
+ "Einlagen stiller Gesellschafter 1": {}
+ },
+ "Gegenkonto zu 9287 und 9288": {},
+ "Gegenkonto zu 9290": {},
+ "Gegenkonto zu 9292": {},
+ "Mahngeb\u00fchren bei Buchungen \u00fcber Debitoren bei \u00a7 4 Abs. 3 EStG": {},
+ "Statistisches Konto Fremdgeld": {},
+ "Statistisches Konto steuerfreie Auslagen": {},
+ "Steuerrechtlicher Ausgleichsposten": {
+ "Steuerrechtlicher Ausgleichsposten 1": {}
+ },
+ "Zinsen bei Buchungen \u00fcber Debitoren bei \u00a7 4 Abs. 3 EStG": {}
+ },
+ "Statistische Konten f\u00fcr Betriebswirtschaftliche Auswertungen (BWA)": {
+ "Anzahl Kreditkunden aufgelaufen": {},
+ "Anzahl Kreditkunden monatlich": {},
+ "Anzahl Rechnungen": {},
+ "Anzahl der Barkunden": {},
+ "Auftragsbestand": {},
+ "Auftragseingang im Gesch\u00e4ftsjahr": {},
+ "Besch\u00e4ftigte Personen 1": {},
+ "Erweiterungsinvestitionen": {},
+ "Gegenkonto f\u00fcr statistische Mengeneinheiten Konten 9101-9107 und Konten 9116-9118": {},
+ "Gegenkonto zu Konten 9120- 9135-9140": {},
+ "Gesch\u00e4ftsraum m2": {},
+ "Unbezahlte Personen": {},
+ "Verkaufskr\u00e4fte": {},
+ "Verkaufsraum m2": {},
+ "Verkaufstage": {}
+ },
+ "Statistische Konten f\u00fcr Gewinnzuschlag": {
+ "Statistische Konten f\u00fcr den Gewinnzuschlag nach \u00a7\u00a7 6b- 6c und 7g EStG (Haben-Buchung)": {},
+ "Statistische Konten f\u00fcr den Gewinnzuschlag- Gegenkonto zu 9890": {}
+ },
+ "Statistische Konten f\u00fcr den Kennziffernteil der Bilanz": {
+ "Besch\u00e4ftigte Personen": {},
+ "Gegenkonto zu 9200": {},
+ "Gegenkonto zu 9210": {},
+ "Produktive L\u00f6hne": {}
+ },
+ "Statistische Konten f\u00fcr die Kapitalkontenentwicklung": {
+ "Anteil f\u00fcr Konto 9840-49 Teilhafter": {},
+ "Anteil f\u00fcr Konto Teilhafter 0080 ": {},
+ "Anteil f\u00fcr Konto Teilhafter 0081": {},
+ "Anteil f\u00fcr Konto Teilhafter 0082": {},
+ "Anteil f\u00fcr Konto Teilhafter 0083": {},
+ "Anteil f\u00fcr Konto Teilhafter 0084": {},
+ "Anteil f\u00fcr Konto Teilhafter 0085": {},
+ "Anteil f\u00fcr Konto Teilhafter 0086": {},
+ "Anteil f\u00fcr Konto Teilhafter 0087": {},
+ "Anteil f\u00fcr Konto Teilhafter 0088": {},
+ "Anteil f\u00fcr Konto Teilhafter 0089": {},
+ "Anteil f\u00fcr Konto Teilhafter 2050": {},
+ "Anteil f\u00fcr Konto Teilhafter 2051": {},
+ "Anteil f\u00fcr Konto Teilhafter 2052": {},
+ "Anteil f\u00fcr Konto Teilhafter 2053": {},
+ "Anteil f\u00fcr Konto Teilhafter 2054": {},
+ "Anteil f\u00fcr Konto Teilhafter 2055": {},
+ "Anteil f\u00fcr Konto Teilhafter 2056": {},
+ "Anteil f\u00fcr Konto Teilhafter 2057": {},
+ "Anteil f\u00fcr Konto Teilhafter 2058": {},
+ "Anteil f\u00fcr Konto Teilhafter 2059": {},
+ "Anteil f\u00fcr Konto Teilhafter 2060": {},
+ "Anteil f\u00fcr Konto Teilhafter 2061": {},
+ "Anteil f\u00fcr Konto Teilhafter 2062": {},
+ "Anteil f\u00fcr Konto Teilhafter 2063": {},
+ "Anteil f\u00fcr Konto Teilhafter 2064": {},
+ "Anteil f\u00fcr Konto Teilhafter 2065": {},
+ "Anteil f\u00fcr Konto Teilhafter 2066": {},
+ "Anteil f\u00fcr Konto Teilhafter 2067": {},
+ "Anteil f\u00fcr Konto Teilhafter 2068": {},
+ "Anteil f\u00fcr Konto Teilhafter 2069": {},
+ "Anteil f\u00fcr Konto Teilhafter 2070 ": {},
+ "Anteil f\u00fcr Konto Teilhafter 2071": {},
+ "Anteil f\u00fcr Konto Teilhafter 2072": {},
+ "Anteil f\u00fcr Konto Teilhafter 2073": {},
+ "Anteil f\u00fcr Konto Teilhafter 2074": {},
+ "Anteil f\u00fcr Konto Teilhafter 2075": {},
+ "Anteil f\u00fcr Konto Teilhafter 2076": {},
+ "Anteil f\u00fcr Konto Teilhafter 2077": {},
+ "Anteil f\u00fcr Konto Teilhafter 2078": {},
+ "Anteil f\u00fcr Konto Teilhafter 2079": {},
+ "Anteil f\u00fcr Konto Vollhafter 0060": {},
+ "Anteil f\u00fcr Konto Vollhafter 0061": {},
+ "Anteil f\u00fcr Konto Vollhafter 0062": {},
+ "Anteil f\u00fcr Konto Vollhafter 0063": {},
+ "Anteil f\u00fcr Konto Vollhafter 0064": {},
+ "Anteil f\u00fcr Konto Vollhafter 0065": {},
+ "Anteil f\u00fcr Konto Vollhafter 0066": {},
+ "Anteil f\u00fcr Konto Vollhafter 0067": {},
+ "Anteil f\u00fcr Konto Vollhafter 0068": {},
+ "Anteil f\u00fcr Konto Vollhafter 0069": {},
+ "Anteil f\u00fcr Konto Vollhafter 2000": {},
+ "Anteil f\u00fcr Konto Vollhafter 2001": {},
+ "Anteil f\u00fcr Konto Vollhafter 2002": {},
+ "Anteil f\u00fcr Konto Vollhafter 2003": {},
+ "Anteil f\u00fcr Konto Vollhafter 2004": {},
+ "Anteil f\u00fcr Konto Vollhafter 2005": {},
+ "Anteil f\u00fcr Konto Vollhafter 2006": {},
+ "Anteil f\u00fcr Konto Vollhafter 2007": {},
+ "Anteil f\u00fcr Konto Vollhafter 2008": {},
+ "Anteil f\u00fcr Konto Vollhafter 2009": {},
+ "Anteil f\u00fcr Konto Vollhafter 2010": {},
+ "Anteil f\u00fcr Konto Vollhafter 2011": {},
+ "Anteil f\u00fcr Konto Vollhafter 2012": {},
+ "Anteil f\u00fcr Konto Vollhafter 2013": {},
+ "Anteil f\u00fcr Konto Vollhafter 2014": {},
+ "Anteil f\u00fcr Konto Vollhafter 2015": {},
+ "Anteil f\u00fcr Konto Vollhafter 2016": {},
+ "Anteil f\u00fcr Konto Vollhafter 2017": {},
+ "Anteil f\u00fcr Konto Vollhafter 2018": {},
+ "Anteil f\u00fcr Konto Vollhafter 2019": {},
+ "Anteil f\u00fcr Konto Vollhafter 2020": {},
+ "Anteil f\u00fcr Konto Vollhafter 2021": {},
+ "Anteil f\u00fcr Konto Vollhafter 2022": {},
+ "Anteil f\u00fcr Konto Vollhafter 2023": {},
+ "Anteil f\u00fcr Konto Vollhafter 2024": {},
+ "Anteil f\u00fcr Konto Vollhafter 2025": {},
+ "Anteil f\u00fcr Konto Vollhafter 2026": {},
+ "Anteil f\u00fcr Konto Vollhafter 2027": {},
+ "Anteil f\u00fcr Konto Vollhafter 2028": {},
+ "Anteil f\u00fcr Konto Vollhafter 2029": {},
+ "Anteil f\u00fcr Konto Vollhafter 9810": {},
+ "Anteil f\u00fcr Konto Vollhafter 9811": {},
+ "Anteil f\u00fcr Konto Vollhafter 9812": {},
+ "Anteil f\u00fcr Konto Vollhafter 9813": {},
+ "Anteil f\u00fcr Konto Vollhafter 9814": {},
+ "Anteil f\u00fcr Konto Vollhafter 9815": {},
+ "Anteil f\u00fcr Konto Vollhafter 9816": {},
+ "Anteil f\u00fcr Konto Vollhafter 9817": {},
+ "Anteil f\u00fcr Konto Vollhafter 9818": {},
+ "Anteil f\u00fcr Konto Vollhafter 9819": {},
+ "Anteil f\u00fcr Konto Vollhafter 9820 ": {},
+ "Anteil f\u00fcr Konto Vollhafter 9821": {},
+ "Anteil f\u00fcr Konto Vollhafter 9822": {},
+ "Anteil f\u00fcr Konto Vollhafter 9823": {},
+ "Anteil f\u00fcr Konto Vollhafter 9824": {},
+ "Anteil f\u00fcr Konto Vollhafter 9825": {},
+ "Anteil f\u00fcr Konto Vollhafter 9826": {},
+ "Anteil f\u00fcr Konto Vollhafter 9827": {},
+ "Anteil f\u00fcr Konto Vollhafter 9828": {},
+ "Anteil f\u00fcr Konto Vollhafter 9829": {},
+ "Darlehensverzinsung Teillhafter": {},
+ "Darlehensverzinsung Vollhafter": {},
+ "Gebrauchs\u00fcberlassung Teillhafter": {},
+ "Gebrauchs\u00fcberlassung Vollhafter": {},
+ "L\u00f6sch- und Korrekturschl\u00fcssel": {},
+ "Name des Gesellschafters Teillhafter": {},
+ "Name des Gesellschafters Vollhafter": {},
+ "Restanteil Teillhafter": {},
+ "Restanteil Vollhafter": {},
+ "Sonstige Verg\u00fctungen Teillhafter": {},
+ "Sonstige Verg\u00fctungen Vollhafter": {},
+ "Tantieme Teillhafter": {},
+ "Tantieme Vollhafter": {},
+ "T\u00e4tigkeitsverg\u00fctung Teillhafter": {},
+ "T\u00e4tigkeitsverg\u00fctung Vollhafter": {}
+ },
+ "Statistische Konten f\u00fcr die im Anhang anzugebenden sonstigen finanziellen Verpflichtungen": {
+ "Andere Verpflichtungen gem\u00e4\u00df \u00a7 285 Nr. 3 HGB": {},
+ "Andere Verpflichtungen gem\u00e4\u00df \u00a7 285 Nr. 3 HGB gegen\u00fcber verbundenen Unternehmen": {},
+ "Gegenkonto zu 9281-9284": {},
+ "Verpflichtungen aus Miet- und Leasingsvertr\u00e4gen": {},
+ "Verpflichtungen aus Miet- und Leasingsvertr\u00e4gen gegen\u00fcber verbundenen Unternehmen": {}
+ },
+ "Statistische Konten f\u00fcr in der Bilanz auszuweisende Haftungsverh\u00e4ltnisse": {
+ "Gegenkonto zu 9271 - 9279 (Soll-Buchung)": {},
+ "Haftung aus der Bestellung von Sicherheiten f\u00fcr fremde Verbindlichkeiten": {},
+ "Haftung aus der Bestellung von Sicherheiten f\u00fcr fremde Verbindlichkeiten gegen\u00fcber verbundenen Unternehmen": {},
+ "Verbindlichkeiten aus B\u00fcrgschaften- Wechsel- und Scheckb\u00fcrgschaften": {},
+ "Verbindlichkeiten aus B\u00fcrgschaften- Wechsel- und Scheckb\u00fcrgschaften gegen\u00fcber verbundenen Unternehmen": {},
+ "Verbindlichkeiten aus Gew\u00e4hrleistungsvertr\u00e4gen": {},
+ "Verbindlichkeiten aus Gew\u00e4hrleistungsvertr\u00e4gen gegen\u00fcber verbundenen Unternehmen": {},
+ "Verbindlichkeiten aus der Begebung und \u00fcbertragung von Wechseln": {},
+ "Verpflichtungen aus Treuhandverm\u00f6gen": {}
+ },
+ "Statistische Konten zu \u00a7 4 (4a) EStG": {
+ "Erh\u00f6hung der Entnahmen \u00a74 (4a) EStG": {},
+ "Gegenkonto zur Erh\u00f6hung der Entnahmen \u00a74 (4a) EStG (Haben)": {},
+ "Gegenkonto zur Minderung der Entnahmen \u00a74 (4a) EStG": {},
+ "Minderung der Entnahmen \u00a74 (4a) EStG (Haben)": {}
+ },
+ "Statistische Konten zur informativen Angabe des gezeichneten Kapitals in anderer W\u00e4hrung": {
+ "Gezeichnetes Kapital in DM": {
+ "Gezeichnetes Kapital in DM (Art. 42 Abs. 3 S. 1 EGHGB)": {}
+ },
+ "Gezeichnetes Kapital in Euro": {
+ "Gegenkonto zu 9220-9221": {},
+ "Gezeichnetes Kapital in Euro (Art. 42 Abs. 3 S. 2 EGHGB)": {}
+ }
+ },
+ "Statistische konten f\u00fcr Kinderbetreuungskosten": {
+ "Gegenkonto zu 9918 (Haben)": {},
+ "Kinderbetreuungskosten (wie Betriebsausgaben steuerlich anzusetzender Betrag)": {}
+ },
+ "Steueraufwand der Gesellschafter": {
+ "Gegenkonto zu 9887": {},
+ "Steueraufwand der Gesellschafter 1": {}
+ },
+ "Verrechnungskonto f\u00fcr nicht durch Verm\u00f6genseinlagen gedeckte Entnahmen": {
+ "Verrechnungskonto f\u00fcr nicht durch Verm\u00f6genseinlagen gedeckte Entnahmen Kommanditisten": {},
+ "Verrechnungskonto f\u00fcr nicht durch Verm\u00f6genseinlagen gedeckte Entnahmen pers\u00f6nlich haftender Gesellschafter": {}
+ },
+ "Vorsteuer-/Umsatzsteuerkonten zur Korrektur der Forderungen/ Verbindlichkeiten (E\u00fcR)": {
+ "Gegenkonto 9893-9894 f\u00fcr die Aufteilung der Umsatzsteuersatz (E\u00fcR)": {},
+ "Gegenkonto 9896-9897 f\u00fcr die Aufteilung der Vorsteuer (E\u00fcR)": {},
+ "SO Commitment": {},
+ "Umsatzsteuer in den Forderungen zum allgemeinen Umsatzsteuersatz (E\u00fcR)": {},
+ "Umsatzsteuer in den Forderungen zum erm\u00e4\u00dfigten Umsatzsteuersatz (E\u00fcR)": {},
+ "Vorsteuer in den Verbindlichkeiten zum allgemeinen Umsatzsteuersatz (E\u00fcR)": {},
+ "Vorsteuer in den Verbindlichkeiten zum erm\u00e4\u00dfigten Umsatzsteuersatz (E\u00fcR)": {}
+ },
+ "Vortragskonten": {
+ "Offene Posten aus 1990": {},
+ "Offene Posten aus 1991": {},
+ "Offene Posten aus 1992": {},
+ "Offene Posten aus 1993": {},
+ "Offene Posten aus 1994": {},
+ "Offene Posten aus 1995": {},
+ "Offene Posten aus 1996": {},
+ "Offene Posten aus 1997": {},
+ "Offene Posten aus 1998": {},
+ "Offene Posten aus 1999": {},
+ "Offene Posten aus 2000": {},
+ "Offene Posten aus 2001": {},
+ "Offene Posten aus 2002": {},
+ "Offene Posten aus 2003": {},
+ "Offene Posten aus 2004": {},
+ "Offene Posten aus 2005": {},
+ "Offene Posten aus 2006": {},
+ "Offene Posten aus 2007": {},
+ "Offene Posten aus 2008": {},
+ "Offene Posten aus 2009": {},
+ "Saldenvortr\u00e4ge": {},
+ "Saldenvortr\u00e4ge Debitoren": {},
+ "Saldenvortr\u00e4ge Kreditoren": {},
+ "Saldenvortr\u00e4ge- Sachkonten": {},
+ "Summenvortragskonto": {}
+ },
+ "root_type": "Asset"
+ }
+ }
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_chart_of_accounts.json
new file mode 100644
index 0000000..834cf3d
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/fr_chart_of_accounts.json
@@ -0,0 +1,99 @@
+{
+ "country_code": "fr",
+ "name": "France - Chart of Accounts",
+ "tree": {
+ "Frais": {
+ "601 achats stock\u00e9s, mat premi\u00e8res": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "6031 variation des stock\u00e9s mat premi\u00e8res": {
+ "account_type": "Stock Adjustment"
+ },
+ "6081 frais accessoires d'achats mat premi\u00e8res": {
+ "account_type": "Expenses Included In Valuation"
+ },
+ "Dotations aux amortissements, d\u00e9pr\u00e9ciations": {
+ "account_type": "Depreciation"
+ },
+ "root_type": "Expense"
+ },
+ "le revenu": {
+ "701 ventes de produits finis": {},
+ "root_type": "Income"
+ },
+ "les atouts": {
+ "Amortissements des immobilisations corporelles ": {
+ "Autres immobilisations corporelles (m\u00eame ventilation que celle du compte 218)": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "Constructions (m\u00eame ventilation que celle du compte 213) ": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "Installations mat\u00e9riel et outillage industriels (m\u00eame ventilation que celle du compte 215)": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "account_type": "Accumulated Depreciation"
+ },
+ "Banques": {
+ "51201 Soci\u00e9t\u00e9 g\u00e9n\u00e9rale": {
+ "account_type": "Bank"
+ },
+ "account_type": "Bank"
+ },
+ "Caisse": {
+ "5301 Caisse si\u00e8ge social": {
+ "account_type": "Cash"
+ },
+ "account_type": "Cash"
+ },
+ "Clients et comptes rattach\u00e9s": {
+ "41119 Autres Clients": {
+ "account_type": "Receivable"
+ },
+ "account_type": "Receivable"
+ },
+ "Immobilisations corporelles en cours": {
+ "Autres immobilisations corporelles": {
+ "account_type": "Fixed Asset"
+ },
+ "Constructions": {
+ "account_type": "Fixed Asset"
+ },
+ "Installations techniques mat\u00e9riel et outillage industriels ": {
+ "account_type": "Fixed Asset"
+ },
+ "account_type": "Fixed Asset"
+ },
+ "Stock": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "root_type": "Asset"
+ },
+ "passifs": {
+ "Fournisseurs - Factures non parvenues ": {
+ "4081 Fournisseurs - Factures non parvenues ": {
+ "account_type": "Stock Received But Not Billed"
+ },
+ "account_type": "Stock Received But Not Billed"
+ },
+ "Fournisseurs et comptes rattach\u00e9s": {
+ "4011 Fournisseurs - Achats de biens et prestations de services": {
+ "account_type": "Payable"
+ },
+ "account_type": "Payable"
+ },
+ "root_type": "Liability",
+ "\u00c9tat - Taxes sur le chiffre d'affaires": {
+ "TVA collect\u00e9e (Taux Normal)": {
+ "account_type": "Tax"
+ },
+ "account_type": "Tax"
+ }
+ },
+ "\u00c9quit\u00e9": {
+ "is_group": 1,
+ "root_type": "Equity"
+ }
+ }
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json
index 5d194eb..f7cf9a0 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/gt_cuentas_plantilla.json
@@ -1,92 +1,351 @@
{
- "country_code": "gt",
- "name": "Guatemala - Cuentas",
- "tree": {
- "Activos": {
- "Activo Corriente": {
- "Caja y Bancos": {},
- "Cuentas por Cobrar": {},
- "Impuestos por Cobrar": {
- "IVA por Cobrar": {},
- "Retenciones de IVA recibidas": {}
- },
- "Inventario": {
- "is_group": 1,
- "account_type": "Stock"
+ "country_code": "gt",
+ "name": "Guatemala - Cuentas",
+ "tree": {
+ "02 - Pasivos": {
+ "Pasivo Corriente": {
+ "Acreedores 1": {
+ "account_type": "Payable"
+ },
+ "Cuentas por Pagar": {},
+ "Impuestos por Pagar": {},
+ "Otras Cuentas por Pagar": {},
+ "Prestaciones": {},
+ "Proveedores": {
+ "Inventario Recibido pero No Cobrado": {
+ "account_type": "Stock Received But Not Billed"
+ }
+ },
+ "Sueldos por Liquidar": {}
+ },
+ "Pasivo No Corriente": {
+ "Acreedores": {},
+ "Provisi\u00f3n para Indemnizaciones": {}
+ },
+ "root_type": "Liability"
+ },
+ "03 - Patrimonio": {
+ "Capital": {},
+ "Resultados del Ejercicio": {},
+ "Utilidades Retenidas": {},
+ "root_type": "Asset"
+ },
+ "04 - Ingresos": {
+ "Productos": {},
+ "Servicios": {},
+ "root_type": "Income"
+ },
+ "05 - Costos": {
+ "Costo de Ventas": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "Costos Incluidos en la Valuaci\u00f3n": {
+ "account_type": "Expenses Included In Valuation"
+ },
+ "Merma o Ajuste de Inventario": {
+ "account_type": "Stock Adjustment"
+ },
+ "root_type": "Expense"
+ },
+ "06 - Gastos": {
+ "Alquileres": {},
+ "Depreciaciones": {
+ "account_type": "Depreciation"
+ },
+ "Gastos Diversos": {},
+ "Gastos de Personal": {},
+ "Honorarios Profesionales": {},
+ "Mantenimiento": {},
+ "Seguros": {},
+ "Servicios B\u00e1sicos": {},
+ "root_type": "Expense"
+ },
+ "07 - Otros Gastos y Productos Financieros": {
+ "Otros Gastos": {
+ "Otros Gastos y Productos Financieros 2": {
+ "Intereses 1": {},
+ "Otros Gastos Financieros 1": {}
+ }
+ },
+ "Otros Ingresos": {
+ "Otros Gastos y Productos Financieros 1": {
+ "Intereses": {},
+ "Otros Gastos Financieros": {}
+ }
+ },
+ "root_type": "Expense"
+ },
+ "1 - Activos": {
+ "1. Activo Corriente": {
+ "1.10 Activos Corrientes Adicionales": {
+ "1.10.1 Inversiones Corrientes no Clasificados como Equivalentes de Caja y Bancos": {},
+ "1.10.2 Activos Diferidos o Restringidos": {
+ "1.10.2.1 Cr\u00e9dito Fiscal (IVA Por Cobrar)": {
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "account_type": "Chargeable"
+ },
+ "account_type": "Chargeable"
+ },
+ "1.2 Inversion en Propiedades": {
+ "1.2.1 Inversion Inmobiliaria Bajo Construccion": {
+ "account_type": "Chargeable"
+ },
+ "1.2.2 Inversion Inmobiliaria Construida": {
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "account_type": "Chargeable"
+ },
+ "1.3 Activos Intangibles": {
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "1.4 Activos Financieros": {
+ "1.4.1 Inversion o Participaci\u00f3n Accionaria en Empresas Afiliadas": {
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "1.4.2 Inversiones Burs\u00e1tiles e Instrumentos Financieros": {
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "1.4.3 Activos Financieros Derivados": {
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "1.4.4 Otros Activos Financieros": {
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "1.4.5 Provisi\u00f3n por Riesgo de Cr\u00e9dito (agregado) (Contra-activo)": {
+ "account_type": "Round Off",
+ "is_group": 1
+ },
+ "1.4.6 Activos Financieros Clasificados por Designaci\u00f3n": {
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "account_type": "Chargeable"
+ },
+ "1.5 Activos Biol\u00f3gicos": {
+ "1.5.1 Activos Biol\u00f3gicos al Costo": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "1.5.2 Activos Biol\u00f3gicos a Valor Razonable": {
+ "1.5.2.1 Animales": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "1.5.2.2 Plantas": {
+ "1.5.2.2.1 Division productiva 1er nivel EJEMPLO": {
+ "1.5.2.2.1.1 Division Productiva 2do nivel EJEMPLO": {
+ "1.5.2.2.1.1.1 Division Productiva 3er Nivel EJEMPLO": {
+ "1.5.2.2.1.1.1.1 Divisi\u00f3n Productiva 4\u00ba Nivel EJEMPLO": {},
+ "account_type": "Stock"
+ },
+ "account_type": "Stock"
+ },
+ "account_type": "Stock"
+ },
+ "account_type": "Stock"
+ },
+ "account_type": "Stock"
+ },
+ "account_type": "Stock"
+ },
+ "1.6 Activos Devengables y Otros Activos": {
+ "1.6.1 Pagos Anticipados y Otros Activos Circulantes": {
+ "1.6.1.0 Seguro Pagado Anticipadamente": {
+ "account_type": "Chargeable"
+ },
+ "account_type": "Chargeable"
+ },
+ "1.6.2 Cobrables Relacionados con Impuestos": {
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "1.6.3 Proveedores de Servicio": {
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "1.6.4 Contratos de Construccion": {
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "1.6.5 Costos de Montaje": {
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "1.6.6 Activos Adicionales y Otros": {
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "account_type": "Chargeable"
+ },
+ "1.7 Inventario": {
+ "1.7.1 Materia Prima": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "1.7.10 Inventarios Pignorados Como Garant\u00eda de Pasivo": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "1.7.11 Inventarios a Valor Razonable Menos Costos de Venta": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "1.7.2 Mercader\u00eda (Mercanc\u00edas)": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "1.7.3 Suministros de Producci\u00f3n y Consumibles": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "1.7.4 Repuestos": {
+ "1.7.4.0 Respuestos en Transito": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "account_type": "Stock"
+ },
+ "1.7.5 Combustibles": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "1.7.6 Trabajo en Progeso": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "1.7.7 Producto Terminado": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "1.7.8 Art\u00edculos de Inventario Adicionales": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "1.7.9 Otros Inventarios": {
+ "1.7.9.1 Merma o Ajuste de Inventario": {
+ "account_type": "Stock Adjustment",
+ "is_group": 1
+ },
+ "account_type": "Stock"
+ },
+ "account_type": "Stock"
+ },
+ "1.8 Cobrables": {
+ "1.8.1 Ventas al Cr\u00e9dito": {
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "1.8.2 Activos bajo Contrato": {
+ "account_type": "Receivable",
+ "is_group": 1
+ },
+ "1.8.3 Otras Cuentas por Cobrar": {
+ "1.8.3.1 Cuentas por Cobrar a Otras Entidades no Afiliadas": {
+ "1.8.3.1.1 Compa\u00f1\u00eda No Afiliada (EJEMPLO)": {
+ "account_type": "Receivable"
+ },
+ "account_type": "Receivable"
+ },
+ "1.8.3.2 Cuentas Por Cobrar Compa\u00f1\u00edas Afiliadas": {
+ "1.8.3.2.1 Compa\u00f1\u00eda subsidiaria (EJEMPLO)": {
+ "account_type": "Receivable"
+ },
+ "account_type": "Receivable"
+ },
+ "1.8.3.3 Cuentas por Cobrar a Empleados": {
+ "1.8.3.3.1 Prestamo EJEMPLO": {
+ "account_type": "Receivable"
+ },
+ "account_type": "Receivable"
+ },
+ "account_type": "Receivable"
+ },
+ "1.8.4 Ajustes": {
+ "account_type": "Chargeable",
+ "is_group": 1
+ },
+ "account_type": "Receivable"
+ },
+ "1.9 Caja y Equivalentes": {
+ "1.9.1 Caja": {
+ "account_type": "Cash",
+ "is_group": 1
+ },
+ "1.9.2 Equivalentes de Efectivo (Bancos)": {
+ "1.9.2.1 Bancos Nacionales": {
+ "1.9.2.1.1 Banco Industrial": {
+ "account_type": "Bank",
+ "is_group": 1
+ },
+ "1.9.2.1.2 Banco Agromercantil de Guatemala": {
+ "account_type": "Bank"
+ },
+ "1.9.2.1.3 Banco Prom\u00e9rica": {
+ "account_type": "Bank"
+ },
+ "1.9.2.1.4 Banco de Am\u00e9rica Central": {
+ "account_type": "Bank"
+ },
+ "1.9.2.1.5 Banco G&T Continental": {
+ "account_type": "Bank"
+ },
+ "1.9.2.1.6 Banco Internacional": {
+ "account_type": "Bank"
+ },
+ "1.9.2.1.7 Banco de Desarrollo Rural": {
+ "account_type": "Bank"
+ },
+ "1.9.2.1.8 Banco de los Trabajadores": {
+ "account_type": "Bank"
+ },
+ "1.9.2.1.9 Vivibanco": {
+ "account_type": "Bank"
+ },
+ "account_type": "Bank"
+ },
+ "1.9.2.2 Bancos Internacionales": {
+ "1.9.2.2.1 HSBC": {
+ "account_type": "Bank"
+ },
+ "account_type": "Bank"
+ },
+ "1.9.2.3 Cadena de Bloques (Blockchain)": {
+ "1.9.2.3.1 Billetera Bitcoin 1234567890abcdefg": {
+ "account_type": "Cash"
+ },
+ "account_type": "Cash"
+ },
+ "account_type": "Bank"
+ },
+ "1.9.3 Inversiones a Corto Plazo": {
+ "account_type": "Bank",
+ "is_group": 1
+ },
+ "1.9.4 Otros Equivalentes de Caja y Bancos": {
+ "account_type": "Cash",
+ "is_group": 1
+ },
+ "account_type": "Bank"
+ },
+ "Impuestos por Cobrar": {
+ "Retenciones de IVA recibidas": {}
+ }
+ },
+ "No Corriente": {
+ "Activos Fijos": {
+ "account_type": "Fixed Asset"
+ },
+ "Cargos Diferidos": {}
+ },
+ "root_type": "Asset"
}
- },
- "No Corriente": {
- "Activos Fijos": {},
- "Cargos Diferidos": {}
- },
- "root_type": "Asset"
- },
- "Pasivos": {
- "Pasivo Corriente": {
- "Proveedores": {
- "Inventario Recibido pero No Cobrado": {
- "account_type": "Stock Received But Not Billed"
- }
- },
- "Impuestos por Pagar": {},
- "Sueldos por Liquidar": {},
- "Prestaciones": {},
- "Cuentas por Pagar": {},
- "Otras Cuentas por Pagar": {},
- "Acreedores": {}
- },
- "Pasivo No Corriente": {
- "Provisión para Indemnizaciones": {},
- "Acreedores": {}
- },
- "root_type": "Liability"
- },
- "Patrimonio": {
- "Capital": {},
- "Utilidades Retenidas": {},
- "Resultados del Ejercicio": {},
- "root_type": "Asset"
- },
- "Costos": {
- "Costo de Ventas": {},
- "Costos Incluidos en la Valuación": {
- "account_type": "Expenses Included In Valuation"
- },
- "Stock Adjustment": {
- "account_type": "Stock Adjustment"
- },
- "root_type": "Expense"
- },
- "Gastos": {
- "Gastos de Personal": {},
- "Honorarios Profesionales": {},
- "Servicios Básicos": {},
- "Alquileres": {},
- "Seguros": {},
- "Mantenimiento": {},
- "Depreciaciones": {},
- "Gastos Diversos": {},
- "root_type": "Expense"
- },
- "Ingresos": {
- "Productos": {},
- "Servicios": {},
- "root_type": "Income"
- },
- "Otros Gastos y Productos Financieros": {
- "Otros Ingresos": {
- "Otros Gastos y Productos Financieros": {
- "Intereses": {},
- "Otros Gastos Financieros": {}
- }
- },
- "Otros Gastos": {
- "Otros Gastos y Productos Financieros": {
- "Intereses": {},
- "Otros Gastos Financieros": {}
- }
- },
- "root_type": "Expense"
}
- }
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json
new file mode 100644
index 0000000..ae2c630
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/id_chart_of_accounts.json
@@ -0,0 +1,369 @@
+{
+ "country_code": "id",
+ "name": "Indonesia - Chart of Accounts",
+ "tree": {
+ "1000.0000 Aktiva": {
+ "1100.0000 Aktiva Lancar": {
+ "1110.0000 Kas": {
+ "1111.000 Kas Rupiah": {
+ "1111.0010 Kas Kecil": {
+ "account_type": "Cash"
+ },
+ "1111.0020 Kas Besar": {
+ "account_type": "Cash"
+ },
+ "account_type": "Cash"
+ },
+ "1112.000 Kas Mata Uang Lain": {
+ "1112.0010 Kas USD": {
+ "account_type": "Cash"
+ }
+ }
+ },
+ "1120.000 Bank ": {
+ "1121.000 Bank Rupiah": {
+ "1121.0010 Bank 1": {
+ "account_type": "Bank"
+ },
+ "1121.0020 Bank 2": {
+ "account_type": "Bank"
+ }
+ },
+ "1122.000 Bank Other Currency": {
+ "1122.0010 Bank 1": {
+ "account_type": "Bank"
+ },
+ "1122.0020 Bank 2": {
+ "account_type": "Bank"
+ }
+ },
+ "account_type": "Bank"
+ },
+ "1130.000 Piutang": {
+ "1131.000 Piutang Dagang": {
+ "1131.0010 Piutang Dagang": {
+ "account_type": "Receivable"
+ }
+ },
+ "1132.000 Piutang Lain lain": {
+ "1132.001 Piutang Lain-lain 1": {
+ "account_type": "Receivable"
+ }
+ }
+ },
+ "1140.000 Persediaan Barang": {
+ "1141.000 Persediaan Barang": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "1142.000 Uang Muka Pembelian": {
+ "1142.001 Uang Muka Pembelian": {
+ "account_type": "Bank"
+ }
+ }
+ },
+ "1150.000 Biaya di Bayar di Muka": {
+ "1151.000 Biaya di Bayar di Muka": {
+ "1151.001 Biaya di Bayar di Muka": {
+ "1151.00111 Biaya d Bayar di Muka": {}
+ }
+ }
+ },
+ "1160.000 Pendapatan Yang Akan di Terima": {
+ "1161.000 Pendapatan Yang di Terima": {
+ "1161.001 Pendapatan Yang Akan di Terima": {}
+ }
+ },
+ "1170.000 Akun sementara": {
+ "1171.000 Pembukaan sementara": {
+ "account_type": "Temporary"
+ }
+ }
+ },
+ "1200.000 Aktiva Tetap": {
+ "1210.000 Aktiva": {
+ "1211.000 Aktiva": {
+ "1211.001 Aktiva": {
+ "account_type": "Fixed Asset"
+ }
+ },
+ "1212.000 Akumulasi Penyusutan Aktiva": {
+ "1212.001 Akumulasi Penyusutan Aktiva": {
+ "account_type": "Accumulated Depreciation"
+ }
+ }
+ },
+ "1230.000 Investasi": {
+ "1231.000 Investasi": {
+ "1231.001 Investai Saham": {
+ "1231.0011 Investasi Saham": {}
+ },
+ "1231.002 Investasi Perumahan": {
+ "1231.0021 Investasi Perumahan": {}
+ },
+ "1231.003 Deposito": {
+ "is_group": 1
+ }
+ }
+ }
+ },
+ "root_type": "Asset"
+ },
+ "2000.000 Passiva": {
+ "2100.000 Pasiva Lancar": {
+ "2110.000 Hutang Dagang": {
+ "2111.000 Hutang Dagang Rupiah": {
+ "2111.001 Hutang Dagang Dalam Negeri": {
+ "account_type": "Payable"
+ },
+ "2111.002 Hutang Dagang Luar Negeri": {
+ "account_type": "Payable"
+ },
+ "2111.003 Hutang Dagang Biaya Kirim Dalam Negeri": {
+ "account_type": "Payable"
+ },
+ "2111.004 HUtang Dagang Biaya Kirim Luar Negeri": {
+ "account_type": "Payable"
+ }
+ },
+ "2112.000 Hutang Dagang Other Currency": {
+ "2112.001 Hutang Dagang Luar Negeri (USD)": {
+ "account_type": "Payable"
+ },
+ "2112.002 Hutang Dagang Luar Negeri (SGD)": {
+ "account_type": "Payable"
+ },
+ "2112.003 Hutang Dagang Biaya Kirim Luar Negeri (USD)": {
+ "account_type": "Payable"
+ },
+ "2112.004 Hutang Dagang Biaya Kirim Luar Negeri (SGD)": {
+ "account_type": "Payable"
+ },
+ "2112.005 Hutang Dagang Biaya Kirim Dalam Negeri": {
+ "account_type": "Payable"
+ }
+ },
+ "2115.000 Stock Diterima Tapi Tidak Ditagih": {
+ "account_type": "Stock Received But Not Billed"
+ }
+ },
+ "2120.000 Pendapatan di Terima di Muka": {
+ "2121.000 Pendapatan di Terima di Muka": {
+ "2121.001 Dp Penjualan": {
+ "account_type": "Bank"
+ }
+ }
+ },
+ "2130.000 Biaya Yang Akan di Bayar": {
+ "2131.000 Biaya Yang Akan di Bayar": {
+ "2131.001 Biaya Yang Akan di Bayar": {}
+ },
+ "2132.000 Biaya Yang Akan di Bayar - Freight": {
+ "2132.001 Biaya Yang Akan di Bayar - Freight": {
+ "account_type": "Expenses Included In Valuation"
+ }
+ }
+ },
+ "2140.000 Hutang Pajak": {
+ "2141.000 Hutang Pajak": {
+ "account_type": "Payable"
+ }
+ }
+ },
+ "2200.000 Passiva Tetap": {
+ "2210.000 Hutang Pada Pihak ke 3": {
+ "2211.000 Pinjaman Pihak ke 3 Rutin": {
+ "2211.001 Hutang": {}
+ },
+ "2212.000 Pinjaman Pihak ke 3 Tidak Rutin": {
+ "2212.001 Hutang": {}
+ },
+ "2213.000 Hutang Bunga Pinjaman Pihak Ke 3 Tidak Rutin": {
+ "2213.001 Hutang Bunga": {}
+ }
+ },
+ "2220.000 Hutang Pada Bank": {
+ "2221.000 Hutang Bank": {
+ "2221.001 Hutang": {}
+ }
+ },
+ "2230.000 Hutang Leasing Kendaraan": {
+ "2231.000 Hutang Leasing Kendaraan": {
+ "2231.001 Hutang Leasing Kendaraan": {}
+ }
+ },
+ "2240.000 Hutang Lain Lain": {
+ "2241.000 Hutang Lain Lain": {
+ "2241.001 Hutang": {}
+ }
+ }
+ },
+ "root_type": "Liability"
+ },
+ "3000.000 Modal": {
+ "3100.000 Modal": {
+ "3110.000 Modal di Setor": {},
+ "3120.000 Prive P.Saham": {},
+ "3130.000 Saldo pembukaan Equity": {}
+ },
+ "3200.000 Laba": {
+ "3210.000 Laba di Tahan": {},
+ "3220.000 Laba Tahun Berjalan": {},
+ "3230.000 Laba Periode Berjalan": {}
+ },
+ "root_type": "Equity"
+ },
+ "4000.000 Penjualan": {
+ "4100.000 Penjualan Barang Dagangan": {
+ "4110.000 Penjualan": {},
+ "4120.000 Retur Penjualan": {},
+ "4130.000 Potongan Penjualan": {}
+ },
+ "4200.000 Harga Pokok Pembelian": {
+ "4210.000 HPP Pembelian": {
+ "account_type": "Cost of Goods Sold"
+ }
+ },
+ "4300.000 Pendapatan Service/Jasa": {
+ "4310.000 Pendapatan Service": {}
+ },
+ "4400.000 Pendapatan Lain lain": {
+ "4410.000 Pendapatan Bunga Bank": {},
+ "4420.000 Pendapatan Bunga Dari Pihak Ke 3": {},
+ "4430.000 Pendapatan Keuntungan Penjualan Aktiva": {},
+ "4440.000 Pendapatan Komisi": {},
+ "4450.000 Pendapatan Sewa Gudang": {},
+ "4460.000 Pendapatan Sewa Lain lain": {},
+ "4470.000 Pendapatan Penjualan Barang BS": {},
+ "4480.000 Pendapatan Lain lain": {}
+ },
+ "root_type": "Income"
+ },
+ "5000.000 Beban": {
+ "5100.000 Beban Langsung": {
+ "5110.000 Beban Penjualan": {
+ "5110.001 Biaya BBM": {},
+ "5110.002 Biaya Tol": {},
+ "5110.003 Biaya Parkir": {},
+ "5110.004 Biaya Upah Angkat/Turun Barang": {},
+ "5110.005 Biaya Kuli": {},
+ "5110.006 Biaya Perjalanan Dinas": {},
+ "5110.007 Biaya Barang Rusak": {},
+ "5110.008 Biaya Perbaikan Kendaraan Operasional": {},
+ "5110.009 Biaya Asuransi Kendaraan Operasional": {},
+ "5110.010 Biaya Leasing Kendaraan Operasional": {},
+ "5110.011 Biaya Kebutuhan Penjualan": {},
+ "5110.012 Biaya Sample": {},
+ "5110.013 Biaya Bonus, Hadiah, dan Sampel": {},
+ "5110.014 Biaya Entertainment dan Pergaulan": {},
+ "5110.015 Biaya Sewa Gudang": {},
+ "5110.016 Biaya Sewa Peralatan Gudang": {},
+ "5110.017 Biaya Piutang Tak Tertagih": {},
+ "5110.018 Potongan Supplier": {},
+ "5110.019 Biaya Penjualan Lain Lain": {},
+ "5110.020 Penyesuaian Stock": {
+ "account_type": "Stock Adjustment"
+ },
+ "5110.021 Biaya Susut Barang": {}
+ },
+ "5120.000 Biaya Gaji & Kesejahteraan Pegawai": {
+ "5120.001 Biaya Gaji Staff & Karyawan Tetap": {},
+ "5120.002 Biaya Gaji Karyawan Harian": {},
+ "5120.003 Biaya Pengobatan": {},
+ "5120.004 Biaya Asuransi Kesehatan Pegawai": {},
+ "5120.005 Biaya THR, Bonus, dan Komisi": {},
+ "5120.006 Biaya Konsumsi": {},
+ "5120.007 Biaya Gaji & Kesejahteraan Lainnya": {}
+ },
+ "5130.000 Biaya Kantor & Gudang": {
+ "5130.001 Biaya PLN Gudang & Kantor": {},
+ "5130.002 Biaya PAM Gudang & Kantor": {},
+ "5130.003 Biaya TLP Gudang & Kantor": {},
+ "5130.004 Biaya Fotocopy, Photo, Print Out": {},
+ "5130.005 Biaya Alat Tulis Kantor": {},
+ "5130.006 Biaya Stamp Duty & Pos": {},
+ "5130.007 Biaya Servis Peralatan Gudang": {},
+ "5130.008 Biaya Pemeliharaan Bgn Gudang": {},
+ "5130.009 Biaya Humas & Pergaulan": {},
+ "5130.010 Biaya Perlengkapan Gudang": {},
+ "5130.011 Iuran Bulanan": {},
+ "5130.012 Biaya Serba Serbi": {},
+ "5130.013 Biaya Sewa Kantor": {},
+ "5130.014 Biaya Asuransi Bangunan": {},
+ "5130.015 Biaya Sumbangan": {},
+ "5130.016 Biaya Perizinan Usaha dan Bangunan": {},
+ "5130.017 Biaya Perizinan Kendaraan Operasional": {},
+ "5130.018 Biaya KTR & GDG Lain Lain": {}
+ }
+ },
+ "5200.000 Beban Tidak Langsung": {
+ "5210.000 Biaya Gaji & Kesejahteraan Pegawai Indirect": {
+ "5210.001 Biaya Gaji Staff": {},
+ "5210.002 Biaya THR dan Bonus Staff": {},
+ "5210.003 Biaya Pengobatan & Kesehatan": {},
+ "5210.004 Biaya Konsumsi": {},
+ "5210.005 Biaya Gaji Lain Lain": {}
+ },
+ "5220.000 Biaya Operational Indirect": {
+ "5220.001 Biaya BBM": {},
+ "5220.002 Biaya Tol & Parkir": {},
+ "5220.003 Biaya TLP & HP": {},
+ "5220.004 Biaya Perjalanan Dinas": {},
+ "5220.005 Biaya Perbaikan Kendaraan Dinas": {},
+ "5220.006 Biaya Asuransi Kendaraan Dinas": {},
+ "5220.007 Biaya Leasing Kendaraan Dinas": {},
+ "5220.008 Biaya Entertainment dan Pergaulan": {},
+ "5220.009 Biaya Hadiah dan Bonus": {}
+ },
+ "5230.000 Biaya Kantor Indirect": {
+ "5230.001 Biaya PLN Kantor": {},
+ "5230.002 Biaya PAM Kantor": {},
+ "5230.003 Biaya TLP Kantor": {},
+ "5230.004 Biaya Sewa Kantor": {},
+ "5230.005 Biaya Asuransi Bangunan": {},
+ "5230.006 Biaya Alat Tulis Kantor": {},
+ "5230.007 Biaya Fotocopy, Photo, Print Out": {},
+ "5230.008 Biaya Kirim Dokumen": {},
+ "5230.009 Biaya Perlengkapan & Peralatan Kantor": {},
+ "5230.010 Service Peralatan Kantor": {},
+ "5230.011 Biaya Pemeliharaan Bangunan Kantor": {},
+ "5230.012 Biaya Iuran Bulanan": {},
+ "5230.013 Biaya Sumbangan": {},
+ "5230.014 Biaya Perizinan Bangunan": {},
+ "5230.015 Biaya Perizinan Kendaraan Dinas": {},
+ "5230.016 Biaya KTR Lain Lain": {},
+ "5230.017 Biaya Stamp Duty & Pos": {}
+ }
+ },
+ "5300.000 Biaya Penyusutan": {
+ "5310.000 Biaya Penyusutan": {
+ "5310.001 By Peny Aktiva ": {
+ "account_type": "Depreciation"
+ }
+ }
+ },
+ "5400.000 Biaya Amortisasi": {
+ "5410.000 Biaya Amortisasi": {}
+ },
+ "5500.000 Beban Lain lain": {
+ "5510.000 Beban Lain lain": {
+ "5510.001 Beban Adm Bank": {},
+ "5510.002 Beban Provisi Pinjaman Bank": {},
+ "5510.003 Beban Notaris Dan ADM Kredit Bank": {},
+ "5510.004 Beban Bunga Kredit Rekening Koran Bank": {},
+ "5510.005 Beban Bunga Pinjaman Pada Pihak Ke 3": {},
+ "5510.006 Beban Pajak Bumi & Bangunan": {},
+ "5510.007 Beban Pajak Penghasilan ": {},
+ "5510.008 Beban Pajak PPN": {},
+ "5510.009 Selisih Pembayaran Customer": {
+ "account_type": "Round Off"
+ },
+ "5510.010 Selisih Kurs": {
+ "account_type": "Round Off"
+ }
+ }
+ },
+ "root_type": "Expense"
+ }
+ }
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/mx_vauxoo_mx_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/mx_plan_de_cuentas.json
similarity index 75%
rename from erpnext/accounts/doctype/account/chart_of_accounts/unverified/mx_vauxoo_mx_chart_template.json
rename to erpnext/accounts/doctype/account/chart_of_accounts/verified/mx_plan_de_cuentas.json
index 3df8dfc..e98c2d6 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/unverified/mx_vauxoo_mx_chart_template.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/mx_plan_de_cuentas.json
@@ -5,15 +5,15 @@
"ACTIVO": {
"ACTIVO CIRCULANTE": {
"DOCUMENTOS Y CUENTAS POR COBRAR": {
- "COMPA\u00d1IAS AFILIADAS Y RELACIONADAS": {},
+ "COMPA\u00d1IAS AFILIADAS Y RELACIONADAS 1": {},
"CUENTAS POR COBRAR ACCIONISTAS": {
- "CUENTAS POR COBRAR SOCIOS": {
+ "CUENTAS POR COBRAR SOCIOS 1": {
"account_type": "Receivable"
}
},
"CUENTAS POR COBRAR EMPLEADOS": {
"ANTICIPO DE NOMINA": {},
- "CUENTAS POR COBRAR EMPLEADOS": {
+ "CUENTAS POR COBRAR EMPLEADOS 1": {
"account_type": "Receivable"
},
"CUENTAS POR COBRAR SOCIOS": {
@@ -21,8 +21,8 @@
},
"PRESTAMOS PERSONALES": {},
"SEGURO DE VEHICULOS": {},
- "UTILIDADES": {},
- "VACACIONES": {},
+ "UTILIDADES 1": {},
+ "VACACIONES 1": {},
"VIATICOS VENDEDORES": {}
},
"CUENTAS POR COBRAR EXTERIOR": {},
@@ -41,10 +41,11 @@
"EFECTOS POR COBRAR": {
"EFECTOS POR COBRAR NACIONALES": {
"account_type": "Receivable"
- }
+ },
+ "account_type": "Receivable"
},
"INTERESES POR COBRAR": {},
- "OTRAS CUENTAS POR COBRAR": {
+ "OTRAS CUENTAS POR COBRAR 1": {
"ADELANTO A PROVEEDORES": {},
"CHEQUES DEVUELTOS": {},
"DEPOSITOS VARIOS": {},
@@ -67,23 +68,29 @@
},
"BANCOS E INTITUCIONES FINANCIERAS": {
"BANCO X MXN": {},
- "BANCO X USD": {}
+ "BANCO X USD": {},
+ "account_type": "Bank"
},
"CAJAS": {
- "CAJA CHICA": {},
- "CAJA PRINCIPAL": {},
- "FONDO A DEPOSITAR": {}
+ "CAJA CHICA": {
+ "account_type": "Cash"
+ },
+ "CAJA PRINCIPAL": {
+ "account_type": "Cash"
+ },
+ "FONDO A DEPOSITAR": {},
+ "account_type": "Cash"
},
"INVERSIONES A CORTO PLAZO": {
"INVERSIONES EN BONOS M.E.": {},
- "INVERSIONES EN BONOS M.N.": {},
+ "INVERSIONES EN BONOS M.N. 1": {},
"INVERSIONES TEMPORALES": {},
"PAPELES COMERCIALES": {}
}
},
"GASTOS OPERACIONALES": {
"GASTOS PREPAGADOS OPERATIVOS": {
- "ALQUILERES": {},
+ "ALQUILERES 1": {},
"PUBLICIDAD": {},
"SEGURO PREPAGADOS": {}
}
@@ -102,40 +109,50 @@
}
},
"INVENTARIOS": {
- "INVENTARIO EN TRANSITO": {
- "MERCANCIA EN TRANSITO": {},
- "MERCANCIA EN TRANSITOS": {}
- },
- "INVENTARIOS DE MERCANCIA": {
- "INVENTARIO FINAL": {},
- "INVENTARIO MERCANCIA ACTUALIZACION DEL VALOR": {},
- "INVENTARIOS DE MERCANCIA EXTERIOR": {},
- "INVENTARIOS DE MERCANCIA NACIONAL": {}
- }
+ "account_type": "Stock",
+ "is_group": 1
}
},
"ACTIVO LARGO PLAZO": {
"ACTIVO FIJO NETO": {
"ACTIVO FIJO": {
- "INMUEBLES COSTO ORIGINAL": {},
+ "INMUEBLES COSTO ORIGINAL": {
+ "account_type": "Fixed Asset"
+ },
"LICENCIA Y SOFTWARE COSTO ORIGINAL": {},
- "MAQUINARIAS Y EQUIPOS COSTO ORIGINAL": {},
- "MUEBLES Y ENSERES COSTO ORIGINAL": {},
+ "MAQUINARIAS Y EQUIPOS COSTO ORIGINAL": {
+ "account_type": "Fixed Asset"
+ },
+ "MUEBLES Y ENSERES COSTO ORIGINAL": {
+ "account_type": "Fixed Asset"
+ },
"TERRENO COSTO ORIGINAL": {},
- "VEHICULOS COSTO ORIGINAL": {}
+ "VEHICULOS COSTO ORIGINAL": {
+ "account_type": "Fixed Asset"
+ },
+ "account_type": "Fixed Asset"
},
"DEPRECIACION Y AMORTIZACION ACUMULADAS": {
- "INMUEBLES COSTO ORIGINAL": {},
- "LICENCIA Y SOFTWARE COSTO ORIGINAL": {},
- "MAQUINARIAS Y EQUIPOS COSTO ORIGINAL": {},
+ "INMUEBLES COSTO ORIGINAL 1": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "LICENCIA Y SOFTWARE COSTO ORIGINAL 1": {},
+ "MAQUINARIAS Y EQUIPOS COSTO ORIGINAL 1": {
+ "account_type": "Accumulated Depreciation"
+ },
"MEJORAS A PROPIEDAD COSTO ORIGINAL": {},
- "MUEBLES Y ENSERES COSTO ORIGINAL": {},
+ "MUEBLES Y ENSERES COSTO ORIGINAL 1": {
+ "account_type": "Accumulated Depreciation"
+ },
"TERRENOS COSTO ORIGINAL": {},
- "VEHICULOS COSTO ORIGINAL": {}
+ "VEHICULOS COSTO ORIGINAL 1": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "account_type": "Accumulated Depreciation"
}
},
"CARGOS DIFERIDOS": {
- "CARGOS DIFERIDOS": {
+ "CARGOS DIFERIDOS 1": {
"GASTOS DE CONSTITUCION": {},
"MARCA DE FABRICA": {},
"OTRAS CUENTAS POR COBRAR": {
@@ -145,7 +162,7 @@
},
"IMPUESTOS DIFERIDOS": {
"IMPUESTOS DIFERIDOS ISR ": {
- "IMPUESTOS DIFERIDOS ISR ": {}
+ "IMPUESTOS DIFERIDOS ISR 1": {}
}
},
"INVERSIONES LARGO PLAZO": {
@@ -156,44 +173,44 @@
}
},
"OTROS ACTIVOS": {
- "OTROS ACTIVOS": {
+ "OTROS ACTIVOS 1": {
"DEPOSITOS GARANTIA ARRENDAMIENTO LOCAL": {},
"DEPOSITOS GARANTIA BANCOS": {},
"DEPOSITOS GARANTIA PROVEEDORES": {}
}
}
},
- "root_type": ""
+ "root_type": "Asset"
},
"CAPITAL": {
"CAPITAL SOCIAL": {
"ACCIONES EN TESORERIA": {
- "ACCIONES EN TESORERIA": {
- "ACCIONES EN TESORERIA": {},
+ "ACCIONES EN TESORERIA 1": {
+ "ACCIONES EN TESORERIA 2": {},
"ACTUALIZACION DE VALOR": {}
}
},
"CAPITAL SOCIAL PAGADO": {
- "CAPITAL SOCIAL PAGADO": {
- "ACTUALIZACION DEL VALOR": {},
- "CAPITAL SOCIAL": {}
+ "CAPITAL SOCIAL PAGADO 1": {
+ "ACTUALIZACION DEL VALOR 1": {},
+ "CAPITAL SOCIAL 1": {}
}
}
},
"GANANCIAS Y PERDIDAS": {
"GANACIAS Y PERDIDAS": {
- "GANACIAS Y PERDIDAS": {}
+ "GANACIAS Y PERDIDAS 1": {}
}
},
"RESERVA DE CAPITAL": {
"OTRAS RESERVAS": {
- "OTRAS RESERVAS": {
+ "OTRAS RESERVAS 1": {
"ACTUALIZACION DEL VALOR": {},
"VALOR ORIGINAL": {}
}
},
"RESERVA LEGAL": {
- "RESERVA LEGAL": {
+ "RESERVA LEGAL 1": {
"RESERVA P/FUTURO AUMENTO DE CAPITAL": {},
"VALOR ORIGINAL RESERVA LEGAL": {}
}
@@ -201,7 +218,7 @@
},
"SUPERAVIT": {
"RESULT.POR TENDENCIA DE ACTIVO NO MONETARIOS": {
- "RESULT.POR TENDENCIA DE ACTIVO NO MONETARIOS": {}
+ "RESULT.POR TENDENCIA DE ACTIVO NO MONETARIOS 1": {}
},
"SUPERAVIT GANADO": {
"RESULTADO POR EXPOS. A LA INFLACION": {
@@ -215,22 +232,21 @@
}
}
},
- "root_type": ""
+ "root_type": "Equity"
},
"COSTO": {
- "COSTO DE VENTAS": {
- "COSTO DE VENTAS": {
- "COSTO DE VENTAS": {
- "COSTO DE VENTAS": {}
- }
- }
+ " Gastos incluidos en la valoraci\u00f3n": {
+ "account_type": "Expenses Included In Valuation"
},
- "root_type": ""
+ "COSTO DE VENTAS": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "root_type": "Expense"
},
"CUENTAS DE ORDEN": {
- "CUENTAS DE ORDEN": {
+ "CUENTAS DE ORDEN 1": {
"CUENTAS DE ORDEN DEUDORAS": {
- "CUENTAS DE ORDEN DEUDORAS": {
+ "CUENTAS DE ORDEN DEUDORAS 1": {
"CARTAS DE CREDITOS": {},
"MERCANCIAS COMPRADAS EN TRANSITO": {},
"MERCANCIAS EN CONSIGNACION": {}
@@ -238,14 +254,14 @@
}
},
"CUENTAS DE ORDEN ACREEDORAS": {
- "CUENTAS DE ORDEN ACREEDORAS": {
- "CUENTAS DE ORDEN ACREEDORAS": {
+ "CUENTAS DE ORDEN ACREEDORAS 1": {
+ "CUENTAS DE ORDEN ACREEDORAS 2": {
"MERCANCIA EN CONSIGNACION P. COMPRA": {},
"MERCANCIA VENDIDAS EN TRANSITO": {}
}
}
},
- "root_type": ""
+ "root_type": "Asset"
},
"GASTOS": {
"GASTOS OPERATIVOS": {
@@ -256,10 +272,19 @@
"DEPRECIACION": {
"INMUEBLES": {},
"LICENCIA Y SOFTWARE": {},
- "MAQUINARIAS Y EQUIPOS": {},
- "MEJORAS A PROPIEDAD": {},
- "MUEBLES Y ENSERES": {},
- "VEHICULOS": {}
+ "MAQUINARIAS Y EQUIPOS": {
+ "account_type": "Depreciation"
+ },
+ "MEJORAS A PROPIEDAD": {
+ "account_type": "Depreciation"
+ },
+ "MUEBLES Y ENSERES": {
+ "account_type": "Depreciation"
+ },
+ "VEHICULOS": {
+ "account_type": "Depreciation"
+ },
+ "account_type": "Depreciation"
}
},
"GASTOS COMERCIALIZACION": {
@@ -270,10 +295,10 @@
"EVENTOS ESPECIALES": {},
"MATERIALES PROMOCIONALES": {},
"MEDIOS": {},
- "PATENTE INDUSTRIA Y COMERCIO": {},
+ "PATENTE INDUSTRIA Y COMERCIO 1": {},
"PRODUCCION MATERIAL P.O.P.": {},
"PROMOCIONES": {},
- "PUBLICIDAD": {},
+ "PUBLICIDAD 1": {},
"TRANSPORTE Y FLETES": {}
}
},
@@ -285,7 +310,7 @@
"BENEFICIOS COMEDOR": {},
"BENEFICIOS SERVICIOS MEDICOS": {},
"BENEFICIOS UNIFORMES": {},
- "BONIFICACION UNICA ESPECIAL": {},
+ "BONIFICACION UNICA ESPECIAL 1": {},
"BONO VACACIONAL": {},
"COMISION AL PERSONAL": {},
"CONTRIBUCIONES": {},
@@ -294,23 +319,27 @@
"HONORARIOS POR PARTIPACION JUNTA DIRECTIVA": {},
"HORAS EXTRAORDINARIAS": {},
"HORAS EXTRAS": {},
- "INTERESES S/PRESTACIONES SOCIALES": {},
- "PRESTACIONES SOCIALES": {},
+ "INTERESES S/PRESTACIONES SOCIALES 2": {},
+ "PRESTACIONES SOCIALES 1": {},
"PRIMA POR RENDIMIENTO": {},
"PROGRAMA DE ALIMENTACION EMPLEADOS": {},
"SUELDOS DIRECTIVOS": {},
"SUELDOS EMPLEADOS": {},
"TRANSPORTE Y ALIMENTACION": {},
- "UTILIDADES": {},
- "VACACIONES": {},
+ "UTILIDADES 2": {},
+ "VACACIONES 2": {},
"VIATICOS Y GASTOS DE REPRESENTACION": {}
}
},
"GASTOS GENERALES": {
- "GASTOS GENERALES": {
+ "GASTOS GENERALES 1": {
"AGUA POTABLE Y REFRIGERIO": {},
- "AJUSTE DE INVENTARIOS DONADOS": {},
- "AJUSTE DE INVENTARIOS OBSOLETOS": {},
+ "AJUSTE DE INVENTARIOS DONADOS": {
+ "account_type": "Stock Adjustment"
+ },
+ "AJUSTE DE INVENTARIOS OBSOLETOS": {
+ "account_type": "Stock Adjustment"
+ },
"ARRENDAMIENTO": {},
"ARTICULOS DE OFICINA": {},
"ASEO URBANO": {},
@@ -320,7 +349,7 @@
"BONIFICACION UNICA ESPECIAL": {},
"COMBUSTIBLES": {},
"COMIDAS, VIAJES Y TRASLADOS": {},
- "CONDOMINIOS": {},
+ "CONDOMINIOS 1": {},
"CONVENSION DE COMERCIALIZACION": {},
"DERECHO DE FRENTE": {},
"ENERGIA ELECTRICA": {},
@@ -342,7 +371,7 @@
"REMANENTES DISTRIBUIBLES": {},
"REPARACIONES": {},
"REPAROS": {},
- "SEGUROS": {},
+ "SEGUROS 1": {},
"SERVICIOS CONTRATADOS A TERCEROS": {},
"SERVICIOS DE PUBLICIDAD": {},
"SERVICIOS PUBLICOS": {},
@@ -356,17 +385,17 @@
}
}
},
- "root_type": ""
+ "root_type": "Expense"
},
"INGRESOS": {
"INGRESOS OPERACIONALES": {
- "INGRESOS OPERACIONALES": {
+ "INGRESOS OPERACIONALES 1": {
"DESCUENTOS Y DEVOLUCION EN VENTAS": {
"DESCUENTOS EN VENTAS": {},
"DEVOLUCIONES EN VENTAS": {}
},
"INGRESOS POR SERVICIOS": {
- "INGRESOS POR SERVICIOS": {}
+ "INGRESOS POR SERVICIOS 1": {}
},
"VENTAS": {
"VENTAS EXPORTACION": {},
@@ -376,7 +405,7 @@
}
}
},
- "root_type": ""
+ "root_type": "Income"
},
"OTROS INGRESOS (EGRESOS)": {
"EGRESOS": {
@@ -384,17 +413,17 @@
"EGRESOS NO GRAVABLES": {
"IMPUESTOS A LAS TRANSACIONES FINANCIERAS": {}
},
- "GASTOS FINANCIEROS": {
+ "GASTOS FINANCIEROS 1": {
"COMISIONES TICKET DE ALIMENTACION": {},
"COMISIONES Y GASTOS BANCARIOS": {},
"INTERESES BANCOS NACIONALES": {},
"INTERESES POR FINANCIAMIENTOS": {},
"OTROS EGRESOS": {}
},
- "OTROS EGRESOS": {
+ "OTROS EGRESOS 1": {
"AJUSTE DE A\u00d1OS ANTERIORES": {},
"FLUCTUACION CAMBIARIA NO REALIZADAS": {},
- "INTERESES S/PRESTACIONES SOCIALES": {},
+ "INTERESES S/PRESTACIONES SOCIALES 1": {},
"PERDIDA POR ROBO DE INVENTARIO": {},
"PERDIDAS EN DIFERENCIAL CAMBIARIO": {},
"PERDIDAS EN INVERSIONES DE BONOS P.": {},
@@ -404,26 +433,29 @@
}
},
"OTROS INGRESOS": {
- "OTROS INGRESOS": {
+ "OTROS INGRESOS 1": {
"INGRESOS FINANCIEROS": {
"INTERESES DE BANCOS EXTRANJEROS": {},
"INTERESES DE BANCOS NACIONALES": {},
"OTROS INGRESOS FINANCIEROS": {}
},
- "OTROS INGRESOS": {
+ "OTROS INGRESOS 2": {
"GANANCIAS EN DIFERENCIAL CAMBIARIO": {},
"GANANCIAS EN VENTAS DE ACTIVOS FIJOS": {},
"GANANCIAS EN VENTAS DE INVERSIONES": {},
"INTERESES VARIOS": {},
- "OTROS INGRESOS": {}
+ "OTROS INGRESOS 3": {}
}
}
},
- "root_type": ""
+ "root_type": "Income"
},
"PASIVO": {
+ " Stock recibidas, pero no facturada": {
+ "account_type": "Stock Received But Not Billed"
+ },
"OTROS PASIVOS A CORTO PLAZO": {
- "OTROS PASIVOS A CORTO PLAZO": {
+ "OTROS PASIVOS A CORTO PLAZO 1": {
"IMPUESTOS POR PAGAR": {
"1% DE RET CEDULAR ARRENDAMIETOS (GUANAJUATO)": {},
"10% ISR RETENIDO ARRENDAMIENTO": {},
@@ -443,19 +475,15 @@
"PASIVO A CORTO PLAZO": {
"ACUMULACIONES LABORALES": {
"APORTES EMPLEADOS": {
- "APORTES EMPLEADOS": {},
+ "APORTES EMPLEADOS 1": {},
"FONDO DE AHORRO": {},
"FONDO FIDEICOMISO": {}
}
},
"DIVIDENDO POR PAGAR": {
- "DIVIDENDO POR PAGAR": {
- "DIVDENDO POR COBRAR NO COBRADOS": {
- "account_type": "Receivable"
- },
- "DIVIDENDO POR PAGAR VIGENTES": {
- "account_type": "Payable"
- }
+ "DIVIDENDO POR PAGAR 1": {
+ "DIVDENDO POR COBRAR NO COBRADOS": {},
+ "DIVIDENDO POR PAGAR VIGENTES": {}
}
},
"DOCUMENTOS Y CUENTAS POR PAGAR": {
@@ -463,7 +491,8 @@
"CUENTAS POR PAGAR ACCIONISTAS": {
"CUENTAS POR PAGAR SOCIOS": {
"account_type": "Payable"
- }
+ },
+ "account_type": "Payable"
},
"PROVEEDORES EXTRANJEROS": {},
"PROVEEDORES OCASIONALES": {
@@ -475,8 +504,10 @@
},
"TARJETA DE CREDITO X": {
"account_type": "Payable"
- }
- }
+ },
+ "account_type": "Payable"
+ },
+ "account_type": "Payable"
},
"GASTOS ACUMULADOS Y RETENCIONES POR PAGAR": {
"CONTRIBUCIONES PATRONAL": {
@@ -492,8 +523,8 @@
"IMPUESTOS MUNICIPALES POR PAGAR": {
"account_type": "Payable"
},
- "IMPUESTOS POR PAGAR": {
- "account_type": "Payable"
+ "IMPUESTOS POR PAGAR 1": {
+ "account_type": "Tax"
},
"INTERESES S/PRESTACIONES SOCIALES": {},
"NOMINA POR PAGAR": {
@@ -525,7 +556,7 @@
"IMPUESTOS SOBRE LA RENTA POR PAGAR": {
"ISR ACUMULADOS GASTOS": {
"DECLARACION ESTIMADAS": {},
- "ISR ACUMULADOS GASTOS": {},
+ "ISR ACUMULADOS GASTOS 1": {},
"RAR AJUSTE INICIAL POR INFLACION": {}
}
},
@@ -535,7 +566,7 @@
}
},
"RESERVAS": {
- "RESERVAS": {
+ "RESERVAS 1": {
"RESERVAS FINANCIERAS": {},
"RESERVAS FISCALES": {},
"RESERVAS OPERATIVAS": {}
@@ -550,22 +581,22 @@
}
},
"OTROS PASIVOS A LARGO PLAZO": {
- "OTROS PASIVOS A LARGO PLAZO": {
- "OTROS PASIVOS A LARGO PLAZO": {}
+ "OTROS PASIVOS A LARGO PLAZO 1": {
+ "OTROS PASIVOS A LARGO PLAZO 2": {}
}
},
"PASIVOS FINANCIEROS A LARGO PLAZO": {
- "PASIVOS FINANCIEROS A LARGO PLAZO": {
- "PASIVOS FINANCIEROS A LARGO PLAZO": {}
+ "PASIVOS FINANCIEROS A LARGO PLAZO 1": {
+ "PASIVOS FINANCIEROS A LARGO PLAZO 2": {}
}
},
"PASIVOS INTERCOMPA\u00d1IAS": {
- "PASIVOS INTERCOMPA\u00d1IAS": {
- "PASIVOS INTERCOMPA\u00d1IAS": {}
+ "PASIVOS INTERCOMPA\u00d1IAS 1": {
+ "PASIVOS INTERCOMPA\u00d1IAS 2": {}
}
}
},
- "root_type": ""
+ "root_type": "Liability"
}
}
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_catalogo_de_cuentas.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_catalogo_de_cuentas.json
new file mode 100644
index 0000000..e8402d6
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_catalogo_de_cuentas.json
@@ -0,0 +1,494 @@
+{
+ "country_code": "ni",
+ "name": "Nicaragua - Catalogo de Cuentas",
+ "tree": {
+ "Activo": {
+ "Activo Corriente": {
+ "Activos Financieros Realizables a Corto Plazo": {
+ "Bonos y Acciones Disponibles para la Venta": {},
+ "Certificados Bancarios": {},
+ "Inversiones a Corto Plazo": {},
+ "Otros Valores Negociables a Corto Plazo": {}
+ },
+ "Cuentas y Documentos por Cobrar a Clientes": {
+ "Cuentas por Cobrar Moneda Extrangera": {
+ "account_type": "Receivable"
+ },
+ "Cuentas por Cobrar Moneda Nacional": {
+ "account_type": "Receivable"
+ },
+ "Cuentas por Cobrar por Exportaciones": {
+ "account_type": "Receivable"
+ },
+ "Documentos por Cobrar Moneda Extrangera": {
+ "account_type": "Receivable"
+ },
+ "Documentos por Cobrar Moneda Nacional": {
+ "account_type": "Receivable"
+ },
+ "Estimacion para Cuentas Incobrables": {}
+ },
+ "Efectivo en Caja y Bancos": {
+ "Caja": {
+ "Caja Chica Moneda Extrangera": {
+ "account_type": "Cash"
+ },
+ "Caja Chica Moneda Nacional": {
+ "account_type": "Cash"
+ },
+ "Caja General Moneda Extrangera": {
+ "account_type": "Cash"
+ },
+ "Caja General Moneda Nacional": {
+ "account_type": "Cash"
+ },
+ "Fondos por Depositar": {
+ "account_type": "Cash"
+ }
+ },
+ "Cuentas Bancarias": {
+ "Cuenta Corriente Moneda Extrangera": {
+ "account_type": "Bank"
+ },
+ "Cuenta Corriente Moneda Nacional": {
+ "account_type": "Bank"
+ },
+ "account_type": "Bank"
+ },
+ "Otros Equivalentes a Efectivo": {
+ "account_type": "Cash",
+ "is_group": 1
+ }
+ },
+ "Impuestos Acreditables": {
+ "Anticipos de IR o Pago Minimo Definitivo": {},
+ "Impuesto a Valor Agregado Acreditable": {
+ "Acreditacion Proporcional": {},
+ "IVA Acreditable por Compra de Bienes": {
+ "account_type": "Tax"
+ },
+ "IVA Acreditable por Importaciones": {
+ "account_type": "Tax"
+ },
+ "IVA Acreditable por Prestacion de Servicios y Uso y Goce de Bienes": {
+ "account_type": "Tax"
+ }
+ },
+ "Retenciones Definitivas Sobre Rentas o Ganancias de Capital": {},
+ "Retenciones a Cuenta de IMI Acreditables": {},
+ "Retenciones a Cuenta de IR Acreditables": {
+ "Retencion Operaciones Targeta Debito/Credito 1.5%": {
+ "account_type": "Tax"
+ },
+ "Retencion por V/Bienes o P/Servicios 2%": {
+ "account_type": "Tax"
+ }
+ }
+ },
+ "Inventarios": {
+ "Ajuste de Inventarios": {
+ "account_type": "Stock Adjustment"
+ },
+ "Todos los Almacenes": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "account_type": "Stock"
+ },
+ "Otras Cuentas por Cobrar": {
+ "account_type": "Receivable",
+ "is_group": 1
+ }
+ },
+ "Activo no Corriente": {
+ "Activo por Impuestos Diferidos": {
+ "is_group": 1
+ },
+ "Activos Intangibles": {
+ "Amortizacion de Activos Intangibles": {
+ "is_group": 1
+ },
+ "Concesiones": {
+ "is_group": 1
+ },
+ "Derechos de Autor": {
+ "is_group": 1
+ },
+ "Deterioro de Valor de Activos Intangibles": {},
+ "Gastos de investigacion": {
+ "is_group": 1
+ },
+ "Licencias": {
+ "is_group": 1
+ },
+ "Marcas Registradas": {
+ "is_group": 1
+ },
+ "Patentes": {
+ "is_group": 1
+ }
+ },
+ "Amortizables": {
+ "Amortizacion de Activos Amortizables": {},
+ "Deterioro de Valaor de Activos Amortizables": {},
+ "Gastos Pre Operativos": {
+ "account_type": "Expenses Included In Valuation"
+ },
+ "Gastos de Consitucion": {
+ "account_type": "Expenses Included In Valuation"
+ },
+ "Mejoras en Bienes Arrendados": {
+ "is_group": 1
+ }
+ },
+ "Bienes en Arrendamiento Financiero": {
+ "Equipos y Maquinaria en Arrendamiento": {},
+ "Locales y Edificios en Arrendamiento": {}
+ },
+ "Cuentas por Cobrar a Largo Plazo": {
+ "Creditos a Largo Plazo": {
+ "is_group": 1
+ }
+ },
+ "Inversiones Permanentes": {
+ "Inversiones Permanentes 1": {
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ },
+ "Negocios Conjuntos": {
+ "account_type": "Fixed Asset",
+ "is_group": 1
+ }
+ },
+ "Inversiones a Largo Plazo": {
+ "Depositos Bancarios a Plazo": {
+ "is_group": 1
+ },
+ "Intereses percibidos por adelantado": {
+ "is_group": 1
+ },
+ "Titulos y Acciones": {
+ "is_group": 1
+ }
+ },
+ "Propiedad Planta y Equipo": {
+ "Almacenes": {},
+ "Depresiacion Acumulada": {
+ "account_type": "Depreciation"
+ },
+ "Edificios": {},
+ "Equipo de Computo": {},
+ "Maquinaria Industrial": {},
+ "Mobiliario y Equipo de Oficinas": {},
+ "Otra Bienes Mobiliarios": {
+ "account_type": "Fixed Asset"
+ },
+ "Otros Activos Inmobiliarios": {},
+ "Parque Vehicular": {},
+ "Terrenos": {},
+ "account_type": "Fixed Asset"
+ }
+ },
+ "root_type": "Asset"
+ },
+ "Capital y Patrimonio": {
+ "Aporte de Socios": {
+ "Capital": {
+ "Capital Social Pagado": {
+ "account_type": "Equity"
+ },
+ "Capital Social no Pagado": {
+ "account_type": "Equity"
+ }
+ }
+ },
+ "Donaciones": {
+ "is_group": 1
+ },
+ "Ganancias Acumuladas": {
+ "Reservas": {
+ "Reservas Legales": {
+ "account_type": "Equity"
+ },
+ "Reservas Voluntarias": {
+ "account_type": "Equity"
+ }
+ },
+ "Resultados": {
+ "Ajustes a Periodos Anteriores": {
+ "account_type": "Equity"
+ },
+ "Resultado del ejercicio": {
+ "account_type": "Equity"
+ },
+ "Resultados Acumulados": {
+ "account_type": "Equity"
+ }
+ }
+ },
+ "root_type": "Equity"
+ },
+ "Costos y Gastos": {
+ "Costo de Venta": {
+ "Costo de Bienes": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "Costo de Produccion": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "Costo de Servicios": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "account_type": "Cost of Goods Sold"
+ },
+ "Costos y Gastos No Deducibles": {},
+ "Gastopor Depreciacion": {
+ "account_type": "Depreciation"
+ },
+ "Gastos de Administracion": {
+ "Alquileres": {},
+ "Amortizaciones": {},
+ "Ayuda a Empleados": {},
+ "Capacitacion al Personal": {},
+ "Combustible": {},
+ "Cuentas Incobrables": {},
+ "Donaciones 1": {},
+ "Fletes y Correos": {},
+ "Gastos Varios": {},
+ "IVA Proporcional no Acreditado": {},
+ "Impuesto Municipal": {},
+ "Inatec": {},
+ "Indemnizacion": {},
+ "Mantenimiento y Reparaciones": {},
+ "Matricula": {},
+ "Papeleria": {},
+ "Recoleccion de Basura": {},
+ "Representacion": {},
+ "Seguros": {},
+ "Servicios Basicos": {
+ "Agua Potable": {},
+ "Celular": {},
+ "Costos por Servicios WEB": {},
+ "Energia Electrica": {},
+ "Internet": {},
+ "Telefono Fijo": {}
+ },
+ "Uniformes": {},
+ "Vigilancia": {}
+ },
+ "Gastos de Ventas": {
+ "Fletes": {},
+ "Mercadeo": {},
+ "Muestras Gratis": {},
+ "Promociones": {},
+ "Publicidad": {},
+ "Regalosa Clientes": {}
+ },
+ "Gastos por Salarios y Otras Compensaciones": {},
+ "Gastos por Servicios Profesionales y Tecnicos": {},
+ "Impuesto por Rentas y Ganancias de Capital": {},
+ "Impuesto sobre la Rentade Activividades Economicas": {},
+ "Otros Gastos": {
+ "Certificacion de Cheques y Chequeras": {},
+ "Perdida Cambiario": {},
+ "P\u00e9rdida en Venta de Activo Fijo": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "Siniestros": {}
+ },
+ "root_type": "Expense"
+ },
+ "Ingresos": {
+ "Ingresos no Grabables": {
+ "Ingreso por Rentas y Ganacias de Capital sujetas a Retencion Definitiva": {},
+ "Interes Bancarios": {},
+ "Otros Ingresos no Grabables": {}
+ },
+ "Otros Ingresos Grabables": {
+ "Ganacia Cambiaria": {},
+ "Otros Ingresos Grabables 1": {},
+ "Sobrante en Arqueo de Caja": {}
+ },
+ "Ventas": {
+ "Venta de Bienes o Prestacion de Servicios Exentos": {},
+ "Venta de Bienes o Prestacion de Servicios Exonerados": {},
+ "Venta de Bienes o Prestacion de Servicios Grabados": {},
+ "Venta por Exportaciones": {}
+ },
+ "root_type": "Income"
+ },
+ "Pasivo": {
+ "Obligaciones por Arrendamiento Financiero a Largo Plazo": {
+ "is_group": 1
+ },
+ "Pasivo Corriente": {
+ "Anticipos de Clientes": {},
+ "Cuentas por Pagar Proveedores": {
+ "Bienes Adquiridos no Pagados": {
+ "account_type": "Stock Received But Not Billed"
+ },
+ "Cuentas por Pagar Moneda Extrangera": {
+ "account_type": "Payable"
+ },
+ "Cuentas por Pagar Moneda Nacional": {
+ "account_type": "Payable"
+ },
+ "Cuentas por Pagar por Importaciones": {
+ "account_type": "Payable"
+ },
+ "Documentos por Pagar Moneda Extrangera": {
+ "account_type": "Payable"
+ },
+ "Documentos por Pagar Moneda Nacional": {
+ "account_type": "Payable"
+ }
+ },
+ "Gastos por Pagar": {
+ "Prestaciones Sociales": {
+ "is_group": 1
+ },
+ "Salarios por Pagar": {},
+ "Servicios Basicos 1": {
+ "is_group": 1
+ }
+ },
+ "Impuestos por Pagar": {
+ "Impuesto al Valor Agregado por Pagar": {
+ "account_type": "Tax"
+ },
+ "Impuesto sobre la Renta por Actividades Economicas": {
+ "account_type": "Tax"
+ },
+ "Impuestos Municipales": {
+ "Impuesto Municipal Sobre Ingresos": {
+ "account_type": "Tax"
+ },
+ "Matricula Municipal": {
+ "account_type": "Tax"
+ },
+ "Recoleccion Basura": {
+ "account_type": "Tax"
+ }
+ }
+ },
+ "Otras Cuentas por Pagar": {
+ "is_group": 1
+ },
+ "Pasivos Financieros a Corto Plazo": {
+ "Otras Deudas Bancarias": {
+ "is_group": 1
+ },
+ "Prestamos por Pagar a Corto Plazo": {
+ "is_group": 1
+ },
+ "Sobregiros Bancarios": {
+ "is_group": 1
+ }
+ },
+ "Provisiones por Pagar": {
+ "Pasivos Laborales": {
+ "Aguinaldo por Pagar": {},
+ "Indemnizacion Laboral": {}
+ },
+ "Reclamos por Pagar": {},
+ "Responsabilidad frente a terceros": {}
+ },
+ "Retenciones por Pagar": {
+ "Rentas de Actividades Economicas": {
+ "Otras Retenciones 10%": {
+ "account_type": "Tax"
+ },
+ "Retencion 10% Servicios Profesionales": {
+ "account_type": "Tax"
+ },
+ "Retencion 2% por C/Bienes o P/Servicios": {
+ "account_type": "Tax"
+ },
+ "Retencion 3% compra Bienes Agropecuarios": {
+ "account_type": "Tax"
+ },
+ "Retencion 5% compra Madera en Rollo": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 1.5% Actividades Economicas No Residentes": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 10% Actividades Economicas No Residentes": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 15% Actividades Economicas No Residentes": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 3% Actividades Economicas No Residentes": {
+ "account_type": "Tax"
+ }
+ },
+ "Rentas del Trabajo": {
+ "Retencion Definitiva 10% por Rentas del Trabajo - Indemnizacion Adicional": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 12.5% por Rentas del Trabajo - Dietas": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 15% por Rentas del Trabajo - No Residentes": {
+ "account_type": "Tax"
+ },
+ "Retencion Rentas del Trabajo Tarifa Progresiva": {
+ "account_type": "Tax"
+ }
+ },
+ "Rentas y Ganancias de Capital": {
+ "Retencion Definitiva 0.25% Transacciones Bursatiles": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 1% Transacciones Bursatiles": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 1.5% Transacciones Bursatiles": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 10% por Ganancia de Capital": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 2% Transacciones Bursatiles": {
+ "account_type": "Tax"
+ },
+ "Retencion Definitiva 5% por Rentas de Capital": {
+ "account_type": "Tax"
+ },
+ "Retencion Defintiva 10% por Rentas de Capital": {
+ "account_type": "Tax"
+ },
+ "Retencion Defintiva 15% por Rentas de Capital": {
+ "account_type": "Tax"
+ },
+ "Retenciones Defintiva 5% Fondos de Inversion": {
+ "account_type": "Tax"
+ }
+ },
+ "Retencion 17% Operaciones con Paraisos Fiscales": {
+ "account_type": "Tax"
+ }
+ }
+ },
+ "Pasivo No Corriente": {
+ "Cuentas por Pagar a Largo Plaso": {
+ "is_group": 1
+ },
+ "Otras Cuentas por Pagar a Largo Plazo": {
+ "is_group": 1
+ },
+ "Otros Pasivos Financieros a Largo Plaso": {
+ "is_group": 1
+ },
+ "Prestamos a Largo Plazo": {
+ "is_group": 1
+ }
+ },
+ "Pasivo por Impuestos Diferidos": {
+ "is_group": 1
+ },
+ "root_type": "Liability"
+ }
+ }
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json
deleted file mode 100644
index 9cd7e59..0000000
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/ni_ni_chart_template.json
+++ /dev/null
@@ -1,466 +0,0 @@
-{
- "country_code": "ni",
- "name": "Nicaragua - Catalogo de Cuentas",
- "tree": {
- "Activo": {
- "Activo Corriente": {
- "Efectivo en Caja y Bancos": {
- "Caja": {
- "Caja General Moneda Nacional": {
- "account_type": "Cash"
- },
- "Caja General Moneda Extrangera": {
- "account_type": "Cash"
- },
- "Caja Chica Moneda Nacional": {
- "account_type": "Cash"
- },
- "Caja Chica Moneda Extrangera": {
- "account_type": "Cash"
- },
- "Fondos por Depositar": {
- "account_type": "Cash"
- }
- },
- "Cuentas Bancarias": {
- "Cuenta Corriente Moneda Nacional": {
- "account_type": "Bank"
- },
- "Cuenta Corriente Moneda Extrangera": {
- "account_type": "Bank"
- }
- },
- "Otros Equivalentes a Efectivo": {
- "is_group": 1,
- "account_type": "Cash"
- }
- },
- "Activos Financieros Realizables a Corto Plazo": {
- "Inversiones a Corto Plazo": {},
- "Bonos y Acciones Disponibles para la Venta": {},
- "Certificados Bancarios": {},
- "Otros Valores Negociables a Corto Plazo": {}
- },
- "Cuentas y Documentos por Cobrar a Clientes": {
- "Cuentas por Cobrar Moneda Nacional": {
- "account_type": "Receivable"
- },
- "Cuentas por Cobrar Moneda Extrangera": {
- "account_type": "Receivable"
- },
- "Documentos por Cobrar Moneda Nacional": {
- "account_type": "Receivable"
- },
- "Documentos por Cobrar Moneda Extrangera": {
- "account_type": "Receivable"
- },
- "Cuentas por Cobrar por Exportaciones": {
- "account_type": "Receivable"
- },
- "Estimacion para Cuentas Incobrables": {}
- },
- "Inventarios": {
- "is_group": 1,
- "account_type": "Stock"
- },
- "Impuestos Acreditables": {
- "Impuesto a Valor Agregado Acreditable": {
- "IVA Acreditable por Compra de Bienes": {
- "account_type": "Tax"
- },
- "IVA Acreditable por Importaciones": {
- "account_type": "Tax"
- },
- "IVA Acreditable por Prestacion de Servicios y Uso y Goce de Bienes": {
- "account_type": "Tax"
- },
- "Acreditacion Proporcional": {}
- },
- "Anticipos de IR o Pago Minimo Definitivo": {},
- "Retenciones a Cuenta de IR Acreditables": {
- "Retencion por V/Bienes o P/Servicios 2%": {
- "account_type": "Tax"
- },
- "Retencion Operaciones Targeta Debito/Credito 1.5%": {
- "account_type": "Tax"
- }
- },
- "Retenciones a Cuenta de IMI Acreditables": {},
- "Retenciones Definitivas Sobre Rentas o Ganancias de Capital": {}
- },
- "Otras Cuentas por Cobrar": {
- "is_group": 1,
- "account_type": "Receivable"
- }
- },
- "Activo no Corriente": {
- "Propiedad Planta y Equipo": {
- "Terrenos": {},
- "Edificios": {},
- "Almacenes": {},
- "Otros Activos Inmobiliarios": {},
- "Parque Vehicular": {},
- "Equipo de Computo": {},
- "Mobiliario y Equipo de Oficinas": {},
- "Maquinaria Industrial": {},
- "Otra Bienes Mobiliarios": {},
- "Depresiacion Acumulada": {},
- "account_type": "Fixed Asset"
- },
- "Inversiones Permanentes": {
- "Inversiones Permanentes": {
- "is_group": 1,
- "account_type": "Fixed Asset"
- },
- "Negocios Conjuntos": {
- "is_group": 1,
- "account_type": "Fixed Asset"
- }
- },
- "Bienes en Arrendamiento Financiero": {
- "Locales y Edificios en Arrendamiento": {},
- "Equipos y Maquinaria en Arrendamiento": {}
- },
- "Activos Intangibles": {
- "Patentes": {
- "is_group": 1
- },
- "Marcas Registradas": {
- "is_group": 1
- },
- "Derechos de Autor": {
- "is_group": 1
- },
- "Concesiones": {
- "is_group": 1
- },
- "Licencias": {
- "is_group": 1
- },
- "Gastos de investigacion": {
- "is_group": 1
- },
- "Amortizacion de Activos Intangibles": {
- "is_group": 1
- },
- "Deterioro de Valor de Activos Intangibles": {}
- },
- "Amortizables": {
- "Gastos de Consitucion": {},
- "Gastos Pre Operativos": {},
- "Mejoras en Bienes Arrendados": {
- "is_group": 1
- },
- "Amortizacion de Activos Amortizables": {},
- "Deterioro de Valaor de Activos Amortizables": {}
- },
- "Cuentas por Cobrar a Largo Plazo": {
- "Creditos a Largo Plazo": {
- "is_group": 1
- }
- },
- "Inversiones a Largo Plazo": {
- "Depositos Bancarios a Plazo": {
- "is_group": 1
- },
- "Intereses percibidos por adelantado": {
- "is_group": 1
- },
- "Titulos y Acciones": {
- "is_group": 1
- }
- },
- "Activo por Impuestos Diferidos": {
- "is_group": 1
- }
- },
- "root_type": "Asset"
- },
- "Pasivo": {
- "Pasivo Corriente": {
- "Cuentas por Pagar Proveedores": {
- "Cuentas por Pagar Moneda Nacional": {
- "account_type": "Payable"
- },
- "Cuentas por Pagar Moneda Extrangera": {
- "account_type": "Payable"
- },
- "Documentos por Pagar Moneda Nacional": {
- "account_type": "Payable"
- },
- "Documentos por Pagar Moneda Extrangera": {
- "account_type": "Payable"
- },
- "Cuentas por Pagar por Importaciones": {
- "account_type": "Payable"
- }
- },
- "Anticipos de Clientes": {},
- "Pasivos Financieros a Corto Plazo": {
- "Prestamos por Pagar a Corto Plazo": {
- "is_group": 1
- },
- "Sobregiros Bancarios": {
- "is_group": 1
- },
- "Otras Deudas Bancarias": {
- "is_group": 1
- }
- },
- "Gastos por Pagar": {
- "Servicios Basicos": {
- "is_group": 1
- },
- "Prestaciones Sociales": {
- "is_group": 1
- },
- "Salarios por Pagar": {}
- },
- "Provisiones por Pagar": {
- "Pasivos Laborales": {
- "Indemnizacion Laboral": {},
- "Aguinaldo por Pagar": {}
- },
- "Reclamos por Pagar": {},
- "Responsabilidad frente a terceros": {}
- },
- "Impuestos por Pagar": {
- "Impuesto al Valor Agregado por Pagar": {
- "account_type": "Tax"
- },
- "Impuesto sobre la Renta por Actividades Economicas": {
- "account_type": "Tax"
- },
- "Impuestos Municipales": {
- "Impuesto Municipal Sobre Ingresos": {
- "account_type": "Tax"
- },
- "Recoleccion Basura": {
- "account_type": "Tax"
- },
- "Matricula Municipal": {
- "account_type": "Tax"
- }
- }
- },
- "Retenciones por Pagar": {
- "Rentas del Trabajo": {
- "Retencion Rentas del Trabajo Tarifa Progresiva": {
- "account_type": "Tax"
- },
- "Retencion Definitiva 10% por Rentas del Trabajo - Indemnizacion Adicional": {
- "account_type": "Tax"
- },
- "Retencion Definitiva 12.5% por Rentas del Trabajo - Dietas": {
- "account_type": "Tax"
- },
- "Retencion Definitiva 15% por Rentas del Trabajo - No Residentes": {
- "account_type": "Tax"
- }
- },
- "Rentas de Actividades Economicas": {
- "Retencion 2% por C/Bienes o P/Servicios": {
- "account_type": "Tax"
- },
- "Retencion 10% Servicios Profesionales": {
- "account_type": "Tax"
- },
- "Retencion 3% compra Bienes Agropecuarios": {
- "account_type": "Tax"
- },
- "Retencion 5% compra Madera en Rollo": {
- "account_type": "Tax"
- },
- "Retencion Definitiva 1.5% Actividades Economicas No Residentes": {
- "account_type": "Tax"
- },
- "Retencion Definitiva 3% Actividades Economicas No Residentes": {
- "account_type": "Tax"
- },
- "Retencion Definitiva 10% Actividades Economicas No Residentes": {
- "account_type": "Tax"
- },
- "Retencion Definitiva 15% Actividades Economicas No Residentes": {
- "account_type": "Tax"
- },
- "Otras Retenciones 10%": {
- "account_type": "Tax"
- }
- },
- "Rentas y Ganancias de Capital": {
- "Retencion Defintiva 15% por Rentas de Capital": {
- "account_type": "Tax"
- },
- "Retencion Defintiva 10% por Rentas de Capital": {
- "account_type": "Tax"
- },
- "Retencion Definitiva 5% por Rentas de Capital": {
- "account_type": "Tax"
- },
- "Retencion Definitiva 10% por Ganancia de Capital": {
- "account_type": "Tax"
- },
- "Retencion Definitiva 0.25% Transacciones Bursatiles": {
- "account_type": "Tax"
- },
- "Retencion Definitiva 1% Transacciones Bursatiles": {
- "account_type": "Tax"
- },
- "Retencion Definitiva 1.5% Transacciones Bursatiles": {
- "account_type": "Tax"
- },
- "Retencion Definitiva 2% Transacciones Bursatiles": {
- "account_type": "Tax"
- },
- "Retenciones Defintiva 5% Fondos de Inversion": {
- "account_type": "Tax"
- }
- },
- "Retencion 17% Operaciones con Paraisos Fiscales": {
- "account_type": "Tax"
- }
- },
- "Otras Cuentas por Pagar": {
- "is_group": 1
- }
- },
- "Pasivo No Corriente": {
- "Prestamos a Largo Plazo": {
- "is_group": 1
- },
- "Cuentas por Pagar a Largo Plaso": {
- "is_group": 1
- },
- "Otras Cuentas por Pagar a Largo Plazo": {
- "is_group": 1
- },
- "Otros Pasivos Financieros a Largo Plaso": {
- "is_group": 1
- }
- },
- "Obligaciones por Arrendamiento Financiero a Largo Plazo": {
- "is_group": 1
- },
- "Pasivo por Impuestos Diferidos": {
- "is_group": 1
- },
- "root_type": "Liability"
- },
- "Patrimonio": {
- "Aporte de Socios": {
- "Capital": {
- "Capital Social Pagado": {
- "account_type": "Equity"
- },
- "Capital Social no Pagado": {
- "account_type": "Equity"
- }
- }
- },
- "Donaciones": {
- "is_group": 1
- },
- "Ganancias Acumuladas": {
- "Reservas": {
- "Reservas Legales": {
- "account_type": "Equity"
- },
- "Reservas Voluntarias": {
- "account_type": "Equity"
- }
- },
- "Resultados": {
- "Resultados Acumulados": {
- "account_type": "Equity"
- },
- "Ajustes a Periodos Anteriores": {
- "account_type": "Equity"
- },
- "Resultado del ejercicio": {
- "account_type": "Equity"
- }
- }
- },
- "root_type": "Equity"
- },
- "Ingresos": {
- "Ventas": {
- "Venta de Bienes o Prestacion de Servicios Grabados": {},
- "Venta de Bienes o Prestacion de Servicios Exentos": {},
- "Venta de Bienes o Prestacion de Servicios Exonerados": {},
- "Venta por Exportaciones": {}
- },
- "Otros Ingresos Grabables": {
- "Ganacia Cambiaria": {},
- "Sobrante en Arqueo de Caja": {},
- "Otros Ingresos Grabables": {}
- },
- "Ingresos no Grabables": {
- "Ingreso por Rentas y Ganacias de Capital sujetas a Retencion Definitiva": {},
- "Interes Bancarios": {},
- "Otros Ingresos no Grabables": {}
- },
- "root_type": "Income"
- },
- "Costos y Gastos": {
- "Costo de Venta": {
- "Costo de Bienes": {},
- "Costo de Servicios": {},
- "Costo de Produccion": {},
- "account_type": "Cost of Goods Sold"
- },
- "Gastos de Ventas": {
- "Publicidad": {},
- "Mercadeo": {},
- "Muestras Gratis": {},
- "Regalosa Clientes": {},
- "Fletes": {},
- "Promociones": {}
- },
- "Gastos de Administracion": {
- "Alquileres": {},
- "Combustible": {},
- "Servicios Basicos": {
- "Energia Electrica": {},
- "Agua Potable": {},
- "Internet": {},
- "Telefono Fijo": {},
- "Celular": {},
- "Costos por Servicios WEB": {}
- },
- "Vigilancia": {},
- "Gastos Varios": {},
- "Mantenimiento y Reparaciones": {},
- "Papeleria": {},
- "Representacion": {},
- "Amortizaciones": {},
- "Inatec": {},
- "Indemnizacion": {},
- "Fletes y Correos": {},
- "Cuentas Incobrables": {},
- "Capacitacion al Personal": {},
- "Uniformes": {},
- "Seguros": {},
- "Donaciones": {},
- "Impuesto Municipal": {},
- "Matricula": {},
- "Recoleccion de Basura": {},
- "IVA Proporcional no Acreditado": {},
- "Ayuda a Empleados": {}
- },
- "Gastos por Servicios Profesionales y Tecnicos": {},
- "Gastos por Salarios y Otras Compensaciones": {},
- "Gastopor Depreciacion": {},
- "Otros Gastos": {
- "Perdida Cambiario": {},
- "Perdida e nVenta de Activo Fijo": {},
- "Siniestros": {},
- "Certificacion de Cheques y Chequeras": {}
- },
- "Costos y Gastos No Deducibles": {},
- "Impuesto por Rentas y Ganancias de Capital": {},
- "Impuesto sobre la Rentade Activividades Economicas": {},
- "root_type": "Expense"
- }
- }
-}
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/nl_grootboekschema.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/nl_grootboekschema.json
new file mode 100644
index 0000000..58b9122
--- /dev/null
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/nl_grootboekschema.json
@@ -0,0 +1,693 @@
+{
+ "country_code": "nl",
+ "name": "Netherlands - Grootboekschema",
+ "tree": {
+ "FABRIKAGEREKENINGEN": {
+ "is_group": 1,
+ "root_type": "Expense"
+ },
+ "FINANCIELE REKENINGEN, KORTLOPENDE VORDERINGEN EN SCHULDEN": {
+ "Bank": {
+ "RABO Bank": {
+ "account_type": "Bank"
+ },
+ "account_type": "Bank"
+ },
+ "KORTLOPENDE SCHULDEN": {
+ "Af te dragen Btw-verlegd": {
+ "account_type": "Tax"
+ },
+ "Afdracht loonheffing": {},
+ "Btw af te dragen hoog": {
+ "account_type": "Tax"
+ },
+ "Btw af te dragen laag": {
+ "account_type": "Tax"
+ },
+ "Btw af te dragen overig": {
+ "account_type": "Tax"
+ },
+ "Btw oude jaren": {
+ "account_type": "Tax"
+ },
+ "Btw te vorderen hoog": {
+ "account_type": "Tax"
+ },
+ "Btw te vorderen laag": {
+ "account_type": "Tax"
+ },
+ "Btw te vorderen overig": {
+ "account_type": "Tax"
+ },
+ "Btw-afdracht": {
+ "account_type": "Tax"
+ },
+ "Crediteuren": {
+ "account_type": "Payable"
+ },
+ "Dividend": {},
+ "Dividendbelasting": {},
+ "Energiekosten 1": {},
+ "Investeringsaftrek": {},
+ "Loonheffing": {},
+ "Overige te betalen posten": {},
+ "Pensioenpremies 1": {},
+ "Premie WIR": {},
+ "Rekening-courant inkoopvereniging": {},
+ "Rente": {},
+ "Sociale lasten 1": {},
+ "Stock Recieved niet gefactureerd": {
+ "account_type": "Stock Received But Not Billed"
+ },
+ "Tanti\u00e8mes 1": {},
+ "Te vorderen Btw-verlegd": {
+ "account_type": "Tax"
+ },
+ "Telefoon/telefax 1": {},
+ "Termijnen onderh. werk": {},
+ "Vakantiedagen": {},
+ "Vakantiegeld 1": {},
+ "Vakantiezegels": {},
+ "Vennootschapsbelasting": {},
+ "Vooruit ontvangen bedr.": {}
+ },
+ "LIQUIDE MIDDELEN": {
+ "ABN-AMRO bank": {},
+ "Bankbetaalkaarten": {},
+ "Effecten": {},
+ "Girobetaalkaarten": {},
+ "Kas": {
+ "account_type": "Cash"
+ },
+ "Kas valuta": {
+ "account_type": "Cash"
+ },
+ "Kleine kas": {
+ "account_type": "Cash"
+ },
+ "Kruisposten": {},
+ "Postbank": {
+ "account_type": "Cash"
+ },
+ "account_type": "Cash"
+ },
+ "VORDERINGEN": {
+ "Debiteuren": {
+ "account_type": "Receivable"
+ },
+ "Dubieuze debiteuren": {},
+ "Overige vorderingen": {},
+ "Rekening-courant directie 1": {},
+ "Te ontvangen ziekengeld": {},
+ "Voorschotten personeel": {},
+ "Vooruitbetaalde kosten": {},
+ "Voorziening dubieuze debiteuren": {}
+ },
+ "root_type": "Asset"
+ },
+ "INDIRECTE KOSTEN": {
+ "is_group": 1,
+ "root_type": "Expense"
+ },
+ "KOSTENREKENINGEN": {
+ "AFSCHRIJVINGEN": {
+ "Aanhangwagens": {},
+ "Aankoopkosten": {},
+ "Aanloopkosten": {},
+ "Auteursrechten": {},
+ "Bedrijfsgebouwen": {},
+ "Bedrijfsinventaris": {
+ "account_type": "Depreciation"
+ },
+ "Drankvergunningen": {},
+ "Fabrieksinventaris": {
+ "account_type": "Depreciation"
+ },
+ "Gebouwen": {},
+ "Gereedschappen": {},
+ "Goodwill": {},
+ "Grondverbetering": {},
+ "Heftrucks": {},
+ "Kantine-inventaris": {},
+ "Kantoorinventaris": {
+ "account_type": "Depreciation"
+ },
+ "Kantoormachines": {},
+ "Licenties": {},
+ "Machines 1": {},
+ "Magazijninventaris": {},
+ "Octrooien": {},
+ "Ontwikkelingskosten": {},
+ "Pachtersinvestering": {},
+ "Parkeerplaats": {},
+ "Personenauto's": {
+ "account_type": "Depreciation"
+ },
+ "Rijwielen en bromfietsen": {},
+ "Tonnagevergunningen": {},
+ "Verbouwingen": {},
+ "Vergunningen": {},
+ "Voorraadverschillen": {},
+ "Vrachtauto's": {},
+ "Winkels": {},
+ "Woon-winkelhuis": {},
+ "account_type": "Depreciation"
+ },
+ "ALGEMENE KOSTEN": {
+ "Accountantskosten": {},
+ "Advieskosten": {},
+ "Assuranties 1": {},
+ "Bankkosten": {},
+ "Juridische kosten": {},
+ "Overige algemene kosten": {},
+ "Toev. Ass. eigen risico": {}
+ },
+ "BEDRIJFSKOSTEN": {
+ "Assuranties 2": {},
+ "Energie (krachtstroom)": {},
+ "Gereedschappen 1": {},
+ "Hulpmaterialen 1": {},
+ "Huur inventaris": {},
+ "Huur machines": {},
+ "Leasing invent.operational": {},
+ "Leasing mach. operational": {},
+ "Onderhoud inventaris": {},
+ "Onderhoud machines": {},
+ "Ophalen/vervoer afval": {},
+ "Overige bedrijfskosten": {}
+ },
+ "FINANCIERINGSKOSTEN 1": {
+ "Overige rentebaten": {},
+ "Overige rentelasten": {},
+ "Rente bankkrediet": {},
+ "Rente huurkoopcontracten": {},
+ "Rente hypotheek": {},
+ "Rente leasecontracten": {},
+ "Rente lening o/g": {},
+ "Rente lening u/g": {}
+ },
+ "HUISVESTINGSKOSTEN": {
+ "Assurantie onroerend goed": {},
+ "Belastingen onr. Goed": {},
+ "Energiekosten": {},
+ "Groot onderhoud onr. Goed": {},
+ "Huur": {},
+ "Huurwaarde woongedeelte": {},
+ "Onderhoud onroerend goed": {},
+ "Ontvangen huren": {},
+ "Overige huisvestingskosten": {},
+ "Pacht": {},
+ "Schoonmaakkosten": {},
+ "Toevoeging egalisatieres. Groot onderhoud": {}
+ },
+ "KANTOORKOSTEN": {
+ "Administratiekosten": {},
+ "Contributies/abonnementen": {},
+ "Huur kantoorapparatuur": {},
+ "Internetaansluiting": {},
+ "Kantoorbenodigdh./drukw.": {},
+ "Onderhoud kantoorinvent.": {},
+ "Overige kantoorkosten": {},
+ "Porti": {},
+ "Telefoon/telefax": {}
+ },
+ "OVERIGE BATEN EN LASTEN": {
+ "Betaalde schadevergoed.": {},
+ "Boekverlies vaste activa": {},
+ "Boekwinst van vaste activa": {},
+ "K.O. regeling OB": {},
+ "Kasverschillen": {},
+ "Kosten loonbelasting": {},
+ "Kosten omzetbelasting": {},
+ "Nadelige koersverschillen": {},
+ "Naheffing bedrijfsver.": {},
+ "Ontvangen schadevergoed.": {},
+ "Overige baten": {},
+ "Overige lasten": {},
+ "Voordelige koersverschil.": {}
+ },
+ "PERSONEELSKOSTEN": {
+ "Autokostenvergoeding": {},
+ "Bedrijfskleding": {},
+ "Belastingvrije uitkeringen": {},
+ "Bijzondere beloningen": {},
+ "Congressen, seminars en symposia": {},
+ "Gereedschapsgeld": {},
+ "Geschenken personeel": {},
+ "Gratificaties": {},
+ "Inhouding pensioenpremies": {},
+ "Inhouding sociale lasten": {},
+ "Kantinekosten": {},
+ "Lonen en salarissen": {},
+ "Loonwerk": {},
+ "Managementvergoedingen": {},
+ "Opleidingskosten": {},
+ "Oprenting stamrechtverpl.": {},
+ "Overhevelingstoeslag": {},
+ "Overige kostenverg.": {},
+ "Overige personeelskosten": {},
+ "Overige uitkeringen": {},
+ "Pensioenpremies": {},
+ "Provisie 1": {},
+ "Reiskosten": {},
+ "Rijwielvergoeding": {},
+ "Sociale lasten": {},
+ "Tanti\u00e8mes": {},
+ "Thuiswerkers": {},
+ "Toev. Backservice pens.verpl.": {},
+ "Toevoeging pensioenverpl.": {},
+ "Uitkering ziekengeld": {},
+ "Uitzendkrachten": {},
+ "Vakantiebonnen": {},
+ "Vakantiegeld": {},
+ "Vergoeding studiekosten": {},
+ "Wervingskosten personeel": {}
+ },
+ "VERKOOPKOSTEN": {
+ "Advertenties": {},
+ "Afschrijving dubieuze deb.": {},
+ "Beurskosten": {},
+ "Etalagekosten": {},
+ "Exportkosten": {},
+ "Kascorrecties": {},
+ "Overige verkoopkosten": {},
+ "Provisie": {},
+ "Reclame": {},
+ "Reis en verblijfkosten": {},
+ "Relatiegeschenken": {},
+ "Representatiekosten": {},
+ "Uitgaande vrachten": {},
+ "Veilingkosten": {},
+ "Verpakkingsmateriaal 1": {},
+ "Websitekosten": {}
+ },
+ "VERVOERSKOSTEN": {
+ "Assuranties auto's": {},
+ "Brandstoffen": {},
+ "Leasing auto's": {},
+ "Onderhoud personenauto's": {},
+ "Onderhoud vrachtauto's": {},
+ "Overige vervoerskosten": {},
+ "Priv\u00e9-gebruik auto's": {},
+ "Wegenbelasting": {}
+ },
+ "root_type": "Expense"
+ },
+ "TUSSENREKENINGEN": {
+ "Betaalwijze cadeaubonnen": {
+ "account_type": "Cash"
+ },
+ "Betaalwijze chipknip": {
+ "account_type": "Cash"
+ },
+ "Betaalwijze contant": {
+ "account_type": "Cash"
+ },
+ "Betaalwijze pin": {
+ "account_type": "Cash"
+ },
+ "Inkopen Nederland hoog": {
+ "account_type": "Cash"
+ },
+ "Inkopen Nederland laag": {
+ "account_type": "Cash"
+ },
+ "Inkopen Nederland onbelast": {
+ "account_type": "Cash"
+ },
+ "Inkopen Nederland overig": {
+ "account_type": "Cash"
+ },
+ "Inkopen Nederland verlegd": {
+ "account_type": "Cash"
+ },
+ "Inkopen binnen EU hoog": {
+ "account_type": "Cash"
+ },
+ "Inkopen binnen EU laag": {
+ "account_type": "Cash"
+ },
+ "Inkopen binnen EU overig": {
+ "account_type": "Cash"
+ },
+ "Inkopen buiten EU hoog": {
+ "account_type": "Cash"
+ },
+ "Inkopen buiten EU laag": {
+ "account_type": "Cash"
+ },
+ "Inkopen buiten EU overig": {
+ "account_type": "Cash"
+ },
+ "Kassa 1": {
+ "account_type": "Cash"
+ },
+ "Kassa 2": {
+ "account_type": "Cash"
+ },
+ "Netto lonen": {
+ "account_type": "Cash"
+ },
+ "Tegenrekening Inkopen": {
+ "account_type": "Cash"
+ },
+ "Tussenrek. autom. betalingen": {
+ "account_type": "Cash"
+ },
+ "Tussenrek. autom. loonbetalingen": {
+ "account_type": "Cash"
+ },
+ "Tussenrek. cadeaubonbetalingen": {
+ "account_type": "Cash"
+ },
+ "Tussenrekening balans": {
+ "account_type": "Cash"
+ },
+ "Tussenrekening chipknip": {
+ "account_type": "Cash"
+ },
+ "Tussenrekening correcties": {
+ "account_type": "Cash"
+ },
+ "Tussenrekening pin": {
+ "account_type": "Cash"
+ },
+ "Vraagposten": {
+ "account_type": "Cash"
+ },
+ "root_type": "Asset"
+ },
+ "VASTE ACTIVA, EIGEN VERMOGEN, LANGLOPEND VREEMD VERMOGEN EN VOORZIENINGEN": {
+ "EIGEN VERMOGEN": {
+ "Aandelenkapitaal": {
+ "account_type": "Equity"
+ },
+ "Assuranties": {
+ "account_type": "Equity"
+ },
+ "Buitengewone lasten": {
+ "account_type": "Equity"
+ },
+ "Giften": {
+ "account_type": "Equity"
+ },
+ "Huishoudgeld": {
+ "account_type": "Equity"
+ },
+ "Inkomstenbelasting": {
+ "account_type": "Equity"
+ },
+ "Kapitaal": {
+ "account_type": "Equity"
+ },
+ "Overige persoonlijke verplichtingen": {
+ "account_type": "Equity"
+ },
+ "Overige priv\u00e9-uitgaven": {
+ "account_type": "Equity"
+ },
+ "Overige reserves": {
+ "account_type": "Equity"
+ },
+ "Premie lijfrenteverzekeringen": {
+ "account_type": "Equity"
+ },
+ "Premie volksverzekeringen": {
+ "account_type": "Equity"
+ },
+ "Priv\u00e9-gebruik": {
+ "account_type": "Equity"
+ },
+ "Priv\u00e9-opnamen/stortingen": {
+ "account_type": "Equity"
+ },
+ "Vermogensbelasting": {
+ "account_type": "Equity"
+ },
+ "WAO en ziekengeldverzekeringen": {
+ "account_type": "Equity"
+ },
+ "Wettelijke reserves": {
+ "account_type": "Equity"
+ }
+ },
+ "FINANCIELE VASTE ACTIVA EN LANGLOPENDE VORDERINGEN": {
+ "FINANCIELE VASTE ACTIVA": {
+ "Aandeel inkoopcombinatie": {},
+ "Meerderheidsdeelnemingen": {},
+ "Minderheidsdeelnemingen": {}
+ },
+ "LANGLOPENDE VORDERINGEN": {
+ "Financieringskosten": {},
+ "Financieringskosten huurkoop": {},
+ "Hypotheken u/g 1": {},
+ "Hypotheken u/g 2": {},
+ "Hypotheken u/g 3": {},
+ "Leningen u/g 1": {},
+ "Leningen u/g 2": {},
+ "Leningen u/g 3": {},
+ "Leningen u/g 4": {},
+ "Leningen u/g 5": {},
+ "Vorderingen op deelnemingen": {},
+ "Waarborgsommen": {}
+ }
+ },
+ "IMMATERIELE ACTIVA": {
+ "Aanschafwaarde Aanloopkosten": {},
+ "Aanschafwaarde Auteursrechten": {},
+ "Aanschafwaarde Drankvergunningen": {},
+ "Aanschafwaarde Goodwill": {},
+ "Aanschafwaarde Octrooien": {},
+ "Aanschafwaarde Ontwikkelingskosten": {},
+ "Aanschafwaarde Tonnagevergunningen": {},
+ "Aanschafwaarde Vergunningen": {},
+ "Afschrijving Aanloopkosten": {},
+ "Afschrijving Auteursrechten": {},
+ "Afschrijving Drankvergunningen": {},
+ "Afschrijving Goodwill": {},
+ "Afschrijving Licenties": {},
+ "Afschrijving Octrooien": {},
+ "Afschrijving Ontwikkelingskosten": {},
+ "Afschrijving Tonnagevergunningen": {},
+ "Afschrijving Vergunningen": {}
+ },
+ "LANGLOPENDE SCHULDEN EN AFLOSSINGEN": {
+ "AFLOSSINGEN": {
+ "Huurkoopverplichtingen": {},
+ "Hypotheek o/g 1": {},
+ "Hypotheek o/g 2": {},
+ "Hypotheek o/g 3": {},
+ "Hypotheek o/g 4": {},
+ "Hypotheek o/g 5": {},
+ "Lease-verplichtingen": {}
+ },
+ "LANGLOPENDE SCHULDEN": {
+ "Huurkoopverplichtingen 1": {},
+ "Hypotheken o/g 1": {},
+ "Hypotheken o/g 2": {},
+ "Hypotheken o/g 3": {},
+ "Hypotheken o/g 4": {},
+ "Hypotheken o/g 5": {},
+ "Lease-verplichtingen 1": {},
+ "Leningen o/g 1": {},
+ "Leningen o/g 2": {},
+ "Leningen o/g 3": {},
+ "Leningen o/g 4": {},
+ "Leningen o/g 5": {},
+ "Rekening-courant directie": {}
+ }
+ },
+ "MACHINES EN INVENTARIS": {
+ "INVENTARIS": {
+ "Aanschafwaarde Bedrijfsinventaris": {},
+ "Aanschafwaarde Fabrieksinventaris": {},
+ "Aanschafwaarde Gereedschappen": {},
+ "Aanschafwaarde Kantine-inventaris": {},
+ "Aanschafwaarde Kantoorinventaris": {},
+ "Aanschafwaarde Kantoormachines": {},
+ "Aanschafwaarde Magazijninventaris": {},
+ "Afschrijving Bedrijfsinventaris": {},
+ "Afschrijving Fabrieksinventaris": {},
+ "Afschrijving Gereedschappen": {},
+ "Afschrijving Kantine-inventaris": {},
+ "Afschrijving Kantoorinventaris": {},
+ "Afschrijving Kantoormachines": {},
+ "Afschrijving Magazijninventaris": {},
+ "account_type": "Stock"
+ },
+ "MACHINES": {
+ "Aanschafwaarde Machines 1": {
+ "account_type": "Fixed Asset"
+ },
+ "Aanschafwaarde Machines 2": {},
+ "Aanschafwaarde Machines 3": {},
+ "Aanschafwaarde Machines 4": {},
+ "Aanschafwaarde Machines 5": {},
+ "Afschrijving Machines 1": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "Afschrijving Machines 2": {},
+ "Afschrijving Machines 3": {},
+ "Afschrijving Machines 4": {},
+ "Afschrijving Machines 5": {},
+ "account_type": "Fixed Asset"
+ }
+ },
+ "ONROERENDE GOEDEREN": {
+ "Aanschafwaarde Aanloopkosten 1": {},
+ "Aanschafwaarde Bedrijfsgebouwen": {},
+ "Aanschafwaarde Gebouwen": {},
+ "Aanschafwaarde Grondverbetering": {},
+ "Aanschafwaarde Landerijen": {},
+ "Aanschafwaarde Ondergrond gebouwen": {},
+ "Aanschafwaarde Pachtersinvesteringen": {},
+ "Aanschafwaarde Parkeerplaats": {},
+ "Aanschafwaarde Verbouwingen": {},
+ "Aanschafwaarde Winkels": {},
+ "Aanschafwaarde Woon-winkelhuis": {},
+ "Afschrijving Aanloopkosten 1": {},
+ "Afschrijving Bedrijfsgebouwen": {},
+ "Afschrijving Gebouwen": {},
+ "Afschrijving Grondverbetering": {},
+ "Afschrijving Pachtersinvesteringen": {},
+ "Afschrijving Parkeerplaats": {},
+ "Afschrijving Verbouwingen": {},
+ "Afschrijving Winkels": {},
+ "Afschrijving Woon-winkelhuis": {}
+ },
+ "VERVOERMIDDELEN": {
+ "Aanschafwaarde Aanhangwagens": {},
+ "Aanschafwaarde Heftrucks": {},
+ "Aanschafwaarde Personenauto's": {},
+ "Aanschafwaarde Rijwielen en bromfietsen": {},
+ "Aanschafwaarde Vrachtauto's": {},
+ "Afschrijving Aanhangwagens": {},
+ "Afschrijving Heftrucks": {},
+ "Afschrijving Personenauto's": {},
+ "Afschrijving Rijwielen en bromfietsen": {},
+ "Afschrijving Vrachtauto's": {}
+ },
+ "VOORZIENINGEN": {
+ "Assurantie eigen risico": {
+ "account_type": "Equity"
+ },
+ "Backservice pensioenverpl.": {
+ "account_type": "Equity"
+ },
+ "Egalisatierekening WIR": {
+ "account_type": "Equity"
+ },
+ "Egalisatieres. grootonderh.": {
+ "account_type": "Equity"
+ },
+ "Garantieverplichtingen": {
+ "account_type": "Equity"
+ },
+ "Latente belastingverpl.": {
+ "account_type": "Equity"
+ },
+ "Pens.voorz. eigen beheer": {
+ "account_type": "Equity"
+ },
+ "Pensioenverplichtingen": {
+ "account_type": "Equity"
+ },
+ "Stamrechtverplichtingen": {
+ "account_type": "Equity"
+ },
+ "Vervangingsreserve": {
+ "account_type": "Equity"
+ },
+ "Voorziening deelnemingen": {
+ "account_type": "Equity"
+ }
+ },
+ "root_type": "Asset"
+ },
+ "VERKOOPRESULTATEN": {
+ "Diensten fabric. 0% niet-EU": {},
+ "Diensten fabricage 0% EU": {},
+ "Diensten fabricage hoog": {},
+ "Diensten fabricage laag": {},
+ "Diensten fabricage overig": {},
+ "Diensten handel 0% EU": {},
+ "Diensten handel 0% niet-EU": {},
+ "Diensten handel hoog tarief": {},
+ "Diensten handel laag tarief": {},
+ "Verkopen Fabric. 0% niet-EU": {},
+ "Verkopen Handel 0% niet-EU": {},
+ "Verkopen fabric. 0 % EU": {},
+ "Verkopen fabricage hoog": {},
+ "Verkopen fabricage laag": {},
+ "Verkopen fabricage overig": {},
+ "Verkopen handel 0% EU": {},
+ "Verkopen handel hoog": {},
+ "Verkopen handel laag": {},
+ "Verkopen handel overig": {},
+ "Verleende Kredietbep. fabricage": {},
+ "Verleende Kredietbep. handel": {},
+ "root_type": "Income"
+ },
+ "VOORRAAD GEREED PRODUCT EN ONDERHANDEN WERK": {
+ "Betalingskort. crediteuren": {},
+ "Garantiekosten": {},
+ "Hulpmaterialen": {},
+ "Inkomende vrachten": {
+ "account_type": "Expenses Included In Valuation"
+ },
+ "Inkoop import buiten EU hoog": {},
+ "Inkoop import buiten EU laag": {},
+ "Inkoop import buiten EU overig": {},
+ "Inkoopbonussen": {},
+ "Inkoopkosten": {},
+ "Inkoopprovisie": {},
+ "Inkopen BTW verlegd": {},
+ "Inkopen EU hoog tarief": {},
+ "Inkopen EU laag tarief": {},
+ "Inkopen EU overig": {},
+ "Inkopen hoog": {},
+ "Inkopen laag": {},
+ "Inkopen nul": {},
+ "Inkopen overig": {},
+ "Invoerkosten": {},
+ "Kosten inkoopvereniging": {},
+ "Kostprijs omzet grondstoffen": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "Kostprijs omzet handelsgoederen": {},
+ "Onttrekking uitgev.garantie": {},
+ "Priv\u00e9-gebruik goederen": {},
+ "Stock aanpassing": {
+ "account_type": "Stock Adjustment"
+ },
+ "Tegenrekening inkoop": {},
+ "Toev. Voorz. incour. grondst.": {},
+ "Toevoeging garantieverpl.": {},
+ "Toevoeging voorz. incour. handelsgoed.": {},
+ "Uitbesteed werk": {},
+ "Voorz. Incourourant grondst.": {},
+ "Voorz.incour. handelsgoed.": {},
+ "root_type": "Expense"
+ },
+ "VOORRAAD GRONDSTOFFEN, HULPMATERIALEN EN HANDELSGOEDEREN": {
+ "Emballage": {},
+ "Gereed product 1": {},
+ "Gereed product 2": {},
+ "Goederen 1": {},
+ "Goederen 2": {},
+ "Goederen in consignatie": {},
+ "Goederen onderweg": {},
+ "Grondstoffen 1": {},
+ "Grondstoffen 2": {},
+ "Halffabrikaten 1": {},
+ "Halffabrikaten 2": {},
+ "Hulpstoffen 1": {},
+ "Hulpstoffen 2": {},
+ "Kantoorbenodigdheden": {},
+ "Onderhanden werk": {},
+ "Verpakkingsmateriaal": {},
+ "Zegels": {},
+ "root_type": "Asset"
+ }
+ }
+}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_default_coa.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_default_coa.json
index 5f84394..b266914 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_default_coa.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_default_coa.json
@@ -1,273 +1,312 @@
{
- "country_code": "sg",
- "name": "Singapore - Chart of Accounts",
- "tree": {
- "Assets": {
- "Current assets": {
- "Accounts Receivable": {
- "Credit Cards": {
- "AMEX Receivable": {},
- "CUP Receivale": {},
- "MC Receivable": {},
- "NETS Receivable": {},
- "VISA Receivable": {}
- },
- "Debtors": {
- "account_type": "Receivable"
- }
- },
- "Bank Accounts": {
- "Paypal Account": {
- "account_type": "Bank"
- },
- "account_type": "Bank"
- },
- "Cash in Hand": {
- "Cash in Transit": {
- "account_type": "Cash"
- },
- "Petty Cash": {
- "account_type": "Cash"
- }
- },
- "Loans and Advances-Assets": {
- "Prepayments": {}
- },
- "Securities and Deposits": {
- "Bank Guarantees": {},
- "Bank Deposits": {},
- "Rental Deposits": {}
- },
- "Stock Assets": {
- "account_type": "Stock",
- "is_group": 1
- },
- "Tax Assets": {
- "GST-Input": {}
- }
- },
- "Non-current assets": {
- "Fixed Assets": {
- "Accumulated Depreciation": {
- "AccDep-Equipment-ICT": {},
- "AccDep-Furniture and Fixtures": {},
- "AccDep-Equipment-Office": {},
- "AccDep-Motor Vehicle": {},
- "AccDep-Plant and Machinery": {}
- },
- "Equipment-ICT": {},
- "Furniture and Fixtures": {},
- "Equipment-Office": {},
- "Motor Vehicle": {},
- "Plant and Machinery": {}
- },
- "Non-Fixed Assets": {
- "Goodwill": {},
- "Investments": {
- "Investments-Associated Company": {},
- "Investments-Subsidiary": {}
- }
- },
- "Shares": {
- "Shares-Quoted": {},
- "Shares-Unquoted": {}
- }
- },
- "Temporary Accunts": {
- "Temporary Opening": {
- "account_type": "Temporary"
- }
- },
- "root_type": "Asset"
- },
- "Liabilities": {
- "Current liabilities": {
- "Accounts Payable": {
- "Creditors":{
- "account_type": "Payable"
- }
- },
- "Duties and Taxes": {
- "account_type": "Tax",
- "Deferred Tax Liabilities-Current": {},
- "GST-Output": {},
- "Income Tax Payable": {}
- },
- "Loans-Current": {
- "Amount Owing to Directors": {},
- "Bank Overdaft Account": {},
- "Secured Loans": {},
- "Unsecured Loans": {}
- },
- "Provision and Accruals": {
- "Accruals": {
- "Accr-CPF": {},
- "Accr-Sundry": {},
- "Accr-Withholding Tax": {}
- },
- "Provisions": {
- "Prov-Audit Fee": {},
- "Prov-Others": {},
- "Prov-Tax Fee": {},
- "Prov-Bonus": {
- "Prov-Bonus-Executive": {},
- "Prov-Bonus-Non Executive": {}
- }
- }
- },
- "Sponsorship Funds": {},
- "Stock Liabilities": {
- "Stock Received But Not Billed": {
- "account_type": "Stock Received But Not Billed"
- }
- }
- },
- "Non-current liabilities": {
- "Deferred Tax Liabilities": {},
- "Loans-Non Current": {}
- },
- "Capital Account": {
- "Reserves and Surplus": {},
- "Shareholder Funds": {}
- },
- "root_type": "Liability"
- },
- "Equity": {
- "Share Capital": {},
- "Current Year Earnings": {},
- "Proposed Dividends": {},
- "Retained Earnings": {},
- "root_type": "Equity"
- },
- "Income": {
- "Direct Income": {
- "Management Income": {},
- "Sales Income": {}
- },
- "Indirect Income": {
- "Government Grants": {},
- "Interest Income": {
- "Current Account Interest Earned": {},
- "Fixed Deposit Interest Earned": {}
- },
- "Other Income": {},
- "Service Charges": {}
- },
- "root_type": "Income"
- },
- "Expenses": {
- "Expenses-Administrative": {
- "Audit Fees": {},
- "Bank charges and interest": {},
- "Currency Exchange Differences": {},
- "Insurance": {},
- "Interest on Loan": {},
- "Legal and Professional Fees": {},
- "Loss on Disposal of FA": {},
- "Postal and Courier Charges": {},
- "Printing and Stationery": {},
- "Secretarial Fees": {},
- "Tax Agent Fees": {}
- },
- "Expenses-Direct": {
- "Cost of Goods Sold": {
- "account_type": "Cost of Goods Sold"
- },
- "Cost of Sales": {},
- "Expenses Included in Valuation": {
- "account_type": "Expenses Included In Valuation"
- },
- "Stock Adjustment": {
- "account_type": "Stock Adjustment"
- }
- },
- "Expenses-Marketing": {
- "Advertising and Promotion": {},
- "Graphic Design Fees": {},
- "Internet Marketing": {}
- },
- "Expenses-Operating": {
- "Cleaning Costs": {},
- "Commission Charges": {
- "Comm-Credit Card": {},
- "Comm-NETS": {},
- "Comm-Paypal": {}
- },
- "Communication Costs": {
- "Internet Connection": {},
- "Telephone Costs": {}
- },
- "Entertainment Expenses": {},
- "General Expenses": {},
- "Licence Fees": {},
- "Rental Costs": {
- "Rental-Premises": {},
- "Rental-Equipment": {},
- "Rental-Storage": {}
- },
- "Repairs and Maintenance": {
- "R&M-ICT": {},
- "R&M-Building": {},
- "R&M-Fixtures & Furniture": {},
- "R&M-Office": {},
- "R&M-Plant & Machinery": {}
- },
- "Service Fees": {},
- "Subscription Fees": {
- "Publication Subscriptions": {},
- "TV Subscriptions": {}
- },
- "Travel Expenses": {},
- "Utilities": {
- "Utility-Electricity": {},
- "Utility-Gas": {},
- "Utility-Refuse Removal": {},
- "Utility-Water": {}
- }
- },
- "Expenses-Other": {
- "Bad Debts Written Off": {},
- "Depreciation": {
- "Dep-ICT Equipment": {},
- "Dep-Fixtures & Furniture": {},
- "Dep-Motor Vehicle": {},
- "Dep-Office Equipment": {},
- "Dep-Plant & Machinery": {},
- "Dep-Renovation": {}
- },
- "Donations": {},
- "Round Off": {},
- "Tax Expenses": {
- "Tax Expenses": {}
- }
- },
- "Expenses-Staff": {
- "Bonuses": {
- "Bonus-Executive": {},
- "Bonus-Non Executive": {},
- "Bonus-Performance": {}
- },
- "CPF": {},
- "Directors Fees": {},
- "FWL": {},
- "Incentives": {},
- "Medical Expenses": {},
- "Salaries": {
- "Casual Labour": {},
- "Salary-Executive": {},
- "Salary-Non Executive-Full Time": {},
- "Salary-Non Executive-Part Time": {}
- },
- "SDF": {},
- "Security Expenses": {},
- "Staff Advertising": {},
- "Staff Commission Paid": {},
- "Staff Meals": {},
- "Staff Training": {},
- "Staff Transport": {},
- "Staff Welfare": {}
- },
- "root_type": "Expense"
- }
- }
+ "country_code": "sg",
+ "name": "Singapore - Chart of Accounts",
+ "tree": {
+ "Assets": {
+ "Current assets": {
+ "Accounts Receivable": {
+ "Credit Cards": {
+ "AMEX Receivable": {},
+ "CUP Receivale": {},
+ "MC Receivable": {},
+ "NETS Receivable": {},
+ "VISA Receivable": {}
+ },
+ "Debtors": {
+ "account_type": "Receivable"
+ }
+ },
+ "Bank Accounts": {
+ "Paypal Account": {
+ "account_type": "Bank"
+ },
+ "account_type": "Bank"
+ },
+ "Cash in Hand": {
+ "Cash in Transit": {
+ "account_type": "Cash"
+ },
+ "Petty Cash": {
+ "account_type": "Cash"
+ },
+ "account_type": "Cash"
+ },
+ "Loans and Advances-Assets": {
+ "Prepayments": {}
+ },
+ "Securities and Deposits": {
+ "Bank Deposits": {},
+ "Bank Guarantees": {},
+ "Rental Deposits": {}
+ },
+ "Stock Assets": {
+ "All Warehouses": {
+ "account_type": "Stock",
+ "is_group": 1
+ },
+ "account_type": "Stock"
+ },
+ "Tax Assets": {
+ "GST-Input": {}
+ }
+ },
+ "Non-current assets": {
+ "Fixed Assets": {
+ "Accumulated Depreciation": {
+ "AccDep-Equipment-ICT": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "AccDep-Equipment-Office": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "AccDep-Furniture and Fixtures": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "AccDep-Motor Vehicle": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "AccDep-Plant and Machinery": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "account_type": "Accumulated Depreciation"
+ },
+ "Equipment-ICT": {
+ "account_type": "Fixed Asset"
+ },
+ "Equipment-Office": {
+ "account_type": "Fixed Asset"
+ },
+ "Furniture and Fixtures": {
+ "account_type": "Fixed Asset"
+ },
+ "Motor Vehicle": {
+ "account_type": "Fixed Asset"
+ },
+ "Plant and Machinery": {
+ "account_type": "Fixed Asset"
+ },
+ "account_type": "Fixed Asset"
+ },
+ "Non-Fixed Assets": {
+ "Goodwill": {},
+ "Investments": {
+ "Investments-Associated Company": {},
+ "Investments-Subsidiary": {}
+ }
+ },
+ "Shares": {
+ "Shares-Quoted": {},
+ "Shares-Unquoted": {}
+ }
+ },
+ "Temporary Accunts": {
+ "Temporary Opening": {
+ "account_type": "Temporary"
+ }
+ },
+ "root_type": "Asset"
+ },
+ "Equity": {
+ "Current Year Earnings": {},
+ "Proposed Dividends": {},
+ "Retained Earnings": {},
+ "Share Capital": {},
+ "root_type": "Equity"
+ },
+ "Expenses": {
+ "Expenses-Administrative": {
+ "Audit Fees": {},
+ "Bank charges and interest": {},
+ "Currency Exchange Differences": {},
+ "Insurance": {},
+ "Interest on Loan": {},
+ "Legal and Professional Fees": {},
+ "Loss on Disposal of FA": {},
+ "Postal and Courier Charges": {},
+ "Printing and Stationery": {},
+ "Secretarial Fees": {},
+ "Tax Agent Fees": {}
+ },
+ "Expenses-Direct": {
+ "Cost of Goods Sold": {
+ "account_type": "Cost of Goods Sold"
+ },
+ "Cost of Sales": {},
+ "Expenses Included in Valuation": {
+ "account_type": "Expenses Included In Valuation"
+ },
+ "Stock Adjustment": {
+ "account_type": "Stock Adjustment"
+ }
+ },
+ "Expenses-Marketing": {
+ "Advertising and Promotion": {},
+ "Graphic Design Fees": {},
+ "Internet Marketing": {}
+ },
+ "Expenses-Operating": {
+ "Cleaning Costs": {},
+ "Commission Charges": {
+ "Comm-Credit Card": {},
+ "Comm-NETS": {},
+ "Comm-Paypal": {}
+ },
+ "Communication Costs": {
+ "Internet Connection": {},
+ "Telephone Costs": {}
+ },
+ "Entertainment Expenses": {},
+ "General Expenses": {},
+ "Licence Fees": {},
+ "Rental Costs": {
+ "Rental-Equipment": {},
+ "Rental-Premises": {},
+ "Rental-Storage": {}
+ },
+ "Repairs and Maintenance": {
+ "R&M-Building": {},
+ "R&M-Fixtures & Furniture": {},
+ "R&M-ICT": {},
+ "R&M-Office": {},
+ "R&M-Plant & Machinery": {}
+ },
+ "Service Fees": {},
+ "Subscription Fees": {
+ "Publication Subscriptions": {},
+ "TV Subscriptions": {}
+ },
+ "Travel Expenses": {},
+ "Utilities": {
+ "Utility-Electricity": {},
+ "Utility-Gas": {},
+ "Utility-Refuse Removal": {},
+ "Utility-Water": {}
+ }
+ },
+ "Expenses-Other": {
+ "Bad Debts Written Off": {},
+ "Depreciation": {
+ "Dep-Fixtures & Furniture": {
+ "account_type": "Depreciation"
+ },
+ "Dep-ICT Equipment": {
+ "account_type": "Depreciation"
+ },
+ "Dep-Motor Vehicle": {
+ "account_type": "Depreciation"
+ },
+ "Dep-Office Equipment": {
+ "account_type": "Depreciation"
+ },
+ "Dep-Plant & Machinery": {
+ "account_type": "Depreciation"
+ },
+ "Dep-Renovation": {
+ "account_type": "Depreciation"
+ },
+ "account_type": "Depreciation"
+ },
+ "Donations": {},
+ "Round Off": {},
+ "Tax Expenses": {
+ "Tax Expenses 1": {}
+ }
+ },
+ "Expenses-Staff": {
+ "Bonuses": {
+ "Bonus-Executive": {},
+ "Bonus-Non Executive": {},
+ "Bonus-Performance": {}
+ },
+ "CPF": {},
+ "Directors Fees": {},
+ "FWL": {},
+ "Incentives": {},
+ "Medical Expenses": {},
+ "SDF": {},
+ "Salaries": {
+ "Casual Labour": {},
+ "Salary-Executive": {},
+ "Salary-Non Executive-Full Time": {},
+ "Salary-Non Executive-Part Time": {}
+ },
+ "Security Expenses": {},
+ "Staff Advertising": {},
+ "Staff Commission Paid": {},
+ "Staff Meals": {},
+ "Staff Training": {},
+ "Staff Transport": {},
+ "Staff Welfare": {}
+ },
+ "root_type": "Expense"
+ },
+ "Income": {
+ "Direct Income": {
+ "Management Income": {},
+ "Sales Income": {}
+ },
+ "Indirect Income": {
+ "Government Grants": {},
+ "Interest Income": {
+ "Current Account Interest Earned": {},
+ "Fixed Deposit Interest Earned": {}
+ },
+ "Other Income": {},
+ "Service Charges": {}
+ },
+ "root_type": "Income"
+ },
+ "Liabilities": {
+ "Capital Account": {
+ "Reserves and Surplus": {},
+ "Shareholder Funds": {}
+ },
+ "Current liabilities": {
+ "Accounts Payable": {
+ "Creditors": {
+ "account_type": "Payable"
+ }
+ },
+ "Duties and Taxes": {
+ "Deferred Tax Liabilities-Current": {},
+ "GST-Output": {},
+ "Income Tax Payable": {},
+ "account_type": "Tax"
+ },
+ "Loans-Current": {
+ "Amount Owing to Directors": {},
+ "Bank Overdaft Account": {},
+ "Secured Loans": {},
+ "Unsecured Loans": {}
+ },
+ "Provision and Accruals": {
+ "Accruals": {
+ "Accr-CPF": {},
+ "Accr-Sundry": {},
+ "Accr-Withholding Tax": {}
+ },
+ "Provisions": {
+ "Prov-Audit Fee": {},
+ "Prov-Bonus": {
+ "Prov-Bonus-Executive": {},
+ "Prov-Bonus-Non Executive": {}
+ },
+ "Prov-Others": {},
+ "Prov-Tax Fee": {}
+ }
+ },
+ "Sponsorship Funds": {},
+ "Stock Liabilities": {
+ "Stock Received But Not Billed": {
+ "account_type": "Stock Received But Not Billed"
+ }
+ }
+ },
+ "Non-current liabilities": {
+ "Deferred Tax Liabilities": {},
+ "Loans-Non Current": {}
+ },
+ "root_type": "Liability"
+ }
+ }
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_fnb_coa.json b/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_fnb_coa.json
index 20d3a80..961912d 100644
--- a/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_fnb_coa.json
+++ b/erpnext/accounts/doctype/account/chart_of_accounts/verified/sg_fnb_coa.json
@@ -28,7 +28,8 @@
},
"Petty Cash": {
"account_type": "Cash"
- }
+ },
+ "account_type": "Cash"
},
"Loans and Advances-Assets": {
"Prepayments": {}
@@ -49,29 +50,73 @@
"Non-current assets": {
"Fixed Assets": {
"Accumulated Depreciation": {
- "AccDep-Equipment-AV": {},
- "AccDep-Equipment-Bar": {},
- "AccDep-Equipment-ICT": {},
- "AccDep-Equipment-Electrical": {},
- "AccDep-Furniture and Fixtures": {},
- "AccDep-Equipment-Kitchen": {},
- "AccDep-Equipment-Lighting": {},
- "AccDep-Equipment-Office": {},
- "AccDep-Motor Vehicle": {},
- "AccDep-Plant and Machinery": {},
- "AccDep-Renovation": {}
+ "AccDep-Equipment-AV": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "AccDep-Equipment-Bar": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "AccDep-Equipment-ICT": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "AccDep-Equipment-Electrical": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "AccDep-Furniture and Fixtures": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "AccDep-Equipment-Kitchen": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "AccDep-Equipment-Lighting": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "AccDep-Equipment-Office": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "AccDep-Motor Vehicle": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "AccDep-Plant and Machinery": {
+ "account_type": "Accumulated Depreciation"
+ },
+ "AccDep-Renovation": {
+ "account_type": "Accumulated Depreciation"
+ }
},
- "Equipment-AV": {},
- "Equipment-Bar": {},
- "Equipment-ICT": {},
- "Equipment-Electrical": {},
- "Furniture and Fixtures": {},
- "Equipment-Kitchen": {},
- "Equipment-Lighting": {},
- "Equipment-Office": {},
- "Motor Vehicle": {},
- "Plant and Machinery": {},
- "Renovation": {}
+ "Equipment-AV": {
+ "account_type": "Fixed Asset"
+ },
+ "Equipment-Bar": {
+ "account_type": "Fixed Asset"
+ },
+ "Equipment-ICT": {
+ "account_type": "Fixed Asset"
+ },
+ "Equipment-Electrical": {
+ "account_type": "Fixed Asset"
+ },
+ "Furniture and Fixtures": {
+ "account_type": "Fixed Asset"
+ },
+ "Equipment-Kitchen": {
+ "account_type": "Fixed Asset"
+ },
+ "Equipment-Lighting": {
+ "account_type": "Fixed Asset"
+ },
+ "Equipment-Office": {
+ "account_type": "Fixed Asset"
+ },
+ "Motor Vehicle": {
+ "account_type": "Fixed Asset"
+ },
+ "Plant and Machinery": {
+ "account_type": "Fixed Asset"
+ },
+ "Renovation": {
+ "account_type": "Fixed Asset"
+ }
},
"Non-Fixed Assets": {
"Goodwill": {},
@@ -292,22 +337,46 @@
"Expenses-Other": {
"Bad Debts Written Off": {},
"Depreciation": {
- "Dep-AV Equipment": {},
- "Dep-Bar Equipment": {},
- "Dep-ICT Equipment": {},
- "Dep-Electrical Equipment": {},
- "Dep-Fixtures & Furniture": {},
- "Dep-Kitchen Equipment": {},
- "Dep-Lighting Equipment": {},
- "Dep-Motor Vehicle": {},
- "Dep-Office Equipment": {},
- "Dep-Plant & Machinery": {},
- "Dep-Renovation": {}
+ "Dep-AV Equipment": {
+ "account_type": "Depreciation"
+ },
+ "Dep-Bar Equipment": {
+ "account_type": "Depreciation"
+ },
+ "Dep-ICT Equipment": {
+ "account_type": "Depreciation"
+ },
+ "Dep-Electrical Equipment": {
+ "account_type": "Depreciation"
+ },
+ "Dep-Fixtures & Furniture": {
+ "account_type": "Depreciation"
+ },
+ "Dep-Kitchen Equipment": {
+ "account_type": "Depreciation"
+ },
+ "Dep-Lighting Equipment": {
+ "account_type": "Depreciation"
+ },
+ "Dep-Motor Vehicle": {
+ "account_type": "Depreciation"
+ },
+ "Dep-Office Equipment": {
+ "account_type": "Depreciation"
+ },
+ "Dep-Plant & Machinery": {
+ "account_type": "Depreciation"
+ },
+ "Dep-Renovation": {
+ "account_type": "Depreciation"
+ }
},
"Donations": {},
- "Round Off": {},
+ "Round Off": {
+ "account_type": "Round Off"
+ },
"Tax Expenses": {
- "Tax Expenses": {}
+ "is_group": 1
}
},
"Expenses-Staff": {
diff --git a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
index c389b5c..7a4d40d 100644
--- a/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
+++ b/erpnext/accounts/doctype/accounts_settings/accounts_settings.json
@@ -226,7 +226,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/asset/asset.json b/erpnext/accounts/doctype/asset/asset.json
index 95d9b48..d093e69 100644
--- a/erpnext/accounts/doctype/asset/asset.json
+++ b/erpnext/accounts/doctype/asset/asset.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Asset Name",
"length": 0,
"no_copy": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Item Code",
"length": 0,
"no_copy": 0,
@@ -78,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Asset Category",
"length": 0,
"no_copy": 0,
@@ -107,6 +110,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -135,6 +139,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 1,
@@ -162,6 +167,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -188,6 +194,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -216,6 +223,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Warehouse",
"length": 0,
"no_copy": 0,
@@ -244,6 +252,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Existing Asset",
"length": 0,
"no_copy": 0,
@@ -271,6 +280,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Date",
"length": 0,
"no_copy": 0,
@@ -298,6 +308,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier",
"length": 0,
"no_copy": 0,
@@ -326,6 +337,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Invoice",
"length": 0,
"no_copy": 1,
@@ -354,6 +366,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Disposal Date",
"length": 0,
"no_copy": 0,
@@ -381,6 +394,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Journal Entry for Scrap",
"length": 0,
"no_copy": 1,
@@ -409,6 +423,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -435,6 +450,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Gross Purchase Amount",
"length": 0,
"no_copy": 0,
@@ -464,6 +480,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Expected Value After Useful Life",
"length": 0,
"no_copy": 0,
@@ -493,6 +510,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Opening Accumulated Depreciation",
"length": 0,
"no_copy": 1,
@@ -521,6 +539,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Value After Depreciation",
"length": 0,
"no_copy": 0,
@@ -549,6 +568,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -577,6 +597,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Depreciation Method",
"length": 0,
"no_copy": 0,
@@ -605,6 +626,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Number of Depreciations",
"length": 0,
"no_copy": 0,
@@ -633,6 +655,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Number of Depreciations Booked",
"length": 0,
"no_copy": 1,
@@ -660,6 +683,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Frequency of Depreciation (Months)",
"length": 0,
"no_copy": 0,
@@ -688,6 +712,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Next Depreciation Date",
"length": 0,
"no_copy": 1,
@@ -715,6 +740,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Depreciation Schedule",
"length": 0,
"no_copy": 0,
@@ -742,6 +768,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Depreciation Schedules",
"length": 0,
"no_copy": 1,
@@ -770,6 +797,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
diff --git a/erpnext/accounts/doctype/asset_category/asset_category.json b/erpnext/accounts/doctype/asset_category/asset_category.json
index 20dd247..0ffdefc 100644
--- a/erpnext/accounts/doctype/asset_category/asset_category.json
+++ b/erpnext/accounts/doctype/asset_category/asset_category.json
@@ -3,16 +3,20 @@
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:asset_category_name",
+ "beta": 0,
"creation": "2016-03-01 17:41:39.778765",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Document",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "asset_category_name",
"fieldtype": "Data",
"hidden": 0,
@@ -20,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Asset Category Name",
"length": 0,
"no_copy": 0,
@@ -28,6 +33,7 @@
"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,
@@ -38,6 +44,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "Straight Line",
"fieldname": "depreciation_method",
"fieldtype": "Select",
@@ -46,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Depreciation Method",
"length": 0,
"no_copy": 0,
@@ -55,6 +63,7 @@
"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,
@@ -65,6 +74,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"hidden": 0,
@@ -72,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -79,6 +90,7 @@
"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,
@@ -89,6 +101,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "total_number_of_depreciations",
"fieldtype": "Int",
"hidden": 0,
@@ -96,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Number of Depreciations",
"length": 0,
"no_copy": 0,
@@ -104,6 +118,7 @@
"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,
@@ -114,6 +129,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "frequency_of_depreciation",
"fieldtype": "Int",
"hidden": 0,
@@ -121,6 +137,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Frequency of Depreciation (Months)",
"length": 0,
"no_copy": 0,
@@ -129,6 +146,7 @@
"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,
@@ -139,6 +157,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "section_break_2",
"fieldtype": "Section Break",
"hidden": 0,
@@ -146,6 +165,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accounts",
"length": 0,
"no_copy": 0,
@@ -154,6 +174,7 @@
"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,
@@ -164,6 +185,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "accounts",
"fieldtype": "Table",
"hidden": 0,
@@ -171,6 +193,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accounts",
"length": 0,
"no_copy": 0,
@@ -180,6 +203,7 @@
"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,
@@ -190,13 +214,14 @@
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
+ "image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-04-20 13:23:09.890324",
+ "modified": "2016-11-07 05:49:42.600981",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Asset Category",
@@ -213,6 +238,7 @@
"export": 1,
"if_owner": 0,
"import": 1,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -233,6 +259,7 @@
"export": 1,
"if_owner": 0,
"import": 1,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/accounts/doctype/asset_movement/asset_movement.json b/erpnext/accounts/doctype/asset_movement/asset_movement.json
index b501bd6..710f3b5 100644
--- a/erpnext/accounts/doctype/asset_movement/asset_movement.json
+++ b/erpnext/accounts/doctype/asset_movement/asset_movement.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Asset",
"length": 0,
"no_copy": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Transaction Date",
"length": 0,
"no_copy": 0,
@@ -78,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -106,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -132,6 +136,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Source Warehouse",
"length": 0,
"no_copy": 0,
@@ -160,6 +165,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Target Warehouse",
"length": 0,
"no_copy": 0,
@@ -188,6 +194,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -214,7 +221,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 15:13:55.990844",
+ "modified": "2016-11-07 05:49:47.558549",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Asset Movement",
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
index f1ccd9f..956f15a 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.js
@@ -15,7 +15,7 @@
frm.set_query("bank_account", function() {
return {
"filters": {
- "account_type": "Bank",
+ "account_type": ["in",["Bank","Cash"]],
"is_group": 0
}
};
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
index 1a7b763..b83dc7c 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.json
@@ -234,7 +234,7 @@
],
"hide_heading": 1,
"hide_toolbar": 1,
- "icon": "icon-check",
+ "icon": "fa fa-check",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/budget/budget.js b/erpnext/accounts/doctype/budget/budget.js
index f6a2c88..6697b17 100644
--- a/erpnext/accounts/doctype/budget/budget.js
+++ b/erpnext/accounts/doctype/budget/budget.js
@@ -10,6 +10,14 @@
}
}
})
+
+ frm.set_query("project", function() {
+ return {
+ filters: {
+ company: frm.doc.company
+ }
+ }
+ })
frm.set_query("account", "accounts", function() {
return {
@@ -28,5 +36,18 @@
}
}
})
+ },
+
+ refresh: function(frm) {
+ frm.trigger("toggle_reqd_fields")
+ },
+
+ budget_against: function(frm) {
+ frm.trigger("toggle_reqd_fields")
+ },
+
+ toggle_reqd_fields: function(frm) {
+ frm.toggle_reqd("cost_center", frm.doc.budget_against=="Cost Center");
+ frm.toggle_reqd("project", frm.doc.budget_against=="Project");
}
});
diff --git a/erpnext/accounts/doctype/budget/budget.json b/erpnext/accounts/doctype/budget/budget.json
index 8deabef..1e55601 100644
--- a/erpnext/accounts/doctype/budget/budget.json
+++ b/erpnext/accounts/doctype/budget/budget.json
@@ -15,45 +15,19 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "cost_center",
- "fieldtype": "Link",
+ "default": "Cost Center",
+ "fieldname": "budget_against",
+ "fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Cost Center",
+ "in_standard_filter": 1,
+ "label": "Budget Against",
"length": 0,
"no_copy": 0,
- "options": "Cost Center",
- "permlevel": 0,
- "precision": "",
- "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,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "fiscal_year",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Fiscal Year",
- "length": 0,
- "no_copy": 0,
- "options": "Fiscal Year",
+ "options": "\nCost Center\nProject",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -78,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -87,7 +62,96 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
- "remember_last_selected_value": 1,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.budget_against == 'Cost Center'",
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 1,
+ "label": "Cost Center",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Cost Center",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.budget_against == 'Project'",
+ "fieldname": "project",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 1,
+ "label": "Project",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Project",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "fiscal_year",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 1,
+ "label": "Fiscal Year",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Fiscal Year",
+ "permlevel": 0,
+ "precision": "",
+ "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,
@@ -106,6 +170,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -133,6 +198,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Action if Annual Budget Exceeded",
"length": 0,
"no_copy": 0,
@@ -163,6 +229,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Action if Accumulated Monthly Budget Exceeded",
"length": 0,
"no_copy": 0,
@@ -192,6 +259,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Monthly Distribution",
"length": 0,
"no_copy": 0,
@@ -220,6 +288,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -247,6 +316,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -273,6 +343,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Budget Accounts",
"length": 0,
"no_copy": 0,
@@ -300,7 +371,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 15:14:19.113302",
+ "modified": "2016-12-15 14:45:31.079107",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Budget",
diff --git a/erpnext/accounts/doctype/budget/budget.py b/erpnext/accounts/doctype/budget/budget.py
index 2488dd6..5fc4fbf 100644
--- a/erpnext/accounts/doctype/budget/budget.py
+++ b/erpnext/accounts/doctype/budget/budget.py
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+ # -*- coding: utf-8 -*-
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
@@ -14,20 +14,25 @@
class Budget(Document):
def autoname(self):
- self.name = make_autoname(self.cost_center + "/" + self.fiscal_year + "/.###")
+ self.name = make_autoname(self.get(frappe.scrub(self.budget_against))
+ + "/" + self.fiscal_year + "/.###")
def validate(self):
+ if not self.get(frappe.scrub(self.budget_against)):
+ frappe.throw(_("{0} is mandatory").format(self.budget_against))
self.validate_duplicate()
self.validate_accounts()
def validate_duplicate(self):
- existing_budget = frappe.db.get_value("Budget", {"cost_center": self.cost_center,
+ budget_against_field = frappe.scrub(self.budget_against)
+ 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,
"name": ["!=", self.name], "docstatus": ["!=", 2]})
- if existing_budget:
- frappe.throw(_("Another Budget record {0} already exists against {1} for fiscal year {2}")
- .format(existing_budget, self.cost_center, self.fiscal_year), DuplicateBudgetError)
-
+ if existing_budget:
+ frappe.throw(_("Another Budget record '{0}' already exists against {1} '{2}' for fiscal year {3}")
+ .format(existing_budget, self.budget_against, budget_against, self.fiscal_year), DuplicateBudgetError)
+
def validate_accounts(self):
account_list = []
for d in self.get('accounts'):
@@ -51,56 +56,104 @@
def validate_expense_against_budget(args):
args = frappe._dict(args)
- if not args.cost_center:
+ if not args.cost_center and not args.project:
return
-
- if frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"}):
- cc_lft, cc_rgt = frappe.db.get_value("Cost Center", args.cost_center, ["lft", "rgt"])
+ for budget_against in [args.project, args.cost_center]:
+ if budget_against \
+ and frappe.db.get_value("Account", {"name": args.account, "root_type": "Expense"}):
- budget_records = frappe.db.sql("""
- select ba.budget_amount, b.monthly_distribution, b.cost_center,
- b.action_if_annual_budget_exceeded, b.action_if_accumulated_monthly_budget_exceeded
- from `tabBudget` b, `tabBudget Account` ba
- where
- b.name=ba.parent and b.fiscal_year=%s and ba.account=%s and b.docstatus=1
- and exists(select name from `tabCost Center` where lft<=%s and rgt>=%s and name=b.cost_center)
- """, (args.fiscal_year, args.account, cc_lft, cc_rgt), as_dict=True)
+ if args.project:
+ condition = "and exists(select name from `tabProject` where name=b.project)"
+ args.budget_against_field = "Project"
+
+ elif args.cost_center:
+ cc_lft, cc_rgt = frappe.db.get_value("Cost Center", args.cost_center, ["lft", "rgt"])
+ condition = """and exists(select name from `tabCost Center`
+ where lft<=%s and rgt>=%s and name=b.cost_center)""" % (cc_lft, cc_rgt)
+ args.budget_against_field = "Cost Center"
+
+ args.budget_against = budget_against
- for budget in budget_records:
- if budget.budget_amount:
- yearly_action = budget.action_if_annual_budget_exceeded
- monthly_action = budget.action_if_accumulated_monthly_budget_exceeded
+ budget_records = frappe.db.sql("""
+ select
+ b.{budget_against_field}, ba.budget_amount, b.monthly_distribution,
+ b.action_if_annual_budget_exceeded,
+ b.action_if_accumulated_monthly_budget_exceeded
+ from
+ `tabBudget` b, `tabBudget Account` ba
+ where
+ b.name=ba.parent and b.fiscal_year=%s
+ and ba.account=%s and b.docstatus=1
+ {condition}
+ """.format(condition=condition,
+ budget_against_field=frappe.scrub(args.get("budget_against_field"))),
+ (args.fiscal_year, args.account), as_dict=True)
- if monthly_action in ["Stop", "Warn"]:
- budget_amount = get_accumulated_monthly_budget(budget.monthly_distribution,
- args.posting_date, args.fiscal_year, budget.budget_amount)
+ validate_budget_records(args, budget_records)
- args["month_end_date"] = get_last_day(args.posting_date)
-
- compare_expense_with_budget(args, budget.cost_center,
- budget_amount, _("Accumulated Monthly"), monthly_action)
+def validate_budget_records(args, budget_records):
+ for budget in budget_records:
+ if budget.budget_amount:
+ yearly_action = budget.action_if_annual_budget_exceeded
+ monthly_action = budget.action_if_accumulated_monthly_budget_exceeded
- if yearly_action in ("Stop", "Warn") and monthly_action != "Stop" \
- and yearly_action != monthly_action:
- compare_expense_with_budget(args, budget.cost_center,
- flt(budget.budget_amount), _("Annual"), yearly_action)
+ if monthly_action in ["Stop", "Warn"]:
+ budget_amount = get_accumulated_monthly_budget(budget.monthly_distribution,
+ args.posting_date, args.fiscal_year, budget.budget_amount)
+ args["month_end_date"] = get_last_day(args.posting_date)
-def compare_expense_with_budget(args, cost_center, budget_amount, action_for, action):
- actual_expense = get_actual_expense(args, cost_center)
+ compare_expense_with_budget(args, budget_amount,
+ _("Accumulated Monthly"), monthly_action)
+
+ if yearly_action in ("Stop", "Warn") and monthly_action != "Stop" \
+ and yearly_action != monthly_action:
+ compare_expense_with_budget(args, flt(budget.budget_amount),
+ _("Annual"), yearly_action)
+
+
+def compare_expense_with_budget(args, budget_amount, action_for, action):
+ actual_expense = get_actual_expense(args)
if actual_expense > budget_amount:
diff = actual_expense - budget_amount
- currency = frappe.db.get_value('Company', frappe.db.get_value('Cost Center',
- cost_center, 'company'), 'default_currency')
+ currency = frappe.db.get_value('Company', args.company, 'default_currency')
- msg = _("{0} Budget for Account {1} against Cost Center {2} is {3}. It will exceed by {4}").format(_(action_for),
- frappe.bold(args.account), frappe.bold(cost_center),
- frappe.bold(fmt_money(budget_amount, currency=currency)), frappe.bold(fmt_money(diff, currency=currency)))
+ msg = _("{0} Budget for Account {1} against {2} {3} is {4}. It will exceed by {5}").format(
+ _(action_for), frappe.bold(args.account), args.budget_against_field,
+ frappe.bold(args.budget_against),
+ frappe.bold(fmt_money(budget_amount, currency=currency)),
+ frappe.bold(fmt_money(diff, currency=currency)))
if action=="Stop":
frappe.throw(msg, BudgetError)
else:
frappe.msgprint(msg, indicator='orange')
+
+def get_actual_expense(args):
+ condition1 = " and gle.posting_date <= %(month_end_date)s" \
+ if args.get("month_end_date") else ""
+ if args.budget_against_field == "Cost Center":
+ lft_rgt = frappe.db.get_value(args.budget_against_field,
+ args.budget_against, ["lft", "rgt"], as_dict=1)
+ args.update(lft_rgt)
+ condition2 = """and exists(select name from `tabCost Center`
+ where lft>=%(lft)s and rgt<=%(rgt)s and name=gle.cost_center)"""
+
+ elif args.budget_against_field == "Project":
+ condition2 = "and exists(select name from `tabProject` where name=gle.project)"
+
+ return flt(frappe.db.sql("""
+ select sum(gle.debit) - sum(gle.credit)
+ from `tabGL Entry` gle
+ where gle.account=%(account)s
+ {condition1}
+ and gle.fiscal_year=%(fiscal_year)s
+ and gle.company=%(company)s
+ and gle.docstatus=1
+ {condition2}
+ """.format(condition1=condition1, condition2=condition2), (args))[0][0])
+
+
def get_accumulated_monthly_budget(monthly_distribution, posting_date, fiscal_year, annual_budget):
distribution = {}
if monthly_distribution:
@@ -121,21 +174,3 @@
dt = add_months(dt, 1)
return annual_budget * accumulated_percentage / 100
-
-def get_actual_expense(args, cost_center):
- lft_rgt = frappe.db.get_value("Cost Center", cost_center, ["lft", "rgt"], as_dict=1)
- args.update(lft_rgt)
-
- condition = " and gle.posting_date <= %(month_end_date)s" if args.get("month_end_date") else ""
-
- return flt(frappe.db.sql("""
- select sum(gle.debit) - sum(gle.credit)
- from `tabGL Entry` gle
- where gle.account=%(account)s
- and exists(select name from `tabCost Center`
- where lft>=%(lft)s and rgt<=%(rgt)s and name=gle.cost_center)
- and gle.fiscal_year=%(fiscal_year)s
- and gle.company=%(company)s
- and gle.docstatus=1
- {condition}
- """.format(condition=condition), (args))[0][0])
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/budget/test_budget.py b/erpnext/accounts/doctype/budget/test_budget.py
index 78f5690..15895dc 100644
--- a/erpnext/accounts/doctype/budget/test_budget.py
+++ b/erpnext/accounts/doctype/budget/test_budget.py
@@ -10,9 +10,9 @@
class TestBudget(unittest.TestCase):
def test_monthly_budget_crossed_ignore(self):
- set_total_expense_zero("2013-02-28")
+ set_total_expense_zero("2013-02-28", "Cost Center")
- budget = make_budget()
+ budget = make_budget("Cost Center")
jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
"_Test Bank - _TC", 40000, "_Test Cost Center - _TC", submit=True)
@@ -22,10 +22,10 @@
budget.cancel()
- def test_monthly_budget_crossed_stop(self):
- set_total_expense_zero("2013-02-28")
+ def test_monthly_budget_crossed_stop1(self):
+ set_total_expense_zero("2013-02-28", "Cost Center")
- budget = make_budget()
+ budget = make_budget("Cost Center")
frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
@@ -37,10 +37,25 @@
budget.load_from_db()
budget.cancel()
- def test_yearly_budget_crossed_stop(self):
- set_total_expense_zero("2013-02-28")
+ def test_monthly_budget_crossed_stop2(self):
+ set_total_expense_zero("2013-02-28", "Project")
- budget = make_budget()
+ budget = make_budget("Project")
+
+ frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
+
+ jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+ "_Test Bank - _TC", 40000, "_Test Cost Center - _TC", project="_Test Project")
+
+ self.assertRaises(BudgetError, jv.submit)
+
+ budget.load_from_db()
+ budget.cancel()
+
+ def test_yearly_budget_crossed_stop1(self):
+ set_total_expense_zero("2013-02-28", "Cost Center")
+
+ budget = make_budget("Cost Center")
jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
"_Test Bank - _TC", 150000, "_Test Cost Center - _TC")
@@ -49,10 +64,22 @@
budget.cancel()
- def test_monthly_budget_on_cancellation(self):
- set_total_expense_zero("2013-02-28")
+ def test_yearly_budget_crossed_stop2(self):
+ set_total_expense_zero("2013-02-28", "Project")
- budget = make_budget()
+ budget = make_budget("Project")
+
+ jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+ "_Test Bank - _TC", 150000, "_Test Cost Center - _TC", project="_Test Project")
+
+ self.assertRaises(BudgetError, jv.submit)
+
+ budget.cancel()
+
+ def test_monthly_budget_on_cancellation1(self):
+ set_total_expense_zero("2013-02-28", "Cost Center")
+
+ budget = make_budget("Cost Center")
jv1 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
"_Test Bank - _TC", 20000, "_Test Cost Center - _TC", submit=True)
@@ -72,12 +99,37 @@
budget.load_from_db()
budget.cancel()
+
+ def test_monthly_budget_on_cancellation2(self):
+ set_total_expense_zero("2013-02-28", "Project")
+
+ budget = make_budget("Project")
+
+ jv1 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+ "_Test Bank - _TC", 20000, "_Test Cost Center - _TC", submit=True, project="_Test Project")
+
+ self.assertTrue(frappe.db.get_value("GL Entry",
+ {"voucher_type": "Journal Entry", "voucher_no": jv1.name}))
+
+ jv2 = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+ "_Test Bank - _TC", 20000, "_Test Cost Center - _TC", submit=True, project="_Test Project")
+
+ self.assertTrue(frappe.db.get_value("GL Entry",
+ {"voucher_type": "Journal Entry", "voucher_no": jv2.name}))
+
+ frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
+
+ self.assertRaises(BudgetError, jv1.cancel)
+
+ budget.load_from_db()
+ budget.cancel()
+
def test_monthly_budget_against_group_cost_center(self):
- set_total_expense_zero("2013-02-28")
- set_total_expense_zero("2013-02-28", "_Test Cost Center 2 - _TC")
+ set_total_expense_zero("2013-02-28", "Cost Center")
+ set_total_expense_zero("2013-02-28", "Cost Center", "_Test Cost Center 2 - _TC")
- budget = make_budget("_Test Company - _TC")
+ budget = make_budget("Cost Center", "_Test Company - _TC")
frappe.db.set_value("Budget", budget.name, "action_if_accumulated_monthly_budget_exceeded", "Stop")
jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
@@ -88,27 +140,52 @@
budget.load_from_db()
budget.cancel()
-def set_total_expense_zero(posting_date, cost_center=None):
- existing_expense = get_actual_expense({
+def set_total_expense_zero(posting_date, budget_against_field=None, budget_against_CC=None):
+ if budget_against_field == "Project":
+ budget_against = "_Test Project"
+ else:
+ budget_against = budget_against_CC or "_Test Cost Center - _TC"
+ existing_expense = get_actual_expense(frappe._dict({
"account": "_Test Account Cost for Goods Sold - _TC",
- "cost_center": cost_center or "_Test Cost Center - _TC",
+ "cost_center": "_Test Cost Center - _TC",
"monthly_end_date": posting_date,
"company": "_Test Company",
- "fiscal_year": "_Test Fiscal Year 2013"
- }, cost_center or "_Test Cost Center - _TC")
+ "fiscal_year": "_Test Fiscal Year 2013",
+ "budget_against_field": budget_against_field,
+ "budget_against": budget_against
+ }))
- make_journal_entry("_Test Account Cost for Goods Sold - _TC",
- "_Test Bank - _TC", -existing_expense, "_Test Cost Center - _TC", submit=True)
+ if existing_expense:
+ if budget_against_field == "Cost Center":
+ make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+ "_Test Bank - _TC", -existing_expense, "_Test Cost Center - _TC", submit=True)
+ elif budget_against_field == "Project":
+ make_journal_entry("_Test Account Cost for Goods Sold - _TC",
+ "_Test Bank - _TC", -existing_expense, "_Test Cost Center - _TC", submit=True, project="_Test Project")
-def make_budget(cost_center=None):
+def make_budget(budget_against=None, cost_center=None):
+ if budget_against == "Project":
+ budget_list = frappe.get_all("Budget", fields=["name"], filters = {"name": ("like", "_Test Project/_Test Fiscal Year 2013%")})
+ else:
+ budget_list = frappe.get_all("Budget", fields=["name"], filters = {"name": ("like", "_Test Cost Center - _TC/_Test Fiscal Year 2013%")})
+ for d in budget_list:
+ frappe.db.sql("delete from `tabBudget` where name = %(name)s", d)
+ frappe.db.sql("delete from `tabBudget Account` where parent = %(name)s", d)
+
budget = frappe.new_doc("Budget")
- budget.cost_center = cost_center or "_Test Cost Center - _TC"
+
+ if budget_against == "Project":
+ budget.project = "_Test Project"
+ else:
+ budget.cost_center =cost_center or "_Test Cost Center - _TC"
+
+
budget.fiscal_year = "_Test Fiscal Year 2013"
budget.monthly_distribution = "_Test Distribution"
budget.company = "_Test Company"
budget.action_if_annual_budget_exceeded = "Stop"
budget.action_if_accumulated_monthly_budget_exceeded = "Ignore"
-
+ budget.budget_against = budget_against
budget.append("accounts", {
"account": "_Test Account Cost for Goods Sold - _TC",
"budget_amount": 100000
diff --git a/erpnext/accounts/doctype/c_form/c_form.json b/erpnext/accounts/doctype/c_form/c_form.json
index e5643dc..a59fd18 100644
--- a/erpnext/accounts/doctype/c_form/c_form.json
+++ b/erpnext/accounts/doctype/c_form/c_form.json
@@ -22,6 +22,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -49,6 +50,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 0,
@@ -76,6 +78,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "C-Form No",
"length": 0,
"no_copy": 0,
@@ -102,6 +105,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Received Date",
"length": 0,
"no_copy": 0,
@@ -128,6 +132,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -155,6 +160,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -182,6 +188,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -209,6 +216,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Quarter",
"length": 0,
"no_copy": 0,
@@ -236,6 +244,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Amount",
"length": 0,
"no_copy": 0,
@@ -263,6 +272,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "State",
"length": 0,
"no_copy": 0,
@@ -289,6 +299,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -314,6 +325,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Invoices",
"length": 0,
"no_copy": 0,
@@ -341,6 +353,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Invoiced Amount",
"length": 0,
"no_copy": 0,
@@ -368,6 +381,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -386,7 +400,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -395,7 +409,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 3,
- "modified": "2016-11-03 15:50:37.408315",
+ "modified": "2016-11-07 05:51:03.273512",
"modified_by": "Administrator",
"module": "Accounts",
"name": "C-Form",
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.js b/erpnext/accounts/doctype/cost_center/cost_center.js
index 83ecc9f..5d11005 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.js
+++ b/erpnext/accounts/doctype/cost_center/cost_center.js
@@ -50,11 +50,11 @@
cur_frm.cscript.hide_unhide_group_ledger = function(doc) {
if (doc.is_group == 1) {
cur_frm.add_custom_button(__('Convert to Non-Group'),
- function() { cur_frm.cscript.convert_to_ledger(); }, "icon-retweet",
+ function() { cur_frm.cscript.convert_to_ledger(); }, "fa fa-retweet",
"btn-default")
} else if (doc.is_group == 0) {
cur_frm.add_custom_button(__('Convert to Group'),
- function() { cur_frm.cscript.convert_to_group(); }, "icon-retweet",
+ function() { cur_frm.cscript.convert_to_group(); }, "fa fa-retweet",
"btn-default")
}
}
diff --git a/erpnext/accounts/doctype/cost_center/cost_center.json b/erpnext/accounts/doctype/cost_center/cost_center.json
index 1656ef5..f590b5d 100644
--- a/erpnext/accounts/doctype/cost_center/cost_center.json
+++ b/erpnext/accounts/doctype/cost_center/cost_center.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Cost Center Name",
"length": 0,
"no_copy": 1,
@@ -78,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Parent Cost Center",
"length": 0,
"no_copy": 0,
@@ -107,6 +110,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -136,6 +140,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -163,6 +168,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Group",
"length": 0,
"no_copy": 0,
@@ -190,6 +196,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "lft",
"length": 0,
"no_copy": 1,
@@ -218,6 +225,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "rgt",
"length": 0,
"no_copy": 1,
@@ -246,6 +254,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "old_parent",
"length": 0,
"no_copy": 1,
@@ -266,7 +275,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-money",
+ "icon": "fa fa-money",
"idx": 1,
"image_view": 0,
"in_create": 1,
@@ -276,7 +285,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-11-03 15:50:55.467294",
+ "modified": "2016-11-07 05:20:40.282432",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Cost Center",
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.js b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
index e7812c3..a516557 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.js
@@ -15,7 +15,7 @@
if (!doc.__islocal && (doc.name != sys_defaults.fiscal_year)) {
this.frm.add_custom_button(__("Default"),
- this.frm.cscript.set_as_default, "icon-star");
+ this.frm.cscript.set_as_default, "fa fa-star");
this.frm.set_intro(__("To set this Fiscal Year as Default, click on 'Set as Default'"));
} else {
this.frm.set_intro("");
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
index fcbd72c..f8284e6 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year.json
@@ -131,7 +131,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-calendar",
+ "icon": "fa fa-calendar",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index 71008a6..cb3aea0 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -8,11 +8,14 @@
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 0,
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "posting_date",
"fieldtype": "Date",
"hidden": 0,
@@ -20,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Posting Date",
"length": 0,
"no_copy": 0,
@@ -29,6 +33,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -39,6 +44,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "transaction_date",
"fieldtype": "Date",
"hidden": 0,
@@ -46,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Transaction Date",
"length": 0,
"no_copy": 0,
@@ -55,6 +62,7 @@
"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,
@@ -65,6 +73,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "account",
"fieldtype": "Link",
"hidden": 0,
@@ -72,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Account",
"length": 0,
"no_copy": 0,
@@ -82,6 +92,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -92,6 +103,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "party_type",
"fieldtype": "Link",
"hidden": 0,
@@ -99,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Party Type",
"length": 0,
"no_copy": 0,
@@ -107,6 +120,7 @@
"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,
@@ -117,6 +131,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "party",
"fieldtype": "Dynamic Link",
"hidden": 0,
@@ -124,6 +139,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Party",
"length": 0,
"no_copy": 0,
@@ -132,6 +148,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -142,6 +159,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "cost_center",
"fieldtype": "Link",
"hidden": 0,
@@ -149,6 +167,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Cost Center",
"length": 0,
"no_copy": 0,
@@ -159,6 +178,7 @@
"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,
@@ -169,6 +189,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "debit",
"fieldtype": "Currency",
"hidden": 0,
@@ -176,6 +197,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Debit Amount",
"length": 0,
"no_copy": 0,
@@ -187,6 +209,7 @@
"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,
@@ -197,6 +220,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "credit",
"fieldtype": "Currency",
"hidden": 0,
@@ -204,6 +228,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit Amount",
"length": 0,
"no_copy": 0,
@@ -215,6 +240,7 @@
"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,
@@ -225,6 +251,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "account_currency",
"fieldtype": "Link",
"hidden": 0,
@@ -232,6 +259,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Account Currency",
"length": 0,
"no_copy": 0,
@@ -241,6 +269,7 @@
"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,
@@ -251,6 +280,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "debit_in_account_currency",
"fieldtype": "Currency",
"hidden": 0,
@@ -258,6 +288,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Debit Amount in Account Currency",
"length": 0,
"no_copy": 0,
@@ -267,6 +298,7 @@
"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,
@@ -277,6 +309,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "credit_in_account_currency",
"fieldtype": "Currency",
"hidden": 0,
@@ -284,6 +317,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit Amount in Account Currency",
"length": 0,
"no_copy": 0,
@@ -293,6 +327,7 @@
"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,
@@ -303,6 +338,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "against",
"fieldtype": "Text",
"hidden": 0,
@@ -310,6 +346,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Against",
"length": 0,
"no_copy": 0,
@@ -319,6 +356,7 @@
"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,
@@ -329,6 +367,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "against_voucher_type",
"fieldtype": "Link",
"hidden": 0,
@@ -336,6 +375,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Against Voucher Type",
"length": 0,
"no_copy": 0,
@@ -346,6 +386,7 @@
"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,
@@ -356,6 +397,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "against_voucher",
"fieldtype": "Dynamic Link",
"hidden": 0,
@@ -363,6 +405,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Against Voucher",
"length": 0,
"no_copy": 0,
@@ -373,6 +416,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -383,6 +427,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "voucher_type",
"fieldtype": "Link",
"hidden": 0,
@@ -390,6 +435,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Voucher Type",
"length": 0,
"no_copy": 0,
@@ -400,6 +446,7 @@
"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,
@@ -410,6 +457,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "voucher_no",
"fieldtype": "Dynamic Link",
"hidden": 0,
@@ -417,6 +465,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Voucher No",
"length": 0,
"no_copy": 0,
@@ -427,6 +476,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -437,6 +487,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "project",
"fieldtype": "Link",
"hidden": 0,
@@ -444,6 +495,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -453,6 +505,7 @@
"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,
@@ -463,6 +516,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "remarks",
"fieldtype": "Text",
"hidden": 0,
@@ -470,6 +524,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Remarks",
"length": 0,
"no_copy": 1,
@@ -479,6 +534,7 @@
"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,
@@ -489,6 +545,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "is_opening",
"fieldtype": "Select",
"hidden": 0,
@@ -496,6 +553,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Opening",
"length": 0,
"no_copy": 0,
@@ -506,6 +564,7 @@
"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,
@@ -516,6 +575,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "is_advance",
"fieldtype": "Select",
"hidden": 0,
@@ -523,6 +583,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Advance",
"length": 0,
"no_copy": 0,
@@ -533,6 +594,7 @@
"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,
@@ -543,6 +605,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "fiscal_year",
"fieldtype": "Link",
"hidden": 0,
@@ -550,6 +613,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Fiscal Year",
"length": 0,
"no_copy": 0,
@@ -560,6 +624,7 @@
"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,
@@ -570,6 +635,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "company",
"fieldtype": "Link",
"hidden": 0,
@@ -577,6 +643,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -587,6 +654,7 @@
"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,
@@ -596,15 +664,16 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-list",
+ "icon": "fa fa-list",
"idx": 1,
+ "image_view": 0,
"in_create": 1,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-05-26 16:22:03.094536",
+ "modified": "2016-12-15 14:44:41.098790",
"modified_by": "Administrator",
"module": "Accounts",
"name": "GL Entry",
@@ -620,6 +689,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -640,6 +710,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -660,6 +731,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index ced56d0..c98e77f 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -20,7 +20,7 @@
group_by_voucher: 0
};
frappe.set_route("query-report", "General Ledger");
- }, "icon-table");
+ }, "fa fa-table");
}
if (frm.doc.__islocal) {
@@ -35,6 +35,14 @@
multi_currency: function(frm) {
erpnext.journal_entry.toggle_fields_based_on_currency(frm);
+ },
+
+ posting_date: function(frm) {
+ if(!frm.doc.multi_currency) return;
+
+ $.each(frm.doc.accounts || [], function(i, row) {
+ erpnext.journal_entry.set_exchange_rate(frm, row.doctype, row.name);
+ })
}
})
@@ -345,7 +353,7 @@
});
}
},
-
+
debit_in_account_currency: function(frm, cdt, cdn) {
erpnext.journal_entry.set_exchange_rate(frm, cdt, cdn);
},
@@ -420,6 +428,7 @@
frappe.call({
method: "erpnext.accounts.doctype.journal_entry.journal_entry.get_exchange_rate",
args: {
+ posting_date: frm.doc.posting_date,
account: row.account,
account_currency: row.account_currency,
company: frm.doc.company,
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.json b/erpnext/accounts/doctype/journal_entry/journal_entry.json
index 90a5397..112112f 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -23,10 +23,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-flag",
+ "options": "fa fa-flag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -79,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Entry Type",
"length": 0,
"no_copy": 0,
@@ -108,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -137,6 +141,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -164,6 +169,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Posting Date",
"length": 0,
"no_copy": 1,
@@ -192,6 +198,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -221,11 +228,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-table",
+ "options": "fa fa-table",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -249,6 +257,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accounting Entries",
"length": 0,
"no_copy": 0,
@@ -278,6 +287,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -304,6 +314,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Reference Number",
"length": 0,
"no_copy": 1,
@@ -332,6 +343,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reference Date",
"length": 0,
"no_copy": 1,
@@ -360,6 +372,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "User Remark",
"length": 0,
"no_copy": 1,
@@ -388,6 +401,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -413,6 +427,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Debit",
"length": 0,
"no_copy": 1,
@@ -442,6 +457,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Credit",
"length": 0,
"no_copy": 1,
@@ -472,6 +488,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Difference (Dr - Cr)",
"length": 0,
"no_copy": 1,
@@ -502,6 +519,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Make Difference Entry",
"length": 0,
"no_copy": 0,
@@ -529,6 +547,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Multi Currency",
"length": 0,
"no_copy": 0,
@@ -556,6 +575,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Amount Currency",
"length": 0,
"no_copy": 1,
@@ -584,6 +604,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Total Amount",
"length": 0,
"no_copy": 1,
@@ -611,6 +632,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Amount in Words",
"length": 0,
"no_copy": 1,
@@ -637,10 +659,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reference",
"length": 0,
"no_copy": 0,
- "options": "icon-pushpin",
+ "options": "fa fa-pushpin",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -664,6 +687,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Clearance Date",
"length": 0,
"no_copy": 1,
@@ -693,6 +717,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Remark",
"length": 0,
"no_copy": 1,
@@ -721,6 +746,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -746,6 +772,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Bill No",
"length": 0,
"no_copy": 0,
@@ -774,6 +801,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Bill Date",
"length": 0,
"no_copy": 0,
@@ -802,6 +830,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Due Date",
"length": 0,
"no_copy": 0,
@@ -831,6 +860,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off",
"length": 0,
"no_copy": 0,
@@ -860,6 +890,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Based On",
"length": 0,
"no_copy": 0,
@@ -888,6 +919,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Get Outstanding Invoices",
"length": 0,
"no_copy": 0,
@@ -915,6 +947,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -942,6 +975,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Amount",
"length": 0,
"no_copy": 0,
@@ -969,6 +1003,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Printing Settings",
"length": 0,
"no_copy": 0,
@@ -985,7 +1020,7 @@
"unique": 0
},
{
- "allow_on_submit": 0,
+ "allow_on_submit": 1,
"bold": 0,
"collapsible": 0,
"columns": 0,
@@ -996,6 +1031,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Pay To / Recd From",
"length": 0,
"no_copy": 1,
@@ -1022,6 +1058,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1048,6 +1085,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -1075,6 +1113,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Heading",
"length": 0,
"no_copy": 1,
@@ -1104,11 +1143,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1132,6 +1172,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -1161,6 +1202,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Opening",
"length": 0,
"no_copy": 0,
@@ -1191,6 +1233,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Stock Entry",
"length": 0,
"no_copy": 0,
@@ -1219,6 +1262,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -1239,7 +1283,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 176,
"image_view": 0,
"in_create": 0,
@@ -1249,7 +1293,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-11-03 15:52:10.053886",
+ "modified": "2016-11-07 05:53:46.738161",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Journal Entry",
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 6ea163b..cd79363 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -37,8 +37,13 @@
self.validate_credit_debit_note()
self.validate_empty_accounts_table()
self.set_account_and_party_balance()
+ self.clear_zero_debit_credit_row()
if not self.title:
self.title = self.get_title()
+
+ def clear_zero_debit_credit_row(self):
+ self.accounts = [account for account in self.accounts
+ if not (account.debit_in_account_currency==0.0 and account.credit_in_account_currency==0.0)]
def on_submit(self):
self.check_credit_limit()
@@ -321,8 +326,9 @@
if d.account_currency == self.company_currency:
d.exchange_rate = 1
elif not d.exchange_rate or d.exchange_rate == 1 or \
- (d.reference_type in ("Sales Invoice", "Purchase Invoice") and d.reference_name):
- d.exchange_rate = get_exchange_rate(d.account, d.account_currency, self.company,
+ (d.reference_type in ("Sales Invoice", "Purchase Invoice") and d.reference_name and d.posting_date):
+ # Modified to include the posting date for which to retreive the exchange rate
+ d.exchange_rate = get_exchange_rate(self.posting_date, d.account, d.account_currency, self.company,
d.reference_type, d.reference_name, d.debit, d.credit, d.exchange_rate)
if not d.exchange_rate:
@@ -643,7 +649,9 @@
cost_center = frappe.db.get_value("Company", ref_doc.company, "cost_center")
exchange_rate = 1
if args.get("party_account"):
- exchange_rate = get_exchange_rate(args.get("party_account"), args.get("party_account_currency"),
+ # Modified to include the posting date for which the exchange rate is required.
+ # Assumed to be the posting date in the reference document
+ exchange_rate = get_exchange_rate(ref_doc.posting_date, args.get("party_account"), args.get("party_account_currency"),
ref_doc.company, ref_doc.doctype, ref_doc.name)
je = frappe.new_doc("Journal Entry")
@@ -676,7 +684,9 @@
bank_account = get_default_bank_cash_account(ref_doc.company, "Bank", account=args.get("bank_account"))
if bank_account:
bank_row.update(bank_account)
- bank_row.exchange_rate = get_exchange_rate(bank_account["account"],
+ # Modified to include the posting date for which the exchange rate is required.
+ # Assumed to be the posting date of the reference date
+ bank_row.exchange_rate = get_exchange_rate(ref_doc.posting_date, bank_account["account"],
bank_account["account_currency"], ref_doc.company)
bank_row.cost_center = cost_center
@@ -800,7 +810,10 @@
"party_type": party_type,
"account_type": account_details.account_type,
"account_currency": account_details.account_currency or company_currency,
- "exchange_rate": get_exchange_rate(account, account_details.account_currency,
+
+ # The date used to retreive the exchange rate here is the date passed in
+ # as an argument to this function. It is assumed to be the date on which the balance is sought
+ "exchange_rate": get_exchange_rate(date, account, account_details.account_currency,
company, debit=debit, credit=credit, exchange_rate=exchange_rate)
}
@@ -810,8 +823,9 @@
return grid_values
+# Added posting_date as one of the parameters of get_exchange_rate
@frappe.whitelist()
-def get_exchange_rate(account, account_currency=None, company=None,
+def get_exchange_rate(posting_date, account, account_currency=None, company=None,
reference_type=None, reference_name=None, debit=None, credit=None, exchange_rate=None):
from erpnext.setup.utils import get_exchange_rate
account_details = frappe.db.get_value("Account", account,
@@ -837,9 +851,10 @@
(account_details.root_type == "Liability" and debit)):
exchange_rate = get_average_exchange_rate(account)
- if not exchange_rate and account_currency:
- exchange_rate = get_exchange_rate(account_currency, company_currency)
-
+ # The date used to retreive the exchange rate here is the date passed
+ # in as an argument to this function.
+ if not exchange_rate and account_currency and posting_date:
+ exchange_rate = get_exchange_rate(account_currency, company_currency, posting_date)
else:
exchange_rate = 1
diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
index 3e609ce..b4bb542 100644
--- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
@@ -171,8 +171,25 @@
})
jv.submit()
+
+ def test_clear_blank_rows(self):
+ je = make_journal_entry("_Test Bank - _TC", "_Test Account Stock Expenses - _TC", 100, save=False)
+ je.append("accounts", {
+ "account": "_Test Cash - _TC",
+ "debit_in_account_currency": 0,
+ "credit_in_account_currency": 0,
+ "exchange_rate": 1
+ })
+
+ self.assertEqual(len(je.get("accounts")), 3)
+ je.save()
+ self.assertEqual(len(je.get("accounts")), 2)
+
-def make_journal_entry(account1, account2, amount, cost_center=None, posting_date=None, exchange_rate=1, save=True, submit=False):
+def make_journal_entry(account1, account2, amount, cost_center=None, posting_date=None, exchange_rate=1, save=True, submit=False, project=None):
+ if not cost_center:
+ cost_center = "_Test Cost Center - _TC"
+
jv = frappe.new_doc("Journal Entry")
jv.posting_date = posting_date or "2013-02-14"
jv.company = "_Test Company"
@@ -182,12 +199,14 @@
{
"account": account1,
"cost_center": cost_center,
+ "project": project,
"debit_in_account_currency": amount if amount > 0 else 0,
"credit_in_account_currency": abs(amount) if amount < 0 else 0,
"exchange_rate": exchange_rate
}, {
"account": account2,
"cost_center": cost_center,
+ "project": project,
"credit_in_account_currency": amount if amount > 0 else 0,
"debit_in_account_currency": abs(amount) if amount < 0 else 0,
"exchange_rate": exchange_rate
diff --git a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
index 26519ac..923e87d 100644
--- a/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
+++ b/erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
@@ -3,16 +3,20 @@
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:mode_of_payment",
+ "beta": 0,
"creation": "2012-12-04 17:49:20",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "mode_of_payment",
"fieldtype": "Data",
"hidden": 0,
@@ -20,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mode of Payment",
"length": 0,
"no_copy": 0,
@@ -29,6 +34,7 @@
"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,
@@ -39,6 +45,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "type",
"fieldtype": "Select",
"hidden": 0,
@@ -46,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Type",
"length": 0,
"no_copy": 0,
@@ -55,6 +63,7 @@
"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,
@@ -65,6 +74,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "accounts",
"fieldtype": "Table",
"hidden": 0,
@@ -72,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accounts",
"length": 0,
"no_copy": 0,
@@ -81,6 +92,7 @@
"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,
@@ -90,15 +102,16 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-credit-card",
+ "icon": "fa fa-credit-card",
"idx": 1,
+ "image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-04-26 11:48:17.411796",
+ "modified": "2016-11-07 05:54:39.560399",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Mode of Payment",
@@ -114,6 +127,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -134,6 +148,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
diff --git a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
index 7af7f48..2340340 100644
--- a/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
+++ b/erpnext/accounts/doctype/monthly_distribution/monthly_distribution.json
@@ -25,6 +25,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Distribution Name",
"length": 0,
"no_copy": 0,
@@ -53,6 +54,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Fiscal Year",
"length": 0,
"no_copy": 0,
@@ -82,6 +84,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Monthly Distribution Percentages",
"length": 0,
"no_copy": 0,
@@ -102,7 +105,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index ce0cb50..d3dbd31 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -120,50 +120,21 @@
set_dynamic_labels: function(frm) {
var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
- var field_label_map = {};
- var grid_field_label_map = {};
-
- var setup_field_label_map = function(fields_list, currency, parentfield) {
- var doctype = parentfield ? frm.fields_dict[parentfield].grid.doctype : frm.doc.doctype;
- $.each(fields_list, function(i, fname) {
- var docfield = frappe.meta.docfield_map[doctype][fname];
- if(docfield) {
- var label = __(docfield.label || "").replace(/\([^\)]*\)/g, "");
- if(parentfield) {
- grid_field_label_map[doctype + "-" + fname] =
- label.trim() + " (" + __(currency) + ")";
- } else {
- field_label_map[fname] = label.trim() + " (" + currency + ")";
- }
- }
- });
- }
-
- setup_field_label_map(["base_paid_amount", "base_received_amount", "base_total_allocated_amount",
+ frm.set_currency_labels(["base_paid_amount", "base_received_amount", "base_total_allocated_amount",
"difference_amount"], company_currency);
- setup_field_label_map(["paid_amount"], frm.doc.paid_from_account_currency);
- setup_field_label_map(["received_amount"], frm.doc.paid_to_account_currency);
+ frm.set_currency_labels(["paid_amount"], frm.doc.paid_from_account_currency);
+ frm.set_currency_labels(["received_amount"], frm.doc.paid_to_account_currency);
var party_account_currency = frm.doc.payment_type=="Receive" ?
frm.doc.paid_from_account_currency : frm.doc.paid_to_account_currency;
- setup_field_label_map(["total_allocated_amount", "unallocated_amount"], party_account_currency);
+ frm.set_currency_labels(["total_allocated_amount", "unallocated_amount"], party_account_currency);
- $.each(field_label_map, function(fname, label) {
- me.frm.fields_dict[fname].set_label(label);
- });
-
- setup_field_label_map(["total_amount", "outstanding_amount", "allocated_amount"],
+ frm.set_currency_labels(["total_amount", "outstanding_amount", "allocated_amount"],
party_account_currency, "references");
- setup_field_label_map(["amount"], company_currency, "deductions");
-
- $.each(grid_field_label_map, function(fname, label) {
- fname = fname.split("-");
- var df = frappe.meta.get_docfield(fname[0], fname[1], me.frm.doc.name);
- if(df) df.label = label;
- });
+ frm.set_currency_labels(["amount"], company_currency, "deductions");
cur_frm.set_df_property("source_exchange_rate", "description",
("1 " + frm.doc.paid_from_account_currency + " = [?] " + company_currency));
@@ -185,7 +156,7 @@
group_by_voucher: 0
};
frappe.set_route("query-report", "General Ledger");
- }, "icon-table");
+ }, "fa fa-table");
}
},
@@ -356,6 +327,7 @@
frappe.call({
method: "erpnext.setup.utils.get_exchange_rate",
args: {
+ transaction_date: frm.doc.posting_date,
from_currency: from_currency,
to_currency: to_currency
},
@@ -364,6 +336,10 @@
}
})
},
+
+ posting_date: function(frm) {
+ frm.events.paid_from_account_currency(frm);
+ },
source_exchange_rate: function(frm) {
if (frm.doc.paid_amount) {
@@ -454,6 +430,7 @@
method: 'erpnext.accounts.doctype.payment_entry.payment_entry.get_outstanding_reference_documents',
args: {
args: {
+ "posting_date": frm.doc.posting_date,
"company": frm.doc.company,
"party_type": frm.doc.party_type,
"payment_type": frm.doc.payment_type,
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json
index c8a9082..c56a83d 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Type of Payment",
"length": 0,
"no_copy": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 0,
@@ -78,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Payment Type",
"length": 0,
"no_copy": 0,
@@ -107,6 +110,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Party Type",
"length": 0,
"no_copy": 0,
@@ -136,6 +140,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Party",
"length": 0,
"no_copy": 0,
@@ -153,17 +158,19 @@
"unique": 0
},
{
- "allow_on_submit": 0,
+ "allow_on_submit": 1,
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "description": "",
"fieldname": "party_name",
"fieldtype": "Data",
- "hidden": 1,
+ "hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Party Name",
"length": 0,
"no_copy": 0,
@@ -171,7 +178,7 @@
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
- "read_only": 1,
+ "read_only": 0,
"remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
@@ -191,6 +198,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -218,6 +226,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Posting Date",
"length": 0,
"no_copy": 0,
@@ -245,6 +254,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -273,6 +283,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Mode of Payment",
"length": 0,
"no_copy": 0,
@@ -301,6 +312,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accounts",
"length": 0,
"no_copy": 0,
@@ -329,6 +341,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Party Balance",
"length": 0,
"no_copy": 0,
@@ -357,6 +370,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Account Paid From",
"length": 0,
"no_copy": 0,
@@ -386,6 +400,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Account Currency",
"length": 0,
"no_copy": 0,
@@ -415,6 +430,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Account Balance",
"length": 0,
"no_copy": 0,
@@ -443,6 +459,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -470,6 +487,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Account Paid To",
"length": 0,
"no_copy": 0,
@@ -499,6 +517,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Account Currency",
"length": 0,
"no_copy": 0,
@@ -528,6 +547,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Account Balance",
"length": 0,
"no_copy": 0,
@@ -558,6 +578,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amount",
"length": 0,
"no_copy": 0,
@@ -586,6 +607,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Paid Amount",
"length": 0,
"no_copy": 0,
@@ -615,6 +637,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -643,6 +666,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Paid Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -671,6 +695,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -698,6 +723,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Received Amount",
"length": 0,
"no_copy": 0,
@@ -727,6 +753,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -755,6 +782,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Received Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -785,6 +813,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reference",
"length": 0,
"no_copy": 0,
@@ -814,6 +843,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Allocate Payment Amount",
"length": 0,
"no_copy": 0,
@@ -842,6 +872,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Payment References",
"length": 0,
"no_copy": 0,
@@ -871,6 +902,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Writeoff",
"length": 0,
"no_copy": 0,
@@ -899,6 +931,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Allocated Amount",
"length": 0,
"no_copy": 0,
@@ -927,6 +960,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Allocated Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -955,6 +989,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Set Exchange Gain / Loss",
"length": 0,
"no_copy": 0,
@@ -982,6 +1017,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1009,6 +1045,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Unallocated Amount",
"length": 0,
"no_copy": 0,
@@ -1037,6 +1074,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Difference Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1066,6 +1104,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Difference Amount",
"length": 0,
"no_copy": 0,
@@ -1095,6 +1134,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Deductions or Loss",
"length": 0,
"no_copy": 0,
@@ -1122,6 +1162,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Payment Deductions or Loss",
"length": 0,
"no_copy": 0,
@@ -1150,6 +1191,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Transaction ID",
"length": 0,
"no_copy": 0,
@@ -1178,6 +1220,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Cheque/Reference No",
"length": 0,
"no_copy": 0,
@@ -1205,6 +1248,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1232,6 +1276,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Cheque/Reference Date",
"length": 0,
"no_copy": 0,
@@ -1260,6 +1305,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Clearance Date",
"length": 0,
"no_copy": 1,
@@ -1289,6 +1335,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
@@ -1317,6 +1364,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -1345,6 +1393,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Remarks",
"length": 0,
"no_copy": 0,
@@ -1372,6 +1421,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1398,6 +1448,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -1426,6 +1477,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Heading",
"length": 0,
"no_copy": 0,
@@ -1454,6 +1506,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -1481,6 +1534,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 0,
@@ -1507,7 +1561,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 15:52:35.329427",
+ "modified": "2016-11-07 05:33:40.371480",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Entry",
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index 936b329..02d2b6b 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -153,11 +153,11 @@
self.source_exchange_rate = get_average_exchange_rate(self.paid_from)
else:
self.source_exchange_rate = get_exchange_rate(self.paid_from_account_currency,
- self.company_currency)
+ self.company_currency, self.posting_date)
if self.paid_to and not self.target_exchange_rate:
self.target_exchange_rate = get_exchange_rate(self.paid_to_account_currency,
- self.company_currency)
+ self.company_currency, self.posting_date)
def validate_mandatory(self):
for field in ("paid_amount", "received_amount", "source_exchange_rate", "target_exchange_rate"):
@@ -482,12 +482,12 @@
d["exchange_rate"] = frappe.db.get_value(d.voucher_type, d.voucher_no, "conversion_rate")
# Get all SO / PO which are not fully billed or aginst which full advance not paid
- orders_to_be_billed = get_orders_to_be_billed(args.get("party_type"), args.get("party"),
+ orders_to_be_billed = get_orders_to_be_billed(args.get("posting_date"),args.get("party_type"), args.get("party"),
party_account_currency, company_currency)
return negative_outstanding_invoices + outstanding_invoices + orders_to_be_billed
-def get_orders_to_be_billed(party_type, party, party_account_currency, company_currency):
+def get_orders_to_be_billed(posting_date, party_type, party, party_account_currency, company_currency):
voucher_type = 'Sales Order' if party_type == "Customer" else 'Purchase Order'
ref_field = "base_grand_total" if party_account_currency == company_currency else "grand_total"
@@ -517,7 +517,9 @@
order_list = []
for d in orders:
d["voucher_type"] = voucher_type
- d["exchange_rate"] = get_exchange_rate(party_account_currency, company_currency)
+ # This assumes that the exchange rate required is the one in the SO
+ d["exchange_rate"] = get_exchange_rate(party_account_currency,
+ company_currency, posting_date)
order_list.append(d)
return order_list
@@ -592,14 +594,19 @@
exchange_rate = 1
else:
total_amount = ref_doc.grand_total
+
+ # Get the exchange rate from the original ref doc
+ # or get it based on the posting date of the ref doc
exchange_rate = ref_doc.get("conversion_rate") or \
- get_exchange_rate(party_account_currency, ref_doc.company_currency)
+ get_exchange_rate(party_account_currency, ref_doc.company_currency, ref_doc.posting_date)
outstanding_amount = ref_doc.get("outstanding_amount") \
if reference_doctype in ("Sales Invoice", "Purchase Invoice") \
else flt(total_amount) - flt(ref_doc.advance_paid)
else:
- exchange_rate = get_exchange_rate(party_account_currency, ref_doc.company_currency)
+ # Get the exchange rate based on the posting date of the ref doc
+ exchange_rate = get_exchange_rate(party_account_currency,
+ ref_doc.company_currency, ref_doc.posting_date)
return frappe._dict({
"due_date": ref_doc.get("due_date"),
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
index ef617b0..fc4edae 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -388,7 +388,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-resize-horizontal",
+ "icon": "fa fa-resize-horizontal",
"idx": 0,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/accounts/doctype/payment_request/payment_request.json b/erpnext/accounts/doctype/payment_request/payment_request.json
index 3619ccb..e6a3131 100644
--- a/erpnext/accounts/doctype/payment_request/payment_request.json
+++ b/erpnext/accounts/doctype/payment_request/payment_request.json
@@ -10,6 +10,7 @@
"doctype": "DocType",
"document_type": "",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
@@ -23,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -51,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Recipient Message And Payment Details",
"length": 0,
"no_copy": 0,
@@ -79,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Format",
"length": 0,
"no_copy": 0,
@@ -107,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "To",
"length": 0,
"no_copy": 0,
@@ -134,6 +139,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Subject",
"length": 0,
"no_copy": 0,
@@ -161,6 +167,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -187,6 +194,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Payment Gateway Account",
"length": 0,
"no_copy": 0,
@@ -215,6 +223,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Transaction Currency",
"length": 0,
"no_copy": 0,
@@ -244,6 +253,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amount",
"length": 0,
"no_copy": 0,
@@ -273,6 +283,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 0,
@@ -302,6 +313,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Make Sales Invoice",
"length": 0,
"no_copy": 0,
@@ -329,6 +341,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -355,6 +368,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Message",
"length": 0,
"no_copy": 0,
@@ -382,6 +396,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Message Examples",
"length": 0,
"no_copy": 0,
@@ -410,6 +425,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mute Email",
"length": 0,
"no_copy": 1,
@@ -437,6 +453,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "payment_url",
"length": 0,
"no_copy": 0,
@@ -465,6 +482,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Payment Gateway Details",
"length": 0,
"no_copy": 0,
@@ -492,6 +510,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Payment Gateway",
"length": 0,
"no_copy": 0,
@@ -520,6 +539,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Payment Account",
"length": 0,
"no_copy": 0,
@@ -548,6 +568,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reference Details",
"length": 0,
"no_copy": 0,
@@ -575,6 +596,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Reference Doctype",
"length": 0,
"no_copy": 1,
@@ -603,6 +625,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Reference Name",
"length": 0,
"no_copy": 1,
@@ -631,6 +654,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -657,7 +681,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-12-12 13:30:42.858205",
+ "modified": "2016-12-15 14:46:19.662816",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Request",
diff --git a/erpnext/accounts/doctype/payment_request/test_payment_request.py b/erpnext/accounts/doctype/payment_request/test_payment_request.py
index 73c412f..bf3e24f 100644
--- a/erpnext/accounts/doctype/payment_request/test_payment_request.py
+++ b/erpnext/accounts/doctype/payment_request/test_payment_request.py
@@ -9,7 +9,6 @@
from erpnext.accounts.doctype.payment_request.payment_request import make_payment_request
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
from erpnext.setup.utils import get_exchange_rate
-# test_records = frappe.get_test_records('Payment Request')
test_dependencies = ["Currency Exchange", "Journal Entry", "Contact", "Address"]
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
index a092e56..c5ded6d 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
@@ -30,7 +30,7 @@
group_by_voucher: 0
};
frappe.set_route("query-report", "General Ledger");
- }, "icon-table");
+ }, "fa fa-table");
}
}
diff --git a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
index ceb0faa..fb4ca2f 100644
--- a/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
+++ b/erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
@@ -3,27 +3,35 @@
"allow_import": 0,
"allow_rename": 0,
"autoname": "PCE/.###",
+ "beta": 0,
"creation": "2013-01-10 16:34:07",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break0",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
"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,
@@ -35,12 +43,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "transaction_date",
"fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Transaction Date",
"length": 0,
"no_copy": 0,
@@ -48,7 +59,9 @@
"oldfieldtype": "Date",
"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,
@@ -59,12 +72,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "posting_date",
"fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Posting Date",
"length": 0,
"no_copy": 0,
@@ -72,7 +88,9 @@
"oldfieldtype": "Date",
"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,
@@ -83,12 +101,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "fiscal_year",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Closing Fiscal Year",
"length": 0,
"no_copy": 0,
@@ -97,7 +118,9 @@
"options": "Fiscal Year",
"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,
@@ -108,12 +131,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "amended_from",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -122,7 +148,9 @@
"options": "Period Closing Voucher",
"permlevel": 0,
"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,
@@ -133,12 +161,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "company",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -147,7 +178,9 @@
"options": "Company",
"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,
@@ -158,18 +191,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break1",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
"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,
@@ -180,13 +218,16 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "The account head under Liability or Equity, in which Profit/Loss will be booked",
"fieldname": "closing_account_head",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Closing Account Head",
"length": 0,
"no_copy": 0,
@@ -195,7 +236,9 @@
"options": "Account",
"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,
@@ -206,12 +249,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "remarks",
"fieldtype": "Small Text",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Remarks",
"length": 0,
"no_copy": 0,
@@ -219,7 +265,9 @@
"oldfieldtype": "Small Text",
"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,
@@ -229,15 +277,16 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 1,
+ "image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 1,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2015-11-16 06:29:51.671436",
+ "modified": "2016-11-07 05:32:15.691681",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Period Closing Voucher",
@@ -253,6 +302,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -273,6 +323,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -284,10 +335,12 @@
"write": 1
}
],
+ "quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"search_fields": "posting_date, fiscal_year",
"sort_field": "modified",
"sort_order": "DESC",
- "title_field": "closing_account_head"
+ "title_field": "closing_account_head",
+ "track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.json b/erpnext/accounts/doctype/pos_profile/pos_profile.json
index e6cfd74..cef56af 100644
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.json
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.json
@@ -22,6 +22,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Applicable for User",
"length": 0,
"no_copy": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -82,6 +84,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Update Stock",
"length": 0,
"no_copy": 0,
@@ -109,6 +112,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Warehouse",
"length": 0,
"no_copy": 0,
@@ -138,6 +142,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Campaign",
"length": 0,
"no_copy": 0,
@@ -166,6 +171,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Ignore Pricing Rule",
"length": 0,
"no_copy": 0,
@@ -193,6 +199,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -219,6 +226,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -248,6 +256,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -277,6 +286,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency",
"length": 0,
"no_copy": 0,
@@ -299,14 +309,15 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "allow_partial_payment",
+ "fieldname": "allow_delete",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Allow Partial Payment",
+ "in_standard_filter": 0,
+ "label": "Allow Delete",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -333,6 +344,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -359,6 +371,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Invoice Payment",
"length": 0,
"no_copy": 0,
@@ -387,6 +400,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -413,6 +427,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Groups",
"length": 0,
"no_copy": 0,
@@ -441,6 +456,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -467,6 +483,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Groups",
"length": 0,
"no_copy": 0,
@@ -495,6 +512,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -522,6 +540,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Format",
"length": 0,
"no_copy": 0,
@@ -550,6 +569,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -579,6 +599,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Heading",
"length": 0,
"no_copy": 0,
@@ -608,6 +629,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
@@ -637,6 +659,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -664,6 +687,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Territory",
"length": 0,
"no_copy": 0,
@@ -693,6 +717,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List",
"length": 0,
"no_copy": 0,
@@ -722,6 +747,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Apply Discount",
"length": 0,
"no_copy": 0,
@@ -751,6 +777,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Apply Discount On",
"length": 0,
"no_copy": 0,
@@ -779,6 +806,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -806,6 +834,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Account",
"length": 0,
"no_copy": 0,
@@ -834,6 +863,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Cost Center",
"length": 0,
"no_copy": 0,
@@ -862,6 +892,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Account for Change Amount",
"length": 0,
"no_copy": 0,
@@ -890,6 +921,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -919,6 +951,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -945,6 +978,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Income Account",
"length": 0,
"no_copy": 0,
@@ -975,6 +1009,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Expense Account",
"length": 0,
"no_copy": 0,
@@ -1002,6 +1037,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Cost Center",
"length": 0,
"no_copy": 0,
@@ -1031,8 +1067,8 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-17 00:20:51.377850",
- "modified_by": "rohit@erpnext.com",
+ "modified": "2016-12-12 17:02:22.323006",
+ "modified_by": "Administrator",
"module": "Accounts",
"name": "POS Profile",
"owner": "Administrator",
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
index 4c22b0d..5a3e651 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.js
@@ -4,7 +4,7 @@
frappe.ui.form.on("Pricing Rule", "refresh", function(frm) {
var help_content = ['<table class="table table-bordered" style="background-color: #f9f9f9;">',
'<tr><td>',
- '<h4><i class="icon-hand-right"></i> ',
+ '<h4><i class="fa fa-hand-right"></i> ',
__('Notes'),
':</h4>',
'<ul>',
@@ -23,7 +23,7 @@
'</ul>',
'</td></tr>',
'<tr><td>',
- '<h4><i class="icon-question-sign"></i> ',
+ '<h4><i class="fa fa-question-sign"></i> ',
__('How Pricing Rule is applied?'),
'</h4>',
'<ol>',
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index 28b47ed..fdf3db9 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -49,6 +50,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -77,6 +79,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Apply On",
"length": 0,
"no_copy": 0,
@@ -105,6 +108,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Item Code",
"length": 0,
"no_copy": 0,
@@ -133,6 +137,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Brand",
"length": 0,
"no_copy": 0,
@@ -161,6 +166,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Item Group",
"length": 0,
"no_copy": 0,
@@ -188,6 +194,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -215,6 +222,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Priority",
"length": 0,
"no_copy": 0,
@@ -242,6 +250,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Disable",
"length": 0,
"no_copy": 0,
@@ -268,6 +277,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -294,6 +304,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Selling",
"length": 0,
"no_copy": 0,
@@ -320,6 +331,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Buying",
"length": 0,
"no_copy": 0,
@@ -346,6 +358,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -373,6 +386,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Applicable For",
"length": 0,
"no_copy": 0,
@@ -401,6 +415,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -429,6 +444,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Group",
"length": 0,
"no_copy": 0,
@@ -457,6 +473,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Territory",
"length": 0,
"no_copy": 0,
@@ -485,6 +502,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Partner",
"length": 0,
"no_copy": 0,
@@ -513,6 +531,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Campaign",
"length": 0,
"no_copy": 0,
@@ -541,6 +560,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier",
"length": 0,
"no_copy": 0,
@@ -569,6 +589,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Type",
"length": 0,
"no_copy": 0,
@@ -596,6 +617,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -622,6 +644,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Min Qty",
"length": 0,
"no_copy": 0,
@@ -648,6 +671,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -674,6 +698,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Max Qty",
"length": 0,
"no_copy": 0,
@@ -700,6 +725,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -727,6 +753,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Valid From",
"length": 0,
"no_copy": 0,
@@ -753,6 +780,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Valid Upto",
"length": 0,
"no_copy": 0,
@@ -779,6 +807,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -804,6 +833,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -832,6 +862,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Margin",
"length": 0,
"no_copy": 0,
@@ -860,6 +891,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Margin Type",
"length": 0,
"no_copy": 0,
@@ -888,6 +920,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -916,6 +949,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Margin Rate or Amount",
"length": 0,
"no_copy": 0,
@@ -943,6 +977,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -970,6 +1005,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price or Discount",
"length": 0,
"no_copy": 0,
@@ -997,6 +1033,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1023,6 +1060,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price",
"length": 0,
"no_copy": 0,
@@ -1050,6 +1088,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Discount on Price List Rate (%)",
"length": 0,
"no_copy": 0,
@@ -1077,6 +1116,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "For Price List",
"length": 0,
"no_copy": 0,
@@ -1104,6 +1144,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -1131,6 +1172,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Pricing Rule Help",
"length": 0,
"no_copy": 0,
@@ -1148,7 +1190,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-gift",
+ "icon": "fa fa-gift",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -1157,7 +1199,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 15:54:12.674744",
+ "modified": "2016-11-07 05:19:31.478456",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Pricing Rule",
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index 3b3184c..9928227 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -11,6 +11,7 @@
from frappe.utils import flt, cint
from frappe.model.document import Document
+
class MultiplePricingRuleConflict(frappe.ValidationError): pass
class PricingRule(Document):
@@ -113,8 +114,19 @@
args_copy = copy.deepcopy(args)
args_copy.update(item)
out.append(get_pricing_rule_for_item(args_copy))
-
+ out.append(get_serial_no_for_item(args_copy))
return out
+
+def get_serial_no_for_item(args):
+ from erpnext.stock.get_item_details import get_serial_no
+ item_details = frappe._dict({
+ "doctype": args.doctype,
+ "name": args.name,
+ "serial_no": args.serial_no
+ })
+ if args.get("parenttype") in ("Sales Invoice", "Delivery Note"):
+ item_details.serial_no = get_serial_no(args)
+ return item_details
def get_pricing_rule_for_item(args):
if args.get("parenttype") == "Material Request": return {}
@@ -286,7 +298,7 @@
pricing_rules = filter(lambda x: x.for_price_list==args.price_list, pricing_rules) \
or pricing_rules
- if len(pricing_rules) > 1:
+ if len(pricing_rules) > 1 and not args.for_shopping_cart:
frappe.throw(_("Multiple Price Rules exists with same criteria, please resolve conflict by assigning priority. Price Rules: {0}")
.format("\n".join([d.name for d in pricing_rules])), MultiplePricingRuleConflict)
elif pricing_rules:
@@ -320,4 +332,4 @@
elif args.customer:
args.transaction_type = "selling"
else:
- args.transaction_type = "buying"
+ args.transaction_type = "buying"
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
index 4ac81b1..b6378f1 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.js
@@ -8,7 +8,7 @@
erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({
onload: function() {
this._super();
-
+
if(!this.frm.doc.__islocal) {
// show credit_to in print format
if(!this.frm.doc.supplier && this.frm.doc.credit_to) {
@@ -32,7 +32,7 @@
if(doc.update_stock==1 && doc.docstatus==1) {
this.show_stock_ledger();
}
-
+
if(!doc.is_return && doc.docstatus==1) {
if(doc.outstanding_amount != 0) {
this.frm.add_custom_button(__('Payment'), this.make_payment_entry, __("Make"));
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 95e1ccf..2791d6f 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -80,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Supplier",
"length": 0,
"no_copy": 0,
@@ -110,6 +113,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Name",
"length": 0,
"no_copy": 0,
@@ -139,6 +143,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Invoice No",
"length": 0,
"no_copy": 0,
@@ -167,6 +172,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Paid",
"length": 0,
"no_copy": 0,
@@ -195,6 +201,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Return",
"length": 0,
"no_copy": 1,
@@ -222,6 +229,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -250,6 +258,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date",
"length": 0,
"no_copy": 0,
@@ -278,6 +287,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Due Date",
"length": 0,
"no_copy": 0,
@@ -306,6 +316,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Invoice Date",
"length": 0,
"no_copy": 0,
@@ -334,6 +345,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -363,6 +375,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -391,6 +404,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Return Against Purchase Invoice",
"length": 0,
"no_copy": 1,
@@ -419,6 +433,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address and Contact",
"length": 0,
"no_copy": 0,
@@ -446,6 +461,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Select Supplier Address",
"length": 0,
"no_copy": 0,
@@ -473,6 +489,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Person",
"length": 0,
"no_copy": 0,
@@ -501,6 +518,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address",
"length": 0,
"no_copy": 0,
@@ -527,6 +545,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
@@ -553,6 +572,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No",
"length": 0,
"no_copy": 0,
@@ -579,6 +599,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Email",
"length": 0,
"no_copy": 0,
@@ -605,6 +626,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -632,6 +654,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Select Shipping Address",
"length": 0,
"no_copy": 0,
@@ -660,6 +683,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Address",
"length": 0,
"no_copy": 0,
@@ -687,10 +711,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -714,6 +739,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency",
"length": 0,
"no_copy": 0,
@@ -744,6 +770,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -773,6 +800,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -798,6 +826,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List",
"length": 0,
"no_copy": 0,
@@ -825,6 +854,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Currency",
"length": 0,
"no_copy": 0,
@@ -852,6 +882,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -879,6 +910,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Ignore Pricing Rule",
"length": 0,
"no_copy": 1,
@@ -905,11 +937,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -934,6 +967,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Update Stock",
"length": 0,
"no_copy": 0,
@@ -961,6 +995,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -990,6 +1025,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1015,6 +1051,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1044,6 +1081,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1073,6 +1111,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1098,6 +1137,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total",
"length": 0,
"no_copy": 0,
@@ -1126,6 +1166,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total",
"length": 0,
"no_copy": 0,
@@ -1155,11 +1196,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1183,6 +1225,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1212,6 +1255,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1241,6 +1285,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Calculation",
"length": 0,
"no_copy": 0,
@@ -1268,11 +1313,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1296,6 +1342,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Added (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1325,6 +1372,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Deducted (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1354,6 +1402,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1383,6 +1432,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1409,6 +1459,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Added",
"length": 0,
"no_copy": 0,
@@ -1438,6 +1489,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Deducted",
"length": 0,
"no_copy": 0,
@@ -1467,6 +1519,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1496,6 +1549,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount",
"length": 0,
"no_copy": 0,
@@ -1524,6 +1578,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Apply Additional Discount On",
"length": 0,
"no_copy": 0,
@@ -1552,6 +1607,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1580,6 +1636,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1606,6 +1663,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Percentage",
"length": 0,
"no_copy": 0,
@@ -1633,6 +1691,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount",
"length": 0,
"no_copy": 0,
@@ -1661,6 +1720,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1687,6 +1747,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Grand Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1717,6 +1778,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1745,6 +1807,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -1772,6 +1835,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Grand Total",
"length": 0,
"no_copy": 0,
@@ -1801,6 +1865,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words",
"length": 0,
"no_copy": 0,
@@ -1829,6 +1894,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Advance",
"length": 0,
"no_copy": 1,
@@ -1858,6 +1924,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Outstanding Amount",
"length": 0,
"no_copy": 1,
@@ -1889,6 +1956,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Payments",
"length": 0,
"no_copy": 0,
@@ -1916,6 +1984,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mode of Payment",
"length": 0,
"no_copy": 0,
@@ -1944,6 +2013,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Cash/Bank Account",
"length": 0,
"no_copy": 0,
@@ -1972,6 +2042,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1999,6 +2070,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Paid Amount",
"length": 0,
"no_copy": 1,
@@ -2027,6 +2099,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Paid Amount (Company Currency)",
"length": 0,
"no_copy": 1,
@@ -2057,6 +2130,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off",
"length": 0,
"no_copy": 0,
@@ -2084,6 +2158,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Amount",
"length": 0,
"no_copy": 1,
@@ -2111,6 +2186,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Amount (Company Currency)",
"length": 0,
"no_copy": 1,
@@ -2139,6 +2215,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2166,6 +2243,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Account",
"length": 0,
"no_copy": 0,
@@ -2194,6 +2272,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Cost Center",
"length": 0,
"no_copy": 0,
@@ -2222,11 +2301,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Advance Payments",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2250,6 +2330,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Get Advances Paid",
"length": 0,
"no_copy": 0,
@@ -2278,6 +2359,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Advances",
"length": 0,
"no_copy": 1,
@@ -2308,10 +2390,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2335,6 +2418,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms",
"length": 0,
"no_copy": 0,
@@ -2362,6 +2446,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions1",
"length": 0,
"no_copy": 0,
@@ -2388,6 +2473,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Raw Materials Supplied",
"length": 0,
"no_copy": 0,
@@ -2416,6 +2502,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Raw Materials Supplied",
"length": 0,
"no_copy": 0,
@@ -2444,6 +2531,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Warehouse",
"length": 0,
"no_copy": 1,
@@ -2474,6 +2562,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplied Items",
"length": 0,
"no_copy": 0,
@@ -2502,6 +2591,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Printing Settings",
"length": 0,
"no_copy": 0,
@@ -2529,6 +2619,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -2557,6 +2648,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Heading",
"length": 0,
"no_copy": 1,
@@ -2586,6 +2678,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Language",
"length": 0,
"no_copy": 0,
@@ -2613,11 +2706,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2642,6 +2736,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit To",
"length": 0,
"no_copy": 0,
@@ -2671,6 +2766,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Party Account Currency",
"length": 0,
"no_copy": 1,
@@ -2701,6 +2797,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Opening",
"length": 0,
"no_copy": 0,
@@ -2730,6 +2827,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Against Expense Account",
"length": 0,
"no_copy": 1,
@@ -2758,6 +2856,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2812,6 +2911,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Posting Time",
"length": 0,
"no_copy": 1,
@@ -2841,6 +2941,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Remarks",
"length": 0,
"no_copy": 1,
@@ -2870,6 +2971,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rejected Warehouse",
"length": 0,
"no_copy": 1,
@@ -2900,10 +3002,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Recurring Invoice",
"length": 0,
"no_copy": 0,
- "options": "icon-time",
+ "options": "fa fa-time",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2929,6 +3032,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Recurring",
"length": 0,
"no_copy": 1,
@@ -2957,6 +3061,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Recurring Type",
"length": 0,
"no_copy": 1,
@@ -2986,6 +3091,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "From Date",
"length": 0,
"no_copy": 1,
@@ -3014,6 +3120,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "To Date",
"length": 0,
"no_copy": 1,
@@ -3041,6 +3148,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Submit on creation",
"length": 0,
"no_copy": 0,
@@ -3070,6 +3178,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Notify by email",
"length": 0,
"no_copy": 1,
@@ -3099,6 +3208,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Repeat on Day of Month",
"length": 0,
"no_copy": 1,
@@ -3127,6 +3237,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "End Date",
"length": 0,
"no_copy": 1,
@@ -3153,6 +3264,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -3181,6 +3293,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Next Date",
"length": 0,
"no_copy": 1,
@@ -3209,6 +3322,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Recurring Id",
"length": 0,
"no_copy": 1,
@@ -3237,6 +3351,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Notification Email Address",
"length": 0,
"no_copy": 1,
@@ -3264,6 +3379,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Recurring Print Format",
"length": 0,
"no_copy": 0,
@@ -3283,7 +3399,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 204,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index d4e20f9..6f8e219 100755
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Item",
"length": 0,
"no_copy": 0,
@@ -33,6 +34,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -51,12 +53,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -75,6 +79,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Name",
"length": 0,
"no_copy": 0,
@@ -84,6 +89,7 @@
"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,
@@ -102,6 +108,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -110,6 +117,7 @@
"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,
@@ -128,6 +136,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -138,6 +147,7 @@
"print_hide_if_no_value": 0,
"print_width": "300px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -157,6 +167,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
@@ -165,6 +176,7 @@
"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,
@@ -183,6 +195,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image View",
"length": 0,
"no_copy": 0,
@@ -192,6 +205,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -210,6 +224,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Quantity and Rate",
"length": 0,
"no_copy": 0,
@@ -217,6 +232,7 @@
"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,
@@ -235,6 +251,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Received Qty",
"length": 0,
"no_copy": 0,
@@ -243,6 +260,7 @@
"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,
@@ -261,6 +279,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Qty",
"length": 0,
"no_copy": 0,
@@ -270,6 +289,7 @@
"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,
@@ -288,6 +308,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rejected Qty",
"length": 0,
"no_copy": 0,
@@ -296,6 +317,7 @@
"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,
@@ -314,12 +336,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -338,6 +362,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "UOM",
"length": 0,
"no_copy": 0,
@@ -346,6 +371,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -364,6 +390,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Conversion Factor",
"length": 0,
"no_copy": 0,
@@ -371,6 +398,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -389,12 +417,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -413,6 +443,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Rate",
"length": 0,
"no_copy": 0,
@@ -421,6 +452,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -440,6 +472,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Discount on Price List Rate (%)",
"length": 0,
"no_copy": 0,
@@ -447,6 +480,7 @@
"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,
@@ -465,12 +499,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -489,6 +525,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Rate (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -497,6 +534,7 @@
"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,
@@ -515,12 +553,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -539,6 +579,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Rate ",
"length": 0,
"no_copy": 0,
@@ -549,6 +590,7 @@
"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,
@@ -567,6 +609,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Amount",
"length": 0,
"no_copy": 0,
@@ -577,6 +620,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -595,12 +639,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -619,6 +665,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rate (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -629,6 +676,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -647,6 +695,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -657,6 +706,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -675,6 +725,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Pricing Rule",
"length": 0,
"no_copy": 0,
@@ -683,6 +734,7 @@
"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,
@@ -701,6 +753,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -708,6 +761,7 @@
"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,
@@ -726,6 +780,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Rate",
"length": 0,
"no_copy": 0,
@@ -735,6 +790,7 @@
"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,
@@ -753,6 +809,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Amount",
"length": 0,
"no_copy": 0,
@@ -762,6 +819,7 @@
"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,
@@ -780,6 +838,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -787,6 +846,7 @@
"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,
@@ -805,6 +865,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Rate (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -814,6 +875,7 @@
"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,
@@ -832,6 +894,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -841,6 +904,7 @@
"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,
@@ -859,6 +923,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Warehouse",
"length": 0,
"no_copy": 0,
@@ -867,6 +932,7 @@
"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,
@@ -886,6 +952,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accepted Warehouse",
"length": 0,
"no_copy": 0,
@@ -895,6 +962,7 @@
"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,
@@ -913,6 +981,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rejected Warehouse",
"length": 0,
"no_copy": 0,
@@ -922,6 +991,37 @@
"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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "quality_inspection",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Quality Inspection",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Quality Inspection",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -940,6 +1040,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Batch No",
"length": 0,
"no_copy": 0,
@@ -949,6 +1050,7 @@
"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,
@@ -967,6 +1069,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -975,6 +1078,7 @@
"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,
@@ -993,6 +1097,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Serial No",
"length": 0,
"no_copy": 0,
@@ -1001,6 +1106,7 @@
"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,
@@ -1019,6 +1125,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rejected Serial No",
"length": 0,
"no_copy": 1,
@@ -1027,6 +1134,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1045,6 +1153,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accounting",
"length": 0,
"no_copy": 0,
@@ -1052,6 +1161,7 @@
"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,
@@ -1070,6 +1180,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Expense Head",
"length": 0,
"no_copy": 0,
@@ -1081,6 +1192,7 @@
"print_hide_if_no_value": 0,
"print_width": "120px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1100,12 +1212,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -1124,6 +1238,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -1132,6 +1247,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1152,6 +1268,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Cost Center",
"length": 0,
"no_copy": 0,
@@ -1163,6 +1280,7 @@
"print_hide_if_no_value": 0,
"print_width": "120px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1182,6 +1300,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reference",
"length": 0,
"no_copy": 0,
@@ -1189,6 +1308,7 @@
"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,
@@ -1207,6 +1327,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Brand",
"length": 0,
"no_copy": 0,
@@ -1216,6 +1337,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1235,6 +1357,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Group",
"length": 0,
"no_copy": 0,
@@ -1245,6 +1368,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -1264,6 +1388,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Tax Rate",
"length": 0,
"no_copy": 0,
@@ -1273,6 +1398,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 1,
"reqd": 0,
"search_index": 0,
@@ -1291,6 +1417,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Tax Amount",
"length": 0,
"no_copy": 1,
@@ -1300,6 +1427,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1319,6 +1447,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Order",
"length": 0,
"no_copy": 1,
@@ -1329,6 +1458,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -1347,6 +1477,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "BOM",
"length": 0,
"no_copy": 0,
@@ -1356,6 +1487,7 @@
"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,
@@ -1374,12 +1506,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -1398,6 +1532,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Fixed Asset",
"length": 0,
"no_copy": 1,
@@ -1406,6 +1541,7 @@
"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,
@@ -1425,6 +1561,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Asset",
"length": 0,
"no_copy": 1,
@@ -1434,6 +1571,7 @@
"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,
@@ -1452,6 +1590,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Order Item",
"length": 0,
"no_copy": 1,
@@ -1461,6 +1600,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -1479,6 +1619,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Receipt",
"length": 0,
"no_copy": 1,
@@ -1489,6 +1630,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -1507,6 +1649,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Page Break",
"length": 0,
"no_copy": 1,
@@ -1514,6 +1657,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 1,
"reqd": 0,
"search_index": 0,
@@ -1532,6 +1676,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "PR Detail",
"length": 0,
"no_copy": 1,
@@ -1541,6 +1686,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -1559,6 +1705,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Valuation Rate",
"length": 0,
"no_copy": 1,
@@ -1567,6 +1714,7 @@
"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,
@@ -1585,6 +1733,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Raw Materials Supplied Cost",
"length": 0,
"no_copy": 1,
@@ -1593,6 +1742,7 @@
"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,
@@ -1611,6 +1761,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Landed Cost Voucher Amount",
"length": 0,
"no_copy": 1,
@@ -1619,6 +1770,7 @@
"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,
@@ -1636,7 +1788,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-08-26 04:37:23.737537",
+ "modified": "2016-11-16 16:04:52.465169",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",
diff --git a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
index 3390cc2..50426df 100644
--- a/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
+++ b/erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -52,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Default",
"length": 0,
"no_copy": 0,
@@ -78,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Disabled",
"length": 0,
"no_copy": 0,
@@ -105,6 +108,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -132,6 +136,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -159,6 +164,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -186,6 +192,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -206,7 +213,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-money",
+ "icon": "fa fa-money",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -215,7 +222,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 15:55:01.611520",
+ "modified": "2016-11-07 05:18:44.095798",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Taxes and Charges Template",
diff --git a/erpnext/accounts/doctype/sales_invoice/pos.py b/erpnext/accounts/doctype/sales_invoice/pos.py
index 75d98c5..3619e98 100644
--- a/erpnext/accounts/doctype/sales_invoice/pos.py
+++ b/erpnext/accounts/doctype/sales_invoice/pos.py
@@ -3,7 +3,6 @@
from __future__ import unicode_literals
import frappe, json
-from frappe import _
from frappe.utils import nowdate
from erpnext.setup.utils import get_exchange_rate
from erpnext.stock.get_item_details import get_pos_profile
@@ -63,8 +62,10 @@
doc.currency = pos_profile.get('currency') or company_data.default_currency
doc.conversion_rate = 1.0
+
if doc.currency != company_data.default_currency:
- doc.conversion_rate = get_exchange_rate(doc.currency, company_data.default_currency)
+ doc.conversion_rate = get_exchange_rate(doc.currency, company_data.default_currency, doc.posting_date)
+
doc.selling_price_list = pos_profile.get('selling_price_list') or \
frappe.db.get_value('Selling Settings', None, 'selling_price_list')
doc.naming_series = pos_profile.get('naming_series') or 'SINV-'
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 216b73a..2a07389 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -24,10 +24,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -52,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -79,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -108,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -138,6 +142,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Name",
"length": 0,
"no_copy": 0,
@@ -166,6 +171,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is POS",
"length": 0,
"no_copy": 0,
@@ -195,6 +201,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Return",
"length": 0,
"no_copy": 1,
@@ -222,6 +229,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Offline POS Name",
"length": 0,
"no_copy": 0,
@@ -249,6 +257,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -276,6 +285,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date",
"length": 0,
"no_copy": 1,
@@ -304,6 +314,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Payment Due Date",
"length": 0,
"no_copy": 1,
@@ -332,6 +343,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -361,6 +373,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -390,6 +403,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -420,6 +434,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Return Against Sales Invoice",
"length": 0,
"no_copy": 1,
@@ -449,6 +464,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address and Contact",
"length": 0,
"no_copy": 0,
@@ -476,6 +492,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Address",
"length": 0,
"no_copy": 0,
@@ -503,6 +520,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address",
"length": 0,
"no_copy": 0,
@@ -529,6 +547,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Person",
"length": 0,
"no_copy": 0,
@@ -556,6 +575,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
@@ -582,6 +602,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No",
"length": 0,
"no_copy": 0,
@@ -608,6 +629,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Email",
"length": 0,
"no_copy": 0,
@@ -635,6 +657,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -661,6 +684,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Address Name",
"length": 0,
"no_copy": 0,
@@ -689,6 +713,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Address",
"length": 0,
"no_copy": 0,
@@ -717,6 +742,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Group",
"length": 0,
"no_copy": 0,
@@ -744,6 +770,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Territory",
"length": 0,
"no_copy": 0,
@@ -773,6 +800,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
@@ -800,6 +828,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency",
"length": 0,
"no_copy": 0,
@@ -830,6 +859,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -859,6 +889,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -885,6 +916,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List",
"length": 0,
"no_copy": 0,
@@ -914,6 +946,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Currency",
"length": 0,
"no_copy": 0,
@@ -942,6 +975,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -969,6 +1003,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Ignore Pricing Rule",
"length": 0,
"no_copy": 1,
@@ -995,11 +1030,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1023,6 +1059,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Update Stock",
"length": 0,
"no_copy": 0,
@@ -1051,6 +1088,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -1080,10 +1118,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Packing List",
"length": 0,
"no_copy": 0,
- "options": "icon-suitcase",
+ "options": "fa fa-suitcase",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -1107,6 +1146,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Packed Items",
"length": 0,
"no_copy": 0,
@@ -1134,6 +1174,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Product Bundle Help",
"length": 0,
"no_copy": 0,
@@ -1162,6 +1203,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Time Sheet List",
"length": 0,
"no_copy": 0,
@@ -1189,6 +1231,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Time Sheets",
"length": 0,
"no_copy": 0,
@@ -1218,6 +1261,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Billing Amount",
"length": 0,
"no_copy": 0,
@@ -1245,6 +1289,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1270,6 +1315,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1298,6 +1344,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1327,6 +1374,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1352,6 +1400,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total",
"length": 0,
"no_copy": 0,
@@ -1379,6 +1428,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total",
"length": 0,
"no_copy": 0,
@@ -1407,11 +1457,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1435,6 +1486,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1464,6 +1516,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1489,6 +1542,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Rule",
"length": 0,
"no_copy": 0,
@@ -1517,6 +1571,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1542,6 +1597,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1571,6 +1627,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Calculation",
"length": 0,
"no_copy": 0,
@@ -1598,6 +1655,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1623,6 +1681,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1652,6 +1711,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1678,6 +1738,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1706,6 +1767,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount",
"length": 0,
"no_copy": 0,
@@ -1734,6 +1796,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Apply Additional Discount On",
"length": 0,
"no_copy": 0,
@@ -1762,6 +1825,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1790,6 +1854,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1815,6 +1880,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Percentage",
"length": 0,
"no_copy": 0,
@@ -1842,6 +1908,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount",
"length": 0,
"no_copy": 0,
@@ -1869,11 +1936,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -1897,6 +1965,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Grand Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1926,6 +1995,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rounded Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1956,6 +2026,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1984,6 +2055,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -2011,6 +2083,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Grand Total",
"length": 0,
"no_copy": 0,
@@ -2040,6 +2113,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rounded Total",
"length": 0,
"no_copy": 0,
@@ -2069,6 +2143,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words",
"length": 0,
"no_copy": 0,
@@ -2097,6 +2172,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Advance",
"length": 0,
"no_copy": 0,
@@ -2126,6 +2202,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Outstanding Amount",
"length": 0,
"no_copy": 1,
@@ -2156,11 +2233,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Advance Payments",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2184,6 +2262,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Get Advances Received",
"length": 0,
"no_copy": 0,
@@ -2212,6 +2291,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Advances",
"length": 0,
"no_copy": 0,
@@ -2243,10 +2323,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Payments",
"length": 0,
"no_copy": 0,
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2271,6 +2352,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Cash/Bank Account",
"length": 0,
"no_copy": 0,
@@ -2300,6 +2382,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Invoice Payment",
"length": 0,
"no_copy": 0,
@@ -2328,6 +2411,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2354,6 +2438,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Paid Amount (Company Currency)",
"length": 0,
"no_copy": 1,
@@ -2382,6 +2467,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2409,6 +2495,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Paid Amount",
"length": 0,
"no_copy": 1,
@@ -2438,6 +2525,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2464,6 +2552,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Base Change Amount (Company Currency)",
"length": 0,
"no_copy": 1,
@@ -2492,6 +2581,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2518,6 +2608,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Change Amount",
"length": 0,
"no_copy": 1,
@@ -2546,6 +2637,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Account for Change Amount",
"length": 0,
"no_copy": 0,
@@ -2576,6 +2668,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off",
"length": 0,
"no_copy": 0,
@@ -2604,6 +2697,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Amount",
"length": 0,
"no_copy": 1,
@@ -2631,6 +2725,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Amount (Company Currency)",
"length": 0,
"no_copy": 1,
@@ -2660,6 +2755,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Outstanding Amount",
"length": 0,
"no_copy": 0,
@@ -2687,6 +2783,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2714,6 +2811,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Account",
"length": 0,
"no_copy": 0,
@@ -2742,6 +2840,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Cost Center",
"length": 0,
"no_copy": 0,
@@ -2770,6 +2869,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms",
"length": 0,
"no_copy": 0,
@@ -2798,6 +2898,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms",
"length": 0,
"no_copy": 0,
@@ -2827,6 +2928,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions Details",
"length": 0,
"no_copy": 0,
@@ -2855,6 +2957,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Printing Settings",
"length": 0,
"no_copy": 0,
@@ -2882,6 +2985,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -2911,6 +3015,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Language",
"length": 0,
"no_copy": 0,
@@ -2938,6 +3043,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2964,6 +3070,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Heading",
"length": 0,
"no_copy": 1,
@@ -2994,6 +3101,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
@@ -3022,6 +3130,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Campaign",
"length": 0,
"no_copy": 0,
@@ -3051,6 +3160,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -3106,6 +3216,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Source",
"length": 0,
"no_copy": 0,
@@ -3135,11 +3246,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accounting Details",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -3164,6 +3276,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Debit To",
"length": 0,
"no_copy": 0,
@@ -3193,6 +3306,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Party Account Currency",
"length": 0,
"no_copy": 1,
@@ -3223,6 +3337,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Opening Entry",
"length": 0,
"no_copy": 0,
@@ -3252,6 +3367,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "C-Form Applicable",
"length": 0,
"no_copy": 1,
@@ -3279,6 +3395,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "C-Form No",
"length": 0,
"no_copy": 1,
@@ -3306,6 +3423,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -3332,6 +3450,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Posting Time",
"length": 0,
"no_copy": 1,
@@ -3360,6 +3479,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Remarks",
"length": 0,
"no_copy": 1,
@@ -3389,11 +3509,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Commission",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-group",
+ "options": "fa fa-group",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -3417,6 +3538,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Partner",
"length": 0,
"no_copy": 0,
@@ -3446,6 +3568,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -3473,6 +3596,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Commission Rate (%)",
"length": 0,
"no_copy": 0,
@@ -3501,6 +3625,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Commission",
"length": 0,
"no_copy": 0,
@@ -3531,6 +3656,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Team",
"length": 0,
"no_copy": 0,
@@ -3557,6 +3683,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Team1",
"length": 0,
"no_copy": 0,
@@ -3588,10 +3715,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Recurring",
"length": 0,
"no_copy": 0,
- "options": "icon-time",
+ "options": "fa fa-time",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -3615,6 +3743,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Settings",
"length": 0,
"no_copy": 0,
@@ -3644,6 +3773,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Recurring",
"length": 0,
"no_copy": 1,
@@ -3672,6 +3802,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reference Document",
"length": 0,
"no_copy": 1,
@@ -3701,6 +3832,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Frequency",
"length": 0,
"no_copy": 1,
@@ -3730,6 +3862,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Repeat on Day of Month",
"length": 0,
"no_copy": 1,
@@ -3758,6 +3891,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "End Date",
"length": 0,
"no_copy": 1,
@@ -3785,6 +3919,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Submit on creation",
"length": 0,
"no_copy": 0,
@@ -3814,6 +3949,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Notify by email",
"length": 0,
"no_copy": 1,
@@ -3843,6 +3979,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Notification Email Address",
"length": 0,
"no_copy": 1,
@@ -3871,6 +4008,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Recurring Print Format",
"length": 0,
"no_copy": 0,
@@ -3899,6 +4037,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "This Document",
"length": 0,
"no_copy": 0,
@@ -3928,6 +4067,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "From Date",
"length": 0,
"no_copy": 1,
@@ -3956,6 +4096,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "To Date",
"length": 0,
"no_copy": 1,
@@ -3984,6 +4125,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Next Date",
"length": 0,
"no_copy": 1,
@@ -4010,6 +4152,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Against Income Account",
"length": 0,
"no_copy": 1,
@@ -4029,7 +4172,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 181,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index 7be5a24..944230b 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Barcode",
"length": 0,
"no_copy": 0,
@@ -30,6 +31,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -48,6 +50,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Item",
"length": 0,
"no_copy": 0,
@@ -58,6 +61,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -76,12 +80,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -100,6 +106,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Name",
"length": 0,
"no_copy": 0,
@@ -109,6 +116,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -127,6 +135,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer's Item Code",
"length": 0,
"no_copy": 0,
@@ -134,6 +143,7 @@
"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,
@@ -152,6 +162,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Edit Description",
"length": 0,
"no_copy": 0,
@@ -160,6 +171,7 @@
"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,
@@ -178,6 +190,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -188,6 +201,7 @@
"print_hide_if_no_value": 0,
"print_width": "200px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -207,6 +221,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -214,6 +229,7 @@
"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,
@@ -232,6 +248,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image View",
"length": 0,
"no_copy": 0,
@@ -241,6 +258,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -259,6 +277,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
@@ -267,6 +286,7 @@
"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,
@@ -285,6 +305,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -292,6 +313,7 @@
"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,
@@ -310,6 +332,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Quantity",
"length": 0,
"no_copy": 0,
@@ -319,6 +342,7 @@
"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,
@@ -337,6 +361,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Rate",
"length": 0,
"no_copy": 0,
@@ -347,6 +372,7 @@
"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,
@@ -365,12 +391,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -389,6 +417,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "UOM",
"length": 0,
"no_copy": 0,
@@ -397,6 +426,7 @@
"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,
@@ -415,6 +445,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Rate (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -425,6 +456,7 @@
"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,
@@ -443,6 +475,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Discount and Margin",
"length": 0,
"no_copy": 0,
@@ -451,6 +484,7 @@
"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,
@@ -470,6 +504,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Discount on Price List Rate (%)",
"length": 0,
"no_copy": 0,
@@ -479,6 +514,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -497,6 +533,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -504,6 +541,7 @@
"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,
@@ -523,6 +561,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Margin Type",
"length": 0,
"no_copy": 0,
@@ -532,6 +571,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -551,6 +591,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Margin Rate or Amount",
"length": 0,
"no_copy": 0,
@@ -559,6 +600,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -578,6 +620,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Margin",
"length": 0,
"no_copy": 0,
@@ -586,6 +629,7 @@
"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,
@@ -604,12 +648,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -628,6 +674,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Rate",
"length": 0,
"no_copy": 0,
@@ -638,6 +685,7 @@
"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,
@@ -656,6 +704,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Amount",
"length": 0,
"no_copy": 0,
@@ -666,6 +715,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -684,12 +734,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -708,6 +760,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rate (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -718,6 +771,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -736,6 +790,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -746,6 +801,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -764,6 +820,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Pricing Rule",
"length": 0,
"no_copy": 0,
@@ -772,6 +829,7 @@
"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,
@@ -790,6 +848,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -797,6 +856,7 @@
"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,
@@ -815,6 +875,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Rate",
"length": 0,
"no_copy": 0,
@@ -824,6 +885,7 @@
"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,
@@ -842,6 +904,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Amount",
"length": 0,
"no_copy": 0,
@@ -851,6 +914,7 @@
"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,
@@ -869,6 +933,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -876,6 +941,7 @@
"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,
@@ -894,6 +960,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Rate (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -903,6 +970,7 @@
"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,
@@ -921,6 +989,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -930,6 +999,7 @@
"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,
@@ -949,6 +1019,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Drop Ship",
"length": 0,
"no_copy": 0,
@@ -957,6 +1028,7 @@
"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,
@@ -975,6 +1047,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Delivered By Supplier",
"length": 0,
"no_copy": 0,
@@ -983,6 +1056,7 @@
"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,
@@ -1001,6 +1075,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accounting Details",
"length": 0,
"no_copy": 0,
@@ -1008,6 +1083,7 @@
"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,
@@ -1026,6 +1102,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Income Account",
"length": 0,
"no_copy": 0,
@@ -1037,6 +1114,7 @@
"print_hide_if_no_value": 0,
"print_width": "120px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -1056,6 +1134,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Expense Account",
"length": 0,
"no_copy": 0,
@@ -1064,6 +1143,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1083,12 +1163,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -1108,6 +1190,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Cost Center",
"length": 0,
"no_copy": 0,
@@ -1119,6 +1202,7 @@
"print_hide_if_no_value": 0,
"print_width": "120px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -1139,6 +1223,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Stock Details",
"length": 0,
"no_copy": 0,
@@ -1146,6 +1231,7 @@
"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,
@@ -1164,6 +1250,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Warehouse",
"length": 0,
"no_copy": 0,
@@ -1174,6 +1261,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1192,6 +1280,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Warehouse (Optional)",
"length": 0,
"no_copy": 1,
@@ -1201,6 +1290,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1212,22 +1302,25 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "serial_no",
- "fieldtype": "Small Text",
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "quality_inspection",
+ "fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Serial No",
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Quality Inspection",
"length": 0,
"no_copy": 0,
- "oldfieldname": "serial_no",
- "oldfieldtype": "Small Text",
+ "options": "Quality Inspection",
"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,
@@ -1246,6 +1339,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Batch No",
"length": 0,
"no_copy": 0,
@@ -1254,6 +1348,62 @@
"print_hide": 1,
"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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "col_break5",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "serial_no",
+ "fieldtype": "Small Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 1,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Serial No",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "serial_no",
+ "oldfieldtype": "Small Text",
+ "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,
@@ -1273,6 +1423,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Group",
"length": 0,
"no_copy": 0,
@@ -1283,6 +1434,7 @@
"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,
@@ -1301,6 +1453,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Brand Name",
"length": 0,
"no_copy": 0,
@@ -1310,6 +1463,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1328,6 +1482,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Tax Rate",
"length": 0,
"no_copy": 0,
@@ -1337,30 +1492,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "col_break5",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "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,
@@ -1379,6 +1511,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Available Batch Qty at Warehouse",
"length": 0,
"no_copy": 1,
@@ -1388,6 +1521,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1407,6 +1541,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Available Qty at Warehouse",
"length": 0,
"no_copy": 0,
@@ -1416,6 +1551,7 @@
"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,
@@ -1434,6 +1570,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "References",
"length": 0,
"no_copy": 0,
@@ -1442,6 +1579,7 @@
"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,
@@ -1460,6 +1598,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Order",
"length": 0,
"no_copy": 1,
@@ -1470,6 +1609,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -1488,6 +1628,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Order Item",
"length": 0,
"no_copy": 1,
@@ -1497,6 +1638,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -1515,6 +1657,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1522,6 +1665,7 @@
"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,
@@ -1540,6 +1684,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Delivery Note",
"length": 0,
"no_copy": 1,
@@ -1550,6 +1695,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -1568,6 +1714,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Delivery Note Item",
"length": 0,
"no_copy": 1,
@@ -1577,6 +1724,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -1595,6 +1743,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Delivered Qty",
"length": 0,
"no_copy": 0,
@@ -1604,6 +1753,7 @@
"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,
@@ -1622,6 +1772,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Fixed Asset",
"length": 0,
"no_copy": 1,
@@ -1630,6 +1781,7 @@
"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,
@@ -1648,6 +1800,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Asset",
"length": 0,
"no_copy": 1,
@@ -1657,6 +1810,7 @@
"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,
@@ -1675,6 +1829,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1682,6 +1837,7 @@
"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,
@@ -1700,6 +1856,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Page Break",
"length": 0,
"no_copy": 1,
@@ -1707,6 +1864,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 1,
"reqd": 0,
"search_index": 0,
@@ -1724,7 +1882,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-11-01 13:01:58.844818",
+ "modified": "2016-11-16 16:04:02.438952",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice Item",
diff --git a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
index 77edcb8..894d5ab 100644
--- a/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
+++ b/erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -52,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Default",
"length": 0,
"no_copy": 0,
@@ -78,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Disabled",
"length": 0,
"no_copy": 0,
@@ -105,6 +108,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -130,6 +134,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -159,6 +164,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -185,6 +191,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -205,7 +212,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-money",
+ "icon": "fa fa-money",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -214,7 +221,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 15:55:23.393483",
+ "modified": "2016-11-07 05:18:41.743257",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Taxes and Charges Template",
diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
index 4a4c5c5..a8788a1 100644
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Shipping Rule Label",
"length": 0,
"no_copy": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Disabled",
"length": 0,
"no_copy": 0,
@@ -78,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Calculate Based On",
"length": 0,
"no_copy": 0,
@@ -106,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Rule Conditions",
"length": 0,
"no_copy": 0,
@@ -132,6 +136,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Rule Conditions",
"length": 0,
"no_copy": 0,
@@ -160,6 +165,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Valid for Countries",
"length": 0,
"no_copy": 0,
@@ -186,6 +192,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Worldwide Shipping",
"length": 0,
"no_copy": 0,
@@ -214,6 +221,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Valid for Countries",
"length": 0,
"no_copy": 0,
@@ -243,6 +251,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -268,6 +277,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -295,6 +305,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -320,6 +331,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Account",
"length": 0,
"no_copy": 0,
@@ -347,6 +359,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Cost Center",
"length": 0,
"no_copy": 0,
@@ -365,7 +378,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-truck",
+ "icon": "fa fa-truck",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -374,7 +387,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 15:56:10.088948",
+ "modified": "2016-11-07 05:18:06.472734",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Shipping Rule",
diff --git a/erpnext/accounts/doctype/tax_rule/tax_rule.json b/erpnext/accounts/doctype/tax_rule/tax_rule.json
index 704393a..df7d872 100644
--- a/erpnext/accounts/doctype/tax_rule/tax_rule.json
+++ b/erpnext/accounts/doctype/tax_rule/tax_rule.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Tax Type",
"length": 0,
"no_copy": 0,
@@ -52,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Use for Shopping Cart",
"length": 0,
"no_copy": 0,
@@ -79,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -106,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Tax Template",
"length": 0,
"no_copy": 0,
@@ -135,6 +139,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Tax Template",
"length": 0,
"no_copy": 0,
@@ -163,6 +168,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Filters",
"length": 0,
"no_copy": 0,
@@ -191,6 +197,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -220,6 +227,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier",
"length": 0,
"no_copy": 0,
@@ -248,6 +256,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Billing City",
"length": 0,
"no_copy": 0,
@@ -275,6 +284,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Billing County",
"length": 0,
"no_copy": 0,
@@ -302,6 +312,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Billing State",
"length": 0,
"no_copy": 0,
@@ -329,6 +340,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Billing Country",
"length": 0,
"no_copy": 0,
@@ -357,6 +369,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -384,6 +397,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Group",
"length": 0,
"no_copy": 0,
@@ -413,6 +427,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Type",
"length": 0,
"no_copy": 0,
@@ -441,6 +456,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping City",
"length": 0,
"no_copy": 0,
@@ -468,6 +484,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping County",
"length": 0,
"no_copy": 0,
@@ -495,6 +512,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping State",
"length": 0,
"no_copy": 0,
@@ -522,6 +540,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Country",
"length": 0,
"no_copy": 0,
@@ -550,6 +569,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Validity",
"length": 0,
"no_copy": 0,
@@ -577,6 +597,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "From Date",
"length": 0,
"no_copy": 0,
@@ -604,6 +625,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -630,6 +652,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "To Date",
"length": 0,
"no_copy": 0,
@@ -657,6 +680,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -684,6 +708,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Priority",
"length": 0,
"no_copy": 0,
@@ -711,6 +736,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -737,6 +763,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
diff --git a/erpnext/accounts/page/pos/pos.js b/erpnext/accounts/page/pos/pos.js
index 9aafdae..b2b6aea 100644
--- a/erpnext/accounts/page/pos/pos.js
+++ b/erpnext/accounts/page/pos/pos.js
@@ -107,51 +107,122 @@
show_unsync_invoice_list: function(){
var me = this;
this.si_docs = this.get_doc_from_localstorage();
-
this.list_dialog = new frappe.ui.Dialog({
title: 'Invoice List'
});
this.list_dialog.show();
this.list_body = this.list_dialog.body;
+ if(me.pos_profile_data["allow_delete"]) {
+ this.list_dialog.set_primary_action(__("Delete"), function() {
+ frappe.confirm(__("Delete permanently?"), function () {
+ me.delete_records();
+ })
+ }).addClass("btn-danger");
+ this.toggle_primary_action();
+ }
+
if(this.si_docs.length > 0){
- $(this.list_body).append('<div class="row list-row list-row-head pos-invoice-list">\
- <div class="col-xs-1">Sr</div>\
- <div class="col-xs-3">Customer</div>\
- <div class="col-xs-2 text-left">Status</div>\
- <div class="col-xs-3 text-right">Paid Amount</div>\
- <div class="col-xs-3 text-right">Grand Total</div>\
- </div>')
-
- $.each(this.si_docs, function(index, data){
- for(key in data) {
- $(frappe.render_template("pos_invoice_list", {
- sr: index + 1,
- name: key,
- customer: data[key].customer,
- paid_amount: format_currency(data[key].paid_amount, me.frm.doc.currency),
- grand_total: format_currency(data[key].grand_total, me.frm.doc.currency),
- data: me.get_doctype_status(data[key])
- })).appendTo($(me.list_body));
- }
- })
-
- $(this.list_body).find('.list-row').click(function() {
- me.name = $(this).attr('invoice-name')
- doc_data = me.get_invoice_doc(me.si_docs)
- if(doc_data){
- me.frm.doc = doc_data[0][me.name];
- me.set_missing_values();
- me.refresh(false);
- me.disable_input_field();
- me.list_dialog.hide();
- }
- })
+ me.render_offline_data();
+ me.dialog_actions()
}else{
$(this.list_body).append(repl('<div class="media-heading">%(message)s</div>', {'message': __("All records are synced.")}))
}
},
+ render_offline_data: function() {
+ var me = this;
+
+ this.removed_items = [];
+ $(this.list_body).empty();
+
+ $(this.list_body).append('<div class="row list-row list-row-head pos-invoice-list">\
+ <div class="col-xs-1"><input class="list-select-all" type="checkbox"></div>\
+ <div class="col-xs-3">Customer</div>\
+ <div class="col-xs-2 text-left">Status</div>\
+ <div class="col-xs-3 text-right">Paid Amount</div>\
+ <div class="col-xs-3 text-right">Grand Total</div>\
+ </div>')
+
+ $.each(this.si_docs, function(index, data){
+ for(key in data) {
+ $(frappe.render_template("pos_invoice_list", {
+ sr: index + 1,
+ name: key,
+ customer: data[key].customer,
+ paid_amount: format_currency(data[key].paid_amount, me.frm.doc.currency),
+ grand_total: format_currency(data[key].grand_total, me.frm.doc.currency),
+ data: me.get_doctype_status(data[key])
+ })).appendTo($(me.list_body));
+ }
+ })
+ },
+
+ dialog_actions: function() {
+ var me = this;
+
+ $(this.list_body).find('.list-column').click(function() {
+ me.name = $(this).parents().attr('invoice-name')
+ me.edit_record();
+ })
+
+ $(this.list_body).find('.list-select-all').click(function() {
+ me.removed_items = [];
+ $(me.list_body).find('.list-delete').prop("checked", $(this).is(":checked"))
+ if($(this).is(":checked")) {
+ $.each(me.si_docs, function(index, data){
+ for(key in data) {
+ me.removed_items.push(key)
+ }
+ })
+ }
+
+ me.toggle_primary_action();
+ })
+
+ $(this.list_body).find('.list-delete').click(function() {
+ me.name = $(this).parent().parent().attr('invoice-name');
+ if($(this).is(":checked")) {
+ me.removed_items.push(me.name);
+ } else {
+ me.removed_items.pop(me.name)
+ }
+
+ me.toggle_primary_action();
+ })
+ },
+
+ edit_record: function() {
+ var me = this;
+
+ doc_data = this.get_invoice_doc(this.si_docs);
+ if(doc_data){
+ this.frm.doc = doc_data[0][this.name];
+ this.set_missing_values();
+ this.refresh(false);
+ this.disable_input_field();
+ this.list_dialog.hide();
+ }
+ },
+
+ delete_records: function() {
+ var me = this;
+ this.remove_doc_from_localstorage()
+ this.update_localstorage();
+ this.render_offline_data();
+ this.dialog_actions();
+ this.toggle_primary_action();
+ },
+
+ toggle_primary_action: function() {
+ var me = this;
+ if(this.removed_items && this.removed_items.length > 0) {
+ $(this.list_dialog.wrapper).find('.btn-danger').show();
+ } else {
+ $(this.list_dialog.wrapper).find('.btn-danger').hide();
+ }
+ },
+
get_doctype_status: function(doc){
if(doc.docstatus == 0) {
return {status: "Draft", indicator: "red"}
@@ -229,7 +300,7 @@
},
save_previous_entry : function(){
- if(this.frm.doc.items.length > 0){
+ if(this.frm.doc.docstatus < 1 && this.frm.doc.items.length > 0){
this.create_invoice()
}
},
@@ -256,7 +327,7 @@
frappe.meta.sync(data)
})
- this.print_template = frappe.render_template("print_template",
+ this.print_template_data = frappe.render_template("print_template",
{content: this.print_template, title:"POS",
base_url: frappe.urllib.get_base_url(), print_css: frappe.boot.print_css})
},
@@ -733,10 +804,10 @@
me.update_paid_amount_status(true);
me.create_invoice();
me.make_payment();
- }, "octicon octicon-credit-card");
+ }, "octicon octfa fa-credit-card");
}else if(this.frm.doc.docstatus == 1) {
this.page.set_primary_action(__("Print"), function() {
- html = frappe.render(me.print_template, me.frm.doc)
+ html = frappe.render(me.print_template_data, me.frm.doc)
me.print_document(html)
})
}else {
@@ -746,7 +817,7 @@
this.page.set_secondary_action(__("New"), function() {
me.save_previous_entry();
me.create_new();
- }, "octicon octicon-plus").addClass("btn-primary");
+ }, "octicon octfa fa-plus").addClass("btn-primary");
},
print_dialog: function(){
@@ -759,7 +830,7 @@
]));
$('.print_doc').click(function(){
- html = frappe.render(me.print_template, me.frm.doc)
+ html = frappe.render(me.print_template_data, me.frm.doc)
me.print_document(html)
})
diff --git a/erpnext/accounts/page/pos/pos.json b/erpnext/accounts/page/pos/pos.json
index 31c043c..abd918a 100644
--- a/erpnext/accounts/page/pos/pos.json
+++ b/erpnext/accounts/page/pos/pos.json
@@ -3,7 +3,7 @@
"creation": "2014-08-08 02:45:55.931022",
"docstatus": 0,
"doctype": "Page",
- "icon": "icon-th",
+ "icon": "fa fa-th",
"modified": "2014-08-08 05:59:33.045012",
"modified_by": "Administrator",
"module": "Accounts",
diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
index 8cfbc83..2b7f1f3 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
@@ -31,6 +31,14 @@
options: "Company",
default: frappe.defaults.get_user_default("Company"),
reqd: 1
+ },
+ {
+ fieldname: "budget_against",
+ label: __("Budget Against"),
+ fieldtype: "Select",
+ options: ["Cost Center", "Project"],
+ default: "Cost Center",
+ reqd: 1
}
]
}
diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
index 0be0b3d..875ec99 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.py
@@ -12,7 +12,7 @@
if not filters: filters = {}
columns = get_columns(filters)
- cost_centers = get_cost_centers(filters.company)
+ cost_centers = get_cost_centers(filters)
period_month_ranges = get_period_month_ranges(filters["period"], filters["fiscal_year"])
cam_map = get_cost_center_account_month_map(filters)
@@ -40,7 +40,7 @@
return columns, data
def get_columns(filters):
- columns = [_("Cost Center") + ":Link/Cost Center:120", _("Account") + ":Link/Account:120"]
+ columns = [_(filters.get("budget_against")) + ":Link/%s:120"%(filters.get("budget_against")), _("Account") + ":Link/Account:120"]
group_months = False if filters["period"] == "Monthly" else True
@@ -56,16 +56,23 @@
return columns + [_("Total Target") + ":Float:120", _("Total Actual") + ":Float:120",
_("Total Variance") + ":Float:120"]
-def get_cost_centers(company):
- return frappe.db.sql_list("select name from `tabCost Center` where company=%s order by lft", company)
+def get_cost_centers(filters):
+ cond = "and 1=1"
+ if filters.get("budget_against") == "Cost Center":
+ cond = "order by lft"
+
+ return frappe.db.sql_list("""select name from `tab{tab}` where company=%s
+ {cond}""".format(tab=filters.get("budget_against"), cond=cond), filters.get("company"))
#Get cost center & target details
def get_cost_center_target_details(filters):
return frappe.db.sql("""
- select b.cost_center, b.monthly_distribution, ba.account, ba.budget_amount
+ select b.{budget_against} as budget_against, b.monthly_distribution, ba.account, ba.budget_amount
from `tabBudget` b, `tabBudget Account` ba
- where b.name=ba.parent and b.docstatus = 1 and b.fiscal_year=%s and b.company=%s
- """, (filters.fiscal_year, filters.company), as_dict=True)
+ where b.name=ba.parent and b.docstatus = 1 and b.fiscal_year=%s
+ and b.budget_against = %s and b.company=%s
+ """.format(budget_against=filters.get("budget_against").replace(" ", "_").lower()),
+ (filters.fiscal_year, filters.budget_against, filters.company), as_dict=True)
#Get target distribution details of accounts of cost center
def get_target_distribution_details(filters):
@@ -78,20 +85,26 @@
return target_details
#Get actual details from gl entry
-def get_actual_details(cost_center, fiscal_year):
- cc_lft, cc_rgt = frappe.db.get_value("Cost Center", cost_center, ["lft", "rgt"])
+def get_actual_details(name, filters):
+ cond = "1=1"
+ budget_against=filters.get("budget_against").replace(" ", "_").lower()
+
+ if filters.get("budget_against") == "Cost Center":
+ cc_lft, cc_rgt = frappe.db.get_value("Cost Center", name, ["lft", "rgt"])
+ cond = "lft>='{lft}' and rgt<='{rgt}'".format(lft = cc_lft, rgt=cc_rgt)
ac_details = frappe.db.sql("""select gl.account, gl.debit, gl.credit,
- MONTHNAME(gl.posting_date) as month_name, b.cost_center
+ MONTHNAME(gl.posting_date) as month_name, b.{budget_against} as budget_against
from `tabGL Entry` gl, `tabBudget Account` ba, `tabBudget` b
where
b.name = ba.parent
and b.docstatus = 1
and ba.account=gl.account
and gl.fiscal_year=%s
- and b.cost_center=%s
- and exists(select name from `tabCost Center` where name=gl.cost_center and lft>=%s and rgt<=%s)
- """, (fiscal_year, cost_center, cc_lft, cc_rgt), as_dict=1)
+ and b.{budget_against}=%s
+ and exists(select name from `tab{tab}` where name=gl.{budget_against} and {cond})
+ """.format(tab = filters.budget_against, budget_against = budget_against, cond = cond),
+ (filters.fiscal_year, name), as_dict=1)
cc_actual_details = {}
for d in ac_details:
@@ -107,17 +120,17 @@
cam_map = {}
for ccd in cost_center_target_details:
- actual_details = get_actual_details(ccd.cost_center, filters.fiscal_year)
+ actual_details = get_actual_details(ccd.budget_against, filters)
for month_id in range(1, 13):
month = datetime.date(2013, month_id, 1).strftime('%B')
- cam_map.setdefault(ccd.cost_center, {}).setdefault(ccd.account, {})\
+ cam_map.setdefault(ccd.budget_against, {}).setdefault(ccd.account, {})\
.setdefault(month, frappe._dict({
"target": 0.0, "actual": 0.0
}))
- tav_dict = cam_map[ccd.cost_center][ccd.account][month]
+ tav_dict = cam_map[ccd.budget_against][ccd.account][month]
month_percentage = tdd.get(ccd.monthly_distribution, {}).get(month, 0) \
if ccd.monthly_distribution else 100.0/12
diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
index 5b1742a..4dc8f8c 100644
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -21,7 +21,7 @@
invoice_income_map, income_accounts)
invoice_so_dn_map = get_invoice_so_dn_map(invoice_list)
- customer_map = get_customer_deatils(invoice_list)
+ customer_map = get_customer_details(invoice_list)
company_currency = frappe.db.get_value("Company", filters.company, "default_currency")
mode_of_payments = get_mode_of_payments([inv.name for inv in invoice_list])
@@ -184,7 +184,7 @@
return invoice_so_dn_map
-def get_customer_deatils(invoice_list):
+def get_customer_details(invoice_list):
customer_map = {}
customers = list(set([inv.customer for inv in invoice_list]))
for cust in frappe.db.sql("""select name, territory, customer_group from `tabCustomer`
@@ -204,4 +204,4 @@
for d in inv_mop:
mode_of_payments.setdefault(d.parent, []).append(d.mode_of_payment)
- return mode_of_payments
\ No newline at end of file
+ return mode_of_payments
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index cec01a0..8e59d8f 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -110,7 +110,7 @@
if party_type and party:
cond.append("""gle.party_type = "%s" and gle.party = "%s" """ %
(frappe.db.escape(party_type), frappe.db.escape(party, percent=False)))
-
+
if company:
cond.append("""gle.company = "%s" """ % (frappe.db.escape(company, percent=False)))
@@ -178,7 +178,7 @@
voucher_type, voucher_no, against_voucher_type, against_voucher
FROM `tabGL Entry` gle
WHERE {0}""".format(" and ".join(cond)), as_dict=True)
-
+
count = 0
for gle in entries:
if fieldname not in ('invoiced_amount','payables'):
@@ -196,12 +196,12 @@
WHERE docstatus < 2 and posting_date <= %(date)s and against_voucher = %(voucher_no)s
and party = %(party)s and name != %(name)s""".format(select_fields),
{"date": date, "voucher_no": gle.voucher_no, "party": gle.party, "name": gle.name})[0][0]
-
+
outstanding_amount = flt(gle.get(dr_or_cr)) - flt(gle.get(cr_or_dr)) - payment_amount
currency_precision = get_currency_precision() or 2
if abs(flt(outstanding_amount)) > 0.1/10**currency_precision:
count += 1
-
+
return count
@frappe.whitelist()
@@ -209,7 +209,7 @@
if not args:
args = frappe.local.form_dict
args.pop("cmd")
-
+
ac = frappe.new_doc("Account")
if args.get("ignore_permissions"):
@@ -220,7 +220,7 @@
if not ac.parent_account:
ac.parent_account = args.get("parent")
-
+
ac.old_parent = ""
ac.freeze_account = "No"
if cint(ac.get("is_root")):
@@ -252,10 +252,10 @@
Cancel JV, Update aginst document, split if required and resubmit jv
"""
for d in args:
-
- check_if_advance_entry_modified(d)
+
+ check_if_advance_entry_modified(d)
validate_allocated_amount(d)
-
+
# cancel advance entry
doc = frappe.get_doc(d.voucher_type, d.voucher_no)
@@ -289,13 +289,13 @@
else:
party_account_field = "paid_from" if args.party_type == "Customer" else "paid_to"
if args.voucher_detail_no:
- ret = frappe.db.sql("""select t1.name
- from `tabPayment Entry` t1, `tabPayment Entry Reference` t2
+ ret = frappe.db.sql("""select t1.name
+ from `tabPayment Entry` t1, `tabPayment Entry Reference` t2
where
- t1.name = t2.parent and t1.docstatus = 1
+ t1.name = t2.parent and t1.docstatus = 1
and t1.name = %(voucher_no)s and t2.name = %(voucher_detail_no)s
and t1.party_type = %(party_type)s and t1.party = %(party)s and t1.{0} = %(account)s
- and t2.reference_doctype in ("", "Sales Order", "Purchase Order")
+ and t2.reference_doctype in ("", "Sales Order", "Purchase Order")
and t2.allocated_amount = %(unadjusted_amount)s
""".format(party_account_field), args)
else:
@@ -367,7 +367,7 @@
# will work as update after submit
jv_obj.flags.ignore_validate_update_after_submit = True
jv_obj.save(ignore_permissions=True)
-
+
def update_reference_in_payment_entry(d, payment_entry):
reference_details = {
"reference_doctype": d.against_voucher_type,
@@ -377,44 +377,44 @@
"allocated_amount": d.allocated_amount,
"exchange_rate": d.exchange_rate
}
-
+
if d.voucher_detail_no:
existing_row = payment_entry.get("references", {"name": d["voucher_detail_no"]})[0]
original_row = existing_row.as_dict().copy()
existing_row.update(reference_details)
-
+
if d.allocated_amount < original_row.allocated_amount:
new_row = payment_entry.append("references")
new_row.docstatus = 1
for field in reference_details.keys():
new_row.set(field, original_row[field])
-
+
new_row.allocated_amount = original_row.allocated_amount - d.allocated_amount
else:
new_row = payment_entry.append("references")
new_row.docstatus = 1
new_row.update(reference_details)
-
+
payment_entry.flags.ignore_validate_update_after_submit = True
payment_entry.setup_party_account_field()
payment_entry.set_missing_values()
payment_entry.set_amounts()
payment_entry.save(ignore_permissions=True)
-
+
def unlink_ref_doc_from_payment_entries(ref_doc):
remove_ref_doc_link_from_jv(ref_doc.doctype, ref_doc.name)
remove_ref_doc_link_from_pe(ref_doc.doctype, ref_doc.name)
-
+
frappe.db.sql("""update `tabGL Entry`
set against_voucher_type=null, against_voucher=null,
modified=%s, modified_by=%s
where against_voucher_type=%s and against_voucher=%s
and voucher_no != ifnull(against_voucher, '')""",
(now(), frappe.session.user, ref_doc.doctype, ref_doc.name))
-
+
if ref_doc.doctype in ("Sales Invoice", "Purchase Invoice"):
ref_doc.set("advances", [])
-
+
frappe.db.sql("""delete from `tab{0} Advance` where parent = %s"""
.format(ref_doc.doctype), ref_doc.name)
@@ -430,7 +430,7 @@
and docstatus < 2""", (now(), frappe.session.user, ref_type, ref_no))
frappe.msgprint(_("Journal Entries {0} are un-linked".format("\n".join(linked_jv))))
-
+
def remove_ref_doc_link_from_pe(ref_type, ref_no):
linked_pe = frappe.db.sql_list("""select parent from `tabPayment Entry Reference`
where reference_doctype=%s and reference_name=%s and docstatus < 2""", (ref_type, ref_no))
@@ -440,18 +440,18 @@
set allocated_amount=0, modified=%s, modified_by=%s
where reference_doctype=%s and reference_name=%s
and docstatus < 2""", (now(), frappe.session.user, ref_type, ref_no))
-
+
for pe in linked_pe:
pe_doc = frappe.get_doc("Payment Entry", pe)
pe_doc.set_total_allocated_amount()
pe_doc.set_unallocated_amount()
pe_doc.clear_unallocated_reference_document_rows()
-
- frappe.db.sql("""update `tabPayment Entry` set total_allocated_amount=%s,
- base_total_allocated_amount=%s, unallocated_amount=%s, modified=%s, modified_by=%s
- where name=%s""", (pe_doc.total_allocated_amount, pe_doc.base_total_allocated_amount,
+
+ frappe.db.sql("""update `tabPayment Entry` set total_allocated_amount=%s,
+ base_total_allocated_amount=%s, unallocated_amount=%s, modified=%s, modified_by=%s
+ where name=%s""", (pe_doc.total_allocated_amount, pe_doc.base_total_allocated_amount,
pe_doc.unallocated_amount, now(), frappe.session.user, pe))
-
+
frappe.msgprint(_("Payment Entries {0} are un-linked".format("\n".join(linked_pe))))
@frappe.whitelist()
@@ -562,7 +562,7 @@
from
`tabGL Entry` invoice_gl_entry
where
- party_type = %(party_type)s and party = %(party)s
+ party_type = %(party_type)s and party = %(party)s
and account = %(account)s and {dr_or_cr} > 0
{condition}
and ((voucher_type = 'Journal Entry'
@@ -590,9 +590,9 @@
'outstanding_amount': flt(d.invoice_amount - d.payment_amount, precision),
'due_date': frappe.db.get_value(d.voucher_type, d.voucher_no, "due_date"),
}))
-
+
outstanding_invoices = sorted(outstanding_invoices, key=lambda k: k['due_date'] or getdate(nowdate()))
-
+
return outstanding_invoices
diff --git a/erpnext/buying/doctype/buying_settings/buying_settings.json b/erpnext/buying/doctype/buying_settings/buying_settings.json
index 306799d..ac97255 100644
--- a/erpnext/buying/doctype/buying_settings/buying_settings.json
+++ b/erpnext/buying/doctype/buying_settings/buying_settings.json
@@ -186,7 +186,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.json b/erpnext/buying/doctype/purchase_order/purchase_order.json
index 20aefc9..c092695 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -23,10 +23,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -78,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -108,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Supplier",
"length": 0,
"no_copy": 0,
@@ -138,6 +142,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Get Items from Open Material Requests",
"length": 0,
"no_copy": 0,
@@ -166,6 +171,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Supply Raw Materials",
"length": 0,
"no_copy": 0,
@@ -193,6 +199,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Name",
"length": 0,
"no_copy": 0,
@@ -219,6 +226,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -248,6 +256,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date",
"length": 0,
"no_copy": 0,
@@ -276,6 +285,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -306,6 +316,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -336,6 +347,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Drop Ship",
"length": 0,
"no_copy": 0,
@@ -364,6 +376,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -393,6 +406,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Name",
"length": 0,
"no_copy": 0,
@@ -420,6 +434,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -447,6 +462,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Contact",
"length": 0,
"no_copy": 0,
@@ -475,6 +491,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Contact",
"length": 0,
"no_copy": 0,
@@ -502,6 +519,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Mobile No",
"length": 0,
"no_copy": 0,
@@ -529,6 +547,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Contact Email",
"length": 0,
"no_copy": 0,
@@ -557,6 +576,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address and Contact",
"length": 0,
"no_copy": 0,
@@ -584,6 +604,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Select Supplier Address",
"length": 0,
"no_copy": 0,
@@ -611,6 +632,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Person",
"length": 0,
"no_copy": 0,
@@ -639,6 +661,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address",
"length": 0,
"no_copy": 0,
@@ -665,6 +688,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
@@ -691,6 +715,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No",
"length": 0,
"no_copy": 0,
@@ -717,6 +742,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Email",
"length": 0,
"no_copy": 0,
@@ -743,6 +769,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -770,6 +797,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Select Shipping Address",
"length": 0,
"no_copy": 0,
@@ -798,6 +826,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Address",
"length": 0,
"no_copy": 0,
@@ -825,10 +854,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -852,6 +882,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency",
"length": 0,
"no_copy": 0,
@@ -882,6 +913,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -911,6 +943,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -936,6 +969,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List",
"length": 0,
"no_copy": 0,
@@ -963,6 +997,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Currency",
"length": 0,
"no_copy": 0,
@@ -990,6 +1025,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -1017,6 +1053,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Ignore Pricing Rule",
"length": 0,
"no_copy": 1,
@@ -1043,11 +1080,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1071,6 +1109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -1101,6 +1140,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Get last purchase rate",
"length": 0,
"no_copy": 0,
@@ -1128,6 +1168,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1153,6 +1194,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1181,6 +1223,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total (Company Currency)",
"length": 0,
"no_copy": 1,
@@ -1210,6 +1253,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1235,6 +1279,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total",
"length": 0,
"no_copy": 0,
@@ -1263,6 +1308,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total",
"length": 0,
"no_copy": 0,
@@ -1292,11 +1338,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1321,6 +1368,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1350,6 +1398,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1379,6 +1428,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Calculation",
"length": 0,
"no_copy": 1,
@@ -1406,11 +1456,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1434,6 +1485,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Added (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1463,6 +1515,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Deducted (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1492,6 +1545,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges (Company Currency)",
"length": 0,
"no_copy": 1,
@@ -1521,6 +1575,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1547,6 +1602,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Added",
"length": 0,
"no_copy": 0,
@@ -1576,6 +1632,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Deducted",
"length": 0,
"no_copy": 0,
@@ -1605,6 +1662,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1634,6 +1692,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount",
"length": 0,
"no_copy": 0,
@@ -1662,6 +1721,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Apply Additional Discount On",
"length": 0,
"no_copy": 0,
@@ -1690,6 +1750,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1718,6 +1779,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1744,6 +1806,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Percentage",
"length": 0,
"no_copy": 0,
@@ -1771,6 +1834,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount",
"length": 0,
"no_copy": 0,
@@ -1799,6 +1863,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1825,6 +1890,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Grand Total (Company Currency)",
"length": 0,
"no_copy": 1,
@@ -1855,6 +1921,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1883,6 +1950,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rounded Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1912,6 +1980,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -1938,6 +2007,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Grand Total",
"length": 0,
"no_copy": 0,
@@ -1967,6 +2037,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words",
"length": 0,
"no_copy": 0,
@@ -1995,6 +2066,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Advance Paid",
"length": 0,
"no_copy": 1,
@@ -2023,11 +2095,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2051,6 +2124,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms",
"length": 0,
"no_copy": 0,
@@ -2080,6 +2154,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
@@ -2108,6 +2183,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
@@ -2136,6 +2212,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -2165,6 +2242,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Ref SQ",
"length": 0,
"no_copy": 1,
@@ -2193,6 +2271,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Party Account Currency",
"length": 0,
"no_copy": 1,
@@ -2221,6 +2300,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2249,6 +2329,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "% Received",
"length": 0,
"no_copy": 1,
@@ -2279,6 +2360,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "% Billed",
"length": 0,
"no_copy": 1,
@@ -2307,6 +2389,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Printing Settings",
"length": 0,
"no_copy": 0,
@@ -2336,6 +2419,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -2365,6 +2449,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Heading",
"length": 0,
"no_copy": 1,
@@ -2394,6 +2479,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2421,6 +2507,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Group same items",
"length": 0,
"no_copy": 0,
@@ -2449,6 +2536,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Language",
"length": 0,
"no_copy": 0,
@@ -2479,11 +2567,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Raw Materials Supplied",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-truck",
+ "options": "fa fa-truck",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2507,6 +2596,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplied Items",
"length": 0,
"no_copy": 0,
@@ -2537,10 +2627,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Recurring",
"length": 0,
"no_copy": 0,
- "options": "icon-time",
+ "options": "fa fa-time",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2564,6 +2655,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Settings",
"length": 0,
"no_copy": 0,
@@ -2592,6 +2684,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Recurring",
"length": 0,
"no_copy": 1,
@@ -2620,6 +2713,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reference Document",
"length": 0,
"no_copy": 1,
@@ -2649,6 +2743,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Frequency",
"length": 0,
"no_copy": 1,
@@ -2678,6 +2773,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Repeat on Day of Month",
"length": 0,
"no_copy": 1,
@@ -2706,6 +2802,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "End Date",
"length": 0,
"no_copy": 1,
@@ -2733,6 +2830,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Submit on creation",
"length": 0,
"no_copy": 0,
@@ -2762,6 +2860,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Notify by email",
"length": 0,
"no_copy": 1,
@@ -2791,6 +2890,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Notification Email Address",
"length": 0,
"no_copy": 1,
@@ -2819,6 +2919,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Recurring Print Format",
"length": 0,
"no_copy": 0,
@@ -2847,6 +2948,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "This Document",
"length": 0,
"no_copy": 0,
@@ -2875,6 +2977,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "From Date",
"length": 0,
"no_copy": 1,
@@ -2903,6 +3006,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "To Date",
"length": 0,
"no_copy": 1,
@@ -2931,6 +3035,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Next Date",
"length": 0,
"no_copy": 1,
@@ -2948,7 +3053,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 105,
"image_view": 0,
"in_create": 0,
@@ -2957,7 +3062,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 15:57:10.007843",
+ "modified": "2016-11-07 06:01:00.233621",
"modified_by": "Administrator",
"module": "Buying",
"name": "Purchase Order",
diff --git a/erpnext/buying/doctype/purchase_order/purchase_order.py b/erpnext/buying/doctype/purchase_order/purchase_order.py
index 197928a..796e0f2 100644
--- a/erpnext/buying/doctype/purchase_order/purchase_order.py
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.py
@@ -156,30 +156,6 @@
msgprint(_("{0} {1} has been modified. Please refresh.").format(self.doctype, self.name),
raise_exception=True)
- def before_print(self):
- if self.get("group_same_items"):
-
- group_item_qty = {}
- group_item_amount = {}
-
- for item in self.items:
- group_item_qty[item.item_code] = group_item_qty.get(item.item_code, 0) + item.qty
- group_item_amount[item.item_code] = group_item_amount.get(item.item_code, 0) + item.amount
-
- duplicate_list = []
-
- for item in self.items:
- if item.item_code in group_item_qty:
- item.qty = group_item_qty[item.item_code]
- item.amount = group_item_amount[item.item_code]
- del group_item_qty[item.item_code]
- else:
- duplicate_list.append(item)
-
- for item in duplicate_list:
- self.remove(item)
-
-
def update_status(self, status):
self.check_modified_date()
self.set_status(update=True, status=status)
@@ -380,4 +356,3 @@
po = frappe.get_doc("Purchase Order", name)
po.update_status(status)
po.update_delivered_qty_in_sales_order()
-
diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.js b/erpnext/buying/doctype/quality_inspection/quality_inspection.js
deleted file mode 100644
index 628337b..0000000
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.js
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-cur_frm.cscript.inspection_type = function(doc, cdt, cdn) {
- if(doc.inspection_type == 'Incoming'){
- doc.delivery_note_no = '';
- hide_field('delivery_note_no');
- unhide_field('purchase_receipt_no');
- }
- else if(doc.inspection_type == 'Outgoing'){
- doc.purchase_receipt_no = '';
- unhide_field('delivery_note_no');
- hide_field('purchase_receipt_no');
-
- }
- else {
- doc.purchase_receipt_no = '';
- doc.delivery_note_no = '';
- hide_field('purchase_receipt_no');
- hide_field('delivery_note_no');
- }
-}
-
-cur_frm.cscript.refresh = cur_frm.cscript.inspection_type;
-
-// item code based on GRN/DN
-cur_frm.fields_dict['item_code'].get_query = function(doc, cdt, cdn) {
- if (doc.purchase_receipt_no) {
- return {
- query: "erpnext.buying.doctype.quality_inspection.quality_inspection.item_query",
- filters: {
- "from": "Purchase Receipt Item",
- "parent": doc.purchase_receipt_no
- }
- }
- } else if (doc.delivery_note_no) {
- return {
- query: "erpnext.buying.doctype.quality_inspection.quality_inspection.item_query",
- filters: {
- "from": "Delivery Note Item",
- "parent": doc.delivery_note_no
- }
- }
- }
-}
-
-// Serial No based on item_code
-cur_frm.fields_dict['item_serial_no'].get_query = function(doc, cdt, cdn) {
- var filters = {};
- if (doc.item_code) {
- filters = {
- 'item_code': doc.item_code
- }
- }
- return { filters: filters }
-}
-
-cur_frm.set_query("batch_no", function(doc) {
- return {
- filters: {
- "item": doc.item_code
- }
- }
-})
-
-cur_frm.add_fetch('item_code', 'item_name', 'item_name');
-cur_frm.add_fetch('item_code', 'description', 'description');
-
diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
index fa641e4..fbdb0e4 100644
--- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
+++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -54,6 +55,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -85,6 +87,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Supplier",
"length": 0,
"no_copy": 1,
@@ -113,6 +116,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -142,6 +146,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date",
"length": 0,
"no_copy": 0,
@@ -171,6 +176,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -198,6 +204,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Detail",
"length": 0,
"no_copy": 0,
@@ -226,11 +233,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -255,6 +263,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -285,6 +294,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -312,6 +322,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Standard Reply",
"length": 0,
"no_copy": 0,
@@ -340,6 +351,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Message for Supplier",
"length": 0,
"no_copy": 0,
@@ -368,11 +380,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -397,6 +410,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms",
"length": 0,
"no_copy": 0,
@@ -427,6 +441,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
@@ -456,6 +471,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Printing Settings",
"length": 0,
"no_copy": 0,
@@ -483,6 +499,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Heading",
"length": 0,
"no_copy": 1,
@@ -513,6 +530,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -543,11 +561,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -572,6 +591,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -602,6 +622,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Fiscal Year",
"length": 0,
"no_copy": 0,
@@ -632,6 +653,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -658,6 +680,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -676,7 +699,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-shopping-cart",
+ "icon": "fa fa-shopping-cart",
"idx": 0,
"image_view": 0,
"in_create": 0,
@@ -685,7 +708,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 15:57:31.603664",
+ "modified": "2016-11-07 05:34:08.567257",
"modified_by": "Administrator",
"module": "Buying",
"name": "Request for Quotation",
@@ -782,6 +805,27 @@
"cancel": 0,
"create": 0,
"delete": 0,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Supplier",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 0
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
"email": 0,
"export": 0,
"if_owner": 0,
diff --git a/erpnext/buying/doctype/supplier/supplier.json b/erpnext/buying/doctype/supplier/supplier.json
index ac7656c..4b8f8c5 100644
--- a/erpnext/buying/doctype/supplier/supplier.json
+++ b/erpnext/buying/doctype/supplier/supplier.json
@@ -11,6 +11,7 @@
"doctype": "DocType",
"document_type": "Setup",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
@@ -24,15 +25,17 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Name and Type",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-user",
+ "options": "fa fa-user",
"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,
@@ -51,6 +54,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -61,6 +65,7 @@
"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,
@@ -79,6 +84,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Name",
"length": 0,
"no_copy": 1,
@@ -88,6 +94,7 @@
"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,
@@ -106,6 +113,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Country",
"length": 0,
"no_copy": 0,
@@ -115,6 +123,7 @@
"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,
@@ -133,6 +142,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 1,
@@ -141,6 +151,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -159,6 +170,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 0,
@@ -168,6 +180,7 @@
"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,
@@ -186,12 +199,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -211,6 +226,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Supplier Type",
"length": 0,
"no_copy": 0,
@@ -221,6 +237,7 @@
"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,
@@ -239,6 +256,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Language",
"length": 0,
"no_copy": 0,
@@ -248,6 +266,7 @@
"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,
@@ -267,6 +286,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Disabled",
"length": 0,
"no_copy": 0,
@@ -275,6 +295,7 @@
"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,
@@ -293,6 +314,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
@@ -301,6 +323,7 @@
"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,
@@ -319,6 +342,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Billing Currency",
"length": 0,
"no_copy": 1,
@@ -327,6 +351,7 @@
"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,
@@ -345,6 +370,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -352,6 +378,7 @@
"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,
@@ -370,6 +397,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List",
"length": 0,
"no_copy": 0,
@@ -378,6 +406,7 @@
"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,
@@ -396,6 +425,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit Limit",
"length": 0,
"no_copy": 0,
@@ -404,6 +434,7 @@
"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,
@@ -422,6 +453,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit Days Based On",
"length": 0,
"no_copy": 0,
@@ -431,6 +463,7 @@
"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,
@@ -450,6 +483,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit Days",
"length": 0,
"no_copy": 0,
@@ -457,6 +491,7 @@
"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,
@@ -476,15 +511,17 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address and Contacts",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
- "options": "icon-map-marker",
+ "options": "fa fa-map-marker",
"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,
@@ -503,6 +540,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address HTML",
"length": 0,
"no_copy": 0,
@@ -510,6 +548,7 @@
"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,
@@ -528,12 +567,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -553,6 +594,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact HTML",
"length": 0,
"no_copy": 0,
@@ -560,6 +602,7 @@
"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,
@@ -579,6 +622,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Payable Accounts",
"length": 0,
"no_copy": 0,
@@ -586,6 +630,7 @@
"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,
@@ -606,6 +651,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accounts",
"length": 0,
"no_copy": 0,
@@ -614,6 +660,7 @@
"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,
@@ -633,6 +680,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
@@ -640,6 +688,7 @@
"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,
@@ -659,6 +708,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Website",
"length": 0,
"no_copy": 0,
@@ -668,6 +718,7 @@
"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,
@@ -687,6 +738,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Details",
"length": 0,
"no_copy": 0,
@@ -696,6 +748,7 @@
"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,
@@ -714,6 +767,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Frozen",
"length": 0,
"no_copy": 0,
@@ -722,6 +776,7 @@
"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,
@@ -731,7 +786,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 370,
"image_field": "image",
"image_view": 0,
@@ -741,7 +796,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-09-21 18:11:03.873221",
+ "modified": "2016-11-07 05:24:30.465053",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier",
@@ -758,6 +813,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -778,6 +834,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -798,6 +855,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -818,6 +876,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -838,6 +897,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -858,6 +918,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -878,6 +939,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index 343c86b..519c37e 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -23,10 +23,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -78,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -108,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Supplier",
"length": 0,
"no_copy": 0,
@@ -137,6 +141,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Name",
"length": 0,
"no_copy": 0,
@@ -163,6 +168,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -192,6 +198,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date",
"length": 0,
"no_copy": 0,
@@ -220,6 +227,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -250,6 +258,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -279,6 +288,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address and Contact",
"length": 0,
"no_copy": 0,
@@ -306,6 +316,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Address",
"length": 0,
"no_copy": 0,
@@ -333,6 +344,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Person",
"length": 0,
"no_copy": 0,
@@ -360,6 +372,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address",
"length": 0,
"no_copy": 0,
@@ -386,6 +399,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
@@ -412,6 +426,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No",
"length": 0,
"no_copy": 0,
@@ -438,6 +453,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Email",
"length": 0,
"no_copy": 0,
@@ -465,10 +481,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -492,6 +509,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency",
"length": 0,
"no_copy": 0,
@@ -522,6 +540,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -551,6 +570,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -578,6 +598,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List",
"length": 0,
"no_copy": 0,
@@ -606,6 +627,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Currency",
"length": 0,
"no_copy": 0,
@@ -634,6 +656,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -661,6 +684,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Ignore Pricing Rule",
"length": 0,
"no_copy": 1,
@@ -687,11 +711,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -715,6 +740,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -744,6 +770,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -769,6 +796,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -797,6 +825,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total (Company Currency)",
"length": 0,
"no_copy": 1,
@@ -826,6 +855,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -851,6 +881,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total",
"length": 0,
"no_copy": 0,
@@ -879,6 +910,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total",
"length": 0,
"no_copy": 0,
@@ -908,11 +940,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -937,6 +970,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges",
"length": 0,
"no_copy": 1,
@@ -966,6 +1000,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -995,6 +1030,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Calculation",
"length": 0,
"no_copy": 1,
@@ -1022,11 +1058,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1050,6 +1087,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Added (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1079,6 +1117,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Deducted (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1108,6 +1147,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges (Company Currency)",
"length": 0,
"no_copy": 1,
@@ -1137,6 +1177,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1163,6 +1204,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Added",
"length": 0,
"no_copy": 0,
@@ -1192,6 +1234,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Deducted",
"length": 0,
"no_copy": 0,
@@ -1221,6 +1264,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1250,6 +1294,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount",
"length": 0,
"no_copy": 0,
@@ -1278,6 +1323,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Apply Additional Discount On",
"length": 0,
"no_copy": 0,
@@ -1306,6 +1352,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1334,6 +1381,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1360,6 +1408,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Percentage",
"length": 0,
"no_copy": 0,
@@ -1387,6 +1436,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount",
"length": 0,
"no_copy": 0,
@@ -1415,6 +1465,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1441,6 +1492,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Grand Total (Company Currency)",
"length": 0,
"no_copy": 1,
@@ -1471,6 +1523,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1499,6 +1552,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rounded Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1528,6 +1582,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -1554,6 +1609,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Grand Total",
"length": 0,
"no_copy": 0,
@@ -1583,6 +1639,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words",
"length": 0,
"no_copy": 0,
@@ -1612,11 +1669,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1640,6 +1698,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms",
"length": 0,
"no_copy": 0,
@@ -1669,6 +1728,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
@@ -1697,6 +1757,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Printing Settings",
"length": 0,
"no_copy": 0,
@@ -1724,6 +1785,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Heading",
"length": 0,
"no_copy": 1,
@@ -1753,6 +1815,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -1782,6 +1845,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Language",
"length": 0,
"no_copy": 0,
@@ -1809,11 +1873,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1837,6 +1902,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -1866,6 +1932,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1892,6 +1959,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Subcontracted",
"length": 0,
"no_copy": 0,
@@ -1919,6 +1987,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reference",
"length": 0,
"no_copy": 0,
@@ -1946,6 +2015,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Opportunity",
"length": 0,
"no_copy": 1,
@@ -1965,7 +2035,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-shopping-cart",
+ "icon": "fa fa-shopping-cart",
"idx": 29,
"image_view": 0,
"in_create": 0,
@@ -1975,7 +2045,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-11-03 15:57:47.183671",
+ "modified": "2016-11-07 05:59:51.237877",
"modified_by": "Administrator",
"module": "Buying",
"name": "Supplier Quotation",
diff --git a/erpnext/buying/page/purchase_analytics/purchase_analytics.json b/erpnext/buying/page/purchase_analytics/purchase_analytics.json
index 407d888..ad13c7d 100644
--- a/erpnext/buying/page/purchase_analytics/purchase_analytics.json
+++ b/erpnext/buying/page/purchase_analytics/purchase_analytics.json
@@ -2,7 +2,7 @@
"creation": "2012-09-21 20:15:16.000000",
"docstatus": 0,
"doctype": "Page",
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
"idx": 1,
"modified": "2013-07-11 14:43:52.000000",
"modified_by": "Administrator",
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index b9c503a..d9faf6d 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -63,7 +63,7 @@
{
"type": "doctype",
"name": "Account",
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"label": _("Chart of Accounts"),
"route": "Tree/Account",
"description": _("Tree of financial accounts."),
@@ -199,7 +199,7 @@
{
"type": "doctype",
"name": "Cost Center",
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"label": _("Chart of Cost Centers"),
"route": "Tree/Cost Center",
"description": _("Tree of financial Cost Centers."),
@@ -244,7 +244,7 @@
},
{
"label": _("Setup"),
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"items": [
{
"type": "doctype",
@@ -351,7 +351,7 @@
},
{
"label": _("Other Reports"),
- "icon": "icon-table",
+ "icon": "fa fa-table",
"items": [
{
"type": "report",
@@ -423,7 +423,7 @@
},
{
"label": _("Help"),
- "icon": "icon-facetime-video",
+ "icon": "fa fa-facetime-video",
"items": [
{
"type": "help",
diff --git a/erpnext/config/buying.py b/erpnext/config/buying.py
index 3c947cb..e246266 100644
--- a/erpnext/config/buying.py
+++ b/erpnext/config/buying.py
@@ -5,7 +5,7 @@
return [
{
"label": _("Purchasing"),
- "icon": "icon-star",
+ "icon": "fa fa-star",
"items": [
{
"type": "doctype",
@@ -57,7 +57,7 @@
},
{
"label": _("Setup"),
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"items": [
{
"type": "doctype",
@@ -98,7 +98,7 @@
{
"type": "doctype",
"name": "Item Group",
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"label": _("Item Group"),
"link": "Tree/Item Group",
"description": _("Tree of Item Groups."),
@@ -119,13 +119,13 @@
},
{
"label": _("Analytics"),
- "icon": "icon-table",
+ "icon": "fa fa-table",
"items": [
{
"type": "page",
"name": "purchase-analytics",
"label": _("Purchase Analytics"),
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
},
{
"type": "report",
@@ -143,7 +143,7 @@
},
{
"label": _("Other Reports"),
- "icon": "icon-list",
+ "icon": "fa fa-list",
"items": [
{
"type": "report",
diff --git a/erpnext/config/crm.py b/erpnext/config/crm.py
index e25493c..9935aef 100644
--- a/erpnext/config/crm.py
+++ b/erpnext/config/crm.py
@@ -4,7 +4,7 @@
return [
{
"label": _("Sales Pipeline"),
- "icon": "icon-star",
+ "icon": "fa fa-star",
"items": [
{
"type": "doctype",
@@ -30,13 +30,13 @@
},
{
"label": _("Reports"),
- "icon": "icon-list",
+ "icon": "fa fa-list",
"items": [
{
"type": "page",
"name": "sales-funnel",
"label": _("Sales Funnel"),
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
},
{
"type": "report",
@@ -53,7 +53,7 @@
{
"type": "report",
"is_query_report": True,
- "name": "Customer Addresses and Contacts",
+ "name": "Customer Addresses And Contacts",
"doctype": "Contact"
},
{
@@ -66,7 +66,7 @@
},
{
"label": _("Communication"),
- "icon": "icon-star",
+ "icon": "fa fa-star",
"items": [
{
"type": "doctype",
@@ -77,7 +77,7 @@
},
{
"label": _("Setup"),
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"items": [
{
"type": "doctype",
@@ -88,7 +88,7 @@
"type": "doctype",
"label": _("Customer Group"),
"name": "Customer Group",
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"link": "Tree/Customer Group",
"description": _("Manage Customer Group Tree."),
},
@@ -96,7 +96,7 @@
"type": "doctype",
"label": _("Territory"),
"name": "Territory",
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"link": "Tree/Territory",
"description": _("Manage Territory Tree."),
},
@@ -104,7 +104,7 @@
"type": "doctype",
"label": _("Sales Person"),
"name": "Sales Person",
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"link": "Tree/Sales Person",
"description": _("Manage Sales Person Tree."),
},
@@ -112,7 +112,7 @@
},
{
"label": _("SMS"),
- "icon": "icon-wrench",
+ "icon": "fa fa-wrench",
"items": [
{
"type": "doctype",
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index c5a1320..9397ffc 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -79,7 +79,7 @@
{
"module_name": "Stock",
"color": "#f39c12",
- "icon": "icon-truck",
+ "icon": "fa fa-truck",
"icon": "octicon octicon-package",
"type": "module",
"hidden": 1
@@ -94,7 +94,7 @@
{
"module_name": "Selling",
"color": "#1abc9c",
- "icon": "icon-tag",
+ "icon": "fa fa-tag",
"icon": "octicon octicon-tag",
"type": "module",
"hidden": 1
@@ -102,7 +102,7 @@
{
"module_name": "Buying",
"color": "#c0392b",
- "icon": "icon-shopping-cart",
+ "icon": "fa fa-shopping-cart",
"icon": "octicon octicon-briefcase",
"type": "module",
"hidden": 1
@@ -110,7 +110,7 @@
{
"module_name": "HR",
"color": "#2ecc71",
- "icon": "icon-group",
+ "icon": "fa fa-group",
"icon": "octicon octicon-organization",
"label": _("Human Resources"),
"type": "module",
@@ -119,7 +119,7 @@
{
"module_name": "Manufacturing",
"color": "#7f8c8d",
- "icon": "icon-cogs",
+ "icon": "fa fa-cogs",
"icon": "octicon octicon-tools",
"type": "module",
"hidden": 1
@@ -127,7 +127,7 @@
{
"module_name": "POS",
"color": "#589494",
- "icon": "icon-th",
+ "icon": "fa fa-th",
"icon": "octicon octicon-credit-card",
"type": "page",
"link": "pos",
@@ -136,7 +136,7 @@
{
"module_name": "Projects",
"color": "#8e44ad",
- "icon": "icon-puzzle-piece",
+ "icon": "fa fa-puzzle-piece",
"icon": "octicon octicon-rocket",
"type": "module",
"hidden": 1
@@ -144,7 +144,7 @@
{
"module_name": "Support",
"color": "#2c3e50",
- "icon": "icon-phone",
+ "icon": "fa fa-phone",
"icon": "octicon octicon-issue-opened",
"type": "module",
"hidden": 1
@@ -231,7 +231,7 @@
{
"module_name": "Assessment",
"color": "#8a70be",
- "icon": "icon-file-text-alt",
+ "icon": "fa fa-file-text-alt",
"label": _("Assessment"),
"link": "List/Assessment",
"_doctype": "Assessment",
@@ -240,7 +240,7 @@
{
"module_name": "Fees",
"color": "#83C21E",
- "icon": "icon-money",
+ "icon": "fa fa-money",
"label": _("Fees"),
"link": "List/Fees",
"_doctype": "Fees",
@@ -258,7 +258,7 @@
{
"module_name": "Room",
"color": "#f22683",
- "icon": "icon-map-marker",
+ "icon": "fa fa-map-marker",
"label": _("Room"),
"link": "List/Room",
"_doctype": "Room",
diff --git a/erpnext/config/docs.py b/erpnext/config/docs.py
index d1a54e8..2d2cc0a 100644
--- a/erpnext/config/docs.py
+++ b/erpnext/config/docs.py
@@ -1,3 +1,7 @@
+from __future__ import unicode_literals
+
+docs_version = "7.x.x"
+
source_link = "https://github.com/frappe/erpnext"
docs_base_url = "https://frappe.github.io/erpnext"
headline = "ERPNext Documentation"
@@ -15,14 +19,16 @@
listed as one of the Best Open Source Softwares in the world by many online
blogs."""
-docs_version = "6.x.x"
splash_light_background = True
+google_analytics_id = 'UA-8911157-22'
def get_context(context):
- context.brand_html = "ERPNext"
+ context.brand_html = ('<img class="brand-logo" src="'+context.docs_base_url
+ +'/assets/img/erpnext-docs.png"> ERPNext</img>')
context.app.splash_light_background = True
context.top_bar_items = [
{"label": "User Manual", "url": context.docs_base_url + "/user/manual", "right": 1},
{"label": "Videos", "url": context.docs_base_url + "/user/videos", "right": 1},
- {"label": "API Documentation", "url": context.docs_base_url + "/current", "right": 1}
+ {"label": "API", "url": context.docs_base_url + "/current", "right": 1},
+ {"label": "Forum", "url": 'https://discuss.erpnext.com', "right": 1}
]
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index 51c258b..55363ab 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -150,15 +150,26 @@
},
{
- "label": _("Tools"),
- "icon": "icon-wrench",
+ "label": _("Training"),
"items": [
-
+ {
+ "type": "doctype",
+ "name": "Training Event"
+ },
+ {
+ "type": "doctype",
+ "name": "Training Result"
+ },
+ {
+ "type": "doctype",
+ "name": "Training Feedback"
+ },
]
},
+
{
"label": _("Setup"),
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"items": [
{
"type": "doctype",
@@ -185,11 +196,15 @@
"name": "Designation",
"description": _("Employee designation (e.g. CEO, Director etc.).")
},
+ {
+ "type": "doctype",
+ "name": "Daily Work Summary Settings"
+ },
]
},
{
"label": _("Reports"),
- "icon": "icon-list",
+ "icon": "fa fa-list",
"items": [
{
"type": "report",
@@ -231,7 +246,7 @@
},
{
"label": _("Help"),
- "icon": "icon-facetime-video",
+ "icon": "fa fa-facetime-video",
"items": [
{
"type": "help",
diff --git a/erpnext/config/maintenance.py b/erpnext/config/maintenance.py
index aa2f87c..7a44f55 100644
--- a/erpnext/config/maintenance.py
+++ b/erpnext/config/maintenance.py
@@ -4,7 +4,7 @@
return [
{
"label": _("Maintenance"),
- "icon": "icon-star",
+ "icon": "fa fa-star",
"items": [
{
"type": "doctype",
diff --git a/erpnext/config/manufacturing.py b/erpnext/config/manufacturing.py
index d2432b6..0f76952 100644
--- a/erpnext/config/manufacturing.py
+++ b/erpnext/config/manufacturing.py
@@ -5,7 +5,7 @@
return [
{
"label": _("Production"),
- "icon": "icon-star",
+ "icon": "fa fa-star",
"items": [
{
"type": "doctype",
@@ -41,7 +41,7 @@
{
"type": "doctype",
"name": "BOM",
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"label": _("BOM Browser"),
"description": _("Tree of Bill of Materials"),
"link": "Tree/BOM",
@@ -66,7 +66,7 @@
},
{
"label": _("Tools"),
- "icon": "icon-wrench",
+ "icon": "fa fa-wrench",
"items": [
{
"type": "doctype",
@@ -87,7 +87,7 @@
},
{
"label": _("Reports"),
- "icon": "icon-list",
+ "icon": "fa fa-list",
"items": [
{
"type": "report",
@@ -123,7 +123,7 @@
},
{
"label": _("Help"),
- "icon": "icon-facetime-video",
+ "icon": "fa fa-facetime-video",
"items": [
{
"type": "help",
diff --git a/erpnext/config/projects.py b/erpnext/config/projects.py
index 87174a4..1a70aee 100644
--- a/erpnext/config/projects.py
+++ b/erpnext/config/projects.py
@@ -5,7 +5,7 @@
return [
{
"label": _("Projects"),
- "icon": "icon-star",
+ "icon": "fa fa-star",
"items": [
{
"type": "doctype",
@@ -48,7 +48,7 @@
},
{
"label": _("Reports"),
- "icon": "icon-list",
+ "icon": "fa fa-list",
"items": [
{
"type": "report",
@@ -66,7 +66,7 @@
},
{
"label": _("Help"),
- "icon": "icon-facetime-video",
+ "icon": "fa fa-facetime-video",
"items": [
{
"type": "help",
diff --git a/erpnext/config/schools.py b/erpnext/config/schools.py
index 6acf081..1d33d4d 100644
--- a/erpnext/config/schools.py
+++ b/erpnext/config/schools.py
@@ -48,6 +48,45 @@
{
"type": "doctype",
"name": "Program Enrollment Tool"
+ },
+ {
+ "type": "doctype",
+ "name": "Student Batch Creation Tool"
+ }
+ ]
+ },
+ {
+ "label": _("Attendance"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Student Attendance"
+ },
+ {
+ "type": "doctype",
+ "name": "Student Leave Application"
+ },
+ {
+ "type": "doctype",
+ "name": "Student Attendance Tool"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Absent Student Report",
+ "doctype": "Student Attendance"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Student Batch-Wise Attendance",
+ "doctype": "Student Attendance"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Student Monthly Attendance Sheet",
+ "doctype": "Student Attendance"
}
]
},
@@ -61,8 +100,13 @@
},
{
"type": "doctype",
- "name": "Student Attendance"
- },
+ "name": "Course Scheduling Tool"
+ }
+ ]
+ },
+ {
+ "label": _("Assessment"),
+ "items": [
{
"type": "doctype",
"name": "Assessment"
@@ -73,7 +117,7 @@
},
{
"type": "doctype",
- "name": "Scheduling Tool"
+ "name": "Grading Structure"
}
]
},
@@ -130,14 +174,6 @@
},
{
"type": "doctype",
- "name": "Student Category"
- },
- {
- "type": "doctype",
- "name": "Grading Structure"
- },
- {
- "type": "doctype",
"name": "Instructor"
},
{
@@ -146,6 +182,14 @@
},
{
"type": "doctype",
+ "name": "Student Category"
+ },
+ {
+ "type": "doctype",
+ "name": "Student Batch Name"
+ },
+ {
+ "type": "doctype",
"name": "Academic Term"
},
{
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index 45ec1f7..c406d09 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -5,7 +5,7 @@
return [
{
"label": _("Sales"),
- "icon": "icon-star",
+ "icon": "fa fa-star",
"items": [
{
"type": "doctype",
@@ -31,7 +31,7 @@
"type": "doctype",
"label": _("Customer Group"),
"name": "Customer Group",
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"link": "Tree/Customer Group",
"description": _("Manage Customer Group Tree."),
},
@@ -69,7 +69,7 @@
{
"type": "doctype",
"name": "Item Group",
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"label": _("Item Group"),
"link": "Tree/Item Group",
"description": _("Tree of Item Groups."),
@@ -100,7 +100,7 @@
"type": "doctype",
"label": _("Territory"),
"name": "Territory",
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"link": "Tree/Territory",
"description": _("Manage Territory Tree."),
},
@@ -113,7 +113,7 @@
"type": "doctype",
"label": _("Sales Person"),
"name": "Sales Person",
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"link": "Tree/Sales Person",
"description": _("Manage Sales Person Tree."),
},
@@ -135,7 +135,7 @@
},
{
"label": _("Setup"),
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"items": [
{
"type": "doctype",
@@ -167,26 +167,26 @@
},
{
"label": _("Analytics"),
- "icon": "icon-table",
+ "icon": "fa fa-table",
"items": [
{
"type": "page",
"name": "sales-analytics",
"label": _("Sales Analytics"),
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
},
{
"type": "page",
"name": "sales-funnel",
"label": _("Sales Funnel"),
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
},
{
"type": "report",
"is_query_report": True,
"name": "Customer Acquisition and Loyalty",
"doctype": "Customer",
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
},
{
"type": "report",
@@ -204,7 +204,7 @@
},
{
"label": _("Other Reports"),
- "icon": "icon-list",
+ "icon": "fa fa-list",
"items": [
{
"type": "report",
@@ -270,7 +270,7 @@
},
{
"label": _("SMS"),
- "icon": "icon-wrench",
+ "icon": "fa fa-wrench",
"items": [
{
"type": "doctype",
diff --git a/erpnext/config/setup.py b/erpnext/config/setup.py
index 5ad6403..9c9bae2 100644
--- a/erpnext/config/setup.py
+++ b/erpnext/config/setup.py
@@ -6,7 +6,7 @@
data = [
{
"label": _("Settings"),
- "icon": "icon-wrench",
+ "icon": "fa fa-wrench",
"items": [
{
"type": "doctype",
@@ -19,7 +19,7 @@
},
{
"label": _("Printing"),
- "icon": "icon-print",
+ "icon": "fa fa-print",
"items": [
{
"type": "doctype",
@@ -75,7 +75,7 @@
},
{
"label": _("Customize"),
- "icon": "icon-glass",
+ "icon": "fa fa-glass",
"items": [
{
"type": "doctype",
@@ -92,7 +92,7 @@
},
{
"label": _("Email"),
- "icon": "icon-envelope",
+ "icon": "fa fa-envelope",
"items": [
{
"type": "doctype",
@@ -109,12 +109,12 @@
]
for module, label, icon in (
- ("accounts", _("Accounts"), "icon-money"),
- ("stock", _("Stock"), "icon-truck"),
- ("selling", _("Selling"), "icon-tag"),
- ("buying", _("Buying"), "icon-shopping-cart"),
- ("hr", _("Human Resources"), "icon-group"),
- ("support", _("Support"), "icon-phone")):
+ ("accounts", _("Accounts"), "fa fa-money"),
+ ("stock", _("Stock"), "fa fa-truck"),
+ ("selling", _("Selling"), "fa fa-tag"),
+ ("buying", _("Buying"), "fa fa-shopping-cart"),
+ ("hr", _("Human Resources"), "fa fa-group"),
+ ("support", _("Support"), "fa fa-phone")):
add_setup_section(data, "erpnext", module, label, icon)
diff --git a/erpnext/config/stock.py b/erpnext/config/stock.py
index 5b78ca3..3ca424d 100644
--- a/erpnext/config/stock.py
+++ b/erpnext/config/stock.py
@@ -79,7 +79,7 @@
{
"type": "doctype",
"name": "Item Group",
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"label": _("Item Group"),
"link": "Tree/Item Group",
"description": _("Tree of Item Groups."),
@@ -140,7 +140,7 @@
},
{
"label": _("Tools"),
- "icon": "icon-wrench",
+ "icon": "fa fa-wrench",
"items": [
{
"type": "doctype",
@@ -166,7 +166,7 @@
},
{
"label": _("Setup"),
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"items": [
{
"type": "doctype",
@@ -198,7 +198,7 @@
},
{
"label": _("Analytics"),
- "icon": "icon-table",
+ "icon": "fa fa-table",
"items": [
{
"type": "report",
@@ -210,7 +210,7 @@
"type": "page",
"name": "stock-analytics",
"label": _("Stock Analytics"),
- "icon": "icon-bar-chart"
+ "icon": "fa fa-bar-chart"
},
{
"type": "report",
@@ -229,7 +229,7 @@
},
{
"label": _("Reports"),
- "icon": "icon-list",
+ "icon": "fa fa-list",
"items": [
{
"type": "report",
@@ -277,7 +277,7 @@
},
{
"label": _("Help"),
- "icon": "icon-facetime-video",
+ "icon": "fa fa-facetime-video",
"items": [
{
"type": "help",
diff --git a/erpnext/config/support.py b/erpnext/config/support.py
index a4a4c22..c1f56f0 100644
--- a/erpnext/config/support.py
+++ b/erpnext/config/support.py
@@ -35,13 +35,13 @@
},
{
"label": _("Reports"),
- "icon": "icon-list",
+ "icon": "fa fa-list",
"items": [
{
"type": "page",
"name": "support-analytics",
"label": _("Support Analytics"),
- "icon": "icon-bar-chart"
+ "icon": "fa fa-bar-chart"
},
{
"type": "report",
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 6d1412d..554529c 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -63,6 +63,11 @@
if self.doctype == 'Purchase Invoice':
self.validate_paid_amount()
+ def before_print(self):
+ if self.doctype in ['Purchase Order', 'Sales Order']:
+ if self.get("group_same_items"):
+ self.group_similar_items()
+
def validate_paid_amount(self):
if hasattr(self, "is_pos") or hasattr(self, "is_paid"):
is_paid = self.get("is_pos") or self.get("is_paid")
@@ -122,6 +127,11 @@
validate_due_date(self.posting_date, self.due_date, "Supplier", self.supplier, self.company)
def set_price_list_currency(self, buying_or_selling):
+ if self.meta.get_field("posting_date"):
+ transaction_date = self.posting_date
+ else:
+ transaction_date = self.transaction_date
+
if self.meta.get_field("currency"):
# price list part
fieldname = "selling_price_list" if buying_or_selling.lower() == "selling" \
@@ -134,8 +144,8 @@
self.plc_conversion_rate = 1.0
elif not self.plc_conversion_rate:
- self.plc_conversion_rate = get_exchange_rate(
- self.price_list_currency, self.company_currency)
+ self.plc_conversion_rate = get_exchange_rate(self.price_list_currency,
+ self.company_currency, transaction_date)
# currency
if not self.currency:
@@ -145,7 +155,7 @@
self.conversion_rate = 1.0
elif not self.conversion_rate:
self.conversion_rate = get_exchange_rate(self.currency,
- self.company_currency)
+ self.company_currency, transaction_date)
def set_missing_item_details(self, for_validate=False):
"""set missing item values"""
@@ -576,6 +586,27 @@
frappe.db.set_value(self.doctype, self.name, "total_advance",
total_allocated_amount, update_modified=False)
+ def group_similar_items(self):
+ group_item_qty = {}
+ group_item_amount = {}
+
+ for item in self.items:
+ group_item_qty[item.item_code] = group_item_qty.get(item.item_code, 0) + item.qty
+ group_item_amount[item.item_code] = group_item_amount.get(item.item_code, 0) + item.amount
+
+ duplicate_list = []
+
+ for item in self.items:
+ if item.item_code in group_item_qty:
+ item.qty = group_item_qty[item.item_code]
+ item.amount = group_item_amount[item.item_code]
+ del group_item_qty[item.item_code]
+ else:
+ duplicate_list.append(item)
+
+ for item in duplicate_list:
+ self.remove(item)
+
@frappe.whitelist()
def get_tax_rate(account_head):
return frappe.db.get_value("Account", account_head, ["tax_rate", "account_name"], as_dict=True)
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index da09e26..096bb2d 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -14,15 +14,17 @@
status_map = {
"Lead": [
- ["Converted", "has_customer"],
+ ["Lost Quotation", "has_lost_quotation"],
["Opportunity", "has_opportunity"],
+ ["Quotation", "has_quotation"],
+ ["Converted", "has_customer"],
],
"Opportunity": [
["Quotation", "has_quotation"],
["Converted", "has_ordered_quotation"],
["Lost", "eval:self.status=='Lost'"],
+ ["Lost", "has_lost_quotation"],
["Closed", "eval:self.status=='Closed'"]
-
],
"Quotation": [
["Draft", None],
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index e48ca1a..96d66aa 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -11,6 +11,10 @@
from erpnext.controllers.accounts_controller import AccountsController
class StockController(AccountsController):
+ def validate(self):
+ super(StockController, self).validate()
+ self.validate_inspection()
+
def make_gl_entries(self, repost_future_gle=True):
if self.docstatus == 2:
delete_gl_entries(voucher_type=self.doctype, voucher_no=self.name)
@@ -39,31 +43,34 @@
gl_list = []
warehouse_with_no_account = []
- for detail in voucher_details:
- sle_list = sle_map.get(detail.name)
+ for item_row in voucher_details:
+ sle_list = sle_map.get(item_row.name)
if sle_list:
for sle in sle_list:
if warehouse_account.get(sle.warehouse):
# from warehouse account
-
- self.check_expense_account(detail)
+
+ self.check_expense_account(item_row)
+
+ if not sle.stock_value_difference:
+ self.validate_negative_stock(sle)
gl_list.append(self.get_gl_dict({
"account": warehouse_account[sle.warehouse]["name"],
- "against": detail.expense_account,
- "cost_center": detail.cost_center,
+ "against": item_row.expense_account,
+ "cost_center": item_row.cost_center,
"remarks": self.get("remarks") or "Accounting Entry for Stock",
"debit": flt(sle.stock_value_difference, 2),
}, warehouse_account[sle.warehouse]["account_currency"]))
# to target warehouse / expense account
gl_list.append(self.get_gl_dict({
- "account": detail.expense_account,
+ "account": item_row.expense_account,
"against": warehouse_account[sle.warehouse]["name"],
- "cost_center": detail.cost_center,
+ "cost_center": item_row.cost_center,
"remarks": self.get("remarks") or "Accounting Entry for Stock",
"credit": flt(sle.stock_value_difference, 2),
- "project": detail.get("project") or self.get("project")
+ "project": item_row.get("project") or self.get("project")
}))
elif sle.warehouse not in warehouse_with_no_account:
warehouse_with_no_account.append(sle.warehouse)
@@ -77,6 +84,11 @@
"\n".join(warehouse_with_no_account))
return process_gl_map(gl_list)
+
+ def validate_negative_stock(self, sle):
+ if sle.qty_after_transaction < 0 and sle.actual_qty < 0:
+ frappe.throw(_("For the Item {item}, valuation rate not found for warehouse {warehouse}. To be able to do accounting entries (for booking expenses), we need valuation rate for item {item}. Please create an incoming stock transaction, on or before {posting_date} {posting_time}, and then try submiting {current_document}").format(item=sle.item_code, warehouse=sle.warehouse,
+ posting_date=sle.posting_date, posting_time=sle.posting_time, current_document=self.name))
def get_voucher_details(self, default_expense_account, default_cost_center, sle_map):
if self.doctype == "Stock Reconciliation":
@@ -126,7 +138,7 @@
def get_stock_ledger_details(self):
stock_ledger = {}
for sle in frappe.db.sql("""select warehouse, stock_value_difference,
- voucher_detail_no, item_code, posting_date, actual_qty
+ voucher_detail_no, item_code, posting_date, posting_time, actual_qty, qty_after_transaction
from `tabStock Ledger Entry` where voucher_type=%s and voucher_no=%s""",
(self.doctype, self.name), as_dict=True):
stock_ledger.setdefault(sle.voucher_detail_no, []).append(sle)
@@ -254,6 +266,28 @@
"name": self.name,
}, update_modified)
+ def validate_inspection(self):
+ '''Checks if quality inspection is set for Items that require inspection.
+ On submit, throw an exception'''
+
+ inspection_required_fieldname = None
+ if self.doctype in ["Purchase Receipt", "Purchase Invoice"]:
+ inspection_required_fieldname = "inspection_required_before_purchase"
+ elif self.doctype in ["Delivery Note", "Sales Invoice"]:
+ inspection_required_fieldname = "inspection_required_before_delivery"
+
+ if not inspection_required_fieldname or \
+ (self.doctype in ["Sales Invoice", "Purchase Invoice"] and not self.update_stock):
+ return
+
+ for d in self.get('items'):
+ if (frappe.db.get_value("Item", d.item_code, inspection_required_fieldname)
+ and not d.quality_inspection):
+
+ frappe.msgprint(_("Quality Inspection required for Item {0}").format(d.item_code))
+ if self.docstatus==1:
+ raise frappe.ValidationError
+
def update_gl_entries_after(posting_date, posting_time, for_warehouses=None, for_items=None,
warehouse_account=None):
def _delete_gl_entries(voucher_type, voucher_no):
diff --git a/erpnext/crm/doctype/lead/lead.json b/erpnext/crm/doctype/lead/lead.json
index a7eda42..99d41af 100644
--- a/erpnext/crm/doctype/lead/lead.json
+++ b/erpnext/crm/doctype/lead/lead.json
@@ -23,10 +23,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -79,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Person Name",
"length": 0,
"no_copy": 0,
@@ -107,6 +110,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Organization Name",
"length": 0,
"no_copy": 0,
@@ -135,6 +139,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Email Id",
"length": 0,
"no_copy": 0,
@@ -164,6 +169,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -191,12 +197,13 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
"oldfieldname": "status",
"oldfieldtype": "Select",
- "options": "Lead\nOpen\nReplied\nOpportunity\nInterested\nConverted\nDo Not Contact",
+ "options": "Lead\nOpen\nReplied\nOpportunity\nQuotation\nLost Quotation\nInterested\nConverted\nDo Not Contact",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -220,6 +227,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Source",
"length": 0,
"no_copy": 0,
@@ -250,6 +258,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "From Customer",
"length": 0,
"no_copy": 1,
@@ -281,6 +290,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Campaign Name",
"length": 0,
"no_copy": 0,
@@ -310,6 +320,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
@@ -337,6 +348,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -364,6 +376,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Lead Owner",
"length": 0,
"no_copy": 0,
@@ -393,6 +406,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -419,6 +433,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Next Contact By",
"length": 0,
"no_copy": 0,
@@ -450,6 +465,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Next Contact Date",
"length": 0,
"no_copy": 1,
@@ -479,11 +495,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address & Contact",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
- "options": "icon-map-marker",
+ "options": "fa fa-map-marker",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -508,6 +525,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address Desc",
"length": 0,
"no_copy": 0,
@@ -534,6 +552,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address HTML",
"length": 0,
"no_copy": 0,
@@ -560,6 +579,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -585,6 +605,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Phone",
"length": 0,
"no_copy": 0,
@@ -613,6 +634,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No.",
"length": 0,
"no_copy": 0,
@@ -641,6 +663,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Fax",
"length": 0,
"no_copy": 0,
@@ -669,6 +692,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Website",
"length": 0,
"no_copy": 0,
@@ -698,6 +722,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Territory",
"length": 0,
"no_copy": 0,
@@ -727,11 +752,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -755,6 +781,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Lead Type",
"length": 0,
"no_copy": 0,
@@ -784,6 +811,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Market Segment",
"length": 0,
"no_copy": 0,
@@ -813,6 +841,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Industry",
"length": 0,
"no_copy": 0,
@@ -842,6 +871,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Request Type",
"length": 0,
"no_copy": 0,
@@ -871,6 +901,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -898,6 +929,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -927,6 +959,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Unsubscribed",
"length": 0,
"no_copy": 0,
@@ -953,6 +986,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Blog Subscriber",
"length": 0,
"no_copy": 0,
@@ -970,7 +1004,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 5,
"image_field": "image",
"image_view": 0,
@@ -980,7 +1014,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 15:58:17.035538",
+ "modified": "2016-12-15 05:16:25.037080",
"modified_by": "Administrator",
"module": "CRM",
"name": "Lead",
diff --git a/erpnext/crm/doctype/lead/lead.py b/erpnext/crm/doctype/lead/lead.py
index 18c0db4..ee3f96f 100644
--- a/erpnext/crm/doctype/lead/lead.py
+++ b/erpnext/crm/doctype/lead/lead.py
@@ -82,6 +82,21 @@
def has_opportunity(self):
return frappe.db.get_value("Opportunity", {"lead": self.name, "status": ["!=", "Lost"]})
+ def has_quotation(self):
+ return frappe.db.get_value("Quotation", {
+ "lead": self.name,
+ "docstatus": 1,
+ "status": ["!=", "Lost"]
+
+ })
+
+ def has_lost_quotation(self):
+ return frappe.db.get_value("Quotation", {
+ "lead": self.name,
+ "docstatus": 1,
+ "status": "Lost"
+ })
+
@frappe.whitelist()
def make_customer(source_name, target_doc=None):
return _make_customer(source_name, target_doc)
diff --git a/erpnext/crm/doctype/opportunity/opportunity.json b/erpnext/crm/doctype/opportunity/opportunity.json
index 8172a86..fa0ec81 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.json
+++ b/erpnext/crm/doctype/opportunity/opportunity.json
@@ -24,10 +24,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -80,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Opportunity From",
"length": 0,
"no_copy": 0,
@@ -110,6 +113,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -140,6 +144,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Lead",
"length": 0,
"no_copy": 0,
@@ -170,6 +175,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer / Lead Name",
"length": 0,
"no_copy": 0,
@@ -196,6 +202,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -223,6 +230,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -251,6 +259,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Opportunity Type",
"length": 0,
"no_copy": 0,
@@ -281,6 +290,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -311,6 +321,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Lost Reason",
"length": 0,
"no_copy": 1,
@@ -337,6 +348,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mins to first response",
"length": 0,
"no_copy": 0,
@@ -364,6 +376,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "With Items",
"length": 0,
"no_copy": 0,
@@ -392,11 +405,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -421,6 +435,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -452,10 +467,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Info",
"length": 0,
"no_copy": 0,
- "options": "icon-bullhorn",
+ "options": "fa fa-bullhorn",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -480,6 +496,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer / Lead Address",
"length": 0,
"no_copy": 0,
@@ -507,6 +524,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address",
"length": 0,
"no_copy": 0,
@@ -537,6 +555,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Territory",
"length": 0,
"no_copy": 0,
@@ -566,6 +585,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Group",
"length": 0,
"no_copy": 0,
@@ -595,6 +615,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -621,6 +642,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Person",
"length": 0,
"no_copy": 0,
@@ -649,6 +671,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
@@ -676,6 +699,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Email",
"length": 0,
"no_copy": 0,
@@ -703,6 +727,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Mobile No",
"length": 0,
"no_copy": 0,
@@ -730,11 +755,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Source",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -758,6 +784,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Source",
"length": 0,
"no_copy": 0,
@@ -788,6 +815,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Campaign",
"length": 0,
"no_copy": 0,
@@ -817,6 +845,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -844,6 +873,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -874,6 +904,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Opportunity Date",
"length": 0,
"no_copy": 0,
@@ -904,6 +935,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Next Contact",
"length": 0,
"no_copy": 0,
@@ -932,6 +964,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Next Contact By",
"length": 0,
"no_copy": 0,
@@ -963,6 +996,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Next Contact Date",
"length": 0,
"no_copy": 0,
@@ -991,6 +1025,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -1018,6 +1053,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "To Discuss",
"length": 0,
"no_copy": 1,
@@ -1046,6 +1082,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -1067,7 +1104,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-info-sign",
+ "icon": "fa fa-info-sign",
"idx": 195,
"image_view": 0,
"in_create": 0,
@@ -1076,7 +1113,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 15:58:37.392157",
+ "modified": "2016-11-07 05:55:17.785342",
"modified_by": "Administrator",
"module": "CRM",
"name": "Opportunity",
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index 6be0768..9111830 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -91,6 +91,14 @@
return frappe.db.sql("""select q.name from `tabQuotation` q, `tabQuotation Item` qi
where q.name = qi.parent and q.docstatus=1 and qi.prevdoc_docname =%s and q.status = 'Ordered'""", self.name)
+ def has_lost_quotation(self):
+ return frappe.db.sql("""
+ select q.name
+ from `tabQuotation` q, `tabQuotation Item` qi
+ where q.name = qi.parent and q.docstatus=1
+ and qi.prevdoc_docname =%s and q.status = 'Lost'
+ """, self.name)
+
def validate_cust_name(self):
if self.customer:
self.customer_name = frappe.db.get_value("Customer", self.customer, "customer_name")
@@ -205,7 +213,8 @@
if company_currency == quotation.currency:
exchange_rate = 1
else:
- exchange_rate = get_exchange_rate(quotation.currency, company_currency)
+ exchange_rate = get_exchange_rate(quotation.currency, company_currency,
+ quotation.transaction_date)
quotation.conversion_rate = exchange_rate
diff --git a/erpnext/demo/setup/setup_data.py b/erpnext/demo/setup/setup_data.py
index 278c398..902bbab 100644
--- a/erpnext/demo/setup/setup_data.py
+++ b/erpnext/demo/setup/setup_data.py
@@ -2,7 +2,7 @@
import random, json
import frappe, erpnext
-from frappe.utils import flt, now_datetime, cstr
+from frappe.utils import flt, now_datetime, cstr, random_string
from frappe.utils.make_random import add_random_children, get_random
from erpnext.demo.domains import data
from frappe import _
@@ -14,8 +14,15 @@
setup_holiday_list()
setup_user()
setup_employee()
- setup_salary_structure()
- setup_salary_structure_for_timesheet()
+
+ employees = frappe.get_all('Employee', fields=['name', 'date_of_joining'])
+
+ # monthly salary
+ setup_salary_structure(employees[:5], 0)
+
+ # based on timesheet
+ setup_salary_structure(employees[5:], 1)
+
setup_leave_allocation()
setup_user_roles()
setup_customer()
@@ -29,7 +36,7 @@
setup_account_to_expense_type()
setup_budget()
setup_pos_profile()
-
+
frappe.db.commit()
frappe.clear_cache()
@@ -111,30 +118,44 @@
frappe.db.set_value("HR Settings", None, "emp_created_by", "Naming Series")
frappe.db.commit()
+ for d in frappe.get_all('Salary Component'):
+ salary_component = frappe.get_doc('Salary Component', d.name)
+ salary_component.append('accounts', dict(
+ company=erpnext.get_default_company(),
+ default_account=frappe.get_value('Account', dict(account_name=('like', 'Salary%')))
+ ))
+ salary_component.save()
+
import_json('Employee')
-def setup_salary_structure():
+def setup_salary_structure(employees, salary_slip_based_on_timesheet=0):
f = frappe.get_doc('Fiscal Year', frappe.defaults.get_global_default('fiscal_year'))
ss = frappe.new_doc('Salary Structure')
- ss.name = "Sample Salary Structure - " + str(f.year_start_date)
- for e in frappe.get_all('Employee', fields=['name', 'date_of_joining']):
+ ss.name = "Sample Salary Structure - " + random_string(5)
+ for e in employees:
ss.append('employees', {
'employee': e.name,
'base': random.random() * 10000
})
- if not e.date_of_joining:
- continue
+ ss.from_date = e.date_of_joining if (e.date_of_joining
+ and e.date_of_joining > f.year_start_date) else f.year_start_date
+ ss.to_date = f.year_end_date
+ ss.salary_slip_based_on_timesheet = salary_slip_based_on_timesheet
- ss.from_date = e.date_of_joining if (e.date_of_joining
- and e.date_of_joining > f.year_start_date) else f.year_start_date
- ss.to_date = f.year_end_date
- ss.payment_account = frappe.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
+ if salary_slip_based_on_timesheet:
+ ss.salary_component = 'Basic'
+ ss.hour_rate = flt(random.random() * 10, 2)
+ else:
+ ss.payroll_frequency = 'Monthly'
+
+ ss.payment_account = frappe.get_value('Account',
+ {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
+
ss.append('earnings', {
'salary_component': 'Basic',
"abbr":'B',
- 'condition': 'base > 5000',
'formula': 'base*.2',
'amount_based_on_formula': 1,
"idx": 1
@@ -142,20 +163,14 @@
ss.append('deductions', {
'salary_component': 'Income Tax',
"abbr":'IT',
- 'condition': 'base > 5000',
+ 'condition': 'base > 1000',
'amount': random.random() * 1000,
"idx": 1
})
ss.insert()
-def setup_salary_structure_for_timesheet():
- for e in frappe.get_all('Salary Structure', fields=['name'], filters={'is_active': 'Yes'}, limit=2):
- ss_doc = frappe.get_doc("Salary Structure", e.name)
- ss_doc.salary_slip_based_on_timesheet = 1
- ss_doc.salary_component = 'Basic'
- ss_doc.hour_rate = flt(random.random() * 10, 2)
- ss_doc.save(ignore_permissions=True)
+ return ss
def setup_user_roles():
user = frappe.get_doc('User', 'demo@erpnext.com')
@@ -208,11 +223,11 @@
user = frappe.get_doc('User', 'aromn@example.com')
user.add_roles('Academics User')
frappe.db.set_global('demo_schools_user', user.name)
-
+
#Add Expense Approver
user = frappe.get_doc('User', 'WanMai@example.com')
user.add_roles('Expense Approver')
-
+
def setup_leave_allocation():
year = now_datetime().year
for employee in frappe.get_all('Employee', fields=['name']):
@@ -345,7 +360,7 @@
})
pos.insert()
-
+
def import_json(doctype, submit=False, values=None):
frappe.flags.in_import = True
data = json.loads(open(frappe.get_app_path('erpnext', 'demo', 'data',
diff --git a/erpnext/demo/user/accounts.py b/erpnext/demo/user/accounts.py
index 392d13d..1a41482 100644
--- a/erpnext/demo/user/accounts.py
+++ b/erpnext/demo/user/accounts.py
@@ -23,25 +23,32 @@
report = "Ordered Items to be Billed"
for so in list(set([r[0] for r in query_report.run(report)["result"]
if r[0]!="Total"]))[:random.randint(1, 5)]:
- si = frappe.get_doc(make_sales_invoice(so))
- si.posting_date = frappe.flags.current_date
- for d in si.get("items"):
- if not d.income_account:
- d.income_account = "Sales - {}".format(frappe.db.get_value('Company', si.company, 'abbr'))
- si.insert()
- si.submit()
- frappe.db.commit()
+ try:
+ si = frappe.get_doc(make_sales_invoice(so))
+ si.posting_date = frappe.flags.current_date
+ for d in si.get("items"):
+ if not d.income_account:
+ d.income_account = "Sales - {}".format(frappe.db.get_value('Company', si.company, 'abbr'))
+ si.insert()
+ si.submit()
+ frappe.db.commit()
+ except frappe.ValidationError:
+ pass
if random.random() <= 0.6:
report = "Received Items to be Billed"
for pr in list(set([r[0] for r in query_report.run(report)["result"]
if r[0]!="Total"]))[:random.randint(1, 5)]:
- pi = frappe.get_doc(make_purchase_invoice(pr))
- pi.posting_date = frappe.flags.current_date
- pi.bill_no = random_string(6)
- pi.insert()
- pi.submit()
- frappe.db.commit()
+ try:
+ pi = frappe.get_doc(make_purchase_invoice(pr))
+ pi.posting_date = frappe.flags.current_date
+ pi.bill_no = random_string(6)
+ pi.insert()
+ pi.submit()
+ frappe.db.commit()
+ except frappe.ValidationError:
+ pass
+
if random.random() < 0.5:
make_payment_entries("Sales Invoice", "Accounts Receivable")
@@ -67,7 +74,7 @@
def make_payment_entries(ref_doctype, report):
outstanding_invoices = list(set([r[3] for r in query_report.run(report,
{"report_date": frappe.flags.current_date })["result"] if r[2]==ref_doctype]))
-
+
# make Payment Entry
for inv in outstanding_invoices[:random.randint(1, 2)]:
pe = get_payment_entry(ref_doctype, inv)
diff --git a/erpnext/demo/user/hr.py b/erpnext/demo/user/hr.py
index 2686987..cfe3119 100644
--- a/erpnext/demo/user/hr.py
+++ b/erpnext/demo/user/hr.py
@@ -1,40 +1,50 @@
from __future__ import unicode_literals
import frappe, erpnext
import random
-from frappe.utils import random_string, add_days, cint
+import datetime
+from frappe.utils import random_string, add_days, get_last_day, getdate
from erpnext.projects.doctype.timesheet.test_timesheet import make_timesheet
from erpnext.projects.doctype.timesheet.timesheet import make_salary_slip, make_sales_invoice
from frappe.utils.make_random import get_random
from erpnext.hr.doctype.expense_claim.expense_claim import get_expense_approver, make_bank_entry
-from erpnext.hr.doctype.leave_application.leave_application import get_leave_balance_on, OverlapError
+from erpnext.hr.doctype.leave_application.leave_application import (get_leave_balance_on,
+ OverlapError, AttendanceAlreadyMarkedError)
def work():
frappe.set_user(frappe.db.get_global('demo_hr_user'))
year, month = frappe.flags.current_date.strftime("%Y-%m").split("-")
- prev_month = str(cint(month)- 1).zfill(2)
- if month=="01":
- prev_month = "12"
-
mark_attendance()
make_leave_application()
# process payroll
- if not frappe.db.get_value("Salary Slip", {"month": prev_month, "fiscal_year": year}):
+ if not frappe.db.sql('select name from `tabSalary Slip` where month(adddate(start_date, interval 1 month))=month(curdate())'):
+ # process payroll for previous month
process_payroll = frappe.get_doc("Process Payroll", "Process Payroll")
process_payroll.company = frappe.flags.company
- process_payroll.month = prev_month
- process_payroll.fiscal_year = year
- process_payroll.from_date = frappe.flags.current_date
- process_payroll.to_date = add_days(frappe.flags.current_date, random.randint(0, 30))
- process_payroll.reference_number = "DemoRef23"
- process_payroll.reference_date = frappe.flags.current_date
+ process_payroll.payroll_frequency = 'Monthly'
+
+ # select a posting date from the previous month
+ process_payroll.posting_date = get_last_day(getdate(frappe.flags.current_date) - datetime.timedelta(days=10))
process_payroll.payment_account = frappe.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
- process_payroll.submit_salary_slip()
- process_payroll.make_journal_entry()
-
+
+ process_payroll.set_start_end_dates()
+
+ # based on frequency
+ process_payroll.salary_slip_based_on_timesheet = 0
+ process_payroll.create_salary_slips()
+ process_payroll.submit_salary_slips()
+ process_payroll.make_journal_entry(reference_date=frappe.flags.current_date,
+ reference_number=random_string(10))
+
+ process_payroll.salary_slip_based_on_timesheet = 1
+ process_payroll.create_salary_slips()
+ process_payroll.submit_salary_slips()
+ process_payroll.make_journal_entry(reference_date=frappe.flags.current_date,
+ reference_number=random_string(10))
+
if frappe.db.get_global('demo_hr_user'):
make_timesheet_records()
-
+
#expense claim
expense_claim = frappe.new_doc("Expense Claim")
expense_claim.extend('expenses', get_expenses())
@@ -100,7 +110,10 @@
select employee from `tabSalary Structure Employee`
where parent IN %(sal_struct)s""", {"sal_struct": sal_struct}, as_dict=True)
return employees
-
+
+ else:
+ return []
+
def make_timesheet_records():
employees = get_timesheet_based_salary_slip_employee()
for e in employees:
@@ -134,10 +147,10 @@
sales_invoice.insert()
sales_invoice.submit()
frappe.db.commit()
-
+
def make_leave_application():
allocated_leaves = frappe.get_all("Leave Allocation", fields=['employee', 'leave_type'])
-
+
for allocated_leave in allocated_leaves:
leave_balance = get_leave_balance_on(allocated_leave.employee, allocated_leave.leave_type, frappe.flags.current_date,
consider_all_leaves_in_the_allocation_period=True)
@@ -146,7 +159,7 @@
to_date = frappe.flags.current_date
else:
to_date = add_days(frappe.flags.current_date, random.randint(0, leave_balance-1))
-
+
leave_application = frappe.get_doc({
"doctype": "Leave Application",
"employee": allocated_leave.employee,
@@ -159,13 +172,13 @@
leave_application.insert()
leave_application.submit()
frappe.db.commit()
- except (OverlapError):
+ except (OverlapError, AttendanceAlreadyMarkedError):
frappe.db.rollback()
-
+
def mark_attendance():
att_date = frappe.flags.current_date
for employee in frappe.get_all('Employee', fields=['name'], filters = {'status': 'Active'}):
-
+
if not frappe.db.get_value("Attendance", {"employee": employee.name, "att_date": att_date}):
attendance = frappe.get_doc({
"doctype": "Attendance",
@@ -175,11 +188,11 @@
leave = frappe.db.sql("""select name from `tabLeave Application`
where employee = %s and %s between from_date and to_date and status = 'Approved'
and docstatus = 1""", (employee.name, att_date))
-
+
if leave:
attendance.status = "Absent"
else:
attendance.status = "Present"
attendance.save()
- attendance.submit()
+ attendance.submit()
frappe.db.commit()
diff --git a/erpnext/demo/user/sales.py b/erpnext/demo/user/sales.py
index 10df143..ddd36ef 100644
--- a/erpnext/demo/user/sales.py
+++ b/erpnext/demo/user/sales.py
@@ -55,12 +55,13 @@
"enquiry_from": "Customer",
"customer": get_random("Customer"),
"enquiry_type": "Sales",
+ "with_items": 1,
"transaction_date": frappe.flags.current_date,
})
add_random_children(b, "items", rows=4, randomize = {
"qty": (1, 5),
- "item_code": ("Item", {"has_variants": "0", "is_fixed_asset": 0})
+ "item_code": ("Item", {"has_variants": 0, "is_fixed_asset": 0})
}, unique="item_code")
b.insert()
@@ -68,7 +69,7 @@
def make_quotation():
# get open opportunites
- opportunity = get_random("Opportunity", {"status": "Open"})
+ opportunity = get_random("Opportunity", {"status": "Open", "with_items": 1})
if opportunity:
from erpnext.crm.doctype.opportunity.opportunity import make_quotation
diff --git a/erpnext/demo/user/stock.py b/erpnext/demo/user/stock.py
index ea23853..0bd5ce3 100644
--- a/erpnext/demo/user/stock.py
+++ b/erpnext/demo/user/stock.py
@@ -85,7 +85,7 @@
def submit_draft_stock_entries():
from erpnext.stock.doctype.stock_entry.stock_entry import IncorrectValuationRateError, \
- DuplicateEntryForProductionOrderError, OperationsNotCompleteError
+ DuplicateEntryForProductionOrderError, OperationsNotCompleteError
# try posting older drafts (if exists)
frappe.db.commit()
@@ -102,7 +102,7 @@
def make_sales_return_records():
for data in frappe.get_all('Delivery Note', fields=["name"], filters={"docstatus": 1}):
- if random.random() < 0.2:
+ if random.random() < 0.1:
try:
dn = make_sales_return(data.name)
dn.insert()
@@ -113,7 +113,7 @@
def make_purchase_return_records():
for data in frappe.get_all('Purchase Receipt', fields=["name"], filters={"docstatus": 1}):
- if random.random() < 0.2:
+ if random.random() < 0.1:
try:
pr = make_purchase_return(data.name)
pr.insert()
diff --git a/erpnext/docs/assets/img/accounts/Screen Shot 2016-10-28 at 5.36.15 PM.png b/erpnext/docs/assets/img/accounts/Screen Shot 2016-10-28 at 5.36.15 PM.png
new file mode 100644
index 0000000..cdc4e1a
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/Screen Shot 2016-10-28 at 5.36.15 PM.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/balance_sheet_report.png b/erpnext/docs/assets/img/accounts/balance_sheet_report.png
new file mode 100644
index 0000000..4d6ffdc
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/balance_sheet_report.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/cash_flow_report.png b/erpnext/docs/assets/img/accounts/cash_flow_report.png
new file mode 100644
index 0000000..33079da
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/cash_flow_report.png
Binary files differ
diff --git a/erpnext/docs/assets/img/accounts/profit_n_loss_report.png b/erpnext/docs/assets/img/accounts/profit_n_loss_report.png
new file mode 100644
index 0000000..de2a75f
--- /dev/null
+++ b/erpnext/docs/assets/img/accounts/profit_n_loss_report.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/Selection_021.png b/erpnext/docs/assets/img/articles/Selection_021.png
index f4a61cf..48e8c3e 100644
--- a/erpnext/docs/assets/img/articles/Selection_021.png
+++ b/erpnext/docs/assets/img/articles/Selection_021.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/barcode-feature-setup.png b/erpnext/docs/assets/img/articles/barcode-feature-setup.png
deleted file mode 100644
index 0a097ef..0000000
--- a/erpnext/docs/assets/img/articles/barcode-feature-setup.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/item-show-on-website-checkbox-checked.png b/erpnext/docs/assets/img/articles/item-show-on-website-checkbox-checked.png
new file mode 100644
index 0000000..ae0878a
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/item-show-on-website-checkbox-checked.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/item-show-on-website-checkbox.png b/erpnext/docs/assets/img/articles/item-show-on-website-checkbox.png
new file mode 100644
index 0000000..d1baa0c
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/item-show-on-website-checkbox.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-01.png b/erpnext/docs/assets/img/articles/new-item-for-website-01.png
new file mode 100644
index 0000000..826d31a
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-01.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-02.png b/erpnext/docs/assets/img/articles/new-item-for-website-02.png
new file mode 100644
index 0000000..d838429
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-02.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-03.png b/erpnext/docs/assets/img/articles/new-item-for-website-03.png
new file mode 100644
index 0000000..e182cbd
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-03.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-04.png b/erpnext/docs/assets/img/articles/new-item-for-website-04.png
new file mode 100644
index 0000000..8e5ef38
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-04.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-05.png b/erpnext/docs/assets/img/articles/new-item-for-website-05.png
new file mode 100644
index 0000000..2822807
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-05.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-06.png b/erpnext/docs/assets/img/articles/new-item-for-website-06.png
new file mode 100644
index 0000000..fea2892
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-06.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-07.png b/erpnext/docs/assets/img/articles/new-item-for-website-07.png
new file mode 100644
index 0000000..4d410b3
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-07.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/new-item-for-website-08.png b/erpnext/docs/assets/img/articles/new-item-for-website-08.png
new file mode 100644
index 0000000..440bef1
--- /dev/null
+++ b/erpnext/docs/assets/img/articles/new-item-for-website-08.png
Binary files differ
diff --git a/erpnext/docs/assets/img/articles/sales-person-transaction-4.png b/erpnext/docs/assets/img/articles/sales-person-transaction-4.png
deleted file mode 100644
index 5883c76..0000000
--- a/erpnext/docs/assets/img/articles/sales-person-transaction-4.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/create-customer.gif b/erpnext/docs/assets/img/crm/create-customer.gif
new file mode 100644
index 0000000..a615f2a
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/create-customer.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/customer-to selling-flowchart.jpeg b/erpnext/docs/assets/img/crm/customer-to selling-flowchart.jpeg
new file mode 100644
index 0000000..70e536e
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/customer-to selling-flowchart.jpeg
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/make-sq-from-opportunity.png b/erpnext/docs/assets/img/crm/make-sq-from-opportunity.png
new file mode 100644
index 0000000..9d41027
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/make-sq-from-opportunity.png
Binary files differ
diff --git a/erpnext/docs/assets/img/crm/requirement-gathering.png b/erpnext/docs/assets/img/crm/requirement-gathering.png
new file mode 100644
index 0000000..cd631d6
--- /dev/null
+++ b/erpnext/docs/assets/img/crm/requirement-gathering.png
Binary files differ
diff --git a/erpnext/docs/assets/img/customize/feature-setup.png b/erpnext/docs/assets/img/customize/feature-setup.png
deleted file mode 100644
index 200d138..0000000
--- a/erpnext/docs/assets/img/customize/feature-setup.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/img/erpnext-docs.png b/erpnext/docs/assets/img/erpnext-docs.png
new file mode 100644
index 0000000..a814703
--- /dev/null
+++ b/erpnext/docs/assets/img/erpnext-docs.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/daily-work-summary-settings.png b/erpnext/docs/assets/img/human-resources/daily-work-summary-settings.png
new file mode 100644
index 0000000..c4801c2
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/daily-work-summary-settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/payroll-frequency.png b/erpnext/docs/assets/img/human-resources/payroll-frequency.png
new file mode 100644
index 0000000..e639903
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/payroll-frequency.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/process-payroll.png b/erpnext/docs/assets/img/human-resources/process-payroll.png
index 2e2fbed..0901cbe 100644
--- a/erpnext/docs/assets/img/human-resources/process-payroll.png
+++ b/erpnext/docs/assets/img/human-resources/process-payroll.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/salary-structure.png b/erpnext/docs/assets/img/human-resources/salary-structure.png
index 71f6013..83e4820 100644
--- a/erpnext/docs/assets/img/human-resources/salary-structure.png
+++ b/erpnext/docs/assets/img/human-resources/salary-structure.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/training_event.png b/erpnext/docs/assets/img/human-resources/training_event.png
new file mode 100644
index 0000000..04162eb
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/training_event.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/training_event_employee.png b/erpnext/docs/assets/img/human-resources/training_event_employee.png
new file mode 100644
index 0000000..aea90b4
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/training_event_employee.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/training_feedback.png b/erpnext/docs/assets/img/human-resources/training_feedback.png
new file mode 100644
index 0000000..84a2ec2
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/training_feedback.png
Binary files differ
diff --git a/erpnext/docs/assets/img/human-resources/training_result.png b/erpnext/docs/assets/img/human-resources/training_result.png
new file mode 100644
index 0000000..36f086c
--- /dev/null
+++ b/erpnext/docs/assets/img/human-resources/training_result.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-FG-update.png b/erpnext/docs/assets/img/manufacturing/PO-FG-update.png
index b07a7cf..97ce265 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-FG-update.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-FG-update.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png
index e8dea02..6191e13 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-qty.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png
index 5c20ff8..0cd0bd1 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-material-transfer-updated.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png b/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png
index dbdc303..c323628 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-material-transfer.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-operations-make-ts.png b/erpnext/docs/assets/img/manufacturing/PO-operations-make-ts.png
new file mode 100644
index 0000000..07b5170
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/PO-operations-make-ts.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-operations.png b/erpnext/docs/assets/img/manufacturing/PO-operations.png
index 6916891..4b091ce 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-operations.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-operations.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/PO-stop.png b/erpnext/docs/assets/img/manufacturing/PO-stop.png
index c486a68..0c82573 100644
--- a/erpnext/docs/assets/img/manufacturing/PO-stop.png
+++ b/erpnext/docs/assets/img/manufacturing/PO-stop.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/manufacturing-flow.png b/erpnext/docs/assets/img/manufacturing/manufacturing-flow.png
new file mode 100644
index 0000000..4701ad0
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/manufacturing-flow.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/price-list-based-currency-bom.png b/erpnext/docs/assets/img/manufacturing/price-list-based-currency-bom.png
new file mode 100644
index 0000000..c8eca6a
--- /dev/null
+++ b/erpnext/docs/assets/img/manufacturing/price-list-based-currency-bom.png
Binary files differ
diff --git a/erpnext/docs/assets/img/manufacturing/production-order.png b/erpnext/docs/assets/img/manufacturing/production-order.png
index d1e7966..fb552f3 100644
--- a/erpnext/docs/assets/img/manufacturing/production-order.png
+++ b/erpnext/docs/assets/img/manufacturing/production-order.png
Binary files differ
diff --git a/erpnext/docs/assets/img/selling/selling-flow.png b/erpnext/docs/assets/img/selling/selling-flow.png
new file mode 100644
index 0000000..7f35f80
--- /dev/null
+++ b/erpnext/docs/assets/img/selling/selling-flow.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/data-import/data-import-tool-template.gif b/erpnext/docs/assets/img/setup/data-import/data-import-tool-template.gif
new file mode 100644
index 0000000..c4d28f4
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data-import/data-import-tool-template.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/data-import/import-csv.png b/erpnext/docs/assets/img/setup/data-import/import-csv.png
new file mode 100644
index 0000000..3b9bc9f
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data-import/import-csv.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/data-import/import-file.png b/erpnext/docs/assets/img/setup/data-import/import-file.png
new file mode 100644
index 0000000..c99e015
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/data-import/import-file.png
Binary files differ
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/docs/assets/img/setup/integration-service/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/docs/assets/img/setup/integration-service/__init__.py
diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-1.png b/erpnext/docs/assets/img/setup/integration-service/api-step-1.png
new file mode 100644
index 0000000..d51434d
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/api-step-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-2.png b/erpnext/docs/assets/img/setup/integration-service/api-step-2.png
new file mode 100644
index 0000000..f4dfa43
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/api-step-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/api-step-3.png b/erpnext/docs/assets/img/setup/integration-service/api-step-3.png
new file mode 100644
index 0000000..070fded
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/api-step-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/create_dropbox_service.png b/erpnext/docs/assets/img/setup/integration-service/create_dropbox_service.png
new file mode 100644
index 0000000..daa792c
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/create_dropbox_service.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-2.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-2.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-2.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-3.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-3.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-3.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-open-1.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-open-1.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-open-1.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-open-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-open-2.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-open-2.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-open-2.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-open-2.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/dropbox-open-3.png b/erpnext/docs/assets/img/setup/integration-service/dropbox-open-3.png
similarity index 100%
rename from erpnext/docs/assets/img/setup/dropbox-open-3.png
rename to erpnext/docs/assets/img/setup/integration-service/dropbox-open-3.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/ldap_settings.png b/erpnext/docs/assets/img/setup/integration-service/ldap_settings.png
new file mode 100644
index 0000000..c0ecbc7
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/ldap_settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/login_via_ldap.png b/erpnext/docs/assets/img/setup/integration-service/login_via_ldap.png
new file mode 100644
index 0000000..15fd387
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/login_via_ldap.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_paypal.png b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_paypal.png
new file mode 100644
index 0000000..e6f1665
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_paypal.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_razorpay.png b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_razorpay.png
new file mode 100644
index 0000000..e09e797
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/payment_gateway_account_razorpay.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/paypal_coa.png b/erpnext/docs/assets/img/setup/integration-service/paypal_coa.png
new file mode 100644
index 0000000..bf0ed19
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/paypal_coa.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/paypal_settings.png b/erpnext/docs/assets/img/setup/integration-service/paypal_settings.png
new file mode 100644
index 0000000..f5f5e54
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/paypal_settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/razorpay_coa.png b/erpnext/docs/assets/img/setup/integration-service/razorpay_coa.png
new file mode 100644
index 0000000..68cad28
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/razorpay_coa.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/razorpay_settings.png b/erpnext/docs/assets/img/setup/integration-service/razorpay_settings.png
new file mode 100644
index 0000000..042b422
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/razorpay_settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/sanbox-credentials.png b/erpnext/docs/assets/img/setup/integration-service/sanbox-credentials.png
new file mode 100644
index 0000000..21e8460
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/sanbox-credentials.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/setup-backup-frequency.png b/erpnext/docs/assets/img/setup/integration-service/setup-backup-frequency.png
new file mode 100644
index 0000000..916679e
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/setup-backup-frequency.png
Binary files differ
diff --git a/erpnext/docs/assets/img/setup/integration-service/setup-sanbox-1.png b/erpnext/docs/assets/img/setup/integration-service/setup-sanbox-1.png
new file mode 100644
index 0000000..932a62a
--- /dev/null
+++ b/erpnext/docs/assets/img/setup/integration-service/setup-sanbox-1.png
Binary files differ
diff --git a/erpnext/docs/assets/img/taxes-and-charges.gif b/erpnext/docs/assets/img/taxes-and-charges.gif
new file mode 100644
index 0000000..8d0a2bc
--- /dev/null
+++ b/erpnext/docs/assets/img/taxes-and-charges.gif
Binary files differ
diff --git a/erpnext/docs/assets/img/website/checkout.png b/erpnext/docs/assets/img/website/checkout.png
new file mode 100644
index 0000000..0aa7b98
--- /dev/null
+++ b/erpnext/docs/assets/img/website/checkout.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/item-in-webiste.png b/erpnext/docs/assets/img/website/item-in-webiste.png
new file mode 100644
index 0000000..8a6203e
--- /dev/null
+++ b/erpnext/docs/assets/img/website/item-in-webiste.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/item-website-specs.png b/erpnext/docs/assets/img/website/item-website-specs.png
new file mode 100644
index 0000000..700b1b0
--- /dev/null
+++ b/erpnext/docs/assets/img/website/item-website-specs.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/item-website-view.png b/erpnext/docs/assets/img/website/item-website-view.png
new file mode 100644
index 0000000..34d708b
--- /dev/null
+++ b/erpnext/docs/assets/img/website/item-website-view.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/place-order.png b/erpnext/docs/assets/img/website/place-order.png
new file mode 100644
index 0000000..ced7612
--- /dev/null
+++ b/erpnext/docs/assets/img/website/place-order.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/shopping-cart-settings.png b/erpnext/docs/assets/img/website/shopping-cart-settings.png
new file mode 100644
index 0000000..7828cff
--- /dev/null
+++ b/erpnext/docs/assets/img/website/shopping-cart-settings.png
Binary files differ
diff --git a/erpnext/docs/assets/img/website/website-login.png b/erpnext/docs/assets/img/website/website-login.png
new file mode 100644
index 0000000..6943098
--- /dev/null
+++ b/erpnext/docs/assets/img/website/website-login.png
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/import-3.png b/erpnext/docs/assets/old_images/erpnext/import-3.png
deleted file mode 100644
index 9387dd5..0000000
--- a/erpnext/docs/assets/old_images/erpnext/import-3.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/import-4.png b/erpnext/docs/assets/old_images/erpnext/import-4.png
deleted file mode 100644
index fce1f51..0000000
--- a/erpnext/docs/assets/old_images/erpnext/import-4.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/item-webimage-1.png b/erpnext/docs/assets/old_images/erpnext/item-webimage-1.png
deleted file mode 100644
index a2dfe7f..0000000
--- a/erpnext/docs/assets/old_images/erpnext/item-webimage-1.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/item-webimage-2.png b/erpnext/docs/assets/old_images/erpnext/item-webimage-2.png
deleted file mode 100644
index 473a3ff..0000000
--- a/erpnext/docs/assets/old_images/erpnext/item-webimage-2.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/item-webimage.png b/erpnext/docs/assets/old_images/erpnext/item-webimage.png
deleted file mode 100644
index af46e3c..0000000
--- a/erpnext/docs/assets/old_images/erpnext/item-webimage.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/itemgroup-webimage-bags.png b/erpnext/docs/assets/old_images/erpnext/itemgroup-webimage-bags.png
deleted file mode 100644
index 9c3a400..0000000
--- a/erpnext/docs/assets/old_images/erpnext/itemgroup-webimage-bags.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/itemgroup-websettings.png b/erpnext/docs/assets/old_images/erpnext/itemgroup-websettings.png
deleted file mode 100644
index dcb8641..0000000
--- a/erpnext/docs/assets/old_images/erpnext/itemgroup-websettings.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/itemgroup-website-settings.png b/erpnext/docs/assets/old_images/erpnext/itemgroup-website-settings.png
deleted file mode 100644
index 1b4039c..0000000
--- a/erpnext/docs/assets/old_images/erpnext/itemgroup-website-settings.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/webpage-itemgroup-display.png b/erpnext/docs/assets/old_images/erpnext/webpage-itemgroup-display.png
deleted file mode 100644
index 7981e4f..0000000
--- a/erpnext/docs/assets/old_images/erpnext/webpage-itemgroup-display.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/assets/old_images/erpnext/webpage-labels.png b/erpnext/docs/assets/old_images/erpnext/webpage-labels.png
deleted file mode 100644
index 3182ab7..0000000
--- a/erpnext/docs/assets/old_images/erpnext/webpage-labels.png
+++ /dev/null
Binary files differ
diff --git a/erpnext/docs/contents.py b/erpnext/docs/contents.py
index 131d410..c23737a 100644
--- a/erpnext/docs/contents.py
+++ b/erpnext/docs/contents.py
@@ -6,4 +6,4 @@
from frappe.website.utils import get_full_index
def get_context(context):
- context.full_index = get_full_index(extn = True)
+ context.full_index = get_full_index()
diff --git a/erpnext/docs/current/models/stock/material_request_item.html b/erpnext/docs/current/models/stock/material_request_item.html
deleted file mode 100644
index 2d1e2a0..0000000
--- a/erpnext/docs/current/models/stock/material_request_item.html
+++ /dev/null
@@ -1,414 +0,0 @@
-<!-- title: Material Request Item -->
-
-
-
-
-
-<div class="dev-header">
-
-<a class="btn btn-default btn-sm" disabled style="margin-bottom: 10px;">
- Version 6.x.x</a>
-
-
- <a class="btn btn-default btn-sm" href="https://github.com/frappe/erpnext/tree/develop/erpnext/stock/doctype/material_request_item"
- target="_blank" style="margin-left: 10px; margin-bottom: 10px;"><i class="octicon octicon-mark-github"></i> Source</a>
-
-</div>
-
-
-<span class="label label-info">Child Table</span>
-
-
- <p><b>Table Name:</b> <code>tabMaterial Request Item</code></p>
-
-
-
-
-<h3>Fields</h3>
-
-<table class="table table-bordered">
- <thead>
- <tr>
- <th style="width: 5%">Sr</th>
- <th style="width: 25%">Fieldname</th>
- <th style="width: 20%">Type</th>
- <th style="width: 25%">Label</th>
- <th style="width: 25%">Options</th>
- </tr>
- </thead>
- <tbody>
-
- <tr >
- <td>1</td>
- <td class="danger" title="Mandatory"><code>item_code</code></td>
- <td >
- Link</td>
- <td >
- Item Code
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/stock/item">Item</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>2</td>
- <td ><code>col_break1</code></td>
- <td class="info">
- Column Break</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>3</td>
- <td ><code>item_name</code></td>
- <td >
- Data</td>
- <td >
- Item Name
-
- </td>
- <td></td>
- </tr>
-
- <tr class="info">
- <td>4</td>
- <td ><code>section_break_4</code></td>
- <td >
- Section Break</td>
- <td >
- Description
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>5</td>
- <td class="danger" title="Mandatory"><code>description</code></td>
- <td >
- Text Editor</td>
- <td >
- Description
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>6</td>
- <td ><code>column_break_6</code></td>
- <td class="info">
- Column Break</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>7</td>
- <td ><code>image</code></td>
- <td >
- Attach Image</td>
- <td >
- Image
-
- </td>
- <td></td>
- </tr>
-
- <tr class="info">
- <td>8</td>
- <td ><code>quantity_and_warehouse</code></td>
- <td >
- Section Break</td>
- <td >
- Quantity and Warehouse
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>9</td>
- <td class="danger" title="Mandatory"><code>qty</code></td>
- <td >
- Float</td>
- <td >
- Quantity
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>10</td>
- <td class="danger" title="Mandatory"><code>uom</code></td>
- <td >
- Link</td>
- <td >
- Stock UOM
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/setup/uom">UOM</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>11</td>
- <td ><code>warehouse</code></td>
- <td >
- Link</td>
- <td >
- For Warehouse
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/stock/warehouse">Warehouse</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>12</td>
- <td ><code>col_break2</code></td>
- <td class="info">
- Column Break</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>13</td>
- <td class="danger" title="Mandatory"><code>schedule_date</code></td>
- <td >
- Date</td>
- <td >
- Required Date
-
- </td>
- <td></td>
- </tr>
-
- <tr class="info">
- <td>14</td>
- <td ><code>more_info</code></td>
- <td >
- Section Break</td>
- <td >
- More Information
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>15</td>
- <td ><code>item_group</code></td>
- <td >
- Link</td>
- <td >
- Item Group
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/setup/item_group">Item Group</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>16</td>
- <td ><code>brand</code></td>
- <td >
- Link</td>
- <td >
- Brand
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/setup/brand">Brand</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>17</td>
- <td ><code>lead_time_date</code></td>
- <td >
- Date</td>
- <td >
- Lead Time Date
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>18</td>
- <td ><code>sales_order</code></td>
- <td >
- Link</td>
- <td >
- Sales Order
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/selling/sales_order">Sales Order</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>19</td>
- <td ><code>project</code></td>
- <td >
- Link</td>
- <td >
- Project
-
- </td>
- <td>
-
-
-
-
-<a href="https://frappe.github.io/erpnext/current/models/projects/project">Project</a>
-
-
-
- </td>
- </tr>
-
- <tr >
- <td>20</td>
- <td ><code>col_break3</code></td>
- <td class="info">
- Column Break</td>
- <td >
-
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>21</td>
- <td ><code>min_order_qty</code></td>
- <td >
- Float</td>
- <td >
- Min Order Qty
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>22</td>
- <td ><code>projected_qty</code></td>
- <td >
- Float</td>
- <td >
- Projected Qty
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>23</td>
- <td ><code>ordered_qty</code></td>
- <td >
- Float</td>
- <td >
- Completed Qty
-
- </td>
- <td></td>
- </tr>
-
- <tr >
- <td>24</td>
- <td ><code>page_break</code></td>
- <td >
- Check</td>
- <td >
- Page Break
-
- </td>
- <td></td>
- </tr>
-
- </tbody>
-</table>
-
-
-
-
- <h4>Child Table Of</h4>
- <ul>
-
- <li>
-
-
-<a href="https://frappe.github.io/erpnext/current/models/stock/material_request">Material Request</a>
-
-</li>
-
- </ul>
-
-
-
-<!-- autodoc -->
-<!-- jinja -->
-<!-- static -->
\ No newline at end of file
diff --git a/erpnext/docs/license.html b/erpnext/docs/license.html
index 6aa4e64..43d90cf 100644
--- a/erpnext/docs/license.html
+++ b/erpnext/docs/license.html
@@ -2,183 +2,689 @@
<h1>GNU General Public License (v3)</h1>
-<h2>ERPNext License Info</h2>
-
-<p>(c) 2013 Frappe Technologies Pvt Ltd. Mumbai
-ERPNext is a trademark of Frappe Technologies</p>
-
-<p>The ERPNext code is licensed under the GNU General Public License (v3) as mentioned below and the Documentation is licensed under Creative Commons (CC-BY-SA-3.0)</p>
-
-<h2>GNU GENERAL PUBLIC LICENSE</h2>
+<h3>GNU GENERAL PUBLIC LICENSE</h3>
<p>Version 3, 29 June 2007</p>
-<p><a href="http://www.gnu.org/copyleft/gpl.html" rel="nofollow">http://www.gnu.org/copyleft/gpl.html</a></p>
+<p>Copyright (C) 2007 Free Software Foundation, Inc.
+<a href="http://fsf.org/" rel="nofollow">http://fsf.org/</a></p>
-<p>TERMS AND CONDITIONS
-0. Definitions.</p>
+<p>Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.</p>
-<p>“This License” refers to version 3 of the GNU General Public License.</p>
+<h3>Preamble</h3>
-<p>“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.</p>
+<p>The GNU General Public License is a free, copyleft license for
+software and other kinds of works.</p>
-<p>“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations.</p>
+<p>The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works. By contrast,
+the GNU General Public License is intended to guarantee your freedom
+to share and change all versions of a program--to make sure it remains
+free software for all its users. We, the Free Software Foundation, use
+the GNU General Public License for most of our software; it applies
+also to any other work released this way by its authors. You can apply
+it to your programs, too.</p>
-<p>To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work.</p>
+<p>When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.</p>
-<p>A “covered work” means either the unmodified Program or a work based on the Program.</p>
+<p>To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights. Therefore, you
+have certain responsibilities if you distribute copies of the
+software, or if you modify it: responsibilities to respect the freedom
+of others.</p>
-<p>To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well.</p>
+<p>For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received. You must make sure that they, too, receive
+or can get the source code. And you must show them these terms so they
+know their rights.</p>
-<p>To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying.</p>
+<p>Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.</p>
-<p>An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion.
-1. Source Code.</p>
+<p>For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software. For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.</p>
-<p>The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work.</p>
+<p>Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the
+manufacturer can do so. This is fundamentally incompatible with the
+aim of protecting users' freedom to change the software. The
+systematic pattern of such abuse occurs in the area of products for
+individuals to use, which is precisely where it is most unacceptable.
+Therefore, we have designed this version of the GPL to prohibit the
+practice for those products. If such problems arise substantially in
+other domains, we stand ready to extend this provision to those
+domains in future versions of the GPL, as needed to protect the
+freedom of users.</p>
-<p>A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language.</p>
+<p>Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish
+to avoid the special danger that patents applied to a free program
+could make it effectively proprietary. To prevent this, the GPL
+assures that patents cannot be used to render the program non-free.</p>
-<p>The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it.</p>
+<p>The precise terms and conditions for copying, distribution and
+modification follow.</p>
-<p>The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work.</p>
+<h3>TERMS AND CONDITIONS</h3>
-<p>The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source.</p>
+<h4>0. Definitions.</h4>
-<p>The Corresponding Source for a work in source code form is that same work.
-2. Basic Permissions.</p>
+<p>"This License" refers to version 3 of the GNU General Public License.</p>
-<p>All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law.</p>
+<p>"Copyright" also means copyright-like laws that apply to other kinds
+of works, such as semiconductor masks.</p>
-<p>You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you.</p>
+<p>"The Program" refers to any copyrightable work licensed under this
+License. Each licensee is addressed as "you". "Licensees" and
+"recipients" may be individuals or organizations.</p>
-<p>Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary.
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.</p>
+<p>To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of
+an exact copy. The resulting work is called a "modified version" of
+the earlier work or a work "based on" the earlier work.</p>
-<p>No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures.</p>
+<p>A "covered work" means either the unmodified Program or a work based
+on the Program.</p>
-<p>When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures.
-4. Conveying Verbatim Copies.</p>
+<p>To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy. Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.</p>
+
+<p>To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies. Mere interaction with a user
+through a computer network, with no transfer of a copy, is not
+conveying.</p>
+
+<p>An interactive user interface displays "Appropriate Legal Notices" to
+the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License. If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.</p>
+
+<h4>1. Source Code.</h4>
+
+<p>The "source code" for a work means the preferred form of the work for
+making modifications to it. "Object code" means any non-source form of
+a work.</p>
+
+<p>A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.</p>
+
+<p>The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form. A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.</p>
+
+<p>The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities. However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work. For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.</p>
+
+<p>The Corresponding Source need not include anything that users can
+regenerate automatically from other parts of the Corresponding Source.</p>
+
+<p>The Corresponding Source for a work in source code form is that same
+work.</p>
+
+<h4>2. Basic Permissions.</h4>
+
+<p>All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met. This License explicitly affirms your unlimited
+permission to run the unmodified Program. The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work. This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.</p>
+
+<p>You may make, run and propagate covered works that you do not convey,
+without conditions so long as your license otherwise remains in force.
+You may convey covered works to others for the sole purpose of having
+them make modifications exclusively for you, or provide you with
+facilities for running those works, provided that you comply with the
+terms of this License in conveying all material for which you do not
+control copyright. Those thus making or running the covered works for
+you must do so exclusively on your behalf, under your direction and
+control, on terms that prohibit them from making any copies of your
+copyrighted material outside their relationship with you.</p>
+
+<p>Conveying under any other circumstances is permitted solely under the
+conditions stated below. Sublicensing is not allowed; section 10 makes
+it unnecessary.</p>
+
+<h4>3. Protecting Users' Legal Rights From Anti-Circumvention Law.</h4>
+
+<p>No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.</p>
+
+<p>When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such
+circumvention is effected by exercising rights under this License with
+respect to the covered work, and you disclaim any intention to limit
+operation or modification of the work as a means of enforcing, against
+the work's users, your or third parties' legal rights to forbid
+circumvention of technological measures.</p>
+
+<h4>4. Conveying Verbatim Copies.</h4>
+
+<p>You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.</p>
+
+<p>You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.</p>
+
+<h4>5. Conveying Modified Source Versions.</h4>
+
+<p>You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these
+conditions:</p>
+
+<ul>
+<li>a) The work must carry prominent notices stating that you modified
+it, and giving a relevant date.</li>
+<li>b) The work must carry prominent notices stating that it is
+released under this License and any conditions added under
+section 7. This requirement modifies the requirement in section 4
+to "keep intact all notices".</li>
+<li>c) You must license the entire work, as a whole, under this
+License to anyone who comes into possession of a copy. This
+License will therefore apply, along with any applicable section 7
+additional terms, to the whole of the work, and all its parts,
+regardless of how they are packaged. This License gives no
+permission to license the work in any other way, but it does not
+invalidate such permission if you have separately received it.</li>
+<li>d) If the work has interactive user interfaces, each must display
+Appropriate Legal Notices; however, if the Program has interactive
+interfaces that do not display Appropriate Legal Notices, your
+work need not make them do so.</li>
+</ul>
+
+<p>A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit. Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.</p>
+
+<h4>6. Conveying Non-Source Forms.</h4>
+
+<p>You may convey a covered work in object code form under the terms of
+sections 4 and 5, provided that you also convey the machine-readable
+Corresponding Source under the terms of this License, in one of these
+ways:</p>
+
+<ul>
+<li>a) Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by the
+Corresponding Source fixed on a durable physical medium
+customarily used for software interchange.</li>
+<li>b) Convey the object code in, or embodied in, a physical product
+(including a physical distribution medium), accompanied by a
+written offer, valid for at least three years and valid for as
+long as you offer spare parts or customer support for that product
+model, to give anyone who possesses the object code either (1) a
+copy of the Corresponding Source for all the software in the
+product that is covered by this License, on a durable physical
+medium customarily used for software interchange, for a price no
+more than your reasonable cost of physically performing this
+conveying of source, or (2) access to copy the Corresponding
+Source from a network server at no charge.</li>
+<li>c) Convey individual copies of the object code with a copy of the
+written offer to provide the Corresponding Source. This
+alternative is allowed only occasionally and noncommercially, and
+only if you received the object code with such an offer, in accord
+with subsection 6b.</li>
+<li>d) Convey the object code by offering access from a designated
+place (gratis or for a charge), and offer equivalent access to the
+Corresponding Source in the same way through the same place at no
+further charge. You need not require recipients to copy the
+Corresponding Source along with the object code. If the place to
+copy the object code is a network server, the Corresponding Source
+may be on a different server (operated by you or a third party)
+that supports equivalent copying facilities, provided you maintain
+clear directions next to the object code saying where to find the
+Corresponding Source. Regardless of what server hosts the
+Corresponding Source, you remain obligated to ensure that it is
+available for as long as needed to satisfy these requirements.</li>
+<li>e) Convey the object code using peer-to-peer transmission,
+provided you inform other peers where the object code and
+Corresponding Source of the work are being offered to the general
+public at no charge under subsection 6d.</li>
+</ul>
+
+<p>A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.</p>
+
+<p>A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal,
+family, or household purposes, or (2) anything designed or sold for
+incorporation into a dwelling. In determining whether a product is a
+consumer product, doubtful cases shall be resolved in favor of
+coverage. For a particular product received by a particular user,
+"normally used" refers to a typical or common use of that class of
+product, regardless of the status of the particular user or of the way
+in which the particular user actually uses, or expects or is expected
+to use, the product. A product is a consumer product regardless of
+whether the product has substantial commercial, industrial or
+non-consumer uses, unless such uses represent the only significant
+mode of use of the product.</p>
+
+<p>"Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to
+install and execute modified versions of a covered work in that User
+Product from a modified version of its Corresponding Source. The
+information must suffice to ensure that the continued functioning of
+the modified object code is in no case prevented or interfered with
+solely because modification has been made.</p>
+
+<p>If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information. But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).</p>
-<p>You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program.</p>
+<p>The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or
+updates for a work that has been modified or installed by the
+recipient, or for the User Product in which it has been modified or
+installed. Access to a network may be denied when the modification
+itself materially and adversely affects the operation of the network
+or violates the rules and protocols for communication across the
+network.</p>
-<p>You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee.
-5. Conveying Modified Source Versions.</p>
+<p>Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.</p>
-<p>You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions:</p>
+<h4>7. Additional Terms.</h4>
-<pre><code>a) The work must carry prominent notices stating that you modified it, and giving a relevant date.
-b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”.
-c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it.
-d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so.
-</code></pre>
+<p>"Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law. If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.</p>
-<p>A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate.
-6. Conveying Non-Source Forms.</p>
+<p>When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it. (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.) You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.</p>
-<p>You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways:</p>
+<p>Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders
+of that material) supplement the terms of this License with terms:</p>
-<pre><code>a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange.
-b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge.
-c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b.
-d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements.
-e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d.
-</code></pre>
+<ul>
+<li>a) Disclaiming warranty or limiting liability differently from the
+terms of sections 15 and 16 of this License; or</li>
+<li>b) Requiring preservation of specified reasonable legal notices or
+author attributions in that material or in the Appropriate Legal
+Notices displayed by works containing it; or</li>
+<li>c) Prohibiting misrepresentation of the origin of that material,
+or requiring that modified versions of such material be marked in
+reasonable ways as different from the original version; or</li>
+<li>d) Limiting the use for publicity purposes of names of licensors
+or authors of the material; or</li>
+<li>e) Declining to grant rights under trademark law for use of some
+trade names, trademarks, or service marks; or</li>
+<li>f) Requiring indemnification of licensors and authors of that
+material by anyone who conveys the material (or modified versions
+of it) with contractual assumptions of liability to the recipient,
+for any liability that these contractual assumptions directly
+impose on those licensors and authors.</li>
+</ul>
-<p>A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work.</p>
+<p>All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10. If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term. If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.</p>
-<p>A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product.</p>
+<p>If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.</p>
-<p>“Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made.</p>
+<p>Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions; the
+above requirements apply either way.</p>
-<p>If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM).</p>
+<h4>8. Termination.</h4>
-<p>The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network.</p>
+<p>You may not propagate or modify a covered work except as expressly
+provided under this License. Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).</p>
-<p>Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying.
-7. Additional Terms.</p>
+<p>However, if you cease all violation of this License, then your license
+from a particular copyright holder is reinstated (a) provisionally,
+unless and until the copyright holder explicitly and finally
+terminates your license, and (b) permanently, if the copyright holder
+fails to notify you of the violation by some reasonable means prior to
+60 days after the cessation.</p>
-<p>“Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions.</p>
+<p>Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.</p>
-<p>When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission.</p>
+<p>Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License. If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.</p>
-<p>Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms:</p>
+<h4>9. Acceptance Not Required for Having Copies.</h4>
-<pre><code>a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or
-b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or
-c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or
-d) Limiting the use for publicity purposes of names of licensors or authors of the material; or
-e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or
-f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors.
-</code></pre>
+<p>You are not required to accept this License in order to receive or run
+a copy of the Program. Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance. However,
+nothing other than this License grants you permission to propagate or
+modify any covered work. These actions infringe copyright if you do
+not accept this License. Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.</p>
-<p>All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying.</p>
+<h4>10. Automatic Licensing of Downstream Recipients.</h4>
-<p>If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms.</p>
+<p>Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License. You are not responsible
+for enforcing compliance by third parties with this License.</p>
-<p>Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way.
-8. Termination.</p>
+<p>An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations. If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.</p>
-<p>You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11).</p>
+<p>You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License. For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.</p>
-<p>However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation.</p>
+<h4>11. Patents.</h4>
-<p>Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice.</p>
+<p>A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based. The
+work thus licensed is called the contributor's "contributor version".</p>
-<p>Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10.
-9. Acceptance Not Required for Having Copies.</p>
+<p>A contributor's "essential patent claims" are all patent claims owned
+or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version. For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.</p>
-<p>You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so.
-10. Automatic Licensing of Downstream Recipients.</p>
+<p>Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.</p>
-<p>Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License.</p>
+<p>In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement). To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.</p>
-<p>An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts.</p>
+<p>If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients. "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.</p>
-<p>You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it.
-11. Patents.</p>
+<p>If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.</p>
-<p>A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”.</p>
+<p>A patent license is "discriminatory" if it does not include within the
+scope of its coverage, prohibits the exercise of, or is conditioned on
+the non-exercise of one or more of the rights that are specifically
+granted under this License. You may not convey a covered work if you
+are a party to an arrangement with a third party that is in the
+business of distributing software, under which you make payment to the
+third party based on the extent of your activity of conveying the
+work, and under which the third party grants, to any of the parties
+who would receive the covered work from you, a discriminatory patent
+license (a) in connection with copies of the covered work conveyed by
+you (or copies made from those copies), or (b) primarily for and in
+connection with specific products or compilations that contain the
+covered work, unless you entered into that arrangement, or that patent
+license was granted, prior to 28 March 2007.</p>
-<p>A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License.</p>
+<p>Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.</p>
-<p>Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version.</p>
+<h4>12. No Surrender of Others' Freedom.</h4>
-<p>In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party.</p>
+<p>If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under
+this License and any other pertinent obligations, then as a
+consequence you may not convey it at all. For example, if you agree to
+terms that obligate you to collect a royalty for further conveying
+from those to whom you convey the Program, the only way you could
+satisfy both those terms and this License would be to refrain entirely
+from conveying the Program.</p>
-<p>If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.</p>
+<h4>13. Use with the GNU Affero General Public License.</h4>
-<p>If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it.</p>
+<p>Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work. The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.</p>
-<p>A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007.</p>
+<h4>14. Revised Versions of this License.</h4>
-<p>Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law.
-12. No Surrender of Others' Freedom.</p>
+<p>The Free Software Foundation may publish revised and/or new versions
+of the GNU General Public License from time to time. Such new versions
+will be similar in spirit to the present version, but may differ in
+detail to address new problems or concerns.</p>
-<p>If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program.
-13. Use with the GNU Affero General Public License.</p>
+<p>Each version is given a distinguishing version number. If the Program
+specifies that a certain numbered version of the GNU General Public
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that numbered version or
+of any later version published by the Free Software Foundation. If the
+Program does not specify a version number of the GNU General Public
+License, you may choose any version ever published by the Free
+Software Foundation.</p>
-<p>Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such.
-14. Revised Versions of this License.</p>
+<p>If the Program specifies that a proxy can decide which future versions
+of the GNU General Public License can be used, that proxy's public
+statement of acceptance of a version permanently authorizes you to
+choose that version for the Program.</p>
-<p>The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.</p>
+<p>Later license versions may give you additional or different
+permissions. However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.</p>
-<p>Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation.</p>
+<h4>15. Disclaimer of Warranty.</h4>
-<p>If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program.</p>
+<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
+DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
+CORRECTION.</p>
-<p>Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version.
-15. Disclaimer of Warranty.</p>
+<h4>16. Limitation of Liability.</h4>
-<p>THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-16. Limitation of Liability.</p>
+<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
+CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
+ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
+NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
+LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
+TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
+PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
-<p>IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-17. Interpretation of Sections 15 and 16.</p>
+<h4>17. Interpretation of Sections 15 and 16.</h4>
-<p>If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee.</p>
+<p>If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.</p>
<p>END OF TERMS AND CONDITIONS</p>
+<h3>How to Apply These Terms to Your New Programs</h3>
+
+<p>If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.</p>
+
+<p>To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively state
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.</p>
+
+<pre><code> <one line="" to="" give="" the="" program's="" name="" and="" a="" brief="" idea="" of="" what="" it="" does.="">
+ Copyright (C) <year> <name of="" author="">
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <<a href="http://www.gnu.org/licenses/" rel="nofollow">http://www.gnu.org/licenses/</a>>.
+</code></pre>
+
+<p>Also add information on how to contact you by electronic and paper
+mail.</p>
+
+<p>If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:</p>
+
+<pre><code> <program> Copyright (C) <year> <name of author>
+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+</code></pre>
+
+<p>The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License. Of course, your
+program's commands might be different; for a GUI interface, you would
+use an "about box".</p>
+
+<p>You should also get your employer (if you work as a programmer) or
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. For more information on this, and how to apply and follow
+the GNU GPL, see <a href="http://www.gnu.org/licenses/" rel="nofollow">http://www.gnu.org/licenses/</a>.</p>
+
+<p>The GNU General Public License does not permit incorporating your
+program into proprietary programs. If your program is a subroutine
+library, you may consider it more useful to permit linking proprietary
+applications with the library. If this is what you want to do, use the
+GNU Lesser General Public License instead of this License. But first,
+please read <a href="http://www.gnu.org/philosophy/why-not-lgpl.html" rel="nofollow">http://www.gnu.org/philosophy/why-not-lgpl.html</a>.</p>
+
<!-- autodoc -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/de/CRM/customer.md b/erpnext/docs/user/manual/de/CRM/customer.md
index 3ec4281..c730c68 100644
--- a/erpnext/docs/user/manual/de/CRM/customer.md
+++ b/erpnext/docs/user/manual/de/CRM/customer.md
@@ -7,9 +7,9 @@
> CRM > Dokumente > Kunde > Neu
-oder einen Upload über ein Datenimportwerkzeug durchführen.
+<img class="screenshot" alt="Kunde" src="{{docs_base_url}}/assets/img/crm/create-customer.gif">
-<img class="screenshot" alt="Kunde" src="{{docs_base_url}}/assets/img/crm/customer.png">
+oder einen Upload über ein Datenimportwerkzeug durchführen.
> Anmerkung: Kunden werden von Kontakten und Adressen getrennt verwaltet. Ein Kunde kann mehrere verschiedene Kontakte und Adressen haben.
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
index c3bec3f..25c40e1 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/custom-field.md
@@ -12,7 +12,7 @@
> Einstellungen > Anpassen > Benutzerdefiniertes Feld > Neu
-Sie können ein neues benutzerdefiniertes Feld auch über das [Werkzeug zum Anpassen von Feldern](https://erpnext.com/customize-erpnext/customize-form) einfügen.
+Sie können ein neues benutzerdefiniertes Feld auch über das [Werkzeug zum Anpassen von Feldern]({{docs_base_url}}/user/manual/de/customize-erpnext/customize-form) einfügen.
In einem benutzerdefinierten Formular finden Sie für jedes Feld die Plus(+)-Option. Wenn Sie auf dieses Symbol klicken, wird eine neue Zeile oberhalb dieses Feldes eingefügt. Sie können die Einstellungen für Ihr Feld in der neu eingefügten leeren Zeile eingeben.
@@ -50,7 +50,7 @@
### Optionen einstellen
-Wenn Sie ein Verknüpfungsfeld erstellen,dann wird der Name des DocType, mit dem dieses Feld verknüpft werden soll, in das Feld "Optionen" eingefügt. Klicken Sie [hier](https://erpnext.com/kb/customize/creating-custom-link-field) um weitere Informationen darüber zu erhalten, wie man benutzerdefinierte Verknüpfungsfelder erstellt.
+Wenn Sie ein Verknüpfungsfeld erstellen,dann wird der Name des DocType, mit dem dieses Feld verknüpft werden soll, in das Feld "Optionen" eingefügt. Klicken Sie [hier]({{docs_base_url}}/user/manual/en/customize-erpnext/articles/creating-custom-link-field) um weitere Informationen darüber zu erhalten, wie man benutzerdefinierte Verknüpfungsfelder erstellt.
diff --git a/erpnext/docs/user/manual/de/customize-erpnext/customize-form.md b/erpnext/docs/user/manual/de/customize-erpnext/customize-form.md
index cd83533..dbb9bc5 100644
--- a/erpnext/docs/user/manual/de/customize-erpnext/customize-form.md
+++ b/erpnext/docs/user/manual/de/customize-erpnext/customize-form.md
@@ -71,7 +71,7 @@
</tr>
<tr>
<td>Feldtyp</td>
- <td>Klicken Sie <a href="https://erpnext.com/kb/customize/field-types">hier</a> um mehr über Feldtypen zu erfahren.</td>
+ <td>Klicken Sie <a href="{{docs_base_url}}/user/manual/en/customize-erpnext/articles/field-types">hier</a> um mehr über Feldtypen zu erfahren.</td>
</tr>
<tr>
<td>Optionen</td>
diff --git a/erpnext/docs/user/manual/en/CRM/customer.md b/erpnext/docs/user/manual/en/CRM/customer.md
index 88f9e66..55755e6 100644
--- a/erpnext/docs/user/manual/en/CRM/customer.md
+++ b/erpnext/docs/user/manual/en/CRM/customer.md
@@ -9,9 +9,13 @@
> Selling > Customer
+<img class="screenshot" alt="Create Customer" src="{{docs_base_url}}/assets/img/crm/create-customer.gif">
+
or upload it via the Data Import Tool.
-<img class="screenshot" alt="Customer" src="{{docs_base_url}}/assets/img/crm/customer.png">
+A Customer can avail the features (operations) in the selling process. The general flow can be summarazed as:
+
+<img class="screenshot" alt="Customer" src="{{docs_base_url}}/assets/img/crm/customer-to selling-flowchart.jpeg">
> Note: Customers are separate from Contacts and Addresses. A Customer can
have multiple Contacts and Addresses.
@@ -53,7 +57,7 @@
master. Classifying Customers
ERPNext allows you to group your Customers using [Customer Group]({{docs_base_url}}/user/manual/en/CRM/setup/customer-group.html)
-and also divide them into [Territories]({{docs_base_url}}/user/manual/en/CRM/setup/territory.html)
+and also divide them into [Territories]({{docs_base_url}}/user/manual/en/setting-up/territory.html)
Grouping will help you get better analysis of your data and
identify which Customers are profitable and which are not. Territories will
help you set sales targets for the respective territories.
diff --git a/erpnext/docs/user/manual/en/CRM/opportunity.md b/erpnext/docs/user/manual/en/CRM/opportunity.md
index 9f44fdf..9248fb2 100644
--- a/erpnext/docs/user/manual/en/CRM/opportunity.md
+++ b/erpnext/docs/user/manual/en/CRM/opportunity.md
@@ -1,5 +1,5 @@
When you know a Lead is looking for some products or services to buy, you can
-track that as an Opportunity.
+track that as an Opportunity. Also opportunity document helps user to collect the requirement of a customer/lead.
You can create an Opportunity from:
@@ -17,11 +17,21 @@
<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/lead-to-opportunity.png">
+#### Figure 3: Create Opportunity for Customer to Collect their Requirement
+
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/requirement-gathering.png">
+
+
An Opportunity can also come from an existing Customer. You can create
multiple Opportunities against the same Lead. In Opportunity, apart from the
Communication, you can also add the Items for which the Lead or Contact is
looking for.
+#### Make Supplier Quotation
+In some business, user collect the rates from their supplier against the customer requirement and based on the supplier rates they prepare the quotation for the customer. In ERPNext user get an option to make supplier quotation from the opportunity.
+
+<img class="screenshot" alt="Opportunity" src="{{docs_base_url}}/assets/img/crm/make-sq-from-opportunity.png">
+
> Best Practice: Leads and Opportunities are often referred as your “Sales
Pipeline” this is what you need to track if you want to be able to predict how
much business you are going to get in the future. Its always a good idea to be
diff --git a/erpnext/docs/user/manual/en/CRM/setup/sales-person.md b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
index 114003b..ce5ed93 100644
--- a/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
+++ b/erpnext/docs/user/manual/en/CRM/setup/sales-person.md
@@ -8,7 +8,7 @@
####Sales Person in Transactions
You can use this Sales Person in Customer and sales transactions like Sales Order, Delivery Note and Sales Invoice.
-Click [here](https://erpnext.com/kb/selling/managing-sales-persons-in-sales-transactions) to learn more
+Click [here]({{docs_base_url}}/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions) to learn more
about how Sales Persons are used in the transactions of Sales Cycle.
-{next}
\ No newline at end of file
+{next}
diff --git a/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
index 99760e7..ae6847e 100644
--- a/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
+++ b/erpnext/docs/user/manual/en/accounts/chart-of-accounts.md
@@ -19,10 +19,19 @@
be worth the effort. You can also take the help of your accountant to setup
your Chart of Accounts.
-Financial statement of your company is easily viewable in ERPNext. An Example
-of a financial statement is given below:
+Financial statements for your company are easily viewable in ERPNext. You can view financial statements
+such as Balance Sheet, Profit and Loss statement and Cash flow statement.
-<img class="screenshot" alt="Financial Analytics Balance Sheet" src="{{docs_base_url}}/assets/img/accounts/financial-analytics-bl.png">
+An Example of various financial statement are given below:
+
+#### Cash Flow Report
+<img class="screenshot" alt="Cash Flow Report" src="{{docs_base_url}}/assets/img/accounts/cash_flow_report.png">
+
+#### Profit and Loss Report
+<img class="screenshot" alt="Profit and Loss Report" src="{{docs_base_url}}/assets/img/accounts/profit_n_loss_report.png">
+
+#### Balance Sheet Report
+<img class="screenshot" alt="Balance Sheet Report" src="{{docs_base_url}}/assets/img/accounts/balance_sheet_report.png">
To edit your Chart of Accounts in ERPNext go to:
diff --git a/erpnext/docs/user/manual/en/accounts/journal-entry.md b/erpnext/docs/user/manual/en/accounts/journal-entry.md
index 68ba22a..061bd62 100644
--- a/erpnext/docs/user/manual/en/accounts/journal-entry.md
+++ b/erpnext/docs/user/manual/en/accounts/journal-entry.md
@@ -68,4 +68,44 @@
> Note: There may be regulations in your country that define by how much
amount you can depreciate a class of Assets.
+#### Credit Note
+
+"Credit Note" is made for a Customer against a Sales Invoice when the
+company needs to adjust a payment for returned goods. When a Credit Note
+is made, the seller can either make a payment to the customer or adjust
+the amount in another invoice.
+
+ * Debit: Sales Return Account
+ * Credit: Customer Account
+
+#### Debit Note
+
+"Debit Note" is made for a Supplier against a Purchase Invoice or accepted
+as a credit note from supplier when a company returns goods. When a Debit
+Note is made, the company can either receive a payment from the supplier or
+adjust the amount in another invoice.
+
+ * Debit: Supplier Account
+ * Credit: Purchase Return Account
+
+#### Excise Entry
+
+When a Company buys good from a Supplier, company pays excise duty
+on these goods to Supplier. And when a company sells these goods to Customers,
+it receives excise duty. Company will deduct payable excise duty and deposit balance
+in Govt. account.
+
+ * When a Company buys goods with Excise duty:
+ * Debit: Purchase Account
+ * Debit: Excise Duty Account
+ * Credit: Supplier Account
+
+ * When a Company sells goods with Excise duty:
+ * Debit: Customer Account
+ * Credit: Sales Account
+ * Credit: Excise Duty Account
+
+> Note: Applicable in India, might not be applicable for your Country.
+Please check your country regulations.
+
{next}
diff --git a/erpnext/docs/user/manual/en/accounts/payments.md b/erpnext/docs/user/manual/en/accounts/payments.md
index 7e5aab3..881d366 100644
--- a/erpnext/docs/user/manual/en/accounts/payments.md
+++ b/erpnext/docs/user/manual/en/accounts/payments.md
@@ -22,7 +22,7 @@
<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/payment-entry-9.png">
-For more details about payment entry [check here.](https://frappe.github.io/erpnext/user/manual/en/accounts/payment-entry)
+For more details about payment entry [check here.]({{docs_base_url}}/user/manual/en/accounts/payment-entry)
## Journal Entry
@@ -45,4 +45,4 @@
Save and submit the journal entry to record the payament against the invoice
<img class="screenshot" alt="Making Payment" src="{{docs_base_url}}/assets/img/accounts/journal-entry.png">
-For more details about journal entry [check here.](https://frappe.github.io/erpnext/user/manual/en/accounts/journal-entry)
\ No newline at end of file
+For more details about journal entry [check here.]({{docs_base_url}}/user/manual/en/accounts/journal-entry)
diff --git a/erpnext/docs/user/manual/en/accounts/sales-invoice.md b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
index fb132e7..e68d2c7 100644
--- a/erpnext/docs/user/manual/en/accounts/sales-invoice.md
+++ b/erpnext/docs/user/manual/en/accounts/sales-invoice.md
@@ -64,6 +64,15 @@
<img class="screenshot" alt="POS Invoice" src="{{docs_base_url}}/assets/img/accounts/pos-sales-invoice.png">
+#### Billing Timesheet with Project
+
+If you want to bill employees working on Projects on hourly basis (contract based),
+they can fill out Timesheets which consists their billing rate. When you make a new
+Sales Invoice, select the Project for which the billing is to be made, and the
+corresponding Timesheet entries for that Project will be fetched.
+
+<img class="screenshot" alt="POS Invoice" src="{{docs_base_url}}/assets/img/accounts/billing-timesheet-sales-invoice.png">
+
* * *
#### "Pro Forma" Invoice
@@ -80,5 +89,4 @@
ERPNext) titled as “Pro Forma Invoice”. This way everyone is happy.
This is a fairly common practice. We follow this at Frappe too.
-
{next}
diff --git a/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
index 85123f9..ce8a1c3 100644
--- a/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
+++ b/erpnext/docs/user/manual/en/customize-erpnext/hiding-modules-and-features.md
@@ -1,15 +1,4 @@
-As you have seen from this manual that ERPNext contains tons of features which you may not use. We have observed that most users start with using 20% of the features, though a different 20%. To hide fields belonging to features you
-dont require, go to:
-
-`Setup > Customize > Features Setup`
-
-<img alt="Hide Features" class="screenshot" src="{{docs_base_url}}/assets/img/customize/feature-setup.png">
-
-Check the features you want to use. The features which are not checked, relevant fields will get hidden from the forms.
-
-* * *
-
-### Hiding Module Icons
+# Hiding Module Icons
To hide modules (icons) from the home page, go to:
diff --git a/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
index fddab31..d5c4d00 100644
--- a/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
+++ b/erpnext/docs/user/manual/en/human-resources/articles/employees-loan-management.md
@@ -10,7 +10,7 @@
#### 1.1 Employee Loan Account
-Create Group as 'Employees Loans' under Current Assets and create employee loan A/C (Ledger) under it. [Check this link for new account creation](https://erpnext.com/kb/setup/managing-tree-structure-masters)
+Create Group as 'Employees Loans' under Current Assets and create employee loan A/C (Ledger) under it. [Check this link for new account creation]({{docs_base_url}}/user/manual/en/setting-up/articles/managing-tree-structure-masters)
@@ -52,4 +52,4 @@
-<!-- markdown -->
\ No newline at end of file
+<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md b/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md
new file mode 100644
index 0000000..d3ba22a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/daily-work-summary.md
@@ -0,0 +1,15 @@
+# Daily Work Summary
+
+Daily Work Summary is way to get a automated way to get a summary of work done by all employees in a company. Once you set it up, each active Employee of the Company gets an email asking them what did they work on during the day.
+
+Replies of all employees who choose to respond is collected and sent as a summary at midnight. Emails are only sent based on the Holiday List setup in the Company or Employee master.
+
+*Note:* You must have one active incoming email account setup for this to work.
+
+### How to Use
+
+Go to "Daily Work Summary Settings" via HR module or search bar and set the company for which you want to activate this feature.
+
+You can also choose to Customize the Message you send to your employees:
+
+<img class="screenshot" alt="Department" src="{{docs_base_url}}/assets/img/human-resources/department.png">
diff --git a/erpnext/docs/user/manual/en/human-resources/index.txt b/erpnext/docs/user/manual/en/human-resources/index.txt
index 33ee4bb..5615790 100644
--- a/erpnext/docs/user/manual/en/human-resources/index.txt
+++ b/erpnext/docs/user/manual/en/human-resources/index.txt
@@ -7,9 +7,11 @@
job-applicant
job-opening
offer-letter
+training
tools
human-resources-reports
setup
holiday-list
human-resource-setup
+daily-work-summary
articles
diff --git a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
index 286df14..48ff96b 100644
--- a/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
+++ b/erpnext/docs/user/manual/en/human-resources/salary-and-payroll.md
@@ -16,9 +16,9 @@
Salary structures are used to help organizations:
1. Maintain pay levels that are competitive with the external labor market,
2. Maintain internal pay relationships among jobs,
- 3. Recognize and reward differences in level of responsibility, skill, and performance, and manage pay expenditures.
+ 3. Recognize and reward differences in the level of responsibility, skill, and performance, and manage pay expenditures.
-The usual components of the salary structure (in india) include:
+The usual components of the salary structure (in India) include:
__Basic Salary:__ It is the taxable base income and generally not more than 40% of CTC.
@@ -32,7 +32,7 @@
__PF:__ Fund collected during emergency or old age. 12% of the basic salary is automatically deducted and goes to the employee provident fund.
-__Medical Allowance:__ The employer pays the employee for the medical expenditures incurred. It is tax free up to Rs.15,000.
+__Medical Allowance:__ The employer pays the employee for the medical expenditures incurred. It is tax-free up to Rs.15,000.
__Bonus:__ Taxable part of the CTC, usually a once a year lump sum amount, given to the employee based on the individual’s as well as the organizational performance for the year.
diff --git a/erpnext/docs/user/manual/en/human-resources/training.md b/erpnext/docs/user/manual/en/human-resources/training.md
new file mode 100644
index 0000000..5d55b6c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/human-resources/training.md
@@ -0,0 +1,28 @@
+### Training Event
+
+Schedule seminars, workshops, conferences etc using Training Event. You can also invite your employees to attend the event using this feature.
+
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/training_event.png">
+
+### Inviting Employees for Event
+
+You can invite your employees to attend the event. You can do so by selecting the employees to be invited in the employee table.
+By default the status of the employee will be 'Open'.
+The system shall notify the employee with status 'Open' by sending a email to the office email address of the employee as mentioned in the employee master if you have selected 'Send Email' checkbox.
+The status is changed to 'Invited' when an invitation email is sent to the employee by the system.
+When an Employee confirms his/her presence for the event you can change the status to 'Confirmed'.
+
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/training_event_employee.png">
+
+### Training Result
+
+After compleation of the training Employee Wise training results can be stored based on the Feedback received from the Trainer.
+
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/training_result.png">
+
+
+### Trainig Feedback
+
+Collect feedback regarding the event from your Employees using Training Feedback.
+
+<img class="screenshot" alt="Employee" src="{{docs_base_url}}/assets/img/human-resources/training_feedback.png">
diff --git a/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md b/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
index 677d65e..7e783f6 100644
--- a/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
+++ b/erpnext/docs/user/manual/en/introduction/getting-started-with-erpnext.md
@@ -30,6 +30,6 @@
### 4\. Install ERPNext on your Unix/Linux/Mac machine
-If you are familiar to installing applications on *nix platforms, read the instructions on how to install using [Frappe Bench](https://github.com/frappe/bench).
+If you are familiar with installing applications on *nix platforms, read the instructions on how to install using [Frappe Bench](https://github.com/frappe/bench).
{next}
diff --git a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
index 34d8530..91bf7ed 100644
--- a/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
+++ b/erpnext/docs/user/manual/en/manufacturing/bill-of-materials.md
@@ -31,6 +31,11 @@
<img class="screenshot" alt="Update Cost" src="{{docs_base_url}}/assets/img/manufacturing/bom-update-cost.png">
+* User can select the currency in the BOM
+* System calculates the costing based on the price list currency
+
+<img class="screenshot" alt="Update Cost" src="{{docs_base_url}}/assets/img/manufacturing/price-list-based-currency-bom.png">
+
### Materials Required(exploded)
This table lists down all the Material required for the Item to be Manufactured.
diff --git a/erpnext/docs/user/manual/en/manufacturing/production-order.md b/erpnext/docs/user/manual/en/manufacturing/production-order.md
index 1720db9..2f0fef3 100644
--- a/erpnext/docs/user/manual/en/manufacturing/production-order.md
+++ b/erpnext/docs/user/manual/en/manufacturing/production-order.md
@@ -1,3 +1,4 @@
+<img class="screenshot" alt="Production Order" src="{{docs_base_url}}/assets/img/manufacturing/manufacturing-flow.png">
Production Order (also called as Work Order) is a document that is given to
the manufacturing shop floor by the Production Planner as a signal to produce
a certain quantity of a certain Item. Production Order also helps to generate
@@ -45,7 +46,7 @@
* Once you have submitted your Production Order, you need to Transfer the Raw Materials to initiate the Manufacturing Process.
* This will create a Stock Entry with all the Items required to complete this Production Order to be added to the WIP Warehouse. (this will add sub-Items with BOM as one Item or explode their children based on your setting above).
-* Click on 'Transfer Materials for Manufacturing'.
+* Click on 'Start'.
<img class="screenshot" alt="Transfer Materials" src="{{docs_base_url}}/assets/img/manufacturing/PO-material-transfer.png">
@@ -63,18 +64,18 @@
### Making Time Logs
-* Progress in the Production Order can be tracked using [Time Log]({{docs_base_url}}/user/manual/en/projects/time-log.html)
-* Time Logs are created against Production Order Operations.
-* Drafts of Time Logs are also created based on the scheduled operations when an Production Order is Submitted.
-* To create more Time Logs against an operation select 'Make TIme Log' in the respective operation.
+* Progress in the Production Order can be tracked using [Timesheet]({{docs_base_url}}/user/manual/en/projects/timesheet/timesheet-against-production-order.html)
+* Timesheet's time slots are created against Production Order Operations.
+* Drafts of Timesheet is created based on the scheduled operations when an Production Order is Submitted.
+* To create more Timesheet against an operation click 'Make Timesheet' button.
-<img class="screenshot" alt="Make TL against PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-tl.png">
+<img class="screenshot" alt="Make timesheet against PO" src="{{docs_base_url}}/assets/img/manufacturing/PO-operations-make-ts.png">
###Updating Finished Goods
* Once you are done with the Production Order you need to update the Finished Goods.
* This will create a Stock Entry that will deduct all the sub-Items from the WIP Warehouse and add them to the Finished Goods Warehouse.
-* Click on 'Update Finished Goods'.
+* Click on 'Finish'.
<img class="screenshot" alt="Update Finished Goods" src="{{docs_base_url}}/assets/img/manufacturing/PO-FG-update.png">
diff --git a/erpnext/docs/user/manual/en/selling/articles/adding-margin.md b/erpnext/docs/user/manual/en/selling/articles/adding-margin.md
index 2b2fb09..2725fee 100644
--- a/erpnext/docs/user/manual/en/selling/articles/adding-margin.md
+++ b/erpnext/docs/user/manual/en/selling/articles/adding-margin.md
@@ -1,7 +1,7 @@
#Adding Margin
User Can apply the margin on Quotation Item and Sales Order Item using following two options.
-1)Price Rule: With the help of this method user can apply the margin on Quotation and Sales Order based on condition. you can find the section margin on pricing rule where a user has to select the type of margin whether it is Percentage or Amount and rate or amount. The system will apply the margin on quotation item and sales order item if pricing rule is enabled.
+1)Price Rule: With the help of this method user can apply the margin on Quotation and Sales Order based on condition. You can find the section margin on pricing rule where a user has to select the type of margin whether it is Percentage or Amount and Rate or Amount. The system will apply the margin on quotation item and sales order item if pricing rule is enabled.
To setup Pricing Rule, go to:
diff --git a/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md b/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
index c270e13..781d2ce 100644
--- a/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
+++ b/erpnext/docs/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions.md
@@ -32,14 +32,4 @@
`Accounts > Standard Reports > Sales Partners Commission`
-####Disable Sales Person Feature
-
-If you don't track Sales Person wise performance, and doesn't wish to use this feature, you can disable it from:
-
-`Setup > Customize > Features Setup`
-
-<img class="screenshot" alt="Disable Sales Person" src="{{docs_base_url}}/assets/img/articles/sales-person-transaction-4.png">
-
-On disabling this feature, fields and tables related to Sales Person will become hidden from masters and transcations.
-
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/selling/quotation.md b/erpnext/docs/user/manual/en/selling/quotation.md
index 6f5cc5e..1f7b06c 100644
--- a/erpnext/docs/user/manual/en/selling/quotation.md
+++ b/erpnext/docs/user/manual/en/selling/quotation.md
@@ -1,9 +1,13 @@
During a sale, the customer may request for a written note about the products
or services you are planning to offer, along with the prices and other terms
of engagement. This is called a “Proposal” or an “Estimate” or a “Pro Forma
-Invoice”or a Quotation.
+Invoice”or a **Quotation**.
-To create a new Quotation go to:
+A typical Selling flow looks like:
+
+<img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/selling-flow.png">
+
+To create a new Quotation navigate to:
> Selling > Quotation > New Quotation
@@ -13,23 +17,18 @@
<img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/make-quote-from-opp.png">
-Or You can create a new Quotation and pull details from an Opportunity.
-
-<img class="screenshot" alt="Make Quotation from Opportunity" src="{{docs_base_url}}/assets/img/selling/make-quotation.gif">
-
A Quotation contains details about:
* The recipient of the Quotation
* The Items and quantities you are offering.
- * The rates at which they are offered. For details refer
+ * The rates at which they are offered.
* The taxes applicable.
* Other charges (like shipping, insurance) if applicable.
* The validity of contract.
* The time of delivery.
* Other conditions.
-> Tip: Images look great on Quotations. To add images to your Quotations,
-attach the corresponding image in the Item master.
+> Tip: Images look great on Quotations. Make sure your items have an image attached.
### Rates
@@ -41,11 +40,13 @@
### Taxes
-To add taxes to your Quotation, you can either select a tax template, Sales
-Taxes and Charges Template or add the taxes on your own. To understand taxes in
-detail visit [Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html)
+To add taxes to your Quotation, you can select a **Sales Taxes and Charges Template** or add the taxes on your own.
-You can add taxes in the same manner as the Sales Taxes and Charges Template.
+For e.g
+
+<img class="screenshot" alt="Taxes and Charges" src="{{docs_base_url}}/assets/img/selling/taxes-and-charges.gif">
+
+To understand taxes in detail visit [Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html).
### Terms and Conditions
@@ -71,19 +72,17 @@
Quotation is a “Submittable” transaction. Since you send this Quotation to
your Customer or Lead, you must freeze it so that changes are not made after
-you send the Quotation. See Document Stages.
+you send the Quotation.
> Tip: Quotations can also be titled as “Proforma Invoice” or “Proposal”.
-Select the right heading in the “Print Heading” field in the “More Info”
-section. To create new Print Headings go to Setup > Branding and Printing >
-Print Headings.
+You can do this by selecting a **Print Heading** in the **Print Settings**
+section. To create new Print Headings go to Setup > Printing >
+Print Heading.
### Discount
While making your sales transactions like a Quotation (or Sales Order) you
-would already have noticed that there is a “Discount” column. On the left is
-the “Price List Rate” on the right is the “Basic Rate”. You can add a
-“Discount” value to update the basic rate. To understand more about discount
-read [Discount.](http://erpnext.org/discount)
+can also give discounts to your customers. In the Discount section, add
+the discount in percentage or fixed amount. Read [Discount](https://frappe.github.io/erpnext/user/manual/en/selling/articles/applying-discount) for more explanation.
{next}
diff --git a/erpnext/docs/user/manual/en/selling/sales-order.md b/erpnext/docs/user/manual/en/selling/sales-order.md
index 269473a..32e58a5 100644
--- a/erpnext/docs/user/manual/en/selling/sales-order.md
+++ b/erpnext/docs/user/manual/en/selling/sales-order.md
@@ -50,6 +50,16 @@
This “reserved” quantity will help you project what is the quantity you need
to purchase based on all your commitments.
+### Taxes
+
+To add taxes to your Quotation, you can select a **Sales Taxes and Charges Template** or add the taxes on your own.
+
+For e.g
+
+<img class="screenshot" alt="Taxes and Charges" src="{{docs_base_url}}/assets/img/selling/taxes-and-charges.gif">
+
+To understand taxes in detail visit [Taxes]({{docs_base_url}}/user/manual/en/setting-up/setting-up-taxes.html).
+
### Sales Team
**Sales Partner:** If this Sale was booked via a Sales Partner, you can update the Sales Partner’s details with commission and other info that you can aggregate.
diff --git a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
index e32c97d..75b7561 100644
--- a/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
+++ b/erpnext/docs/user/manual/en/selling/setup/sales-person-target-allocation.md
@@ -80,7 +80,7 @@
###See Also
-1. [Managing Sales Person](https://erpnext.com/selling/selling-setup/sales-person)
-2. [Using Sales Person in transactions](https://erpnext.com/kb/selling/managing-sales-persons-in-sales-transactions)
+1. [Sales Person Target Allocation]({{docs_base_url}}/user/manual/en/selling/setup/sales-person-target-allocation)
+2. [Using Sales Person in transactions]({{docs_base_url}}/user/manual/en/selling/articles/sales-persons-in-the-sales-transactions)
{next}
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/index.txt b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
index 6f99f89..e6a3b85 100644
--- a/erpnext/docs/user/manual/en/setting-up/articles/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/articles/index.txt
@@ -9,5 +9,4 @@
naming-series-current-value
overwriting-data-from-data-import-tool
rename-user
-setting-up-dropbox-backups
using-custom-domain-on-erpnext
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.md b/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.md
deleted file mode 100644
index 68e4031..0000000
--- a/erpnext/docs/user/manual/en/setting-up/articles/setting-up-dropbox-backups.md
+++ /dev/null
@@ -1,74 +0,0 @@
-#Setting Up Dropbox Backups
-
-We always recommend customers to maintain backup of their data in ERPNext. he database backup is downloaded in the form of an SQL file. If needed, this SQL file of backup can be restored in the another ERPNext account as well.
-
-You can automate database backup download of your ERPNext account into your Dropbox account.
-
-####Step 1: Go to Setup
-
-`Explore > Setup > Integrations > Dropbox Backup`
-
-####Step 2: Activate
-
-In the Dropbox Backup, check "Send Backups to Dropbox" to active this feature. On checking this field, you will find field to set Frequency and notification Email.
-
-####Step 3: Set Frequency
-
-Set Frequency to download backup in your Dropbox account.
-
-<img class="screenshot" alt="set frequency" src="{{docs_base_url}}/assets/img/setup/dropbox-1.png">
-
-####Step 4: Allow Dropbox Access
-
-After setting frequency and updating notification email, click on `Allow Dropbox access`. On clicking this button, the Dropbox login page will open in the new tab. This might require you to allow pop-up for your ERPNext account.
-
-####Step 5: Login to Dropbox
-
-Login to your Dropbox account by entering login credentials.
-
-<img class="screenshot" alt="Login" src="{{docs_base_url}}/assets/img/setup/dropbox-2.png">
-
-####Step 6: Allow
-
-On successfull login, you will find a confirmation message as following. Click on "Allow" to let your ERPNext account have access to your Dropbox account.
-
-<img class="screenshot" alt="Allow" src="{{docs_base_url}}/assets/img/setup/dropbox-3.png">
-
-With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it.
-
-##Open Source Users
-
-####Step 1: Go to
-
-<a href="https://www.dropbox.com/developers/apps" target="_blank" style="line-height: 1.42857143;">https://www.dropbox.com/developers/apps</a>
-
-####Step 2:Create a new app
-
-<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/dropbox-open-3.png">
-
-####Step 3: Fill in details for the app
-
-<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/dropbox-open-1.png">
-
--
-<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/dropbox-open-2.png">
-
-####Step 4: Settings in Site Config
-
-After the app is created, note the app key and app secret and enter in `sites/{sitename}/site_config.json` as follows,
-
-<div>
- <pre>
- <code>{
- "db_name": "demo",
- "db_password": "DZ1Idd55xJ9qvkHvUH",
- "dropbox_access_key": "ACCESSKEY",
- "dropbox_secret_key": "SECRECTKEY"
-}
- </code>
- </pre>
-</div>
-
-####Step 5: Complete Backup
-
-Setup dropbox backups from the backup manager as shown in previous section.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
index e59ed21..563568a 100644
--- a/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
+++ b/erpnext/docs/user/manual/en/setting-up/data/data-import-tool.md
@@ -1,8 +1,6 @@
-The Data Import Tool is a great way to upload (or edit) bulk data, specially
-master data, into the system.
+The Data Import Tool is a great way to upload (or edit) bulk data, specially master data, into the system.
-To Open the data import tool, you either go to Setup or go to the Transaction
-you want to Import. If Data Import is allowed, you will see an Import Button:
+To Open the data import tool, you either go to Setup or go to the Transaction you want to Import. If Data Import is allowed, you will see an Import Button:
<img alt="Start Import" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-1.png">
@@ -20,22 +18,24 @@
implemented where there are multiple values for any property. For example an
Item can have multiple prices, An Invoice has multiple Items and so on.
-<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-2.png">
-
- * Click on the table you want to download or "All Tables"
- * For bulk editing, you can click on "Download With Data"
+ * Select Doctype for which template should be downloaded.
+ * Check fields to be included in the template.
+ * Click on "Download Blank Template".
+ * For bulk editing, you can click on "Download With Data".
+
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/data-import-tool-template.gif">
### 2\. Fill in the Template
After downloading the template, open it in a spreadsheet application and fill
in the data below the column headings.
-
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/import-file.png">
Then export your template or save it as a **Comma Separated Values** (CSV)
file.
-
+<img alt="Download Template" class="screenshot" src="{{docs_base_url}}/assets/img/setup/data-import/import-csv.png">
### 3\. Upload the .csv File
@@ -49,7 +49,7 @@
1. Make sure that if your application allows, use encoding as UTF-8.
1. Keep the ID column blank for new records.
-### 4\. Uploading All Tables (Main + Child)
+### 4. Uploading All Tables (Main + Child)
If you select all tables, you will get columns belonging to all the tables in
one row separated by `~` columns.
@@ -67,7 +67,7 @@
> To see how its done, enter a few records manually using forms and export
"All Tables" with "Download with Data"
-### 5\. Overwriting
+### 5. Overwriting
ERPNext also allows you to overwrite all / certain columns. If you want to
update certain columns, you can download the template with data. Remember to
@@ -76,7 +76,7 @@
> Note: For child records, if you select Overwrite, it will delete all the
child records of that parent.
-### 6\. Upload Limitations
+### 6. Upload Limitations
ERPNext restricts the amount of data you can upload in one file. Though the
number may vary based on the type of data. It is usually safe to upload around
@@ -107,4 +107,10 @@
clear way of saving as UTF-8. So save your file as a CSV, then open it in
Notepad, and save as “UTF-8”. (Sorry blame Microsoft for this!)
+####Help Video on Importing Data in ERPNext from Spreadsheet file
+
+
+
+<iframe width="660" height="371" src="https://www.youtube.com/embed/Ta2Xx3QoK3E" frameborder="0" allowfullscreen></iframe>
+
{next}
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/docs/user/manual/en/setting-up/integration-services/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/docs/user/manual/en/setting-up/integration-services/__init__.py
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/dropbox-backup.md b/erpnext/docs/user/manual/en/setting-up/integration-services/dropbox-backup.md
new file mode 100644
index 0000000..7fc283b
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/dropbox-backup.md
@@ -0,0 +1,81 @@
+#Setting Up Dropbox Backups
+
+We always recommend customers to maintain backup of their data in ERPNext. he database backup is downloaded in the form of an SQL file. If needed, this SQL file of backup can be restored in the another ERPNext account as well.
+
+You can automate database backup download of your ERPNext account into your Dropbox account.
+
+####Step 1: Create Dropbox service
+
+`Explore > Setup > Integration Service`
+
+Make a new Integration Service and select `Dropbox` as a service from dropdown then save the document.
+
+####Step 2: Activate
+
+After saving a document, click on `Dropbox Settings` button, to setup service.
+
+<img class="screenshot" alt="create dropbox service" src="{{docs_base_url}}/assets/img/setup/integration-service/create_service.png">
+
+####Step 3: Set Frequency
+
+Set Frequency to download backup in your Dropbox account.
+
+<img class="screenshot" alt="set frequency" src="{{docs_base_url}}/assets/img/setup/integration-service/setup-backup-frequency.png">
+
+####Step 4: Allow Dropbox Access
+
+After setting frequency and updating other details, click on `Allow Dropbox access`. On clicking this button, the Dropbox login page will open in the new tab. This might require you to allow pop-up for your ERPNext account.
+
+####Step 5: Login to Dropbox
+
+Login to your Dropbox account by entering login credentials.
+
+<img class="screenshot" alt="Login" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-2.png">
+
+####Step 6: Allow
+
+On successfull login, you will find a confirmation message as following. Click on "Allow" to let your ERPNext account have access to your Dropbox account.
+
+<img class="screenshot" alt="Allow" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-3.png">
+
+####Step 7: Enable Service
+After generating access token, go back to Dropbox Integration Service record and check `enable`. This will enable backup auto-download.
+
+With this, a folder called "ERPNext" will be created in your Dropbox account, and database backup will start to auto-download in it.
+
+##Open Source Users
+
+####Step 1: Go to
+
+<a href="https://www.dropbox.com/developers/apps" target="_blank" style="line-height: 1.42857143;">https://www.dropbox.com/developers/apps</a>
+
+####Step 2:Create a new app
+
+<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-open-3.png">
+
+####Step 3: Fill in details for the app
+
+<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-open-1.png">
+
+-
+<img class="screenshot" alt="Create new" src="{{docs_base_url}}/assets/img/setup/integration-service/dropbox-open-2.png">
+
+####Step 4: Settings in Site Config
+
+After the app is created, note the app key and app secret on Dropbox Settings page or enter in `sites/{sitename}/site_config.json` as follows,
+
+<div>
+ <pre>
+ <code>{
+ "db_name": "demo",
+ "db_password": "DZ1Idd55xJ9qvkHvUH",
+ "dropbox_access_key": "ACCESSKEY",
+ "dropbox_secret_key": "SECRECTKEY"
+}
+ </code>
+ </pre>
+</div>
+
+####Step 5: Complete Backup
+
+Setup dropbox backups from the backup manager as shown in previous section.
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/index.md b/erpnext/docs/user/manual/en/setting-up/integration-services/index.md
new file mode 100644
index 0000000..e7b5a61
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/index.md
@@ -0,0 +1,5 @@
+
+Integration Services is platform to configure 3rd Party Services.
+
+###Services
+{index}
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/index.txt b/erpnext/docs/user/manual/en/setting-up/integration-services/index.txt
new file mode 100644
index 0000000..fc5e8a4
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/index.txt
@@ -0,0 +1,4 @@
+dropbox-backup
+paypal-integration
+razorpay-integration
+ldap-integration
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/ldap-integration.md b/erpnext/docs/user/manual/en/setting-up/integration-services/ldap-integration.md
new file mode 100644
index 0000000..e12ed1c
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/ldap-integration.md
@@ -0,0 +1,24 @@
+#Setting up LDAP
+
+Lightweight Directory Access Protocol is a centralised access controll system used by many small medium scale organisations.
+
+By settings up LDAP service, you able to login to ERPNext account by using LDAP credentials.
+
+####Step 1: Create LDAP service
+
+`Explore > Setup > Integration Service`
+
+Make a new Integration Service and select `LDAP` as a service from dropdown then save the document.
+After saving a document, click on `LDAP Settings` button, to setup service.
+
+####Step 2: Setup LDAP service
+
+To enable ldap service, you need to configure parameters like LDAP Server Url, Organizational Unit, UID, Base Distinguished Name (DN) and Password for Base DN
+
+<img class="screenshot" alt="LDAP Settings" src="{{docs_base_url}}/assets/img/setup/integration-service/ldap_settings.png">
+
+####Step 3: Enable Service
+After setting up credentials on LDAP Settings, go back to LDAP Service record and enable it.
+While enabling, it will validate LDAP details and on successful validation, it will enables LDAP login option.
+
+<img class="screenshot" alt="LOGIN via LDAP" src="{{docs_base_url}}/assets/img/setup/integration-service/login_via_ldap.png">
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md b/erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md
new file mode 100644
index 0000000..d1054ba
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/paypal-integration.md
@@ -0,0 +1,58 @@
+#Setting up PayPal
+
+A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar.
+
+A payment gateway facilitates the transfer of information between a payment portal (such as a website, mobile phone or interactive voice response service) and the Front End Processor or acquiring bank.
+
+####Step 1: Create PayPal service
+
+`Explore > Setup > Integration Service`
+
+Make a new Integration Service and select `PayPal` as a service from dropdown then save the document.
+After saving a document, click on `PayPal Settings` button, to setup service.
+
+####Step 2: Setup payment service
+
+To enable PayPal payment service, you need to configure parameters like API Username, API Password and Signature.
+
+<img class="screenshot" alt="PayPal Settings" src="{{docs_base_url}}/assets/img/setup/integration-service/paypal_settings.png">
+
+You also can set test payment environment, by settings `Use Sandbox`
+
+####Step 3: Enable Service
+After setting up credentials on PayPal Settings, go back to PayPal Service record and enable it.
+On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank.
+
+<img class="screenshot" alt="PayPal COA" src="{{docs_base_url}}/assets/img/setup/integration-service/paypal_coa.png">
+
+Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
+
+<img class="screenshot" alt="Payment Gateway Account" src="{{docs_base_url}}/assets/img/setup/integration-service/payment_gateway_account_paypal.png">
+
+After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
+
+####Supporting transaction currencies
+AUD, BRL, CAD, CZK, DKK, EUR, HKD, HUF, ILS, JPY, MYR, MXN, TWD, NZD, NOK, PHP, PLN, GBP, RUB, SGD, SEK, CHF, THB, TRY, USD
+
+##Get PayPal credentials
+
+#### Paypal Sanbox API Signature
+ - Login to paypal developer account, <a href="https://developer.paypal.com/">PayPal Developer Account</a>
+ - From **Accounts** tab. create a new business account.
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/setup-sanbox-1.png">
+
+ - From this account profile you will get your sandbox api credentials
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/sanbox-credentials.png">
+
+
+---
+
+#### PayPal Account API Signature
+ - Login to PayPal Account and go to profile
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/api-step-1.png">
+
+ - From **My Selling Tools** go to **api Access**
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/api-step-2.png">
+
+ - On API Access Page, choose option 2 to generate API credentials
+<img class="screenshot" alt="Payment Request" src="{{ docs_base_url }}/assets/img/setup/integration-service/api-step-3.png">
diff --git a/erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md b/erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md
new file mode 100644
index 0000000..ad43f63
--- /dev/null
+++ b/erpnext/docs/user/manual/en/setting-up/integration-services/razorpay-integration.md
@@ -0,0 +1,33 @@
+#Setting up Razorpay
+
+A payment gateway is an e-commerce application service provider service that authorizes credit card payments for e-businesses, online retailers, bricks and clicks, or traditional brick and mortar.
+
+A payment gateway facilitates the transfer of information between a payment portal (such as a website, mobile phone or interactive voice response service) and the Front End Processor or acquiring bank.
+
+####Step 1: Create Razorpay service
+
+`Explore > Setup > Integration Service`
+
+Make a new Integration Service and select `Razorpay` as a service from dropdown then save the document.
+After saving a document, click on `Razorpay Settings` button, to setup service.
+
+####Step 2: Setup payment service
+
+To enable Razorpay payment service, you need to configure parameters like API Username, API Password and Signature.
+
+<img class="screenshot" alt="Razorpay Settings" src="{{docs_base_url}}/assets/img/setup/integration-service/razorpay_settings.png">
+
+####Step 3: Enable Service
+After setting up credentials on Razorpay Settings, go back to Razorpay Service record and enable it.
+On enabling service, the system will create Payment Gateway record and Account head in chart of account with account type as Bank.
+
+<img class="screenshot" alt="Razorpay COA" src="{{docs_base_url}}/assets/img/setup/integration-service/razorpay_coa.png">
+
+Also it will create Payment Gateway Account entry. Payment Gateway Account is configuration hub from this you can set account head from existing COA, default Payment Request email body template.
+
+<img class="screenshot" alt="Payment Gateway Account" src="{{docs_base_url}}/assets/img/setup/integration-service/payment_gateway_account_razorpay.png">
+
+After enabling service and configuring Payment Gateway Account your system is able to accept online payments.
+
+####Supporting transaction currencies
+INR
diff --git a/erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md b/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
similarity index 98%
rename from erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md
rename to erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
index a15834c..1dab1c1 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/multi-lingual-print-format.md
+++ b/erpnext/docs/user/manual/en/setting-up/print/custom-translations.md
@@ -1,4 +1,4 @@
-#Multi-lngual Print Formats
+#Custom Translations
User can print the customer's and supplier's document in their local language. For an example if I have customers from germany, france who want quotation in german, french language will be possible with these feature.
diff --git a/erpnext/docs/user/manual/en/setting-up/print/index.txt b/erpnext/docs/user/manual/en/setting-up/print/index.txt
index 80b5946..fa23652 100644
--- a/erpnext/docs/user/manual/en/setting-up/print/index.txt
+++ b/erpnext/docs/user/manual/en/setting-up/print/index.txt
@@ -5,4 +5,4 @@
address-template
terms-and-conditions
cheque-print-template
-multi-lingual-print-format
\ No newline at end of file
+custom-translations
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
index df7de6d..086a272 100644
--- a/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
+++ b/erpnext/docs/user/manual/en/setting-up/settings/naming-series.md
@@ -46,3 +46,12 @@
{next}
+### 4. Custom Field in Naming Series
+ Some companies prefers to make use of "short-codes" for suppliers, i.e. WN for company "Web Notes" that later can be used in naming series for quick identification.
+
+#### Example:
+
+ A custom field "Vendor ID" is created under Document: Supplier.
+ Then under Naming Series, we should allow something like
+ PO-.YY.MM.-.vendor_id.-.#####
+ Resulting in "PO-1503-WN-00001"
diff --git a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
index c880dfb..6d8fcb6 100644
--- a/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
+++ b/erpnext/docs/user/manual/en/stock/articles/track-items-using-barcode.md
@@ -2,15 +2,9 @@
A barcode is a value decoded into vertical spaced lines. Barcode scanners are the input medium, like Keyboard. When it scans a barcode, the data appears in the computer screens at the point of a cursor.
-To enable barcode feature in ERPNext go to:
+### Item Master
-`Setup > Customize > Features Setup`
-
-Check "Item Barcode".
-
-<img alt="Material Transfer" class="screenshot" src="{{docs_base_url}}/assets/img/articles/barcode-feature-setup.png">
-
-Now a new field "Barcode" will be appear in Item master. Enter barcode while creating a new item.
+To set the barcode of a particular item, you will have to open the Item record. You can also enter barcode while creating a new item.
<img alt="Material Transfer" class="screenshot" src="{{docs_base_url}}/assets/img/articles/barcode-item-master.png">
diff --git a/erpnext/docs/user/manual/en/stock/item/index.md b/erpnext/docs/user/manual/en/stock/item/index.md
index 7ca9d4e..ad44866 100644
--- a/erpnext/docs/user/manual/en/stock/item/index.md
+++ b/erpnext/docs/user/manual/en/stock/item/index.md
@@ -10,7 +10,7 @@
* **Default Unit of Measure:** This is the default measuring unit that you will use for your product. It could be in nos, kgs, meters, etc. You can store all the UOM’s that your product will require under Set Up> Master Data > UOM. These can be preselected while filling New Item by using % sign to get a pop up of the UOM list.
* **Brand:** If you have more than one brand save them under Set Up> Master Data> Brand and pre-select them while filling a New Item.
* **Variant:** A Item Variant is a different version of a Item.To learn more about managing varaints see [Item Variants]({{docs_base_url}}/user/manual/en/stock/item/item-variants.html)
-
+
### Upload an Image
To upload an image for your icon that will appear in all transactions, save
@@ -24,8 +24,8 @@
Asset Item, Stock Item or even Manufacturing Item.
* **Stock Item:** If you are maintaining stock of this Item in your Inventory, ERPNext will make a stock ledger entry for each transaction of this item.
- * **Default Warehouse:** This is the Warehouse that is automatically selected in your transactions.
- * **Allowance Percentage:** This is the percent by which you will be allowed to over-bill or over-deliver this Item. If not set, it will select from the Global Defaults.
+ * **Default Warehouse:** This is the Warehouse that is automatically selected in your transactions.
+ * **Allowance Percentage:** This is the percent by which you will be allowed to over-bill or over-deliver this Item. If not set, it will select from the Global Defaults.
* **Valuation Method:** There are two options to maintain valuation of stock. FIFO (first in - first out) and Moving Average. To understand this topic in detail please visit “ Item Valuation, FIFO and Moving Average”.
### Serialized and Batched Inventory
@@ -34,11 +34,11 @@
> Important: Once you mark an item as serialized or batched or neither, you cannot change it after you have made any stock entry.
- * [Discussion on Serialized Inventory]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html)
+ * [Discussion on Serialized Inventory]({{docs_base_url}}/user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item.html)
### Re Ordering
- * **Re-order level** suggests the amount of stock balance in the Warehouse.
+ * **Re-order level** suggests the amount of stock balance in the Warehouse.
* **Re-order Qty** suggests the amount of stock to be ordered to maintain minimum stock levels.
* **Minimum Order Qty** is the minimum quantity for which a Material Request / Purchase Order must be made.
@@ -86,7 +86,7 @@
-Visit [Manufacturing]({{docs_base_url}}/user/manual/en/manufacturing.html) and [Website ]({{docs_base_url}}/user/manual/en/website.html)to understand these topics in detail.
+Visit [Manufacturing]({{docs_base_url}}/user/manual/en/manufacturing) and [Website ]({{docs_base_url}}/user/manual/en/website)to understand these topics in detail.
### Learn more about Item
diff --git a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
index 15dd117..f03bbd8 100644
--- a/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
+++ b/erpnext/docs/user/manual/en/using-erpnext/articles/merging-documents.md
@@ -1,6 +1,6 @@
#Merging Documents
-For a document, of you have two records which are identical, and meant for common purpose, you can merge them into one record.
+For a document, if you have two records which are identical, and meant for common purpose, you can merge them into one record.
Following are step to merge documents. Let's assume we are merging two Accounts.
@@ -10,7 +10,7 @@
#### Step 2: Go to Account
-For an Account to be merge, click on "Rename" option.
+For an Account to be merged, click on the "Rename" option.
<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/merge-docs-1.png">
@@ -18,7 +18,7 @@
In the New Name field, enter another account name with which this account will be merged. Check "Merge with existing" option. Then press 'Rename' button to merge.
-Following is how merged account will appear in the Chart of Account master.
+Following is how the merged account will appear in the Chart of Accounts master.
<img alt="Sales Order File Attachment" class="screenshot" src="{{docs_base_url}}/assets/img/articles/merge-docs-2.gif">
@@ -28,4 +28,4 @@
<div class="well"> Note: Group Account cannot be merged into Child Account and vice versa.</div>
-<!-- markdown -->
\ No newline at end of file
+<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/website/add-products-to-website.md b/erpnext/docs/user/manual/en/website/add-products-to-website.md
index 3bad0df..d8ddcf0 100644
--- a/erpnext/docs/user/manual/en/website/add-products-to-website.md
+++ b/erpnext/docs/user/manual/en/website/add-products-to-website.md
@@ -1,69 +1,63 @@
### Add Products to the Website
-To list your Item on the Website, fill the Item details and save the file.
-Once the file is saved, a plus (+) button will appear next to the Image icon.
-Click on the plus button and add your Item image. The html code will be
+ERPNext will populate your website with products out of your Item Master. The html code will be
generated automatically.
-##### Step 1: Save Image
+#### Step 1: Edit Item
-
+For this example we will add a rocking chair to our catalog to sell on our website.
-
+To edit a catalog item go to: `Stock > Items and Pricing > Item`. From there select an item to add to website or create a new item by clicking the **New** button in the upper right.
-##### Step 2: Check the 'Show in Website' box.
+For this example, click on the **New** button to create a new item. Fill in the form and then click **Save**.
-Under the Website section, please check the box that says 'show in Website'.
-Once the box is checked, the page will display other fields for entering
-information.
+
-
+#### Step 2: Save Image
-
+1. Click the new item from the list to edit it.
+1. In the upper left, click the image block to give the product a picture. Be sure to uncheck the **Private** box so the image will be publicly viewable.
-##### Step 3: Enter Website Details
+
-
+#### Step 3: Check the 'Show in Website' box
-The page name will be generated automatically. Mention the Item-Group under
-which the Item will be displayed.
+Under the Website section near the bottom of the form, check the box that says **Show in Website**. Once the box is checked, the page will display other fields for entering information.
-#### Item Groups
+* Give the page a route on the website.
-Mention the Item Group under this column. If you wish to list your Item under
-the broad category products, name your Item Group as Products. In case you
-have various varieties of Item and want to classify them under different
-names, make Item Groups with those names and check the box that says 'show in
-Website'. For Example, if you wish to create a category called 'Bags', create
-a Item Group named Bags.
+
-
+#### Step 4: Enter Website Details
-Once the Item Group is created go to the Website Settings page under Website.
-Enter the Label, Url, and Parent Label.
+Once the `Show in Website` checkbox is checked, a new section called **Website Specifications** appears. Expand this section to add more details about the rocking chair to the website.
-
+
-
+Click **Save** in the upper right and then click `See on Website` on the left under the product image to see the item on your website.
-#### Webpage labels
+
-
+### Item Groups
-Add more Items under a particular Item Group.
+Items can be grouped together in items groups. To see a listing of the existing item groups to go: `Stock > Items and Pricing > Item Group`. Out of the box, ERPNext comes with a collection of item groups that you can use. Click `Products` to select it and then click `Edit` to open it up.
-To add more Items under a certain Label, mention the Item Group on the Item
-Page. The Items will be added automatically on the Webpage, under the Item
-Group Label. For Example, To add Item-Kiddies Bag and Butterfly Print Bag,
-check the 'Show in Website'box. The Items will be placed under the Label Bags
-on the Webpage.
+* Click the **Show in Website** check box.
+* Change the route to `products`.
+* Fill in a description for your products page.
+* Click **Save**.
-
+
-
+* Go back to the rocking chair item, expand the **website** section.
+* Click **Add new row** button under the `Item Group` table.
+* Select `Products` from the list.
+* Click **Save**.
-Item Group Display
+
-
+To see on the website, go back to the `Item Group` and then click **See on website**.
+
+
{next}
diff --git a/erpnext/docs/user/manual/en/website/articles/index.txt b/erpnext/docs/user/manual/en/website/articles/index.txt
index a89040a..97c24d5 100644
--- a/erpnext/docs/user/manual/en/website/articles/index.txt
+++ b/erpnext/docs/user/manual/en/website/articles/index.txt
@@ -1,3 +1,3 @@
managing-user-sign-up-via-website
website-security
-wesite-home-page
\ No newline at end of file
+website-home-page
diff --git a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
index 92be7f7..c4f0b77 100644
--- a/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
+++ b/erpnext/docs/user/manual/en/website/articles/managing-user-sign-up-via-website.md
@@ -2,7 +2,7 @@
Users can sign up for ERPNext account via the ERPNext Website.
-<img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-12-10 at 4.45.27 pm.jpg">
+<img src="{{docs_base_url}}/assets/img/website/website-login.png">
As seen above the login / sign-up button appears on the homepage of the website generated using ERPNext.
@@ -16,7 +16,7 @@
3. Check the disable SignUp check-box and save the doc.
-Now only the login button shall appear and there shall be no option to sign-up via the website. You can always revert back by following the same steps.
+Now only the login button will appear and there shall be no option to sign-up via the website. You can always revert back by following the same steps.
<!-- markdown -->
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/website-home-page.md b/erpnext/docs/user/manual/en/website/articles/website-home-page.md
new file mode 100644
index 0000000..d44a31a
--- /dev/null
+++ b/erpnext/docs/user/manual/en/website/articles/website-home-page.md
@@ -0,0 +1,25 @@
+# Wesite Home Page
+
+It is very much possible in ERPNext to setup certain standard page as default website Home Page. Following are steps to setup default website home page.
+
+#### **Step 1: Create a Web Page**
+To create a web page go to: `Website > Web Site > Web Page` and then click on the `New` button in the upper right.
+
+* Fill in the page title
+* Give the page a route (keep it lower case)
+* Add content to the `Main Content` section. If you want, you can use markdown to create a more complex page.
+* Tick (Check) the `Published` check box
+* Click the `Save` button.
+
+#### **Step 2: Open Website Settings Page**
+To Open website settings page go to: `Website > Setup > Website Settings`
+
+#### **Step 3: Set Home page**
+
+Enter the same value you entered for the `route` field in the previous section to the `Home Page` field. ERPNext will set this route to be the same as /index for your page.
+
+
+
+#### **Step 4: Save Website Settings Form.**
+
+After setting up Home Page Press `Save` button from website settings page and refresh the system from Help menu. Like this you can set any standard page as your default website home page. When some one visited to your website, he/she will see home page as default landing page on your website.
diff --git a/erpnext/docs/user/manual/en/website/articles/website-security.md b/erpnext/docs/user/manual/en/website/articles/website-security.md
index 2a5ac0a..ef7986a 100644
--- a/erpnext/docs/user/manual/en/website/articles/website-security.md
+++ b/erpnext/docs/user/manual/en/website/articles/website-security.md
@@ -1,9 +1,11 @@
#Website Security
-One can easily generate a website using erpnext. We can list out Products on the website and also create blogs. Products are directly fetched from the Item Master records of your erpnext account. some people would like to limit the access of the website generated by ERPNext to certain people. This is because some of the items may not be available to public.
+One can easily generate a website using ERPNext. We can list our Products on the website and also create blogs. Products are directly fetched from the Item Master records of your ERPNext account. Some people would like to limit the access of the website generated by ERPNext to certain people. This is because some of the items may not be available to the public.
-Well at the moment this feature is not available. You cannot limit the access of the website generated by ERPNext to certain people. If you publish the website it will be publicly visible. However while you cannot control who can view the website, you can always choose which items to display on the website. To show or not show an Item on your website go to 'Item Master' and in the Item form check the 'show in website' checkbox.
+Well at the moment this feature is not available. You cannot limit the access of the website generated by ERPNext to certain people. If you publish the website it will be publicly visible. However while you cannot control who can view the website, you can always choose which items to display on the website. To show or not show an Item on your website go to `Selling > Items and Pricing > Item` and in the Item form check the `show in website` checkbox.
-<img src="{{docs_base_path}}/assets/img/articles/Screen Shot 2014-11-26 at 10.43.51 am.png">
+<img src="{{docs_base_url}}/assets/img/articles/item-show-on-website-checkbox.png">
-You can also fill in the details of the product as to be shown on the website here.
\ No newline at end of file
+Once the check box has been checked, then more details will appear that you can fill in for the details of the product as to be shown on the website.
+
+<img src="{{docs_base_url}}/assets/img/articles/item-show-on-website-checkbox-checked.png">
\ No newline at end of file
diff --git a/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md b/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md
deleted file mode 100644
index 0cf5fdc..0000000
--- a/erpnext/docs/user/manual/en/website/articles/wesite-home-page.md
+++ /dev/null
@@ -1,23 +0,0 @@
-<h1>Wesite Home Page</h1>
-
-It is very much possible in ERPNext to setup certain standard page as default website Home Page. Following are steps to setup default website home page.
-
-#### **Step 1: Open Website Settings Page.**
-To Open website settings page go to:
-
-`Website > Setup > Website Settings`
-
-
-#### **Step 2: Set Home page.**
-
-Enter standard page like, index, login, products, blog, about, contact etc. as Home Page in Landing Page section of Website Settings page. For e.g consider you want login page as your default website home page.
-
-
-
-#### **Step 3: Save Website Settings Form.**
-
-After setting up Home Page Press 'Save' button from website settings page and refresh the system from Help menu. Like this you can set any standard page as your default website home page. When some one visited to your website, he/she will see home page as default landing page on your website.
-
-
-
-<!-- markdown -->
diff --git a/erpnext/docs/user/manual/en/website/shopping-cart.md b/erpnext/docs/user/manual/en/website/shopping-cart.md
index 1682084..7b10037 100644
--- a/erpnext/docs/user/manual/en/website/shopping-cart.md
+++ b/erpnext/docs/user/manual/en/website/shopping-cart.md
@@ -6,30 +6,49 @@
This software displays the price of the product . It also displays shipping
and handling charges, along with taxes, if applicable.
-To set up a shopping cart, go to the selling module.
+### Shopping Cart Setup
-> Selling > Shopping Cart Settings
+To set up a shopping cart, go to the website module.
-#### Step 1: Enter Company Details and Default Territory.
+> Website > Shopping Cart Settings
-
+#### Enter Company Details and Checkout Details.
-#### Step 2: Enter Price List, Tax Master and Shipping Rule.
+<img class="screenshot" alt="Shopping Cart Settings" src="{{docs_base_url}}/assets/img/website/item-website-specs.png">
-
+To make item available on website go to Item master.
-#### Shopping Cart Display
+> Stock > Item
-On the Website, the shopping cart image will be seen below the Item price.
-Customers can click on the cart and enter the amount of quantity they wish to
-buy. The Item number will be stored on the right hand corner of the page, next
-to the flower sign.
+#### Enable Item for website.
-
+<img class="screenshot" alt="Item" src="{{docs_base_url}}/assets/img/website/item-in-webiste.png">
-Click on the flower sign on the right hand side to see the cart details. Click
-on the cart to get the final amount details.
+#### Enter Website Specifications for Item.
-
+<img class="screenshot" alt="Website Specifications" src="{{docs_base_url}}/assets/img/website/item-website-specs.png">
+
+
+### Shop using Shopping Cart
+
+#### Add item to shopping cart
+
+Click on "Add to Cart" to add item to shopping cart.
+
+<img class="screenshot" alt="Website Specifications" src="{{docs_base_url}}/assets/img/website/item-website-view.png">
+
+#### Goto Checkout
+
+Click on "Goto Cart" to checkout or on "Cart" which is on upper right side
+of the screen.
+
+<img class="screenshot" alt="Website Specifications" src="{{docs_base_url}}/assets/img/website/checkout.png">
+
+#### Checkout
+
+Change quantity, select Shipping and Billing Address and click
+on "Place Order" to place the order.
+
+<img class="screenshot" alt="Website Specifications" src="{{docs_base_url}}/assets/img/website/place-order.png">
{next}
diff --git a/erpnext/fleet_management/doctype/vehicle/vehicle.json b/erpnext/fleet_management/doctype/vehicle/vehicle.json
index 5dec1e3..edad8a2 100644
--- a/erpnext/fleet_management/doctype/vehicle/vehicle.json
+++ b/erpnext/fleet_management/doctype/vehicle/vehicle.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "License Plate",
"length": 0,
"no_copy": 1,
@@ -31,6 +32,7 @@
"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,
@@ -49,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Make",
"length": 0,
"no_copy": 0,
@@ -57,6 +60,7 @@
"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,
@@ -75,6 +79,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -82,6 +87,7 @@
"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,
@@ -100,6 +106,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Model",
"length": 0,
"no_copy": 0,
@@ -108,6 +115,7 @@
"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,
@@ -126,6 +134,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Details",
"length": 0,
"no_copy": 0,
@@ -134,6 +143,7 @@
"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,
@@ -152,6 +162,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Odometer Value (Last)",
"length": 0,
"no_copy": 1,
@@ -160,6 +171,7 @@
"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,
@@ -178,6 +190,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Acquisition Date",
"length": 0,
"no_copy": 0,
@@ -186,6 +199,7 @@
"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,
@@ -204,6 +218,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Location",
"length": 0,
"no_copy": 0,
@@ -212,6 +227,7 @@
"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,
@@ -230,6 +246,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -237,6 +254,7 @@
"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,
@@ -255,6 +273,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Chassis No",
"length": 0,
"no_copy": 0,
@@ -263,6 +282,7 @@
"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,
@@ -281,6 +301,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Vehicle Value",
"length": 0,
"no_copy": 0,
@@ -290,6 +311,7 @@
"print_hide": 0,
"print_hide_if_no_value": 1,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -308,6 +330,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Employee",
"length": 0,
"no_copy": 0,
@@ -317,6 +340,7 @@
"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,
@@ -335,6 +359,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Insurance Details",
"length": 0,
"no_copy": 0,
@@ -343,6 +368,7 @@
"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,
@@ -361,6 +387,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Insurance Company",
"length": 0,
"no_copy": 0,
@@ -369,6 +396,7 @@
"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,
@@ -387,6 +415,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Policy No",
"length": 0,
"no_copy": 0,
@@ -395,6 +424,7 @@
"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,
@@ -413,6 +443,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -420,6 +451,7 @@
"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,
@@ -438,6 +470,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Start Date",
"length": 0,
"no_copy": 0,
@@ -446,6 +479,7 @@
"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,
@@ -464,6 +498,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "End Date",
"length": 0,
"no_copy": 0,
@@ -472,6 +507,7 @@
"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,
@@ -490,6 +526,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Details",
"length": 0,
"no_copy": 0,
@@ -498,6 +535,7 @@
"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,
@@ -516,6 +554,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Fuel Type",
"length": 0,
"no_copy": 0,
@@ -525,6 +564,7 @@
"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,
@@ -544,6 +584,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Fuel UOM",
"length": 0,
"no_copy": 0,
@@ -553,6 +594,7 @@
"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,
@@ -571,6 +613,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Last Carbon Check",
"length": 0,
"no_copy": 0,
@@ -579,6 +622,7 @@
"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,
@@ -597,6 +641,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -604,6 +649,7 @@
"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,
@@ -622,6 +668,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Color",
"length": 0,
"no_copy": 0,
@@ -630,6 +677,7 @@
"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,
@@ -648,6 +696,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Wheels",
"length": 0,
"no_copy": 0,
@@ -656,6 +705,7 @@
"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,
@@ -674,6 +724,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Doors",
"length": 0,
"no_copy": 0,
@@ -682,6 +733,7 @@
"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,
@@ -700,6 +752,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -708,6 +761,7 @@
"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,
@@ -725,7 +779,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-09-20 11:39:45.446271",
+ "modified": "2016-11-07 06:00:22.056662",
"modified_by": "Administrator",
"module": "Fleet Management",
"name": "Vehicle",
@@ -742,6 +796,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json b/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json
index 9381852..26a4a01 100644
--- a/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json
+++ b/erpnext/fleet_management/doctype/vehicle_log/vehicle_log.json
@@ -23,14 +23,16 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"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,
@@ -49,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -58,6 +61,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -76,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "License Plate",
"length": 0,
"no_copy": 0,
@@ -85,6 +90,7 @@
"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,
@@ -103,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Employee",
"length": 0,
"no_copy": 0,
@@ -112,6 +119,7 @@
"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,
@@ -130,6 +138,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -137,6 +146,7 @@
"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,
@@ -155,6 +165,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -162,6 +173,7 @@
"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,
@@ -180,6 +192,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Model",
"length": 0,
"no_copy": 0,
@@ -188,6 +201,7 @@
"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,
@@ -206,6 +220,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Make",
"length": 0,
"no_copy": 0,
@@ -214,6 +229,7 @@
"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,
@@ -232,6 +248,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Odometer Reading",
"length": 0,
"no_copy": 0,
@@ -240,6 +257,7 @@
"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,
@@ -258,6 +276,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date",
"length": 0,
"no_copy": 0,
@@ -266,6 +285,7 @@
"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,
@@ -284,6 +304,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Odometer",
"length": 0,
"no_copy": 0,
@@ -292,6 +313,7 @@
"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,
@@ -310,6 +332,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Refuelling Details",
"length": 0,
"no_copy": 0,
@@ -318,6 +341,7 @@
"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,
@@ -336,6 +360,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Fuel Qty",
"length": 0,
"no_copy": 0,
@@ -344,6 +369,7 @@
"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,
@@ -362,6 +388,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Fuel Price",
"length": 0,
"no_copy": 0,
@@ -370,6 +397,7 @@
"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,
@@ -388,6 +416,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -395,6 +424,7 @@
"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,
@@ -413,6 +443,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier",
"length": 0,
"no_copy": 0,
@@ -422,6 +453,7 @@
"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,
@@ -440,6 +472,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Invoice Ref",
"length": 0,
"no_copy": 0,
@@ -448,6 +481,7 @@
"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,
@@ -466,6 +500,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Service_Details",
"length": 0,
"no_copy": 0,
@@ -474,6 +509,7 @@
"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,
@@ -492,6 +528,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Service Detail",
"length": 0,
"no_copy": 0,
@@ -501,6 +538,7 @@
"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,
@@ -519,6 +557,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -526,6 +565,7 @@
"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,
@@ -545,6 +585,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Make Expense Claim",
"length": 0,
"no_copy": 0,
@@ -553,6 +594,7 @@
"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,
@@ -571,6 +613,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -579,6 +622,7 @@
"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,
@@ -596,7 +640,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-09-17 15:44:02.397851",
+ "modified": "2016-11-07 05:24:55.310831",
"modified_by": "Administrator",
"module": "Fleet Management",
"name": "Vehicle Log",
@@ -613,6 +657,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index 4a98470..95f6c0b 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -6,7 +6,7 @@
app_title = "ERPNext"
app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = """ERP made simple"""
-app_icon = "icon-th"
+app_icon = "fa fa-th"
app_color = "#e74c3c"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
@@ -183,7 +183,8 @@
scheduler_events = {
"hourly": [
- "erpnext.controllers.recurring_document.create_recurring_documents"
+ "erpnext.controllers.recurring_document.create_recurring_documents",
+ 'erpnext.hr.doctype.daily_work_summary_settings.daily_work_summary_settings.trigger_emails'
],
"daily": [
"erpnext.stock.reorder_item.reorder_item",
@@ -193,7 +194,8 @@
"erpnext.accounts.doctype.fiscal_year.fiscal_year.auto_create_fiscal_year",
"erpnext.hr.doctype.employee.employee.send_birthday_reminders",
"erpnext.projects.doctype.task.task.set_tasks_as_overdue",
- "erpnext.accounts.doctype.asset.depreciation.post_depreciation_entries"
+ "erpnext.accounts.doctype.asset.depreciation.post_depreciation_entries",
+ 'erpnext.hr.doctype.daily_work_summary_settings.daily_work_summary_settings.send_summary'
]
}
diff --git a/erpnext/hr/doctype/appraisal/appraisal.json b/erpnext/hr/doctype/appraisal/appraisal.json
index 83d6292..0906557 100644
--- a/erpnext/hr/doctype/appraisal/appraisal.json
+++ b/erpnext/hr/doctype/appraisal/appraisal.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -79,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Appraisal Template",
"length": 0,
"no_copy": 0,
@@ -110,6 +113,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "For Employee",
"length": 0,
"no_copy": 0,
@@ -140,6 +144,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "For Employee Name",
"length": 0,
"no_copy": 0,
@@ -169,6 +174,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -198,6 +204,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -228,6 +235,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Start Date",
"length": 0,
"no_copy": 0,
@@ -257,6 +265,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "End Date",
"length": 0,
"no_copy": 0,
@@ -286,6 +295,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Goals",
"length": 0,
"no_copy": 0,
@@ -314,6 +324,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Goals",
"length": 0,
"no_copy": 0,
@@ -343,6 +354,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Calculate Total Score",
"length": 0,
"no_copy": 0,
@@ -371,6 +383,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Total Score (Out of 5)",
"length": 0,
"no_copy": 1,
@@ -400,6 +413,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -426,6 +440,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Remarks",
"length": 0,
"no_copy": 0,
@@ -453,6 +468,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -479,6 +495,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -508,6 +525,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -534,6 +552,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -555,7 +574,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-thumbs-up",
+ "icon": "fa fa-thumbs-up",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -564,7 +583,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 15:59:04.766412",
+ "modified": "2016-11-07 05:47:32.082712",
"modified_by": "Administrator",
"module": "HR",
"name": "Appraisal",
diff --git a/erpnext/hr/doctype/appraisal_template/appraisal_template.json b/erpnext/hr/doctype/appraisal_template/appraisal_template.json
index 4ecd838..97402ac 100644
--- a/erpnext/hr/doctype/appraisal_template/appraisal_template.json
+++ b/erpnext/hr/doctype/appraisal_template/appraisal_template.json
@@ -3,16 +3,19 @@
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:kra_title",
+ "beta": 0,
"creation": "2012-07-03 13:30:39",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
+ "editable_grid": 0,
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "kra_title",
"fieldtype": "Data",
"hidden": 0,
@@ -20,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Appraisal Template Title",
"length": 0,
"no_copy": 0,
@@ -29,6 +33,7 @@
"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,
@@ -39,6 +44,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "description",
"fieldtype": "Small Text",
"hidden": 0,
@@ -46,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -56,6 +63,7 @@
"print_hide_if_no_value": 0,
"print_width": "300px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -67,6 +75,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "goals",
"fieldtype": "Table",
"hidden": 0,
@@ -74,6 +83,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Goals",
"length": 0,
"no_copy": 0,
@@ -84,6 +94,7 @@
"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,
@@ -95,13 +106,14 @@
"hide_toolbar": 0,
"icon": "icon-file-text",
"idx": 1,
+ "image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-04-13 01:49:21.815151",
+ "modified": "2016-12-13 12:37:56.937023",
"modified_by": "Administrator",
"module": "HR",
"name": "Appraisal Template",
@@ -117,6 +129,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -126,8 +139,30 @@
"share": 1,
"submit": 0,
"write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Employee",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 0
}
],
+ "quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"sort_order": "DESC",
diff --git a/erpnext/hr/doctype/attendance/attendance.json b/erpnext/hr/doctype/attendance/attendance.json
index 79c1466..9a1b66e 100644
--- a/erpnext/hr/doctype/attendance/attendance.json
+++ b/erpnext/hr/doctype/attendance/attendance.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -80,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Employee",
"length": 0,
"no_copy": 0,
@@ -109,6 +112,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Employee Name",
"length": 0,
"no_copy": 0,
@@ -138,6 +142,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -167,6 +172,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Leave Type",
"length": 0,
"no_copy": 0,
@@ -196,6 +202,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -223,6 +230,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Attendance Date",
"length": 0,
"no_copy": 0,
@@ -251,6 +259,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -280,6 +289,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -298,7 +308,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-ok",
+ "icon": "fa fa-ok",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -307,7 +317,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 15:59:24.506752",
+ "modified": "2016-11-07 05:50:01.058617",
"modified_by": "Administrator",
"module": "HR",
"name": "Attendance",
diff --git a/erpnext/hr/doctype/branch/branch.json b/erpnext/hr/doctype/branch/branch.json
index 1b8f2fd..609456c 100644
--- a/erpnext/hr/doctype/branch/branch.json
+++ b/erpnext/hr/doctype/branch/branch.json
@@ -40,7 +40,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-code-fork",
+ "icon": "fa fa-code-fork",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/hr/doctype/daily_work_summary/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/hr/doctype/daily_work_summary/__init__.py
diff --git a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.js b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.js
new file mode 100644
index 0000000..1ac173a
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Daily Work Summary', {
+ refresh: function(frm) {
+
+ }
+});
diff --git a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.json b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.json
new file mode 100644
index 0000000..b457cf2
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.json
@@ -0,0 +1,168 @@
+{
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2016-11-08 04:58:20.001780",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Company",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Company",
+ "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_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "Open",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Status",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Open\nSent",
+ "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_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "email_sent_to",
+ "fieldtype": "Code",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Email Sent To",
+ "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,
+ "unique": 0
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 1,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2016-11-21 01:05:55.258867",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Daily Work Summary",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Employee",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 0
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR User",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 0
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 1,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py
new file mode 100644
index 0000000..7fff5f5
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary/daily_work_summary.py
@@ -0,0 +1,101 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+from frappe import _
+from email_reply_parser import EmailReplyParser
+from erpnext.hr.doctype.employee.employee import is_holiday
+from frappe.utils import formatdate
+from markdown2 import markdown
+
+class DailyWorkSummary(Document):
+ def send_mails(self, settings, emails):
+ '''Send emails to get daily work summary to all employees'''
+ incoming_email_account = frappe.db.get_value('Email Account',
+ dict(enable_incoming=1, default_incoming=1), 'email_id')
+
+ self.db_set('email_sent_to', '\n'.join(emails))
+ frappe.sendmail(recipients = emails, message = settings.message,
+ subject = settings.subject, reference_doctype=self.doctype,
+ reference_name=self.name, reply_to = incoming_email_account)
+
+ def send_summary(self):
+ '''Send summary of all replies. Called at midnight'''
+ message = self.get_summary_message()
+
+ frappe.sendmail(recipients = get_employee_emails(self.company, False),
+ message = message,
+ subject = _('Daily Work Summary for {0}').format(self.company),
+ reference_doctype=self.doctype, reference_name=self.name)
+
+ self.db_set('status', 'Sent')
+
+ def get_summary_message(self):
+ '''Return summary of replies as HTML'''
+ settings = frappe.get_doc('Daily Work Summary Settings')
+
+ replies = frappe.get_all('Communication', fields=['content', 'text_content', 'sender'],
+ filters=dict(reference_doctype=self.doctype, reference_name=self.name,
+ communication_type='Communication', sent_or_received='Received'),
+ order_by='creation asc')
+
+ did_not_reply = self.email_sent_to.split()
+
+ for d in replies:
+ d.sender_name = frappe.db.get_value("Employee", {"user_id": d.sender},
+ "employee_name") or d.sender
+ if d.sender in did_not_reply:
+ did_not_reply.remove(d.sender)
+ if d.text_content:
+ d.content = markdown(EmailReplyParser.parse_reply(d.text_content))
+
+
+ did_not_reply = [(frappe.db.get_value("Employee", {"user_id": email}, "employee_name") or email)
+ for email in did_not_reply]
+
+ return frappe.render_template(self.get_summary_template(),
+ dict(replies=replies,
+ original_message=settings.message,
+ title=_('Daily Work Summary for {0}'.format(formatdate(self.creation))),
+ did_not_reply= ', '.join(did_not_reply) or '',
+ did_not_reply_title = _('No replies from')))
+
+ def get_summary_template(self):
+ return '''
+<h3>{{ title }}</h3>
+
+{% for reply in replies %}
+<h4>{{ reply.sender_name }}</h4>
+<p style="padding-bottom: 20px">
+ {{ reply.content }}
+</p>
+<hr>
+{% endfor %}
+
+{% if did_not_reply %}
+<p>{{ did_not_reply_title }}: {{ did_not_reply }}</p>
+{% endif %}
+
+'''
+
+def get_employee_emails(company, only_working=True):
+ '''Returns list of Employee user ids for the given company who are working today
+
+ :param company: Company `name`'''
+ employee_list = frappe.get_all('Employee', fields=['name', 'user_id'],
+ filters={'status': 'Active', 'company': company})
+
+ out = []
+ for e in employee_list:
+ if e.user_id:
+ if only_working and is_holiday(e.name):
+ # don't add if holiday
+ continue
+ out.append(e.user_id)
+
+ return out
+
+
diff --git a/erpnext/hr/doctype/daily_work_summary/test_daily_work_summary.py b/erpnext/hr/doctype/daily_work_summary/test_daily_work_summary.py
new file mode 100644
index 0000000..81455f1
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary/test_daily_work_summary.py
@@ -0,0 +1,81 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import os
+import frappe
+import unittest
+import frappe.utils
+
+# test_records = frappe.get_test_records('Daily Work Summary')
+
+class TestDailyWorkSummary(unittest.TestCase):
+ def test_email_trigger(self):
+ settings, employees, emails = self.setup_and_prepare_test()
+
+ for d in employees:
+ # check that email is sent to this employee
+ self.assertTrue(d.user_id in [d.recipient for d in emails
+ if settings.subject in d.message])
+
+ def test_email_trigger_failed(self):
+ hour = '00'
+ if frappe.utils.nowtime().split(':')[0]=='00':
+ hour = '01'
+
+ settings, employees, emails = self.setup_and_prepare_test(hour)
+
+ for d in employees:
+ # check that email is sent to this employee
+ self.assertFalse(d.user_id in [d.recipient for d in emails
+ if settings.subject in d.message])
+
+ def test_incoming(self):
+ settings, employees, emails = self.setup_and_prepare_test()
+
+ # get test mail with message-id as in-reply-to
+ with open(os.path.join(os.path.dirname(__file__), "test_data", "test-reply.raw"), "r") as f:
+ test_mails = [f.read().replace('{{ sender }}', employees[-1].user_id)\
+ .replace('{{ message_id }}', emails[-1].message_id)]
+
+ # pull the mail
+ email_account = frappe.get_doc("Email Account", "_Test Email Account 1")
+ email_account.db_set('enable_incoming', 1)
+ email_account.receive(test_mails=test_mails)
+
+ daily_work_summary = frappe.get_doc('Daily Work Summary',
+ frappe.get_all('Daily Work Summary')[0].name)
+
+ summary = daily_work_summary.get_summary_message()
+
+ self.assertTrue('I built Daily Work Summary!' in summary)
+
+ def setup_and_prepare_test(self, hour=None):
+ if not hour:
+ hour = frappe.utils.nowtime().split(':')[0]
+ frappe.db.sql('delete from `tabDaily Work Summary`')
+ frappe.db.sql('delete from `tabEmail Queue`')
+ frappe.db.sql('delete from `tabEmail Queue Recipient`')
+ frappe.db.sql('delete from `tabCommunication`')
+
+ # setup email to trigger at this our
+ settings = frappe.get_doc('Daily Work Summary Settings')
+ settings.companies = []
+
+ settings.append('companies', dict(company='_Test Company',
+ send_emails_at=hour + ':00'))
+ settings.test_subject = 'this is a subject for testing summary emails'
+ settings.save()
+
+ from erpnext.hr.doctype.daily_work_summary_settings.daily_work_summary_settings \
+ import trigger_emails
+ trigger_emails()
+
+ # check if emails are created
+ employees = frappe.get_all('Employee', fields = ['user_id'],
+ filters=dict(company='_Test Company', status='Active'))
+
+ emails = frappe.db.sql("""select r.recipient, q.message, q.message_id from `tabEmail Queue` as q, `tabEmail Queue Recipient` as r where q.name = r.parent""", as_dict=1)
+
+ return settings, employees, emails
\ No newline at end of file
diff --git a/erpnext/hr/doctype/daily_work_summary/test_data/test-reply.raw b/erpnext/hr/doctype/daily_work_summary/test_data/test-reply.raw
new file mode 100644
index 0000000..ba01bc2
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary/test_data/test-reply.raw
@@ -0,0 +1,75 @@
+From: {{ sender }}
+Content-Type: multipart/alternative;
+ boundary="Apple-Mail=_29597CF7-20DD-4184-B3FA-85582C5C4361"
+Message-Id: <07D687F6-10AA-4B9F-82DE-27753096164E@gmail.com>
+Mime-Version: 1.0 (Mac OS X Mail 9.3 \(3124\))
+X-Smtp-Server: 73CC8281-7E8F-4B47-8324-D5DA86EEDD4F
+Subject: Re: What did you work on today?
+Date: Thu, 10 Nov 2016 16:04:43 +0530
+X-Universally-Unique-Identifier: A4D9669F-179C-42D8-A3D3-AA6A8C49A6F2
+References: <{{ message_id }}>
+To: test_in@iwebnotes.com
+In-Reply-To: <{{ message_id }}>
+
+
+--Apple-Mail=_29597CF7-20DD-4184-B3FA-85582C5C4361
+Content-Transfer-Encoding: quoted-printable
+Content-Type: text/plain;
+ charset=us-ascii
+
+I built Daily Work Summary!
+
+> On 10-Nov-2016, at 3:20 PM, Frappe <test@erpnext.com> wrote:
+>=20
+> Please share what did you do today. If you reply by midnight, your =
+response will be recorded!
+>=20
+> This email was sent to rmehta@gmail.com
+> Unsubscribe from this list =
+<http://demo-test.erpnext.com.dev/api/method/frappe.email.queue.unsubscrib=
+e?email=3Drmehta%40gmail.com&name=3D26cc3e5a5d&doctype=3DDaily+Work+Summar=
+y&_signature=3D2c7ab37e6d775e5a481e9b4376154a41>
+> Sent via ERPNext <https://erpnext.com/?source=3Dvia_email_footer>
+
+
+--Apple-Mail=_29597CF7-20DD-4184-B3FA-85582C5C4361
+Content-Transfer-Encoding: 7bit
+Content-Type: text/html;
+ charset=us-ascii
+
+<html><head><meta http-equiv="Content-Type" content="text/html charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">I built Daily Work Summary!<div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On 10-Nov-2016, at 3:20 PM, Frappe <<a href="mailto:test@erpnext.com" class="">test@erpnext.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class="">
+
+
+<meta name="viewport" content="width=device-width" class="">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" class="">
+<title class="">What did you work on today?</title>
+
+<div style="line-height: 1.5; color: #36414C;" class="">
+<!-- body -->
+<div style="font-family: -apple-system, BlinkMacSystemFont,
+ " segoe="" ui",="" "roboto",="" "oxygen",="" "ubuntu",="" "cantarell",="" "fira="" sans",="" "droid="" "helvetica="" neue",="" sans-serif;="" font-size:="" 14px;="" padding:="" 10px;"="" class=""><p class="">Please share what did you do today. If you reply by midnight, your response will be recorded!</p>
+
+</div>
+
+<!-- footer -->
+<div style="margin-top: 30px; font-family: Helvetica, Arial, sans-serif; font-size: 11px;
+ margin-bottom: 15px; border-top: 1px solid #d1d8dd;" data-email-footer="true" class="">
+ <div style="margin: 15px auto; padding: 0px 7px; text-align: center; color: #8d99a6;" class="">
+ This email was sent to <a href="mailto:rmehta@gmail.com" class="">rmehta@gmail.com</a>
+ <p style="margin: 15px auto;" class="">
+ <a href="http://demo-test.erpnext.com.dev/api/method/frappe.email.queue.unsubscribe?email=rmehta%40gmail.com&name=26cc3e5a5d&doctype=Daily+Work+Summary&_signature=2c7ab37e6d775e5a481e9b4376154a41" style="color: #8d99a6; text-decoration: underline;
+ target=" _blank"="" class="">Unsubscribe from this list
+ </a>
+ </p>
+ </div><div style="margin: 15px auto;" class=""><div style="text-align: center;" class="">
+ <a href="https://erpnext.com/?source=via_email_footer" target="_blank" style="color: #8d99a6;" class="">
+ Sent via ERPNext
+ </a>
+</div></div>
+</div>
+<!-- /footer -->
+
+<div class="print-html"></div>
+</div>
+</div></blockquote></div><br class=""></div></body></html>
+--Apple-Mail=_29597CF7-20DD-4184-B3FA-85582C5C4361--
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/hr/doctype/daily_work_summary_settings/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/hr/doctype/daily_work_summary_settings/__init__.py
diff --git a/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.js b/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.js
new file mode 100644
index 0000000..f5c0a5c
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.js
@@ -0,0 +1,10 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Daily Work Summary Settings', {
+ refresh: function(frm) {
+ frm.add_custom_button(__('Daily Work Summary'), function() {
+ frappe.set_route('List', 'Daily Work Summary');
+ });
+ }
+});
diff --git a/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.json b/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.json
new file mode 100644
index 0000000..f52af39
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.json
@@ -0,0 +1,204 @@
+{
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2016-11-08 04:55:08.231715",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "Emails will be sent to all Active Employees of the company at the given hour, if they do not have holiday. Summary of responses will be sent at midnight.",
+ "fieldname": "select_companies",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Select Companies",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "companies",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Companies",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Daily Work Summary Settings Company",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "message_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Message",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "What did you work on today?",
+ "fieldname": "subject",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Subject",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "<p>Please share what did you do today. If you reply by midnight, your response will be recorded!</p>",
+ "fieldname": "message",
+ "fieldtype": "Text Editor",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Message",
+ "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,
+ "unique": 0
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 1,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2016-11-21 00:55:20.726328",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Daily Work Summary Settings",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "HR Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py b/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py
new file mode 100644
index 0000000..aea4c35
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary_settings/daily_work_summary_settings.py
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+import frappe.utils
+from frappe import _
+from erpnext.hr.doctype.daily_work_summary.daily_work_summary import get_employee_emails
+
+class DailyWorkSummarySettings(Document):
+ def validate(self):
+ if self.companies:
+ if not frappe.flags.in_test and not frappe.db.get_value('Email Account', dict(enable_incoming=1,
+ default_incoming=1)):
+ frappe.throw(_('There must be a default incoming Email Account enabled for this to work. Please setup a default incoming Email Account (POP/IMAP) and try again.'))
+
+def trigger_emails():
+ '''Send emails to Employees of the enabled companies at the give hour asking
+ them what did they work on today'''
+ settings = frappe.get_doc('Daily Work Summary Settings')
+ for d in settings.companies:
+ # if current hour
+ if frappe.utils.nowtime().split(':')[0] == d.send_emails_at.split(':')[0]:
+ emails = get_employee_emails(d.company)
+ # find emails relating to a company
+ if emails:
+ daily_work_summary = frappe.get_doc(dict(doctype='Daily Work Summary',
+ company=d.company)).insert()
+ daily_work_summary.send_mails(settings, emails)
+
+def send_summary():
+ '''Send summary to everyone'''
+ for d in frappe.get_all('Daily Work Summary', dict(status='Open')):
+ daily_work_summary = frappe.get_doc('Daily Work Summary', d.name)
+ daily_work_summary.send_summary()
\ No newline at end of file
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/hr/doctype/daily_work_summary_settings_company/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/hr/doctype/daily_work_summary_settings_company/__init__.py
diff --git a/erpnext/hr/doctype/daily_work_summary_settings_company/daily_work_summary_settings_company.json b/erpnext/hr/doctype/daily_work_summary_settings_company/daily_work_summary_settings_company.json
new file mode 100644
index 0000000..be27fa3
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary_settings_company/daily_work_summary_settings_company.json
@@ -0,0 +1,97 @@
+{
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2016-11-08 05:44:02.502527",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Company",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Company",
+ "permlevel": 0,
+ "precision": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "17:00",
+ "fieldname": "send_emails_at",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Send Emails At",
+ "length": 0,
+ "no_copy": 0,
+ "options": "00:00\n01:00\n02:00\n03:00\n04:00\n05:00\n06:00\n07:00\n08:00\n09:00\n10:00\n11:00\n12:00\n13:00\n14:00\n15:00\n16:00\n17:00\n18:00\n19:00\n20:00\n21:00\n22:00\n23:00",
+ "permlevel": 0,
+ "precision": "",
+ "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,
+ "unique": 0
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2016-11-08 05:46:09.198788",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Daily Work Summary Settings Company",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/daily_work_summary_settings_company/daily_work_summary_settings_company.py b/erpnext/hr/doctype/daily_work_summary_settings_company/daily_work_summary_settings_company.py
new file mode 100644
index 0000000..cd051b4
--- /dev/null
+++ b/erpnext/hr/doctype/daily_work_summary_settings_company/daily_work_summary_settings_company.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class DailyWorkSummarySettingsCompany(Document):
+ pass
diff --git a/erpnext/hr/doctype/department/department.json b/erpnext/hr/doctype/department/department.json
index cd65d17..e19f175 100644
--- a/erpnext/hr/doctype/department/department.json
+++ b/erpnext/hr/doctype/department/department.json
@@ -66,7 +66,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/designation/designation.json b/erpnext/hr/doctype/designation/designation.json
index 73f4446..1e70196 100644
--- a/erpnext/hr/doctype/designation/designation.json
+++ b/erpnext/hr/doctype/designation/designation.json
@@ -64,7 +64,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-bookmark",
+ "icon": "fa fa-bookmark",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/hr/doctype/employee/employee.js b/erpnext/hr/doctype/employee/employee.js
index 98f9f6e..0a8d9a1 100755
--- a/erpnext/hr/doctype/employee/employee.js
+++ b/erpnext/hr/doctype/employee/employee.js
@@ -58,6 +58,15 @@
},
update_contact:function(frm){
frm.set_value("prefered_email",frm.fields_dict[frappe.model.scrub(frm.doc.prefered_contact_email)].value)
- }
+ },
+ status: function(frm) {
+ return frm.call({
+ method: "deactivate_sales_person",
+ args: {
+ employee: frm.doc.employee,
+ status: frm.doc.status
+ }
+ });
+ },
});
cur_frm.cscript = new erpnext.hr.EmployeeController({frm: cur_frm});
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index 9b6bcbd..5ded5a0 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Employee",
"length": 0,
"no_copy": 1,
@@ -76,6 +78,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -105,6 +108,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Salutation",
"length": 0,
"no_copy": 0,
@@ -134,6 +138,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Full Name",
"length": 0,
"no_copy": 0,
@@ -162,6 +167,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -190,6 +196,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "User ID",
"length": 0,
"no_copy": 0,
@@ -217,6 +224,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 1,
@@ -244,6 +252,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -270,6 +279,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Employee Number",
"length": 0,
"no_copy": 0,
@@ -298,6 +308,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date of Joining",
"length": 0,
"no_copy": 0,
@@ -327,6 +338,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date of Birth",
"length": 0,
"no_copy": 0,
@@ -355,6 +367,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Gender",
"length": 0,
"no_copy": 0,
@@ -384,6 +397,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Employment Details",
"length": 0,
"no_copy": 0,
@@ -411,6 +425,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 0,
@@ -440,6 +455,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Employment Type",
"length": 0,
"no_copy": 0,
@@ -470,6 +486,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Holiday List",
"length": 0,
"no_copy": 0,
@@ -499,6 +516,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -524,6 +542,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Offer Date",
"length": 0,
"no_copy": 0,
@@ -552,6 +571,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Confirmation Date",
"length": 0,
"no_copy": 0,
@@ -580,6 +600,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contract End Date",
"length": 0,
"no_copy": 0,
@@ -608,6 +629,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date Of Retirement",
"length": 0,
"no_copy": 0,
@@ -636,6 +658,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Job Profile",
"length": 0,
"no_copy": 0,
@@ -662,6 +685,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Branch",
"length": 0,
"no_copy": 0,
@@ -691,6 +715,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Department",
"length": 0,
"no_copy": 0,
@@ -720,6 +745,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Designation",
"length": 0,
"no_copy": 0,
@@ -750,6 +776,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company Email",
"length": 0,
"no_copy": 0,
@@ -779,6 +806,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Notice (days)",
"length": 0,
"no_copy": 0,
@@ -807,6 +835,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Salary Information",
"length": 0,
"no_copy": 0,
@@ -835,6 +864,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Salary Mode",
"length": 0,
"no_copy": 0,
@@ -865,6 +895,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Bank Name",
"length": 0,
"no_copy": 0,
@@ -894,6 +925,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Bank A/C No.",
"length": 0,
"no_copy": 0,
@@ -922,6 +954,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Organization Profile",
"length": 0,
"no_copy": 0,
@@ -948,6 +981,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reports to",
"length": 0,
"no_copy": 0,
@@ -978,6 +1012,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Leave Approvers",
"length": 0,
"no_copy": 0,
@@ -1005,6 +1040,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Details",
"length": 0,
"no_copy": 0,
@@ -1032,6 +1068,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Prefered Contact Email",
"length": 0,
"no_copy": 0,
@@ -1060,6 +1097,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Prefered Email",
"length": 0,
"no_copy": 0,
@@ -1088,6 +1126,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Cell Number",
"length": 0,
"no_copy": 0,
@@ -1114,6 +1153,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Personal Email",
"length": 0,
"no_copy": 0,
@@ -1141,6 +1181,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Unsubscribed",
"length": 0,
"no_copy": 0,
@@ -1167,6 +1208,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Emergency Contact",
"length": 0,
"no_copy": 0,
@@ -1193,6 +1235,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Relation",
"length": 0,
"no_copy": 0,
@@ -1219,6 +1262,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Emergency Phone",
"length": 0,
"no_copy": 0,
@@ -1245,6 +1289,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1271,6 +1316,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Permanent Address Is",
"length": 0,
"no_copy": 0,
@@ -1298,6 +1344,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Permanent Address",
"length": 0,
"no_copy": 0,
@@ -1324,6 +1371,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Current Address Is",
"length": 0,
"no_copy": 0,
@@ -1351,6 +1399,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Current Address",
"length": 0,
"no_copy": 0,
@@ -1377,6 +1426,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -1404,6 +1454,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Bio",
"length": 0,
"no_copy": 0,
@@ -1430,6 +1481,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Personal Details",
"length": 0,
"no_copy": 0,
@@ -1456,6 +1508,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Passport Number",
"length": 0,
"no_copy": 0,
@@ -1482,6 +1535,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date of Issue",
"length": 0,
"no_copy": 0,
@@ -1508,6 +1562,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Valid Upto",
"length": 0,
"no_copy": 0,
@@ -1534,6 +1589,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Place of Issue",
"length": 0,
"no_copy": 0,
@@ -1560,6 +1616,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1586,6 +1643,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Marital Status",
"length": 0,
"no_copy": 0,
@@ -1613,6 +1671,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Blood Group",
"length": 0,
"no_copy": 0,
@@ -1641,6 +1700,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Family Background",
"length": 0,
"no_copy": 0,
@@ -1668,6 +1728,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Health Details",
"length": 0,
"no_copy": 0,
@@ -1694,6 +1755,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Educational Qualification",
"length": 0,
"no_copy": 0,
@@ -1720,6 +1782,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Education",
"length": 0,
"no_copy": 0,
@@ -1747,6 +1810,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Previous Work Experience",
"length": 0,
"no_copy": 0,
@@ -1774,6 +1838,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "External Work History",
"length": 0,
"no_copy": 0,
@@ -1801,6 +1866,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "History In Company",
"length": 0,
"no_copy": 0,
@@ -1828,6 +1894,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Internal Work History",
"length": 0,
"no_copy": 0,
@@ -1855,6 +1922,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Exit",
"length": 0,
"no_copy": 0,
@@ -1882,6 +1950,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Resignation Letter Date",
"length": 0,
"no_copy": 0,
@@ -1910,6 +1979,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Relieving Date",
"length": 0,
"no_copy": 0,
@@ -1938,6 +2008,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reason for Leaving",
"length": 0,
"no_copy": 0,
@@ -1966,6 +2037,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Leave Encashed?",
"length": 0,
"no_copy": 0,
@@ -1995,6 +2067,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Encashment Date",
"length": 0,
"no_copy": 0,
@@ -2023,6 +2096,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Exit Interview Details",
"length": 0,
"no_copy": 0,
@@ -2052,6 +2126,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Held On",
"length": 0,
"no_copy": 0,
@@ -2080,6 +2155,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reason for Resignation",
"length": 0,
"no_copy": 0,
@@ -2109,6 +2185,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "New Workplace",
"length": 0,
"no_copy": 0,
@@ -2137,6 +2214,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Feedback",
"length": 0,
"no_copy": 0,
@@ -2156,7 +2234,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 24,
"image_field": "image",
"image_view": 0,
@@ -2166,7 +2244,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 15:59:50.942167",
+ "modified": "2016-11-07 05:15:16.925799",
"modified_by": "Administrator",
"module": "HR",
"name": "Employee",
diff --git a/erpnext/hr/doctype/employee/employee.py b/erpnext/hr/doctype/employee/employee.py
index 2e5fb26..58d1262 100755
--- a/erpnext/hr/doctype/employee/employee.py
+++ b/erpnext/hr/doctype/employee/employee.py
@@ -9,7 +9,6 @@
from frappe import throw, _
import frappe.permissions
from frappe.model.document import Document
-from frappe.model.mapper import get_mapped_doc
from erpnext.utilities.transaction_base import delete_events
@@ -164,7 +163,6 @@
@frappe.whitelist()
def get_retirement_date(date_of_birth=None):
- import datetime
ret = {}
if date_of_birth:
try:
@@ -233,3 +231,22 @@
return holiday_list
+def is_holiday(employee, date=None):
+ '''Returns True if given Employee has an holiday on the given date
+
+ :param employee: Employee `name`
+ :param date: Date to check. Will check for today if None'''
+
+ holiday_list = get_holiday_list_for_employee(employee)
+ if not date:
+ date = today()
+
+ if holiday_list:
+ return frappe.get_all('Holiday List', dict(name=holiday_list, holiday_date=date)) and True or False
+
+@frappe.whitelist()
+def deactivate_sales_person(status = None, employee = None):
+ if status == "Left":
+ sales_person = frappe.db.get_value("Sales Person", {"Employee": employee})
+ if sales_person:
+ frappe.db.set_value("Sales Person", sales_person, "enabled", 0)
diff --git a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
index 3493719..de8e17c 100644
--- a/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
+++ b/erpnext/hr/doctype/employee_attendance_tool/employee_attendance_tool.js
@@ -80,14 +80,14 @@
var row;
$.each(employee, function(i, m) {
- var attendance_icon = "icon-check";
+ var attendance_icon = "fa fa-check";
var color_class = "";
if(m.status == "Absent") {
- attendance_icon = "icon-check-empty"
+ attendance_icon = "fa fa-check-empty"
color_class = "text-muted";
}
else if(m.status == "Half Day") {
- attendance_icon = "icon-check-minus"
+ attendance_icon = "fa fa-check-minus"
}
if (i===0 || i % 4===0) {
diff --git a/erpnext/hr/doctype/employment_type/employment_type.json b/erpnext/hr/doctype/employment_type/employment_type.json
index 3b9604d..6963be2 100644
--- a/erpnext/hr/doctype/employment_type/employment_type.json
+++ b/erpnext/hr/doctype/employment_type/employment_type.json
@@ -40,7 +40,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim.json b/erpnext/hr/doctype/expense_claim/expense_claim.json
index 49c8253..99b20fe 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim.json
+++ b/erpnext/hr/doctype/expense_claim/expense_claim.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -54,6 +55,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Approval Status",
"length": 0,
"no_copy": 1,
@@ -84,6 +86,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Approver",
"length": 0,
"no_copy": 0,
@@ -114,6 +117,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -141,6 +145,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Total Claimed Amount",
"length": 0,
"no_copy": 1,
@@ -171,6 +176,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Sanctioned Amount",
"length": 0,
"no_copy": 1,
@@ -201,6 +207,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -228,6 +235,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Expenses",
"length": 0,
"no_copy": 0,
@@ -257,6 +265,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"options": "Simple",
@@ -284,6 +293,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Posting Date",
"length": 0,
"no_copy": 0,
@@ -312,6 +322,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "From Employee",
"length": 0,
"no_copy": 0,
@@ -341,6 +352,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Employee Name",
"length": 0,
"no_copy": 0,
@@ -370,6 +382,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -399,6 +412,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Vehicle Log",
"length": 0,
"no_copy": 0,
@@ -427,6 +441,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -452,6 +467,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Amount Reimbursed",
"length": 0,
"no_copy": 1,
@@ -480,6 +496,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Remark",
"length": 0,
"no_copy": 1,
@@ -508,6 +525,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -536,6 +554,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Task",
"length": 0,
"no_copy": 0,
@@ -565,6 +584,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -592,6 +612,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Employees Email Id",
"length": 0,
"no_copy": 0,
@@ -620,6 +641,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -641,7 +663,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-money",
+ "icon": "fa fa-money",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -651,7 +673,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-11-03 16:00:20.567863",
+ "modified": "2016-11-07 05:52:48.548201",
"modified_by": "Administrator",
"module": "HR",
"name": "Expense Claim",
diff --git a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
index 4749800..f59111a 100644
--- a/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
+++ b/erpnext/hr/doctype/expense_claim_type/expense_claim_type.json
@@ -97,7 +97,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/holiday_list/holiday_list.json b/erpnext/hr/doctype/holiday_list/holiday_list.json
index ea41654..6b71ffc 100644
--- a/erpnext/hr/doctype/holiday_list/holiday_list.json
+++ b/erpnext/hr/doctype/holiday_list/holiday_list.json
@@ -3,16 +3,20 @@
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:holiday_list_name",
+ "beta": 0,
"creation": "2013-01-10 16:34:14",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "holiday_list_name",
"fieldtype": "Data",
"hidden": 0,
@@ -20,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Holiday List Name",
"length": 0,
"no_copy": 0,
@@ -29,6 +34,7 @@
"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,
@@ -39,6 +45,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "from_date",
"fieldtype": "Date",
"hidden": 0,
@@ -46,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "From Date",
"length": 0,
"no_copy": 0,
@@ -54,6 +62,7 @@
"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,
@@ -64,6 +73,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "to_date",
"fieldtype": "Date",
"hidden": 0,
@@ -71,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "To Date",
"length": 0,
"no_copy": 0,
@@ -79,6 +90,7 @@
"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,
@@ -89,6 +101,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "weekly_off",
"fieldtype": "Select",
"hidden": 0,
@@ -96,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Weekly Off",
"length": 0,
"no_copy": 1,
@@ -104,6 +118,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 1,
"reqd": 0,
"search_index": 0,
@@ -114,6 +129,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "get_weekly_off_dates",
"fieldtype": "Button",
"hidden": 0,
@@ -121,6 +137,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Get Weekly Off Dates",
"length": 0,
"no_copy": 0,
@@ -129,6 +146,7 @@
"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,
@@ -139,6 +157,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "holidays",
"fieldtype": "Table",
"hidden": 0,
@@ -146,6 +165,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Holidays",
"length": 0,
"no_copy": 0,
@@ -156,6 +176,7 @@
"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,
@@ -166,6 +187,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "clear_table",
"fieldtype": "Button",
"hidden": 0,
@@ -173,6 +195,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Clear Table",
"length": 0,
"no_copy": 0,
@@ -181,6 +204,7 @@
"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,
@@ -190,15 +214,16 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-calendar",
+ "icon": "fa fa-calendar",
"idx": 1,
+ "image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-03-11 05:26:24.819829",
+ "modified": "2016-11-07 05:31:24.729126",
"modified_by": "Administrator",
"module": "HR",
"name": "Holiday List",
@@ -214,6 +239,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -225,8 +251,10 @@
"write": 1
}
],
+ "quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"sort_field": "modified",
- "sort_order": "DESC"
+ "sort_order": "DESC",
+ "track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/hr_settings/hr_settings.json b/erpnext/hr/doctype/hr_settings/hr_settings.json
index d0f7c20..74c4273 100644
--- a/erpnext/hr/doctype/hr_settings/hr_settings.json
+++ b/erpnext/hr/doctype/hr_settings/hr_settings.json
@@ -217,7 +217,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.json b/erpnext/hr/doctype/job_applicant/job_applicant.json
index 4af03b6..05e3c46 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.json
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.json
@@ -11,11 +11,13 @@
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"fieldname": "applicant_name",
"fieldtype": "Data",
"hidden": 0,
@@ -23,6 +25,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Applicant Name",
"length": 0,
"no_copy": 0,
@@ -30,6 +33,7 @@
"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,
@@ -40,6 +44,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"fieldname": "email_id",
"fieldtype": "Data",
"hidden": 0,
@@ -47,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Email Id",
"length": 0,
"no_copy": 0,
@@ -55,6 +61,7 @@
"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,
@@ -65,6 +72,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "status",
"fieldtype": "Select",
"hidden": 0,
@@ -72,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 0,
@@ -80,6 +89,7 @@
"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,
@@ -90,6 +100,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"hidden": 0,
@@ -97,12 +108,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -114,6 +127,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "job_title",
"fieldtype": "Link",
"hidden": 0,
@@ -121,6 +135,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Job Opening",
"length": 0,
"no_copy": 0,
@@ -129,6 +144,7 @@
"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,
@@ -139,6 +155,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "section_break_6",
"fieldtype": "Section Break",
"hidden": 0,
@@ -146,6 +163,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -153,6 +171,7 @@
"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,
@@ -163,6 +182,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "cover_letter",
"fieldtype": "Text",
"hidden": 0,
@@ -170,6 +190,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Cover Letter",
"length": 0,
"no_copy": 0,
@@ -178,6 +199,7 @@
"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,
@@ -188,6 +210,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "resume_attachment",
"fieldtype": "Attach",
"hidden": 0,
@@ -195,6 +218,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Resume Attachment",
"length": 0,
"no_copy": 0,
@@ -203,6 +227,7 @@
"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,
@@ -212,7 +237,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -221,7 +246,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-07-15 07:10:58.195489",
+ "modified": "2016-11-07 05:29:24.405606",
"modified_by": "Administrator",
"module": "HR",
"name": "Job Applicant",
@@ -237,6 +262,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/hr/doctype/job_opening/job_opening.json b/erpnext/hr/doctype/job_opening/job_opening.json
index 4556ed3..7e28eef 100644
--- a/erpnext/hr/doctype/job_opening/job_opening.json
+++ b/erpnext/hr/doctype/job_opening/job_opening.json
@@ -10,11 +10,14 @@
"docstatus": 0,
"doctype": "DocType",
"document_type": "Document",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "job_title",
"fieldtype": "Data",
"hidden": 0,
@@ -22,6 +25,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Job Title",
"length": 0,
"no_copy": 0,
@@ -29,6 +33,7 @@
"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,
@@ -39,6 +44,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "publish",
"fieldtype": "Check",
"hidden": 0,
@@ -46,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Publish on website",
"length": 0,
"no_copy": 0,
@@ -54,6 +61,7 @@
"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,
@@ -64,6 +72,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "publish",
"fieldname": "route",
"fieldtype": "Data",
@@ -72,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Route",
"length": 0,
"no_copy": 0,
@@ -80,6 +90,7 @@
"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,
@@ -90,6 +101,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "status",
"fieldtype": "Select",
"hidden": 0,
@@ -97,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 0,
@@ -105,6 +118,7 @@
"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,
@@ -115,6 +129,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "Job profile, qualifications required etc.",
"fieldname": "description",
"fieldtype": "Text Editor",
@@ -123,6 +138,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -130,6 +146,7 @@
"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,
@@ -139,7 +156,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-bookmark",
+ "icon": "fa fa-bookmark",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -148,7 +165,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-06-23 14:45:46.102129",
+ "modified": "2016-11-07 05:29:33.272398",
"modified_by": "Administrator",
"module": "HR",
"name": "Job Opening",
@@ -164,6 +181,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/hr/doctype/leave_allocation/leave_allocation.json b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
index 4e768c1..e984bfc 100644
--- a/erpnext/hr/doctype/leave_allocation/leave_allocation.json
+++ b/erpnext/hr/doctype/leave_allocation/leave_allocation.json
@@ -10,6 +10,7 @@
"doctype": "DocType",
"document_type": "Setup",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
@@ -23,12 +24,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -48,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -57,6 +61,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -75,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Employee",
"length": 0,
"no_copy": 0,
@@ -85,6 +91,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
@@ -103,6 +110,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Employee Name",
"length": 0,
"no_copy": 0,
@@ -110,6 +118,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -128,12 +137,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -153,6 +164,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -162,6 +174,7 @@
"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,
@@ -181,6 +194,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -188,6 +202,7 @@
"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,
@@ -206,6 +221,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Leave Type",
"length": 0,
"no_copy": 0,
@@ -216,6 +232,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
@@ -234,6 +251,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "From Date",
"length": 0,
"no_copy": 0,
@@ -242,6 +260,7 @@
"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,
@@ -260,6 +279,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "To Date",
"length": 0,
"no_copy": 0,
@@ -268,6 +288,7 @@
"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,
@@ -286,6 +307,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -293,6 +315,7 @@
"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,
@@ -311,6 +334,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "New Leaves Allocated",
"length": 0,
"no_copy": 0,
@@ -318,6 +342,7 @@
"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,
@@ -337,6 +362,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Add unused leaves from previous allocations",
"length": 0,
"no_copy": 0,
@@ -344,6 +370,7 @@
"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,
@@ -363,6 +390,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Unused leaves",
"length": 0,
"no_copy": 0,
@@ -370,6 +398,7 @@
"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,
@@ -388,6 +417,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Leaves Allocated",
"length": 0,
"no_copy": 0,
@@ -395,6 +425,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -413,6 +444,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -423,6 +455,7 @@
"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,
@@ -432,7 +465,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-ok",
+ "icon": "fa fa-ok",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -441,7 +474,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-09-01 15:09:42.311292",
+ "modified": "2016-11-07 05:26:00.812083",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Allocation",
@@ -457,6 +490,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -477,6 +511,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/hr/doctype/leave_application/leave_application.json b/erpnext/hr/doctype/leave_application/leave_application.json
index a27ec0c..0f63ec3 100644
--- a/erpnext/hr/doctype/leave_application/leave_application.json
+++ b/erpnext/hr/doctype/leave_application/leave_application.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -53,6 +54,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -80,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -106,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Leave Type",
"length": 0,
"no_copy": 0,
@@ -133,6 +137,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Leave Balance Before Application",
"length": 0,
"no_copy": 1,
@@ -159,6 +164,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -185,6 +191,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "From Date",
"length": 0,
"no_copy": 0,
@@ -211,6 +218,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "To Date",
"length": 0,
"no_copy": 0,
@@ -237,6 +245,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Half Day",
"length": 0,
"no_copy": 0,
@@ -263,6 +272,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Total Leave Days",
"length": 0,
"no_copy": 1,
@@ -289,6 +299,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -316,6 +327,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reason",
"length": 0,
"no_copy": 0,
@@ -342,6 +354,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -368,6 +381,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Employee",
"length": 0,
"no_copy": 0,
@@ -395,6 +409,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Employee Name",
"length": 0,
"no_copy": 0,
@@ -421,6 +436,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -448,6 +464,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Leave Approver",
"length": 0,
"no_copy": 0,
@@ -475,6 +492,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Leave Approver Name",
"length": 0,
"no_copy": 0,
@@ -502,6 +520,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -529,6 +548,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Posting Date",
"length": 0,
"no_copy": 1,
@@ -556,6 +576,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Follow via Email",
"length": 0,
"no_copy": 0,
@@ -582,6 +603,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -607,6 +629,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -634,6 +657,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -661,6 +685,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -679,7 +704,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-calendar",
+ "icon": "fa fa-calendar",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -688,7 +713,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 3,
- "modified": "2016-11-03 16:00:44.359310",
+ "modified": "2016-12-15 14:48:14.552415",
"modified_by": "Administrator",
"module": "HR",
"name": "Leave Application",
diff --git a/erpnext/hr/doctype/leave_application/leave_application.py b/erpnext/hr/doctype/leave_application/leave_application.py
index a0a718e..5c836df 100755
--- a/erpnext/hr/doctype/leave_application/leave_application.py
+++ b/erpnext/hr/doctype/leave_application/leave_application.py
@@ -16,6 +16,7 @@
class OverlapError(frappe.ValidationError): pass
class InvalidLeaveApproverError(frappe.ValidationError): pass
class LeaveApproverIdentityError(frappe.ValidationError): pass
+class AttendanceAlreadyMarkedError(frappe.ValidationError): pass
from frappe.model.document import Document
class LeaveApplication(Document):
@@ -100,16 +101,16 @@
def validate_salary_processed_days(self):
if not frappe.db.get_value("Leave Type", self.leave_type, "is_lwp"):
return
-
+
last_processed_pay_slip = frappe.db.sql("""
select start_date, end_date from `tabSalary Slip`
where docstatus = 1 and employee = %s
- and ((%s between start_date and end_date) or (%s between start_date and end_date))
+ and ((%s between start_date and end_date) or (%s between start_date and end_date))
order by modified desc limit 1
""",(self.employee, self.to_date, self.from_date))
if last_processed_pay_slip:
- frappe.throw(_("Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.").format(formatdate(last_processed_pay_slip[0][0]),
+ frappe.throw(_("Salary already processed for period between {0} and {1}, Leave application period cannot be between this date range.").format(formatdate(last_processed_pay_slip[0][0]),
formatdate(last_processed_pay_slip[0][1])))
@@ -213,13 +214,14 @@
elif self.docstatus==1 and len(leave_approvers) and self.leave_approver != frappe.session.user:
frappe.throw(_("Only the selected Leave Approver can submit this Leave Application"),
LeaveApproverIdentityError)
-
+
def validate_attendance(self):
attendance = frappe.db.sql("""select name from `tabAttendance` where employee = %s and (att_date between %s and %s)
and docstatus = 1""",
(self.employee, self.from_date, self.to_date))
if attendance:
- frappe.throw(_("Attendance for employee {0} is already marked for this day").format(self.employee))
+ frappe.throw(_("Attendance for employee {0} is already marked for this day").format(self.employee),
+ AttendanceAlreadyMarkedError)
def notify_employee(self, status):
employee = frappe.get_doc("Employee", self.employee)
@@ -416,13 +418,13 @@
query = """select name, from_date, to_date, employee_name, half_day,
status, employee, docstatus
from `tabLeave Application` where
- (from_date between %s and %s or to_date between %s and %s)
+ from_date <= %(end)s and to_date >= %(start)s <= to_date
and docstatus < 2
and status!="Rejected" """
if match_conditions:
query += " and " + match_conditions
- for d in frappe.db.sql(query, (start, end, start, end), as_dict=True):
+ for d in frappe.db.sql(query, {"start":start, "end": end}, as_dict=True):
e = {
"name": d.name,
"doctype": "Leave Application",
diff --git a/erpnext/hr/doctype/leave_block_list/leave_block_list.json b/erpnext/hr/doctype/leave_block_list/leave_block_list.json
index d961bad..16dbda8 100644
--- a/erpnext/hr/doctype/leave_block_list/leave_block_list.json
+++ b/erpnext/hr/doctype/leave_block_list/leave_block_list.json
@@ -203,7 +203,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-calendar",
+ "icon": "fa fa-calendar",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
index 17e667e..6e02ff5 100644
--- a/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
+++ b/erpnext/hr/doctype/leave_control_panel/leave_control_panel.json
@@ -311,7 +311,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/hr/doctype/leave_type/leave_type.json b/erpnext/hr/doctype/leave_type/leave_type.json
index e218ecd..9153bbf 100644
--- a/erpnext/hr/doctype/leave_type/leave_type.json
+++ b/erpnext/hr/doctype/leave_type/leave_type.json
@@ -174,7 +174,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/hr/doctype/offer_letter/offer_letter.json b/erpnext/hr/doctype/offer_letter/offer_letter.json
index f707675..b0a95c3 100644
--- a/erpnext/hr/doctype/offer_letter/offer_letter.json
+++ b/erpnext/hr/doctype/offer_letter/offer_letter.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Job Applicant",
"length": 0,
"no_copy": 0,
@@ -52,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Applicant Name",
"length": 0,
"no_copy": 0,
@@ -80,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -106,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -135,6 +139,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Offer Date",
"length": 0,
"no_copy": 0,
@@ -162,6 +167,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Designation",
"length": 0,
"no_copy": 0,
@@ -190,6 +196,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -218,6 +225,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -244,6 +252,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Offer Letter Terms",
"length": 0,
"no_copy": 0,
@@ -272,6 +281,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -298,6 +308,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Select Terms and Conditions",
"length": 0,
"no_copy": 0,
@@ -326,6 +337,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
@@ -354,6 +366,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -380,7 +393,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 16:02:06.661956",
+ "modified": "2016-11-07 05:55:03.924272",
"modified_by": "Administrator",
"module": "HR",
"name": "Offer Letter",
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.js b/erpnext/hr/doctype/process_payroll/process_payroll.js
index 35c097a..0ad8cec 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.js
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.js
@@ -2,43 +2,45 @@
// License: GNU General Public License v3. See license.txt
frappe.ui.form.on("Process Payroll", {
- refresh: function(frm) {
- frm.disable_save();
- frm.trigger("toggle_fields");
- frm.trigger("set_month_dates");
- },
-
- month: function(frm) {
- frm.trigger("set_month_dates");
- },
-
- fiscal_year: function(frm) {
- frm.trigger("set_month_dates");
- },
-
- salary_slip_based_on_timesheet: function(frm) {
- frm.trigger("toggle_fields")
+ onload: function(frm) {
+ frm.doc.posting_date = frappe.datetime.nowdate();
+ frm.doc.start_date = '';
+ frm.doc.end_date = '';
+ frm.doc.payroll_frequency = '';
},
- toggle_fields: function(frm) {
- frm.toggle_display(['from_date','to_date'],
- cint(frm.doc.salary_slip_based_on_timesheet)==1);
- frm.toggle_display(['fiscal_year', 'month'],
- cint(frm.doc.salary_slip_based_on_timesheet)==0);
+ refresh: function(frm) {
+ frm.disable_save();
},
-
- set_month_dates: function(frm) {
+
+ payroll_frequency: function(frm) {
+ frm.trigger("set_start_end_dates");
+ },
+
+ start_date: function(frm) {
+ frm.trigger("set_start_end_dates");
+ },
+
+ end_date: function(frm) {
+ frm.trigger("set_start_end_dates");
+ },
+
+ payment_account: function(frm) {
+ frm.toggle_display(['make_bank_entry'], (frm.doc.payment_account!="" && frm.doc.payment_account!="undefined"));
+ },
+
+ set_start_end_dates: function(frm) {
if (!frm.doc.salary_slip_based_on_timesheet){
frappe.call({
- method:'erpnext.hr.doctype.process_payroll.process_payroll.get_month_details',
+ method:'erpnext.hr.doctype.process_payroll.process_payroll.get_start_end_dates',
args:{
- year: frm.doc.fiscal_year,
- month: frm.doc.month
+ payroll_frequency: frm.doc.payroll_frequency,
+ start_date: frm.doc.start_date || frm.doc.posting_date
},
callback: function(r){
if (r.message){
- frm.set_value('from_date', r.message.month_start_date);
- frm.set_value('to_date', r.message.month_end_date);
+ frm.set_value('start_date', r.message.start_date);
+ frm.set_value('end_date', r.message.end_date);
}
}
})
@@ -56,17 +58,6 @@
}
})
-cur_frm.cscript.onload = function(doc,cdt,cdn){
- if(!doc.month) {
- var today=new Date();
- month = (today.getMonth()+01).toString();
- if(month.length>1) doc.month = month;
- else doc.month = '0'+month;
- }
- if(!doc.fiscal_year) doc.fiscal_year = sys_defaults['fiscal_year'];
- refresh_many(['month', 'fiscal_year']);
-}
-
cur_frm.cscript.display_activity_log = function(msg) {
if(!cur_frm.ss_html)
cur_frm.ss_html = $a(cur_frm.fields_dict['activity_log'].wrapper,'div');
@@ -86,13 +77,13 @@
if (r.message)
cur_frm.cscript.display_activity_log(r.message);
}
- return $c('runserverobj', args={'method':'create_sal_slip','docs':doc},callback);
+ return $c('runserverobj', args={'method':'create_salary_slips','docs':doc},callback);
}
cur_frm.cscript.submit_salary_slip = function(doc, cdt, cdn) {
cur_frm.cscript.display_activity_log("");
- frappe.confirm(__("Do you really want to Submit all Salary Slip from {0} to {1}", [doc.from_date, doc.to_date]), function() {
+ frappe.confirm(__("Do you really want to Submit all Salary Slip from {0} to {1}", [doc.start_date, doc.end_date]), function() {
// clear all in locals
if(locals["Salary Slip"]) {
$.each(locals["Salary Slip"], function(name, d) {
@@ -105,12 +96,12 @@
cur_frm.cscript.display_activity_log(r.message);
}
- return $c('runserverobj', args={'method':'submit_salary_slip','docs':doc},callback);
+ return $c('runserverobj', args={'method':'submit_salary_slips','docs':doc},callback);
});
}
cur_frm.cscript.make_bank_entry = function(doc,cdt,cdn){
- if(doc.company && doc.from_date && doc.to_date){
+ if(doc.company && doc.start_date && doc.end_date){
return cur_frm.cscript.reference_entry(doc,cdt,cdn);
} else {
msgprint(__("Company, From Date and To Date is mandatory"));
@@ -122,15 +113,15 @@
title: __("Bank Transaction Reference"),
fields: [
{
- "label": __("Reference Number"),
+ "label": __("Reference Number"),
"fieldname": "reference_number",
- "fieldtype": "Data",
+ "fieldtype": "Data",
"reqd": 1
},
{
- "label": __("Reference Date"),
+ "label": __("Reference Date"),
"fieldname": "reference_date",
- "fieldtype": "Date",
+ "fieldtype": "Date",
"reqd": 1,
"default": get_today()
}
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.json b/erpnext/hr/doctype/process_payroll/process_payroll.json
index b773ce7..7d84910 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.json
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.json
@@ -22,6 +22,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Select Employees",
"length": 0,
"no_copy": 0,
@@ -48,6 +49,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -67,6 +69,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "default": "",
"fieldname": "company",
"fieldtype": "Link",
"hidden": 0,
@@ -74,6 +77,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -102,6 +106,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Posting Date",
"length": 0,
"no_copy": 0,
@@ -122,6 +127,37 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "default": "",
+ "depends_on": "eval:doc.salary_slip_based_on_timesheet == 0",
+ "fieldname": "payroll_frequency",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Payroll Frequency",
+ "length": 0,
+ "no_copy": 0,
+ "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily",
+ "permlevel": 0,
+ "precision": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "column_break1",
"fieldtype": "Column Break",
"hidden": 0,
@@ -129,6 +165,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -155,6 +192,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Branch",
"length": 0,
"no_copy": 0,
@@ -182,6 +220,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Department",
"length": 0,
"no_copy": 0,
@@ -209,6 +248,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Designation",
"length": 0,
"no_copy": 0,
@@ -236,6 +276,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -262,6 +303,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Salary Slip Based on Timesheet",
"length": 0,
"no_copy": 0,
@@ -289,6 +331,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Select Payroll Period",
"length": 0,
"no_copy": 0,
@@ -309,14 +352,16 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "from_date",
- "fieldtype": "Data",
+ "default": "",
+ "fieldname": "start_date",
+ "fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "From",
+ "in_standard_filter": 0,
+ "label": "Start Date",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -336,33 +381,6 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "fiscal_year",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Fiscal Year",
- "length": 0,
- "no_copy": 0,
- "options": "Fiscal Year",
- "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,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "column_break_11",
"fieldtype": "Column Break",
"hidden": 0,
@@ -370,6 +388,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -389,14 +408,16 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "to_date",
- "fieldtype": "Data",
+ "default": "",
+ "fieldname": "end_date",
+ "fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "To",
+ "in_standard_filter": 0,
+ "label": "End Date",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -416,33 +437,6 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "month",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Month",
- "length": 0,
- "no_copy": 0,
- "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12",
- "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,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "process_payroll",
"fieldtype": "Section Break",
"hidden": 0,
@@ -450,6 +444,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Process Payroll",
"length": 0,
"no_copy": 0,
@@ -477,6 +472,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -504,6 +500,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Create Salary Slip",
"length": 0,
"no_copy": 0,
@@ -530,6 +527,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -557,6 +555,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Submit Salary Slip",
"length": 0,
"no_copy": 0,
@@ -583,6 +582,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Account",
"length": 0,
"no_copy": 0,
@@ -611,6 +611,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Payment Account",
"length": 0,
"no_copy": 0,
@@ -632,15 +633,16 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "depends_on": "eval:doc.payment_account",
+ "depends_on": "",
"description": "Create Bank Entry for the total salary paid for the above selected criteria",
"fieldname": "make_bank_entry",
"fieldtype": "Button",
- "hidden": 0,
+ "hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Make Bank Entry",
"length": 0,
"no_copy": 0,
@@ -667,6 +669,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -692,6 +695,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Activity Log",
"length": 0,
"no_copy": 0,
@@ -709,7 +713,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -718,7 +722,7 @@
"issingle": 1,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 16:02:34.040851",
+ "modified": "2016-12-14 01:48:22.326326",
"modified_by": "Administrator",
"module": "HR",
"name": "Process Payroll",
diff --git a/erpnext/hr/doctype/process_payroll/process_payroll.py b/erpnext/hr/doctype/process_payroll/process_payroll.py
index 2077982..45030cb 100644
--- a/erpnext/hr/doctype/process_payroll/process_payroll.py
+++ b/erpnext/hr/doctype/process_payroll/process_payroll.py
@@ -3,15 +3,13 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import cint, flt, nowdate
+from frappe.utils import cint, flt, nowdate, add_days, getdate
from frappe import _
-import collections
-from collections import defaultdict
+from erpnext.accounts.utils import get_fiscal_year
from frappe.model.document import Document
class ProcessPayroll(Document):
-
def get_emp_list(self):
"""
Returns list of active employees based on selected criteria
@@ -20,21 +18,33 @@
cond = self.get_filter_condition()
cond += self.get_joining_releiving_condition()
+
+ condition = ''
+ if self.payroll_frequency:
+ condition = """and payroll_frequency = '%(payroll_frequency)s'""" % {"payroll_frequency": self.payroll_frequency}
+
sal_struct = frappe.db.sql("""
- select name from `tabSalary Structure`
- where docstatus != 2 and is_active = 'Yes' and company = %(company)s and
- ifnull(salary_slip_based_on_timesheet,0) = %(salary_slip_based_on_timesheet)s""",
+ select
+ name from `tabSalary Structure`
+ where
+ docstatus != 2 and
+ is_active = 'Yes'
+ and company = %(company)s and
+ ifnull(salary_slip_based_on_timesheet,0) = %(salary_slip_based_on_timesheet)s
+ {condition}""".format(condition=condition),
{"company": self.company, "salary_slip_based_on_timesheet":self.salary_slip_based_on_timesheet})
-
+
if sal_struct:
cond += "and t2.parent IN %(sal_struct)s "
-
emp_list = frappe.db.sql("""
- select t1.name
- from `tabEmployee` t1, `tabSalary Structure Employee` t2
- where t1.docstatus!=2 and t1.name = t2.employee
+ select
+ t1.name
+ from
+ `tabEmployee` t1, `tabSalary Structure Employee` t2
+ where
+ t1.docstatus!=2
+ and t1.name = t2.employee
%s """% cond, {"sal_struct": sal_struct})
-
return emp_list
@@ -51,18 +61,18 @@
def get_joining_releiving_condition(self):
cond = """
- and ifnull(t1.date_of_joining, '0000-00-00') <= '%(to_date)s'
- and ifnull(t1.relieving_date, '2199-12-31') >= '%(from_date)s'
- """ % {"from_date": self.from_date, "to_date": self.to_date}
+ and ifnull(t1.date_of_joining, '0000-00-00') <= '%(end_date)s'
+ and ifnull(t1.relieving_date, '2199-12-31') >= '%(start_date)s'
+ """ % {"start_date": self.start_date, "end_date": self.end_date}
return cond
def check_mandatory(self):
- for f in ['company', 'from_date', 'to_date']:
- if not self.get(f):
- frappe.throw(_("Please set {0}").format(f))
+ for fieldname in ['company', 'payroll_frequency', 'start_date', 'end_date']:
+ if not self.get(fieldname):
+ frappe.throw(_("Please set {0}").format(self.meta.get_label(fieldname)))
- def create_sal_slip(self):
+ def create_salary_slips(self):
"""
Creates salary slip for selected employees if already not created
"""
@@ -72,31 +82,26 @@
ss_list = []
if emp_list:
for emp in emp_list:
- if not frappe.db.sql("""select name from `tabSalary Slip`
- where docstatus!= 2 and employee = %s and start_date >= %s and end_date <= %s and company = %s
- """, (emp[0], self.from_date, self.to_date, self.company)):
- if self.salary_slip_based_on_timesheet:
- ss = frappe.get_doc({
- "doctype": "Salary Slip",
- "salary_slip_based_on_timesheet": self.salary_slip_based_on_timesheet,
- "start_date": self.from_date,
- "end_date": self.to_date,
- "employee": emp[0],
- "employee_name": frappe.get_value("Employee", {"name":emp[0]}, "employee_name"),
- "company": self.company,
- "posting_date": self.posting_date
- })
- else:
- ss = frappe.get_doc({
- "doctype": "Salary Slip",
- "salary_slip_based_on_timesheet": self.salary_slip_based_on_timesheet,
- "fiscal_year": self.fiscal_year,
- "month": self.month,
- "employee": emp[0],
- "employee_name": frappe.get_value("Employee", {"name":emp[0]}, "employee_name"),
- "company": self.company,
- "posting_date": self.posting_date
- })
+ if not frappe.db.sql("""select
+ name from `tabSalary Slip`
+ where
+ docstatus!= 2 and
+ employee = %s and
+ start_date >= %s and
+ end_date <= %s and
+ company = %s
+ """, (emp[0], self.start_date, self.end_date, self.company)):
+ ss = frappe.get_doc({
+ "doctype": "Salary Slip",
+ "salary_slip_based_on_timesheet": self.salary_slip_based_on_timesheet,
+ "payroll_frequency": self.payroll_frequency,
+ "start_date": self.start_date,
+ "end_date": self.end_date,
+ "employee": emp[0],
+ "employee_name": frappe.get_value("Employee", {"name":emp[0]}, "employee_name"),
+ "company": self.company,
+ "posting_date": self.posting_date
+ })
ss.insert()
ss_list.append(ss.name)
return self.create_log(ss_list)
@@ -115,16 +120,16 @@
Returns list of salary slips based on selected criteria
"""
cond = self.get_filter_condition()
-
+
ss_list = frappe.db.sql("""
select t1.name, t1.salary_structure from `tabSalary Slip` t1
- where t1.docstatus = %s and t1.start_date >= %s and t1.end_date <= %s
+ where t1.docstatus = %s and t1.start_date >= %s and t1.end_date <= %s
and (t1.journal_entry is null or t1.journal_entry = "") and ifnull(salary_slip_based_on_timesheet,0) = %s %s
- """ % ('%s', '%s', '%s','%s', cond), (ss_status, self.from_date, self.to_date, self.salary_slip_based_on_timesheet), as_dict=as_dict)
+ """ % ('%s', '%s', '%s','%s', cond), (ss_status, self.start_date, self.end_date, self.salary_slip_based_on_timesheet), as_dict=as_dict)
return ss_list
- def submit_salary_slip(self):
+ def submit_salary_slips(self):
"""
Submit all salary slips based on selected criteria
"""
@@ -139,12 +144,11 @@
else:
try:
ss_obj.submit()
- except Exception,e:
+ except frappe.ValidationError:
not_submitted_ss.append(ss[0])
return self.create_submit_log(ss_list, not_submitted_ss)
-
def create_submit_log(self, all_ss, not_submitted_ss):
log = ''
if not all_ss:
@@ -162,12 +166,9 @@
log += """
<b>Not Submitted Salary Slips: </b>\
<br><br> %s <br><br> \
- Reason: <br>\
- May be net pay is less than 0 <br>
- May be company email id specified in employee master is not valid. <br> \
- Please mention correct email id in employee master or if you don't want to \
- send mail, uncheck 'Send Email' checkbox. <br>\
- Then try to submit Salary Slip again.
+ Possible reasons: <br>\
+ 1. Net pay is less than 0 <br>
+ 2. Company email id specified in employee master is not valid. <br> \
"""% ('<br>'.join(not_submitted_ss))
return log
@@ -183,45 +184,45 @@
tot = frappe.db.sql("""
select sum(rounded_total) from `tabSalary Slip` t1
where t1.docstatus = 1 and start_date >= %s and end_date <= %s %s
- """ % ('%s', '%s', cond), (self.from_date, self.to_date))
+ """ % ('%s', '%s', cond), (self.start_date, self.end_date))
return flt(tot[0][0])
-
+
def get_salary_component_account(self, salary_component):
account = frappe.db.get_value("Salary Component Account",
{"parent": salary_component, "company": self.company}, "default_account")
-
+
if not account:
frappe.throw(_("Please set default account in Salary Component {0}")
.format(salary_component))
-
- return account
-
+
+ return account
+
def get_salary_components(self, component_type):
salary_slips = self.get_sal_slip_list(ss_status = 1, as_dict = True)
if salary_slips:
salary_components = frappe.db.sql("""select salary_component, amount, parentfield
from `tabSalary Detail` where parentfield = '%s' and parent in (%s)""" %
- (component_type, ', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]), as_dict=True)
+ (component_type, ', '.join(['%s']*len(salary_slips))), tuple([d.name for d in salary_slips]), as_dict=True)
return salary_components
-
+
def get_salary_component_total(self, component_type = None):
salary_components = self.get_salary_components(component_type)
if salary_components:
component_dict = {}
- for item in salary_components:
+ for item in salary_components:
component_dict[item['salary_component']] = component_dict.get(item['salary_component'], 0) + item['amount']
account_details = self.get_account(component_dict = component_dict)
return account_details
-
+
def get_account(self, component_dict = None):
account_dict = {}
for s, a in component_dict.items():
account = self.get_salary_component_account(s)
- account_dict[account] = account_dict.get(account, 0) + a
+ account_dict[account] = account_dict.get(account, 0) + a
return account_dict
-
-
+
+
def make_journal_entry(self, reference_number = None, reference_date = None):
self.check_permission('write')
earnings = self.get_salary_component_total(component_type = "earnings") or {}
@@ -231,11 +232,11 @@
if earnings or deductions:
journal_entry = frappe.new_doc('Journal Entry')
journal_entry.voucher_type = 'Bank Entry'
- journal_entry.user_remark = _('Payment of salary from {0} to {1}').format(self.from_date,
- self.to_date)
+ journal_entry.user_remark = _('Payment of salary from {0} to {1}').format(self.start_date,
+ self.end_date)
journal_entry.company = self.company
journal_entry.posting_date = nowdate()
-
+
account_amt_list = []
adjustment_amt = 0
for acc, amt in earnings.items():
@@ -253,10 +254,11 @@
account_amt_list.append({
"account": self.payment_account,
"credit_in_account_currency": adjustment_amt
- })
+ })
journal_entry.set("accounts", account_amt_list)
journal_entry.cheque_no = reference_number
journal_entry.cheque_date = reference_date
+ journal_entry.multi_currency = 1
journal_entry.save()
try:
journal_entry.submit()
@@ -265,15 +267,15 @@
except Exception, e:
frappe.msgprint(e)
return self.create_jv_log(jv_name)
-
+
def create_jv_log(self, jv_name):
log = "<p>" + _("No submitted Salary Slip found") + "</p>"
if jv_name:
log = "<b>" + _("Journal Entry Submitted") + "</b>\
%s" % '<br>''<a href="#Form/Journal Entry/{0}">{0}</a>'.format(jv_name)
- return log
-
+ return log
+
def update_salary_slip_status(self, jv_name = None):
ss_list = self.get_sal_slip_list(ss_status=1)
for ss in ss_list:
@@ -281,8 +283,44 @@
frappe.db.set_value("Salary Slip", ss_obj.name, "status", "Paid")
frappe.db.set_value("Salary Slip", ss_obj.name, "journal_entry", jv_name)
+ def set_start_end_dates(self):
+ self.update(get_start_end_dates(self.payroll_frequency, self.start_date or self.posting_date))
+
@frappe.whitelist()
+def get_start_end_dates(payroll_frequency, start_date=None):
+ '''Returns dict of start and end dates for given payroll frequency based on start_date'''
+ if not payroll_frequency:
+ frappe.throw(_("Please set Payroll Frequency first"))
+
+ if payroll_frequency == "Monthly" or payroll_frequency == "Bimonthly":
+ fiscal_year = get_fiscal_year(start_date)[0]
+ month = "%02d" % getdate(start_date).month
+ m = get_month_details(fiscal_year, month)
+ if payroll_frequency == "Bimonthly":
+ if getdate(start_date).day <= 15:
+ start_date = m['month_start_date']
+ end_date = m['month_mid_end_date']
+ else:
+ start_date = m['month_mid_start_date']
+ end_date = m['month_end_date']
+ else:
+ start_date = m['month_start_date']
+ end_date = m['month_end_date']
+
+ if payroll_frequency == "Weekly":
+ end_date = add_days(start_date, 6)
+
+ if payroll_frequency == "Fortnightly":
+ end_date = add_days(start_date, 13)
+
+ if payroll_frequency == "Daily":
+ end_date = start_date
+
+ return frappe._dict({
+ 'start_date': start_date, 'end_date': end_date
+ })
+
def get_month_details(year, month):
ysd = frappe.db.get_value("Fiscal Year", year, "year_start_date")
if ysd:
@@ -293,12 +331,16 @@
diff_mnt = 12-int(ysd.month)+cint(month)
msd = ysd + relativedelta(months=diff_mnt) # month start date
month_days = cint(calendar.monthrange(cint(msd.year) ,cint(month))[1]) # days in month
+ mid_start = datetime.date(msd.year, cint(month), 16) # month mid start date
+ mid_end = datetime.date(msd.year, cint(month), 15) # month mid end date
med = datetime.date(msd.year, cint(month), month_days) # month end date
return frappe._dict({
'year': msd.year,
'month_start_date': msd,
'month_end_date': med,
+ 'month_mid_start_date': mid_start,
+ 'month_mid_end_date': mid_end,
'month_days': month_days
})
else:
- frappe.throw(_("Fiscal Year {0} not found").format(year))
\ No newline at end of file
+ frappe.throw(_("Fiscal Year {0} not found").format(year))
diff --git a/erpnext/hr/doctype/process_payroll/test_process_payroll.py b/erpnext/hr/doctype/process_payroll/test_process_payroll.py
index 3be4b4c..2eb1c6b 100644
--- a/erpnext/hr/doctype/process_payroll/test_process_payroll.py
+++ b/erpnext/hr/doctype/process_payroll/test_process_payroll.py
@@ -18,17 +18,16 @@
get_salary_component_account(data.name)
payment_account = frappe.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
- if not frappe.db.get_value("Salary Slip", {"fiscal_year": fiscal_year, "month": month}):
+ if not frappe.db.get_value("Salary Slip", {"start_date": "2016-11-01", "end_date": "2016-11-30"}):
process_payroll = frappe.get_doc("Process Payroll", "Process Payroll")
process_payroll.company = erpnext.get_default_company()
- process_payroll.month = month
- process_payroll.fiscal_year = fiscal_year
- process_payroll.from_date = "2016-11-01"
- process_payroll.to_date = "2016-11-30"
+ process_payroll.start_date = "2016-11-01"
+ process_payroll.end_date = "2016-11-30"
process_payroll.payment_account = payment_account
process_payroll.posting_date = nowdate()
- process_payroll.create_sal_slip()
- process_payroll.submit_salary_slip()
+ process_payroll.payroll_frequency = "Monthly"
+ process_payroll.create_salary_slips()
+ process_payroll.submit_salary_slips()
if process_payroll.get_sal_slip_list(ss_status = 1):
r = process_payroll.make_journal_entry(reference_number=random_string(10),reference_date=nowdate())
diff --git a/erpnext/hr/doctype/salary_component/salary_component.json b/erpnext/hr/doctype/salary_component/salary_component.json
index 64f91c7..29d6015 100644
--- a/erpnext/hr/doctype/salary_component/salary_component.json
+++ b/erpnext/hr/doctype/salary_component/salary_component.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Name",
"length": 0,
"no_copy": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Abbr",
"length": 0,
"no_copy": 0,
@@ -79,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Type",
"length": 0,
"no_copy": 0,
@@ -107,6 +110,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -134,6 +138,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -160,6 +165,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accounts",
"length": 0,
"no_copy": 0,
@@ -179,7 +185,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 0,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.js b/erpnext/hr/doctype/salary_slip/salary_slip.js
index e1120e8..8b0dd16 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.js
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.js
@@ -46,59 +46,44 @@
salary_slip_based_on_timesheet: function(frm) {
frm.trigger("toggle_fields")
},
+
+ payroll_frequency: function(frm) {
+ frm.trigger("toggle_fields")
+ },
toggle_fields: function(frm) {
- frm.toggle_display(['start_date', 'end_date', 'hourly_wages', 'timesheets'],
+ frm.toggle_display(['hourly_wages', 'timesheets'],
cint(frm.doc.salary_slip_based_on_timesheet)==1);
- frm.toggle_display(['fiscal_year', 'month', 'total_days_in_month', 'leave_without_pay', 'payment_days'],
- cint(frm.doc.salary_slip_based_on_timesheet)==0);
+
+ frm.toggle_display(['payment_days', 'total_working_days', 'leave_without_pay'],
+ frm.doc.payroll_frequency!="");
}
})
-frappe.ui.form.on("Salary Slip Timesheet", {
- time_sheet: function(frm, cdt, cdn) {
- doc = frm.doc;
- cur_frm.cscript.fiscal_year(doc, cdt, cdn)
- }
-})
-
-
-// On load
-// -------------------------------------------------------------------
-cur_frm.cscript.onload = function(doc,dt,dn){
- if((cint(doc.__islocal) == 1) && !doc.amended_from){
- if(!doc.month) {
- var today=new Date();
- month = (today.getMonth()+01).toString();
- if(month.length>1) doc.month = month;
- else doc.month = '0'+month;
- }
- if(!doc.fiscal_year) doc.fiscal_year = sys_defaults['fiscal_year'];
- refresh_many(['month', 'fiscal_year']);
- }
-}
-
// Get leave details
//---------------------------------------------------------------------
-cur_frm.cscript.fiscal_year = function(doc,dt,dn){
- return $c_obj(doc, 'get_emp_and_leave_details','',function(r, rt) {
- var doc = locals[dt][dn];
+cur_frm.cscript.start_date = function(doc, dt, dn){
+ return frappe.call({
+ method: 'get_emp_and_leave_details',
+ doc: locals[dt][dn],
+ callback: function(r, rt) {
cur_frm.refresh();
calculate_all(doc, dt, dn);
- });
+ }
+ });
}
-cur_frm.cscript.month = cur_frm.cscript.salary_slip_based_on_timesheet = cur_frm.cscript.fiscal_year;
-cur_frm.cscript.start_date = cur_frm.cscript.end_date = cur_frm.cscript.fiscal_year;
+cur_frm.cscript.payroll_frequency = cur_frm.cscript.salary_slip_based_on_timesheet = cur_frm.cscript.start_date;
+cur_frm.cscript.end_date = cur_frm.cscript.start_date;
cur_frm.cscript.employee = function(doc,dt,dn){
doc.salary_structure = ''
- cur_frm.cscript.fiscal_year(doc, dt, dn)
+ cur_frm.cscript.start_date(doc, dt, dn)
}
cur_frm.cscript.leave_without_pay = function(doc,dt,dn){
- if (doc.employee && doc.fiscal_year && doc.month) {
+ if (doc.employee && doc.start_date && doc.end_date) {
return $c_obj(doc, 'get_leave_details', {"lwp": doc.leave_without_pay}, function(r, rt) {
var doc = locals[dt][dn];
cur_frm.refresh();
@@ -135,7 +120,7 @@
for(var i = 0; i < tbl.length; i++){
if(cint(tbl[i].depends_on_lwp) == 1) {
tbl[i].amount = Math.round(tbl[i].default_amount)*(flt(doc.payment_days) /
- cint(doc.total_days_in_month)*100)/100;
+ cint(doc.total_working_days)*100)/100;
refresh_field('amount', tbl[i].name, 'earnings');
} else if(reset_amount) {
tbl[i].amount = tbl[i].default_amount;
@@ -155,7 +140,7 @@
var total_ded = 0;
for(var i = 0; i < tbl.length; i++){
if(cint(tbl[i].depends_on_lwp) == 1) {
- tbl[i].amount = Math.round(tbl[i].default_amount)*(flt(doc.payment_days)/cint(doc.total_days_in_month)*100)/100;
+ tbl[i].amount = Math.round(tbl[i].default_amount)*(flt(doc.payment_days)/cint(doc.total_working_days)*100)/100;
refresh_field('amount', tbl[i].name, 'deductions');
} else if(reset_amount) {
tbl[i].amount = tbl[i].default_amount;
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json
index f660b78..e558d73 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.json
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -43,6 +44,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "default": "Today",
"fieldname": "posting_date",
"fieldtype": "Date",
"hidden": 0,
@@ -50,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Posting Date",
"length": 0,
"no_copy": 0,
@@ -77,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Employee",
"length": 0,
"no_copy": 0,
@@ -106,6 +110,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Employee Name",
"length": 0,
"no_copy": 0,
@@ -135,7 +140,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
- "in_standard_filter": 0,
+ "in_standard_filter": 1,
"label": "Department",
"length": 0,
"no_copy": 0,
@@ -196,7 +201,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
- "in_standard_filter": 0,
+ "in_standard_filter": 1,
"label": "Branch",
"length": 0,
"no_copy": 0,
@@ -226,6 +231,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -253,6 +259,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 0,
@@ -281,6 +288,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Journal Entry",
"length": 0,
"no_copy": 0,
@@ -308,6 +316,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -335,6 +344,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -362,6 +372,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -389,6 +400,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Salary Slip Based on Timesheet",
"length": 0,
"no_copy": 0,
@@ -410,67 +422,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "depends_on": "",
- "fieldname": "fiscal_year",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Fiscal Year",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "fiscal_year",
- "oldfieldtype": "Data",
- "options": "Fiscal Year",
- "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,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "month",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Month",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "month",
- "oldfieldtype": "Select",
- "options": "\n01\n02\n03\n04\n05\n06\n07\n08\n09\n10\n11\n12",
- "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": 1,
- "set_only_once": 0,
- "unique": 0,
- "width": "37%"
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
+ "default": "",
"fieldname": "start_date",
"fieldtype": "Date",
"hidden": 0,
@@ -478,6 +430,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Start Date",
"length": 0,
"no_copy": 0,
@@ -498,7 +451,7 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "default": "Today",
+ "default": "",
"depends_on": "",
"fieldname": "end_date",
"fieldtype": "Date",
@@ -507,6 +460,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "End Date",
"length": 0,
"no_copy": 0,
@@ -534,6 +488,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -561,6 +516,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Salary Structure",
"length": 0,
"no_copy": 0,
@@ -582,14 +538,46 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "default": "",
+ "depends_on": "eval:(!doc.salary_slip_based_on_timesheet)",
+ "fieldname": "payroll_frequency",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Payroll Frequency",
+ "length": 0,
+ "no_copy": 0,
+ "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"depends_on": "",
- "fieldname": "total_days_in_month",
+ "fieldname": "total_working_days",
"fieldtype": "Float",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Working Days",
"length": 0,
"no_copy": 0,
@@ -619,6 +607,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Leave Without Pay",
"length": 0,
"no_copy": 0,
@@ -648,6 +637,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Payment Days",
"length": 0,
"no_copy": 0,
@@ -677,6 +667,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -705,6 +696,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Salary Slip Timesheet",
"length": 0,
"no_copy": 0,
@@ -733,6 +725,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -759,6 +752,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Working Hours",
"length": 0,
"no_copy": 0,
@@ -786,6 +780,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Hour Rate",
"length": 0,
"no_copy": 0,
@@ -814,6 +809,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -841,6 +837,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Bank Name",
"length": 0,
"no_copy": 0,
@@ -869,6 +866,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Bank Account No.",
"length": 0,
"no_copy": 0,
@@ -897,6 +895,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -923,6 +922,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -952,6 +952,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Earning & Deduction",
"length": 0,
"no_copy": 0,
@@ -979,6 +980,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Earning",
"length": 0,
"no_copy": 0,
@@ -1008,6 +1010,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Earnings",
"length": 0,
"no_copy": 0,
@@ -1037,6 +1040,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Deduction",
"length": 0,
"no_copy": 0,
@@ -1065,6 +1069,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Deductions",
"length": 0,
"no_copy": 0,
@@ -1094,6 +1099,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -1121,6 +1127,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Arrear Amount",
"length": 0,
"no_copy": 0,
@@ -1150,6 +1157,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Leave Encashment Amount",
"length": 0,
"no_copy": 0,
@@ -1179,6 +1187,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Gross Pay",
"length": 0,
"no_copy": 0,
@@ -1208,6 +1217,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1233,6 +1243,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Deduction",
"length": 0,
"no_copy": 0,
@@ -1263,6 +1274,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Pay",
"length": 0,
"no_copy": 0,
@@ -1292,6 +1304,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rounded Total",
"length": 0,
"no_copy": 0,
@@ -1320,6 +1333,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total in words",
"length": 0,
"no_copy": 0,
@@ -1339,7 +1353,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 9,
"image_view": 0,
"in_create": 0,
@@ -1348,7 +1362,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-06 09:54:36.478329",
+ "modified": "2016-12-14 08:26:31.400930",
"modified_by": "Administrator",
"module": "HR",
"name": "Salary Slip",
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 06028e2..eeec6e8 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -4,13 +4,12 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import add_days, cint, cstr, flt, getdate, nowdate, rounded, date_diff, money_in_words
+from frappe.utils import add_days, cint, cstr, flt, getdate, rounded, date_diff, money_in_words
from frappe.model.naming import make_autoname
from frappe import msgprint, _
-from erpnext.accounts.utils import get_fiscal_year
from erpnext.setup.utils import get_company_currency
-from erpnext.hr.doctype.process_payroll.process_payroll import get_month_details
+from erpnext.hr.doctype.process_payroll.process_payroll import get_start_end_dates
from erpnext.hr.doctype.employee.employee import get_holiday_list_for_employee
from erpnext.utilities.transaction_base import TransactionBase
@@ -22,8 +21,7 @@
self.status = self.get_status()
self.validate_dates()
self.check_existing()
- self.set_month_dates()
-
+ self.get_date_details()
if not (len(self.get("earnings")) or len(self.get("deductions"))):
# get details from salary structure
self.get_emp_and_leave_details()
@@ -35,7 +33,7 @@
company_currency = get_company_currency(self.company)
self.total_in_words = money_in_words(self.rounded_total, company_currency)
-
+
if frappe.db.get_single_value("HR Settings", "max_working_hours_against_timesheet"):
max_working_hours = frappe.db.get_single_value("HR Settings", "max_working_hours_against_timesheet")
if self.salary_slip_based_on_timesheet and (self.total_working_hours > int(max_working_hours)):
@@ -45,7 +43,7 @@
def validate_dates(self):
if date_diff(self.end_date, self.start_date) < 0:
frappe.throw(_("To date cannot be before From date"))
-
+
def calculate_component_amounts(self):
if not getattr(self, '_salary_structure_doc', None):
self._salary_structure_doc = frappe.get_doc('Salary Structure', self.salary_structure)
@@ -53,17 +51,17 @@
data = self.get_data_for_eval()
for key in ('earnings', 'deductions'):
for struct_row in self._salary_structure_doc.get(key):
- amount = self.eval_condition_and_formula(struct_row, data)
+ amount = self.eval_condition_and_formula(struct_row, data)
if amount:
self.update_component_row(struct_row, amount, key)
-
-
+
+
def update_component_row(self, struct_row, amount, key):
component_row = None
for d in self.get(key):
if d.salary_component == struct_row.salary_component:
component_row = d
-
+
if not component_row:
self.append(key, {
'amount': amount,
@@ -73,12 +71,12 @@
})
else:
component_row.amount = amount
-
+
def eval_condition_and_formula(self, d, data):
try:
if d.condition:
if not eval(d.condition, None, data):
- return None
+ return None
amount = d.amount
if d.amount_based_on_formula:
if d.formula:
@@ -86,23 +84,23 @@
if amount:
data[d.abbr] = amount
return amount
-
+
except NameError as err:
frappe.throw(_("Name error: {0}".format(err)))
except SyntaxError as err:
frappe.throw(_("Syntax error in formula or condition: {0}".format(err)))
except:
frappe.throw(_("Error in formula or condition"))
- raise
-
+ raise
+
def get_data_for_eval(self):
'''Returns data for evaluating formula'''
data = frappe._dict()
-
+
for d in self._salary_structure_doc.employees:
if d.employee == self.employee:
data.base, data.variable = d.base, d.variable
-
+
data.update(frappe.get_doc("Employee", self.employee).as_dict())
data.update(self.as_dict())
@@ -110,9 +108,9 @@
salary_components = frappe.get_all("Salary Component", fields=["salary_component_abbr"])
for salary_component in salary_components:
data[salary_component.salary_component_abbr] = 0
-
+
return data
-
+
def get_emp_and_leave_details(self):
'''First time, load all the components from salary structure'''
@@ -120,7 +118,7 @@
self.set("earnings", [])
self.set("deductions", [])
- self.set_month_dates()
+ self.get_date_details()
self.validate_dates()
joining_date, relieving_date = frappe.db.get_value("Employee", self.employee,
["date_of_joining", "relieving_date"])
@@ -146,21 +144,25 @@
'working_hours': data.total_hours
})
- def set_month_dates(self):
- if self.month and not self.salary_slip_based_on_timesheet:
- m = get_month_details(self.fiscal_year, self.month)
- self.start_date = m['month_start_date']
- self.end_date = m['month_end_date']
+ def get_date_details(self):
+ if not self.end_date:
+ date_details = get_start_end_dates(self.payroll_frequency, self.start_date or self.posting_date)
+ self.start_date = date_details.start_date
+ self.end_date = date_details.end_date
def check_sal_struct(self, joining_date, relieving_date):
+ cond = ''
+ if self.payroll_frequency:
+ cond = """and payroll_frequency = '%(payroll_frequency)s'""" % {"payroll_frequency": self.payroll_frequency}
+
st_name = frappe.db.sql("""select parent from `tabSalary Structure Employee`
where employee=%s
and parent in (select name from `tabSalary Structure`
where is_active = 'Yes'
and (from_date <= %s or from_date <= %s)
- and (to_date is null or to_date >= %s or to_date >= %s))
- """,(self.employee, self.start_date, joining_date, self.end_date, relieving_date))
-
+ and (to_date is null or to_date >= %s or to_date >= %s) %s)
+ """% ('%s', '%s', '%s','%s','%s', cond),(self.employee, self.start_date, joining_date, self.end_date, relieving_date))
+
if st_name:
if len(st_name) > 1:
frappe.msgprint(_("Multiple active Salary Structures found for employee {0} for the given dates")
@@ -169,7 +171,7 @@
else:
self.salary_structure = None
frappe.msgprint(_("No active or default Salary Structure found for employee {0} for the given dates")
- .format(self.employee), title=_('Salary Structure Missing'))
+ .format(self.employee), title=_('Salary Structure Missing'))
def pull_sal_struct(self):
from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
@@ -180,11 +182,10 @@
self.hour_rate = self._salary_structure_doc.hour_rate
self.total_working_hours = sum([d.working_hours or 0.0 for d in self.timesheets]) or 0.0
self.add_earning_for_hourly_wages(self._salary_structure_doc.salary_component)
-
-
-
+
def process_salary_structure(self):
'''Calculate salary after salary structure details have been updated'''
+ self.get_date_details()
self.pull_emp_details()
self.get_leave_details()
self.calculate_net_pay()
@@ -210,14 +211,6 @@
def get_leave_details(self, joining_date=None, relieving_date=None, lwp=None):
- if not self.fiscal_year:
- # if default fiscal year is not set, get from nowdate
- self.fiscal_year = get_fiscal_year(nowdate())[0]
-
- if not self.month:
- self.month = "%02d" % getdate(nowdate()).month
- self.set_month_dates()
-
if not joining_date:
joining_date, relieving_date = frappe.db.get_value("Employee", self.employee,
["date_of_joining", "relieving_date"])
@@ -234,25 +227,24 @@
lwp = actual_lwp
elif lwp != actual_lwp:
frappe.msgprint(_("Leave Without Pay does not match with approved Leave Application records"))
-
- self.total_days_in_month = working_days
+
+ self.total_working_days = working_days
self.leave_without_pay = lwp
-
+
payment_days = flt(self.get_payment_days(joining_date, relieving_date)) - flt(lwp)
self.payment_days = payment_days > 0 and payment_days or 0
def get_payment_days(self, joining_date, relieving_date):
start_date = getdate(self.start_date)
-
if joining_date:
- if joining_date > getdate(self.start_date):
+ if getdate(self.start_date) <= joining_date <= getdate(self.end_date):
start_date = joining_date
elif joining_date > getdate(self.end_date):
return
end_date = getdate(self.end_date)
if relieving_date:
- if relieving_date > start_date and relieving_date < getdate(self.end_date):
+ if getdate(self.start_date) <= relieving_date <= getdate(self.end_date):
end_date = relieving_date
elif relieving_date < getdate(self.start_date):
frappe.throw(_("Employee relieved on {0} must be set as 'Left'")
@@ -263,7 +255,6 @@
if not cint(frappe.db.get_value("HR Settings", None, "include_holidays_in_total_working_days")):
holidays = self.get_holidays_for_employee(start_date, end_date)
payment_days -= len(holidays)
-
return payment_days
def get_holidays_for_employee(self, start_date, end_date):
@@ -281,7 +272,7 @@
holidays = [cstr(i) for i in holidays]
return holidays
-
+
def calculate_lwp(self, holidays, working_days):
lwp = 0
holidays = "','".join(holidays)
@@ -300,14 +291,14 @@
""".format(holidays), {"employee": self.employee, "dt": dt})
if leave:
lwp = cint(leave[0][1]) and (lwp + 0.5) or (lwp + 1)
- return lwp
+ return lwp
def check_existing(self):
if not self.salary_slip_based_on_timesheet:
ret_exist = frappe.db.sql("""select name from `tabSalary Slip`
- where month = %s and fiscal_year = %s and docstatus != 2
+ where start_date = %s and end_date = %s and docstatus != 2
and employee = %s and name != %s""",
- (self.month, self.fiscal_year, self.employee, self.name))
+ (self.start_date, self.end_date, self.employee, self.name))
if ret_exist:
self.employee = ''
frappe.throw(_("Salary Slip of employee {0} already created for this period").format(self.employee))
@@ -320,7 +311,7 @@
for d in self.get(component_type):
if cint(d.depends_on_lwp) == 1 and not self.salary_slip_based_on_timesheet:
d.amount = rounded((flt(d.default_amount) * flt(self.payment_days)
- / cint(self.total_days_in_month)), self.precision("amount", component_type))
+ / cint(self.total_working_days)), self.precision("amount", component_type))
elif not self.payment_days and not self.salary_slip_based_on_timesheet:
d.amount = 0
elif not d.amount:
@@ -360,7 +351,7 @@
receiver = frappe.db.get_value("Employee", self.employee, "prefered_email")
if receiver:
- subj = 'Salary Slip - from {0} to {1}, fiscal year {2}'.format(self.start_date, self.end_date, self.fiscal_year)
+ subj = 'Salary Slip - from {0} to {1}'.format(self.start_date, self.end_date)
frappe.sendmail([receiver], subject=subj, message = _("Please see attachment"),
attachments=[frappe.attach_print(self.doctype, self.name, file_name=self.name)], reference_doctype= self.doctype, reference_name= self.name)
else:
@@ -374,7 +365,7 @@
timesheet.flags.ignore_validate_update_after_submit = True
timesheet.set_status()
timesheet.save()
-
+
def set_status(self, status=None):
'''Get and update status'''
if not status:
@@ -390,7 +381,7 @@
status = "Paid"
elif self.docstatus == 2:
status = "Cancelled"
- return status
+ return status
def unlink_ref_doc_from_salary_slip(ref_no):
linked_ss = frappe.db.sql_list("""select name from `tabSalary Slip`
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip_list.js b/erpnext/hr/doctype/salary_slip/salary_slip_list.js
index 17f13d6..33d5bd7 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip_list.js
+++ b/erpnext/hr/doctype/salary_slip/salary_slip_list.js
@@ -1,3 +1,3 @@
frappe.listview_settings['Salary Slip'] = {
- add_fields: ["employee", "employee_name", "fiscal_year", "month"],
+ add_fields: ["employee", "employee_name"],
};
diff --git a/erpnext/hr/doctype/salary_slip/test_salary_slip.py b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
index fafc227..54faa64 100644
--- a/erpnext/hr/doctype/salary_slip/test_salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/test_salary_slip.py
@@ -10,12 +10,13 @@
from frappe.utils import getdate, nowdate, add_days
from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
from erpnext.hr.doctype.process_payroll.test_process_payroll import get_salary_component_account
+from erpnext.hr.doctype.process_payroll.process_payroll import get_month_details
class TestSalarySlip(unittest.TestCase):
def setUp(self):
make_earning_salary_component(["Basic Salary", "Allowance", "HRA"])
make_deduction_salary_component(["Professional Tax", "TDS"])
-
+
for dt in ["Leave Application", "Leave Allocation", "Salary Slip"]:
frappe.db.sql("delete from `tab%s`" % dt)
@@ -35,9 +36,9 @@
frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "relieving_date", None)
frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "status", "Active")
ss = frappe.get_doc("Salary Slip",
- self.make_employee_salary_slip("test_employee@salary.com"))
+ self.make_employee_salary_slip("test_employee@salary.com", "Monthly"))
- self.assertEquals(ss.total_days_in_month, no_of_days[0])
+ self.assertEquals(ss.total_working_days, no_of_days[0])
self.assertEquals(ss.payment_days, no_of_days[0])
self.assertEquals(ss.earnings[0].amount, 5000)
self.assertEquals(ss.earnings[1].amount, 3000)
@@ -53,9 +54,9 @@
frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "relieving_date", None)
frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "status", "Active")
ss = frappe.get_doc("Salary Slip",
- self.make_employee_salary_slip("test_employee@salary.com"))
+ self.make_employee_salary_slip("test_employee@salary.com", "Monthly"))
- self.assertEquals(ss.total_days_in_month, no_of_days[0] - no_of_days[1])
+ self.assertEquals(ss.total_working_days, no_of_days[0] - no_of_days[1])
self.assertEquals(ss.payment_days, no_of_days[0] - no_of_days[1])
self.assertEquals(ss.earnings[0].amount, 5000)
self.assertEquals(ss.earnings[0].default_amount, 5000)
@@ -64,7 +65,7 @@
self.assertEquals(ss.deductions[1].amount, 2500)
self.assertEquals(ss.gross_pay, 10500)
self.assertEquals(ss.net_pay, 3000)
-
+
def test_payment_days(self):
no_of_days = self.get_no_of_days()
# Holidays not included in working days
@@ -72,7 +73,7 @@
# set joinng date in the same month
self.make_employee("test_employee@salary.com")
- if getdate(nowdate()).day > 15:
+ if getdate(nowdate()).day >= 15:
date_of_joining = getdate(add_days(nowdate(),-10))
relieving_date = getdate(add_days(nowdate(),-10))
elif getdate(nowdate()).day < 15 and getdate(nowdate()).day > 5:
@@ -85,14 +86,17 @@
date_of_joining = getdate(nowdate())
relieving_date = getdate(nowdate())
- frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "date_of_joining", date_of_joining)
- frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "relieving_date", None)
- frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "status", "Active")
-
- ss = frappe.get_doc("Salary Slip",
- self.make_employee_salary_slip("test_employee@salary.com"))
+ frappe.db.set_value("Employee", frappe.get_value("Employee",
+ {"employee_name":"test_employee@salary.com"}, "name"), "date_of_joining", date_of_joining)
+ frappe.db.set_value("Employee", frappe.get_value("Employee",
+ {"employee_name":"test_employee@salary.com"}, "name"), "relieving_date", None)
+ frappe.db.set_value("Employee", frappe.get_value("Employee",
+ {"employee_name":"test_employee@salary.com"}, "name"), "status", "Active")
- self.assertEquals(ss.total_days_in_month, no_of_days[0])
+ ss = frappe.get_doc("Salary Slip",
+ self.make_employee_salary_slip("test_employee@salary.com", "Monthly"))
+
+ self.assertEquals(ss.total_working_days, no_of_days[0])
self.assertEquals(ss.payment_days, (no_of_days[0] - getdate(date_of_joining).day + 1))
# set relieving date in the same month
@@ -100,8 +104,8 @@
frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "relieving_date", relieving_date)
frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "status", "Left")
ss.save()
-
- self.assertEquals(ss.total_days_in_month, no_of_days[0])
+
+ self.assertEquals(ss.total_working_days, no_of_days[0])
self.assertEquals(ss.payment_days, getdate(relieving_date).day)
frappe.db.set_value("Employee", frappe.get_value("Employee", {"employee_name":"test_employee@salary.com"}, "name"), "relieving_date", None)
@@ -111,7 +115,7 @@
self.make_employee("test_employee@salary.com")
salary_slip_test_employee = frappe.get_doc("Salary Slip",
- self.make_employee_salary_slip("test_employee@salary.com"))
+ self.make_employee_salary_slip("test_employee@salary.com", "Monthly"))
frappe.set_user("test_employee@salary.com")
self.assertTrue(salary_slip_test_employee.has_permission("read"))
@@ -124,11 +128,34 @@
self.make_employee("test_employee@salary.com")
ss = frappe.get_doc("Salary Slip",
- self.make_employee_salary_slip("test_employee@salary.com"))
+ self.make_employee_salary_slip("test_employee@salary.com", "Monthly"))
ss.submit()
email_queue = frappe.db.sql("""select name from `tabEmail Queue`""")
self.assertTrue(email_queue)
+ def test_payroll_frequency(self):
+ fiscal_year = get_fiscal_year(nowdate())[0]
+ month = "%02d" % getdate(nowdate()).month
+ m = get_month_details(fiscal_year, month)
+
+ for payroll_frequncy in ["Monthly", "Bimonthly", "Fortnightly", "Weekly", "Daily"]:
+ self.make_employee(payroll_frequncy + "_test_employee@salary.com")
+ ss = frappe.get_doc("Salary Slip",
+ self.make_employee_salary_slip(payroll_frequncy + "_test_employee@salary.com", payroll_frequncy))
+ if payroll_frequncy == "Monthly":
+ self.assertEqual(ss.end_date, m['month_end_date'])
+ elif payroll_frequncy == "Bimonthly":
+ if getdate(ss.start_date).day <= 15:
+ self.assertEqual(ss.end_date, m['month_mid_end_date'])
+ else:
+ self.assertEqual(ss.end_date, m['month_end_date'])
+ elif payroll_frequncy == "Fortnightly":
+ self.assertEqual(ss.end_date, getdate(add_days(nowdate(),13)))
+ elif payroll_frequncy == "Weekly":
+ self.assertEqual(ss.end_date, getdate(add_days(nowdate(),6)))
+ elif payroll_frequncy == "Daily":
+ self.assertEqual(ss.end_date, getdate(nowdate()))
+
def make_employee(self, user):
if not frappe.db.get_value("User", user):
frappe.get_doc({
@@ -166,20 +193,19 @@
"from_date": fiscal_year[1],
"to_date": fiscal_year[2],
"weekly_off": "Sunday"
- }).insert()
+ }).insert()
holiday_list.get_weekly_off_dates()
holiday_list.save()
- def make_employee_salary_slip(self, user):
+ def make_employee_salary_slip(self, user, payroll_frequency):
employee = frappe.db.get_value("Employee", {"user_id": user})
- salary_structure = make_salary_structure("Salary Structure Test for Salary Slip", employee)
+ salary_structure = make_salary_structure(payroll_frequency + " Salary Structure Test for Salary Slip", payroll_frequency, employee)
salary_slip = frappe.db.get_value("Salary Slip", {"employee": frappe.db.get_value("Employee", {"user_id": user})})
-
+
if not salary_slip:
salary_slip = make_salary_slip(salary_structure, employee = employee)
salary_slip.employee_name = frappe.get_value("Employee", {"name":frappe.db.get_value("Employee", {"user_id": user})}, "employee_name")
- salary_slip.fiscal_year = "_Test Fiscal Year 2016"
- salary_slip.month = getdate(nowdate()).month
+ salary_slip.payroll_frequency = payroll_frequency
salary_slip.posting_date = nowdate()
salary_slip.insert()
# salary_slip.submit()
@@ -196,9 +222,10 @@
def get_no_of_days(self):
no_of_days_in_month = calendar.monthrange(getdate(nowdate()).year,
- getdate(nowdate()).month)
+ getdate(nowdate()).month)
no_of_holidays_in_month = len([1 for i in calendar.monthcalendar(getdate(nowdate()).year,
- getdate(nowdate()).month) if i[6] != 0])
+ getdate(nowdate()).month) if i[6] != 0])
+
return [no_of_days_in_month[1], no_of_holidays_in_month]
@@ -224,7 +251,7 @@
sal_comp.insert()
get_salary_component_account(salary_component)
-def make_salary_structure(sal_struct, employee):
+def make_salary_structure(sal_struct, payroll_frequency, employee):
if not frappe.db.exists('Salary Structure', sal_struct):
frappe.get_doc({
"doctype": "Salary Structure",
@@ -234,6 +261,7 @@
"employees": get_employee_details(employee),
"earnings": get_earnings_component(),
"deductions": get_deductions_component(),
+ "payroll_frequency": payroll_frequency,
"payment_account": frappe.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
}).insert()
@@ -255,7 +283,7 @@
}
]
-def get_earnings_component():
+def get_earnings_component():
return [
{
"salary_component": 'Basic Salary',
@@ -285,8 +313,8 @@
"idx": 4
},
]
-
-def get_deductions_component():
+
+def get_deductions_component():
return [
{
"salary_component": 'Professional Tax',
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.js b/erpnext/hr/doctype/salary_structure/salary_structure.js
index c5df2e6..0bc67a7 100755
--- a/erpnext/hr/doctype/salary_structure/salary_structure.js
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.js
@@ -15,6 +15,8 @@
frappe.ui.form.on('Salary Structure', {
onload: function(frm) {
+ frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet),
+
frm.set_query("salary_component", "earnings", function() {
return {
filters: {
@@ -45,7 +47,7 @@
frm.fields_dict['deductions'].grid.set_column_disp("default_amount", false);
frm.add_custom_button(__("Preview Salary Slip"),
- function() { frm.trigger('preview_salary_slip'); }, "icon-sitemap", "btn-default");
+ function() { frm.trigger('preview_salary_slip'); }, "fa fa-sitemap", "btn-default");
frm.add_custom_button(__("Add Employees"),function () {
frm.trigger('add_employees')
@@ -142,6 +144,7 @@
toggle_fields: function(frm) {
frm.toggle_display(['salary_component', 'hour_rate'], frm.doc.salary_slip_based_on_timesheet);
frm.toggle_reqd(['salary_component', 'hour_rate'], frm.doc.salary_slip_based_on_timesheet);
+ frm.toggle_reqd(['payroll_frequency'], !frm.doc.salary_slip_based_on_timesheet);
}
});
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.json b/erpnext/hr/doctype/salary_structure/salary_structure.json
index 5529d42..8db8e93 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.json
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -49,6 +50,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -76,6 +78,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -97,6 +100,37 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "default": "Monthly",
+ "depends_on": "eval:(!doc.salary_slip_based_on_timesheet)",
+ "fieldname": "payroll_frequency",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Payroll Frequency",
+ "length": 0,
+ "no_copy": 0,
+ "options": "\nMonthly\nFortnightly\nBimonthly\nWeekly\nDaily",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "column_break1",
"fieldtype": "Column Break",
"hidden": 0,
@@ -104,6 +138,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -131,6 +166,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Is Active",
"length": 0,
"no_copy": 0,
@@ -161,6 +197,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Default",
"length": 0,
"no_copy": 1,
@@ -189,6 +226,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "From Date",
"length": 0,
"no_copy": 0,
@@ -217,6 +255,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "To Date",
"length": 0,
"no_copy": 0,
@@ -245,6 +284,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -272,6 +312,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Employees",
"length": 0,
"no_copy": 0,
@@ -300,6 +341,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -328,6 +370,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Salary Slip Based on Timesheet",
"length": 0,
"no_copy": 0,
@@ -355,6 +398,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -383,6 +427,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Salary Component",
"length": 0,
"no_copy": 0,
@@ -412,6 +457,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Hour Rate",
"length": 0,
"no_copy": 0,
@@ -441,6 +487,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -470,6 +517,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Earning",
"length": 0,
"no_copy": 0,
@@ -500,6 +548,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Earnings",
"length": 0,
"no_copy": 0,
@@ -529,6 +578,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Deduction",
"length": 0,
"no_copy": 0,
@@ -558,6 +608,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Deductions",
"length": 0,
"no_copy": 0,
@@ -588,6 +639,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"options": "Simple",
@@ -614,6 +666,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -640,6 +693,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Earning",
"length": 0,
"no_copy": 0,
@@ -669,6 +723,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Deduction",
"length": 0,
"no_copy": 0,
@@ -698,6 +753,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Pay",
"length": 0,
"no_copy": 0,
@@ -725,6 +781,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Account",
"length": 0,
"no_copy": 0,
@@ -752,6 +809,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mode of Payment",
"length": 0,
"no_copy": 0,
@@ -780,6 +838,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -806,6 +865,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Payment Account",
"length": 0,
"no_copy": 0,
@@ -825,7 +885,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -834,7 +894,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 16:03:23.123216",
+ "modified": "2016-12-14 02:02:10.848614",
"modified_by": "Administrator",
"module": "HR",
"name": "Salary Structure",
diff --git a/erpnext/hr/doctype/salary_structure/test_salary_structure.py b/erpnext/hr/doctype/salary_structure/test_salary_structure.py
index 8eb9daa..fe88d9a 100644
--- a/erpnext/hr/doctype/salary_structure/test_salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/test_salary_structure.py
@@ -8,8 +8,8 @@
from frappe.utils.make_random import get_random
from frappe.utils import nowdate, add_days, add_years, getdate
from erpnext.hr.doctype.salary_structure.salary_structure import make_salary_slip
-from erpnext.hr.doctype.salary_slip.test_salary_slip import make_earning_salary_component, make_deduction_salary_component
-# test_records = frappe.get_test_records('Salary Structure')
+from erpnext.hr.doctype.salary_slip.test_salary_slip \
+ import make_earning_salary_component, make_deduction_salary_component
test_dependencies = ["Fiscal Year"]
@@ -19,8 +19,8 @@
frappe.db.set_value("Company", erpnext.get_default_company(), "default_holiday_list", "Salary Structure Test Holiday List")
make_earning_salary_component(["Basic Salary", "Allowance", "HRA"])
make_deduction_salary_component(["Professional Tax", "TDS"])
- employee1 = self.make_employee("test_employee@salary.com")
- employee2 = self.make_employee("test_employee_2@salary.com")
+ self.make_employee("test_employee@salary.com")
+ self.make_employee("test_employee_2@salary.com")
def make_holiday_list(self):
if not frappe.db.get_value("Holiday List", "Salary Structure Test Holiday List"):
@@ -81,9 +81,9 @@
sal_struct = make_salary_structure('Salary Structure Sample')
sal_slip = make_salary_slip(sal_struct, employee = employee)
sal_slip.employee_name = frappe.get_value("Employee", {"name":employee}, "employee_name")
- sal_slip.fiscal_year = "_Test Fiscal Year 2016"
- sal_slip.month = getdate(nowdate()).month
+ sal_slip.start_date = nowdate()
sal_slip.posting_date = nowdate()
+ sal_slip.payroll_frequency = "Monthly"
sal_slip.insert()
sal_slip.submit()
return sal_slip
@@ -98,6 +98,7 @@
"employees": get_employee_details(),
"earnings": get_earnings_component(),
"deductions": get_deductions_component(),
+ "payroll_frequency": "Monthly",
"payment_account": frappe.get_value('Account', {'account_type': 'Cash', 'company': erpnext.get_default_company(),'is_group':0}, "name")
}).insert()
return sal_struct
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/hr/doctype/training_event/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/hr/doctype/training_event/__init__.py
diff --git a/erpnext/hr/doctype/training_event/test_training_event.py b/erpnext/hr/doctype/training_event/test_training_event.py
new file mode 100644
index 0000000..03416ee
--- /dev/null
+++ b/erpnext/hr/doctype/training_event/test_training_event.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Training Event')
+
+class TestTrainingEvent(unittest.TestCase):
+ pass
diff --git a/erpnext/hr/doctype/training_event/training_event.js b/erpnext/hr/doctype/training_event/training_event.js
new file mode 100644
index 0000000..ebe0c79
--- /dev/null
+++ b/erpnext/hr/doctype/training_event/training_event.js
@@ -0,0 +1,21 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Training Event', {
+ refresh: function(frm) {
+ if(!frm.doc.__islocal) {
+ frm.add_custom_button(__("Training Result"), function() {
+ frappe.route_options = {
+ training_event: frm.doc.name
+ }
+ frappe.set_route("List", "Training Result");
+ });
+ frm.add_custom_button(__("Training Feedback"), function() {
+ frappe.route_options = {
+ training_event: frm.doc.name
+ }
+ frappe.set_route("List", "Training Feedback");
+ });
+ }
+ }
+});
diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.json b/erpnext/hr/doctype/training_event/training_event.json
similarity index 68%
copy from erpnext/buying/doctype/quality_inspection/quality_inspection.json
copy to erpnext/hr/doctype/training_event/training_event.json
index 06246cc..610ec05 100644
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.json
+++ b/erpnext/hr/doctype/training_event/training_event.json
@@ -1,391 +1,30 @@
{
"allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "naming_series:",
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:event_name",
"beta": 0,
- "creation": "2013-04-30 13:13:03",
+ "creation": "2016-08-08 04:53:58.355206",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
+ "document_type": "",
"editable_grid": 1,
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Series",
- "length": 0,
- "no_copy": 1,
- "options": "QI-",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "default": "Today",
- "fieldname": "report_date",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Report Date",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "report_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 1,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "column_break_4",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "inspection_type",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Inspection Type",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "inspection_type",
- "oldfieldtype": "Select",
- "options": "\nIncoming\nOutgoing\nIn Process",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "purchase_receipt_no",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Purchase Receipt No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "purchase_receipt_no",
- "oldfieldtype": "Link",
- "options": "Purchase Receipt",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 1,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "delivery_note_no",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Delivery Note No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "delivery_note_no",
- "oldfieldtype": "Link",
- "options": "Delivery Note",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 1,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "section_break_7",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "item_code",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Item Code",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_code",
- "oldfieldtype": "Link",
- "options": "Item",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 1,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "item_serial_no",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Item Serial No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_serial_no",
- "oldfieldtype": "Link",
- "options": "Serial No",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "batch_no",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Batch No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "batch_no",
- "oldfieldtype": "Link",
- "options": "Batch",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "sample_size",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Sample Size",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "sample_size",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
- "width": "50%"
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "item_name",
+ "columns": 0,
+ "fieldname": "event_name",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Item Name",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "description",
- "fieldtype": "Small Text",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Description",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "description",
- "oldfieldtype": "Small Text",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
- "width": "300px"
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "section_break_14",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Event Name",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -393,34 +32,36 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
- "reqd": 0,
+ "reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
- "allow_on_submit": 0,
+ "allow_on_submit": 1,
"bold": 0,
"collapsible": 0,
- "default": "user",
- "fieldname": "inspected_by",
- "fieldtype": "Link",
+ "columns": 0,
+ "fieldname": "event_status",
+ "fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Inspected By",
+ "in_standard_filter": 1,
+ "label": "Event Status",
"length": 0,
"no_copy": 0,
- "oldfieldname": "inspected_by",
- "oldfieldtype": "Data",
- "options": "User",
+ "options": "Scheduled\nCompleted\nCancelled",
"permlevel": 0,
+ "precision": "",
"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,
@@ -431,39 +72,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "verified_by",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Verified By",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "verified_by",
- "oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "column_break_17",
+ "columns": 0,
+ "fieldname": "column_break_2",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -471,6 +88,7 @@
"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,
@@ -481,24 +99,27 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "remarks",
- "fieldtype": "Text",
+ "columns": 0,
+ "fieldname": "type",
+ "fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Remarks",
+ "in_standard_filter": 1,
+ "label": "Type",
"length": 0,
- "no_copy": 1,
- "oldfieldname": "remarks",
- "oldfieldtype": "Text",
+ "no_copy": 0,
+ "options": "Seminar\nTheory\nWorkshop\nConference\nExam\nInternet",
"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,
+ "reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@@ -507,49 +128,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Amended From",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "amended_from",
- "oldfieldtype": "Data",
- "options": "Quality Inspection",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "specification_details",
+ "columns": 0,
+ "fieldname": "section_break_4",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "",
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "Simple",
"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,
@@ -560,21 +155,24 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "get_specification_details",
- "fieldtype": "Button",
+ "columns": 0,
+ "fieldname": "trainer_name",
+ "fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Get Specification Details",
+ "in_standard_filter": 0,
+ "label": "Trainer Name",
"length": 0,
"no_copy": 0,
- "options": "get_item_specification_details",
"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,
@@ -585,23 +183,445 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "readings",
+ "columns": 0,
+ "fieldname": "trainer_email",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Trainer Email",
+ "length": 0,
+ "no_copy": 0,
+ "options": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_7",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "supplier",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Supplier",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Supplier",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "contact_number",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Contact Number",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_9",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "course",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 1,
+ "label": "Course",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Course",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "location",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 1,
+ "label": "Location",
+ "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": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_12",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "start_time",
+ "fieldtype": "Datetime",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Start Time",
+ "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": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "end_time",
+ "fieldtype": "Datetime",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "End Time",
+ "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": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_15",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "introduction",
+ "fieldtype": "Text Editor",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Introduction",
+ "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": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_18",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Attendees",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "Will send an email about the event to employees with status 'Open'",
+ "fieldname": "send_email",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Send Email",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "employees",
"fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Readings",
+ "in_standard_filter": 0,
+ "label": "Employees",
"length": 0,
"no_copy": 0,
- "oldfieldname": "qa_specification_details",
- "oldfieldtype": "Table",
- "options": "Quality Inspection Reading",
+ "options": "Training Event Employee",
"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,
+ "unique": 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_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Amended From",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Training Event",
+ "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,
@@ -611,8 +631,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-search",
- "idx": 1,
+ "idx": 0,
"image_view": 0,
"in_create": 0,
"in_dialog": 0,
@@ -620,10 +639,11 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-07-31 11:42:40.498926",
+ "modified": "2016-12-15 14:49:36.135608",
"modified_by": "Administrator",
- "module": "Buying",
- "name": "Quality Inspection",
+ "module": "HR",
+ "name": "Training Event",
+ "name_case": "",
"owner": "Administrator",
"permissions": [
{
@@ -633,24 +653,27 @@
"create": 1,
"delete": 1,
"email": 1,
- "export": 0,
+ "export": 1,
"if_owner": 0,
- "import": 0,
+ "import": 1,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
- "role": "Quality Manager",
+ "role": "HR Manager",
"set_user_permissions": 0,
"share": 1,
"submit": 1,
"write": 1
}
],
- "quick_entry": 0,
+ "quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
- "search_fields": "item_code, report_date, purchase_receipt_no, delivery_note_no",
- "sort_order": "ASC",
+ "search_fields": "event_name",
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "event_name",
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/training_event/training_event.py b/erpnext/hr/doctype/training_event/training_event.py
new file mode 100644
index 0000000..c9be3dd
--- /dev/null
+++ b/erpnext/hr/doctype/training_event/training_event.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+class TrainingEvent(Document):
+ def validate(self):
+ if self.event_status == "Scheduled":
+ self.invite_employee()
+
+ def on_update_after_submit(self):
+ if self.event_status == "Scheduled" and self.send_email:
+ self.invite_employee()
+
+ def invite_employee(self):
+ subject = _("""You are invited for to attend {0} - {1} scheduled from {2} to {3} at {4}."""\
+ .format(self.type, self.event_name, self.start_time, self.end_time, self.location))
+
+ for emp in self.employees:
+ if emp.status== "Open":
+ frappe.sendmail(frappe.db.get_value("Employee", emp.employee, "company_email"), \
+ subject=subject, content= self.introduction)
+ emp.status= "Invited"
\ No newline at end of file
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/hr/doctype/training_event_employee/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/hr/doctype/training_event_employee/__init__.py
diff --git a/erpnext/hr/doctype/training_event_employee/training_event_employee.json b/erpnext/hr/doctype/training_event_employee/training_event_employee.json
new file mode 100644
index 0000000..575d0e7
--- /dev/null
+++ b/erpnext/hr/doctype/training_event_employee/training_event_employee.json
@@ -0,0 +1,152 @@
+{
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2016-08-08 05:33:39.965305",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "employee",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Employee",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Employee",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "employee_name",
+ "fieldtype": "Read Only",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Employee Name",
+ "length": 0,
+ "no_copy": 0,
+ "options": "employee.employee_name",
+ "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,
+ "unique": 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_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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "Open",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Status",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Open\nInvited\nConfirmed\nAttended\nWithdrawn",
+ "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,
+ "unique": 0
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2016-12-14 11:43:40.996578",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Training Event Employee",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/training_event_employee/training_event_employee.py b/erpnext/hr/doctype/training_event_employee/training_event_employee.py
new file mode 100644
index 0000000..234e958
--- /dev/null
+++ b/erpnext/hr/doctype/training_event_employee/training_event_employee.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class TrainingEventEmployee(Document):
+ pass
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/hr/doctype/training_feedback/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/hr/doctype/training_feedback/__init__.py
diff --git a/erpnext/hr/doctype/training_feedback/test_training_feedback.py b/erpnext/hr/doctype/training_feedback/test_training_feedback.py
new file mode 100644
index 0000000..3455998
--- /dev/null
+++ b/erpnext/hr/doctype/training_feedback/test_training_feedback.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Training Feedback')
+
+class TestTrainingFeedback(unittest.TestCase):
+ pass
diff --git a/erpnext/hr/doctype/training_feedback/training_feedback.js b/erpnext/hr/doctype/training_feedback/training_feedback.js
new file mode 100644
index 0000000..0dea098
--- /dev/null
+++ b/erpnext/hr/doctype/training_feedback/training_feedback.js
@@ -0,0 +1,10 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Training Feedback', {
+ onload: function(frm) {
+ frm.add_fetch("training_event", "course", "course");
+ frm.add_fetch("training_event", "event_name", "event_name");
+ frm.add_fetch("training_event", "trainer_name", "trainer_name");
+ }
+});
\ No newline at end of file
diff --git a/erpnext/hr/doctype/training_feedback/training_feedback.json b/erpnext/hr/doctype/training_feedback/training_feedback.json
new file mode 100644
index 0000000..e45c694
--- /dev/null
+++ b/erpnext/hr/doctype/training_feedback/training_feedback.json
@@ -0,0 +1,364 @@
+{
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "Feedback.####",
+ "beta": 0,
+ "creation": "2016-08-08 06:35:34.158568",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "employee",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 1,
+ "label": "Employee",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Employee",
+ "permlevel": 0,
+ "precision": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "employee_name",
+ "fieldtype": "Read Only",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Employee Name",
+ "length": 0,
+ "no_copy": 0,
+ "options": "employee.employee_name",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "course",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Course",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Course",
+ "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_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_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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "training_event",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 1,
+ "label": "Training Event",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Training Event",
+ "permlevel": 0,
+ "precision": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "event_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Event Name",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "trainer_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Trainer Name",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_6",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "feedback",
+ "fieldtype": "Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Feedback",
+ "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": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 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_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Amended From",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Training Feedback",
+ "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,
+ "unique": 0
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 1,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2016-12-15 14:49:55.261774",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Training Feedback",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 1,
+ "apply_user_permissions": 0,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 0,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Employee",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "employee_name",
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/training_feedback/training_feedback.py b/erpnext/hr/doctype/training_feedback/training_feedback.py
new file mode 100644
index 0000000..2a0403b
--- /dev/null
+++ b/erpnext/hr/doctype/training_feedback/training_feedback.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class TrainingFeedback(Document):
+ pass
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/hr/doctype/training_result/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/hr/doctype/training_result/__init__.py
diff --git a/erpnext/hr/doctype/training_result/test_training_result.py b/erpnext/hr/doctype/training_result/test_training_result.py
new file mode 100644
index 0000000..29ed2a0
--- /dev/null
+++ b/erpnext/hr/doctype/training_result/test_training_result.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Training Result')
+
+class TestTrainingResult(unittest.TestCase):
+ pass
diff --git a/erpnext/hr/doctype/training_result/training_result.js b/erpnext/hr/doctype/training_result/training_result.js
new file mode 100644
index 0000000..3a3d70a
--- /dev/null
+++ b/erpnext/hr/doctype/training_result/training_result.js
@@ -0,0 +1,32 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Training Result', {
+ onload: function(frm) {
+ if (frm.doc.training_event) {
+ frm.trigger("training_event");
+ }
+ },
+
+ training_event: function(frm) {
+ if (frm.doc.training_event) {
+ frappe.call({
+ method: "erpnext.hr.doctype.training_result.training_result.get_employees",
+ args: {
+ "training_event": frm.doc.training_event
+ },
+ callback: function(r) {
+ frm.set_value("employees" ,"");
+ if (r.message) {
+ $.each(r.message, function(i, d) {
+ var row = frappe.model.add_child(cur_frm.doc, "Training Result Employee", "employees");
+ row.employee = d.employee;
+ row.employee_name = d.employee_name;
+ });
+ }
+ refresh_field("employees");
+ }
+ });
+ }
+ }
+});
diff --git a/erpnext/hr/doctype/training_result/training_result.json b/erpnext/hr/doctype/training_result/training_result.json
new file mode 100644
index 0000000..52b9a16
--- /dev/null
+++ b/erpnext/hr/doctype/training_result/training_result.json
@@ -0,0 +1,171 @@
+{
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 1,
+ "autoname": "TRES.#####",
+ "beta": 0,
+ "creation": "2016-11-04 02:13:48.407576",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "training_event",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Training Event",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Training Event",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 1
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_3",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "employees",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Employees",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Training Result Employee",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 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_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Amended From",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Training Result",
+ "permlevel": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 1,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2016-11-04 08:53:48.597031",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Training Result",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 1,
+ "apply_user_permissions": 0,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "training_event",
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/training_result/training_result.py b/erpnext/hr/doctype/training_result/training_result.py
new file mode 100644
index 0000000..16b76a7
--- /dev/null
+++ b/erpnext/hr/doctype/training_result/training_result.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe import _
+from frappe.model.document import Document
+
+class TrainingResult(Document):
+ def on_submit(self):
+ self.send_result()
+
+ def send_result(self):
+ for emp in self.employees:
+ message = "Thank You for attending {0}. You grade is {1}".format(self.training_event, emp.grade)
+ frappe.sendmail(frappe.db.get_value("Employee", emp.employee, "company_email"), \
+ subject=_("{0} Results".format(self.training_event)), \
+ content=message)
+
+@frappe.whitelist()
+def get_employees(training_event):
+ return frappe.get_doc("Training Event", training_event).employees
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/hr/doctype/training_result_employee/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/hr/doctype/training_result_employee/__init__.py
diff --git a/erpnext/hr/doctype/training_result_employee/training_result_employee.json b/erpnext/hr/doctype/training_result_employee/training_result_employee.json
new file mode 100644
index 0000000..477a8e6
--- /dev/null
+++ b/erpnext/hr/doctype/training_result_employee/training_result_employee.json
@@ -0,0 +1,254 @@
+{
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2016-11-04 02:39:12.825569",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "employee",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Employee",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Employee",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "employee_name",
+ "fieldtype": "Read Only",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Employee Name",
+ "length": 0,
+ "no_copy": 0,
+ "options": "employee.employee_name",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "section_break_5",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "hours",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Hours",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "grade",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Grade",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_7",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 1,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "comments",
+ "fieldtype": "Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Comments",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2016-11-04 03:31:08.624394",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Training Result Employee",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/training_result_employee/training_result_employee.py b/erpnext/hr/doctype/training_result_employee/training_result_employee.py
new file mode 100644
index 0000000..54e2a18
--- /dev/null
+++ b/erpnext/hr/doctype/training_result_employee/training_result_employee.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class TrainingResultEmployee(Document):
+ pass
diff --git a/erpnext/hr/doctype/upload_attendance/upload_attendance.json b/erpnext/hr/doctype/upload_attendance/upload_attendance.json
index 4d7ef8e..5a3f72a 100644
--- a/erpnext/hr/doctype/upload_attendance/upload_attendance.json
+++ b/erpnext/hr/doctype/upload_attendance/upload_attendance.json
@@ -161,7 +161,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-upload-alt",
+ "icon": "fa fa-upload-alt",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/hr/print_format/salary_slip_standard/salary_slip_standard.json b/erpnext/hr/print_format/salary_slip_standard/salary_slip_standard.json
index 1789c75..0c38d45 100644
--- a/erpnext/hr/print_format/salary_slip_standard/salary_slip_standard.json
+++ b/erpnext/hr/print_format/salary_slip_standard/salary_slip_standard.json
@@ -6,7 +6,7 @@
"docstatus": 0,
"doctype": "Print Format",
"font": "Default",
- "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"HTML\", \"options\": \" <h3 style=\\\"text-align: right;\\\"><span style=\\\"line-height: 1.42857;\\\">{{doc.name}}</span></h3>\\n<div>\\n <hr style=\\\"text-align: center;\\\">\\n</div> \"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"employee\"}, {\"print_hide\": 0, \"fieldname\": \"company\"}, {\"print_hide\": 0, \"fieldname\": \"employee_name\"}, {\"print_hide\": 0, \"fieldname\": \"department\"}, {\"print_hide\": 0, \"fieldname\": \"designation\"}, {\"print_hide\": 0, \"fieldname\": \"branch\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"start_date\"}, {\"print_hide\": 0, \"fieldname\": \"end_date\"}, {\"print_hide\": 0, \"fieldname\": \"total_days_in_month\"}, {\"print_hide\": 0, \"fieldname\": \"leave_without_pay\"}, {\"print_hide\": 0, \"fieldname\": \"payment_days\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"depends_on_lwp\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"earnings\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"depends_on_lwp\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"deductions\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"arrear_amount\"}, {\"print_hide\": 0, \"fieldname\": \"leave_encashment_amount\"}, {\"print_hide\": 0, \"fieldname\": \"gross_pay\"}, {\"print_hide\": 0, \"fieldname\": \"total_deduction\"}, {\"print_hide\": 0, \"fieldname\": \"net_pay\"}, {\"print_hide\": 0, \"fieldname\": \"rounded_total\"}, {\"print_hide\": 0, \"fieldname\": \"total_in_words\"}]",
+ "format_data": "[{\"fieldname\": \"print_heading_template\", \"fieldtype\": \"HTML\", \"options\": \" <h3 style=\\\"text-align: right;\\\"><span style=\\\"line-height: 1.42857;\\\">{{doc.name}}</span></h3>\\n<div>\\n <hr style=\\\"text-align: center;\\\">\\n</div> \"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"employee\"}, {\"print_hide\": 0, \"fieldname\": \"company\"}, {\"print_hide\": 0, \"fieldname\": \"employee_name\"}, {\"print_hide\": 0, \"fieldname\": \"department\"}, {\"print_hide\": 0, \"fieldname\": \"designation\"}, {\"print_hide\": 0, \"fieldname\": \"branch\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"start_date\"}, {\"print_hide\": 0, \"fieldname\": \"end_date\"}, {\"print_hide\": 0, \"fieldname\": \"total_working_days\"}, {\"print_hide\": 0, \"fieldname\": \"leave_without_pay\"}, {\"print_hide\": 0, \"fieldname\": \"payment_days\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"depends_on_lwp\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"earnings\"}, {\"fieldtype\": \"Column Break\"}, {\"visible_columns\": [{\"print_hide\": 0, \"fieldname\": \"salary_component\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"amount\", \"print_width\": \"\"}, {\"print_hide\": 0, \"fieldname\": \"depends_on_lwp\", \"print_width\": \"\"}], \"print_hide\": 0, \"fieldname\": \"deductions\"}, {\"fieldtype\": \"Section Break\"}, {\"fieldtype\": \"Column Break\"}, {\"fieldtype\": \"Column Break\"}, {\"print_hide\": 0, \"fieldname\": \"arrear_amount\"}, {\"print_hide\": 0, \"fieldname\": \"leave_encashment_amount\"}, {\"print_hide\": 0, \"fieldname\": \"gross_pay\"}, {\"print_hide\": 0, \"fieldname\": \"total_deduction\"}, {\"print_hide\": 0, \"fieldname\": \"net_pay\"}, {\"print_hide\": 0, \"fieldname\": \"rounded_total\"}, {\"print_hide\": 0, \"fieldname\": \"total_in_words\"}]",
"idx": 0,
"modified": "2016-08-22 00:21:42.600548",
"modified_by": "Administrator",
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
index a50ca53..60ddf63 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.json
@@ -23,11 +23,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -79,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -108,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -135,6 +139,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -164,6 +169,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Transaction Date",
"length": 0,
"no_copy": 0,
@@ -192,11 +198,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -220,6 +227,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -249,11 +257,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Schedule",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-time",
+ "options": "fa fa-time",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -277,6 +286,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Generate Schedule",
"length": 0,
"no_copy": 0,
@@ -304,6 +314,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Schedules",
"length": 0,
"no_copy": 0,
@@ -333,6 +344,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Info",
"length": 0,
"no_copy": 0,
@@ -360,6 +372,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Customer Name",
"length": 0,
"no_copy": 0,
@@ -389,6 +402,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Person",
"length": 0,
"no_copy": 0,
@@ -417,6 +431,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No",
"length": 0,
"no_copy": 0,
@@ -444,6 +459,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Email",
"length": 0,
"no_copy": 0,
@@ -470,6 +486,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
@@ -496,6 +513,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -522,6 +540,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Address",
"length": 0,
"no_copy": 0,
@@ -549,6 +568,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address",
"length": 0,
"no_copy": 0,
@@ -577,6 +597,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Territory",
"length": 0,
"no_copy": 0,
@@ -608,6 +629,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Group",
"length": 0,
"no_copy": 0,
@@ -635,6 +657,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -664,6 +687,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -682,7 +706,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-calendar",
+ "icon": "fa fa-calendar",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -691,7 +715,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 16:03:43.964816",
+ "modified": "2016-11-07 05:54:23.335854",
"modified_by": "Administrator",
"module": "Maintenance",
"name": "Maintenance Schedule",
diff --git a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
index ef20c51..6efd6fd 100644
--- a/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
+++ b/erpnext/maintenance/doctype/maintenance_visit/maintenance_visit.json
@@ -23,11 +23,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -77,6 +79,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -105,6 +108,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -134,6 +138,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Name",
"length": 0,
"no_copy": 0,
@@ -160,6 +165,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address",
"length": 0,
"no_copy": 0,
@@ -186,6 +192,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
@@ -212,6 +219,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No",
"length": 0,
"no_copy": 0,
@@ -238,6 +246,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Email",
"length": 0,
"no_copy": 0,
@@ -264,6 +273,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -292,6 +302,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Maintenance Date",
"length": 0,
"no_copy": 1,
@@ -320,6 +331,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Maintenance Time",
"length": 0,
"no_copy": 1,
@@ -348,11 +360,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-wrench",
+ "options": "fa fa-wrench",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -376,6 +389,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Completion Status",
"length": 0,
"no_copy": 0,
@@ -405,6 +419,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -431,6 +446,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Maintenance Type",
"length": 0,
"no_copy": 0,
@@ -460,10 +476,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-wrench",
+ "options": "fa fa-wrench",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -487,6 +504,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purposes",
"length": 0,
"no_copy": 0,
@@ -516,11 +534,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -544,6 +563,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Feedback",
"length": 0,
"no_copy": 0,
@@ -572,6 +592,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -598,6 +619,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -627,6 +649,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -657,6 +680,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -687,10 +711,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Info",
"length": 0,
"no_copy": 0,
- "options": "icon-bullhorn",
+ "options": "fa fa-bullhorn",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -714,6 +739,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Address",
"length": 0,
"no_copy": 0,
@@ -741,6 +767,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Person",
"length": 0,
"no_copy": 0,
@@ -768,6 +795,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -794,6 +822,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Territory",
"length": 0,
"no_copy": 0,
@@ -822,6 +851,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Group",
"length": 0,
"no_copy": 0,
@@ -840,7 +870,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -849,7 +879,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 16:04:05.169359",
+ "modified": "2016-11-07 05:13:23.358364",
"modified_by": "Administrator",
"module": "Maintenance",
"name": "Maintenance Visit",
diff --git a/erpnext/manufacturing/doctype/bom/bom.js b/erpnext/manufacturing/doctype/bom/bom.js
index ce4c4cb..5181cf4 100644
--- a/erpnext/manufacturing/doctype/bom/bom.js
+++ b/erpnext/manufacturing/doctype/bom/bom.js
@@ -4,9 +4,19 @@
frappe.provide("erpnext.bom");
frappe.ui.form.on("BOM", {
+ setup: function(frm) {
+ frm.add_fetch('buying_price_list', 'currency', 'currency')
+ frm.fields_dict["items"].grid.get_field("bom_no").get_query = function(doc, cdt, cdn){
+ return {
+ filters: {'currency': frm.doc.currency}
+ }
+ }
+ },
+
onload_post_render: function(frm) {
frm.get_field("items").grid.set_multiple_add("item_code", "qty");
},
+
refresh: function(frm) {
frm.toggle_enable("item", frm.doc.__islocal);
toggle_operations(frm);
@@ -31,6 +41,7 @@
});
}
},
+
update_cost: function(frm) {
return frappe.call({
doc: frm.doc,
@@ -43,6 +54,28 @@
}
});
+erpnext.bom.BomController = erpnext.TransactionController.extend({
+ conversion_rate: function(doc, cdt, cdn) {
+ if(this.frm.doc.currency === this.get_company_currency()) {
+ this.frm.set_value("conversion_rate", 1.0);
+ } else {
+ erpnext.bom.update_cost(doc);
+ }
+ },
+
+ item_code: function(doc, cdt, cdn){
+ var scrap_items = false;
+ child = locals[cdt][cdn];
+ if(child.doctype == 'BOM Scrap Item') {
+ scrap_items = true;
+ }
+
+ get_bom_material_detail(doc, cdt, cdn, scrap_items);
+ },
+})
+
+$.extend(cur_frm.cscript, new erpnext.bom.BomController({frm: cur_frm}));
+
cur_frm.add_fetch("item", "description", "description");
cur_frm.add_fetch("item", "image", "image");
cur_frm.add_fetch("item", "item_name", "item_name");
@@ -56,19 +89,15 @@
cur_frm.cscript.time_in_mins = cur_frm.cscript.hour_rate;
-cur_frm.cscript.item_code = function(doc, cdt, cdn) {
- get_bom_material_detail(doc, cdt, cdn);
-}
-
cur_frm.cscript.bom_no = function(doc, cdt, cdn) {
- get_bom_material_detail(doc, cdt, cdn);
+ get_bom_material_detail(doc, cdt, cdn, false);
}
cur_frm.cscript.is_default = function(doc) {
if (doc.is_default) cur_frm.set_value("is_active", 1);
}
-var get_bom_material_detail= function(doc, cdt, cdn) {
+var get_bom_material_detail= function(doc, cdt, cdn, scrap_items) {
var d = locals[cdt][cdn];
if (d.item_code) {
return frappe.call({
@@ -77,6 +106,7 @@
args: {
'item_code': d.item_code,
'bom_no': d.bom_no != null ? d.bom_no: '',
+ "scrap_items": scrap_items,
'qty': d.qty
},
callback: function(r) {
@@ -96,60 +126,99 @@
cur_frm.cscript.qty = function(doc, cdt, cdn) {
erpnext.bom.calculate_rm_cost(doc);
+ erpnext.bom.calculate_scrap_materials_cost(doc);
erpnext.bom.calculate_total(doc);
}
cur_frm.cscript.rate = function(doc, cdt, cdn) {
var d = locals[cdt][cdn];
+ var scrap_items = false;
+
+ if(child.doctype == 'BOM Scrap Item') {
+ scrap_items = true;
+ }
+
if (d.bom_no) {
msgprint(__("You can not change rate if BOM mentioned agianst any item"));
- get_bom_material_detail(doc, cdt, cdn);
+ get_bom_material_detail(doc, cdt, cdn, scrap_items);
} else {
erpnext.bom.calculate_rm_cost(doc);
+ erpnext.bom.calculate_scrap_materials_cost(doc);
erpnext.bom.calculate_total(doc);
}
}
+erpnext.bom.update_cost = function(doc) {
+ erpnext.bom.calculate_op_cost(doc);
+ erpnext.bom.calculate_rm_cost(doc);
+ erpnext.bom.calculate_scrap_materials_cost(doc);
+ erpnext.bom.calculate_total(doc);
+}
+
erpnext.bom.calculate_op_cost = function(doc) {
var op = doc.operations || [];
doc.operating_cost = 0.0;
+ doc.base_operating_cost = 0.0;
+
for(var i=0;i<op.length;i++) {
operating_cost = flt(flt(op[i].hour_rate) * flt(op[i].time_in_mins) / 60, 2);
+ base_operating_cost = flt(flt(op[i].base_hour_rate) * flt(op[i].time_in_mins) / 60, 2);
frappe.model.set_value('BOM Operation',op[i].name, "operating_cost", operating_cost);
+ frappe.model.set_value('BOM Operation',op[i].name, "base_operating_cost", base_operating_cost);
doc.operating_cost += operating_cost;
+ doc.base_operating_cost += base_operating_cost;
}
- refresh_field('operating_cost');
+ refresh_field(['operating_cost', 'base_operating_cost']);
}
// rm : raw material
erpnext.bom.calculate_rm_cost = function(doc) {
var rm = doc.items || [];
total_rm_cost = 0;
+ base_total_rm_cost = 0;
for(var i=0;i<rm.length;i++) {
- amt = flt(rm[i].rate) * flt(rm[i].qty);
- set_multiple('BOM Item',rm[i].name, {'amount': amt}, 'items');
- set_multiple('BOM Item',rm[i].name,
- {'qty_consumed_per_unit': flt(rm[i].qty)/flt(doc.quantity)}, 'items');
- total_rm_cost += amt;
+ amount = flt(rm[i].rate) * flt(rm[i].qty);
+ base_amount = flt(rm[i].rate) * flt(doc.conversion_rate) * flt(rm[i].qty);
+ frappe.model.set_value('BOM Item', rm[i].name, 'base_rate', flt(rm[i].rate) * flt(doc.conversion_rate))
+ frappe.model.set_value('BOM Item', rm[i].name, 'amount', amount)
+ frappe.model.set_value('BOM Item', rm[i].name, 'qty_consumed_per_unit', flt(rm[i].qty)/flt(doc.quantity))
+ frappe.model.set_value('BOM Item', rm[i].name, 'base_amount', base_amount)
+ total_rm_cost += amount;
+ base_total_rm_cost += base_amount;
}
cur_frm.set_value("raw_material_cost", total_rm_cost);
+ cur_frm.set_value("base_raw_material_cost", base_total_rm_cost);
}
//sm : scrap material
erpnext.bom.calculate_scrap_materials_cost = function(doc) {
var sm = doc.scrap_items || [];
total_sm_cost = 0;
+ base_total_sm_cost = 0;
+
for(var i=0;i<sm.length;i++) {
- amt = flt(sm[i].rate) * flt(sm[i].qty);
- set_multiple('BOM Scrap Item',sm[i].name, {'amount': amt}, 'scrap_items');
+ base_rate = flt(sm[i].rate) * flt(doc.conversion_rate);
+ amount = flt(sm[i].rate) * flt(sm[i].qty);
+ base_amount = flt(sm[i].rate) * flt(sm[i].qty) * flt(doc.conversion_rate);
+ frappe.model.set_value('BOM Scrap Item',sm[i].name, 'base_rate', base_rate);
+ frappe.model.set_value('BOM Scrap Item',sm[i].name, 'amount', amount);
+ frappe.model.set_value('BOM Scrap Item',sm[i].name, 'base_amount', base_amount);
+
+ total_sm_cost += amount;
+ base_total_sm_cost += base_amount;
}
+
+ cur_frm.set_value("scrap_material_cost", total_sm_cost);
+ cur_frm.set_value("base_scrap_material_cost", base_total_sm_cost);
}
// Calculate Total Cost
erpnext.bom.calculate_total = function(doc) {
- total_cost = flt(doc.operating_cost) + flt(doc.raw_material_cost);
- frappe.model.set_value(doc.doctype, doc.name, "total_cost", total_cost);
+ total_cost = flt(doc.operating_cost) + flt(doc.raw_material_cost) - flt(doc.scrap_material_cost);
+ base_total_cost = flt(doc.base_operating_cost) + flt(doc.base_raw_material_cost) - flt(doc.base_scrap_material_cost);
+ cur_frm.set_value("total_cost", total_cost);
+ cur_frm.set_value("base_total_cost", base_total_cost);
}
@@ -186,10 +255,7 @@
}
cur_frm.cscript.validate = function(doc, dt, dn) {
- erpnext.bom.calculate_op_cost(doc);
- erpnext.bom.calculate_rm_cost(doc);
- erpnext.bom.calculate_scrap_materials_cost(doc);
- erpnext.bom.calculate_total(doc);
+ erpnext.bom.update_cost(doc)
}
frappe.ui.form.on("BOM Operation", "operation", function(frm, cdt, cdn) {
@@ -225,6 +291,7 @@
},
callback: function (data) {
frappe.model.set_value(d.doctype, d.name, "hour_rate", data.message.hour_rate);
+ frappe.model.set_value(d.doctype, d.name, "base_hour_rate", flt(data.message.hour_rate) * flt(frm.doc.conversion_rate));
erpnext.bom.calculate_op_cost(frm.doc);
erpnext.bom.calculate_total(frm.doc);
}
@@ -252,7 +319,6 @@
toggle_operations(frm);
});
-
cur_frm.cscript.image = function() {
refresh_field("image_view");
}
diff --git a/erpnext/manufacturing/doctype/bom/bom.json b/erpnext/manufacturing/doctype/bom/bom.json
index 7c6456b..c2c9b64 100644
--- a/erpnext/manufacturing/doctype/bom/bom.json
+++ b/erpnext/manufacturing/doctype/bom/bom.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Item",
"length": 0,
"no_copy": 0,
@@ -52,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Name",
"length": 0,
"no_copy": 0,
@@ -81,6 +83,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Quantity",
"length": 0,
"no_copy": 0,
@@ -109,6 +112,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -135,6 +139,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Is Active",
"length": 0,
"no_copy": 1,
@@ -164,6 +169,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Is Default",
"length": 0,
"no_copy": 1,
@@ -193,6 +199,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "With Operations",
"length": 0,
"no_copy": 0,
@@ -219,6 +226,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rate Of Materials Based On",
"length": 0,
"no_copy": 0,
@@ -247,6 +255,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List",
"length": 0,
"no_copy": 0,
@@ -267,6 +276,118 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "currency_detail",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "",
+ "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,
+ "unique": 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_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Currency",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Currency",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_12",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "conversion_rate",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Conversion Rate",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "9",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"depends_on": "",
"description": "Specify the operations, operating cost and give a unique Operation no to your operations.",
"fieldname": "operations_section",
@@ -276,6 +397,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Operations",
"length": 0,
"no_copy": 0,
@@ -303,6 +425,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Operations",
"length": 0,
"no_copy": 0,
@@ -332,6 +455,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Materials",
"length": 0,
"no_copy": 0,
@@ -359,6 +483,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -388,6 +513,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Scrap",
"length": 0,
"no_copy": 0,
@@ -415,6 +541,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Scrap Items",
"length": 0,
"no_copy": 0,
@@ -443,6 +570,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Costing",
"length": 0,
"no_copy": 0,
@@ -470,10 +598,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Operating Cost",
"length": 0,
"no_copy": 0,
- "options": "Company:company:default_currency",
+ "options": "currency",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -497,10 +626,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Raw Material Cost",
"length": 0,
"no_copy": 0,
- "options": "Company:company:default_currency",
+ "options": "currency",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -517,6 +647,35 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "scrap_material_cost",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Scrap Material Cost",
+ "length": 0,
+ "no_copy": 0,
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "cb1",
"fieldtype": "Column Break",
"hidden": 0,
@@ -524,6 +683,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -542,6 +702,120 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "base_operating_cost",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Operating Cost (Company Currency)",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "base_raw_material_cost",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Raw Material Cost(Company Currency)",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "base_scrap_material_cost",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Scrap Material Cost(Company Currency)",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Company:company:default_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_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "total_cost_of_bom",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "total_cost",
"fieldtype": "Currency",
"hidden": 0,
@@ -549,12 +823,69 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Total Cost",
"length": 0,
"no_copy": 0,
+ "options": "currency",
+ "permlevel": 0,
+ "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_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_26",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "base_total_cost",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Total Cost(Company Currency)",
+ "length": 0,
+ "no_copy": 0,
"options": "Company:company:default_currency",
"permlevel": 0,
- "print_hide": 0,
+ "precision": "",
+ "print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
"remember_last_selected_value": 0,
@@ -576,6 +907,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -602,6 +934,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -631,6 +964,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -659,6 +993,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -686,6 +1021,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -711,6 +1047,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item UOM",
"length": 0,
"no_copy": 0,
@@ -738,6 +1075,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -764,7 +1102,8 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Item Desription",
+ "in_standard_filter": 0,
+ "label": "Item Description",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -790,6 +1129,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -816,6 +1156,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
@@ -843,6 +1184,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image View",
"length": 0,
"no_copy": 0,
@@ -872,6 +1214,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Materials Required (Exploded)",
"length": 0,
"no_copy": 0,
@@ -898,6 +1241,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Exploded_items",
"length": 0,
"no_copy": 1,
@@ -918,7 +1262,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -927,8 +1271,8 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 16:04:27.449775",
- "modified_by": "Administrator",
+ "modified": "2016-11-21 17:06:49.349654",
+ "modified_by": "rohit@erpnext.com",
"module": "Manufacturing",
"name": "BOM",
"owner": "Administrator",
@@ -936,6 +1280,27 @@
{
"amend": 0,
"apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "All",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
"cancel": 1,
"create": 1,
"delete": 1,
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index c6a3f1f..2a27922 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -5,6 +5,7 @@
import frappe
from frappe.utils import cint, cstr, flt
from frappe import _
+from erpnext.setup.utils import get_exchange_rate
from frappe.model.document import Document
from operator import itemgetter
@@ -35,6 +36,8 @@
def validate(self):
self.clear_operations()
self.validate_main_item()
+ self.validate_currency()
+ self.set_conversion_rate()
from erpnext.utilities.transaction_base import validate_uom_is_integer
validate_uom_is_integer(self, "stock_uom", "qty", "BOM Item")
@@ -84,6 +87,8 @@
for r in ret:
if not item.get(r):
item.set(r, ret[r])
+
+ self.validate_bom_currecny(item)
def get_bom_material_detail(self, args=None):
""" Get raw material details like uom, desc and rate"""
@@ -102,19 +107,27 @@
rate = self.get_rm_rate(args)
ret_item = {
- 'item_name' : item and args['item_name'] or '',
- 'description' : item and args['description'] or '',
- 'image' : item and args['image'] or '',
- 'stock_uom' : item and args['stock_uom'] or '',
- 'bom_no' : args['bom_no'],
- 'rate' : rate
+ 'item_name' : item and args['item_name'] or '',
+ 'description' : item and args['description'] or '',
+ 'image' : item and args['image'] or '',
+ 'stock_uom' : item and args['stock_uom'] or '',
+ 'bom_no' : args['bom_no'],
+ 'rate' : rate,
+ 'base_rate' : rate if self.company_currency() == self.currency else rate * self.conversion_rate
}
return ret_item
+ def validate_bom_currecny(self, item):
+ if item.get('bom_no') and frappe.db.get_value('BOM', item.get('bom_no'), 'currency') != self.currency:
+ frappe.throw(_("Row {0}: Currency of the BOM #{1} should be equal to the selected currency {2}").format(item.idx, item.bom_no, self.currency))
+
def get_rm_rate(self, arg):
""" Get raw material rate as per selected method, if bom exists takes bom cost """
rate = 0
- if arg['bom_no']:
+
+ if arg.get('scrap_items'):
+ rate = self.get_valuation_rate(arg)
+ elif arg['bom_no']:
rate = self.get_bom_unitcost(arg['bom_no'])
elif arg:
if self.rm_cost_as_per == 'Valuation Rate':
@@ -209,6 +222,14 @@
if not self.quantity:
frappe.throw(_("Quantity should be greater than 0"))
+
+ def validate_currency(self):
+ if self.rm_cost_as_per == 'Price List' and \
+ frappe.db.get_value('Price List', self.buying_price_list, 'currency') != self.currency:
+ frappe.throw(_("Currency of the price list {0} is not similar with the selected currency {1}").format(self.buying_price_list, self.currency))
+
+ def set_conversion_rate(self):
+ self.conversion_rate = get_exchange_rate(self.currency, self.company_currency())
def validate_materials(self):
""" Validate raw material entries """
@@ -270,11 +291,14 @@
"""Calculate bom totals"""
self.calculate_op_cost()
self.calculate_rm_cost()
- self.total_cost = self.operating_cost + self.raw_material_cost
+ self.calculate_sm_cost()
+ self.total_cost = self.operating_cost + self.raw_material_cost - self.scrap_material_cost
+ self.base_total_cost = self.base_operating_cost + self.base_raw_material_cost - self.base_scrap_material_cost
def calculate_op_cost(self):
"""Update workstation rate and calculates totals"""
self.operating_cost = 0
+ self.base_operating_cost = 0
for d in self.get('operations'):
if d.workstation:
if not d.hour_rate:
@@ -282,20 +306,45 @@
if d.hour_rate and d.time_in_mins:
d.operating_cost = flt(d.hour_rate) * flt(d.time_in_mins) / 60.0
+ d.base_hour_rate = flt(d.hour_rate) * flt(self.conversion_rate)
+ d.base_operating_cost = flt(d.base_hour_rate) * flt(d.time_in_mins) / 60.0
self.operating_cost += flt(d.operating_cost)
+ self.base_operating_cost += flt(d.base_operating_cost)
def calculate_rm_cost(self):
"""Fetch RM rate as per today's valuation rate and calculate totals"""
total_rm_cost = 0
+ base_total_rm_cost = 0
+
for d in self.get('items'):
if d.bom_no:
d.rate = self.get_bom_unitcost(d.bom_no)
+
+ d.base_rate = d.rate * self.conversion_rate
d.amount = flt(d.rate, self.precision("rate", d)) * flt(d.qty, self.precision("qty", d))
+ d.base_amount = d.amount * self.conversion_rate
d.qty_consumed_per_unit = flt(d.qty, self.precision("qty", d)) / flt(self.quantity, self.precision("quantity"))
total_rm_cost += d.amount
+ base_total_rm_cost += d.base_amount
self.raw_material_cost = total_rm_cost
+ self.base_raw_material_cost = base_total_rm_cost
+
+ def calculate_sm_cost(self):
+ """Fetch RM rate as per today's valuation rate and calculate totals"""
+ total_sm_cost = 0
+ base_total_sm_cost = 0
+
+ for d in self.get('scrap_items'):
+ d.base_rate = d.rate * self.conversion_rate
+ d.amount = flt(d.rate, self.precision("rate", d)) * flt(d.qty, self.precision("qty", d))
+ d.base_amount = d.amount * self.conversion_rate
+ total_sm_cost += d.amount
+ base_total_sm_cost += d.base_amount
+
+ self.scrap_material_cost = total_sm_cost
+ self.base_scrap_material_cost = base_total_sm_cost
def update_exploded_items(self):
""" Update Flat BOM, following will be correct data"""
@@ -316,8 +365,11 @@
'image' : d.image,
'stock_uom' : d.stock_uom,
'qty' : flt(d.qty),
- 'rate' : flt(d.rate),
+ 'rate' : d.base_rate,
}))
+
+ def company_currency(self):
+ return frappe.db.get_value('Company', self.company, 'default_currency')
def add_to_cur_exploded_items(self, args):
if self.cur_exploded_items.get(args.item_code):
diff --git a/erpnext/manufacturing/doctype/bom/test_records.json b/erpnext/manufacturing/doctype/bom/test_records.json
index da8d67b..5baa0cb 100644
--- a/erpnext/manufacturing/doctype/bom/test_records.json
+++ b/erpnext/manufacturing/doctype/bom/test_records.json
@@ -22,6 +22,7 @@
],
"docstatus": 1,
"doctype": "BOM",
+ "currency": "USD",
"is_active": 1,
"is_default": 1,
"item": "_Test Item Home Desktop Manufactured",
@@ -63,6 +64,7 @@
"doctype": "BOM",
"is_active": 1,
"is_default": 1,
+ "currency": "USD",
"item": "_Test FG Item",
"quantity": 1.0
},
@@ -101,6 +103,7 @@
"doctype": "BOM",
"is_active": 1,
"is_default": 1,
+ "currency": "USD",
"item": "_Test FG Item 2",
"quantity": 1.0,
"with_operations": 1
@@ -130,6 +133,7 @@
"doctype": "BOM",
"is_active": 1,
"is_default": 1,
+ "currency": "USD",
"item": "_Test Variant Item",
"quantity": 1.0,
"with_operations": 1
diff --git a/erpnext/manufacturing/doctype/bom_item/bom_item.json b/erpnext/manufacturing/doctype/bom_item/bom_item.json
index d485abc..bb55c73 100644
--- a/erpnext/manufacturing/doctype/bom_item/bom_item.json
+++ b/erpnext/manufacturing/doctype/bom_item/bom_item.json
@@ -7,6 +7,7 @@
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
+ "document_type": "Setup",
"editable_grid": 1,
"fields": [
{
@@ -317,7 +318,7 @@
"label": "Rate",
"length": 0,
"no_copy": 0,
- "options": "Company:company:default_currency",
+ "options": "currency",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -333,6 +334,36 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "Amount",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "amount_as_per_mar",
+ "oldfieldtype": "Currency",
+ "options": "currency",
+ "permlevel": 0,
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "print_width": "150px",
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
+ "width": "150px"
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "col_break2",
"fieldtype": "Column Break",
"hidden": 0,
@@ -385,30 +416,79 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "amount",
+ "fieldname": "base_rate",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
- "in_list_view": 1,
- "label": "Amount",
+ "in_list_view": 0,
+ "label": "Basic Rate (Company Currency)",
"length": 0,
"no_copy": 0,
- "oldfieldname": "amount_as_per_mar",
- "oldfieldtype": "Currency",
"options": "Company:company:default_currency",
"permlevel": 0,
- "print_hide": 0,
+ "precision": "",
+ "print_hide": 1,
"print_hide_if_no_value": 0,
- "print_width": "150px",
"read_only": 1,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
- "unique": 0,
- "width": "150px"
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "base_amount",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Amount (Company Currency)",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_18",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
},
{
"allow_on_submit": 0,
@@ -475,7 +555,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-08-26 02:42:40.468812",
+ "modified": "2016-10-21 15:57:22.521537",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "BOM Item",
diff --git a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
index 8b6406e..50f1c6c 100644
--- a/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
+++ b/erpnext/manufacturing/doctype/bom_operation/bom_operation.json
@@ -9,11 +9,13 @@
"doctype": "DocType",
"document_type": "Setup",
"editable_grid": 1,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "operation",
"fieldtype": "Link",
"hidden": 0,
@@ -41,6 +43,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "workstation",
"fieldtype": "Link",
"hidden": 0,
@@ -68,6 +71,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "description",
"fieldtype": "Text Editor",
"hidden": 0,
@@ -94,6 +98,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "col_break1",
"fieldtype": "Column Break",
"hidden": 0,
@@ -117,8 +122,9 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "hour_rate",
- "fieldtype": "Float",
+ "fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@@ -129,6 +135,7 @@
"no_copy": 0,
"oldfieldname": "hour_rate",
"oldfieldtype": "Currency",
+ "options": "currency",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -143,6 +150,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "In minutes",
"fieldname": "time_in_mins",
"fieldtype": "Float",
@@ -171,6 +179,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "operating_cost",
"fieldtype": "Currency",
"hidden": 0,
@@ -183,6 +192,7 @@
"no_copy": 0,
"oldfieldname": "operating_cost",
"oldfieldtype": "Currency",
+ "options": "currency",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -192,6 +202,61 @@
"search_index": 0,
"set_only_once": 0,
"unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "base_hour_rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Base Hour Rate(Company Currency)",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "5",
+ "fieldname": "base_operating_cost",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Operating Cost(Company Currency)",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
}
],
"hide_heading": 0,
@@ -204,7 +269,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-07-11 03:27:58.625909",
+ "modified": "2016-10-21 18:38:14.700637",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "BOM Operation",
diff --git a/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json b/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json
index b7cf4a9..bf7e6fc 100644
--- a/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json
+++ b/erpnext/manufacturing/doctype/bom_replace_tool/bom_replace_tool.json
@@ -80,7 +80,7 @@
],
"hide_heading": 1,
"hide_toolbar": 1,
- "icon": "icon-magic",
+ "icon": "fa fa-magic",
"idx": 1,
"in_create": 1,
"in_dialog": 0,
diff --git a/erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json b/erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
index ea5e6c1..fe81592 100644
--- a/erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
+++ b/erpnext/manufacturing/doctype/bom_scrap_item/bom_scrap_item.json
@@ -130,7 +130,7 @@
"label": "Rate",
"length": 0,
"no_copy": 0,
- "options": "Company:company:default_currency",
+ "options": "currency",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -147,6 +147,33 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "fieldname": "amount",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Amount",
+ "length": 0,
+ "no_copy": 0,
+ "options": "currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_6",
"fieldtype": "Column Break",
"hidden": 0,
@@ -199,20 +226,47 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "amount",
+ "fieldname": "base_rate",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Amount",
+ "label": "Basic Rate (Company Currency)",
"length": 0,
"no_copy": 0,
"options": "Company:company:default_currency",
"permlevel": 0,
"precision": "",
- "print_hide": 0,
+ "print_hide": 1,
+ "print_hide_if_no_value": 0,
+ "read_only": 1,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "base_amount",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Basic Amount (Company Currency)",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Company:company:default_currency",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
"report_hide": 0,
@@ -232,7 +286,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-09-26 02:58:58.433348",
+ "modified": "2016-10-25 00:27:53.712140",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "BOM Scrap Item",
diff --git a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
index 5465705..9f12e45 100644
--- a/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
+++ b/erpnext/manufacturing/doctype/manufacturing_settings/manufacturing_settings.json
@@ -331,7 +331,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-wrench",
+ "icon": "fa fa-wrench",
"idx": 0,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/manufacturing/doctype/operation/operation.json b/erpnext/manufacturing/doctype/operation/operation.json
index 2193e95..69eb449 100644
--- a/erpnext/manufacturing/doctype/operation/operation.json
+++ b/erpnext/manufacturing/doctype/operation/operation.json
@@ -10,11 +10,13 @@
"doctype": "DocType",
"document_type": "Setup",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "workstation",
"fieldtype": "Link",
"hidden": 0,
@@ -22,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Default Workstation",
"length": 0,
"no_copy": 0,
@@ -31,6 +34,7 @@
"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,
@@ -41,6 +45,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "section_break_4",
"fieldtype": "Section Break",
"hidden": 0,
@@ -48,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -55,6 +61,7 @@
"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,
@@ -65,6 +72,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "description",
"fieldtype": "Text",
"hidden": 0,
@@ -72,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -80,6 +89,7 @@
"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,
@@ -89,7 +99,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-wrench",
+ "icon": "fa fa-wrench",
"idx": 0,
"image_view": 0,
"in_create": 0,
@@ -98,7 +108,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-07-25 05:24:23.398894",
+ "modified": "2016-11-07 05:28:27.462413",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Operation",
@@ -115,6 +125,7 @@
"export": 1,
"if_owner": 0,
"import": 1,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -135,6 +146,7 @@
"export": 1,
"if_owner": 0,
"import": 1,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.json b/erpnext/manufacturing/doctype/production_order/production_order.json
index 9a98fb8..dd8bb5b 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.json
+++ b/erpnext/manufacturing/doctype/production_order/production_order.json
@@ -23,10 +23,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-gift",
+ "options": "fa fa-gift",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 0,
@@ -80,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -109,6 +112,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Item To Manufacture",
"length": 0,
"no_copy": 0,
@@ -140,6 +144,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "BOM No",
"length": 0,
"no_copy": 0,
@@ -171,6 +176,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Use Multi-Level BOM",
"length": 0,
"no_copy": 0,
@@ -197,6 +203,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -225,6 +232,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Order",
"length": 0,
"no_copy": 0,
@@ -253,6 +261,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Qty To Manufacture",
"length": 0,
"no_copy": 0,
@@ -284,6 +293,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Material Transferred for Manufacturing",
"length": 0,
"no_copy": 1,
@@ -314,6 +324,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Manufactured Qty",
"length": 0,
"no_copy": 1,
@@ -342,10 +353,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Warehouses",
"length": 0,
"no_copy": 0,
- "options": "icon-building",
+ "options": "fa fa-building",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -370,6 +382,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Source Warehouse",
"length": 0,
"no_copy": 0,
@@ -398,6 +411,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Work-in-Progress Warehouse",
"length": 0,
"no_copy": 0,
@@ -425,6 +439,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -452,6 +467,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Target Warehouse",
"length": 0,
"no_copy": 0,
@@ -479,6 +495,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Scrap Warehouse",
"length": 0,
"no_copy": 0,
@@ -507,10 +524,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Time",
"length": 0,
"no_copy": 0,
- "options": "icon-time",
+ "options": "fa fa-time",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -536,6 +554,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Expected Delivery Date",
"length": 0,
"no_copy": 0,
@@ -563,6 +582,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Planned Start Date",
"length": 0,
"no_copy": 0,
@@ -590,6 +610,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Planned End Date",
"length": 0,
"no_copy": 1,
@@ -617,6 +638,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -643,6 +665,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Actual Start Date",
"length": 0,
"no_copy": 0,
@@ -670,6 +693,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Actual End Date",
"length": 0,
"no_copy": 0,
@@ -698,10 +722,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Operations",
"length": 0,
"no_copy": 0,
- "options": "icon-wrench",
+ "options": "fa fa-wrench",
"permlevel": 0,
"precision": "",
"print_hide": 0,
@@ -727,6 +752,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Operations",
"length": 0,
"no_copy": 0,
@@ -756,6 +782,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Operation Cost",
"length": 0,
"no_copy": 0,
@@ -784,6 +811,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Planned Operating Cost",
"length": 0,
"no_copy": 0,
@@ -812,6 +840,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Actual Operating Cost",
"length": 0,
"no_copy": 1,
@@ -840,6 +869,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Operating Cost",
"length": 0,
"no_copy": 1,
@@ -868,6 +898,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -894,6 +925,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Operating Cost",
"length": 0,
"no_copy": 1,
@@ -922,10 +954,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -949,6 +982,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Description",
"length": 0,
"no_copy": 0,
@@ -976,6 +1010,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Stock UOM",
"length": 0,
"no_copy": 0,
@@ -1005,6 +1040,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -1034,6 +1070,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1060,6 +1097,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -1090,6 +1128,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Material Request",
"length": 0,
"no_copy": 0,
@@ -1118,6 +1157,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Material Request Item",
"length": 0,
"no_copy": 0,
@@ -1145,6 +1185,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -1174,6 +1215,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Required Items",
"length": 0,
"no_copy": 0,
@@ -1193,7 +1235,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cogs",
+ "icon": "fa fa-cogs",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -1202,7 +1244,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 16:04:45.105694",
+ "modified": "2016-11-07 05:13:02.064821",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Production Order",
diff --git a/erpnext/manufacturing/doctype/production_order/production_order.py b/erpnext/manufacturing/doctype/production_order/production_order.py
index 3934935..aa69342 100644
--- a/erpnext/manufacturing/doctype/production_order/production_order.py
+++ b/erpnext/manufacturing/doctype/production_order/production_order.py
@@ -217,7 +217,7 @@
return
self.set('operations', [])
operations = frappe.db.sql("""select operation, description, workstation, idx,
- hour_rate, time_in_mins, "Pending" as status from `tabBOM Operation`
+ base_hour_rate as hour_rate, time_in_mins, "Pending" as status from `tabBOM Operation`
where parent = %s order by idx""", self.bom_no, as_dict=1)
self.set('operations', operations)
self.calculate_time()
@@ -466,6 +466,9 @@
if variant_of:
res["bom_no"] = frappe.db.get_value("BOM", filters={"item": variant_of, "is_default": 1})
+ if not res["bom_no"]:
+ frappe.throw(_("Default BOM for {0} not found").format(item))
+
res.update(check_if_scrap_warehouse_mandatory(res["bom_no"]))
return res
@@ -523,9 +526,9 @@
planned_end_date, status
from `tabProduction Order`
where ((ifnull(planned_start_date, '0000-00-00')!= '0000-00-00') \
- and (planned_start_date between %(start)s and %(end)s) \
- or ((ifnull(planned_start_date, '0000-00-00')!= '0000-00-00') \
- and planned_end_date between %(start)s and %(end)s)) {conditions}
+ and (planned_start_date <= %(end)s) \
+ and ((ifnull(planned_start_date, '0000-00-00')!= '0000-00-00') \
+ and planned_end_date >= %(start)s)) {conditions}
""".format(conditions=conditions), {
"start": start,
"end": end
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
index d9f3082..ffba219 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.json
@@ -807,7 +807,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-calendar",
+ "icon": "fa fa-calendar",
"idx": 1,
"image_view": 0,
"in_create": 1,
diff --git a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
index a3d0f1b..aaa0e95 100644
--- a/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
+++ b/erpnext/manufacturing/doctype/production_planning_tool/production_planning_tool.py
@@ -175,7 +175,7 @@
and bom.is_active = 1) %s""" % \
(", ".join(["%s"] * len(mr_list)), item_condition), tuple(mr_list), as_dict=1)
- self.add_items(items)
+ self.add_items(items)
def add_items(self, items):
@@ -314,7 +314,7 @@
}
"""
item_list = []
-
+
for bom, so_wise_qty in bom_dict.items():
bom_wise_item_details = {}
if self.use_multi_level_bom and self.only_raw_materials and self.include_subcontracted:
@@ -335,19 +335,19 @@
# so no childs of SA items
bom_wise_item_details = self.get_subitems(bom_wise_item_details, bom,1, \
self.use_multi_level_bom,self.only_raw_materials, self.include_subcontracted,non_stock_item)
-
+
for item, item_details in bom_wise_item_details.items():
for so_qty in so_wise_qty:
item_list.append([item, flt(item_details.qty) * so_qty[1], item_details.description,
item_details.stock_uom, item_details.min_order_qty, so_qty[0]])
-
+
self.make_items_dict(item_list)
def get_subitems(self,bom_wise_item_details, bom, parent_qty, include_sublevel, only_raw, supply_subs,non_stock_item=0):
for d in frappe.db.sql("""SELECT bom_item.item_code, default_material_request_type,
- ifnull(%(parent_qty)s * sum(bom_item.qty/ifnull(bom.quantity, 1)), 0) as qty,
+ ifnull(%(parent_qty)s * sum(bom_item.qty/ifnull(bom.quantity, 1)), 0) as qty,
item.is_sub_contracted_item as is_sub_contracted, item.default_bom as default_bom,
- bom_item.description as description, bom_item.stock_uom as stock_uom, item.min_order_qty
+ bom_item.description as description, bom_item.stock_uom as stock_uom, item.min_order_qty
as min_order_qty FROM `tabBOM Item` bom_item, `tabBOM` bom, tabItem item
where bom.name = bom_item.parent and bom.name = %(bom)s and bom_item.docstatus < 2
and bom_item.item_code = item.name
@@ -364,7 +364,7 @@
if include_sublevel:
if (d.default_material_request_type == "Purchase" and d.is_sub_contracted \
and supply_subs) or (d.default_material_request_type == "Manufacture"):
- child_details = self.get_subitems(bom_wise_item_details,d.default_bom, \
+ self.get_subitems(bom_wise_item_details,d.default_bom, \
d.qty, include_sublevel, only_raw, supply_subs)
return bom_wise_item_details
@@ -409,12 +409,12 @@
items_to_be_requested = frappe._dict()
if not self.create_material_requests_for_all_required_qty:
- item_projected_qty = self.get_projected_qty()
+ item_projected_qty = self.get_projected_qty()
for item, so_item_qty in self.item_dict.items():
total_qty = sum([flt(d[0]) for d in so_item_qty])
requested_qty = 0
-
+
if self.create_material_requests_for_all_required_qty:
requested_qty = total_qty
elif total_qty > item_projected_qty.get(item, 0):
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.json b/erpnext/manufacturing/doctype/workstation/workstation.json
index 93cc992..9f72e5c 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.json
+++ b/erpnext/manufacturing/doctype/workstation/workstation.json
@@ -3,29 +3,36 @@
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:workstation_name",
+ "beta": 0,
"creation": "2013-01-10 16:34:17",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
+ "editable_grid": 0,
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "description_and_warehouse",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"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,
@@ -36,12 +43,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "workstation_name",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Workstation Name",
"length": 0,
"no_copy": 0,
@@ -49,7 +59,9 @@
"oldfieldtype": "Data",
"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,
@@ -60,12 +72,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "description",
"fieldtype": "Text",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -73,7 +88,9 @@
"oldfieldtype": "Text",
"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,
@@ -85,18 +102,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_4",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 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,
@@ -107,13 +129,16 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "",
"fieldname": "holiday_list",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Holiday List",
"length": 0,
"no_copy": 0,
@@ -121,7 +146,9 @@
"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,
@@ -132,19 +159,24 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "over_heads",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Operating Costs",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
"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,
@@ -155,13 +187,16 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "per hour",
"fieldname": "hour_rate_electricity",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Electricity Cost",
"length": 0,
"no_copy": 0,
@@ -169,7 +204,9 @@
"oldfieldtype": "Currency",
"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,
@@ -180,13 +217,16 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "per hour",
"fieldname": "hour_rate_consumable",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Consumable Cost",
"length": 0,
"no_copy": 0,
@@ -194,7 +234,9 @@
"oldfieldtype": "Currency",
"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,
@@ -205,18 +247,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_11",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 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,
@@ -227,13 +274,16 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "per hour",
"fieldname": "hour_rate_rent",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rent Cost",
"length": 0,
"no_copy": 0,
@@ -241,7 +291,9 @@
"oldfieldtype": "Currency",
"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,
@@ -252,13 +304,16 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "Wages per hour",
"fieldname": "hour_rate_labour",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Wages",
"length": 0,
"no_copy": 0,
@@ -266,7 +321,9 @@
"oldfieldtype": "Currency",
"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,
@@ -277,13 +334,16 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "per hour",
"fieldname": "hour_rate",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Hour Rate",
"length": 0,
"no_copy": 0,
@@ -291,7 +351,9 @@
"oldfieldtype": "Currency",
"permlevel": 0,
"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,
@@ -302,19 +364,24 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "working_hours_section",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Working Hours",
"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,
@@ -325,12 +392,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "working_hours",
"fieldtype": "Table",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Working Hours",
"length": 0,
"no_copy": 0,
@@ -338,7 +408,9 @@
"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,
@@ -350,13 +422,14 @@
"hide_toolbar": 0,
"icon": "icon-wrench",
"idx": 1,
+ "image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2015-11-16 06:30:01.041198",
+ "modified": "2016-12-13 05:04:54.668633",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Workstation",
@@ -372,6 +445,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -383,6 +457,9 @@
"write": 1
}
],
+ "quick_entry": 0,
"read_only": 0,
- "read_only_onload": 0
+ "read_only_onload": 0,
+ "sort_order": "ASC",
+ "track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/workstation/workstation.py b/erpnext/manufacturing/doctype/workstation/workstation.py
index 5095784..dd1c9f2 100644
--- a/erpnext/manufacturing/doctype/workstation/workstation.py
+++ b/erpnext/manufacturing/doctype/workstation/workstation.py
@@ -58,6 +58,9 @@
def is_within_operating_hours(workstation, operation, from_datetime, to_datetime):
operation_length = time_diff_in_seconds(to_datetime, from_datetime)
workstation = frappe.get_doc("Workstation", workstation)
+
+ if not workstation.working_hours:
+ return
for working_hour in workstation.working_hours:
if working_hour.start_time and working_hour.end_time:
diff --git a/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json b/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
index b9cd174..89ca714 100644
--- a/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
+++ b/erpnext/manufacturing/doctype/workstation_working_hour/workstation_working_hour.json
@@ -9,11 +9,13 @@
"doctype": "DocType",
"document_type": "",
"editable_grid": 1,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "start_time",
"fieldtype": "Time",
"hidden": 0,
@@ -21,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Start Time",
"length": 0,
"no_copy": 0,
@@ -29,6 +32,7 @@
"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,
@@ -39,6 +43,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_2",
"fieldtype": "Column Break",
"hidden": 0,
@@ -46,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -53,6 +59,7 @@
"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,
@@ -63,6 +70,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "end_time",
"fieldtype": "Time",
"hidden": 0,
@@ -70,6 +78,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "End Time",
"length": 0,
"no_copy": 0,
@@ -78,6 +87,7 @@
"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,
@@ -88,30 +98,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "section_break_2",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
+ "columns": 0,
"default": "1",
"fieldname": "enabled",
"fieldtype": "Check",
@@ -120,6 +107,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Enabled",
"length": 0,
"no_copy": 0,
@@ -128,6 +116,7 @@
"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,
@@ -145,7 +134,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-07-11 03:28:10.225704",
+ "modified": "2016-12-13 05:02:36.754145",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Workstation Working Hour",
diff --git a/erpnext/manufacturing/report/issued_items_against_production_order/issued_items_against_production_order.json b/erpnext/manufacturing/report/issued_items_against_production_order/issued_items_against_production_order.json
index b9b16c4..0f69eb2 100644
--- a/erpnext/manufacturing/report/issued_items_against_production_order/issued_items_against_production_order.json
+++ b/erpnext/manufacturing/report/issued_items_against_production_order/issued_items_against_production_order.json
@@ -2,16 +2,17 @@
"add_total_row": 0,
"apply_user_permissions": 1,
"creation": "2013-05-03 17:48:46",
+ "disabled": 0,
"docstatus": 0,
"doctype": "Report",
"idx": 1,
"is_standard": "Yes",
- "modified": "2015-03-30 05:43:20.932301",
+ "modified": "2016-12-14 07:02:23.570939",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Issued Items Against Production Order",
"owner": "Administrator",
- "query": "select\n ste.production_order as \"Production Order:Link/Production Order:120\",\n ste.posting_date as \"Issue Date:Date:140\",\n ste_item.item_code as \"Item Code:Link/Item:120\",\n\tste_item.description as \"Description::150\",\n\tste_item.transfer_qty as \"Qty:Float:100\",\n\tste_item.stock_uom as \"UOM:Link/UOM:80\",\n\tste_item.amount as \"Amount:Currency:120\",\n\tste_item.serial_no as \"Serial No:Link/Serial No:80\",\n\tste_item.s_warehouse as \"Source Warehouse:Link/Warehouse:120\",\n\tste_item.t_warehouse as \"Target Warehouse:Link/Warehouse:120\",\n\tpro.production_item as \"Finished Goods:Link/Item:120\", \n\tste.name as \"Stock Entry:Link/Stock Entry:120\",\n\tste.company as \"Company:Link/Company:\"\nfrom\n\t`tabStock Entry` ste, `tabStock Entry Detail` ste_item, `tabProduction Order` pro\nwhere\n\tifnull(ste.production_order, '') != '' and ste.name = ste_item.parent \n\tand ste.production_order = pro.name and ste.docstatus = 1 \n\tand ste.purpose = 'Manufacture' or 'Repack'\norder by ste.posting_date, ste.production_order, ste_item.item_code",
+ "query": "select\n ste.production_order as \"Production Order:Link/Production Order:120\",\n ste.posting_date as \"Issue Date:Date:140\",\n ste_item.item_code as \"Item Code:Link/Item:120\",\n\tste_item.description as \"Description::150\",\n\tste_item.transfer_qty as \"Qty:Float:100\",\n\tste_item.stock_uom as \"UOM:Link/UOM:80\",\n\tste_item.amount as \"Amount:Currency:120\",\n\tste_item.serial_no as \"Serial No:Link/Serial No:80\",\n\tste_item.s_warehouse as \"Source Warehouse:Link/Warehouse:120\",\n\tste_item.t_warehouse as \"Target Warehouse:Link/Warehouse:120\",\n\tpro.production_item as \"Finished Goods:Link/Item:120\", \n\tste.name as \"Stock Entry:Link/Stock Entry:120\",\n\tste.company as \"Company:Link/Company:\",\n\t(select bin.projected_qty from `tabBin` bin \n\t\t\twhere bin.item_code= ste_item.item_code and bin.warehouse= ste_item.s_warehouse) as \"Projected Quantity as Source:Float:200\"\nfrom\t`tabStock Entry` ste, `tabStock Entry Detail` ste_item, `tabProduction Order` pro\nwhere\n\tifnull(ste.production_order, '') != '' and ste.name = ste_item.parent \n\tand ste.production_order = pro.name and ste.docstatus = 1\n\tand ste.purpose = 'Material Transfer for Manufacture'\norder by ste.posting_date, ste.production_order, ste_item.item_code",
"ref_doctype": "Production Order",
"report_name": "Issued Items Against Production Order",
"report_type": "Query Report"
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index b9f8efb..aad8d42 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -343,12 +343,18 @@
execute:frappe.reload_doc('accounts', 'doctype', 'accounts_settings')
execute:frappe.db.set_value("Accounts Settings", "Accounts Settings", "unlink_payment_on_cancellation_of_invoice", 0)
execute:frappe.db.sql("update `tabStock Entry` set total_amount = null where purpose in('Repack', 'Manufacture')")
+erpnext.patches.v7_1.save_stock_settings
erpnext.patches.v7_0.repost_gle_for_pi_with_update_stock #2016-11-01
erpnext.patches.v7_1.add_account_user_role_for_timesheet
erpnext.patches.v7_0.set_base_amount_in_invoice_payment_table
erpnext.patches.v7_1.update_invoice_status
erpnext.patches.v7_0.po_status_issue_for_pr_return
erpnext.patches.v7_1.update_missing_salary_component_type
+erpnext.patches.v7_1.rename_quality_inspection_field
erpnext.patches.v7_0.update_autoname_field
+erpnext.patches.v7_1.update_bom_base_currency
erpnext.patches.v7_0.update_status_of_po_so
-erpnext.patches.v7_1.repost_stock_for_deleted_bins_for_merging_items
\ No newline at end of file
+erpnext.patches.v7_1.set_budget_against_as_cost_center
+erpnext.patches.v7_1.set_currency_exchange_date
+erpnext.patches.v7_1.set_sales_person_status
+erpnext.patches.v7_1.repost_stock_for_deleted_bins_for_merging_items
diff --git a/erpnext/patches/v7_1/rename_quality_inspection_field.py b/erpnext/patches/v7_1/rename_quality_inspection_field.py
new file mode 100644
index 0000000..3b5a7d9
--- /dev/null
+++ b/erpnext/patches/v7_1/rename_quality_inspection_field.py
@@ -0,0 +1,38 @@
+from __future__ import unicode_literals
+import frappe
+from frappe.model.utils.rename_field import *
+
+def execute():
+ for doctype in ("Purchase Receipt Item", "Delivery Note Item"):
+ frappe.reload_doctype(doctype)
+
+ table_columns = frappe.db.get_table_columns(doctype)
+ if "qa_no" in table_columns:
+ rename_field(doctype, "qa_no", "quality_inspection")
+
+ frappe.reload_doctype("Item")
+ rename_field("Item", "inspection_required", "inspection_required_before_purchase")
+
+ frappe.reload_doc('stock', 'doctype', 'quality_inspection')
+ frappe.db.sql("""
+ update
+ `tabQuality Inspection`
+ set
+ reference_type = 'Purchase Receipt', reference_name = purchase_receipt_no
+ where
+ ifnull(purchase_receipt_no, '') != '' and inspection_type = 'Incoming'
+ """)
+
+ frappe.db.sql("""
+ update
+ `tabQuality Inspection`
+ set
+ reference_type = 'Delivery Note', reference_name = delivery_note_no
+ where
+ ifnull(delivery_note_no, '') != '' and inspection_type = 'Outgoing'
+ """)
+
+ for old_fieldname in ["purchase_receipt_no", "delivery_note_no"]:
+ update_reports("Quality Inspection", old_fieldname, "reference_name")
+ update_users_report_view_settings("Quality Inspection", old_fieldname, "reference_name")
+ update_property_setters("Quality Inspection", old_fieldname, "reference_name")
diff --git a/erpnext/patches/v7_1/save_stock_settings.py b/erpnext/patches/v7_1/save_stock_settings.py
new file mode 100644
index 0000000..83c27dc
--- /dev/null
+++ b/erpnext/patches/v7_1/save_stock_settings.py
@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ stock_settings = frappe.get_doc('Stock Settings')
+ stock_settings.flags.ignore_mandatory = True
+ stock_settings.save()
diff --git a/erpnext/patches/v7_1/set_budget_against_as_cost_center.py b/erpnext/patches/v7_1/set_budget_against_as_cost_center.py
new file mode 100644
index 0000000..1d334a5
--- /dev/null
+++ b/erpnext/patches/v7_1/set_budget_against_as_cost_center.py
@@ -0,0 +1,10 @@
+import frappe
+
+def execute():
+ frappe.reload_doc("accounts", "doctype", "budget")
+ frappe.db.sql("""
+ update
+ `tabBudget`
+ set
+ budget_against = 'Cost Center'
+ """)
diff --git a/erpnext/patches/v7_1/set_currency_exchange_date.py b/erpnext/patches/v7_1/set_currency_exchange_date.py
new file mode 100644
index 0000000..7d8e4f0
--- /dev/null
+++ b/erpnext/patches/v7_1/set_currency_exchange_date.py
@@ -0,0 +1,9 @@
+import frappe
+
+def execute():
+ frappe.reload_doctype("Currency Exchange")
+ frappe.db.sql("""
+ update `tabCurrency Exchange`
+ set `date` = '2010-01-01'
+ where date is null or date = '' or date = '0000-00-00'
+ """)
\ No newline at end of file
diff --git a/erpnext/patches/v7_1/set_prefered_contact_email.py b/erpnext/patches/v7_1/set_prefered_contact_email.py
index d083811..3b68e22 100644
--- a/erpnext/patches/v7_1/set_prefered_contact_email.py
+++ b/erpnext/patches/v7_1/set_prefered_contact_email.py
@@ -2,6 +2,7 @@
import frappe
def execute():
+ frappe.reload_doctype('User')
for d in frappe.get_all("Employee"):
employee = frappe.get_doc("Employee", d.name)
if employee.company_email:
@@ -13,5 +14,4 @@
elif employee.user_id:
employee.prefered_contact_email = "User ID"
employee.prefered_email = employee.user_id
-
- employee.db_update()
\ No newline at end of file
+ employee.db_update()
diff --git a/erpnext/patches/v7_1/set_sales_person_status.py b/erpnext/patches/v7_1/set_sales_person_status.py
new file mode 100644
index 0000000..929beac
--- /dev/null
+++ b/erpnext/patches/v7_1/set_sales_person_status.py
@@ -0,0 +1,8 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ frappe.reload_doc('setup','doctype','sales_person')
+ frappe.db.sql("""update `tabSales Person` set enabled=1
+ where (employee is null or employee = ''
+ or employee IN (select employee from tabEmployee where status != "Left"))""")
diff --git a/erpnext/patches/v7_1/update_bom_base_currency.py b/erpnext/patches/v7_1/update_bom_base_currency.py
new file mode 100644
index 0000000..c8af033
--- /dev/null
+++ b/erpnext/patches/v7_1/update_bom_base_currency.py
@@ -0,0 +1,19 @@
+import frappe
+from erpnext import get_default_currency
+
+def execute():
+ frappe.reload_doc("manufacturing", "doctype", "bom")
+ frappe.reload_doc("manufacturing", "doctype", "bom_item")
+ frappe.reload_doc("manufacturing", "doctype", "bom_explosion_item")
+ frappe.reload_doc("manufacturing", "doctype", "bom_operation")
+ frappe.reload_doc("manufacturing", "doctype", "bom_scrap_item")
+
+ frappe.db.sql(""" update `tabBOM Operation` set base_hour_rate = hour_rate,
+ base_operating_cost = operating_cost """)
+
+ frappe.db.sql(""" update `tabBOM Item` set base_rate = rate, base_amount = amount """)
+ frappe.db.sql(""" update `tabBOM Scrap Item` set base_rate = rate, base_amount = amount """)
+
+ frappe.db.sql(""" update `tabBOM` set `tabBOM`.base_operating_cost = `tabBOM`.operating_cost,
+ `tabBOM`.base_raw_material_cost = `tabBOM`.raw_material_cost,
+ `tabBOM`.currency = (select default_currency from `tabCompany` where name = `tabBOM`.company)""")
diff --git a/erpnext/projects/doctype/activity_cost/activity_cost.json b/erpnext/projects/doctype/activity_cost/activity_cost.json
index 00ca43f..9d812dd 100644
--- a/erpnext/projects/doctype/activity_cost/activity_cost.json
+++ b/erpnext/projects/doctype/activity_cost/activity_cost.json
@@ -3,22 +3,28 @@
"allow_import": 1,
"allow_rename": 1,
"autoname": "AC-.#####",
+ "beta": 0,
"creation": "2015-03-23 02:00:21.861546",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "activity_type",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Activity Type",
"length": 0,
"no_copy": 0,
@@ -26,7 +32,9 @@
"permlevel": 0,
"precision": "",
"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,
@@ -37,18 +45,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_2",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 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,
@@ -59,12 +72,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "employee",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Employee",
"length": 0,
"no_copy": 0,
@@ -72,7 +88,9 @@
"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,
@@ -83,12 +101,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "employee_name",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Employee Name",
"length": 0,
"no_copy": 0,
@@ -96,7 +117,9 @@
"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,
@@ -107,18 +130,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "section_break_4",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 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,
@@ -129,21 +157,26 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "0",
"description": "per hour",
"fieldname": "billing_rate",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Billing Rate",
"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,
@@ -154,18 +187,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_6",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 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,
@@ -176,21 +214,26 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "0",
"description": "per hour",
"fieldname": "costing_rate",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Costing Rate",
"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,
@@ -201,19 +244,24 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "title",
"fieldtype": "Data",
"hidden": 1,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "title",
"length": 0,
"no_copy": 1,
"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,
@@ -223,13 +271,15 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2015-11-16 06:29:41.623039",
+ "modified": "2016-11-07 05:46:58.605696",
"modified_by": "Administrator",
"module": "Projects",
"name": "Activity Cost",
@@ -246,6 +296,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -257,9 +308,11 @@
"write": 1
}
],
+ "quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"sort_field": "modified",
"sort_order": "DESC",
- "title_field": "title"
+ "title_field": "title",
+ "track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/activity_type/activity_type.json b/erpnext/projects/doctype/activity_type/activity_type.json
index 628f993..65a0fa1 100644
--- a/erpnext/projects/doctype/activity_type/activity_type.json
+++ b/erpnext/projects/doctype/activity_type/activity_type.json
@@ -15,6 +15,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "activity_type",
"fieldtype": "Data",
"hidden": 0,
@@ -22,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Activity Type",
"length": 0,
"no_copy": 0,
@@ -29,6 +31,7 @@
"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,
@@ -39,6 +42,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "costing_rate",
"fieldtype": "Currency",
"hidden": 0,
@@ -46,6 +50,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Costing Rate",
"length": 0,
"no_copy": 0,
@@ -54,6 +59,7 @@
"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,
@@ -64,6 +70,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"hidden": 0,
@@ -71,6 +78,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -78,6 +86,7 @@
"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,
@@ -88,6 +97,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "billing_rate",
"fieldtype": "Currency",
"hidden": 0,
@@ -95,6 +105,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Billing Rate",
"length": 0,
"no_copy": 0,
@@ -103,6 +114,7 @@
"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,
@@ -121,7 +133,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-08-22 08:53:43.680463",
+ "modified": "2016-12-13 12:38:18.218618",
"modified_by": "Administrator",
"module": "Projects",
"name": "Activity Type",
@@ -137,6 +149,7 @@
"export": 1,
"if_owner": 0,
"import": 1,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -157,6 +170,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -166,6 +180,27 @@
"share": 1,
"submit": 0,
"write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Employee",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 0
}
],
"quick_entry": 1,
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index 0ad59d4..37ca968 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project Name",
"length": 0,
"no_copy": 0,
@@ -52,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -81,6 +83,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Project Type",
"length": 0,
"no_copy": 0,
@@ -110,6 +113,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Is Active",
"length": 0,
"no_copy": 0,
@@ -140,6 +144,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "% Complete Method",
"length": 0,
"no_copy": 0,
@@ -168,6 +173,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -194,6 +200,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Priority",
"length": 0,
"no_copy": 0,
@@ -223,6 +230,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Expected Start Date",
"length": 0,
"no_copy": 0,
@@ -251,6 +259,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Expected End Date",
"length": 0,
"no_copy": 0,
@@ -279,6 +288,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "% Completed",
"length": 0,
"no_copy": 1,
@@ -305,11 +315,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Details",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -333,6 +344,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -362,6 +374,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -388,6 +401,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Order",
"length": 0,
"no_copy": 0,
@@ -416,6 +430,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Users",
"length": 0,
"no_copy": 0,
@@ -444,6 +459,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Users",
"length": 0,
"no_copy": 0,
@@ -472,11 +488,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Tasks",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-flag",
+ "options": "fa fa-flag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -500,6 +517,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Tasks",
"length": 0,
"no_copy": 0,
@@ -528,11 +546,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Notes",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-list",
+ "options": "fa fa-list",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -556,6 +575,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Notes",
"length": 0,
"no_copy": 0,
@@ -584,6 +604,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Start and End Dates",
"length": 0,
"no_copy": 0,
@@ -611,6 +632,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Actual Start Date",
"length": 0,
"no_copy": 0,
@@ -638,6 +660,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Actual Time (in Hours)",
"length": 0,
"no_copy": 0,
@@ -665,6 +688,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -691,6 +715,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Actual End Date",
"length": 0,
"no_copy": 0,
@@ -719,11 +744,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Costing and Billing",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -747,6 +773,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Estimated Cost",
"length": 0,
"no_copy": 0,
@@ -777,6 +804,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Costing Amount (via Time Logs)",
"length": 0,
"no_copy": 0,
@@ -805,6 +833,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Expense Claim (via Expense Claims)",
"length": 0,
"no_copy": 0,
@@ -832,6 +861,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -859,6 +889,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Cost Center",
"length": 0,
"no_copy": 0,
@@ -886,6 +917,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -913,6 +945,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Billing Amount (via Time Logs)",
"length": 0,
"no_copy": 0,
@@ -940,6 +973,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Purchase Cost (via Purchase Invoice)",
"length": 0,
"no_copy": 0,
@@ -967,6 +1001,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Margin",
"length": 0,
"no_copy": 0,
@@ -995,6 +1030,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Gross Margin",
"length": 0,
"no_copy": 0,
@@ -1024,6 +1060,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1050,6 +1087,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Gross Margin %",
"length": 0,
"no_copy": 0,
@@ -1070,7 +1108,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-puzzle-piece",
+ "icon": "fa fa-puzzle-piece",
"idx": 29,
"image_view": 0,
"in_create": 0,
@@ -1079,7 +1117,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 4,
- "modified": "2016-11-03 16:05:54.407202",
+ "modified": "2016-11-07 05:55:56.179455",
"modified_by": "Administrator",
"module": "Projects",
"name": "Project",
diff --git a/erpnext/projects/doctype/task/task.js b/erpnext/projects/doctype/task/task.js
index c6b6664..7c4eb80 100644
--- a/erpnext/projects/doctype/task/task.js
+++ b/erpnext/projects/doctype/task/task.js
@@ -67,4 +67,12 @@
});
+cur_frm.fields_dict['depends_on'].grid.get_field('task').get_query = function(doc) {
+ if(doc.project) {
+ return {
+ filters: {'project': doc.project}
+ }
+ }
+}
+
cur_frm.add_fetch('task', 'subject', 'subject');
diff --git a/erpnext/projects/doctype/task/task.json b/erpnext/projects/doctype/task/task.json
index 47991f4..9cd2aa8 100644
--- a/erpnext/projects/doctype/task/task.json
+++ b/erpnext/projects/doctype/task/task.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Subject",
"length": 0,
"no_copy": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -80,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -108,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -137,6 +141,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Priority",
"length": 0,
"no_copy": 0,
@@ -166,6 +171,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -192,6 +198,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Expected Start Date",
"length": 0,
"no_copy": 0,
@@ -222,6 +229,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Expected Time (in hours)",
"length": 0,
"no_copy": 0,
@@ -250,6 +258,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Weight",
"length": 0,
"no_copy": 0,
@@ -277,6 +286,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -303,6 +313,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Expected End Date",
"length": 0,
"no_copy": 0,
@@ -331,6 +342,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "% Progress",
"length": 0,
"no_copy": 0,
@@ -358,6 +370,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
@@ -385,6 +398,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Details",
"length": 0,
"no_copy": 0,
@@ -415,6 +429,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Depends On",
"length": 0,
"no_copy": 0,
@@ -442,6 +457,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "depends_on",
"length": 0,
"no_copy": 0,
@@ -470,6 +486,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "depends_on_tasks",
"length": 0,
"no_copy": 0,
@@ -498,6 +515,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -527,6 +545,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Actual Start Date (via Time Sheet)",
"length": 0,
"no_copy": 0,
@@ -557,6 +576,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Actual Time (in hours)",
"length": 0,
"no_copy": 0,
@@ -585,6 +605,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -611,6 +632,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Actual End Date (via Time Sheet)",
"length": 0,
"no_copy": 0,
@@ -639,6 +661,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -665,6 +688,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Costing Amount (via Time Sheet)",
"length": 0,
"no_copy": 0,
@@ -694,6 +718,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Expense Claim (via Expense Claim)",
"length": 0,
"no_copy": 0,
@@ -722,6 +747,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -748,6 +774,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Billing Amount (via Time Sheet)",
"length": 0,
"no_copy": 0,
@@ -775,6 +802,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -802,6 +830,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Review Date",
"length": 0,
"no_copy": 0,
@@ -831,6 +860,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Closing Date",
"length": 0,
"no_copy": 0,
@@ -859,6 +889,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -884,6 +915,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -902,7 +934,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-check",
+ "icon": "fa fa-check",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -912,7 +944,7 @@
"istable": 0,
"max_attachments": 5,
"menu_index": 0,
- "modified": "2016-11-03 16:06:10.725100",
+ "modified": "2016-11-07 05:12:23.294476",
"modified_by": "Administrator",
"module": "Projects",
"name": "Task",
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index a9b48fc..0ae2f8b 100644
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -133,9 +133,9 @@
data = frappe.db.sql("""select name, exp_start_date, exp_end_date,
subject, status, project from `tabTask`
where ((ifnull(exp_start_date, '0000-00-00')!= '0000-00-00') \
- and (exp_start_date between %(start)s and %(end)s) \
- or ((ifnull(exp_start_date, '0000-00-00')!= '0000-00-00') \
- and exp_end_date between %(start)s and %(end)s))
+ and (exp_start_date <= %(end)s) \
+ or ((ifnull(exp_end_date, '0000-00-00')!= '0000-00-00') \
+ and exp_end_date >= %(start)s))
{conditions}""".format(conditions=conditions), {
"start": start,
"end": end
diff --git a/erpnext/projects/doctype/timesheet/test_timesheet.py b/erpnext/projects/doctype/timesheet/test_timesheet.py
index 98866ab..11d0b1c 100644
--- a/erpnext/projects/doctype/timesheet/test_timesheet.py
+++ b/erpnext/projects/doctype/timesheet/test_timesheet.py
@@ -7,7 +7,7 @@
import unittest
import datetime
from frappe.utils.make_random import get_random
-from frappe.utils import now_datetime, nowdate
+from frappe.utils import now_datetime, nowdate, add_days
from erpnext.projects.doctype.timesheet.timesheet import OverlapError
from erpnext.projects.doctype.timesheet.timesheet import make_salary_slip, make_sales_invoice
from erpnext.accounts.doctype.sales_invoice.test_sales_invoice import create_sales_invoice
@@ -76,7 +76,7 @@
salary_structure = frappe.new_doc("Salary Structure")
salary_structure.name = "Timesheet Salary Structure Test"
salary_structure.salary_slip_based_on_timesheet = 1
- salary_structure.from_date = nowdate()
+ salary_structure.from_date = add_days(nowdate(), -30)
salary_structure.salary_component = "Basic"
salary_structure.hour_rate = 50.0
salary_structure.company = "_Test Company"
diff --git a/erpnext/projects/doctype/timesheet/timesheet.js b/erpnext/projects/doctype/timesheet/timesheet.js
index 7d0e71a..93f8b68 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.js
+++ b/erpnext/projects/doctype/timesheet/timesheet.js
@@ -41,12 +41,12 @@
if(frm.doc.docstatus==1) {
if(frm.doc.per_billed < 100){
frm.add_custom_button(__("Make Sales Invoice"), function() { frm.trigger("make_invoice") },
- "icon-file-alt");
+ "fa fa-file-alt");
}
if(!frm.doc.salary_slip && frm.doc.employee){
frm.add_custom_button(__("Make Salary Slip"), function() { frm.trigger("make_salary_slip") },
- "icon-file-alt");
+ "fa fa-file-alt");
}
}
diff --git a/erpnext/projects/doctype/timesheet/timesheet.json b/erpnext/projects/doctype/timesheet/timesheet.json
index 5d9fe94..8762a23 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.json
+++ b/erpnext/projects/doctype/timesheet/timesheet.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -81,6 +83,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Invoice",
"length": 0,
"no_copy": 1,
@@ -108,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -134,6 +138,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Salary Slip",
"length": 0,
"no_copy": 1,
@@ -163,6 +168,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -192,6 +198,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Employee Detail",
"length": 0,
"no_copy": 0,
@@ -221,6 +228,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Employee",
"length": 0,
"no_copy": 0,
@@ -250,6 +258,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Employee Name",
"length": 0,
"no_copy": 0,
@@ -278,6 +287,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "User",
"length": 0,
"no_copy": 0,
@@ -306,6 +316,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -332,6 +343,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Start Date",
"length": 0,
"no_copy": 0,
@@ -359,6 +371,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "End Date",
"length": 0,
"no_copy": 0,
@@ -388,6 +401,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Production Detail",
"length": 0,
"no_copy": 0,
@@ -415,6 +429,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Production Order",
"length": 0,
"no_copy": 1,
@@ -443,6 +458,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -468,6 +484,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Time Sheets",
"length": 0,
"no_copy": 0,
@@ -495,6 +512,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -523,6 +541,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Total Working Hours",
"length": 0,
"no_copy": 0,
@@ -549,6 +568,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Billing Details",
"length": 0,
"no_copy": 0,
@@ -576,6 +596,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Billable Hours",
"length": 0,
"no_copy": 0,
@@ -603,6 +624,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Billed Hours",
"length": 0,
"no_copy": 0,
@@ -630,6 +652,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Costing Amount",
"length": 0,
"no_copy": 0,
@@ -657,6 +680,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -686,6 +710,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Billable Amount",
"length": 0,
"no_copy": 0,
@@ -713,6 +738,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Billed Amount",
"length": 0,
"no_copy": 0,
@@ -740,6 +766,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "% Amount Billed",
"length": 0,
"no_copy": 1,
@@ -767,6 +794,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -793,6 +821,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Note",
"length": 0,
"no_copy": 0,
@@ -820,6 +849,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -838,7 +868,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-time",
+ "icon": "fa fa-time",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/projects/doctype/timesheet/timesheet.py b/erpnext/projects/doctype/timesheet/timesheet.py
index 5cb0184..48d3e00 100644
--- a/erpnext/projects/doctype/timesheet/timesheet.py
+++ b/erpnext/projects/doctype/timesheet/timesheet.py
@@ -360,7 +360,7 @@
from `tabTimesheet Detail`, `tabTimesheet`
where `tabTimesheet Detail`.parent = `tabTimesheet`.name
and `tabTimesheet`.docstatus < 2
- and (from_time between %(start)s and %(end)s) {conditions} {match_cond}
+ and (from_time <= %(end)s and to_time >= %(start)s) {conditions} {match_cond}
""".format(conditions=conditions, match_cond = get_match_cond('Timesheet')),
{
"start": start,
diff --git a/erpnext/projects/doctype/timesheet/timesheet_calendar.js b/erpnext/projects/doctype/timesheet/timesheet_calendar.js
index ad81de6..b22cd09 100644
--- a/erpnext/projects/doctype/timesheet/timesheet_calendar.js
+++ b/erpnext/projects/doctype/timesheet/timesheet_calendar.js
@@ -29,4 +29,4 @@
}
],
get_events_method: "erpnext.projects.doctype.timesheet.timesheet.get_events"
-}
\ No newline at end of file
+}
diff --git a/erpnext/public/build.json b/erpnext/public/build.json
index ac1c7c3..30b0900 100644
--- a/erpnext/public/build.json
+++ b/erpnext/public/build.json
@@ -1,37 +1,38 @@
{
- "css/erpnext.css": [
- "public/css/erpnext.css"
- ],
- "js/erpnext-web.min.js": [
- "public/js/website_utils.js",
- "public/js/shopping_cart.js"
- ],
- "js/erpnext.min.js": [
- "public/js/conf.js",
- "public/js/utils.js",
- "public/js/queries.js",
- "public/js/sms_manager.js",
- "public/js/utils/party.js",
- "public/js/templates/address_list.html",
- "public/js/templates/contact_list.html",
- "public/js/controllers/stock_controller.js",
- "public/js/payment/payments.js",
- "public/js/controllers/taxes_and_totals.js",
- "public/js/controllers/transaction.js",
- "public/js/pos/pos.html",
- "public/js/pos/pos_bill_item.html",
- "public/js/pos/pos_item.html",
- "public/js/pos/pos_tax_row.html",
- "public/js/pos/pos_invoice_list.html",
- "public/js/payment/pos_payment.html",
- "public/js/payment/payment_details.html",
- "public/js/templates/item_selector.html",
- "public/js/utils/item_selector.js",
- "public/js/help_links.js"
- ],
- "js/item-dashboard.min.js": [
- "stock/dashboard/item_dashboard.html",
- "stock/dashboard/item_dashboard_list.html",
- "stock/dashboard/item_dashboard.js"
- ]
-}
+ "css/erpnext.css": [
+ "public/css/erpnext.css"
+ ],
+ "js/erpnext-web.min.js": [
+ "public/js/website_utils.js",
+ "public/js/shopping_cart.js"
+ ],
+ "js/erpnext.min.js": [
+ "public/js/conf.js",
+ "public/js/utils.js",
+ "public/js/queries.js",
+ "public/js/sms_manager.js",
+ "public/js/utils/party.js",
+ "public/js/templates/address_list.html",
+ "public/js/templates/contact_list.html",
+ "public/js/controllers/stock_controller.js",
+ "public/js/payment/payments.js",
+ "public/js/controllers/taxes_and_totals.js",
+ "public/js/controllers/transaction.js",
+ "public/js/pos/pos.html",
+ "public/js/pos/pos_bill_item.html",
+ "public/js/pos/pos_item.html",
+ "public/js/pos/pos_tax_row.html",
+ "public/js/pos/pos_invoice_list.html",
+ "public/js/payment/pos_payment.html",
+ "public/js/payment/payment_details.html",
+ "public/js/templates/item_selector.html",
+ "public/js/utils/item_selector.js",
+ "public/js/help_links.js",
+ "public/js/schools/student_button.html"
+ ],
+ "js/item-dashboard.min.js": [
+ "stock/dashboard/item_dashboard.html",
+ "stock/dashboard/item_dashboard_list.html",
+ "stock/dashboard/item_dashboard.js"
+ ]
+}
\ No newline at end of file
diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js
index 89e5396..d256c08 100644
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -14,7 +14,7 @@
$('.navbar-home').html('<img class="erpnext-icon" src="'+
frappe.urllib.get_base_url()+'/assets/erpnext/images/erp-icon.svg" />');
- $('[data-link="docs"]').attr("href", "https://manual.erpnext.com")
+ $('[data-link="docs"]').attr("href", "https://frappe.github.io/erpnext/")
$('[data-link="issues"]').attr("href", "https://github.com/frappe/erpnext/issues")
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index aa20e79..dcbb56b 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -79,11 +79,9 @@
frm.cscript.calculate_taxes_and_totals();
});
-
},
onload: function() {
var me = this;
- //this.frm.show_print_first = true;
if(this.frm.doc.__islocal) {
var today = get_today(),
currency = frappe.defaults.get_user_default("currency");
@@ -136,7 +134,42 @@
}
});
}
+
+ this.setup_quality_inspection();
+ },
+ setup_quality_inspection: function() {
+ if(!in_list(["Delivery Note", "Sales Invoice", "Purchase Receipt", "Purchase Invoice"], this.frm.doc.doctype)) {
+ return;
+ }
+ var me = this;
+ var inspection_type = in_list(["Purchase Receipt", "Purchase Invoice"], this.frm.doc.doctype)
+ ? "Incoming" : "Outgoing";
+
+ var quality_inspection_field = this.frm.get_docfield("items", "quality_inspection");
+ quality_inspection_field.get_route_options_for_new_doc = function(row) {
+ if(me.frm.is_new()) return;
+ return {
+ "inspection_type": inspection_type,
+ "reference_type": me.frm.doc.doctype,
+ "reference_name": me.frm.doc.name,
+ "item_code": row.doc.item_code,
+ "description": row.doc.description,
+ "item_serial_no": row.doc.serial_no ? row.doc.serial_no.split("\n")[0] : null,
+ "batch_no": row.doc.batch_no
+ }
+ }
+
+ this.frm.set_query("quality_inspection", "items", function(doc, cdt, cdn) {
+ var d = locals[cdt][cdn];
+ return {
+ filters: {
+ docstatus: 1,
+ inspection_type: inspection_type,
+ item_code: d.item_code
+ }
+ }
+ });
},
onload_post_render: function() {
@@ -380,6 +413,7 @@
transaction_date: function() {
if (this.frm.doc.transaction_date) {
this.frm.transaction_date = this.frm.doc.transaction_date;
+ frappe.ui.form.trigger(this.frm.doc.doctype, "currency");
}
},
@@ -401,9 +435,12 @@
callback: function(r, rt) {
if(r.message) {
me.frm.set_value("due_date", r.message);
+ frappe.ui.form.trigger(me.frm.doc.doctype, "currency");
}
}
})
+ } else {
+ frappe.ui.form.trigger(me.frm.doc.doctype, "currency");
}
}
},
@@ -417,6 +454,10 @@
},
currency: function() {
+ /* manqala 19/09/2016: let the translation date be whichever of the transaction_date or posting_date is available */
+ var transaction_date = this.frm.doc.transaction_date || this.frm.doc.posting_date;
+ /* end manqala */
+
var me = this;
this.set_dynamic_labels();
@@ -424,7 +465,7 @@
// Added `ignore_pricing_rule` to determine if document is loading after mapping from another doc
if(this.frm.doc.currency && this.frm.doc.currency !== company_currency
&& !this.frm.doc.ignore_pricing_rule) {
- this.get_exchange_rate(this.frm.doc.currency, company_currency,
+ this.get_exchange_rate(transaction_date, this.frm.doc.currency, company_currency,
function(exchange_rate) {
me.frm.set_value("conversion_rate", exchange_rate);
});
@@ -452,10 +493,11 @@
}
},
- get_exchange_rate: function(from_currency, to_currency, callback) {
+ get_exchange_rate: function(transaction_date, from_currency, to_currency, callback) {
return frappe.call({
method: "erpnext.setup.utils.get_exchange_rate",
args: {
+ transaction_date: transaction_date,
from_currency: from_currency,
to_currency: to_currency
},
@@ -472,7 +514,7 @@
var company_currency = this.get_company_currency();
// Added `ignore_pricing_rule` to determine if document is loading after mapping from another doc
if(this.frm.doc.price_list_currency !== company_currency && !this.frm.doc.ignore_pricing_rule) {
- this.get_exchange_rate(this.frm.doc.price_list_currency, company_currency,
+ this.get_exchange_rate(this.frm.doc.posting_date, this.frm.doc.price_list_currency, company_currency,
function(exchange_rate) {
me.frm.set_value("plc_conversion_rate", exchange_rate);
});
@@ -517,28 +559,20 @@
change_form_labels: function(company_currency) {
var me = this;
- var field_label_map = {};
- var setup_field_label_map = function(fields_list, currency) {
- $.each(fields_list, function(i, fname) {
- var docfield = frappe.meta.docfield_map[me.frm.doc.doctype][fname];
- if(docfield) {
- var label = __(docfield.label || "").replace(/\([^\)]*\)/g, "");
- field_label_map[fname] = label.trim() + " (" + currency + ")";
- }
- });
- };
- setup_field_label_map(["base_total", "base_net_total", "base_total_taxes_and_charges",
+ this.frm.set_currency_labels(["base_total", "base_net_total", "base_total_taxes_and_charges",
"base_discount_amount", "base_grand_total", "base_rounded_total", "base_in_words",
"base_taxes_and_charges_added", "base_taxes_and_charges_deducted", "total_amount_to_pay",
- "base_paid_amount", "base_write_off_amount", "base_change_amount"
+ "base_paid_amount", "base_write_off_amount", "base_change_amount", "base_operating_cost",
+ "base_raw_material_cost", "base_total_cost", "base_scrap_material_cost"
], company_currency);
- setup_field_label_map(["total", "net_total", "total_taxes_and_charges", "discount_amount",
+ this.frm.set_currency_labels(["total", "net_total", "total_taxes_and_charges", "discount_amount",
"grand_total", "taxes_and_charges_added", "taxes_and_charges_deducted",
- "rounded_total", "in_words", "paid_amount", "write_off_amount"], this.frm.doc.currency);
+ "rounded_total", "in_words", "paid_amount", "write_off_amount", "operating_cost", "scrap_material_cost",
+ "raw_material_cost", "total_cost"], this.frm.doc.currency);
- setup_field_label_map(["outstanding_amount", "total_advance"], this.frm.doc.party_account_currency);
+ this.frm.set_currency_labels(["outstanding_amount", "total_advance"], this.frm.doc.party_account_currency);
cur_frm.set_df_property("conversion_rate", "description", "1 " + this.frm.doc.currency
+ " = [?] " + company_currency)
@@ -552,17 +586,13 @@
this.frm.toggle_display(["conversion_rate", "base_total", "base_net_total", "base_total_taxes_and_charges",
"base_taxes_and_charges_added", "base_taxes_and_charges_deducted",
"base_grand_total", "base_rounded_total", "base_in_words", "base_discount_amount",
- "base_paid_amount", "base_write_off_amount"],
+ "base_paid_amount", "base_write_off_amount", "base_operating_cost",
+ "base_raw_material_cost", "base_total_cost", "base_scrap_material_cost"],
this.frm.doc.currency != company_currency);
this.frm.toggle_display(["plc_conversion_rate", "price_list_currency"],
this.frm.doc.price_list_currency != company_currency);
- // set labels
- $.each(field_label_map, function(fname, label) {
- me.frm.fields_dict[fname].set_label(label);
- });
-
var show =cint(cur_frm.doc.discount_amount) ||
((cur_frm.doc.taxes || []).filter(function(d) {return d.included_in_print_rate===1}).length);
@@ -576,34 +606,43 @@
change_grid_labels: function(company_currency) {
var me = this;
- var field_label_map = {};
- var setup_field_label_map = function(fields_list, currency, parentfield) {
- var grid_doctype = me.frm.fields_dict[parentfield].grid.doctype;
- $.each(fields_list, function(i, fname) {
- var docfield = frappe.meta.docfield_map[grid_doctype][fname];
- if(docfield) {
- var label = __(docfield.label || "").replace(/\([^\)]*\)/g, "");
- field_label_map[grid_doctype + "-" + fname] =
- label.trim() + " (" + __(currency) + ")";
- }
+ this.frm.set_currency_labels(["base_rate", "base_net_rate", "base_price_list_rate", "base_amount", "base_net_amount"],
+ company_currency, "items");
+
+ this.frm.set_currency_labels(["rate", "net_rate", "price_list_rate", "amount", "net_amount"],
+ this.frm.doc.currency, "items");
+
+ if(this.frm.fields_dict["operations"]) {
+ this.frm.set_currency_labels(["operating_cost", "hour_rate"], this.frm.doc.currency, "operations");
+ this.frm.set_currency_labels(["base_operating_cost", "base_hour_rate"], company_currency, "operations");
+
+ var item_grid = this.frm.fields_dict["operations"].grid;
+ $.each(["base_operating_cost", "base_hour_rate"], function(i, fname) {
+ if(frappe.meta.get_docfield(item_grid.doctype, fname))
+ item_grid.set_column_disp(fname, me.frm.doc.currency != company_currency);
});
}
- setup_field_label_map(["base_rate", "base_net_rate", "base_price_list_rate", "base_amount", "base_net_amount"],
- company_currency, "items");
+ if(this.frm.fields_dict["scrap_items"]) {
+ this.frm.set_currency_labels(["rate", "amount"], this.frm.doc.currency, "scrap_items");
+ this.frm.set_currency_labels(["base_rate", "base_amount"], company_currency, "scrap_items");
- setup_field_label_map(["rate", "net_rate", "price_list_rate", "amount", "net_amount"],
- this.frm.doc.currency, "items");
+ var item_grid = this.frm.fields_dict["scrap_items"].grid;
+ $.each(["base_rate", "base_amount"], function(i, fname) {
+ if(frappe.meta.get_docfield(item_grid.doctype, fname))
+ item_grid.set_column_disp(fname, me.frm.doc.currency != company_currency);
+ });
+ }
if(this.frm.fields_dict["taxes"]) {
- setup_field_label_map(["tax_amount", "total", "tax_amount_after_discount"], this.frm.doc.currency, "taxes");
+ this.frm.set_currency_labels(["tax_amount", "total", "tax_amount_after_discount"], this.frm.doc.currency, "taxes");
- setup_field_label_map(["base_tax_amount", "base_total", "base_tax_amount_after_discount"], company_currency, "taxes");
+ this.frm.set_currency_labels(["base_tax_amount", "base_total", "base_tax_amount_after_discount"], company_currency, "taxes");
}
if(this.frm.fields_dict["advances"]) {
- setup_field_label_map(["advance_amount", "allocated_amount"],
+ this.frm.set_currency_labels(["advance_amount", "allocated_amount"],
this.frm.doc.party_account_currency, "advances");
}
@@ -629,11 +668,6 @@
// set labels
var $wrapper = $(this.frm.wrapper);
- $.each(field_label_map, function(fname, label) {
- fname = fname.split("-");
- var df = frappe.meta.get_docfield(fname[0], fname[1], me.frm.doc.name);
- if(df) df.label = label;
- });
},
recalculate: function() {
@@ -711,7 +745,9 @@
"qty": d.qty,
"parenttype": d.parenttype,
"parent": d.parent,
- "pricing_rule": d.pricing_rule
+ "pricing_rule": d.pricing_rule,
+ "warehouse": d.warehouse,
+ "serial_no": d.serial_no
});
// if doctype is Quotation Item / Sales Order Iten then add Margin Type and rate in item_list
@@ -866,13 +902,17 @@
get_terms: function() {
var me = this;
if(this.frm.doc.tc_name) {
- return this.frm.call({
- method: "frappe.client.get_value",
+ return frappe.call({
+ method: 'erpnext.setup.doctype.terms_and_conditions.terms_and_conditions.get_terms_and_conditions',
args: {
- doctype: "Terms and Conditions",
- fieldname: "terms",
- filters: { name: this.frm.doc.tc_name },
+ template_name: this.frm.doc.tc_name,
+ doc: this.frm.doc
},
+ callback: function(r) {
+ if(!r.exc) {
+ me.frm.set_value("terms", r.message);
+ }
+ }
});
}
},
@@ -1004,5 +1044,6 @@
}
return method
- }
+ },
+
});
\ No newline at end of file
diff --git a/erpnext/public/js/pos/pos_bill_item.html b/erpnext/public/js/pos/pos_bill_item.html
index c21e1d5..a6ef2d6 100644
--- a/erpnext/public/js/pos/pos_bill_item.html
+++ b/erpnext/public/js/pos/pos_bill_item.html
@@ -2,18 +2,18 @@
<div class="col-xs-5"><h6>{%= item_code || "" %}{%= item_name || "" %}</h6></div>
<div class="col-xs-4">
<div class="row pos-qty-row">
- <div class="col-xs-2 text-center pos-qty-btn" data-action="decrease-qty"><i class="icon-minus-sign text-muted"></i></div>
+ <div class="col-xs-2 text-center pos-qty-btn" data-action="decrease-qty"><i class="fa fa-minus-sign text-muted"></i></div>
<div class="col-xs-8">
<div>
<input type="text" value="{%= qty %}" class="form-control input-sm pos-item-qty text-right">
</div>
{% if(actual_qty != null) { %}
<div style="margin-top: 5px;" class="text-muted small text-right">
- <span title="{%= __("In Stock") %}">{%= actual_qty || 0 %}<span>
+ <span title="{%= __("In Stock") %}">{%= actual_qty || 0 %}<span>
</div>
{% } %}
</div>
- <div class="col-xs-2 text-center pos-qty-btn" data-action="increase-qty"><i class="icon-plus-sign text-muted"></i></div>
+ <div class="col-xs-2 text-center pos-qty-btn" data-action="increase-qty"><i class="fa fa-plus-sign text-muted"></i></div>
</div>
</div>
<div class="col-xs-3 text-right">
diff --git a/erpnext/public/js/pos/pos_invoice_list.html b/erpnext/public/js/pos/pos_invoice_list.html
index 6eecfe3..67110a7 100644
--- a/erpnext/public/js/pos/pos_invoice_list.html
+++ b/erpnext/public/js/pos/pos_invoice_list.html
@@ -1,7 +1,7 @@
<div class="row list-row pos-invoice-list" invoice-name = "{{name}}">
- <div class="col-xs-1">{%= sr %}</div>
- <div class="col-xs-3">{%= customer %}</div>
- <div class="col-xs-2 text-left"><span class="indicator {{data.indicator}}">{{ data.status }}</span></div>
- <div class="col-xs-3 text-right">{%= paid_amount %}</div>
- <div class="col-xs-3 text-right">{%= grand_total %}</div>
+ <div class="col-xs-1"><input class="list-delete" type="checkbox"></div>
+ <div class="list-column col-xs-3">{%= customer %}</div>
+ <div class="list-column col-xs-2 text-left"><span class="indicator {{data.indicator}}">{{ data.status }}</span></div>
+ <div class="list-column col-xs-3 text-right">{%= paid_amount %}</div>
+ <div class="list-column col-xs-3 text-right">{%= grand_total %}</div>
</div>
diff --git a/erpnext/public/js/pos/pos_item.html b/erpnext/public/js/pos/pos_item.html
index aec36a7..b33076d 100644
--- a/erpnext/public/js/pos/pos_item.html
+++ b/erpnext/public/js/pos/pos_item.html
@@ -6,8 +6,8 @@
{% if (!item_image) { %}{{ abbr }}{% } %}
</div>
<div class="pos-item-text">
- <h6 class="item-code text-ellipsis">{%= item_name ? (item_name + " (" + item_code + ")") : item_code %}</h6>
- <div class="small text-ellipsis">{%= item_price %}</div>
+ <h6 class="item-code ellipsis">{%= item_name ? (item_name + " (" + item_code + ")") : item_code %}</h6>
+ <div class="small ellipsis">{%= item_price %}</div>
</div>
</div>
</div>
\ No newline at end of file
diff --git a/erpnext/public/js/schools/student_button.html b/erpnext/public/js/schools/student_button.html
new file mode 100644
index 0000000..dabaf26
--- /dev/null
+++ b/erpnext/public/js/schools/student_button.html
@@ -0,0 +1,20 @@
+<div class="col-sm-3">
+ <div class="checkbox {% if status %} text-muted {% endif %}">
+ <label>
+ <input
+ type="checkbox"
+ data-idx="{{idx}}"
+ data-student="{{student}}"
+ data-student-name="{{student_name}}"
+ class="students-check"
+ {% if status %}
+ disabled="true"
+ {% endif %}
+ {% if status === "Present" %}
+ checked
+ {% endif %}
+ >
+ {{ idx }} - {{ student_name }}
+ </label>
+ </div>
+</div>
\ No newline at end of file
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index 0013fdb..30323ec 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -34,7 +34,7 @@
org: {
domains: ["all"],
title: __("The Organization"),
- icon: "icon-building",
+ icon: "fa fa-building",
fields: [
{fieldname:'company_name',
label: frappe.wiz.domain==='Education' ?
@@ -158,7 +158,7 @@
branding: {
domains: ["all"],
- icon: "icon-bookmark",
+ icon: "fa fa-bookmark",
title: __("The Brand"),
help: __('Upload your letter head and logo. (you can edit them later).'),
fields: [
@@ -180,7 +180,7 @@
users: {
domains: ["all"],
- icon: "icon-money",
+ icon: "fa fa-money",
title: __("Add Users"),
help: __("Add users to your organization, other than yourself"),
fields: [],
@@ -212,7 +212,7 @@
taxes: {
domains: ['manufacturing', 'services', 'retail', 'distribution'],
- icon: "icon-money",
+ icon: "fa fa-money",
title: __("Add Taxes"),
help: __("List your tax heads (e.g. VAT, Customs etc; they should have unique names) and their standard rates. This will create a standard template, which you can edit and add more later."),
"fields": [],
@@ -233,7 +233,7 @@
customers: {
domains: ['manufacturing', 'services', 'retail', 'distribution'],
- icon: "icon-group",
+ icon: "fa fa-group",
title: __("Your Customers"),
help: __("List a few of your customers. They could be organizations or individuals."),
fields: [],
@@ -256,7 +256,7 @@
suppliers: {
domains: ['manufacturing', 'services', 'retail', 'distribution'],
- icon: "icon-group",
+ icon: "fa fa-group",
title: __("Your Suppliers"),
help: __("List a few of your suppliers. They could be organizations or individuals."),
fields: [],
@@ -279,7 +279,7 @@
items: {
domains: ['manufacturing', 'services', 'retail', 'distribution'],
- icon: "icon-barcode",
+ icon: "fa fa-barcode",
title: __("Your Products or Services"),
help: __("List your products or services that you buy or sell. Make sure to check the Item Group, Unit of Measure and other properties when you start."),
fields: [],
diff --git a/erpnext/public/js/shopping_cart.js b/erpnext/public/js/shopping_cart.js
index 1617283..2a69deb 100644
--- a/erpnext/public/js/shopping_cart.js
+++ b/erpnext/public/js/shopping_cart.js
@@ -8,7 +8,7 @@
// update user
if(full_name) {
$('.navbar li[data-label="User"] a')
- .html('<i class="icon-fixed-width icon-user"></i> ' + full_name);
+ .html('<i class="fa fa-fixed-width fa fa-user"></i> ' + full_name);
}
// update login
diff --git a/erpnext/public/js/templates/item_selector.html b/erpnext/public/js/templates/item_selector.html
index 47da67c..89171f8 100644
--- a/erpnext/public/js/templates/item_selector.html
+++ b/erpnext/public/js/templates/item_selector.html
@@ -8,7 +8,7 @@
{% if(!item.image) { %}{{ item.abbr }}{% } %}
</div>
<div class="pos-item-text">
- <h6 class="item-code text-ellipsis">{{ item.name }}</h6>
+ <h6 class="item-code ellipsis">{{ item.name }}</h6>
</div>
</div>
</div>
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 466ff28..04f5f95 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -143,8 +143,35 @@
if(!cur_frm.doc.items[0].item_code) {
cur_frm.doc.items = cur_frm.doc.items.splice(1);
}
+
+ // find the doctype of the items table
+ var items_doctype = frappe.meta.get_docfield(cur_frm.doctype, 'items').options;
+
+ // find the link fieldname from items table for the given
+ // source_doctype
+ var link_fieldname = null;
+ frappe.get_meta(items_doctype).fields.forEach(function(d) {
+ if(d.options===opts.source_doctype) link_fieldname = d.fieldname; });
+
+ // search in existing items if the source_name is already set
+ var already_set = false;
+
+ $.each(cur_frm.doc.items, function(i, d) {
+ if(d[link_fieldname]==opts.source_name) {
+ already_set = true;
+ return false;
+ }
+ });
+
+ if(already_set) {
+ frappe.msgprint(__("You have already selected items from {0} {1}",
+ [opts.source_doctype, opts.source_name]));
+ return;
+ }
+
}
+
return frappe.call({
// Sometimes we hit the limit for URL length of a GET request
// as we send the full target_doc. Hence this is a POST request.
@@ -192,7 +219,7 @@
frappe.form.link_formatters['Item'] = function(value, doc) {
if(doc && doc.item_name && doc.item_name !== value) {
- return value + ': ' + doc.item_name;
+ return value? value + ': ' + doc.item_name: doc.item_name;
} else {
return value;
}
@@ -200,7 +227,7 @@
frappe.form.link_formatters['Employee'] = function(value, doc) {
if(doc && doc.employee_name && doc.employee_name !== value) {
- return value + ': ' + doc.employee_name;
+ return value? value + ': ' + doc.employee_name: doc.employee_name;
} else {
return value;
}
diff --git a/erpnext/schools/api.py b/erpnext/schools/api.py
index 6011158..bf09351 100644
--- a/erpnext/schools/api.py
+++ b/erpnext/schools/api.py
@@ -30,33 +30,42 @@
return program_enrollment
@frappe.whitelist()
-def check_attendance_records_exist(course_schedule):
- """Check if Attendance Records are made against the specified Course Schedule.
+def check_attendance_records_exist(course_schedule=None, student_batch=None, date=None):
+ """Check if Attendance Records are made against the specified Course Schedule or Student Batch for given date.
:param course_schedule: Course Schedule.
+ :param student_batch: Student Batch.
+ :param date: Date.
"""
- return frappe.get_list("Student Attendance", filters={"course_schedule": course_schedule})
+ if course_schedule:
+ return frappe.get_list("Student Attendance", filters={"course_schedule": course_schedule})
+ else:
+ return frappe.get_list("Student Attendance", filters={"student_batch": student_batch, "date": date})
@frappe.whitelist()
-def mark_attendance(students_present, students_absent, course_schedule):
+def mark_attendance(students_present, students_absent, course_schedule=None, student_batch=None, date=None):
"""Creates Multiple Attendance Records.
:param students_present: Students Present JSON.
:param students_absent: Students Absent JSON.
:param course_schedule: Course Schedule.
+ :param student_batch: Student Batch.
+ :param date: Date.
"""
+
present = json.loads(students_present)
absent = json.loads(students_absent)
-
+
for d in present:
- make_attendance_records(d["student"], d["student_name"], course_schedule, "Present")
+ make_attendance_records(d["student"], d["student_name"], "Present", course_schedule, student_batch, date)
for d in absent:
- make_attendance_records(d["student"], d["student_name"], course_schedule, "Absent")
+ make_attendance_records(d["student"], d["student_name"], "Absent", course_schedule, student_batch, date)
+ frappe.db.commit()
frappe.msgprint(_("Attendance has been marked successfully."))
-def make_attendance_records(student, student_name, course_schedule, status):
+def make_attendance_records(student, student_name, status, course_schedule=None, student_batch=None, date=None):
"""Creates Attendance Record.
:param student: Student.
@@ -68,9 +77,19 @@
student_attendance.student = student
student_attendance.student_name = student_name
student_attendance.course_schedule = course_schedule
+ student_attendance.student_batch = student_batch
+ student_attendance.date = date
student_attendance.status = status
student_attendance.submit()
- frappe.db.commit()
+
+@frappe.whitelist()
+def get_student_batch_students(student_batch):
+ """Returns List of student, student_name in Student Batch.
+
+ :param student_batch: Student Batch.
+ """
+ students = frappe.get_list("Student Batch Student", fields=["student", "student_name", "idx"] , filters={"parent": student_batch}, order_by= "idx")
+ return students
@frappe.whitelist()
def get_student_group_students(student_group):
diff --git a/erpnext/schools/doctype/academic_term/academic_term.json b/erpnext/schools/doctype/academic_term/academic_term.json
index ca10ebf..e15d5d6 100644
--- a/erpnext/schools/doctype/academic_term/academic_term.json
+++ b/erpnext/schools/doctype/academic_term/academic_term.json
@@ -10,11 +10,13 @@
"doctype": "DocType",
"document_type": "Setup",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "academic_year",
"fieldtype": "Link",
"hidden": 0,
@@ -22,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Academic Year",
"length": 0,
"no_copy": 0,
@@ -31,6 +34,7 @@
"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,
@@ -41,6 +45,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "term_name",
"fieldtype": "Data",
"hidden": 0,
@@ -48,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Term Name",
"length": 0,
"no_copy": 0,
@@ -56,6 +62,7 @@
"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,
@@ -66,6 +73,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "term_start_date",
"fieldtype": "Date",
"hidden": 0,
@@ -73,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Term Start Date",
"length": 0,
"no_copy": 0,
@@ -81,6 +90,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -91,6 +101,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "term_end_date",
"fieldtype": "Date",
"hidden": 0,
@@ -98,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Term End Date",
"length": 0,
"no_copy": 0,
@@ -106,6 +118,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -116,6 +129,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "title",
"fieldtype": "Data",
"hidden": 1,
@@ -123,6 +137,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 0,
@@ -131,6 +146,7 @@
"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,
@@ -148,7 +164,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-08-27 23:02:03.565866",
+ "modified": "2016-11-07 05:45:48.577744",
"modified_by": "Administrator",
"module": "Schools",
"name": "Academic Term",
@@ -165,6 +181,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/schools/doctype/academic_term/academic_term.py b/erpnext/schools/doctype/academic_term/academic_term.py
index 891feb8..4a1a941 100644
--- a/erpnext/schools/doctype/academic_term/academic_term.py
+++ b/erpnext/schools/doctype/academic_term/academic_term.py
@@ -4,35 +4,35 @@
from __future__ import unicode_literals
import frappe
-from frappe import msgprint, _
-from frappe.utils import get_datetime, get_datetime_str
+from frappe import _
+from frappe.utils import get_datetime
from frappe.model.document import Document
class AcademicTerm(Document):
def autoname(self):
self.name = self.academic_year + " ({})".format(self.term_name) if self.term_name else ""
-
+
def validate(self):
#Check if entry with same academic_year and the term_name already exists
validate_duplication(self)
self.title = self.academic_year + " ({})".format(self.term_name) if self.term_name else ""
-
+
#Check that start of academic year is earlier than end of academic year
if self.term_start_date and self.term_end_date and self.term_start_date > self.term_end_date:
frappe.throw(_("The Term End Date cannot be earlier than the Term Start Date. Please correct the dates and try again."))
-
- """Check that the start of the term is not before the start of the academic year and end of term is not after
+
+ """Check that the start of the term is not before the start of the academic year and end of term is not after
the end of the academic year"""
year = frappe.get_doc("Academic Year",self.academic_year)
- if self.term_start_date and get_datetime_str(year.year_start_date) and (self.term_start_date < get_datetime_str(year.year_start_date)):
+ if self.term_start_date and get_datetime(year.year_start_date) and (self.term_start_date < get_datetime(year.year_start_date)):
frappe.throw(_("The Term Start Date cannot be earlier than the Year Start Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.").format(self.academic_year))
-
- if self.term_end_date and get_datetime_str(year.year_end_date) and (self.term_end_date > get_datetime_str(year.year_end_date)):
+
+ if self.term_end_date and get_datetime(year.year_end_date) and (self.term_end_date > get_datetime(year.year_end_date)):
frappe.throw(_("The Term End Date cannot be later than the Year End Date of the Academic Year to which the term is linked (Academic Year {}). Please correct the dates and try again.").format(self.academic_year))
def validate_duplication(self):
- term = frappe.db.sql("""select name from `tabAcademic Term` where academic_year= %s and term_name= %s
+ term = frappe.db.sql("""select name from `tabAcademic Term` where academic_year= %s and term_name= %s
and docstatus<2 and name != %s""", (self.academic_year, self.term_name, self.name))
if term:
frappe.throw(_("An academic term with this 'Academic Year' {0} and 'Term Name' {1} already exists. Please modify these entries and try again.").format(self.academic_year,self.term_name))
diff --git a/erpnext/schools/doctype/assessment/assessment.js b/erpnext/schools/doctype/assessment/assessment.js
index efadbd6..e842f41 100644
--- a/erpnext/schools/doctype/assessment/assessment.js
+++ b/erpnext/schools/doctype/assessment/assessment.js
@@ -6,46 +6,46 @@
cur_frm.add_fetch("supervisor", "instructor_name", "supervisor_name");
cur_frm.add_fetch("student", "title", "student_name");
-frappe.ui.form.on("Assessment" ,{
- student_group : function(frm) {
- frm.set_value("results" ,"");
- if (frm.doc.student_group) {
- frappe.call({
- method: "erpnext.schools.api.get_student_group_students",
- args: {
- "student_group": frm.doc.student_group
- },
- callback: function(r) {
- if (r.message) {
- $.each(r.message, function(i, d) {
- var row = frappe.model.add_child(cur_frm.doc, "Assessment Result", "results");
- row.student = d.student;
- row.student_name = d.student_name;
- });
- }
- refresh_field("results");
- }
- });
- }
- }
+frappe.ui.form.on("Assessment", {
+ student_group: function(frm) {
+ frm.set_value("results", "");
+ if (frm.doc.student_group) {
+ frappe.call({
+ method: "erpnext.schools.api.get_student_group_students",
+ args: {
+ "student_group": frm.doc.student_group
+ },
+ callback: function(r) {
+ if (r.message) {
+ $.each(r.message, function(i, d) {
+ var row = frappe.model.add_child(cur_frm.doc, "Assessment Result", "results");
+ row.student = d.student;
+ row.student_name = d.student_name;
+ });
+ }
+ refresh_field("results");
+ }
+ });
+ }
+ }
});
-frappe.ui.form.on("Assessment Result" ,{
- result : function(frm, cdt, cdn) {
- if(frm.doc.grading_structure){
- var assessment_result = locals[cdt][cdn];
- frappe.call({
- method:"erpnext.schools.doctype.assessment.assessment.get_grade",
- args:{
- grading_structure: frm.doc.grading_structure,
- result: assessment_result.result
- },
- callback: function(r){
- if(r.message){
- frappe.model.set_value(cdt, cdn, 'grade', r.message);
- }
- }
- });
- }
- }
+frappe.ui.form.on("Assessment Result", {
+ result: function(frm, cdt, cdn) {
+ if (frm.doc.grading_structure) {
+ var assessment_result = locals[cdt][cdn];
+ frappe.call({
+ method: "erpnext.schools.doctype.assessment.assessment.get_grade",
+ args: {
+ grading_structure: frm.doc.grading_structure,
+ result: assessment_result.result
+ },
+ callback: function(r) {
+ if (r.message) {
+ frappe.model.set_value(cdt, cdn, 'grade', r.message);
+ }
+ }
+ });
+ }
+ }
});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/assessment/assessment.json b/erpnext/schools/doctype/assessment/assessment.json
index e978d08..845f2f6 100644
--- a/erpnext/schools/doctype/assessment/assessment.json
+++ b/erpnext/schools/doctype/assessment/assessment.json
@@ -10,11 +10,13 @@
"doctype": "DocType",
"document_type": "Setup",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "assessment_name",
"fieldtype": "Data",
"hidden": 0,
@@ -22,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Assessment Name",
"length": 0,
"no_copy": 0,
@@ -30,6 +33,7 @@
"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,
@@ -40,6 +44,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "assessment_code",
"fieldtype": "Data",
"hidden": 0,
@@ -47,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Assessment Code",
"length": 0,
"no_copy": 0,
@@ -55,6 +61,7 @@
"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,
@@ -65,6 +72,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "student_group",
"fieldtype": "Link",
"hidden": 0,
@@ -72,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Student Group",
"length": 0,
"no_copy": 0,
@@ -81,8 +90,9 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
- "reqd": 1,
+ "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@@ -91,6 +101,36 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
+ "fieldname": "student_batch",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Student Batch",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Student Batch",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "grading_structure",
"fieldtype": "Link",
"hidden": 0,
@@ -98,6 +138,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Grading Structure",
"length": 0,
"no_copy": 0,
@@ -107,6 +148,7 @@
"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,
@@ -117,6 +159,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "course",
"fieldtype": "Link",
"hidden": 0,
@@ -124,6 +167,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Course",
"length": 0,
"no_copy": 0,
@@ -133,6 +177,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -143,6 +188,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_2",
"fieldtype": "Column Break",
"hidden": 0,
@@ -150,6 +196,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -157,6 +204,7 @@
"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,
@@ -167,6 +215,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "assessment_group",
"fieldtype": "Link",
"hidden": 0,
@@ -174,6 +223,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Assessment Group",
"length": 0,
"no_copy": 0,
@@ -183,6 +233,7 @@
"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,
@@ -193,6 +244,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "supervisor",
"fieldtype": "Link",
"hidden": 0,
@@ -200,6 +252,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supervisor",
"length": 0,
"no_copy": 0,
@@ -209,6 +262,7 @@
"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,
@@ -219,6 +273,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "supervisor_name",
"fieldtype": "Data",
"hidden": 0,
@@ -226,6 +281,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supervisor Name",
"length": 0,
"no_copy": 0,
@@ -234,6 +290,7 @@
"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,
@@ -244,6 +301,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "examiner",
"fieldtype": "Link",
"hidden": 0,
@@ -251,6 +309,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Examiner",
"length": 0,
"no_copy": 0,
@@ -260,6 +319,7 @@
"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,
@@ -270,6 +330,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "examiner_name",
"fieldtype": "Data",
"hidden": 0,
@@ -277,6 +338,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Examiner Name",
"length": 0,
"no_copy": 0,
@@ -285,6 +347,7 @@
"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,
@@ -296,6 +359,7 @@
"bold": 0,
"collapsible": 1,
"collapsible_depends_on": "",
+ "columns": 0,
"depends_on": "",
"fieldname": "section_break_5",
"fieldtype": "Section Break",
@@ -304,6 +368,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Schedule",
"length": 0,
"no_copy": 0,
@@ -312,6 +377,7 @@
"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,
@@ -322,6 +388,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "Today",
"fieldname": "schedule_date",
"fieldtype": "Date",
@@ -330,6 +397,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Schedule Date",
"length": 0,
"no_copy": 0,
@@ -338,6 +406,7 @@
"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,
@@ -348,6 +417,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "room",
"fieldtype": "Link",
"hidden": 0,
@@ -355,6 +425,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Room",
"length": 0,
"no_copy": 0,
@@ -364,6 +435,7 @@
"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,
@@ -374,6 +446,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_4",
"fieldtype": "Column Break",
"hidden": 0,
@@ -381,6 +454,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -388,6 +462,7 @@
"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,
@@ -398,6 +473,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "from_time",
"fieldtype": "Time",
"hidden": 0,
@@ -405,6 +481,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "From Time",
"length": 0,
"no_copy": 0,
@@ -413,6 +490,7 @@
"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,
@@ -423,6 +501,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "to_time",
"fieldtype": "Time",
"hidden": 0,
@@ -430,6 +509,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "To Time",
"length": 0,
"no_copy": 0,
@@ -438,6 +518,7 @@
"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,
@@ -448,6 +529,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 1,
+ "columns": 0,
"fieldname": "section_break_11",
"fieldtype": "Section Break",
"hidden": 0,
@@ -455,6 +537,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Results",
"length": 0,
"no_copy": 0,
@@ -463,6 +546,7 @@
"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,
@@ -473,6 +557,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "results",
"fieldtype": "Table",
"hidden": 0,
@@ -480,6 +565,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "results",
"length": 0,
"no_copy": 0,
@@ -489,6 +575,7 @@
"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,
@@ -499,6 +586,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "amended_from",
"fieldtype": "Link",
"hidden": 0,
@@ -506,6 +594,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -514,6 +603,7 @@
"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,
@@ -532,7 +622,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-08-27 14:18:51.852078",
+ "modified": "2016-11-16 13:05:54.953750",
"modified_by": "Administrator",
"module": "Schools",
"name": "Assessment",
@@ -549,6 +639,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/schools/doctype/assessment/assessment.py b/erpnext/schools/doctype/assessment/assessment.py
index de6a653..003b427 100644
--- a/erpnext/schools/doctype/assessment/assessment.py
+++ b/erpnext/schools/doctype/assessment/assessment.py
@@ -8,56 +8,66 @@
from frappe import _
class Assessment(Document):
- def validate(self):
- self.validate_overlap()
-
- def validate_overlap(self):
- """Validates overlap for Student Group, Supervisor, Room"""
+ def validate(self):
+ self.validate_overlap()
- from erpnext.schools.utils import validate_overlap_for
+ def validate_overlap(self):
+ """Validates overlap for Student Group/Student Batch, Instructor, Room"""
+
+ from erpnext.schools.utils import validate_overlap_for
- validate_overlap_for(self, "Assessment", "student_group")
- validate_overlap_for(self, "Course Schedule", "student_group" )
-
- if self.room:
- validate_overlap_for(self, "Assessment", "room")
- validate_overlap_for(self, "Course Schedule", "room")
+ #Validate overlapping course schedules.
+ if self.student_batch:
+ validate_overlap_for(self, "Course Schedule", "student_batch")
- if self.supervisor:
- validate_overlap_for(self, "Assessment", "supervisor")
- validate_overlap_for(self, "Course Schedule", "instructor", self.supervisor)
+ if self.student_group:
+ validate_overlap_for(self, "Course Schedule", "student_group")
+
+ validate_overlap_for(self, "Course Schedule", "instructor")
+ validate_overlap_for(self, "Course Schedule", "room")
+
+ #validate overlapping assessment schedules.
+ if self.student_batch:
+ validate_overlap_for(self, "Assessment", "student_batch")
+
+ if self.student_group:
+ validate_overlap_for(self, "Assessment", "student_group")
+
+ validate_overlap_for(self, "Assessment", "room")
+ validate_overlap_for(self, "Assessment", "supervisor", self.instructor)
+
def get_assessment_list(doctype, txt, filters, limit_start, limit_page_length=20):
- user = frappe.session.user
- student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
- if student:
- return frappe. db.sql('''select course, schedule_date, from_time, to_time, sgs.name from `tabAssessment` as assessment,
- `tabStudent Group Student` as sgs where assessment.student_group = sgs.parent and sgs.student = %s and assessment.docstatus=1
- order by assessment.name asc limit {0} , {1}'''
- .format(limit_start, limit_page_length), student, as_dict = True)
+ user = frappe.session.user
+ student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
+ if student:
+ return frappe. db.sql('''select course, schedule_date, from_time, to_time, sgs.name from `tabAssessment` as assessment,
+ `tabStudent Group Student` as sgs where assessment.student_group = sgs.parent and sgs.student = %s and assessment.docstatus=1
+ order by assessment.name asc limit {0} , {1}'''
+ .format(limit_start, limit_page_length), student, as_dict = True)
def get_list_context(context=None):
- return {
- "show_sidebar": True,
- 'no_breadcrumbs': True,
- "title": _("Assessment Schedule"),
- "get_list": get_assessment_list,
- "row_template": "templates/includes/assessment/assessment_row.html"
- }
+ return {
+ "show_sidebar": True,
+ 'no_breadcrumbs': True,
+ "title": _("Assessment Schedule"),
+ "get_list": get_assessment_list,
+ "row_template": "templates/includes/assessment/assessment_row.html"
+ }
@frappe.whitelist()
def get_grade(grading_structure, result):
- grade = frappe.db.sql("""select gi.from_score, gi.to_score, gi.grade_code, gi.grade_description
- from `tabGrading Structure` as gs, `tabGrade Interval` as gi
- where gs.name = gi.parent and gs.name = %(grading_structure)s and gi.from_score <= %(result)s
- and gi.to_score >= %(result)s""".format(),
- {
- "grading_structure":grading_structure,
- "result": result
- },
- as_dict=True)
-
- return grade[0].grade_code if grade else ""
+ grade = frappe.db.sql("""select gi.from_score, gi.to_score, gi.grade_code, gi.grade_description
+ from `tabGrading Structure` as gs, `tabGrade Interval` as gi
+ where gs.name = gi.parent and gs.name = %(grading_structure)s and gi.from_score <= %(result)s
+ and gi.to_score >= %(result)s""".format(),
+ {
+ "grading_structure":grading_structure,
+ "result": result
+ },
+ as_dict=True)
+
+ return grade[0].grade_code if grade else ""
def validate_grade(score, grade):
- pass
\ No newline at end of file
+ pass
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course/course.json b/erpnext/schools/doctype/course/course.json
index c03246b..6fada19 100644
--- a/erpnext/schools/doctype/course/course.json
+++ b/erpnext/schools/doctype/course/course.json
@@ -10,11 +10,13 @@
"doctype": "DocType",
"document_type": "",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "course_name",
"fieldtype": "Data",
"hidden": 0,
@@ -22,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Course Name",
"length": 0,
"no_copy": 0,
@@ -30,6 +33,7 @@
"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,
@@ -40,6 +44,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "course_code",
"fieldtype": "Data",
"hidden": 0,
@@ -47,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Course Code",
"length": 0,
"no_copy": 0,
@@ -55,6 +61,7 @@
"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,
@@ -65,6 +72,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"hidden": 0,
@@ -72,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -79,6 +88,7 @@
"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,
@@ -89,6 +99,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "course_abbreviation",
"fieldtype": "Data",
"hidden": 0,
@@ -96,6 +107,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Course Abbreviation",
"length": 0,
"no_copy": 0,
@@ -104,6 +116,7 @@
"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,
@@ -114,6 +127,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "department",
"fieldtype": "Link",
"hidden": 0,
@@ -121,6 +135,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Department",
"length": 0,
"no_copy": 0,
@@ -130,6 +145,7 @@
"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,
@@ -140,6 +156,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "section_break_6",
"fieldtype": "Section Break",
"hidden": 0,
@@ -147,6 +164,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -154,6 +172,7 @@
"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,
@@ -164,6 +183,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "course_intro",
"fieldtype": "Text Editor",
"hidden": 0,
@@ -171,6 +191,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Course Intro",
"length": 0,
"no_copy": 0,
@@ -179,6 +200,7 @@
"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,
@@ -197,7 +219,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-07-25 01:33:48.647068",
+ "modified": "2016-08-08 05:26:26.442635",
"modified_by": "Administrator",
"module": "Schools",
"name": "Course",
@@ -214,6 +236,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -223,6 +246,26 @@
"share": 1,
"submit": 0,
"write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
}
],
"quick_entry": 0,
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.js b/erpnext/schools/doctype/course_schedule/course_schedule.js
index 2defbd5..12e8522 100644
--- a/erpnext/schools/doctype/course_schedule/course_schedule.js
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.js
@@ -1,137 +1,15 @@
frappe.provide("schools")
-frappe.ui.form.on("Course Schedule" ,{
- onload: function(frm) {
- if (frm.doc.from_datetime && frm.doc.to_datetime) {
- var from_datetime = moment(frm.doc.from_datetime);
- var to_datetime = moment(frm.doc.to_datetime);
- frm.doc.schedule_date = from_datetime.format(moment.defaultFormat);
- frm.doc.from_time = from_datetime.format("HH:mm:ss");
- frm.doc.to_time = to_datetime.format("HH:mm:ss");
- }
- },
-
- refresh :function(frm) {
- if(!frm.doc.__islocal) {
- frappe.call({
- method: "erpnext.schools.api.check_attendance_records_exist",
- args: {
- "course_schedule": frm.doc.name
- },
- callback: function(r) {
- if(r.message) {
- hide_field('attendance');
- frm.events.view_attendance(frm)
- }
- else {
- frappe.call({
- method: "erpnext.schools.api.get_student_group_students",
- args: {
- "student_group": frm.doc.student_group
- },
- callback: function(r) {
- if (r.message) {
- frm.events.get_students(frm, r.message)
- }
- }
- });
- }
- }
- });
- }
- else {
- hide_field('attendance');
- }
- },
-
- view_attendance: function(frm) {
- hide_field('attendance');
- frm.add_custom_button(__("View attendance"), function() {
- frappe.route_options = {
- course_schedule: frm.doc.name
- }
- frappe.set_route("List", "Student Attendance");
- });
- },
-
- get_students: function(frm, students) {
- if(!frm.students_area) {
- frm.students_area = $('<div>')
- .appendTo(frm.fields_dict.students_html.wrapper);
- }
- frm.students_editor = new schools.StudentsEditor(frm, frm.students_area, students)
- }
-});
-
-
-schools.StudentsEditor = Class.extend({
- init: function(frm, wrapper, students) {
- this.wrapper = wrapper;
- this.frm = frm;
- this.make(frm, students);
- },
- make: function(frm, students) {
- var me = this;
-
- $(this.wrapper).empty();
- var student_toolbar = $('<p>\
- <button class="btn btn-default btn-add btn-xs" style="margin-right: 5px;"></button>\
- <button class="btn btn-xs btn-default btn-remove" style="margin-right: 5px;"></button>\
- <button class="btn btn-default btn-primary btn-mark-att btn-xs"></button></p>').appendTo($(this.wrapper));
-
- student_toolbar.find(".btn-add")
- .html(__('Check all'))
- .on("click", function() {
- $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
- if(!$(check).is(":checked")) {
- check.checked = true;
- }
- });
- });
-
- student_toolbar.find(".btn-remove")
- .html(__('Uncheck all'))
- .on("click", function() {
- $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
- if($(check).is(":checked")) {
- check.checked = false;
- }
- });
- });
-
- student_toolbar.find(".btn-mark-att")
- .html(__('Mark Attendence'))
- .on("click", function() {
- var students_present = [];
- var students_absent = [];
- $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
- if($(check).is(":checked")) {
- students_present.push(students[i]);
- }
- else {
- students_absent.push(students[i]);
- }
- });
- frappe.call({
- method: "erpnext.schools.api.mark_attendance",
- args: {
- "students_present": students_present,
- "students_absent": students_absent,
- "course_schedule": frm.doc.name
- },
- callback: function(r) {
- frm.events.view_attendance(frm)
- }
- });
- });
-
-
- $.each(students, function(i, m) {
- $(repl('<div class="col-sm-6">\
- <div class="checkbox">\
- <label><input type="checkbox" class="students-check" student="%(student)s">\
- %(student)s</label>\
- </div></div>', {student: m.student_name})).appendTo(me.wrapper);
- });
- }
-})
\ No newline at end of file
+frappe.ui.form.on("Course Schedule", {
+ refresh: function(frm) {
+ if (!frm.doc.__islocal) {
+ frm.add_custom_button(__("Attendance"), function() {
+ frappe.route_options = {
+ based_on: "Course Schedule",
+ course_schedule: frm.doc.name
+ }
+ frappe.set_route("Form", "Student Attendance Tool");
+ });
+ }
+ }
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.json b/erpnext/schools/doctype/course_schedule/course_schedule.json
index 308cf68..450d7cf 100644
--- a/erpnext/schools/doctype/course_schedule/course_schedule.json
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.json
@@ -2,7 +2,7 @@
"allow_copy": 0,
"allow_import": 1,
"allow_rename": 0,
- "autoname": "SH.####",
+ "autoname": "naming_series:",
"beta": 0,
"creation": "2015-09-09 16:34:04.960369",
"custom": 0,
@@ -10,11 +10,42 @@
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
+ "fieldname": "student_batch",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Student Batch",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Student Batch",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "student_group",
"fieldtype": "Link",
"hidden": 0,
@@ -22,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Student Group",
"length": 0,
"no_copy": 0,
@@ -31,8 +63,9 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
- "reqd": 1,
+ "reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
@@ -41,6 +74,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "instructor",
"fieldtype": "Link",
"hidden": 0,
@@ -48,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Instructor",
"length": 0,
"no_copy": 0,
@@ -57,6 +92,7 @@
"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,
@@ -67,56 +103,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "column_break_2",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "course",
- "fieldtype": "Read Only",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Course",
- "length": 0,
- "no_copy": 0,
- "options": "student_group.course",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
+ "columns": 0,
"fieldname": "instructor_name",
"fieldtype": "Read Only",
"hidden": 0,
@@ -124,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Instructor Name",
"length": 0,
"no_copy": 0,
@@ -133,6 +121,7 @@
"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,
@@ -143,13 +132,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "section_break_6",
- "fieldtype": "Section Break",
+ "columns": 0,
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -157,6 +148,7 @@
"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,
@@ -167,6 +159,93 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
+ "default": "SH",
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Naming Series",
+ "length": 0,
+ "no_copy": 0,
+ "options": "SH",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "course",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Course",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Course",
+ "permlevel": 0,
+ "precision": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_6",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"default": "Today",
"fieldname": "schedule_date",
"fieldtype": "Date",
@@ -175,6 +254,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Schedule Date",
"length": 0,
"no_copy": 0,
@@ -183,6 +263,7 @@
"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,
@@ -193,6 +274,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "room",
"fieldtype": "Link",
"hidden": 0,
@@ -200,6 +282,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Room",
"length": 0,
"no_copy": 0,
@@ -209,6 +292,7 @@
"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,
@@ -219,6 +303,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_9",
"fieldtype": "Column Break",
"hidden": 0,
@@ -226,6 +311,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -233,6 +319,7 @@
"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,
@@ -243,6 +330,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "from_time",
"fieldtype": "Time",
"hidden": 0,
@@ -250,6 +338,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "From Time",
"length": 0,
"no_copy": 0,
@@ -258,6 +347,7 @@
"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,
@@ -268,6 +358,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "to_time",
"fieldtype": "Time",
"hidden": 0,
@@ -275,6 +366,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "To Time",
"length": 0,
"no_copy": 0,
@@ -283,6 +375,7 @@
"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,
@@ -292,57 +385,8 @@
{
"allow_on_submit": 0,
"bold": 0,
- "collapsible": 1,
- "fieldname": "attendance",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Attendance",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
"collapsible": 0,
- "fieldname": "students_html",
- "fieldtype": "HTML",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Students HTML",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
+ "columns": 0,
"fieldname": "title",
"fieldtype": "Data",
"hidden": 1,
@@ -350,6 +394,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 0,
@@ -358,6 +403,7 @@
"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,
@@ -376,7 +422,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-07-25 01:25:04.593769",
+ "modified": "2016-12-09 17:00:02.822788",
"modified_by": "Administrator",
"module": "Schools",
"name": "Course Schedule",
@@ -388,11 +434,33 @@
"apply_user_permissions": 0,
"cancel": 0,
"create": 1,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 1,
+ "role": "Instructor",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/schools/doctype/course_schedule/course_schedule.py b/erpnext/schools/doctype/course_schedule/course_schedule.py
index 11f3894..ec30c62 100644
--- a/erpnext/schools/doctype/course_schedule/course_schedule.py
+++ b/erpnext/schools/doctype/course_schedule/course_schedule.py
@@ -4,34 +4,62 @@
from __future__ import unicode_literals
import frappe
+from frappe import _
from frappe.model.document import Document
class CourseSchedule(Document):
def validate(self):
self.instructor_name = frappe.db.get_value("Instructor", self.instructor, "instructor_name")
self.set_title()
+ self.validate_mandatory()
+ self.validate_course()
+ self.set_student_batch()
self.validate_date()
self.validate_overlap()
-
+
def set_title(self):
"""Set document Title"""
self.title = self.course + " by " + (self.instructor_name if self.instructor_name else self.instructor)
+ def validate_mandatory(self):
+ if not (self.student_batch or self.student_group):
+ frappe.throw(_("""Student Batch or Student Group is mandatory"""))
+
+ def validate_course(self):
+ if self.student_group:
+ self.course= frappe.db.get_value("Student Group", self.student_group, "course")
+
+ def set_student_batch(self):
+ if self.student_group:
+ self.student_batch = frappe.db.get_value("Student Group", self.student_group, "student_batch")
+
def validate_date(self):
"""Validates if from_time is greater than to_time"""
if self.from_time > self.to_time:
- frappe.throw("From Time cannot be greater than To Time.")
+ frappe.throw(_("From Time cannot be greater than To Time."))
def validate_overlap(self):
- """Validates overlap for Student Group, Instructor, Room"""
+ """Validates overlap for Student Group/Student Batch, Instructor, Room"""
from erpnext.schools.utils import validate_overlap_for
- validate_overlap_for(self, "Course Schedule", "student_group" )
+ #Validate overlapping course schedules.
+ if self.student_batch:
+ validate_overlap_for(self, "Course Schedule", "student_batch")
+
+ if self.student_group:
+ validate_overlap_for(self, "Course Schedule", "student_group")
+
validate_overlap_for(self, "Course Schedule", "instructor")
validate_overlap_for(self, "Course Schedule", "room")
- validate_overlap_for(self, "Assessment", "student_group")
+ #validate overlapping assessment schedules.
+ if self.student_batch:
+ validate_overlap_for(self, "Assessment", "student_batch")
+
+ if self.student_group:
+ validate_overlap_for(self, "Assessment", "student_group")
+
validate_overlap_for(self, "Assessment", "room")
validate_overlap_for(self, "Assessment", "supervisor", self.instructor)
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/doctype/course_scheduling_tool/__init__.py
similarity index 100%
rename from erpnext/schools/doctype/scheduling_tool/__init__.py
rename to erpnext/schools/doctype/course_scheduling_tool/__init__.py
diff --git a/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js
new file mode 100644
index 0000000..ea62b8f
--- /dev/null
+++ b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.js
@@ -0,0 +1,21 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+cur_frm.add_fetch("student_group", "program", "program");
+cur_frm.add_fetch("student_group", "student_batch", "student_batch");
+cur_frm.add_fetch("student_group", "course", "course");
+cur_frm.add_fetch("student_group", "academic_year", "academic_year");
+cur_frm.add_fetch("student_group", "academic_term", "academic_term");
+
+frappe.ui.form.on("Course Scheduling Tool", {
+
+ refresh: function(frm) {
+ frm.disable_save();
+ frm.page.set_primary_action(__("Schedule Course"), function() {
+ frappe.call({
+ method: "schedule_course",
+ doc: frm.doc
+ })
+ });
+ }
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.json b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.json
similarity index 82%
rename from erpnext/schools/doctype/scheduling_tool/scheduling_tool.json
rename to erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.json
index 41a7b94..a66960e 100644
--- a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.json
+++ b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.json
@@ -9,11 +9,42 @@
"doctype": "DocType",
"document_type": "Setup",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
+ "fieldname": "student_batch",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Student Batch",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Student Batch",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "student_group",
"fieldtype": "Link",
"hidden": 0,
@@ -21,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Group",
"length": 0,
"no_copy": 0,
@@ -30,6 +62,36 @@
"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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "course",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Course",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Course",
+ "permlevel": 0,
+ "precision": "",
+ "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,
@@ -40,6 +102,34 @@
"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_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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "academic_year",
"fieldtype": "Link",
"hidden": 0,
@@ -47,6 +137,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Academic Year",
"length": 0,
"no_copy": 0,
@@ -56,6 +147,7 @@
"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,
@@ -66,6 +158,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "academic_term",
"fieldtype": "Link",
"hidden": 0,
@@ -73,6 +166,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Academic Term",
"length": 0,
"no_copy": 0,
@@ -82,6 +176,7 @@
"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,
@@ -92,30 +187,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "column_break_3",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
+ "columns": 0,
"fieldname": "program",
"fieldtype": "Link",
"hidden": 0,
@@ -123,6 +195,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Program",
"length": 0,
"no_copy": 0,
@@ -132,6 +205,7 @@
"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,
@@ -142,32 +216,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "course",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Course",
- "length": 0,
- "no_copy": 0,
- "options": "Course",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
+ "columns": 0,
"fieldname": "section_break_6",
"fieldtype": "Section Break",
"hidden": 0,
@@ -175,6 +224,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -182,6 +232,7 @@
"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,
@@ -192,56 +243,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "room",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Room",
- "length": 0,
- "no_copy": 0,
- "options": "Room",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "column_break_9",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
+ "columns": 0,
"fieldname": "instructor",
"fieldtype": "Link",
"hidden": 0,
@@ -249,6 +251,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Instructor",
"length": 0,
"no_copy": 0,
@@ -258,6 +261,7 @@
"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,
@@ -268,6 +272,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "instructor_name",
"fieldtype": "Read Only",
"hidden": 0,
@@ -275,6 +280,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Instructor Name",
"length": 0,
"no_copy": 0,
@@ -284,6 +290,7 @@
"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,
@@ -294,13 +301,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "section_break_7",
- "fieldtype": "Section Break",
+ "columns": 0,
+ "fieldname": "column_break_9",
+ "fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -308,6 +317,7 @@
"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,
@@ -318,22 +328,25 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "default": "",
- "fieldname": "from_time",
- "fieldtype": "Time",
+ "columns": 0,
+ "fieldname": "room",
+ "fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "From Time",
+ "in_standard_filter": 0,
+ "label": "Room",
"length": 0,
"no_copy": 0,
+ "options": "Room",
"permlevel": 0,
"precision": "",
"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,
@@ -344,6 +357,63 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_7",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "",
+ "fieldname": "from_time",
+ "fieldtype": "Time",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "From Time",
+ "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": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"default": "",
"fieldname": "course_start_date",
"fieldtype": "Date",
@@ -352,6 +422,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Course Start Date",
"length": 0,
"no_copy": 0,
@@ -361,6 +432,7 @@
"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,
@@ -371,6 +443,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "day",
"fieldtype": "Select",
"hidden": 0,
@@ -378,6 +451,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Day",
"length": 0,
"no_copy": 0,
@@ -387,6 +461,7 @@
"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,
@@ -397,6 +472,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "rechedule",
"fieldtype": "Check",
"hidden": 0,
@@ -404,6 +480,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rechedule",
"length": 0,
"no_copy": 0,
@@ -412,6 +489,7 @@
"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,
@@ -422,6 +500,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_15",
"fieldtype": "Column Break",
"hidden": 0,
@@ -429,6 +508,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -436,6 +516,7 @@
"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,
@@ -446,6 +527,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "to_time",
"fieldtype": "Time",
"hidden": 0,
@@ -453,6 +535,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "To TIme",
"length": 0,
"no_copy": 0,
@@ -461,6 +544,7 @@
"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,
@@ -471,6 +555,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "",
"fieldname": "course_end_date",
"fieldtype": "Date",
@@ -479,6 +564,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Course End Date",
"length": 0,
"no_copy": 0,
@@ -487,6 +573,7 @@
"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,
@@ -505,10 +592,10 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-07-25 01:24:48.220756",
+ "modified": "2016-11-21 16:58:29.295922",
"modified_by": "Administrator",
"module": "Schools",
- "name": "Scheduling Tool",
+ "name": "Course Scheduling Tool",
"name_case": "",
"owner": "Administrator",
"permissions": [
@@ -522,6 +609,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
diff --git a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py
similarity index 84%
rename from erpnext/schools/doctype/scheduling_tool/scheduling_tool.py
rename to erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py
index 4a62a74..86fefe2 100644
--- a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.py
+++ b/erpnext/schools/doctype/course_scheduling_tool/course_scheduling_tool.py
@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe Technologies and contributors
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
# For license information, please see license.txt
from __future__ import unicode_literals
@@ -10,7 +10,7 @@
from frappe.utils import add_days, getdate
from erpnext.schools.utils import OverlapError
-class SchedulingTool(Document):
+class CourseSchedulingTool(Document):
def schedule_course(self):
"""Creates course schedules as per specified parametes"""
@@ -22,7 +22,9 @@
self.validate_mandatory()
self.validate_date()
self.instructor_name= frappe.db.get_value("Instructor", self.instructor, "instructor_name")
- self.course= frappe.db.get_value("Student Group", self.student_group, "course")
+
+ if self.student_group:
+ self.course= frappe.db.get_value("Student Group", self.student_group, "course")
if self.rechedule:
rescheduled, reschedule_errors = self.delete_course_schedule(rescheduled, reschedule_errors)
@@ -54,7 +56,11 @@
def validate_mandatory(self):
"""Validates all mandatory fields"""
- fields = ['student_group', 'room', 'instructor', 'from_time', 'to_time', 'course_start_date', 'course_end_date', 'day']
+
+ if not (self.student_batch or self.student_group):
+ frappe.throw(_("""Student Batch or Student Group is mandatory"""))
+
+ fields = ['course', 'room', 'instructor', 'from_time', 'to_time', 'course_start_date', 'course_end_date', 'day']
for d in fields:
if not self.get(d):
frappe.throw(_("{0} is mandatory").format(self.meta.get_label(d)))
@@ -68,6 +74,8 @@
"""Delete all course schedule within the Date range and specified filters"""
schedules = frappe.get_list("Course Schedule", fields=["name", "schedule_date"], filters =
[["student_group", "=", self.student_group],
+ ["student_batch", "=", self.student_batch],
+ ["course", "=", self.course],
["schedule_date", ">=", self.course_start_date],
["schedule_date", "<=", self.course_end_date]])
for d in schedules:
@@ -85,6 +93,7 @@
course_schedule = frappe.new_doc("Course Schedule")
course_schedule.student_group = self.student_group
+ course_schedule.student_batch = self.student_batch
course_schedule.course = self.course
course_schedule.instructor = self.instructor
course_schedule.instructor_name = self.instructor_name
@@ -93,3 +102,4 @@
course_schedule.from_time= self.from_time
course_schedule.to_time= self.to_time
return course_schedule
+
diff --git a/erpnext/schools/doctype/discussion/discussion.json b/erpnext/schools/doctype/discussion/discussion.json
index 1fea44d..57ebfba 100644
--- a/erpnext/schools/doctype/discussion/discussion.json
+++ b/erpnext/schools/doctype/discussion/discussion.json
@@ -10,11 +10,13 @@
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "subject",
"fieldtype": "Data",
"hidden": 0,
@@ -22,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Subject",
"length": 0,
"no_copy": 0,
@@ -30,6 +33,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
@@ -40,6 +44,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "course",
"fieldtype": "Link",
"hidden": 0,
@@ -47,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Course",
"length": 0,
"no_copy": 0,
@@ -56,6 +62,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -66,6 +73,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "description",
"fieldtype": "Text",
"hidden": 0,
@@ -73,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -81,6 +90,7 @@
"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,
@@ -91,6 +101,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "amended_from",
"fieldtype": "Link",
"hidden": 0,
@@ -98,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -106,6 +118,7 @@
"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,
@@ -123,7 +136,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-07-25 05:24:23.235387",
+ "modified": "2016-11-07 05:28:34.032169",
"modified_by": "Administrator",
"module": "Schools",
"name": "Discussion",
@@ -140,6 +153,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/schools/doctype/fee_category/fee_category.json b/erpnext/schools/doctype/fee_category/fee_category.json
index 4314aae..da8f7b1 100644
--- a/erpnext/schools/doctype/fee_category/fee_category.json
+++ b/erpnext/schools/doctype/fee_category/fee_category.json
@@ -69,7 +69,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 0,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/schools/doctype/fee_component/fee_component.json b/erpnext/schools/doctype/fee_component/fee_component.json
index c0f7bd6..ecf3314 100644
--- a/erpnext/schools/doctype/fee_component/fee_component.json
+++ b/erpnext/schools/doctype/fee_component/fee_component.json
@@ -95,7 +95,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 0,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/schools/doctype/fee_structure/fee_structure.json b/erpnext/schools/doctype/fee_structure/fee_structure.json
index 95a2f6f..6e99032 100644
--- a/erpnext/schools/doctype/fee_structure/fee_structure.json
+++ b/erpnext/schools/doctype/fee_structure/fee_structure.json
@@ -10,6 +10,7 @@
"doctype": "DocType",
"document_type": "Setup",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
@@ -23,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Program",
"length": 0,
"no_copy": 0,
@@ -34,6 +36,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
@@ -52,6 +55,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Naming Series",
"length": 0,
"no_copy": 0,
@@ -61,6 +65,7 @@
"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,
@@ -79,6 +84,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -86,6 +92,7 @@
"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,
@@ -104,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Academic Term",
"length": 0,
"no_copy": 0,
@@ -115,6 +123,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
@@ -134,6 +143,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Category",
"length": 0,
"no_copy": 0,
@@ -143,6 +153,7 @@
"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,
@@ -161,6 +172,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -168,6 +180,7 @@
"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,
@@ -186,6 +199,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Components",
"length": 0,
"no_copy": 0,
@@ -195,6 +209,7 @@
"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,
@@ -213,6 +228,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -220,6 +236,7 @@
"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,
@@ -238,6 +255,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Total Amount",
"length": 0,
"no_copy": 0,
@@ -246,6 +264,7 @@
"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,
@@ -255,7 +274,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 0,
"image_view": 0,
"in_create": 0,
@@ -265,7 +284,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-09-05 06:54:22.360035",
+ "modified": "2016-11-07 05:25:37.393218",
"modified_by": "Administrator",
"module": "Schools",
"name": "Fee Structure",
@@ -282,6 +301,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/schools/doctype/fees/fees.json b/erpnext/schools/doctype/fees/fees.json
index a3af99b..6309dbd 100644
--- a/erpnext/schools/doctype/fees/fees.json
+++ b/erpnext/schools/doctype/fees/fees.json
@@ -10,6 +10,7 @@
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
@@ -23,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student",
"length": 0,
"no_copy": 0,
@@ -32,6 +34,7 @@
"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,
@@ -50,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Academic Year",
"length": 0,
"no_copy": 0,
@@ -59,6 +63,7 @@
"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,
@@ -77,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Academic Term",
"length": 0,
"no_copy": 0,
@@ -86,6 +92,7 @@
"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,
@@ -104,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Fee Structure",
"length": 0,
"no_copy": 0,
@@ -113,6 +121,7 @@
"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,
@@ -131,6 +140,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Due Date",
"length": 0,
"no_copy": 0,
@@ -139,6 +149,7 @@
"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,
@@ -157,6 +168,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -164,6 +176,7 @@
"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,
@@ -182,6 +195,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Name",
"length": 0,
"no_copy": 0,
@@ -190,6 +204,7 @@
"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,
@@ -208,6 +223,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Naming Series",
"length": 0,
"no_copy": 0,
@@ -217,6 +233,7 @@
"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,
@@ -235,6 +252,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Program",
"length": 0,
"no_copy": 0,
@@ -244,6 +262,7 @@
"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,
@@ -262,6 +281,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Program Enrollment",
"length": 0,
"no_copy": 0,
@@ -271,6 +291,7 @@
"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,
@@ -289,6 +310,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Category",
"length": 0,
"no_copy": 0,
@@ -298,6 +320,7 @@
"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,
@@ -316,6 +339,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -323,6 +347,7 @@
"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,
@@ -341,6 +366,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Components",
"length": 0,
"no_copy": 0,
@@ -350,6 +376,7 @@
"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,
@@ -368,6 +395,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -375,6 +403,7 @@
"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,
@@ -393,6 +422,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -401,6 +431,7 @@
"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,
@@ -419,6 +450,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -426,6 +458,7 @@
"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,
@@ -445,6 +478,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Amount",
"length": 0,
"no_copy": 0,
@@ -453,6 +487,7 @@
"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,
@@ -472,6 +507,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Paid Amount",
"length": 0,
"no_copy": 1,
@@ -480,6 +516,7 @@
"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,
@@ -499,6 +536,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Outstanding Amount",
"length": 0,
"no_copy": 1,
@@ -507,6 +545,7 @@
"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,
@@ -525,7 +564,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-09-05 06:56:33.012835",
+ "modified": "2016-11-07 05:25:29.875222",
"modified_by": "Administrator",
"module": "Schools",
"name": "Fees",
@@ -542,6 +581,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/schools/doctype/instructor/instructor.json b/erpnext/schools/doctype/instructor/instructor.json
index e461980..fbb4a0b 100644
--- a/erpnext/schools/doctype/instructor/instructor.json
+++ b/erpnext/schools/doctype/instructor/instructor.json
@@ -10,6 +10,7 @@
"doctype": "DocType",
"document_type": "Other",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
@@ -23,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Instructor Name",
"length": 0,
"no_copy": 0,
@@ -31,6 +33,7 @@
"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,
@@ -49,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Employee",
"length": 0,
"no_copy": 0,
@@ -58,6 +62,7 @@
"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,
@@ -76,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -83,6 +89,7 @@
"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,
@@ -101,6 +108,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Naming Series",
"length": 0,
"no_copy": 0,
@@ -110,6 +118,7 @@
"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,
@@ -128,6 +137,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Department",
"length": 0,
"no_copy": 0,
@@ -137,6 +147,7 @@
"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,
@@ -155,6 +166,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
@@ -163,6 +175,7 @@
"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,
@@ -182,7 +195,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-09-19 03:51:10.877110",
+ "modified": "2016-11-07 05:24:48.046207",
"modified_by": "Administrator",
"module": "Schools",
"name": "Instructor",
@@ -198,7 +211,8 @@
"email": 1,
"export": 1,
"if_owner": 0,
- "import": 1,
+ "import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/schools/doctype/program/program.json b/erpnext/schools/doctype/program/program.json
index ca6e1df..95a37f0 100644
--- a/erpnext/schools/doctype/program/program.json
+++ b/erpnext/schools/doctype/program/program.json
@@ -1,7 +1,7 @@
{
"allow_copy": 0,
"allow_import": 1,
- "allow_rename": 0,
+ "allow_rename": 1,
"autoname": "field:program_name",
"beta": 0,
"creation": "2015-09-07 12:54:03.609282",
@@ -10,11 +10,13 @@
"doctype": "DocType",
"document_type": "",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "program_name",
"fieldtype": "Data",
"hidden": 0,
@@ -22,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Program Name",
"length": 0,
"no_copy": 0,
@@ -30,6 +33,7 @@
"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,
@@ -40,6 +44,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "program_code",
"fieldtype": "Data",
"hidden": 0,
@@ -47,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Program Code",
"length": 0,
"no_copy": 0,
@@ -55,6 +61,7 @@
"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,
@@ -65,6 +72,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "program_abbreviation",
"fieldtype": "Data",
"hidden": 0,
@@ -72,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Program Abbreviation",
"length": 0,
"no_copy": 0,
@@ -80,6 +89,7 @@
"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,
@@ -90,6 +100,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"hidden": 0,
@@ -97,6 +108,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -104,6 +116,7 @@
"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,
@@ -114,6 +127,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "department",
"fieldtype": "Link",
"hidden": 0,
@@ -121,6 +135,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Department",
"length": 0,
"no_copy": 0,
@@ -130,6 +145,7 @@
"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,
@@ -140,6 +156,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "section_break_5",
"fieldtype": "Section Break",
"hidden": 0,
@@ -147,6 +164,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Course",
"length": 0,
"no_copy": 0,
@@ -155,6 +173,7 @@
"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,
@@ -165,6 +184,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "courses",
"fieldtype": "Table",
"hidden": 0,
@@ -172,6 +192,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Courses",
"length": 0,
"no_copy": 0,
@@ -181,6 +202,7 @@
"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,
@@ -191,6 +213,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "fee_schedule",
"fieldtype": "Section Break",
"hidden": 0,
@@ -198,6 +221,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Fee Schedule",
"length": 0,
"no_copy": 0,
@@ -206,6 +230,7 @@
"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,
@@ -216,6 +241,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "fees",
"fieldtype": "Table",
"hidden": 0,
@@ -223,6 +249,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Fees",
"length": 0,
"no_copy": 0,
@@ -232,6 +259,7 @@
"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,
@@ -250,7 +278,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-08-27 03:21:35.806511",
+ "modified": "2016-11-07 05:23:07.030155",
"modified_by": "Administrator",
"module": "Schools",
"name": "Program",
@@ -267,6 +295,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/schools/doctype/program_enrollment/program_enrollment.json b/erpnext/schools/doctype/program_enrollment/program_enrollment.json
index 199b5e1..e7269f0 100644
--- a/erpnext/schools/doctype/program_enrollment/program_enrollment.json
+++ b/erpnext/schools/doctype/program_enrollment/program_enrollment.json
@@ -10,6 +10,7 @@
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
@@ -23,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student",
"length": 0,
"no_copy": 0,
@@ -32,6 +34,7 @@
"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,
@@ -50,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Name",
"length": 0,
"no_copy": 0,
@@ -59,6 +63,7 @@
"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,
@@ -77,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Category",
"length": 0,
"no_copy": 0,
@@ -86,6 +92,36 @@
"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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "student_batch_name",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Student Batch Name",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Student Batch Name",
+ "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,
@@ -104,6 +140,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -111,6 +148,7 @@
"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,
@@ -129,6 +167,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Program",
"length": 0,
"no_copy": 0,
@@ -138,6 +177,7 @@
"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,
@@ -156,6 +196,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Academic Year",
"length": 0,
"no_copy": 0,
@@ -165,6 +206,7 @@
"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,
@@ -184,6 +226,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Enrollment Date",
"length": 0,
"no_copy": 0,
@@ -192,6 +235,7 @@
"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,
@@ -210,6 +254,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -218,6 +263,7 @@
"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,
@@ -236,6 +282,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Fees",
"length": 0,
"no_copy": 0,
@@ -245,6 +292,7 @@
"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,
@@ -264,6 +312,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -272,6 +321,7 @@
"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,
@@ -290,6 +340,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
@@ -298,6 +349,7 @@
"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,
@@ -317,7 +369,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-09-05 06:59:18.620611",
+ "modified": "2016-11-18 14:20:10.023790",
"modified_by": "Administrator",
"module": "Schools",
"name": "Program Enrollment",
@@ -334,6 +386,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js b/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js
deleted file mode 100644
index 7109771..0000000
--- a/erpnext/schools/doctype/scheduling_tool/scheduling_tool.js
+++ /dev/null
@@ -1,14 +0,0 @@
-cur_frm.add_fetch("student_group", "program", "program");
-cur_frm.add_fetch("student_group", "course", "course");
-cur_frm.add_fetch("student_group", "academic_year", "academic_year");
-cur_frm.add_fetch("student_group", "academic_term", "academic_term");
-
-frappe.ui.form.on("Scheduling Tool", "refresh", function(frm) {
- frm.disable_save();
- frm.page.set_primary_action(__("Schedule Course"), function() {
- frappe.call({
- method: "schedule_course",
- doc:frm.doc
- })
- });
-});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/scheduling_tool/test_scheduling_tool.py b/erpnext/schools/doctype/scheduling_tool/test_scheduling_tool.py
deleted file mode 100644
index 4ec3747..0000000
--- a/erpnext/schools/doctype/scheduling_tool/test_scheduling_tool.py
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2015, Frappe and Contributors
-# See license.txt
-from __future__ import unicode_literals
-
-import frappe
-import unittest
-
-# test_records = frappe.get_test_records('Scheduling Tool')
-
-class TestSchedulingTool(unittest.TestCase):
- pass
diff --git a/erpnext/schools/doctype/student/student.json b/erpnext/schools/doctype/student/student.json
index d188db3..6984d38 100644
--- a/erpnext/schools/doctype/student/student.json
+++ b/erpnext/schools/doctype/student/student.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "First Name",
"length": 0,
"no_copy": 0,
@@ -32,6 +33,7 @@
"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,
@@ -50,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Middle Name",
"length": 0,
"no_copy": 0,
@@ -58,6 +61,7 @@
"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,
@@ -76,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Last Name",
"length": 0,
"no_copy": 0,
@@ -84,6 +89,7 @@
"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,
@@ -102,6 +108,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -109,6 +116,7 @@
"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,
@@ -127,6 +135,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Naming Series",
"length": 0,
"no_copy": 0,
@@ -136,6 +145,7 @@
"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,
@@ -154,6 +164,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Email ID",
"length": 0,
"no_copy": 0,
@@ -162,6 +173,7 @@
"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,
@@ -180,6 +192,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Mobile Number",
"length": 0,
"no_copy": 0,
@@ -189,6 +202,7 @@
"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,
@@ -208,6 +222,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Joining Date",
"length": 0,
"no_copy": 0,
@@ -216,6 +231,7 @@
"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,
@@ -234,6 +250,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
@@ -242,6 +259,7 @@
"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,
@@ -262,6 +280,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Personal Details",
"length": 0,
"no_copy": 0,
@@ -270,6 +289,7 @@
"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,
@@ -288,6 +308,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date of Birth",
"length": 0,
"no_copy": 0,
@@ -296,6 +317,7 @@
"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,
@@ -314,6 +336,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Blood Group",
"length": 0,
"no_copy": 0,
@@ -323,6 +346,7 @@
"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,
@@ -341,6 +365,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -348,6 +373,7 @@
"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,
@@ -366,6 +392,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Gender",
"length": 0,
"no_copy": 0,
@@ -375,6 +402,7 @@
"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,
@@ -393,6 +421,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Nationality",
"length": 0,
"no_copy": 0,
@@ -402,6 +431,7 @@
"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,
@@ -420,6 +450,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Applicant",
"length": 0,
"no_copy": 0,
@@ -429,6 +460,7 @@
"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,
@@ -447,6 +479,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Home Address",
"length": 0,
"no_copy": 0,
@@ -455,6 +488,7 @@
"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,
@@ -473,6 +507,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address Line 1",
"length": 0,
"no_copy": 0,
@@ -481,6 +516,7 @@
"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,
@@ -499,6 +535,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address Line 2",
"length": 0,
"no_copy": 0,
@@ -507,6 +544,7 @@
"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,
@@ -525,6 +563,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Pincode",
"length": 0,
"no_copy": 0,
@@ -533,6 +572,7 @@
"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,
@@ -551,6 +591,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -558,6 +599,7 @@
"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,
@@ -576,6 +618,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "City",
"length": 0,
"no_copy": 0,
@@ -584,6 +627,7 @@
"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,
@@ -602,6 +646,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "State",
"length": 0,
"no_copy": 0,
@@ -610,6 +655,7 @@
"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,
@@ -628,6 +674,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Guardian Details",
"length": 0,
"no_copy": 0,
@@ -636,6 +683,7 @@
"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,
@@ -654,6 +702,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Guardians",
"length": 0,
"no_copy": 0,
@@ -663,6 +712,7 @@
"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,
@@ -681,6 +731,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sibling Details",
"length": 0,
"no_copy": 0,
@@ -690,6 +741,7 @@
"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,
@@ -708,6 +760,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Siblings",
"length": 0,
"no_copy": 0,
@@ -717,6 +770,7 @@
"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,
@@ -736,6 +790,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 0,
@@ -744,6 +799,7 @@
"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,
@@ -763,7 +819,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-10-26 12:24:10.533118",
+ "modified": "2016-12-01 12:55:32.453131",
"modified_by": "Administrator",
"module": "Schools",
"name": "Student",
@@ -774,6 +830,27 @@
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Instructor",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 0
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
diff --git a/erpnext/schools/doctype/student/student_list.js b/erpnext/schools/doctype/student/student_list.js
new file mode 100644
index 0000000..763f120
--- /dev/null
+++ b/erpnext/schools/doctype/student/student_list.js
@@ -0,0 +1,3 @@
+frappe.listview_settings['Student'] = {
+ add_fields: [ "image"]
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_admission/student_admission.json b/erpnext/schools/doctype/student_admission/student_admission.json
index 77a3236..22bdb2b 100644
--- a/erpnext/schools/doctype/student_admission/student_admission.json
+++ b/erpnext/schools/doctype/student_admission/student_admission.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Academic Year",
"length": 0,
"no_copy": 0,
@@ -32,6 +33,7 @@
"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,
@@ -50,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Admission Start Date",
"length": 0,
"no_copy": 0,
@@ -58,6 +61,7 @@
"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,
@@ -76,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Admission End Date",
"length": 0,
"no_copy": 0,
@@ -84,6 +89,7 @@
"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,
@@ -102,6 +108,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 0,
@@ -110,6 +117,7 @@
"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,
@@ -128,6 +136,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Naming Series (for Student Applicant)",
"length": 0,
"no_copy": 0,
@@ -136,6 +145,7 @@
"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,
@@ -154,6 +164,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Publish on website",
"length": 0,
"no_copy": 0,
@@ -162,6 +173,7 @@
"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,
@@ -180,6 +192,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -187,6 +200,7 @@
"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,
@@ -205,6 +219,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Program",
"length": 0,
"no_copy": 0,
@@ -214,6 +229,7 @@
"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,
@@ -232,6 +248,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Application Fee",
"length": 0,
"no_copy": 0,
@@ -241,6 +258,7 @@
"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,
@@ -259,6 +277,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency",
"length": 0,
"no_copy": 0,
@@ -268,6 +287,7 @@
"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,
@@ -287,6 +307,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Route",
"length": 0,
"no_copy": 0,
@@ -295,6 +316,7 @@
"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,
@@ -313,6 +335,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Application Form Route",
"length": 0,
"no_copy": 0,
@@ -321,6 +344,7 @@
"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,
@@ -339,6 +363,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -346,6 +371,7 @@
"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,
@@ -364,6 +390,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Introduction",
"length": 0,
"no_copy": 0,
@@ -372,6 +399,7 @@
"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,
@@ -390,6 +418,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Eligibility",
"length": 0,
"no_copy": 0,
@@ -398,6 +427,7 @@
"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,
@@ -415,7 +445,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-10-04 02:44:28.480942",
+ "modified": "2016-11-07 05:23:58.170546",
"modified_by": "Administrator",
"module": "Schools",
"name": "Student Admission",
diff --git a/erpnext/schools/doctype/student_applicant/student_applicant.json b/erpnext/schools/doctype/student_applicant/student_applicant.json
index 5c6e276..18a490a 100644
--- a/erpnext/schools/doctype/student_applicant/student_applicant.json
+++ b/erpnext/schools/doctype/student_applicant/student_applicant.json
@@ -25,6 +25,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "First Name",
"length": 0,
"no_copy": 0,
@@ -33,6 +34,7 @@
"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,
@@ -51,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Middle Name",
"length": 0,
"no_copy": 0,
@@ -59,6 +62,7 @@
"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,
@@ -77,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Last Name",
"length": 0,
"no_copy": 0,
@@ -85,6 +90,7 @@
"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,
@@ -103,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Program",
"length": 0,
"no_copy": 0,
@@ -112,6 +119,7 @@
"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,
@@ -130,6 +138,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Paid",
"length": 0,
"no_copy": 0,
@@ -138,6 +147,7 @@
"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,
@@ -156,6 +166,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -163,6 +174,7 @@
"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,
@@ -181,6 +193,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Naming Series",
"length": 0,
"no_copy": 0,
@@ -190,6 +203,7 @@
"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,
@@ -209,6 +223,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Application Status",
"length": 0,
"no_copy": 1,
@@ -218,6 +233,7 @@
"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,
@@ -237,6 +253,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Application Date",
"length": 0,
"no_copy": 0,
@@ -246,6 +263,7 @@
"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,
@@ -264,6 +282,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Academic Year",
"length": 0,
"no_copy": 0,
@@ -273,6 +292,7 @@
"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,
@@ -291,6 +311,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Admission",
"length": 0,
"no_copy": 0,
@@ -300,6 +321,7 @@
"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,
@@ -318,6 +340,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
@@ -326,6 +349,7 @@
"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,
@@ -345,6 +369,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Personal Details",
"length": 0,
"no_copy": 0,
@@ -353,6 +378,7 @@
"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,
@@ -371,6 +397,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date of Birth",
"length": 0,
"no_copy": 0,
@@ -379,6 +406,7 @@
"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,
@@ -397,6 +425,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Gender",
"length": 0,
"no_copy": 0,
@@ -406,6 +435,7 @@
"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,
@@ -424,6 +454,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Blood Group",
"length": 0,
"no_copy": 0,
@@ -433,6 +464,7 @@
"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,
@@ -451,6 +483,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -458,6 +491,7 @@
"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,
@@ -476,6 +510,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Email ID",
"length": 0,
"no_copy": 0,
@@ -484,6 +519,7 @@
"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,
@@ -502,6 +538,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Mobile Number",
"length": 0,
"no_copy": 0,
@@ -510,6 +547,7 @@
"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,
@@ -528,6 +566,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Nationality",
"length": 0,
"no_copy": 0,
@@ -537,6 +576,7 @@
"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,
@@ -555,6 +595,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Home Address",
"length": 0,
"no_copy": 0,
@@ -563,6 +604,7 @@
"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,
@@ -581,6 +623,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address Line 1",
"length": 0,
"no_copy": 0,
@@ -589,6 +632,7 @@
"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,
@@ -607,6 +651,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address Line 2",
"length": 0,
"no_copy": 0,
@@ -615,6 +660,7 @@
"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,
@@ -633,6 +679,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Pincode",
"length": 0,
"no_copy": 0,
@@ -641,6 +688,7 @@
"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,
@@ -659,6 +707,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -666,6 +715,7 @@
"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,
@@ -684,6 +734,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "City",
"length": 0,
"no_copy": 0,
@@ -692,6 +743,7 @@
"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,
@@ -710,6 +762,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "State",
"length": 0,
"no_copy": 0,
@@ -718,6 +771,7 @@
"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,
@@ -736,6 +790,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Guardian Details",
"length": 0,
"no_copy": 0,
@@ -744,6 +799,7 @@
"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,
@@ -762,6 +818,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Guardians",
"length": 0,
"no_copy": 0,
@@ -771,6 +828,7 @@
"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,
@@ -789,6 +847,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sibling Details",
"length": 0,
"no_copy": 0,
@@ -797,6 +856,7 @@
"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,
@@ -815,6 +875,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Siblings",
"length": 0,
"no_copy": 0,
@@ -824,6 +885,7 @@
"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,
@@ -842,6 +904,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -849,6 +912,7 @@
"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,
@@ -867,6 +931,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 0,
@@ -875,6 +940,7 @@
"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,
@@ -893,6 +959,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -901,6 +968,7 @@
"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,
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.js b/erpnext/schools/doctype/student_attendance/student_attendance.js
index 5068208..ec2a0cb 100644
--- a/erpnext/schools/doctype/student_attendance/student_attendance.js
+++ b/erpnext/schools/doctype/student_attendance/student_attendance.js
@@ -1,8 +1,5 @@
// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
// For license information, please see license.txt
-frappe.ui.form.on('Student Attendance', {
- refresh: function(frm) {
-
- }
-});
+cur_frm.add_fetch("course_schedule", "schedule_date", "date");
+cur_frm.add_fetch("course_schedule", "student_batch", "student_batch")
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.json b/erpnext/schools/doctype/student_attendance/student_attendance.json
index 64d3994..1f8f680 100644
--- a/erpnext/schools/doctype/student_attendance/student_attendance.json
+++ b/erpnext/schools/doctype/student_attendance/student_attendance.json
@@ -10,11 +10,13 @@
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "student",
"fieldtype": "Link",
"hidden": 0,
@@ -22,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Student",
"length": 0,
"no_copy": 0,
@@ -31,6 +34,7 @@
"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,
@@ -41,56 +45,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "student_name",
- "fieldtype": "Read Only",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Student Name",
- "length": 0,
- "no_copy": 0,
- "options": "student.title",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "column_break_3",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
+ "columns": 0,
"fieldname": "course_schedule",
"fieldtype": "Link",
"hidden": 0,
@@ -98,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Course Schedule",
"length": 0,
"no_copy": 0,
@@ -107,6 +63,35 @@
"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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Date",
+ "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": 1,
"search_index": 0,
@@ -117,6 +102,92 @@
"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_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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "student_name",
+ "fieldtype": "Read Only",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Student Name",
+ "length": 0,
+ "no_copy": 0,
+ "options": "student.title",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "student_batch",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 1,
+ "label": "Student Batch",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Student Batch",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"default": "Present",
"fieldname": "status",
"fieldtype": "Select",
@@ -125,6 +196,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 0,
@@ -134,6 +206,7 @@
"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,
@@ -144,6 +217,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "amended_from",
"fieldtype": "Link",
"hidden": 0,
@@ -151,6 +225,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -159,6 +234,7 @@
"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,
@@ -176,7 +252,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-07-25 01:23:49.324922",
+ "modified": "2016-12-15 14:51:03.951240",
"modified_by": "Administrator",
"module": "Schools",
"name": "Student Attendance",
@@ -193,6 +269,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/schools/doctype/student_attendance/student_attendance.py b/erpnext/schools/doctype/student_attendance/student_attendance.py
index 65dbd68..e2d01b5 100644
--- a/erpnext/schools/doctype/student_attendance/student_attendance.py
+++ b/erpnext/schools/doctype/student_attendance/student_attendance.py
@@ -9,13 +9,32 @@
class StudentAttendance(Document):
def validate(self):
+ self.validate_date()
+ self.validate_mandatory()
self.validate_duplication()
+ def validate_date(self):
+ if self.course_schedule:
+ self.date = frappe.db.get_value("Course Schedule", self.course_schedule, "schedule_date")
+
+ def validate_mandatory(self):
+ if not (self.student_batch or self.course_schedule):
+ frappe.throw(_("""Student Batch or Course Schedule is mandatory"""))
+
def validate_duplication(self):
"""Check if the Attendance Record is Unique"""
- attendance_records= frappe.db.sql("""select name from `tabStudent Attendance` where \
- student= %s and course_schedule= %s and name != %s""",
- (self.student, self.course_schedule, self.name))
+
+ attendance_records=None
+ if self.course_schedule:
+ attendance_records= frappe.db.sql("""select name from `tabStudent Attendance` where \
+ student= %s and course_schedule= %s and name != %s and docstatus=1""",
+ (self.student, self.course_schedule, self.name))
+ else:
+ attendance_records= frappe.db.sql("""select name from `tabStudent Attendance` where \
+ student= %s and student_batch= %s and date= %s and name != %s and docstatus=1 and \
+ (course_schedule is Null or course_schedule='')""",
+ (self.student, self.student_batch, self.date, self.name))
+
if attendance_records:
- frappe.throw(_("Attendance Record {0} exists against Student {1} for Course Schedule {2}")
- .format(attendance_records[0][0], self.student, self.course_schedule))
+ frappe.throw(_("Attendance Record {0} exists against Student {1}")
+ .format(attendance_records[0][0], self.student))
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/doctype/student_attendance_tool/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/doctype/student_attendance_tool/__init__.py
diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
new file mode 100644
index 0000000..7dd9dda
--- /dev/null
+++ b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.js
@@ -0,0 +1,150 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+frappe.provide("schools")
+
+frappe.ui.form.on('Student Attendance Tool', {
+ refresh: function(frm) {
+ frm.disable_save();
+ },
+
+ based_on: function(frm) {
+ if (frm.doc.based_on == "Student Batch") {
+ frm.set_value("course_schedule", "");
+ } else {
+ frm.set_value("student_batch", "");
+ }
+ },
+
+ student_batch: function(frm) {
+ if ((frm.doc.student_batch && frm.doc.date) || frm.doc.course_schedule) {
+ var method = "erpnext.schools.doctype.student_attendance_tool.student_attendance_tool.get_student_attendance_records";
+
+ frappe.call({
+ method: method,
+ args: {
+ based_on: frm.doc.based_on,
+ student_batch: frm.doc.student_batch,
+ date: frm.doc.date,
+ course_schedule: frm.doc.course_schedule
+ },
+ callback: function(r) {
+ frm.events.get_students(frm, r.message);
+ }
+ })
+ }
+ },
+
+ date: function(frm) {
+ frm.trigger("student_batch");
+ },
+
+ course_schedule: function(frm) {
+ frm.trigger("student_batch");
+ },
+
+ get_students: function(frm, students) {
+ if (!frm.students_area) {
+ frm.students_area = $('<div>')
+ .appendTo(frm.fields_dict.students_html.wrapper);
+ }
+ frm.students_editor = new schools.StudentsEditor(frm, frm.students_area, students)
+ }
+});
+
+
+schools.StudentsEditor = Class.extend({
+ init: function(frm, wrapper, students) {
+ this.wrapper = wrapper;
+ this.frm = frm;
+ this.make(frm, students);
+ },
+ make: function(frm, students) {
+ var me = this;
+
+ $(this.wrapper).empty();
+ var student_toolbar = $('<p>\
+ <button class="btn btn-default btn-add btn-xs" style="margin-right: 5px;"></button>\
+ <button class="btn btn-xs btn-default btn-remove" style="margin-right: 5px;"></button>\
+ <button class="btn btn-default btn-primary btn-mark-att btn-xs"></button></p>').appendTo($(this.wrapper));
+
+ student_toolbar.find(".btn-add")
+ .html(__('Check all'))
+ .on("click", function() {
+ $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+ if (!$(check).prop("disabled")) {
+ check.checked = true;
+ }
+ });
+ });
+
+ student_toolbar.find(".btn-remove")
+ .html(__('Uncheck all'))
+ .on("click", function() {
+ $(me.wrapper).find('input[type="checkbox"]').each(function(i, check) {
+ if (!$(check).prop("disabled")) {
+ check.checked = false;
+ }
+ });
+ });
+
+ var get_present_student = function(student) {
+ return students.filter(function(s) {
+ return s.idx === idx;
+ })
+ }
+ var get_absent_student = function(idx) {
+ return students.filter(function(s) {
+ return s.idx === idx;
+ })
+ }
+
+ student_toolbar.find(".btn-mark-att")
+ .html(__('Mark Attendence'))
+ .on("click", function() {
+ var studs = [];
+ $(me.wrapper.find('input[type="checkbox"]')).each(function(i, check) {
+ var $check = $(check);
+ studs.push({
+ student: $check.data().student,
+ student_name: $check.data().studentName,
+ idx: $check.data().idx,
+ disabled: $check.prop("disabled"),
+ checked: $check.is(":checked")
+ });
+ });
+
+ var students_present = studs.filter(function(stud) {
+ return !stud.disabled && stud.checked;
+ });
+
+ var students_absent = studs.filter(function(stud) {
+ return !stud.disabled && !stud.checked;
+ });
+
+ frappe.call({
+ method: "erpnext.schools.api.mark_attendance",
+ args: {
+ "students_present": students_present,
+ "students_absent": students_absent,
+ "student_batch": frm.doc.student_batch,
+ "course_schedule": frm.doc.course_schedule,
+ "date": frm.doc.date
+ },
+ callback: function(r) {
+ frm.trigger("student_batch");
+ }
+ });
+ });
+
+ var htmls = students.map(function(student) {
+ return frappe.render_template("student_button", {
+ student: student.student,
+ student_name: student.student_name,
+ idx: student.idx,
+ status: student.status
+ })
+ });
+
+ $(htmls.join("")).appendTo(me.wrapper);
+ }
+});
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json
new file mode 100644
index 0000000..092af04
--- /dev/null
+++ b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.json
@@ -0,0 +1,284 @@
+{
+ "allow_copy": 1,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2016-11-16 17:12:46.437539",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "",
+ "fieldname": "based_on",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Based On",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Student Batch\nCourse Schedule",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.based_on ==\"Student Batch\"",
+ "fieldname": "student_batch",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Student Batch",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Student Batch",
+ "permlevel": 0,
+ "precision": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.based_on ==\"Course Schedule\"",
+ "fieldname": "course_schedule",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Course Schedule",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Course Schedule",
+ "permlevel": 0,
+ "precision": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.based_on ==\"Student Batch\"",
+ "fieldname": "date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Date",
+ "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": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval: (doc.course_schedule \n|| (doc.student_batch && doc.date))",
+ "fieldname": "attendance",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Attendance",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "students_html",
+ "fieldtype": "HTML",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Students HTML",
+ "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,
+ "unique": 0
+ }
+ ],
+ "hide_heading": 1,
+ "hide_toolbar": 1,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 1,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2016-12-09 17:36:28.739318",
+ "modified_by": "Administrator",
+ "module": "Schools",
+ "name": "Student Attendance Tool",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Instructor",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 0,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "Academics User",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py
new file mode 100644
index 0000000..30a692c
--- /dev/null
+++ b/erpnext/schools/doctype/student_attendance_tool/student_attendance_tool.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class StudentAttendanceTool(Document):
+ pass
+
+@frappe.whitelist()
+def get_student_attendance_records(based_on, date=None, student_batch=None, course_schedule=None):
+ student_list = []
+ student_attendance_list = []
+
+ if based_on=="Course Schedule":
+ student_group = frappe.db.get_value("Course Schedule", course_schedule, "student_group")
+ if student_group:
+ student_list = frappe.get_list("Student Group Student", fields=["student", "student_name", "idx"] , \
+ filters={"parent": student_group}, order_by= "idx")
+ else:
+ student_batch = frappe.db.get_value("Course Schedule", course_schedule, "student_batch")
+ if not student_list:
+ student_list = frappe.get_list("Student Batch Student", fields=["student", "student_name", "idx"] , filters={"parent": student_batch}, order_by= "idx")
+
+ if course_schedule:
+ student_attendance_list= frappe.db.sql("""select student, status from `tabStudent Attendance` where \
+ course_schedule= %s and docstatus=1""", (course_schedule), as_dict=1)
+ else:
+ student_attendance_list= frappe.db.sql("""select student, status from `tabStudent Attendance` where \
+ student_batch= %s and date= %s and docstatus=1 and \
+ (course_schedule is Null or course_schedule='')""",
+ (student_batch, date), as_dict=1)
+
+ for attendance in student_attendance_list:
+ for student in student_list:
+ if student.student == attendance.student:
+ student.status = attendance.status
+ return student_list
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch/student_batch.json b/erpnext/schools/doctype/student_batch/student_batch.json
index fa7e6b5..f571d9d 100644
--- a/erpnext/schools/doctype/student_batch/student_batch.json
+++ b/erpnext/schools/doctype/student_batch/student_batch.json
@@ -10,26 +10,31 @@
"doctype": "DocType",
"document_type": "",
"editable_grid": 1,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "student_batch_name",
- "fieldtype": "Data",
+ "fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Batch Name",
"length": 0,
"no_copy": 0,
+ "options": "Student Batch Name",
"permlevel": 0,
"precision": "",
"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,
@@ -40,6 +45,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "academic_year",
"fieldtype": "Link",
"hidden": 0,
@@ -47,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Academic Year",
"length": 0,
"no_copy": 0,
@@ -56,6 +63,7 @@
"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,
@@ -66,13 +74,17 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "column_break_2",
- "fieldtype": "Column Break",
+ "columns": 0,
+ "default": "1",
+ "fieldname": "enabled",
+ "fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Active",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -80,6 +92,7 @@
"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,
@@ -90,6 +103,34 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "program",
"fieldtype": "Link",
"hidden": 0,
@@ -97,6 +138,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Program",
"length": 0,
"no_copy": 0,
@@ -106,6 +148,7 @@
"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,
@@ -116,6 +159,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "academic_term",
"fieldtype": "Link",
"hidden": 0,
@@ -123,6 +167,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Academic Term",
"length": 0,
"no_copy": 0,
@@ -132,6 +177,7 @@
"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,
@@ -142,13 +188,16 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "section_break_8",
+ "columns": 0,
+ "fieldname": "section_break_6",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Students",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -156,6 +205,7 @@
"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,
@@ -166,6 +216,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "students",
"fieldtype": "Table",
"hidden": 0,
@@ -173,6 +224,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Students",
"length": 0,
"no_copy": 0,
@@ -182,6 +234,64 @@
"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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_8",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Instructors",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "instructors",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Instructors",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Student Batch Instructor",
+ "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,
@@ -199,7 +309,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-08-24 05:32:00.585277",
+ "modified": "2016-12-01 13:18:12.024001",
"modified_by": "Administrator",
"module": "Schools",
"name": "Student Batch",
@@ -216,6 +326,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -225,6 +336,27 @@
"share": 1,
"submit": 0,
"write": 1
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Instructor",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 0
}
],
"quick_entry": 1,
diff --git a/erpnext/schools/doctype/student_batch/student_batch.py b/erpnext/schools/doctype/student_batch/student_batch.py
index ec2dc79..1a0d799 100644
--- a/erpnext/schools/doctype/student_batch/student_batch.py
+++ b/erpnext/schools/doctype/student_batch/student_batch.py
@@ -8,12 +8,11 @@
import frappe
class StudentBatch(Document):
- def autoname(self):
- prog_abb = frappe.db.get_value("Program", self.program, "program_abbreviation")
- if not prog_abb:
- prog_abb = self.program
- self.name = prog_abb + "-"+ self.student_batch_name + "-" + self.academic_year
-
- def validate(self):
- validate_duplicate_student(self.students)
-
\ No newline at end of file
+ def autoname(self):
+ prog_abb = frappe.db.get_value("Program", self.program, "program_abbreviation")
+ if not prog_abb:
+ prog_abb = self.program
+ self.name = prog_abb + "-"+ self.student_batch_name + "-" + self.academic_year
+
+ def validate(self):
+ validate_duplicate_student(self.students)
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/doctype/student_batch_creation_tool/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/doctype/student_batch_creation_tool/__init__.py
diff --git a/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.js b/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.js
new file mode 100644
index 0000000..3167174
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Student Batch Creation Tool', {
+ refresh: function(frm) {
+ frm.disable_save();
+ }
+});
diff --git a/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.json b/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.json
new file mode 100644
index 0000000..d94c480
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.json
@@ -0,0 +1,176 @@
+{
+ "allow_copy": 1,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2016-11-14 18:20:12.160405",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "academic_year",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Academic Year",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Academic Year",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "program",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Program",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Program",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "student_batch_name",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Student Batch Name",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Student Batch Name",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "make_student_batch",
+ "fieldtype": "Button",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Make Student Batch",
+ "length": 0,
+ "no_copy": 0,
+ "options": "make_batch",
+ "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,
+ "unique": 0
+ }
+ ],
+ "hide_heading": 1,
+ "hide_toolbar": 1,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 1,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2016-11-21 16:47:56.823988",
+ "modified_by": "Administrator",
+ "module": "Schools",
+ "name": "Student Batch Creation Tool",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 0,
+ "role": "Academics User",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 0,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.py b/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.py
new file mode 100644
index 0000000..deda137
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_creation_tool/student_batch_creation_tool.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class StudentBatchCreationTool(Document):
+ def make_batch(self):
+ if self.academic_year and self.program and self.student_batch_name:
+ students = frappe.get_list("Program Enrollment", fields=["student", "student_name"],
+ filters={"academic_year":self.academic_year, "program": self.program, "student_batch_name": self.student_batch_name},
+ order_by= "student_name")
+ if students:
+ student_batch = frappe.new_doc("Student Batch")
+ student_batch.update({
+ "academic_year": self.academic_year,
+ "program": self.program,
+ "student_batch_name": self.student_batch_name,
+ "students": students
+ })
+ student_batch.save()
+ frappe.msgprint("Student Batch created.")
+ else:
+ frappe.msgprint("No students found.")
+
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/doctype/student_batch_instructor/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/doctype/student_batch_instructor/__init__.py
diff --git a/erpnext/schools/doctype/student_batch_instructor/student_batch_instructor.json b/erpnext/schools/doctype/student_batch_instructor/student_batch_instructor.json
new file mode 100644
index 0000000..29680fb
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_instructor/student_batch_instructor.json
@@ -0,0 +1,123 @@
+{
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "beta": 0,
+ "creation": "2016-11-21 19:04:48.211565",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "instructor",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Instructor",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Instructor",
+ "permlevel": 0,
+ "precision": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_2",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "instructor_name",
+ "fieldtype": "Read Only",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Instructor Name",
+ "length": 0,
+ "no_copy": 0,
+ "options": "instructor.instructor_name",
+ "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,
+ "unique": 0
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 1,
+ "max_attachments": 0,
+ "modified": "2016-11-21 19:08:07.680320",
+ "modified_by": "Administrator",
+ "module": "Schools",
+ "name": "Student Batch Instructor",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch_instructor/student_batch_instructor.py b/erpnext/schools/doctype/student_batch_instructor/student_batch_instructor.py
new file mode 100644
index 0000000..19a759d
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_instructor/student_batch_instructor.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class StudentBatchInstructor(Document):
+ pass
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/doctype/student_batch_name/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/doctype/student_batch_name/__init__.py
diff --git a/erpnext/schools/doctype/student_batch_name/student_batch_name.js b/erpnext/schools/doctype/student_batch_name/student_batch_name.js
new file mode 100644
index 0000000..7ed3021
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_name/student_batch_name.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Student Batch Name', {
+ refresh: function(frm) {
+
+ }
+});
diff --git a/erpnext/schools/doctype/student_batch_name/student_batch_name.json b/erpnext/schools/doctype/student_batch_name/student_batch_name.json
new file mode 100644
index 0000000..7f5f16d
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_name/student_batch_name.json
@@ -0,0 +1,89 @@
+{
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "field:batch_name",
+ "beta": 0,
+ "creation": "2016-11-17 18:45:57.965091",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "batch_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Batch Name",
+ "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": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2016-11-21 16:31:50.775958",
+ "modified_by": "Administrator",
+ "module": "Schools",
+ "name": "Student Batch Name",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Academics User",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
+ "write": 1
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_batch_name/student_batch_name.py b/erpnext/schools/doctype/student_batch_name/student_batch_name.py
new file mode 100644
index 0000000..e6d38ea
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_name/student_batch_name.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class StudentBatchName(Document):
+ pass
diff --git a/erpnext/schools/doctype/student_batch_name/test_student_batch_name.py b/erpnext/schools/doctype/student_batch_name/test_student_batch_name.py
new file mode 100644
index 0000000..09534f3
--- /dev/null
+++ b/erpnext/schools/doctype/student_batch_name/test_student_batch_name.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Student Batch Name')
+
+class TestStudentBatchName(unittest.TestCase):
+ pass
diff --git a/erpnext/schools/doctype/student_group/student_group.js b/erpnext/schools/doctype/student_group/student_group.js
index 784f557..6f4084b 100644
--- a/erpnext/schools/doctype/student_group/student_group.js
+++ b/erpnext/schools/doctype/student_group/student_group.js
@@ -1,34 +1,36 @@
cur_frm.add_fetch("student", "title", "student_name");
-frappe.ui.form.on("Student Group", "refresh", function(frm) {
- if(!frm.doc.__islocal) {
- frm.add_custom_button(__("Course Schedule"), function() {
- frappe.route_options = {
- student_group: frm.doc.name
- }
- frappe.set_route("List", "Course Schedule");
- });
-
- frm.add_custom_button(__("Assessment"), function() {
- frappe.route_options = {
- student_group: frm.doc.name
- }
- frappe.set_route("List", "Assessment");
- });
- }
-});
+frappe.ui.form.on("Student Group", {
+ refresh: function(frm) {
+ if (!frm.doc.__islocal) {
+ frm.add_custom_button(__("Course Schedule"), function() {
+ frappe.route_options = {
+ student_group: frm.doc.name
+ }
+ frappe.set_route("List", "Course Schedule");
+ });
-frappe.ui.form.on("Student Group", "onload", function(frm){
- cur_frm.set_query("academic_term",function(){
- return{
- "filters":{
- "academic_year": (frm.doc.academic_year)
- }
- };
- });
+ frm.add_custom_button(__("Assessment"), function() {
+ frappe.route_options = {
+ student_group: frm.doc.name
+ }
+ frappe.set_route("List", "Assessment");
+ });
+ }
+ },
+
+ onload: function(frm) {
+ cur_frm.set_query("academic_term", function() {
+ return {
+ "filters": {
+ "academic_year": (frm.doc.academic_year)
+ }
+ };
+ });
+ }
});
//If Student Batch is entered, deduce program, academic_year and academic term from it
cur_frm.add_fetch("student_batch", "program", "program");
cur_frm.add_fetch("student_batch", "academic_term", "academic_term");
-cur_frm.add_fetch("student_batch", "academic_year", "academic_year");
+cur_frm.add_fetch("student_batch", "academic_year", "academic_year");
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_group/student_group.json b/erpnext/schools/doctype/student_group/student_group.json
index a0584e3..9e44f51 100644
--- a/erpnext/schools/doctype/student_group/student_group.json
+++ b/erpnext/schools/doctype/student_group/student_group.json
@@ -10,11 +10,13 @@
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "student_batch",
"fieldtype": "Link",
"hidden": 0,
@@ -22,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Batch",
"length": 0,
"no_copy": 0,
@@ -31,6 +34,7 @@
"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,
@@ -41,6 +45,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "academic_year",
"fieldtype": "Link",
"hidden": 0,
@@ -48,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Academic Year",
"length": 0,
"no_copy": 0,
@@ -57,6 +63,7 @@
"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,
@@ -67,6 +74,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "academic_term",
"fieldtype": "Link",
"hidden": 0,
@@ -74,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Academic Term",
"length": 0,
"no_copy": 0,
@@ -83,6 +92,7 @@
"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,
@@ -93,6 +103,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"hidden": 0,
@@ -100,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -107,6 +119,7 @@
"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,
@@ -117,6 +130,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "program",
"fieldtype": "Link",
"hidden": 0,
@@ -124,6 +138,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Program",
"length": 0,
"no_copy": 0,
@@ -133,6 +148,7 @@
"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,
@@ -143,6 +159,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "course",
"fieldtype": "Link",
"hidden": 0,
@@ -150,6 +167,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Course",
"length": 0,
"no_copy": 0,
@@ -159,6 +177,7 @@
"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,
@@ -169,6 +188,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "Set 0 for no limit",
"fieldname": "max_strength",
"fieldtype": "Int",
@@ -177,6 +197,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Max Strength",
"length": 0,
"no_copy": 0,
@@ -185,6 +206,7 @@
"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,
@@ -196,6 +218,7 @@
"bold": 0,
"collapsible": 1,
"collapsible_depends_on": "",
+ "columns": 0,
"fieldname": "section_break_6",
"fieldtype": "Section Break",
"hidden": 0,
@@ -203,6 +226,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Students",
"length": 0,
"no_copy": 0,
@@ -211,6 +235,7 @@
"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,
@@ -221,6 +246,7 @@
"allow_on_submit": 1,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "students",
"fieldtype": "Table",
"hidden": 0,
@@ -228,6 +254,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Students",
"length": 0,
"no_copy": 0,
@@ -237,6 +264,7 @@
"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,
@@ -247,6 +275,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "amended_from",
"fieldtype": "Link",
"hidden": 0,
@@ -254,6 +283,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -262,6 +292,7 @@
"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,
@@ -280,7 +311,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-08-24 05:21:05.058875",
+ "modified": "2016-12-01 12:57:17.125085",
"modified_by": "Administrator",
"module": "Schools",
"name": "Student Group",
@@ -291,12 +322,34 @@
"amend": 0,
"apply_user_permissions": 0,
"cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Instructor",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
+ "write": 0
+ },
+ {
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/doctype/student_leave_application/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/doctype/student_leave_application/__init__.py
diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.js b/erpnext/schools/doctype/student_leave_application/student_leave_application.js
new file mode 100644
index 0000000..4746148
--- /dev/null
+++ b/erpnext/schools/doctype/student_leave_application/student_leave_application.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Student Leave Application', {
+ refresh: function(frm) {
+
+ }
+});
diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.json b/erpnext/schools/doctype/student_leave_application/student_leave_application.json
new file mode 100644
index 0000000..f183afc
--- /dev/null
+++ b/erpnext/schools/doctype/student_leave_application/student_leave_application.json
@@ -0,0 +1,280 @@
+{
+ "allow_copy": 0,
+ "allow_import": 0,
+ "allow_rename": 0,
+ "autoname": "SLA.######",
+ "beta": 0,
+ "creation": "2016-11-28 15:38:54.793854",
+ "custom": 0,
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "fields": [
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "student",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Student",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Student",
+ "permlevel": 0,
+ "precision": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "student_name",
+ "fieldtype": "Read Only",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Student Name",
+ "length": 0,
+ "no_copy": 0,
+ "options": "student.title",
+ "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,
+ "unique": 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_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Date",
+ "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": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 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_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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "reason",
+ "fieldtype": "Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Reason",
+ "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,
+ "unique": 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_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Amended From",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Student Leave Application",
+ "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,
+ "unique": 0
+ }
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "idx": 0,
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 1,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 0,
+ "modified": "2016-12-15 14:51:28.774955",
+ "modified_by": "Administrator",
+ "module": "Schools",
+ "name": "Student Leave Application",
+ "name_case": "",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "amend": 1,
+ "apply_user_permissions": 0,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Instructor",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 1,
+ "write": 1
+ },
+ {
+ "amend": 1,
+ "apply_user_permissions": 0,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Academics User",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 1,
+ "write": 1
+ }
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "student_name",
+ "track_seen": 0
+}
\ No newline at end of file
diff --git a/erpnext/schools/doctype/student_leave_application/student_leave_application.py b/erpnext/schools/doctype/student_leave_application/student_leave_application.py
new file mode 100644
index 0000000..4a36590
--- /dev/null
+++ b/erpnext/schools/doctype/student_leave_application/student_leave_application.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.model.document import Document
+
+class StudentLeaveApplication(Document):
+ pass
diff --git a/erpnext/schools/doctype/student_leave_application/test_student_leave_application.py b/erpnext/schools/doctype/student_leave_application/test_student_leave_application.py
new file mode 100644
index 0000000..ddb30ac
--- /dev/null
+++ b/erpnext/schools/doctype/student_leave_application/test_student_leave_application.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# See license.txt
+from __future__ import unicode_literals
+
+import frappe
+import unittest
+
+# test_records = frappe.get_test_records('Student Leave Application')
+
+class TestStudentLeaveApplication(unittest.TestCase):
+ pass
diff --git a/erpnext/schools/doctype/student_log/student_log.json b/erpnext/schools/doctype/student_log/student_log.json
index 4bb5bd6..7809c7e 100644
--- a/erpnext/schools/doctype/student_log/student_log.json
+++ b/erpnext/schools/doctype/student_log/student_log.json
@@ -10,11 +10,13 @@
"doctype": "DocType",
"document_type": "",
"editable_grid": 1,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "student",
"fieldtype": "Link",
"hidden": 0,
@@ -22,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Student",
"length": 0,
"no_copy": 0,
@@ -31,6 +34,7 @@
"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,
@@ -41,6 +45,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "type",
"fieldtype": "Select",
"hidden": 0,
@@ -48,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Type",
"length": 0,
"no_copy": 0,
@@ -57,6 +63,7 @@
"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,
@@ -67,6 +74,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"hidden": 0,
@@ -74,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -81,6 +90,7 @@
"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,
@@ -91,6 +101,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "student_name",
"fieldtype": "Read Only",
"hidden": 0,
@@ -98,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Student Name",
"length": 0,
"no_copy": 0,
@@ -107,6 +119,7 @@
"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,
@@ -117,6 +130,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "date",
"fieldtype": "Date",
"hidden": 0,
@@ -124,6 +138,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Date",
"length": 0,
"no_copy": 0,
@@ -132,6 +147,7 @@
"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,
@@ -142,6 +158,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "section_break_5",
"fieldtype": "Section Break",
"hidden": 0,
@@ -149,6 +166,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -156,6 +174,7 @@
"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,
@@ -166,6 +185,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "log",
"fieldtype": "Text Editor",
"hidden": 0,
@@ -173,6 +193,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Log",
"length": 0,
"no_copy": 0,
@@ -181,6 +202,7 @@
"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,
@@ -198,7 +220,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-07-29 07:35:28.623364",
+ "modified": "2016-11-07 05:59:40.460389",
"modified_by": "Administrator",
"module": "Schools",
"name": "Student Log",
@@ -215,6 +237,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/schools/doctype/topic/topic.json b/erpnext/schools/doctype/topic/topic.json
index 6aedc1e..0a69f88 100644
--- a/erpnext/schools/doctype/topic/topic.json
+++ b/erpnext/schools/doctype/topic/topic.json
@@ -9,11 +9,14 @@
"docstatus": 0,
"doctype": "DocType",
"document_type": "Document",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "course",
"fieldtype": "Link",
"hidden": 0,
@@ -21,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Course",
"length": 0,
"no_copy": 0,
@@ -30,6 +34,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
@@ -40,6 +45,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "topic_name",
"fieldtype": "Data",
"hidden": 0,
@@ -47,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Topic Name",
"length": 0,
"no_copy": 0,
@@ -55,6 +62,7 @@
"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,
@@ -65,6 +73,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "introduction",
"fieldtype": "Text",
"hidden": 0,
@@ -72,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Introduction",
"length": 0,
"no_copy": 0,
@@ -80,6 +90,7 @@
"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,
@@ -90,6 +101,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "content",
"fieldtype": "Text Editor",
"hidden": 0,
@@ -97,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Content",
"length": 0,
"no_copy": 0,
@@ -105,6 +118,7 @@
"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,
@@ -122,7 +136,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-07-18 10:30:50.243271",
+ "modified": "2016-11-07 05:29:20.531725",
"modified_by": "Administrator",
"module": "Schools",
"name": "Topic",
@@ -139,6 +153,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/report/absent_student_report/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/report/absent_student_report/__init__.py
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.js b/erpnext/schools/report/absent_student_report/absent_student_report.js
new file mode 100644
index 0000000..7515f22
--- /dev/null
+++ b/erpnext/schools/report/absent_student_report/absent_student_report.js
@@ -0,0 +1,15 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+
+frappe.query_reports["Absent Student Report"] = {
+ "filters": [
+ {
+ "fieldname":"date",
+ "label": __("Date"),
+ "fieldtype": "Date",
+ "default": get_today(),
+ "reqd": 1
+ }
+ ]
+}
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.json b/erpnext/schools/report/absent_student_report/absent_student_report.json
new file mode 100644
index 0000000..5f3ca71
--- /dev/null
+++ b/erpnext/schools/report/absent_student_report/absent_student_report.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0,
+ "apply_user_permissions": 1,
+ "creation": "2013-05-13 14:04:03",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 1,
+ "is_standard": "Yes",
+ "modified": "2016-12-01 14:28:27.184668",
+ "modified_by": "Administrator",
+ "module": "Schools",
+ "name": "Absent Student Report",
+ "owner": "Administrator",
+ "ref_doctype": "Student Attendance",
+ "report_name": "Absent Student Report",
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/schools/report/absent_student_report/absent_student_report.py b/erpnext/schools/report/absent_student_report/absent_student_report.py
new file mode 100644
index 0000000..82a20aa
--- /dev/null
+++ b/erpnext/schools/report/absent_student_report/absent_student_report.py
@@ -0,0 +1,60 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import cstr, cint, getdate
+from frappe import msgprint, _
+
+def execute(filters=None):
+ if not filters: filters = {}
+
+ if not filters.get("date"):
+ msgprint(_("Please select date"), raise_exception=1)
+
+ columns = get_columns(filters)
+
+ absent_students = get_absent_students(filters.get("date"))
+ leave_applicants = get_leave_applications(filters.get("date"))
+
+ data = []
+ for student in absent_students:
+ if not student.student in leave_applicants:
+ row = [student.student, student.student_name, student.student_batch]
+ stud_details = frappe.db.get_value("Student", student.student, ['student_email_id', 'student_mobile_number'], as_dict=True)
+
+ if stud_details.student_email_id:
+ row+=[stud_details.student_email_id]
+ else:
+ row+= [""]
+
+ if stud_details.student_mobile_number:
+ row+=[stud_details.student_mobile_number]
+ else:
+ row+= [""]
+
+ data.append(row)
+
+ return columns, data
+
+def get_columns(filters):
+ columns = [
+ _("Student") + ":Link/Student:90",
+ _("Student Name") + "::150",
+ _("Student Batch") + "::180",
+ _("Student Email ID") + "::180",
+ _("Student Mobile No.") + "::150",
+ ]
+ return columns
+
+def get_absent_students(date):
+ absent_students = frappe.db.sql("""select student, student_name, student_batch from `tabStudent Attendance`
+ where docstatus = 1 and status="Absent" and date = %s order by student_batch, student_name""", date, as_dict=1)
+ return absent_students
+
+def get_leave_applications(date):
+ leave_applicants = []
+ for student in frappe.db.sql("""select student from `tabStudent Leave Application`
+ where docstatus = 1 and date = %s""", date):
+ leave_applicants.append(student[0])
+ return leave_applicants
\ No newline at end of file
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/report/student_batch_wise_attendance/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/report/student_batch_wise_attendance/__init__.py
diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js
new file mode 100644
index 0000000..51f7346
--- /dev/null
+++ b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.js
@@ -0,0 +1,12 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.query_reports["Student Batch-Wise Attendance"] = {
+ "filters": [{
+ "fieldname": "date",
+ "label": __("Date"),
+ "fieldtype": "Date",
+ "default": get_today(),
+ "reqd": 1
+ }]
+}
\ No newline at end of file
diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json
new file mode 100644
index 0000000..8e5e483
--- /dev/null
+++ b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0,
+ "apply_user_permissions": 1,
+ "creation": "2016-11-28 22:07:03.859124",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 0,
+ "is_standard": "Yes",
+ "modified": "2016-12-01 15:48:50.120579",
+ "modified_by": "Administrator",
+ "module": "Schools",
+ "name": "Student Batch-Wise Attendance",
+ "owner": "Administrator",
+ "ref_doctype": "Student Attendance",
+ "report_name": "Student Batch-Wise Attendance",
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py
new file mode 100644
index 0000000..c112b59
--- /dev/null
+++ b/erpnext/schools/report/student_batch_wise_attendance/student_batch_wise_attendance.py
@@ -0,0 +1,64 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import cstr, cint, getdate
+from frappe import msgprint, _
+
+def execute(filters=None):
+ if not filters: filters = {}
+
+ if not filters.get("date"):
+ msgprint(_("Please select date"), raise_exception=1)
+
+ columns = get_columns(filters)
+
+ active_student_batch = get_active_student_batch()
+
+ data = []
+ for student_batch in active_student_batch:
+ row = [student_batch.name]
+ present_students = 0
+ absent_students = 0
+ student_batch_strength = get_student_batch_strength(student_batch.name)
+ student_attendance = get_student_attendance(student_batch.name, filters.get("date"))
+ if student_attendance:
+ for attendance in student_attendance:
+ if attendance.status== "Present":
+ present_students = attendance.count
+ elif attendance.status== "Absent":
+ absent_students = attendance.count
+
+ unmarked_students = student_batch_strength - (present_students + absent_students)
+ row+= [student_batch_strength, present_students, absent_students, unmarked_students]
+ data.append(row)
+
+ return columns, data
+
+def get_columns(filters):
+ columns = [
+ _("Student batch") + ":Link/Student Batch:250",
+ _("Student batch Strength") + "::170",
+ _("Present") + "::90",
+ _("Absent") + "::90",
+ _("Not Marked") + "::90"
+ ]
+ return columns
+
+def get_active_student_batch():
+ active_student_batch = frappe.db.sql("""select name from `tabStudent Batch`
+ where enabled = 1 order by name""", as_dict=1)
+ return active_student_batch
+
+def get_student_batch_strength(student_batch):
+ student_batch_strength = frappe.db.sql("""select count(*) from `tabStudent Batch Student`
+ where parent = %s""", student_batch)[0][0]
+ return student_batch_strength
+
+def get_student_attendance(student_batch, date):
+ student_attendance = frappe.db.sql("""select count(*) as count, status from `tabStudent Attendance` where \
+ student_batch= %s and date= %s and docstatus=1 and\
+ (course_schedule is Null or course_schedule='') group by status""",
+ (student_batch, date), as_dict=1)
+ return student_attendance
\ No newline at end of file
diff --git a/erpnext/schools/doctype/scheduling_tool/__init__.py b/erpnext/schools/report/student_monthly_attendance_sheet/__init__.py
similarity index 100%
copy from erpnext/schools/doctype/scheduling_tool/__init__.py
copy to erpnext/schools/report/student_monthly_attendance_sheet/__init__.py
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js
new file mode 100644
index 0000000..32c0551
--- /dev/null
+++ b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.js
@@ -0,0 +1,42 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+
+frappe.query_reports["Student Monthly Attendance Sheet"] = {
+ "filters": [
+ {
+ "fieldname":"month",
+ "label": __("Month"),
+ "fieldtype": "Select",
+ "options": "Jan\nFeb\nMar\nApr\nMay\nJun\nJul\nAug\nSep\nOct\nNov\nDec",
+ "default": ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
+ "Dec"][frappe.datetime.str_to_obj(frappe.datetime.get_today()).getMonth()],
+ },
+ {
+ "fieldname":"year",
+ "label": __("Year"),
+ "fieldtype": "Select",
+ "reqd": 1
+ },
+ {
+ "fieldname":"student_batch",
+ "label": __("Student Batch"),
+ "fieldtype": "Link",
+ "options": "Student Batch",
+ "reqd": 1
+ }
+ ],
+
+ "onload": function() {
+ return frappe.call({
+ method: "erpnext.schools.report.student_monthly_attendance_sheet.student_monthly_attendance_sheet.get_attendance_years",
+ callback: function(r) {
+ var year_filter = frappe.query_report_filters_by_name.year;
+ year_filter.df.options = r.message;
+ year_filter.df.default = r.message.split("\n")[0];
+ year_filter.refresh();
+ year_filter.set_input(year_filter.df.default);
+ }
+ });
+ }
+}
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json
new file mode 100644
index 0000000..1d8f4d0
--- /dev/null
+++ b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.json
@@ -0,0 +1,18 @@
+{
+ "add_total_row": 0,
+ "apply_user_permissions": 1,
+ "creation": "2013-05-13 14:04:03",
+ "disabled": 0,
+ "docstatus": 0,
+ "doctype": "Report",
+ "idx": 1,
+ "is_standard": "Yes",
+ "modified": "2016-12-01 14:29:53.547378",
+ "modified_by": "Administrator",
+ "module": "Schools",
+ "name": "Student Monthly Attendance Sheet",
+ "owner": "Administrator",
+ "ref_doctype": "Student Attendance",
+ "report_name": "Student Monthly Attendance Sheet",
+ "report_type": "Script Report"
+}
\ No newline at end of file
diff --git a/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
new file mode 100644
index 0000000..2f8ba52
--- /dev/null
+++ b/erpnext/schools/report/student_monthly_attendance_sheet/student_monthly_attendance_sheet.py
@@ -0,0 +1,82 @@
+# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+from frappe.utils import cstr, cint, getdate
+from frappe import msgprint, _
+from calendar import monthrange
+from erpnext.schools.api import get_student_batch_students
+
+def execute(filters=None):
+ if not filters: filters = {}
+
+ conditions, filters = get_conditions(filters)
+ columns = get_columns(filters)
+ att_map = get_attendance_list(conditions, filters)
+ students = get_student_batch_students(filters.get("student_batch"))
+ data = []
+ for stud in students:
+ row = [stud.student, stud.student_name]
+
+ total_p = total_a = 0.0
+ for day in range(filters["total_days_in_month"]):
+ status="None"
+ if att_map.get(stud.student):
+ status = att_map.get(stud.student).get(day + 1, "None")
+ status_map = {"Present": "P", "Absent": "A", "None": ""}
+ row.append(status_map[status])
+
+ if status == "Present":
+ total_p += 1
+ elif status == "Absent":
+ total_a += 1
+
+ row += [total_p, total_a]
+ data.append(row)
+
+ return columns, data
+
+def get_columns(filters):
+ columns = [ _("Student") + ":Link/Student:90", _("Student Name") + "::150"]
+
+ for day in range(filters["total_days_in_month"]):
+ columns.append(cstr(day+1) +"::20")
+
+ columns += [_("Total Present") + ":Int:95", _("Total Absent") + ":Int:90"]
+ return columns
+
+def get_attendance_list(conditions, filters):
+ attendance_list = frappe.db.sql("""select student, day(date) as day_of_month,
+ status from `tabStudent Attendance` where docstatus = 1 %s order by student, date""" %
+ conditions, filters, as_dict=1)
+
+ att_map = {}
+ for d in attendance_list:
+ att_map.setdefault(d.student, frappe._dict()).setdefault(d.day_of_month, "")
+ att_map[d.student][d.day_of_month] = d.status
+
+ return att_map
+
+def get_conditions(filters):
+ if not (filters.get("month") and filters.get("year")):
+ msgprint(_("Please select month and year"), raise_exception=1)
+
+ filters["month"] = ["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov",
+ "Dec"].index(filters.month) + 1
+
+ filters["total_days_in_month"] = monthrange(cint(filters.year), filters.month)[1]
+
+ conditions = " and month(date) = %(month)s and year(date) = %(year)s"
+
+ if filters.get("student_batch"): conditions += " and student_batch = %(student_batch)s"
+
+ return conditions, filters
+
+@frappe.whitelist()
+def get_attendance_years():
+ year_list = frappe.db.sql_list("""select distinct YEAR(date) from `tabStudent Attendance` ORDER BY YEAR(date) DESC""")
+ if not year_list:
+ year_list = [getdate().year]
+
+ return "\n".join(str(year) for year in year_list)
diff --git a/erpnext/selling/doctype/campaign/campaign.js b/erpnext/selling/doctype/campaign/campaign.js
index 31a796f..72a90d0 100644
--- a/erpnext/selling/doctype/campaign/campaign.js
+++ b/erpnext/selling/doctype/campaign/campaign.js
@@ -10,6 +10,6 @@
cur_frm.add_custom_button(__("View Leads"), function() {
frappe.route_options = {"source": "Campaign","campaign_name": frm.doc.name}
frappe.set_route("List", "Lead");
- }, "icon-list", true);
+ }, "fa fa-list", true);
}
})
diff --git a/erpnext/selling/doctype/campaign/campaign.json b/erpnext/selling/doctype/campaign/campaign.json
index 2c1d2b4..9487540 100644
--- a/erpnext/selling/doctype/campaign/campaign.json
+++ b/erpnext/selling/doctype/campaign/campaign.json
@@ -118,7 +118,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-bullhorn",
+ "icon": "fa fa-bullhorn",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/selling/doctype/customer/customer.json b/erpnext/selling/doctype/customer/customer.json
index bbd23cb..77cc624 100644
--- a/erpnext/selling/doctype/customer/customer.json
+++ b/erpnext/selling/doctype/customer/customer.json
@@ -11,11 +11,13 @@
"doctype": "DocType",
"document_type": "Setup",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "basic_info",
"fieldtype": "Section Break",
"hidden": 0,
@@ -23,15 +25,17 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Name and Type",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-user",
+ "options": "fa fa-user",
"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,
@@ -42,6 +46,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "naming_series",
"fieldtype": "Select",
"hidden": 0,
@@ -49,6 +54,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -57,6 +63,7 @@
"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,
@@ -67,6 +74,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"fieldname": "customer_name",
"fieldtype": "Data",
"hidden": 0,
@@ -74,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Full Name",
"length": 0,
"no_copy": 1,
@@ -83,6 +92,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
@@ -93,6 +103,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "customer_type",
"fieldtype": "Select",
"hidden": 0,
@@ -100,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Type",
"length": 0,
"no_copy": 0,
@@ -110,6 +122,7 @@
"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,
@@ -120,6 +133,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "lead_name",
"fieldtype": "Link",
"hidden": 0,
@@ -127,6 +141,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "From Lead",
"length": 0,
"no_copy": 1,
@@ -137,6 +152,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 1,
"reqd": 0,
"search_index": 0,
@@ -147,6 +163,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "image",
"fieldtype": "Attach Image",
"hidden": 1,
@@ -154,6 +171,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
@@ -162,6 +180,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -172,6 +191,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "Active",
"fieldname": "status",
"fieldtype": "Select",
@@ -180,6 +200,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 0,
@@ -189,6 +210,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -199,6 +221,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break0",
"fieldtype": "Column Break",
"hidden": 0,
@@ -206,12 +229,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -223,6 +248,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "",
"fieldname": "customer_group",
"fieldtype": "Link",
@@ -231,6 +257,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Customer Group",
"length": 0,
"no_copy": 0,
@@ -241,6 +268,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
@@ -251,6 +279,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "",
"fieldname": "territory",
"fieldtype": "Link",
@@ -259,6 +288,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Territory",
"length": 0,
"no_copy": 0,
@@ -269,6 +299,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -279,6 +310,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "tax_id",
"fieldtype": "Data",
"hidden": 0,
@@ -286,6 +318,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Tax ID",
"length": 0,
"no_copy": 0,
@@ -294,6 +327,7 @@
"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,
@@ -304,6 +338,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "0",
"fieldname": "disabled",
"fieldtype": "Check",
@@ -312,6 +347,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Disabled",
"length": 0,
"no_copy": 0,
@@ -320,6 +356,7 @@
"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,
@@ -330,6 +367,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 1,
+ "columns": 0,
"fieldname": "currency_and_price_list",
"fieldtype": "Section Break",
"hidden": 0,
@@ -337,6 +375,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
@@ -345,6 +384,7 @@
"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,
@@ -355,6 +395,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "default_currency",
"fieldtype": "Link",
"hidden": 0,
@@ -362,6 +403,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Billing Currency",
"length": 0,
"no_copy": 1,
@@ -370,6 +412,7 @@
"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,
@@ -380,6 +423,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "default_price_list",
"fieldtype": "Link",
"hidden": 0,
@@ -387,6 +431,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Price List",
"length": 0,
"no_copy": 0,
@@ -395,6 +440,7 @@
"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,
@@ -405,6 +451,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_14",
"fieldtype": "Column Break",
"hidden": 0,
@@ -412,6 +459,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -419,6 +467,7 @@
"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,
@@ -429,6 +478,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "language",
"fieldtype": "Link",
"hidden": 0,
@@ -436,6 +486,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Language",
"length": 0,
"no_copy": 0,
@@ -445,6 +496,7 @@
"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,
@@ -455,6 +507,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "address_contacts",
"fieldtype": "Section Break",
@@ -463,14 +516,16 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address and Contact",
"length": 0,
"no_copy": 0,
- "options": "icon-map-marker",
+ "options": "fa fa-map-marker",
"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,
@@ -481,6 +536,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "address_html",
"fieldtype": "HTML",
"hidden": 0,
@@ -488,6 +544,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address HTML",
"length": 0,
"no_copy": 0,
@@ -495,6 +552,7 @@
"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,
@@ -505,6 +563,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "website",
"fieldtype": "Data",
"hidden": 0,
@@ -512,6 +571,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Website",
"length": 0,
"no_copy": 0,
@@ -519,6 +579,7 @@
"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,
@@ -529,6 +590,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break1",
"fieldtype": "Column Break",
"hidden": 0,
@@ -536,12 +598,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -553,6 +617,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "contact_html",
"fieldtype": "HTML",
"hidden": 0,
@@ -560,6 +625,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact HTML",
"length": 0,
"no_copy": 0,
@@ -568,6 +634,7 @@
"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,
@@ -579,6 +646,7 @@
"bold": 0,
"collapsible": 1,
"collapsible_depends_on": "",
+ "columns": 0,
"fieldname": "default_receivable_accounts",
"fieldtype": "Section Break",
"hidden": 0,
@@ -586,6 +654,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accounting",
"length": 0,
"no_copy": 0,
@@ -593,6 +662,7 @@
"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,
@@ -603,6 +673,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "",
"description": "Mention if non-standard receivable account",
"fieldname": "accounts",
@@ -612,6 +683,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accounts",
"length": 0,
"no_copy": 0,
@@ -620,6 +692,7 @@
"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,
@@ -631,6 +704,7 @@
"bold": 0,
"collapsible": 1,
"collapsible_depends_on": "eval:doc.credit_days || doc.credit_limit",
+ "columns": 0,
"fieldname": "credit_limit_section",
"fieldtype": "Section Break",
"hidden": 0,
@@ -638,6 +712,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit Limit",
"length": 0,
"no_copy": 0,
@@ -645,6 +720,7 @@
"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,
@@ -656,6 +732,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "credit_days_based_on",
"fieldtype": "Select",
"hidden": 0,
@@ -663,6 +740,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit Days Based On",
"length": 0,
"no_copy": 0,
@@ -672,6 +750,7 @@
"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,
@@ -682,6 +761,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:doc.credit_days_based_on=='Fixed Days'",
"fieldname": "credit_days",
"fieldtype": "Int",
@@ -690,6 +770,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit Days",
"length": 0,
"no_copy": 0,
@@ -699,6 +780,7 @@
"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,
@@ -709,6 +791,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "credit_limit",
"fieldtype": "Currency",
"hidden": 0,
@@ -716,6 +799,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit Limit",
"length": 0,
"no_copy": 0,
@@ -726,6 +810,7 @@
"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,
@@ -737,6 +822,7 @@
"bold": 0,
"collapsible": 1,
"collapsible_depends_on": "customer_details",
+ "columns": 0,
"fieldname": "more_info",
"fieldtype": "Section Break",
"hidden": 0,
@@ -744,15 +830,17 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"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,
@@ -763,6 +851,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "Additional information regarding the customer.",
"fieldname": "customer_details",
"fieldtype": "Text",
@@ -771,6 +860,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Details",
"length": 0,
"no_copy": 0,
@@ -780,6 +870,7 @@
"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,
@@ -790,6 +881,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "is_frozen",
"fieldtype": "Check",
"hidden": 0,
@@ -797,6 +889,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Frozen",
"length": 0,
"no_copy": 0,
@@ -805,6 +898,7 @@
"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,
@@ -816,6 +910,7 @@
"bold": 0,
"collapsible": 1,
"collapsible_depends_on": "default_sales_partner",
+ "columns": 0,
"fieldname": "sales_team_section_break",
"fieldtype": "Section Break",
"hidden": 0,
@@ -823,15 +918,17 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Partner and Commission",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-group",
+ "options": "fa fa-group",
"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,
@@ -842,6 +939,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "default_sales_partner",
"fieldtype": "Link",
"hidden": 0,
@@ -849,6 +947,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Partner",
"length": 0,
"no_copy": 0,
@@ -859,6 +958,7 @@
"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,
@@ -869,6 +969,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "default_commission_rate",
"fieldtype": "Float",
"hidden": 0,
@@ -876,6 +977,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Commission Rate",
"length": 0,
"no_copy": 0,
@@ -885,6 +987,7 @@
"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,
@@ -896,6 +999,7 @@
"bold": 0,
"collapsible": 1,
"collapsible_depends_on": "sales_team",
+ "columns": 0,
"fieldname": "sales_team_section",
"fieldtype": "Section Break",
"hidden": 0,
@@ -903,6 +1007,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Team",
"length": 0,
"no_copy": 0,
@@ -911,6 +1016,7 @@
"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,
@@ -921,6 +1027,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "sales_team",
"fieldtype": "Table",
"hidden": 0,
@@ -928,6 +1035,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Team Details",
"length": 0,
"no_copy": 0,
@@ -938,6 +1046,7 @@
"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,
@@ -947,7 +1056,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 363,
"image_field": "image",
"image_view": 0,
@@ -957,7 +1066,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-08-23 05:43:04.309480",
+ "modified": "2016-11-07 05:26:57.948263",
"modified_by": "Administrator",
"module": "Selling",
"name": "Customer",
@@ -974,6 +1083,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -994,6 +1104,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 1,
"print": 0,
"read": 1,
@@ -1014,6 +1125,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -1034,6 +1146,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -1054,6 +1167,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 1,
"print": 0,
"read": 1,
@@ -1074,6 +1188,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -1094,6 +1209,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -1114,6 +1230,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -1134,6 +1251,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/selling/doctype/industry_type/industry_type.json b/erpnext/selling/doctype/industry_type/industry_type.json
index 9d23215..027626c 100644
--- a/erpnext/selling/doctype/industry_type/industry_type.json
+++ b/erpnext/selling/doctype/industry_type/industry_type.json
@@ -40,7 +40,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/selling/doctype/installation_note/installation_note.js b/erpnext/selling/doctype/installation_note/installation_note.js
index 5b99691..0334ae7 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.js
+++ b/erpnext/selling/doctype/installation_note/installation_note.js
@@ -60,7 +60,7 @@
company: cur_frm.doc.company
}
})
- }, "icon-download", "btn-default"
+ }, "fa fa-download", "btn-default"
);
}
},
diff --git a/erpnext/selling/doctype/installation_note/installation_note.json b/erpnext/selling/doctype/installation_note/installation_note.json
index edd1981..0254ec8 100644
--- a/erpnext/selling/doctype/installation_note/installation_note.json
+++ b/erpnext/selling/doctype/installation_note/installation_note.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Installation Note",
"length": 0,
"no_copy": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -77,6 +79,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -106,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -136,6 +140,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Address",
"length": 0,
"no_copy": 0,
@@ -164,6 +169,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Person",
"length": 0,
"no_copy": 0,
@@ -191,6 +197,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Name",
"length": 0,
"no_copy": 0,
@@ -219,6 +226,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address",
"length": 0,
"no_copy": 0,
@@ -245,6 +253,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
@@ -272,6 +281,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No",
"length": 0,
"no_copy": 0,
@@ -299,6 +309,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Email",
"length": 0,
"no_copy": 0,
@@ -328,6 +339,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Territory",
"length": 0,
"no_copy": 0,
@@ -357,6 +369,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Group",
"length": 0,
"no_copy": 0,
@@ -384,6 +397,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -411,6 +425,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Installation Date",
"length": 0,
"no_copy": 0,
@@ -439,6 +454,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Installation Time",
"length": 0,
"no_copy": 0,
@@ -468,6 +484,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -498,6 +515,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -527,6 +545,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -556,6 +575,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Remarks",
"length": 0,
"no_copy": 0,
@@ -584,6 +604,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -612,6 +633,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -632,7 +654,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-wrench",
+ "icon": "fa fa-wrench",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -641,7 +663,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 16:06:56.856800",
+ "modified": "2016-11-07 05:53:24.141335",
"modified_by": "Administrator",
"module": "Selling",
"name": "Installation Note",
diff --git a/erpnext/selling/doctype/product_bundle/product_bundle.json b/erpnext/selling/doctype/product_bundle/product_bundle.json
index 7ec3df8..0edb8e6 100644
--- a/erpnext/selling/doctype/product_bundle/product_bundle.json
+++ b/erpnext/selling/doctype/product_bundle/product_bundle.json
@@ -108,7 +108,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 9d9dfa3..4fc536e 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -23,10 +23,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -78,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -108,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Quotation To",
"length": 0,
"no_copy": 0,
@@ -138,6 +142,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -168,6 +173,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Lead",
"length": 0,
"no_copy": 0,
@@ -197,6 +203,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Name",
"length": 0,
"no_copy": 0,
@@ -223,6 +230,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -250,6 +258,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -281,6 +290,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -312,6 +322,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date",
"length": 0,
"no_copy": 1,
@@ -342,6 +353,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Order Type",
"length": 0,
"no_copy": 0,
@@ -373,10 +385,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address and Contact",
"length": 0,
"no_copy": 0,
- "options": "icon-bullhorn",
+ "options": "fa fa-bullhorn",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -400,6 +413,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Address",
"length": 0,
"no_copy": 0,
@@ -427,6 +441,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address",
"length": 0,
"no_copy": 0,
@@ -456,6 +471,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Person",
"length": 0,
"no_copy": 0,
@@ -485,6 +501,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
@@ -511,6 +528,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No",
"length": 0,
"no_copy": 0,
@@ -537,6 +555,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Email",
"length": 0,
"no_copy": 0,
@@ -565,6 +584,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -591,6 +611,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Address",
"length": 0,
"no_copy": 0,
@@ -618,6 +639,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Address",
"length": 0,
"no_copy": 0,
@@ -646,6 +668,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Group",
"length": 0,
"no_copy": 0,
@@ -676,6 +699,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Territory",
"length": 0,
"no_copy": 0,
@@ -703,10 +727,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -730,6 +755,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency",
"length": 0,
"no_copy": 0,
@@ -761,6 +787,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -791,6 +818,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -817,6 +845,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List",
"length": 0,
"no_copy": 0,
@@ -847,6 +876,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Currency",
"length": 0,
"no_copy": 0,
@@ -875,6 +905,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -902,6 +933,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Ignore Pricing Rule",
"length": 0,
"no_copy": 1,
@@ -928,11 +960,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -956,6 +989,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -986,6 +1020,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1011,6 +1046,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1039,6 +1075,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1069,6 +1106,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1094,6 +1132,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total",
"length": 0,
"no_copy": 0,
@@ -1122,6 +1161,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total",
"length": 0,
"no_copy": 0,
@@ -1149,11 +1189,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1177,6 +1218,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1206,6 +1248,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1231,6 +1274,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Rule",
"length": 0,
"no_copy": 0,
@@ -1259,6 +1303,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1284,6 +1329,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1313,6 +1359,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Calculation",
"length": 0,
"no_copy": 0,
@@ -1340,6 +1387,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1365,6 +1413,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1394,6 +1443,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1419,6 +1469,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1447,6 +1498,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount",
"length": 0,
"no_copy": 0,
@@ -1475,6 +1527,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Apply Additional Discount On",
"length": 0,
"no_copy": 0,
@@ -1503,6 +1556,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1531,6 +1585,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1557,6 +1612,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Percentage",
"length": 0,
"no_copy": 0,
@@ -1584,6 +1640,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount",
"length": 0,
"no_copy": 0,
@@ -1611,11 +1668,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -1639,6 +1697,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Grand Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1670,6 +1729,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1699,6 +1759,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rounded Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1729,6 +1790,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -1756,6 +1818,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Grand Total",
"length": 0,
"no_copy": 0,
@@ -1786,6 +1849,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rounded Total",
"length": 0,
"no_copy": 0,
@@ -1816,6 +1880,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words",
"length": 0,
"no_copy": 0,
@@ -1846,11 +1911,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1874,6 +1940,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms",
"length": 0,
"no_copy": 0,
@@ -1903,6 +1970,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Term Details",
"length": 0,
"no_copy": 0,
@@ -1931,6 +1999,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Settings",
"length": 0,
"no_copy": 0,
@@ -1958,6 +2027,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -1987,6 +2057,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Heading",
"length": 0,
"no_copy": 1,
@@ -2016,6 +2087,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2042,6 +2114,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Language",
"length": 0,
"no_copy": 0,
@@ -2069,11 +2142,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2097,6 +2171,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Campaign",
"length": 0,
"no_copy": 0,
@@ -2126,6 +2201,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Source",
"length": 0,
"no_copy": 0,
@@ -2156,6 +2232,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Quotation Lost Reason",
"length": 0,
"no_copy": 1,
@@ -2184,6 +2261,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -2212,6 +2290,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -2241,6 +2320,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Opportunity Item",
"length": 0,
"no_copy": 0,
@@ -2260,7 +2340,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-shopping-cart",
+ "icon": "fa fa-shopping-cart",
"idx": 82,
"image_view": 0,
"in_create": 0,
@@ -2270,7 +2350,7 @@
"istable": 0,
"max_attachments": 1,
"menu_index": 0,
- "modified": "2016-11-03 16:07:18.546417",
+ "modified": "2016-11-07 05:58:07.587479",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index 6ed1888..56a365e 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -16,6 +16,7 @@
def validate(self):
super(Quotation, self).validate()
self.set_status()
+ self.update_opportunity()
self.validate_order_type()
self.validate_uom_is_integer("stock_uom", "qty")
self.validate_quotation_to()
@@ -35,6 +36,10 @@
elif self.lead:
self.quotation_to = "Lead"
+ def update_lead(self):
+ if self.lead:
+ frappe.get_doc("Lead", self.lead).set_status(update=True)
+
def update_opportunity(self):
for opportunity in list(set([d.prevdoc_docname for d in self.get("items")])):
if opportunity:
@@ -45,6 +50,7 @@
frappe.db.set(self, 'status', 'Lost')
frappe.db.set(self, 'order_lost_reason', arg)
self.update_opportunity()
+ self.update_lead()
else:
frappe.throw(_("Cannot set as Lost as Sales Order is made."))
@@ -60,11 +66,13 @@
#update enquiry status
self.update_opportunity()
+ self.update_lead()
def on_cancel(self):
#update enquiry status
self.set_status(update=True)
self.update_opportunity()
+ self.update_lead()
def print_other_charges(self,docname):
print_lst = []
diff --git a/erpnext/selling/doctype/sales_order/sales_order.json b/erpnext/selling/doctype/sales_order/sales_order.json
index 707f6c4..f171007 100644
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -10,6 +10,7 @@
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 1,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
@@ -23,10 +24,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -50,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -78,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -105,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -134,6 +139,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -163,6 +169,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Name",
"length": 0,
"no_copy": 0,
@@ -191,6 +198,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Order Type",
"length": 0,
"no_copy": 0,
@@ -220,6 +228,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -247,6 +256,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -278,6 +288,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -309,6 +320,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date",
"length": 0,
"no_copy": 1,
@@ -339,6 +351,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Delivery Date",
"length": 0,
"no_copy": 1,
@@ -370,6 +383,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer's Purchase Order",
"length": 0,
"no_copy": 0,
@@ -401,6 +415,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer's Purchase Order Date",
"length": 0,
"no_copy": 0,
@@ -432,10 +447,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address and Contact",
"length": 0,
"no_copy": 0,
- "options": "icon-bullhorn",
+ "options": "fa fa-bullhorn",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -459,6 +475,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Address",
"length": 0,
"no_copy": 0,
@@ -486,6 +503,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address",
"length": 0,
"no_copy": 0,
@@ -512,6 +530,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Person",
"length": 0,
"no_copy": 0,
@@ -539,6 +558,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
@@ -565,6 +585,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No",
"length": 0,
"no_copy": 0,
@@ -591,6 +612,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Email",
"length": 0,
"no_copy": 0,
@@ -618,6 +640,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -644,6 +667,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Address Name",
"length": 0,
"no_copy": 0,
@@ -671,6 +695,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Address",
"length": 0,
"no_copy": 0,
@@ -698,6 +723,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Group",
"length": 0,
"no_copy": 0,
@@ -726,6 +752,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Territory",
"length": 0,
"no_copy": 0,
@@ -753,10 +780,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -780,6 +808,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency",
"length": 0,
"no_copy": 0,
@@ -811,6 +840,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -841,6 +871,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -867,6 +898,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List",
"length": 0,
"no_copy": 0,
@@ -897,6 +929,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Currency",
"length": 0,
"no_copy": 0,
@@ -925,6 +958,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -952,6 +986,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Ignore Pricing Rule",
"length": 0,
"no_copy": 1,
@@ -978,11 +1013,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1006,6 +1042,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -1035,6 +1072,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1060,6 +1098,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1085,6 +1124,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1113,6 +1153,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1143,6 +1184,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1168,6 +1210,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total",
"length": 0,
"no_copy": 0,
@@ -1196,6 +1239,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total",
"length": 0,
"no_copy": 0,
@@ -1223,11 +1267,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1251,6 +1296,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1280,6 +1326,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1305,6 +1352,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Rule",
"length": 0,
"no_copy": 0,
@@ -1333,6 +1381,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1358,6 +1407,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1387,6 +1437,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Calculation",
"length": 0,
"no_copy": 0,
@@ -1414,6 +1465,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1439,6 +1491,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1469,6 +1522,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1495,6 +1549,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1523,6 +1578,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount",
"length": 0,
"no_copy": 0,
@@ -1551,6 +1607,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Apply Additional Discount On",
"length": 0,
"no_copy": 0,
@@ -1579,6 +1636,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1607,6 +1665,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1633,6 +1692,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Percentage",
"length": 0,
"no_copy": 0,
@@ -1661,6 +1721,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount",
"length": 0,
"no_copy": 0,
@@ -1688,11 +1749,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -1716,6 +1778,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Grand Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1746,6 +1809,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rounded Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1777,6 +1841,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1806,6 +1871,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -1833,6 +1899,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Grand Total",
"length": 0,
"no_copy": 0,
@@ -1863,6 +1930,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rounded Total",
"length": 0,
"no_copy": 0,
@@ -1893,6 +1961,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words",
"length": 0,
"no_copy": 0,
@@ -1922,6 +1991,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Advance Paid",
"length": 0,
"no_copy": 1,
@@ -1951,11 +2021,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Packing List",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-suitcase",
+ "options": "fa fa-suitcase",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -1979,6 +2050,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Packed Items",
"length": 0,
"no_copy": 0,
@@ -2009,11 +2081,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2037,6 +2110,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms",
"length": 0,
"no_copy": 0,
@@ -2066,6 +2140,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions Details",
"length": 0,
"no_copy": 0,
@@ -2095,11 +2170,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2124,6 +2200,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -2153,6 +2230,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Party Account Currency",
"length": 0,
"no_copy": 1,
@@ -2181,6 +2259,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2207,6 +2286,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Source",
"length": 0,
"no_copy": 0,
@@ -2237,6 +2317,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Campaign",
"length": 0,
"no_copy": 0,
@@ -2266,6 +2347,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Printing Details",
"length": 0,
"no_copy": 0,
@@ -2293,6 +2375,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Language",
"length": 0,
"no_copy": 0,
@@ -2320,6 +2403,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -2349,6 +2433,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -2376,6 +2461,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Heading",
"length": 0,
"no_copy": 1,
@@ -2394,6 +2480,34 @@
"unique": 0
},
{
+ "allow_on_submit": 1,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "group_same_items",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Group same items",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "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,
+ "unique": 0
+ },
+ {
"allow_on_submit": 0,
"bold": 0,
"collapsible": 1,
@@ -2405,6 +2519,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Billing and Delivery Status",
"length": 0,
"no_copy": 0,
@@ -2434,6 +2549,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -2464,6 +2580,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Delivery Status",
"length": 0,
"no_copy": 1,
@@ -2493,6 +2610,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "% Delivered",
"length": 0,
"no_copy": 1,
@@ -2522,6 +2640,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2549,6 +2668,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "% Amount Billed",
"length": 0,
"no_copy": 1,
@@ -2578,6 +2698,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Billing Status",
"length": 0,
"no_copy": 1,
@@ -2606,11 +2727,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Commission",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-group",
+ "options": "fa fa-group",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2634,6 +2756,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Partner",
"length": 0,
"no_copy": 0,
@@ -2664,6 +2787,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2690,6 +2814,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Commission Rate",
"length": 0,
"no_copy": 0,
@@ -2719,6 +2844,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Commission",
"length": 0,
"no_copy": 0,
@@ -2749,6 +2875,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Team",
"length": 0,
"no_copy": 0,
@@ -2775,6 +2902,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Team1",
"length": 0,
"no_copy": 0,
@@ -2805,10 +2933,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Recurring Order",
"length": 0,
"no_copy": 0,
- "options": "icon-time",
+ "options": "fa fa-time",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2832,6 +2961,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Settings",
"length": 0,
"no_copy": 0,
@@ -2861,6 +2991,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Recurring",
"length": 0,
"no_copy": 1,
@@ -2889,6 +3020,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reference Document",
"length": 0,
"no_copy": 1,
@@ -2918,6 +3050,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Frequency",
"length": 0,
"no_copy": 1,
@@ -2947,6 +3080,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Repeat on Day of Month",
"length": 0,
"no_copy": 1,
@@ -2975,6 +3109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Recurring Upto",
"length": 0,
"no_copy": 1,
@@ -3002,6 +3137,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Submit on creation",
"length": 0,
"no_copy": 0,
@@ -3031,6 +3167,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Notify by email",
"length": 0,
"no_copy": 1,
@@ -3060,6 +3197,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Notification Email Address",
"length": 0,
"no_copy": 1,
@@ -3088,6 +3226,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Recurring Print Format",
"length": 0,
"no_copy": 0,
@@ -3116,6 +3255,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "This Document",
"length": 0,
"no_copy": 0,
@@ -3144,6 +3284,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "From Date",
"length": 0,
"no_copy": 1,
@@ -3172,6 +3313,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "To Date",
"length": 0,
"no_copy": 1,
@@ -3200,6 +3342,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Next Date",
"length": 0,
"no_copy": 1,
@@ -3217,7 +3360,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 105,
"image_view": 0,
"in_create": 0,
@@ -3226,7 +3369,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-14 16:07:45.817880",
+ "modified": "2016-11-16 04:06:28.675876",
"modified_by": "Administrator",
"module": "Selling",
"name": "Sales Order",
diff --git a/erpnext/selling/doctype/selling_settings/selling_settings.json b/erpnext/selling/doctype/selling_settings/selling_settings.json
index dd9bcd7..f1bfe95 100644
--- a/erpnext/selling/doctype/selling_settings/selling_settings.json
+++ b/erpnext/selling/doctype/selling_settings/selling_settings.json
@@ -352,7 +352,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/selling/doctype/sms_center/sms_center.json b/erpnext/selling/doctype/sms_center/sms_center.json
index 56a3c03..3ea5b14 100644
--- a/erpnext/selling/doctype/sms_center/sms_center.json
+++ b/erpnext/selling/doctype/sms_center/sms_center.json
@@ -319,7 +319,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-mobile-phone",
+ "icon": "fa fa-mobile-phone",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/selling/page/sales_analytics/sales_analytics.json b/erpnext/selling/page/sales_analytics/sales_analytics.json
index 12bc487..4a7761e 100644
--- a/erpnext/selling/page/sales_analytics/sales_analytics.json
+++ b/erpnext/selling/page/sales_analytics/sales_analytics.json
@@ -2,7 +2,7 @@
"creation": "2012-09-21 20:15:12.000000",
"docstatus": 0,
"doctype": "Page",
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
"idx": 1,
"modified": "2013-07-11 14:43:59.000000",
"modified_by": "Administrator",
diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.js b/erpnext/selling/page/sales_funnel/sales_funnel.js
index a516342..67ba1c8 100644
--- a/erpnext/selling/page/sales_funnel/sales_funnel.js
+++ b/erpnext/selling/page/sales_funnel/sales_funnel.js
@@ -31,7 +31,7 @@
from_date: wrapper.page.add_date(__("From Date")),
to_date: wrapper.page.add_date(__("To Date")),
refresh_btn: wrapper.page.set_primary_action(__("Refresh"),
- function() { me.get_data(); }, "icon-refresh"),
+ function() { me.get_data(); }, "fa fa-refresh"),
};
this.elements.no_data = $('<div class="alert alert-warning">' + __("No Data") + '</div>')
diff --git a/erpnext/selling/page/sales_funnel/sales_funnel.json b/erpnext/selling/page/sales_funnel/sales_funnel.json
index 3a50968..e60b975 100644
--- a/erpnext/selling/page/sales_funnel/sales_funnel.json
+++ b/erpnext/selling/page/sales_funnel/sales_funnel.json
@@ -2,7 +2,7 @@
"creation": "2013-10-04 13:17:18.000000",
"docstatus": 0,
"doctype": "Page",
- "icon": "icon-filter",
+ "icon": "fa fa-filter",
"idx": 1,
"modified": "2013-10-04 13:17:18.000000",
"modified_by": "Administrator",
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 97eca54..fc3cb3d 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -206,11 +206,13 @@
if(item.item_code && item.warehouse) {
return this.frm.call({
- method: "erpnext.stock.get_item_details.get_bin_details",
+ method: "erpnext.stock.get_item_details.get_bin_details_and_serial_nos",
child: item,
args: {
item_code: item.item_code,
warehouse: item.warehouse,
+ qty: item.qty,
+ serial_no:item.serial_no
},
callback:function(r){
if (inList(['Delivery Note', 'Sales Invoice'], doc.doctype)) {
@@ -375,4 +377,4 @@
})
}
}
-})
+})
\ No newline at end of file
diff --git a/erpnext/setup/doctype/authorization_rule/authorization_rule.json b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
index 42e5400..d696d3b 100644
--- a/erpnext/setup/doctype/authorization_rule/authorization_rule.json
+++ b/erpnext/setup/doctype/authorization_rule/authorization_rule.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Transaction",
"length": 0,
"no_copy": 0,
@@ -52,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Based On",
"length": 0,
"no_copy": 0,
@@ -81,6 +83,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer or Item",
"length": 0,
"no_copy": 0,
@@ -109,6 +112,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Customer / Item Name",
"length": 0,
"no_copy": 0,
@@ -138,6 +142,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -164,6 +169,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -193,6 +199,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -219,6 +226,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Authorized Value",
"length": 0,
"no_copy": 0,
@@ -247,6 +255,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -273,6 +282,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Applicable To (Role)",
"length": 0,
"no_copy": 0,
@@ -303,6 +313,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Applicable To (Employee)",
"length": 0,
"no_copy": 0,
@@ -332,6 +343,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -358,6 +370,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Applicable To (User)",
"length": 0,
"no_copy": 0,
@@ -388,6 +401,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Applicable To (Designation)",
"length": 0,
"no_copy": 0,
@@ -417,6 +431,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -443,6 +458,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Approving Role (above authorized value)",
"length": 0,
"no_copy": 0,
@@ -472,6 +488,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -498,6 +515,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Approving User (above authorized value)",
"length": 0,
"no_copy": 0,
@@ -518,7 +536,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-shield",
+ "icon": "fa fa-shield",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -527,7 +545,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 16:08:11.656994",
+ "modified": "2016-11-07 05:10:52.977860",
"modified_by": "Administrator",
"module": "Setup",
"name": "Authorization Rule",
diff --git a/erpnext/setup/doctype/brand/brand.json b/erpnext/setup/doctype/brand/brand.json
index 8b04358..03433de 100644
--- a/erpnext/setup/doctype/brand/brand.json
+++ b/erpnext/setup/doctype/brand/brand.json
@@ -67,7 +67,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-certificate",
+ "icon": "fa fa-certificate",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index a003bde..fabbd51 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -10,11 +10,13 @@
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
+ "editable_grid": 0,
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "details",
"fieldtype": "Section Break",
"hidden": 0,
@@ -22,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -30,6 +33,7 @@
"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,
@@ -40,6 +44,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "company_name",
"fieldtype": "Data",
"hidden": 0,
@@ -47,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -56,6 +62,7 @@
"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,
@@ -66,6 +73,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "",
"fieldname": "abbr",
"fieldtype": "Data",
@@ -74,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Abbr",
"length": 0,
"no_copy": 0,
@@ -83,6 +92,7 @@
"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,
@@ -93,6 +103,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:!doc.__islocal && in_list(user_roles, \"System Manager\")",
"fieldname": "change_abbr",
"fieldtype": "Button",
@@ -101,6 +112,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Change Abbreviation",
"length": 0,
"no_copy": 0,
@@ -108,6 +120,7 @@
"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,
@@ -118,6 +131,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "cb0",
"fieldtype": "Column Break",
"hidden": 0,
@@ -125,12 +139,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -141,6 +157,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "domain",
"fieldtype": "Select",
"hidden": 0,
@@ -148,6 +165,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Domain",
"length": 0,
"no_copy": 0,
@@ -156,6 +174,7 @@
"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,
@@ -166,6 +185,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "charts_section",
"fieldtype": "Section Break",
"hidden": 0,
@@ -173,6 +193,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Values",
"length": 0,
"no_copy": 0,
@@ -180,6 +201,7 @@
"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,
@@ -190,6 +212,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "default_letter_head",
"fieldtype": "Link",
"hidden": 0,
@@ -197,6 +220,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Letter Head",
"length": 0,
"no_copy": 0,
@@ -206,6 +230,7 @@
"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,
@@ -216,6 +241,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "default_holiday_list",
"fieldtype": "Link",
"hidden": 0,
@@ -223,6 +249,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Holiday List",
"length": 0,
"no_copy": 0,
@@ -232,6 +259,7 @@
"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,
@@ -242,6 +270,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "default_terms",
"fieldtype": "Link",
"hidden": 0,
@@ -249,6 +278,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Terms",
"length": 0,
"no_copy": 0,
@@ -257,6 +287,7 @@
"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,
@@ -267,55 +298,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "column_break_10",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "country",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 1,
- "label": "Country",
- "length": 0,
- "no_copy": 0,
- "options": "Country",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
+ "columns": 0,
"fieldname": "default_currency",
"fieldtype": "Link",
"hidden": 0,
@@ -323,6 +306,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Currency",
"length": 0,
"no_copy": 0,
@@ -331,6 +315,7 @@
"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,
@@ -341,21 +326,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "chart_of_accounts",
- "fieldtype": "Select",
+ "columns": 0,
+ "fieldname": "column_break_10",
+ "fieldtype": "Column Break",
"hidden": 0,
- "ignore_user_permissions": 1,
+ "ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
- "label": "Chart of Accounts",
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
- "options": "",
"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,
@@ -366,6 +353,124 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
+ "fieldname": "country",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "in_standard_filter": 0,
+ "label": "Country",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Country",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "create_chart_of_accounts_based_on",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Create Chart Of Accounts Based On",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Standard Template\nExisting Company",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"",
+ "fieldname": "chart_of_accounts",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Chart Of Accounts Template",
+ "length": 0,
+ "no_copy": 1,
+ "options": "",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Existing Company\"",
+ "fieldname": "existing_company",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Existing Company ",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Company",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "default_settings",
"fieldtype": "Section Break",
"hidden": 0,
@@ -373,6 +478,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accounts Settings",
"length": 0,
"no_copy": 0,
@@ -381,6 +487,7 @@
"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,
@@ -391,6 +498,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "default_bank_account",
"fieldtype": "Link",
@@ -399,6 +507,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Bank Account",
"length": 0,
"no_copy": 1,
@@ -409,6 +518,7 @@
"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,
@@ -419,6 +529,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "default_cash_account",
"fieldtype": "Link",
@@ -427,6 +538,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Cash Account",
"length": 0,
"no_copy": 1,
@@ -435,6 +547,7 @@
"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,
@@ -445,6 +558,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "default_receivable_account",
"fieldtype": "Link",
@@ -453,6 +567,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Receivable Account",
"length": 0,
"no_copy": 1,
@@ -463,6 +578,7 @@
"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,
@@ -473,6 +589,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "round_off_account",
"fieldtype": "Link",
"hidden": 0,
@@ -480,6 +597,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Round Off Account",
"length": 0,
"no_copy": 0,
@@ -489,6 +607,7 @@
"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,
@@ -499,6 +618,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "write_off_account",
"fieldtype": "Link",
"hidden": 0,
@@ -506,6 +626,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Write Off Account",
"length": 0,
"no_copy": 0,
@@ -515,6 +636,7 @@
"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,
@@ -525,6 +647,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "exchange_gain_loss_account",
"fieldtype": "Link",
"hidden": 0,
@@ -532,6 +655,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Exchange Gain / Loss Account",
"length": 0,
"no_copy": 0,
@@ -541,6 +665,7 @@
"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,
@@ -551,6 +676,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break0",
"fieldtype": "Column Break",
"hidden": 0,
@@ -558,6 +684,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -565,6 +692,7 @@
"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,
@@ -576,6 +704,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "default_payable_account",
"fieldtype": "Link",
@@ -584,6 +713,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Payable Account",
"length": 0,
"no_copy": 1,
@@ -594,6 +724,7 @@
"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,
@@ -604,6 +735,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "default_expense_account",
"fieldtype": "Link",
@@ -612,6 +744,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Cost of Goods Sold Account",
"length": 0,
"no_copy": 1,
@@ -620,6 +753,7 @@
"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,
@@ -630,6 +764,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "default_income_account",
"fieldtype": "Link",
@@ -638,6 +773,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Income Account",
"length": 0,
"no_copy": 1,
@@ -646,6 +782,7 @@
"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,
@@ -656,6 +793,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "round_off_cost_center",
"fieldtype": "Link",
"hidden": 0,
@@ -663,6 +801,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Round Off Cost Center",
"length": 0,
"no_copy": 0,
@@ -672,6 +811,7 @@
"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,
@@ -682,6 +822,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "section_break_22",
"fieldtype": "Section Break",
"hidden": 0,
@@ -689,6 +830,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -696,6 +838,7 @@
"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,
@@ -706,6 +849,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "cost_center",
"fieldtype": "Link",
@@ -714,6 +858,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Default Cost Center",
"length": 0,
"no_copy": 1,
@@ -722,6 +867,7 @@
"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,
@@ -732,6 +878,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "credit_limit",
"fieldtype": "Currency",
@@ -740,6 +887,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit Limit",
"length": 0,
"no_copy": 0,
@@ -750,6 +898,7 @@
"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,
@@ -760,6 +909,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_26",
"fieldtype": "Column Break",
"hidden": 0,
@@ -767,6 +917,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -774,6 +925,7 @@
"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,
@@ -784,6 +936,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "credit_days_based_on",
"fieldtype": "Select",
"hidden": 0,
@@ -791,6 +944,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit Days Based On",
"length": 0,
"no_copy": 0,
@@ -800,6 +954,7 @@
"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,
@@ -810,6 +965,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:(!doc.__islocal && doc.credit_days_based_on=='Fixed Days')",
"fieldname": "credit_days",
"fieldtype": "Int",
@@ -818,6 +974,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit Days",
"length": 0,
"no_copy": 0,
@@ -827,6 +984,7 @@
"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,
@@ -837,6 +995,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "auto_accounting_for_stock_settings",
"fieldtype": "Section Break",
@@ -845,6 +1004,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Stock Settings",
"length": 0,
"no_copy": 0,
@@ -852,6 +1012,7 @@
"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,
@@ -862,6 +1023,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "stock_received_but_not_billed",
"fieldtype": "Link",
"hidden": 0,
@@ -869,6 +1031,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Stock Received But Not Billed",
"length": 0,
"no_copy": 1,
@@ -877,6 +1040,7 @@
"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,
@@ -887,6 +1051,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "stock_adjustment_account",
"fieldtype": "Link",
"hidden": 0,
@@ -894,6 +1059,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Stock Adjustment Account",
"length": 0,
"no_copy": 1,
@@ -902,6 +1068,7 @@
"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,
@@ -912,6 +1079,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_32",
"fieldtype": "Column Break",
"hidden": 0,
@@ -919,6 +1087,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -926,6 +1095,7 @@
"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,
@@ -936,6 +1106,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "expenses_included_in_valuation",
"fieldtype": "Link",
"hidden": 0,
@@ -943,6 +1114,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Expenses Included In Valuation",
"length": 0,
"no_copy": 1,
@@ -951,6 +1123,7 @@
"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,
@@ -961,6 +1134,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "fixed_asset_depreciation_settings",
"fieldtype": "Section Break",
"hidden": 0,
@@ -968,6 +1142,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Fixed Asset Depreciation Settings",
"length": 0,
"no_copy": 0,
@@ -976,6 +1151,7 @@
"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,
@@ -986,6 +1162,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "accumulated_depreciation_account",
"fieldtype": "Link",
"hidden": 0,
@@ -993,6 +1170,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accumulated Depreciation Account",
"length": 0,
"no_copy": 1,
@@ -1002,6 +1180,7 @@
"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,
@@ -1012,6 +1191,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "depreciation_expense_account",
"fieldtype": "Link",
"hidden": 0,
@@ -1019,6 +1199,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Depreciation Expense Account",
"length": 0,
"no_copy": 1,
@@ -1028,6 +1209,7 @@
"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,
@@ -1038,6 +1220,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_40",
"fieldtype": "Column Break",
"hidden": 0,
@@ -1045,6 +1228,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1052,6 +1236,7 @@
"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,
@@ -1062,6 +1247,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "disposal_account",
"fieldtype": "Link",
"hidden": 0,
@@ -1069,6 +1255,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Gain/Loss Account on Asset Disposal",
"length": 0,
"no_copy": 1,
@@ -1078,6 +1265,7 @@
"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,
@@ -1088,6 +1276,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "depreciation_cost_center",
"fieldtype": "Link",
"hidden": 0,
@@ -1095,6 +1284,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Asset Depreciation Cost Center",
"length": 0,
"no_copy": 1,
@@ -1104,6 +1294,7 @@
"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,
@@ -1114,6 +1305,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "For reference only.",
"fieldname": "company_info",
"fieldtype": "Section Break",
@@ -1122,6 +1314,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company Info",
"length": 0,
"no_copy": 0,
@@ -1129,6 +1322,7 @@
"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,
@@ -1139,6 +1333,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "address",
"fieldtype": "Small Text",
"hidden": 0,
@@ -1146,6 +1341,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address",
"length": 0,
"no_copy": 0,
@@ -1155,6 +1351,7 @@
"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,
@@ -1165,6 +1362,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break1",
"fieldtype": "Column Break",
"hidden": 0,
@@ -1172,6 +1370,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -1179,6 +1378,7 @@
"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,
@@ -1190,6 +1390,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "phone_no",
"fieldtype": "Data",
"hidden": 0,
@@ -1197,6 +1398,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Phone No",
"length": 0,
"no_copy": 0,
@@ -1207,6 +1409,7 @@
"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,
@@ -1217,6 +1420,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "fax",
"fieldtype": "Data",
"hidden": 0,
@@ -1224,6 +1428,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Fax",
"length": 0,
"no_copy": 0,
@@ -1234,6 +1439,7 @@
"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,
@@ -1244,6 +1450,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "email",
"fieldtype": "Data",
"hidden": 0,
@@ -1251,6 +1458,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Email",
"length": 0,
"no_copy": 0,
@@ -1261,6 +1469,7 @@
"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,
@@ -1271,6 +1480,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "website",
"fieldtype": "Data",
"hidden": 0,
@@ -1278,6 +1488,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Website",
"length": 0,
"no_copy": 0,
@@ -1287,6 +1498,7 @@
"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,
@@ -1297,6 +1509,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "",
"fieldname": "registration_info",
"fieldtype": "Section Break",
@@ -1305,6 +1518,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -1313,6 +1527,7 @@
"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,
@@ -1324,6 +1539,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "Company registration numbers for your reference. Tax numbers etc.",
"fieldname": "registration_details",
"fieldtype": "Code",
@@ -1332,6 +1548,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Registration Details",
"length": 0,
"no_copy": 0,
@@ -1341,6 +1558,7 @@
"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,
@@ -1351,6 +1569,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "delete_company_transactions",
"fieldtype": "Button",
"hidden": 0,
@@ -1358,6 +1577,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Delete Company Transactions",
"length": 0,
"no_copy": 0,
@@ -1366,6 +1586,7 @@
"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,
@@ -1375,7 +1596,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-building",
+ "icon": "fa fa-building",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -1385,7 +1606,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-10-26 09:08:50.476200",
+ "modified": "2016-11-23 16:32:04.893315",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",
@@ -1401,6 +1622,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -1421,6 +1643,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -1441,6 +1664,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -1461,6 +1685,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -1481,6 +1706,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -1501,6 +1727,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -1521,6 +1748,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
diff --git a/erpnext/setup/doctype/company/company.py b/erpnext/setup/doctype/company/company.py
index 00538cd..7f506d5 100644
--- a/erpnext/setup/doctype/company/company.py
+++ b/erpnext/setup/doctype/company/company.py
@@ -30,6 +30,7 @@
self.validate_abbr()
self.validate_default_accounts()
self.validate_currency()
+ self.validate_coa_input()
def validate_abbr(self):
if not self.abbr:
@@ -113,16 +114,25 @@
warehouse.insert()
def create_default_accounts(self):
- if not self.chart_of_accounts:
- self.chart_of_accounts = "Standard"
-
from erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts import create_charts
- create_charts(self.chart_of_accounts, self.name)
+ create_charts(self.name, self.chart_of_accounts, self.existing_company)
frappe.db.set(self, "default_receivable_account", frappe.db.get_value("Account",
{"company": self.name, "account_type": "Receivable", "is_group": 0}))
frappe.db.set(self, "default_payable_account", frappe.db.get_value("Account",
{"company": self.name, "account_type": "Payable", "is_group": 0}))
+
+ def validate_coa_input(self):
+ if self.create_chart_of_accounts_based_on == "Existing Company":
+ self.chart_of_accounts = None
+ if not self.existing_company:
+ frappe.throw(_("Please select Existing Company for creating Chart of Accounts"))
+
+ else:
+ self.existing_company = None
+ self.create_chart_of_accounts_based_on = "Standard Template"
+ if not self.chart_of_accounts:
+ self.chart_of_accounts = "Standard"
def set_default_accounts(self):
self._set_default_account("default_cash_account", "Cash")
diff --git a/erpnext/setup/doctype/company/fixtures/india/__init__.py b/erpnext/setup/doctype/company/fixtures/india/__init__.py
index 2aeec99..0f4bd4f 100644
--- a/erpnext/setup/doctype/company/fixtures/india/__init__.py
+++ b/erpnext/setup/doctype/company/fixtures/india/__init__.py
@@ -7,9 +7,10 @@
def install(company):
docs = [
- {'doctype': 'Salary Component', 'salary_component': 'Professional Tax', 'description': 'Professional Tax'},
- {'doctype': 'Salary Component', 'salary_component': 'Provident Fund', 'description': 'Provident fund'},
- {'doctype': 'Salary Component', 'salary_component': 'House Rent Allowance', 'description': 'House Rent Allowance'}
+ {'doctype': 'Salary Component', 'salary_component': 'Professional Tax', 'description': 'Professional Tax', 'type': 'Deduction'},
+ {'doctype': 'Salary Component', 'salary_component': 'Provident Fund', 'description': 'Provident fund', 'type': 'Deduction'},
+ {'doctype': 'Salary Component', 'salary_component': 'House Rent Allowance', 'description': 'House Rent Allowance', 'type': 'Earning'},
+ {'doctype': 'Salary Component', 'salary_component': 'Basic', 'description': 'Basic', 'type': 'Earning'}
]
for d in docs:
diff --git a/erpnext/setup/doctype/company/test_company.py b/erpnext/setup/doctype/company/test_company.py
index afcc3b1..43cb4d3 100644
--- a/erpnext/setup/doctype/company/test_company.py
+++ b/erpnext/setup/doctype/company/test_company.py
@@ -6,9 +6,76 @@
import frappe
import unittest
-
-class TestCompany(unittest.TestCase):
- pass
-
+from frappe.utils import random_string
+from erpnext.accounts.doctype.account.chart_of_accounts.chart_of_accounts import get_charts_for_country
test_records = frappe.get_test_records('Company')
+
+class TestCompany(unittest.TestCase):
+ def test_coa_based_on_existing_company(self):
+ company = frappe.new_doc("Company")
+ company.company_name = "COA from Existing Company"
+ company.abbr = "CFEC"
+ company.default_currency = "INR"
+ company.create_chart_of_accounts_based_on = "Existing Company"
+ company.existing_company = "_Test Company"
+ company.save()
+
+ expected_results = {
+ "Debtors - CFEC": {
+ "account_type": "Receivable",
+ "is_group": 0,
+ "root_type": "Asset",
+ "parent_account": "Accounts Receivable - CFEC",
+ },
+ "_Test Cash - CFEC": {
+ "account_type": "Cash",
+ "is_group": 0,
+ "root_type": "Asset",
+ "parent_account": "Cash In Hand - CFEC"
+ }
+ }
+
+ for account, acc_property in expected_results.items():
+ acc = frappe.get_doc("Account", account)
+ for prop, val in acc_property.items():
+ self.assertEqual(acc.get(prop), val)
+
+ frappe.delete_doc("Company", "COA from Existing Company")
+
+ def test_coa_based_on_country_template(self):
+ countries = ["India", "Brazil", "United Arab Emirates", "Canada", "Germany", "France",
+ "Guatemala", "Indonesia", "Mexico", "Nicaragua", "Netherlands", "Singapore"]
+
+ for country in countries:
+ templates = get_charts_for_country(country)
+ if len(templates) != 1 and "Standard" in templates:
+ templates.remove("Standard")
+
+ self.assertTrue(templates)
+
+ for template in templates:
+ try:
+ company = frappe.new_doc("Company")
+ company.company_name = template
+ company.abbr = random_string(3)
+ company.default_currency = "USD"
+ company.create_chart_of_accounts_based_on = "Standard Template"
+ company.chart_of_accounts = template
+ company.save()
+
+ account_types = ["Cost of Goods Sold", "Depreciation",
+ "Expenses Included In Valuation", "Fixed Asset", "Payable", "Receivable",
+ "Stock Adjustment", "Stock Received But Not Billed", "Bank", "Cash", "Stock"]
+
+ for account_type in account_types:
+ filters = {
+ "company": template,
+ "account_type": account_type
+ }
+ if account_type in ["Bank", "Cash", "Stock"]:
+ filters["is_group"] = 1
+
+ self.assertTrue(frappe.get_all("Account", filters))
+ finally:
+ frappe.delete_doc("Company", template)
\ No newline at end of file
diff --git a/erpnext/setup/doctype/currency_exchange/currency_exchange.json b/erpnext/setup/doctype/currency_exchange/currency_exchange.json
index 1209bc1..76e1a6b 100644
--- a/erpnext/setup/doctype/currency_exchange/currency_exchange.json
+++ b/erpnext/setup/doctype/currency_exchange/currency_exchange.json
@@ -10,11 +10,40 @@
"doctype": "DocType",
"document_type": "Setup",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
+ "fieldname": "date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 1,
+ "label": "Date",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 1,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0,
+ "width": "5"
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "from_currency",
"fieldtype": "Link",
"hidden": 0,
@@ -22,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "From Currency",
"length": 0,
"no_copy": 0,
@@ -30,16 +60,19 @@
"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,
- "unique": 0
+ "unique": 0,
+ "width": "3"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "to_currency",
"fieldtype": "Link",
"hidden": 0,
@@ -47,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "To Currency",
"length": 0,
"no_copy": 0,
@@ -55,16 +89,19 @@
"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,
- "unique": 0
+ "unique": 0,
+ "width": "3"
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "exchange_rate",
"fieldtype": "Float",
"hidden": 0,
@@ -72,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -80,16 +118,18 @@
"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,
- "unique": 0
+ "unique": 0,
+ "width": "3"
}
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-exchange",
+ "icon": "fa fa-exchange",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -98,7 +138,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-07-25 05:24:26.264021",
+ "modified": "2016-11-08 05:28:09.772560",
"modified_by": "Administrator",
"module": "Setup",
"name": "Currency Exchange",
@@ -114,6 +154,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -134,6 +175,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -154,6 +196,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -174,6 +217,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -188,5 +232,8 @@
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
+ "sort_field": "name",
+ "sort_order": "DESC",
+ "title_field": "",
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/currency_exchange/currency_exchange.py b/erpnext/setup/doctype/currency_exchange/currency_exchange.py
index 6022812..ab892fb 100644
--- a/erpnext/setup/doctype/currency_exchange/currency_exchange.py
+++ b/erpnext/setup/doctype/currency_exchange/currency_exchange.py
@@ -7,10 +7,14 @@
import frappe
from frappe import _
from frappe.model.document import Document
+from frappe.utils import get_datetime_str, formatdate, nowdate
class CurrencyExchange(Document):
def autoname(self):
- self.name = self.from_currency + "-" + self.to_currency
+ if not self.date:
+ self.date = nowdate()
+ self.name = '{0}-{1}-{2}'.format(formatdate(get_datetime_str(self.date), "yyyy-MM-dd"),
+ self.from_currency, self.to_currency)
def validate(self):
self.validate_value("exchange_rate", ">", 0)
diff --git a/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
index 0077630..181f072 100644
--- a/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
+++ b/erpnext/setup/doctype/currency_exchange/test_currency_exchange.py
@@ -3,5 +3,18 @@
from __future__ import unicode_literals
-import frappe
-test_records = frappe.get_test_records('Currency Exchange')
\ No newline at end of file
+import frappe, unittest
+test_records = frappe.get_test_records('Currency Exchange')
+
+class TestCurrencyExchange(unittest.TestCase):
+ def test_exchnage_rate(self):
+ from erpnext.setup.utils import get_exchange_rate
+
+ # Exchange rate as on 15th Jan, 2016, should be fetched from Currency Exchange record
+ exchange_rate = get_exchange_rate("USD", "INR", "2016-01-15")
+ self.assertEqual(exchange_rate, 60.0)
+
+ # Exchange rate as on 15th Dec, 2015, should be fetched from fixer.io
+ exchange_rate = get_exchange_rate("USD", "INR", "2015-12-15")
+ self.assertFalse(exchange_rate==60)
+
\ No newline at end of file
diff --git a/erpnext/setup/doctype/currency_exchange/test_records.json b/erpnext/setup/doctype/currency_exchange/test_records.json
index 784bf26..23edd8a 100644
--- a/erpnext/setup/doctype/currency_exchange/test_records.json
+++ b/erpnext/setup/doctype/currency_exchange/test_records.json
@@ -1,18 +1,21 @@
[
{
"doctype": "Currency Exchange",
+ "date": "2016-01-01",
"exchange_rate": 60.0,
"from_currency": "USD",
"to_currency": "INR"
},
{
"doctype": "Currency Exchange",
+ "date": "2016-01-01",
"exchange_rate": 0.773,
"from_currency": "USD",
"to_currency": "EUR"
},
{
"doctype": "Currency Exchange",
+ "date": "2016-01-01",
"exchange_rate": 0.0167,
"from_currency": "INR",
"to_currency": "USD"
diff --git a/erpnext/setup/doctype/customer_group/customer_group.json b/erpnext/setup/doctype/customer_group/customer_group.json
index a7ebb8a..dc595ac 100644
--- a/erpnext/setup/doctype/customer_group/customer_group.json
+++ b/erpnext/setup/doctype/customer_group/customer_group.json
@@ -350,7 +350,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/email_digest/email_digest.js b/erpnext/setup/doctype/email_digest/email_digest.js
index b830d87..d822a75 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.js
+++ b/erpnext/setup/doctype/email_digest/email_digest.js
@@ -21,7 +21,7 @@
d.show();
}
});
- }, "icon-eye-open", "btn-default");
+ }, "fa fa-eye-open", "btn-default");
if(user==="Administrator") {
cur_frm.add_custom_button(__('Send Now'), function() {
@@ -39,7 +39,7 @@
} else {
msgprint(save_msg);
}
- }, "icon-envelope", "btn-default");
+ }, "fa fa-envelope", "btn-default");
}
}
diff --git a/erpnext/setup/doctype/email_digest/email_digest.json b/erpnext/setup/doctype/email_digest/email_digest.json
index 3a662e6..a75a59a 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.json
+++ b/erpnext/setup/doctype/email_digest/email_digest.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Email Digest Settings",
"length": 0,
"no_copy": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -75,6 +77,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Enabled",
"length": 0,
"no_copy": 0,
@@ -101,6 +104,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "For Company",
"length": 0,
"no_copy": 0,
@@ -128,6 +132,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "How frequently?",
"length": 0,
"no_copy": 0,
@@ -156,6 +161,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Next email will be sent on:",
"length": 0,
"no_copy": 0,
@@ -182,6 +188,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -208,6 +215,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Recipients",
"length": 0,
"no_copy": 0,
@@ -235,6 +243,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Add/Remove Recipients",
"length": 0,
"no_copy": 0,
@@ -261,6 +270,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Accounts",
"length": 0,
"no_copy": 0,
@@ -287,6 +297,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Profit & Loss",
"length": 0,
"no_copy": 0,
@@ -314,6 +325,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "New Income",
"length": 0,
"no_copy": 0,
@@ -341,6 +353,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "New Expenses",
"length": 0,
"no_copy": 0,
@@ -367,6 +380,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Annual Income",
"length": 0,
"no_copy": 0,
@@ -393,6 +407,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Annual Expenses",
"length": 0,
"no_copy": 0,
@@ -421,6 +436,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Balance Sheet",
"length": 0,
"no_copy": 0,
@@ -448,6 +464,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Bank Balance",
"length": 0,
"no_copy": 0,
@@ -474,6 +491,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit Balance",
"length": 0,
"no_copy": 0,
@@ -502,6 +520,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Receivables",
"length": 0,
"no_copy": 0,
@@ -529,6 +548,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Payables",
"length": 0,
"no_copy": 0,
@@ -555,6 +575,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Operations",
"length": 0,
"no_copy": 0,
@@ -582,6 +603,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -608,6 +630,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "New Sales Orders",
"length": 0,
"no_copy": 0,
@@ -635,6 +658,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Pending Sales Orders",
"length": 0,
"no_copy": 0,
@@ -662,6 +686,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "New Purchase Orders",
"length": 0,
"no_copy": 0,
@@ -689,6 +714,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Pending Purchase Orders",
"length": 0,
"no_copy": 0,
@@ -716,6 +742,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -743,6 +770,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "New Quotations",
"length": 0,
"no_copy": 0,
@@ -770,6 +798,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Pending Quotations",
"length": 0,
"no_copy": 0,
@@ -797,6 +826,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Open Issues",
"length": 0,
"no_copy": 0,
@@ -824,6 +854,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Open Projects",
"length": 0,
"no_copy": 0,
@@ -851,6 +882,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Other",
"length": 0,
"no_copy": 0,
@@ -878,6 +910,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Tools",
"length": 0,
"no_copy": 0,
@@ -905,6 +938,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Upcoming Calendar Events",
"length": 0,
"no_copy": 0,
@@ -932,6 +966,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Open To Do",
"length": 0,
"no_copy": 0,
@@ -959,6 +994,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Open Notifications",
"length": 0,
"no_copy": 0,
@@ -986,6 +1022,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": " ",
"length": 0,
"no_copy": 0,
@@ -1013,6 +1050,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Add Quote",
"length": 0,
"no_copy": 0,
@@ -1031,7 +1069,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-envelope",
+ "icon": "fa fa-envelope",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -1041,7 +1079,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-11-03 16:10:05.679109",
+ "modified": "2016-11-07 05:10:32.190134",
"modified_by": "Administrator",
"module": "Setup",
"name": "Email Digest",
diff --git a/erpnext/setup/doctype/global_defaults/global_defaults.json b/erpnext/setup/doctype/global_defaults/global_defaults.json
index a9397f2..ce3f2cf 100644
--- a/erpnext/setup/doctype/global_defaults/global_defaults.json
+++ b/erpnext/setup/doctype/global_defaults/global_defaults.json
@@ -222,7 +222,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"in_create": 1,
"in_dialog": 0,
diff --git a/erpnext/setup/doctype/item_group/item_group.json b/erpnext/setup/doctype/item_group/item_group.json
index 02b5268..45740bc 100644
--- a/erpnext/setup/doctype/item_group/item_group.json
+++ b/erpnext/setup/doctype/item_group/item_group.json
@@ -453,7 +453,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-sitemap",
+ "icon": "fa fa-sitemap",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/naming_series/naming_series.json b/erpnext/setup/doctype/naming_series/naming_series.json
index 545db9d..0daf1a1 100644
--- a/erpnext/setup/doctype/naming_series/naming_series.json
+++ b/erpnext/setup/doctype/naming_series/naming_series.json
@@ -227,7 +227,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-sort-by-order",
+ "icon": "fa fa-sort-by-order",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/setup/doctype/notification_control/notification_control.json b/erpnext/setup/doctype/notification_control/notification_control.json
index 540aa13..fc3316e 100644
--- a/erpnext/setup/doctype/notification_control/notification_control.json
+++ b/erpnext/setup/doctype/notification_control/notification_control.json
@@ -523,7 +523,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-envelope",
+ "icon": "fa fa-envelope",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/setup/doctype/print_heading/print_heading.json b/erpnext/setup/doctype/print_heading/print_heading.json
index be64db0..d992fcb 100644
--- a/erpnext/setup/doctype/print_heading/print_heading.json
+++ b/erpnext/setup/doctype/print_heading/print_heading.json
@@ -67,7 +67,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-font",
+ "icon": "fa fa-font",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
index c301698..b95a936 100644
--- a/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
+++ b/erpnext/setup/doctype/quotation_lost_reason/quotation_lost_reason.json
@@ -40,7 +40,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/sales_partner/sales_partner.json b/erpnext/setup/doctype/sales_partner/sales_partner.json
index 7cdb30d..760954c 100644
--- a/erpnext/setup/doctype/sales_partner/sales_partner.json
+++ b/erpnext/setup/doctype/sales_partner/sales_partner.json
@@ -10,11 +10,14 @@
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "partner_name",
"fieldtype": "Data",
"hidden": 0,
@@ -22,6 +25,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Partner Name",
"length": 0,
"no_copy": 0,
@@ -31,6 +35,7 @@
"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,
@@ -41,6 +46,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "partner_type",
"fieldtype": "Select",
"hidden": 0,
@@ -48,6 +54,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Partner Type",
"length": 0,
"no_copy": 0,
@@ -58,6 +65,7 @@
"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,
@@ -68,6 +76,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "",
"fieldname": "territory",
"fieldtype": "Link",
@@ -76,6 +85,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Territory",
"length": 0,
"no_copy": 0,
@@ -84,6 +94,7 @@
"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,
@@ -94,6 +105,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break0",
"fieldtype": "Column Break",
"hidden": 0,
@@ -101,6 +113,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -108,6 +121,7 @@
"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,
@@ -119,6 +133,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "commission_rate",
"fieldtype": "Float",
"hidden": 0,
@@ -126,6 +141,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Commission Rate",
"length": 0,
"no_copy": 0,
@@ -135,6 +151,7 @@
"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,
@@ -145,6 +162,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "address_contacts",
"fieldtype": "Section Break",
"hidden": 0,
@@ -152,6 +170,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address & Contacts",
"length": 0,
"no_copy": 0,
@@ -159,6 +178,7 @@
"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,
@@ -169,6 +189,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:doc.__islocal",
"fieldname": "address_desc",
"fieldtype": "HTML",
@@ -177,6 +198,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address Desc",
"length": 0,
"no_copy": 0,
@@ -184,6 +206,7 @@
"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,
@@ -194,6 +217,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "address_html",
"fieldtype": "HTML",
"hidden": 0,
@@ -201,6 +225,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address HTML",
"length": 0,
"no_copy": 0,
@@ -208,6 +233,7 @@
"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,
@@ -218,6 +244,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break1",
"fieldtype": "Column Break",
"hidden": 0,
@@ -225,12 +252,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -241,6 +270,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:doc.__islocal",
"fieldname": "contact_desc",
"fieldtype": "HTML",
@@ -249,6 +279,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Desc",
"length": 0,
"no_copy": 0,
@@ -256,6 +287,7 @@
"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,
@@ -266,6 +298,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "contact_html",
"fieldtype": "HTML",
"hidden": 0,
@@ -273,6 +306,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact HTML",
"length": 0,
"no_copy": 0,
@@ -280,6 +314,7 @@
"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,
@@ -290,6 +325,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "partner_target_details_section_break",
"fieldtype": "Section Break",
"hidden": 0,
@@ -297,6 +333,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Partner Target",
"length": 0,
"no_copy": 0,
@@ -305,6 +342,7 @@
"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,
@@ -315,6 +353,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "targets",
"fieldtype": "Table",
"hidden": 0,
@@ -322,6 +361,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Targets",
"length": 0,
"no_copy": 0,
@@ -332,6 +372,7 @@
"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,
@@ -342,6 +383,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "Select Monthly Distribution to unevenly distribute targets across months.",
"fieldname": "distribution_id",
"fieldtype": "Link",
@@ -350,6 +392,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Target Distribution",
"length": 0,
"no_copy": 0,
@@ -360,6 +403,7 @@
"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,
@@ -370,6 +414,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "website",
"fieldtype": "Section Break",
"hidden": 0,
@@ -377,6 +422,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Website",
"length": 0,
"no_copy": 0,
@@ -384,6 +430,7 @@
"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,
@@ -394,6 +441,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "show_in_website",
"fieldtype": "Check",
"hidden": 0,
@@ -401,6 +449,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Show In Website",
"length": 0,
"no_copy": 0,
@@ -408,6 +457,7 @@
"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,
@@ -418,6 +468,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "show_in_website",
"fieldname": "section_break_17",
"fieldtype": "Section Break",
@@ -426,12 +477,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -442,6 +495,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "route",
"fieldtype": "Data",
"hidden": 0,
@@ -449,6 +503,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Route",
"length": 0,
"no_copy": 0,
@@ -457,6 +512,7 @@
"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,
@@ -467,6 +523,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_20",
"fieldtype": "Column Break",
"hidden": 0,
@@ -474,12 +531,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -490,6 +549,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "logo",
"fieldtype": "Attach",
"hidden": 0,
@@ -497,6 +557,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Logo",
"length": 0,
"no_copy": 0,
@@ -505,6 +566,7 @@
"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,
@@ -515,6 +577,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "partner_website",
"fieldtype": "Data",
"hidden": 0,
@@ -522,6 +585,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Partner website",
"length": 0,
"no_copy": 0,
@@ -529,6 +593,7 @@
"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,
@@ -539,6 +604,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "show_in_website",
"fieldname": "section_break_22",
"fieldtype": "Section Break",
@@ -547,12 +613,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -563,6 +631,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "introduction",
"fieldtype": "Text",
"hidden": 0,
@@ -570,6 +639,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Introduction",
"length": 0,
"no_copy": 0,
@@ -577,6 +647,7 @@
"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,
@@ -587,6 +658,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "description",
"fieldtype": "Text Editor",
"hidden": 0,
@@ -594,6 +666,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -601,6 +674,7 @@
"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,
@@ -610,7 +684,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -619,7 +693,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-06-23 14:45:31.978973",
+ "modified": "2016-11-07 05:29:37.597903",
"modified_by": "Administrator",
"module": "Setup",
"name": "Sales Partner",
@@ -635,6 +709,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -655,6 +730,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -675,6 +751,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/setup/doctype/sales_person/sales_person.json b/erpnext/setup/doctype/sales_person/sales_person.json
index b42adca..595552e 100644
--- a/erpnext/setup/doctype/sales_person/sales_person.json
+++ b/erpnext/setup/doctype/sales_person/sales_person.json
@@ -11,11 +11,13 @@
"doctype": "DocType",
"document_type": "Setup",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "name_and_employee_id",
"fieldtype": "Section Break",
"hidden": 0,
@@ -23,6 +25,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Name and Employee ID",
"length": 0,
"no_copy": 0,
@@ -31,6 +34,7 @@
"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,
@@ -41,6 +45,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "sales_person_name",
"fieldtype": "Data",
"hidden": 0,
@@ -48,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Sales Person Name",
"length": 0,
"no_copy": 0,
@@ -57,6 +63,7 @@
"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,
@@ -67,6 +74,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "Select company name first.",
"fieldname": "parent_sales_person",
"fieldtype": "Link",
@@ -75,6 +83,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Parent Sales Person",
"length": 0,
"no_copy": 0,
@@ -85,6 +94,7 @@
"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,
@@ -95,6 +105,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "is_group",
"fieldtype": "Check",
"hidden": 0,
@@ -102,6 +113,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Is Group",
"length": 0,
"no_copy": 0,
@@ -112,6 +124,7 @@
"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,
@@ -122,6 +135,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "cb0",
"fieldtype": "Column Break",
"hidden": 0,
@@ -129,12 +143,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -145,6 +161,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "employee",
"fieldtype": "Link",
"hidden": 0,
@@ -152,6 +169,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Employee",
"length": 0,
"no_copy": 0,
@@ -160,6 +178,7 @@
"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,
@@ -170,6 +189,36 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
+ "default": "1",
+ "fieldname": "enabled",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Enabled",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "lft",
"fieldtype": "Int",
"hidden": 1,
@@ -177,6 +226,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "lft",
"length": 0,
"no_copy": 1,
@@ -186,6 +236,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -196,6 +247,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "rgt",
"fieldtype": "Int",
"hidden": 1,
@@ -203,6 +255,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "rgt",
"length": 0,
"no_copy": 1,
@@ -212,6 +265,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -222,6 +276,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "old_parent",
"fieldtype": "Data",
"hidden": 1,
@@ -229,6 +284,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "old_parent",
"length": 0,
"no_copy": 1,
@@ -238,6 +294,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -248,6 +305,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "Set targets Item Group-wise for this Sales Person.",
"fieldname": "target_details_section_break",
"fieldtype": "Section Break",
@@ -256,6 +314,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Person Targets",
"length": 0,
"no_copy": 0,
@@ -265,6 +324,7 @@
"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,
@@ -275,6 +335,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "targets",
"fieldtype": "Table",
"hidden": 0,
@@ -282,6 +343,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Targets",
"length": 0,
"no_copy": 0,
@@ -292,6 +354,7 @@
"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,
@@ -302,6 +365,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "Select Monthly Distribution to unevenly distribute targets across months.",
"fieldname": "distribution_id",
"fieldtype": "Link",
@@ -310,6 +374,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Target Distribution",
"length": 0,
"no_copy": 0,
@@ -320,6 +385,7 @@
"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,
@@ -338,7 +404,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-07-14 12:44:43.408367",
+ "modified": "2016-12-12 18:47:13.924225",
"modified_by": "Administrator",
"module": "Setup",
"name": "Sales Person",
@@ -354,6 +420,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -374,6 +441,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -394,6 +462,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/setup/doctype/sms_settings/sms_settings.json b/erpnext/setup/doctype/sms_settings/sms_settings.json
index ab2adeb..23d6fa2 100755
--- a/erpnext/setup/doctype/sms_settings/sms_settings.json
+++ b/erpnext/setup/doctype/sms_settings/sms_settings.json
@@ -163,7 +163,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/setup/doctype/supplier_type/supplier_type.json b/erpnext/setup/doctype/supplier_type/supplier_type.json
index 8d34022..5e62099 100644
--- a/erpnext/setup/doctype/supplier_type/supplier_type.json
+++ b/erpnext/setup/doctype/supplier_type/supplier_type.json
@@ -159,7 +159,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
index 8af6321..bede595 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
@@ -16,6 +16,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "title",
"fieldtype": "Data",
"hidden": 0,
@@ -23,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -32,6 +34,7 @@
"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,
@@ -42,6 +45,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "disabled",
"fieldtype": "Check",
"hidden": 0,
@@ -49,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Disabled",
"length": 0,
"no_copy": 0,
@@ -57,6 +62,7 @@
"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,
@@ -67,6 +73,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "terms",
"fieldtype": "Text Editor",
"hidden": 0,
@@ -74,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
@@ -83,6 +91,36 @@
"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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "terms_and_conditions_help",
+ "fieldtype": "HTML",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Terms and Conditions Help",
+ "length": 0,
+ "no_copy": 0,
+ "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 standard reply are the fields in the document from which you are sending the email. You can find out the fields of any documents via Setup > 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>",
+ "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,
@@ -101,7 +139,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-07-25 05:24:25.093905",
+ "modified": "2016-12-12 17:31:53.349301",
"modified_by": "Administrator",
"module": "Setup",
"name": "Terms and Conditions",
@@ -117,6 +155,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -137,6 +176,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -157,6 +197,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -177,6 +218,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -197,6 +239,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -217,6 +260,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -231,5 +275,6 @@
"quick_entry": 1,
"read_only": 0,
"read_only_onload": 0,
+ "sort_order": "ASC",
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
index 52f5156..d2b68b4 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
@@ -3,8 +3,18 @@
from __future__ import unicode_literals
import frappe
-
+import json
from frappe.model.document import Document
+from frappe.utils.jinja import validate_template
class TermsandConditions(Document):
- pass
\ No newline at end of file
+ def validate(self):
+ validate_template(self.terms)
+
+@frappe.whitelist()
+def get_terms_and_conditions(template_name, doc):
+ if isinstance(doc, basestring):
+ doc = json.loads(doc)
+
+ terms_and_conditions = frappe.get_doc("Terms and Conditions", template_name)
+ return frappe.render_template(terms_and_conditions.terms, doc)
\ No newline at end of file
diff --git a/erpnext/setup/doctype/territory/territory.json b/erpnext/setup/doctype/territory/territory.json
index e0f44de..e920c9d 100644
--- a/erpnext/setup/doctype/territory/territory.json
+++ b/erpnext/setup/doctype/territory/territory.json
@@ -309,7 +309,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-map-marker",
+ "icon": "fa fa-map-marker",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/doctype/uom/uom.json b/erpnext/setup/doctype/uom/uom.json
index cea21de..609c6c0 100644
--- a/erpnext/setup/doctype/uom/uom.json
+++ b/erpnext/setup/doctype/uom/uom.json
@@ -67,7 +67,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-compass",
+ "icon": "fa fa-compass",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py
index 9971baa..7b71675 100644
--- a/erpnext/setup/install.py
+++ b/erpnext/setup/install.py
@@ -27,7 +27,7 @@
def set_single_defaults():
for dt in ('Accounts Settings', 'Print Settings', 'HR Settings', 'Buying Settings',
- 'Selling Settings', 'Stock Settings'):
+ 'Selling Settings', 'Stock Settings', 'Daily Work Summary Settings'):
default_values = frappe.db.sql("""select fieldname, `default` from `tabDocField`
where parent=%s""", dt)
if default_values:
diff --git a/erpnext/setup/setup_wizard/domainify.py b/erpnext/setup/setup_wizard/domainify.py
index 4d6ea5c..14e2f33 100644
--- a/erpnext/setup/setup_wizard/domainify.py
+++ b/erpnext/setup/setup_wizard/domainify.py
@@ -97,6 +97,7 @@
'''Add, remove roles from `data.allow_roles` or `data.remove_roles`'''
def remove_role(role):
frappe.db.sql('delete from tabUserRole where role=%s', role)
+ frappe.set_value('Role', role, 'disabled', 1)
if data.remove_roles:
for role in data.remove_roles:
@@ -104,7 +105,7 @@
if data.allow_roles:
# remove all roles other than allowed roles
- data.allow_roles += ['Administrator', 'Guest', 'System Manager']
+ data.allow_roles += ['Administrator', 'Guest', 'System Manager', 'All']
for role in frappe.get_all('Role'):
if not (role.name in data.allow_roles):
remove_role(role.name)
diff --git a/erpnext/setup/setup_wizard/install_fixtures.py b/erpnext/setup/setup_wizard/install_fixtures.py
index a80e6d9..1589b3b 100644
--- a/erpnext/setup/setup_wizard/install_fixtures.py
+++ b/erpnext/setup/setup_wizard/install_fixtures.py
@@ -31,8 +31,8 @@
'is_group': 0, 'parent_item_group': _('All Item Groups') },
# salary component
- {'doctype': 'Salary Component', 'salary_component': _('Income Tax'), 'description': _('Income Tax')},
- {'doctype': 'Salary Component', 'salary_component': _('Basic'), 'description': _('Basic')},
+ {'doctype': 'Salary Component', 'salary_component': _('Income Tax'), 'description': _('Income Tax'), 'type': 'Deduction'},
+ {'doctype': 'Salary Component', 'salary_component': _('Basic'), 'description': _('Basic'), 'type': 'Earning'},
# expense claim type
{'doctype': 'Expense Claim Type', 'name': _('Calls'), 'expense_type': _('Calls')},
@@ -186,9 +186,6 @@
{'doctype': "Print Heading", 'print_heading': _("Credit Note")},
{'doctype': "Print Heading", 'print_heading': _("Debit Note")},
-
- {"doctype": "Salary Component", "salary_component": _("Basic")},
- {"doctype": "Salary Component", "salary_component": _("Income Tax")},
]
from erpnext.setup.setup_wizard.industry_type import get_industry_types
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 646aef1..395ea51 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -88,6 +88,7 @@
'abbr':args.get('company_abbr'),
'default_currency':args.get('currency'),
'country': args.get('country'),
+ 'create_chart_of_accounts_based_on': 'Standard Template',
'chart_of_accounts': args.get(('chart_of_accounts')),
'domain': args.get('domain')
}).insert()
diff --git a/erpnext/setup/utils.py b/erpnext/setup/utils.py
index eda2042..0c214e4 100644
--- a/erpnext/setup/utils.py
+++ b/erpnext/setup/utils.py
@@ -5,7 +5,8 @@
import frappe
from frappe import _, throw
from frappe.utils import flt
-
+from frappe.utils import get_datetime_str, nowdate
+
def get_company_currency(company):
currency = frappe.db.get_value("Company", company, "default_currency", cache=True)
if not currency:
@@ -64,36 +65,44 @@
frappe.db.commit()
@frappe.whitelist()
-def get_exchange_rate(from_currency, to_currency):
+def get_exchange_rate(from_currency, to_currency, transaction_date=None):
+ if not transaction_date:
+ transaction_date = nowdate()
if not (from_currency and to_currency):
+ # manqala 19/09/2016: Should this be an empty return or should it throw and exception?
return
if from_currency == to_currency:
return 1
- exchange = "%s-%s" % (from_currency, to_currency)
- value = flt(frappe.db.get_value("Currency Exchange", exchange, "exchange_rate"))
+ # cksgb 19/09/2016: get last entry in Currency Exchange with from_currency and to_currency.
+ entries = frappe.get_all("Currency Exchange", fields = ["exchange_rate"],
+ filters=[
+ ["date", "<=", get_datetime_str(transaction_date)],
+ ["from_currency", "=", from_currency],
+ ["to_currency", "=", to_currency]
+ ], order_by="date desc", limit=1)
+
+ if entries:
+ return flt(entries[0].exchange_rate)
- if not value:
- try:
- cache = frappe.cache()
- key = "currency_exchange_rate:{0}:{1}".format(from_currency, to_currency)
- value = cache.get(key)
+ try:
+ cache = frappe.cache()
+ key = "currency_exchange_rate:{0}:{1}".format(from_currency, to_currency)
+ value = cache.get(key)
- if not value:
- import requests
- response = requests.get("http://api.fixer.io/latest", params={
- "base": from_currency,
- "symbols": to_currency
- })
- # expire in 6 hours
- response.raise_for_status()
- value = response.json()["rates"][to_currency]
- cache.setex(key, value, 6 * 60 * 60)
+ if not value:
+ import requests
+ response = requests.get("http://api.fixer.io/latest", params={
+ "base": from_currency,
+ "symbols": to_currency
+ })
+ # expire in 6 hours
+ response.raise_for_status()
+ value = response.json()["rates"][to_currency]
+ cache.setex(key, value, 6 * 60 * 60)
- return flt(value)
- except:
- frappe.msgprint(_("Unable to find exchange rate for {0} to {1}").format(from_currency, to_currency))
- return 0.0
- else:
- return value
+ return flt(value)
+ except:
+ frappe.msgprint(_("Unable to find exchange rate for {0} to {1} for key date {2}").format(from_currency, to_currency, transaction_date))
+ return 0.0
\ No newline at end of file
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
index c4522f0..b04b427 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.json
@@ -338,7 +338,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-shopping-cart",
+ "icon": "fa fa-shopping-cart",
"idx": 1,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
index d8d00ef..6915ef5 100644
--- a/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
+++ b/erpnext/shopping_cart/doctype/shopping_cart_settings/shopping_cart_settings.py
@@ -8,6 +8,7 @@
from frappe import _, msgprint
from frappe.utils import comma_and
from frappe.model.document import Document
+from frappe.utils import get_datetime, get_datetime_str, now_datetime
class ShoppingCartSetupError(frappe.ValidationError): pass
@@ -38,11 +39,18 @@
expected_to_exist = [currency + "-" + company_currency
for currency in price_list_currency_map.values()
if currency != company_currency]
+
+ # manqala 20/09/2016: set up selection parameters for query from tabCurrency Exchange
+ from_currency = [currency for currency in price_list_currency_map.values() if currency != company_currency]
+ to_currency = company_currency
+ # manqala end
if expected_to_exist:
- exists = frappe.db.sql_list("""select name from `tabCurrency Exchange`
- where name in (%s)""" % (", ".join(["%s"]*len(expected_to_exist)),),
- tuple(expected_to_exist))
+ # manqala 20/09/2016: modify query so that it uses date in the selection from Currency Exchange.
+ # exchange rates defined with date less than the date on which this document is being saved will be selected
+ exists = frappe.db.sql_list("""select CONCAT(from_currency,'-',to_currency) from `tabCurrency Exchange`
+ where from_currency in (%s) and to_currency = "%s" and date <= curdate()""" % (", ".join(["%s"]*len(from_currency)), to_currency), tuple(from_currency))
+ # manqala end
missing = list(set(expected_to_exist).difference(exists))
diff --git a/erpnext/shopping_cart/product.py b/erpnext/shopping_cart/product.py
index 6a6cb69..24e4d42 100644
--- a/erpnext/shopping_cart/product.py
+++ b/erpnext/shopping_cart/product.py
@@ -4,9 +4,11 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import cint, fmt_money
+from frappe.utils import cint, fmt_money, flt
from erpnext.shopping_cart.cart import _get_cart_quotation
-from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings import is_cart_enabled
+from erpnext.shopping_cart.doctype.shopping_cart_settings.shopping_cart_settings \
+ import is_cart_enabled, get_shopping_cart_settings
+from erpnext.accounts.doctype.pricing_rule.pricing_rule import get_pricing_rule_for_item
@frappe.whitelist(allow_guest=True)
def get_product_info(item_code):
@@ -51,12 +53,14 @@
in_stock = in_stock[0][0] > 0 and 1 or 0
else:
- in_stock = -1
+ in_stock = 0
return in_stock
-def get_price(item_code, template_item_code, price_list):
+def get_price(item_code, template_item_code, price_list, qty=1):
if price_list:
+ cart_settings = get_shopping_cart_settings()
+
price = frappe.get_all("Item Price", fields=["price_list_rate", "currency"],
filters={"price_list": price_list, "item_code": item_code})
@@ -65,4 +69,22 @@
filters={"price_list": price_list, "item_code": template_item_code})
if price:
+ pricing_rule = get_pricing_rule_for_item(frappe._dict({
+ "item_code": item_code,
+ "qty": qty,
+ "transaction_type": "selling",
+ "price_list": price_list,
+ "customer_group": cart_settings.default_customer_group,
+ "company": cart_settings.company,
+ "conversion_rate": 1,
+ "for_shopping_cart": True
+ }))
+
+ if pricing_rule:
+ if pricing_rule.pricing_rule_for == "Discount Percentage":
+ price[0].price_list_rate = flt(price[0].price_list_rate * (1.0 - (pricing_rule.discount_percentage / 100.0)))
+
+ if pricing_rule.pricing_rule_for == "Price":
+ price[0].price_list_rate = pricing_rule.price_list_rate
+
return price[0]
diff --git a/erpnext/startup/notifications.py b/erpnext/startup/notifications.py
index 58a2c79..a1b90f9 100644
--- a/erpnext/startup/notifications.py
+++ b/erpnext/startup/notifications.py
@@ -30,6 +30,7 @@
"outstanding_amount": (">", 0),
"docstatus": ("<", 2)
},
+ "Payment Entry": {"docstatus": 0},
"Leave Application": {"status": "Open"},
"Expense Claim": {"approval_status": "Draft"},
"Job Applicant": {"status": "Open"},
diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js
index 33296ee..43bd6d4 100644
--- a/erpnext/stock/dashboard/item_dashboard.js
+++ b/erpnext/stock/dashboard/item_dashboard.js
@@ -46,6 +46,7 @@
args: {
item_code: this.item_code,
warehouse: this.warehouse,
+ item_group: this.item_group,
start: this.start,
sort_by: this.sort_by,
sort_order: this.sort_order,
diff --git a/erpnext/stock/dashboard/item_dashboard.py b/erpnext/stock/dashboard/item_dashboard.py
index 5a00b3d..28ea045 100644
--- a/erpnext/stock/dashboard/item_dashboard.py
+++ b/erpnext/stock/dashboard/item_dashboard.py
@@ -3,12 +3,38 @@
import frappe
@frappe.whitelist()
-def get_data(item_code=None, warehouse=None, start=0, sort_by='actual_qty', sort_order='desc'):
- filters = {}
+def get_data(item_code=None, warehouse=None, item_group=None,
+ start=0, sort_by='actual_qty', sort_order='desc'):
+ '''Return data to render the item dashboard'''
+ conditions = []
+ values = []
if item_code:
- filters['item_code'] = item_code
+ conditions.append('b.item_code=%s')
+ values.append(item_code)
if warehouse:
- filters['warehouse'] = warehouse
- return frappe.get_list("Bin", filters=filters, fields=['item_code', 'warehouse',
- 'projected_qty', 'reserved_qty', 'reserved_qty_for_production', 'actual_qty', 'valuation_rate'],
- order_by='{0} {1}'.format(sort_by, sort_order), start=start, page_length = 21)
\ No newline at end of file
+ conditions.append('b.warehouse=%s')
+ values.append(warehouse)
+ if item_group:
+ conditions.append('i.item_group=%s')
+ values.append(item_group)
+
+ if conditions:
+ conditions = ' and ' + ' and '.join(conditions)
+ else:
+ conditions = ''
+
+ return frappe.db.sql('''
+ select
+ b.item_code, b.warehouse, b.projected_qty, b.reserved_qty,
+ b.reserved_qty_for_production, b.actual_qty, b.valuation_rate, i.item_name
+ from
+ tabBin b, tabItem i
+ where
+ b.item_code = i.name
+ {conditions}
+ order by
+ {sort_by} {sort_order}
+ limit
+ {start}, 21
+ '''.format(conditions=conditions, sort_by=sort_by, sort_order=sort_order,
+ start=start), values, as_dict=True)
diff --git a/erpnext/stock/dashboard/item_dashboard_list.html b/erpnext/stock/dashboard/item_dashboard_list.html
index f9ffbb3..c1792a9 100644
--- a/erpnext/stock/dashboard/item_dashboard_list.html
+++ b/erpnext/stock/dashboard/item_dashboard_list.html
@@ -7,7 +7,9 @@
<div class="col-sm-3 small" style="margin-top: 8px;">
{% if show_item %}
<a data-type="item"
- data-name="{{ d.item_code }}">{{ d.item_code }}</a>
+ data-name="{{ d.item_code }}">{{ d.item_code }}
+ {% if d.item_name != d.item_code %}({{ d.item_name }}){% endif %}
+ </a>
{% endif %}
</div>
<div class="col-sm-4 small">
diff --git a/erpnext/stock/doctype/batch/batch.json b/erpnext/stock/doctype/batch/batch.json
index 1abe9b3..ef31cfd 100644
--- a/erpnext/stock/doctype/batch/batch.json
+++ b/erpnext/stock/doctype/batch/batch.json
@@ -3,22 +3,28 @@
"allow_import": 1,
"allow_rename": 0,
"autoname": "field:batch_id",
+ "beta": 0,
"creation": "2013-03-05 14:50:38",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "batch_id",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Batch ID",
"length": 0,
"no_copy": 1,
@@ -26,7 +32,9 @@
"oldfieldtype": "Data",
"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,
@@ -37,12 +45,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "item",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Item",
"length": 0,
"no_copy": 0,
@@ -51,7 +62,9 @@
"options": "Item",
"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,
@@ -62,18 +75,23 @@
"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_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,
@@ -84,12 +102,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "expiry_date",
"fieldtype": "Date",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Expiry Date",
"length": 0,
"no_copy": 0,
@@ -97,7 +118,9 @@
"oldfieldtype": "Date",
"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,
@@ -108,18 +131,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "section_break_7",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 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,
@@ -130,12 +158,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "description",
"fieldtype": "Small Text",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Batch Description",
"length": 0,
"no_copy": 0,
@@ -143,7 +174,9 @@
"oldfieldtype": "Small Text",
"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,
@@ -154,15 +187,16 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-archive",
+ "icon": "fa fa-archive",
"idx": 1,
+ "image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 5,
- "modified": "2015-11-16 06:29:42.315839",
+ "modified": "2016-11-07 05:50:33.973883",
"modified_by": "Administrator",
"module": "Stock",
"name": "Batch",
@@ -178,6 +212,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -189,7 +224,9 @@
"write": 1
}
],
+ "quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
- "title_field": "item"
+ "title_field": "item",
+ "track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/bin/bin.json b/erpnext/stock/doctype/bin/bin.json
index 6557db9..0481cfc 100644
--- a/erpnext/stock/doctype/bin/bin.json
+++ b/erpnext/stock/doctype/bin/bin.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Warehouse",
"length": 0,
"no_copy": 0,
@@ -52,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Item Code",
"length": 0,
"no_copy": 0,
@@ -82,6 +84,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Reserved Quantity",
"length": 0,
"no_copy": 0,
@@ -111,6 +114,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Actual Quantity",
"length": 0,
"no_copy": 0,
@@ -140,6 +144,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Ordered Quantity",
"length": 0,
"no_copy": 0,
@@ -169,6 +174,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Requested Quantity",
"length": 0,
"no_copy": 0,
@@ -197,6 +203,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Planned Qty",
"length": 0,
"no_copy": 0,
@@ -225,6 +232,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Projected Qty",
"length": 0,
"no_copy": 0,
@@ -253,6 +261,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reserved Qty for Production",
"length": 0,
"no_copy": 0,
@@ -280,6 +289,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Moving Average Rate",
"length": 0,
"no_copy": 0,
@@ -308,6 +318,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "UOM",
"length": 0,
"no_copy": 0,
@@ -337,6 +348,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "FCFS Rate",
"length": 0,
"no_copy": 0,
@@ -365,6 +377,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Valuation Rate",
"length": 0,
"no_copy": 0,
@@ -393,6 +406,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Stock Value",
"length": 0,
"no_copy": 0,
@@ -420,7 +434,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-27 16:31:55.929378",
+ "modified": "2016-12-15 14:51:43.312590",
"modified_by": "Administrator",
"module": "Stock",
"name": "Bin",
@@ -453,27 +467,6 @@
"cancel": 0,
"create": 0,
"delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Item Manager",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
- "write": 0
- },
- {
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
"email": 1,
"export": 0,
"if_owner": 0,
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index ec2da53..204e98a 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -6,16 +6,24 @@
frappe.provide("erpnext.stock");
frappe.provide("erpnext.stock.delivery_note");
-frappe.ui.form.on('Delivery Note', 'onload', function(frm) {
- frm.set_indicator_formatter('item_code',
- function(doc) {
- return (doc.docstatus==1 || doc.qty<=doc.actual_qty) ? "green" : "orange"
+frappe.ui.form.on("Delivery Note", {
+ setup: function(frm) {
+ frm.set_indicator_formatter('item_code',
+ function(doc) {
+ return (doc.docstatus==1 || doc.qty<=doc.actual_qty) ? "green" : "orange"
+ })
+
+ frm.set_query("warehouse", "items", function() {
+ return {
+ filters: [
+ ["Warehouse", "company", "in", ["", cstr(frm.doc.company)]],
+ ["Warehouse", "is_group", "=", 0]
+ ]
+ }
})
- erpnext.queries.setup_queries(frm, "Warehouse", function() {
- return erpnext.queries.warehouse(frm.doc);
- });
-})
+ }
+});
erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend({
refresh: function(doc, dt, dn) {
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 402f595..e1aa16d 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -23,10 +23,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Delivery To",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -79,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -106,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -135,6 +139,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -165,6 +170,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Name",
"length": 0,
"no_copy": 0,
@@ -191,6 +197,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -217,6 +224,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -249,6 +257,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -281,6 +290,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date",
"length": 0,
"no_copy": 1,
@@ -311,6 +321,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer's Purchase Order No",
"length": 0,
"no_copy": 0,
@@ -342,6 +353,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer's Purchase Order Date",
"length": 0,
"no_copy": 0,
@@ -372,6 +384,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Return",
"length": 0,
"no_copy": 1,
@@ -400,6 +413,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Return Against Delivery Note",
"length": 0,
"no_copy": 1,
@@ -429,10 +443,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address and Contact",
"length": 0,
"no_copy": 0,
- "options": "icon-bullhorn",
+ "options": "fa fa-bullhorn",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -456,6 +471,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Address",
"length": 0,
"no_copy": 0,
@@ -483,6 +499,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Address",
"length": 0,
"no_copy": 0,
@@ -509,6 +526,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Person",
"length": 0,
"no_copy": 0,
@@ -536,6 +554,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
@@ -562,6 +581,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No",
"length": 0,
"no_copy": 0,
@@ -588,6 +608,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Email",
"length": 0,
"no_copy": 0,
@@ -615,6 +636,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -643,6 +665,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Billing Address Name",
"length": 0,
"no_copy": 0,
@@ -670,6 +693,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Billing Address",
"length": 0,
"no_copy": 0,
@@ -697,6 +721,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Group",
"length": 0,
"no_copy": 0,
@@ -725,6 +750,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Territory",
"length": 0,
"no_copy": 0,
@@ -752,10 +778,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -779,6 +806,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency",
"length": 0,
"no_copy": 0,
@@ -809,6 +837,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -838,6 +867,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -863,6 +893,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List",
"length": 0,
"no_copy": 0,
@@ -892,6 +923,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Currency",
"length": 0,
"no_copy": 0,
@@ -920,6 +952,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -947,6 +980,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Ignore Pricing Rule",
"length": 0,
"no_copy": 1,
@@ -973,11 +1007,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1001,6 +1036,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -1031,11 +1067,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Packing List",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-suitcase",
+ "options": "fa fa-suitcase",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -1059,6 +1096,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Packed Items",
"length": 0,
"no_copy": 0,
@@ -1088,6 +1126,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Product Bundle Help",
"length": 0,
"no_copy": 0,
@@ -1114,6 +1153,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1139,6 +1179,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1167,6 +1208,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1198,6 +1240,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1223,6 +1266,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total",
"length": 0,
"no_copy": 0,
@@ -1251,6 +1295,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total",
"length": 0,
"no_copy": 0,
@@ -1278,11 +1323,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1307,6 +1353,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1336,6 +1383,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1361,6 +1409,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Rule",
"length": 0,
"no_copy": 0,
@@ -1389,6 +1438,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1414,6 +1464,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1443,6 +1494,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Calculation",
"length": 0,
"no_copy": 0,
@@ -1470,6 +1522,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1495,6 +1548,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1526,6 +1580,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1552,6 +1607,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1580,6 +1636,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount",
"length": 0,
"no_copy": 0,
@@ -1608,6 +1665,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Apply Additional Discount On",
"length": 0,
"no_copy": 0,
@@ -1636,6 +1694,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1664,6 +1723,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1689,6 +1749,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Percentage",
"length": 0,
"no_copy": 0,
@@ -1716,6 +1777,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount",
"length": 0,
"no_copy": 0,
@@ -1743,11 +1805,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1771,6 +1834,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Grand Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1802,6 +1866,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rounded Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1834,6 +1899,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1864,6 +1930,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -1890,6 +1957,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Grand Total",
"length": 0,
"no_copy": 0,
@@ -1921,6 +1989,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rounded Total",
"length": 0,
"no_copy": 0,
@@ -1953,6 +2022,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words",
"length": 0,
"no_copy": 0,
@@ -1984,11 +2054,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2012,6 +2083,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms",
"length": 0,
"no_copy": 0,
@@ -2041,6 +2113,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions Details",
"length": 0,
"no_copy": 0,
@@ -2070,10 +2143,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Transporter Info",
"length": 0,
"no_copy": 0,
- "options": "icon-truck",
+ "options": "fa fa-truck",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2097,6 +2171,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Transporter Name",
"length": 0,
"no_copy": 0,
@@ -2127,6 +2202,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2155,6 +2231,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Vehicle No",
"length": 0,
"no_copy": 0,
@@ -2187,6 +2264,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Vehicle Dispatch Date",
"length": 0,
"no_copy": 0,
@@ -2217,11 +2295,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2246,6 +2325,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -2276,6 +2356,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Campaign",
"length": 0,
"no_copy": 0,
@@ -2305,6 +2386,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Source",
"length": 0,
"no_copy": 0,
@@ -2334,6 +2416,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -2363,6 +2446,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Posting Time",
"length": 0,
"no_copy": 0,
@@ -2393,6 +2477,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "% Amount Billed",
"length": 0,
"no_copy": 1,
@@ -2420,6 +2505,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Printing Details",
"length": 0,
"no_copy": 0,
@@ -2447,6 +2533,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -2476,6 +2563,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Heading",
"length": 0,
"no_copy": 1,
@@ -2505,6 +2593,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Language",
"length": 0,
"no_copy": 0,
@@ -2532,6 +2621,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2558,6 +2648,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Without Amount",
"length": 0,
"no_copy": 0,
@@ -2586,6 +2677,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 0,
@@ -2613,6 +2705,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -2646,6 +2739,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "% Installed",
"length": 0,
"no_copy": 1,
@@ -2674,6 +2768,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Installation Status",
"length": 0,
"no_copy": 0,
@@ -2700,6 +2795,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2726,6 +2822,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "To Warehouse",
"length": 0,
"no_copy": 1,
@@ -2755,6 +2852,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Excise Page Number",
"length": 0,
"no_copy": 0,
@@ -2783,6 +2881,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Instructions",
"length": 0,
"no_copy": 0,
@@ -2812,11 +2911,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Commission",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-group",
+ "options": "fa fa-group",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -2840,6 +2940,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Partner",
"length": 0,
"no_copy": 0,
@@ -2871,6 +2972,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2898,6 +3000,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Commission Rate (%)",
"length": 0,
"no_copy": 0,
@@ -2928,6 +3031,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Commission",
"length": 0,
"no_copy": 0,
@@ -2958,6 +3062,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Team",
"length": 0,
"no_copy": 0,
@@ -2984,6 +3089,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Team1",
"length": 0,
"no_copy": 0,
@@ -3004,7 +3110,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-truck",
+ "icon": "fa fa-truck",
"idx": 146,
"image_view": 0,
"in_create": 0,
@@ -3014,7 +3120,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-11-03 16:10:53.936936",
+ "modified": "2016-11-07 05:52:12.783914",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
index adbfa4d..c296d8c 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note_dashboard.py
@@ -2,10 +2,10 @@
def get_data():
return {
- 'fieldname': 'delivery_note_no',
+ 'fieldname': 'delivery_note',
'non_standard_fieldnames': {
- 'Sales Invoice': 'delivery_note',
- 'Packing Slip': 'delivery_note',
+ 'Stock Entry': 'delivery_note_no',
+ 'Quality Inspection': 'reference_name'
},
'internal_links': {
'Sales Order': ['items', 'against_sales_order'],
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
index 5bba56d..1cb0fcd 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Barcode",
"length": 0,
"no_copy": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Item Code",
"length": 0,
"no_copy": 0,
@@ -81,6 +83,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Item Name",
"length": 0,
"no_copy": 0,
@@ -111,6 +114,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -136,6 +140,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer's Item Code",
"length": 0,
"no_copy": 0,
@@ -162,6 +167,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -189,6 +195,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -219,6 +226,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -245,6 +253,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
@@ -272,6 +281,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image View",
"length": 0,
"no_copy": 0,
@@ -300,6 +310,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Quantity and Rate",
"length": 0,
"no_copy": 0,
@@ -326,6 +337,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Quantity",
"length": 0,
"no_copy": 0,
@@ -356,6 +368,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Rate",
"length": 0,
"no_copy": 0,
@@ -387,6 +400,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -412,6 +426,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "UOM",
"length": 0,
"no_copy": 0,
@@ -443,6 +458,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Rate (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -474,6 +490,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Discount and Margin",
"length": 0,
"no_copy": 0,
@@ -502,6 +519,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Discount on Price List Rate (%)",
"length": 0,
"no_copy": 0,
@@ -532,6 +550,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -559,6 +578,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Margin Type",
"length": 0,
"no_copy": 0,
@@ -588,6 +608,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Margin Rate or Amount",
"length": 0,
"no_copy": 0,
@@ -616,6 +637,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Margin",
"length": 0,
"no_copy": 0,
@@ -643,6 +665,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -668,6 +691,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Rate",
"length": 0,
"no_copy": 0,
@@ -699,6 +723,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Amount",
"length": 0,
"no_copy": 0,
@@ -730,6 +755,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -755,6 +781,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rate (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -786,6 +813,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -817,6 +845,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Pricing Rule",
"length": 0,
"no_copy": 0,
@@ -844,6 +873,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -870,6 +900,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Rate",
"length": 0,
"no_copy": 0,
@@ -898,6 +929,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Amount",
"length": 0,
"no_copy": 0,
@@ -926,6 +958,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -952,6 +985,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Rate (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -980,6 +1014,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1008,6 +1043,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Warehouse and Reference",
"length": 0,
"no_copy": 0,
@@ -1034,6 +1070,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "From Warehouse",
"length": 0,
"no_copy": 0,
@@ -1067,6 +1104,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Warehouse (Optional)",
"length": 0,
"no_copy": 1,
@@ -1088,6 +1126,63 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "quality_inspection",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Quality Inspection",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Quality Inspection",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_40",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "serial_no",
"fieldtype": "Text",
"hidden": 0,
@@ -1095,6 +1190,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Serial No",
"length": 0,
"no_copy": 1,
@@ -1123,6 +1219,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Batch No",
"length": 0,
"no_copy": 0,
@@ -1152,6 +1249,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Available Qty at From Warehouse",
"length": 0,
"no_copy": 1,
@@ -1183,6 +1281,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Available Batch Qty at From Warehouse",
"length": 0,
"no_copy": 1,
@@ -1213,6 +1312,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Group",
"length": 0,
"no_copy": 0,
@@ -1242,6 +1342,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Brand Name",
"length": 0,
"no_copy": 0,
@@ -1273,6 +1374,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Tax Rate",
"length": 0,
"no_copy": 0,
@@ -1301,6 +1403,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1326,6 +1429,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Expense Account",
"length": 0,
"no_copy": 1,
@@ -1355,6 +1459,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Cost Center",
"length": 0,
"no_copy": 1,
@@ -1383,6 +1488,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Against Sales Order",
"length": 0,
"no_copy": 1,
@@ -1410,6 +1516,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Against Sales Invoice",
"length": 0,
"no_copy": 1,
@@ -1437,6 +1544,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Against Sales Order Item",
"length": 0,
"no_copy": 1,
@@ -1467,6 +1575,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Against Sales Invoice Item",
"length": 0,
"no_copy": 1,
@@ -1494,6 +1603,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Installed Qty",
"length": 0,
"no_copy": 1,
@@ -1524,6 +1634,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Billed Amt",
"length": 0,
"no_copy": 1,
@@ -1552,6 +1663,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Page Break",
"length": 0,
"no_copy": 0,
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 42b50e3..5d2d557 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -1,2752 +1,2869 @@
{
- "allow_copy": 0,
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:item_code",
- "beta": 0,
- "creation": "2013-05-03 10:45:46",
- "custom": 0,
- "default_print_format": "Standard",
- "description": "A Product or a Service that is bought, sold or kept in stock.",
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Setup",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "allow_copy": 0,
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:item_code",
+ "beta": 0,
+ "creation": "2013-05-03 10:45:46",
+ "custom": 0,
+ "default_print_format": "Standard",
+ "description": "A Product or a Service that is bought, sold or kept in stock.",
+ "docstatus": 0,
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "editable_grid": 1,
+ "engine": "InnoDB",
"fields": [
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "name_and_description_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "icon-flag",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "name_and_description_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-flag",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "naming_series",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Series",
- "length": 0,
- "no_copy": 0,
- "options": "ITEM-",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "naming_series",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Series",
+ "length": 0,
+ "no_copy": 0,
+ "options": "ITEM-",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "item_code",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Item Code",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "item_code",
- "oldfieldtype": "Data",
- "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,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "",
+ "fieldname": "item_code",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Item Code",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "item_code",
+ "oldfieldtype": "Data",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "variant_of",
- "description": "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",
- "fieldname": "variant_of",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Variant Of",
- "length": 0,
- "no_copy": 0,
- "options": "Item",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "variant_of",
+ "description": "If item is a variant of another item then description, image, pricing, taxes etc will be set from the template unless explicitly specified",
+ "fieldname": "variant_of",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 1,
+ "label": "Variant Of",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item",
+ "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_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "item_name",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Item Name",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_name",
- "oldfieldtype": "Data",
- "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": 1,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 1,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Item Name",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "item_name",
+ "oldfieldtype": "Data",
+ "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": 1,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "barcode",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Barcode",
- "length": 0,
- "no_copy": 1,
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "barcode",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Barcode",
+ "length": 0,
+ "no_copy": 1,
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "item_group",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Item Group",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_group",
- "oldfieldtype": "Link",
- "options": "Item Group",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "",
+ "fieldname": "item_group",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 1,
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Item Group",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "item_group",
+ "oldfieldtype": "Link",
+ "options": "Item Group",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
- "fieldname": "stock_uom",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Default Unit of Measure",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "stock_uom",
- "oldfieldtype": "Link",
- "options": "UOM",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "",
+ "fieldname": "stock_uom",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Unit of Measure",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "stock_uom",
+ "oldfieldtype": "Link",
+ "options": "UOM",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "disabled",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Disabled",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "disabled",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Disabled",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "1",
- "description": "",
- "fieldname": "is_stock_item",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Maintain Stock",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "is_stock_item",
- "oldfieldtype": "Select",
- "options": "",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "1",
+ "description": "",
+ "fieldname": "is_stock_item",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Maintain Stock",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "is_stock_item",
+ "oldfieldtype": "Select",
+ "options": "",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)",
- "fieldname": "opening_stock",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Opening Stock",
- "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,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:(doc.__islocal&&doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no)",
+ "fieldname": "opening_stock",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Opening Stock",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:(doc.__islocal && doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no && doc.opening_stock)",
- "fieldname": "valuation_rate",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Valuation Rate",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:(doc.__islocal && doc.is_stock_item && !doc.has_serial_no && !doc.has_batch_no && doc.opening_stock)",
+ "fieldname": "valuation_rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Valuation Rate",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "standard_rate",
- "fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Standard Selling Rate",
- "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,
+ "allow_on_submit": 0,
+ "bold": 1,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "standard_rate",
+ "fieldtype": "Currency",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Standard Selling Rate",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "is_fixed_asset",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Is Fixed Asset",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "is_fixed_asset",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Is Fixed Asset",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_fixed_asset",
- "fieldname": "asset_category",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Asset Category",
- "length": 0,
- "no_copy": 0,
- "options": "Asset Category",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_fixed_asset",
+ "fieldname": "asset_category",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Asset Category",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Asset Category",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "image",
- "fieldtype": "Attach Image",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Image",
- "length": 0,
- "no_copy": 0,
- "options": "image",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "image",
+ "fieldtype": "Attach Image",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Image",
+ "length": 0,
+ "no_copy": 0,
+ "options": "image",
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "section_break_11",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Description",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "section_break_11",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Description",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "brand",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Brand",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "brand",
- "oldfieldtype": "Link",
- "options": "Brand",
- "permlevel": 0,
- "print_hide": 1,
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "brand",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Brand",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "brand",
+ "oldfieldtype": "Link",
+ "options": "Brand",
+ "permlevel": 0,
+ "print_hide": 1,
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "description",
- "fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Description",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "description",
- "oldfieldtype": "Text",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "description",
+ "fieldtype": "Text Editor",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Description",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "description",
+ "oldfieldtype": "Text",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "is_stock_item",
- "columns": 0,
- "depends_on": "is_stock_item",
- "fieldname": "inventory",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Inventory",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "icon-truck",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "is_stock_item",
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "fieldname": "inventory",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Inventory",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-truck",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_stock_item",
- "description": "",
- "fieldname": "default_warehouse",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Default Warehouse",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "default_warehouse",
- "oldfieldtype": "Link",
- "options": "Warehouse",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "description": "",
+ "fieldname": "default_warehouse",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Warehouse",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "default_warehouse",
+ "oldfieldtype": "Link",
+ "options": "Warehouse",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "2099-12-31",
- "depends_on": "is_stock_item",
- "fieldname": "end_of_life",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "End of Life",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "end_of_life",
- "oldfieldtype": "Date",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "2099-12-31",
+ "depends_on": "is_stock_item",
+ "fieldname": "end_of_life",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "End of Life",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "end_of_life",
+ "oldfieldtype": "Date",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "depends_on": "eval:doc.is_stock_item",
- "fieldname": "has_batch_no",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Has Batch No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "has_batch_no",
- "oldfieldtype": "Select",
- "options": "",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "",
+ "depends_on": "eval:doc.is_stock_item",
+ "fieldname": "has_batch_no",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Has Batch No",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "has_batch_no",
+ "oldfieldtype": "Select",
+ "options": "",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "depends_on": "eval:doc.is_stock_item",
- "description": "Selecting \"Yes\" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",
- "fieldname": "has_serial_no",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Has Serial No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "has_serial_no",
- "oldfieldtype": "Select",
- "options": "",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "",
+ "depends_on": "eval:doc.is_stock_item",
+ "description": "Selecting \"Yes\" will give a unique identity to each entity of this item which can be viewed in the Serial No master.",
+ "fieldname": "has_serial_no",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 1,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Has Serial No",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "has_serial_no",
+ "oldfieldtype": "Select",
+ "options": "",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "has_serial_no",
- "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",
- "fieldname": "serial_no_series",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Serial Number Series",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "has_serial_no",
+ "description": "Example: ABCD.#####\nIf series is set and Serial No is not mentioned in transactions, then automatic serial number will be created based on this series. If you always want to explicitly mention Serial Nos for this item. leave this blank.",
+ "fieldname": "serial_no_series",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Serial Number Series",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "Purchase",
- "fieldname": "default_material_request_type",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Default Material Request Type",
- "length": 0,
- "no_copy": 0,
- "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "Purchase",
+ "fieldname": "default_material_request_type",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Material Request Type",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Purchase\nMaterial Transfer\nMaterial Issue\nManufacture",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_stock_item",
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "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,
- "unique": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "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,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_stock_item",
- "description": "",
- "fieldname": "tolerance",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Allow over delivery or receipt upto this percent",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "tolerance",
- "oldfieldtype": "Currency",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "description": "",
+ "fieldname": "tolerance",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Allow over delivery or receipt upto this percent",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "tolerance",
+ "oldfieldtype": "Currency",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_stock_item",
- "fieldname": "valuation_method",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Valuation Method",
- "length": 0,
- "no_copy": 0,
- "options": "\nFIFO\nMoving Average",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "fieldname": "valuation_method",
+ "fieldtype": "Select",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Valuation Method",
+ "length": 0,
+ "no_copy": 0,
+ "options": "\nFIFO\nMoving Average",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.is_stock_item",
- "fieldname": "warranty_period",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Warranty Period (in days)",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "warranty_period",
- "oldfieldtype": "Data",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.is_stock_item",
+ "fieldname": "warranty_period",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Warranty Period (in days)",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "warranty_period",
+ "oldfieldtype": "Data",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "is_stock_item",
- "description": "",
- "fieldname": "net_weight",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Net Weight",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "description": "",
+ "fieldname": "net_weight",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Net Weight",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "eval:doc.is_stock_item",
- "fieldname": "weight_uom",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Weight UOM",
- "length": 0,
- "no_copy": 0,
- "options": "UOM",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:doc.is_stock_item",
+ "fieldname": "weight_uom",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Weight UOM",
+ "length": 0,
+ "no_copy": 0,
+ "options": "UOM",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "depends_on": "is_stock_item",
- "description": "",
- "fieldname": "reorder_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Auto re-order",
- "length": 0,
- "no_copy": 0,
- "options": "icon-rss",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "description": "",
+ "fieldname": "reorder_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Auto re-order",
+ "length": 0,
+ "no_copy": 0,
+ "options": "fa fa-rss",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "Will also apply for variants unless overrridden",
- "fieldname": "reorder_levels",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Reorder level based on Warehouse",
- "length": 0,
- "no_copy": 0,
- "options": "Item Reorder",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "Will also apply for variants unless overrridden",
+ "fieldname": "reorder_levels",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Reorder level based on Warehouse",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item Reorder",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "attributes",
- "columns": 0,
- "depends_on": "",
- "fieldname": "variants_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Variants",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "attributes",
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "variants_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Variants",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "depends_on": "eval:!doc.variant_of",
- "description": "If this item has variants, then it cannot be selected in sales orders etc.",
- "fieldname": "has_variants",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Has Variants",
- "length": 0,
- "no_copy": 1,
- "options": "",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "0",
+ "depends_on": "eval:!doc.variant_of",
+ "description": "If this item has variants, then it cannot be selected in sales orders etc.",
+ "fieldname": "has_variants",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Has Variants",
+ "length": 0,
+ "no_copy": 1,
+ "options": "",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "attributes",
- "fieldtype": "Table",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Attributes",
- "length": 0,
- "no_copy": 1,
- "options": "Item Variant Attribute",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "attributes",
+ "fieldtype": "Table",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Attributes",
+ "length": 0,
+ "no_copy": 1,
+ "options": "Item Variant Attribute",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "purchase_details",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Purchase Details",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "purchase_details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Purchase Details",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-shopping-cart",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "1",
- "fieldname": "is_purchase_item",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Is Purchase Item",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "1",
+ "fieldname": "is_purchase_item",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Is Purchase Item",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0.00",
- "depends_on": "is_stock_item",
- "description": "",
- "fieldname": "min_order_qty",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Minimum Order Qty",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "min_order_qty",
- "oldfieldtype": "Currency",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "0.00",
+ "depends_on": "is_stock_item",
+ "description": "",
+ "fieldname": "min_order_qty",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Minimum Order Qty",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "min_order_qty",
+ "oldfieldtype": "Currency",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "safety_stock",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Safety Stock",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "safety_stock",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Safety Stock",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "Average time taken by the supplier to deliver",
- "fieldname": "lead_time_days",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Lead Time in days",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "lead_time_days",
- "oldfieldtype": "Int",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "Average time taken by the supplier to deliver",
+ "fieldname": "lead_time_days",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Lead Time in days",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "lead_time_days",
+ "oldfieldtype": "Int",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "",
- "fieldname": "buying_cost_center",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Default Buying Cost Center",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "cost_center",
- "oldfieldtype": "Link",
- "options": "Cost Center",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "",
+ "fieldname": "buying_cost_center",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Buying Cost Center",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "cost_center",
+ "oldfieldtype": "Link",
+ "options": "Cost Center",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "",
- "fieldname": "expense_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Default Expense Account",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "purchase_account",
- "oldfieldtype": "Link",
- "options": "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "",
+ "fieldname": "expense_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Expense Account",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "purchase_account",
+ "oldfieldtype": "Link",
+ "options": "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "unit_of_measure_conversion",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Unit of Measure Conversion",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "unit_of_measure_conversion",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Unit of Measure Conversion",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "Will also apply for variants",
- "fieldname": "uoms",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "UOMs",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "uom_conversion_details",
- "oldfieldtype": "Table",
- "options": "UOM Conversion Detail",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "Will also apply for variants",
+ "fieldname": "uoms",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "UOMs",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "uom_conversion_details",
+ "oldfieldtype": "Table",
+ "options": "UOM Conversion Detail",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "last_purchase_rate",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Last Purchase Rate",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "last_purchase_rate",
- "oldfieldtype": "Currency",
- "permlevel": 0,
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "last_purchase_rate",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Last Purchase Rate",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "last_purchase_rate",
+ "oldfieldtype": "Currency",
+ "permlevel": 0,
+ "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_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "depends_on": "",
- "fieldname": "supplier_details",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Supplier Details",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "supplier_details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Supplier Details",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "default_supplier",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Default Supplier",
- "length": 0,
- "no_copy": 0,
- "options": "Supplier",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "default_supplier",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Supplier",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Supplier",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "delivered_by_supplier",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Delivered by Supplier (Drop Ship)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "delivered_by_supplier",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Delivered by Supplier (Drop Ship)",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 1,
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "manufacturer",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Manufacturer",
- "length": 0,
- "no_copy": 0,
- "options": "Manufacturer",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "manufacturer",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Manufacturer",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Manufacturer",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "manufacturer_part_no",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Manufacturer Part Number",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "manufacturer_part_no",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Manufacturer Part Number",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "column_break2",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Item Code for Suppliers",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "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,
- "unique": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "column_break2",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Item Code for Suppliers",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "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,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "supplier_items",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Supplier Items",
- "length": 0,
- "no_copy": 0,
- "options": "Item Supplier",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "supplier_items",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Supplier Items",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item Supplier",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "sales_details",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Sales Details",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "icon-tag",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "sales_details",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Sales Details",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-tag",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "1",
- "fieldname": "is_sales_item",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Is Sales Item",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "1",
+ "fieldname": "is_sales_item",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Is Sales Item",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "description": "Publish Item to hub.erpnext.com",
- "fieldname": "publish_in_hub",
- "fieldtype": "Check",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Publish in Hub",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "0",
+ "description": "Publish Item to hub.erpnext.com",
+ "fieldname": "publish_in_hub",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Publish in Hub",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "0",
- "fieldname": "synced_with_hub",
- "fieldtype": "Check",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Synced With Hub",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "0",
+ "fieldname": "synced_with_hub",
+ "fieldtype": "Check",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Synced With Hub",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "income_account",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Default Income Account",
- "length": 0,
- "no_copy": 0,
- "options": "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "income_account",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Income Account",
+ "length": 0,
+ "no_copy": 0,
+ "options": "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "selling_cost_center",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Default Selling Cost Center",
- "length": 0,
- "no_copy": 0,
- "options": "Cost Center",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "selling_cost_center",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default Selling Cost Center",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Cost Center",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "column_break3",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Customer Item Codes",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Column Break",
- "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,
- "unique": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "column_break3",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer Item Codes",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Column Break",
+ "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,
+ "unique": 0,
"width": "50%"
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "description": "",
- "fieldname": "customer_items",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Customer Items",
- "length": 0,
- "no_copy": 0,
- "options": "Item Customer Detail",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "description": "",
+ "fieldname": "customer_items",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer Items",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item Customer Detail",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "max_discount",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Max Discount (%)",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "max_discount",
- "oldfieldtype": "Currency",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "max_discount",
+ "fieldtype": "Float",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Max Discount (%)",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "max_discount",
+ "oldfieldtype": "Currency",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "item_tax_section_break",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Item Tax",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "icon-money",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "item_tax_section_break",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Item Tax",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-money",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "Will also apply for variants",
- "fieldname": "taxes",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Taxes",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_tax",
- "oldfieldtype": "Table",
- "options": "Item Tax",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "description": "Will also apply for variants",
+ "fieldname": "taxes",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Taxes",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "item_tax",
+ "oldfieldtype": "Table",
+ "options": "Item Tax",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "inspection_criteria",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Inspection Criteria",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "icon-search",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "inspection_criteria",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Inspection Criteria",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-search",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "fieldname": "inspection_required",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Inspection Required",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "inspection_required",
- "oldfieldtype": "Select",
- "options": "",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "",
+ "fieldname": "inspection_required_before_purchase",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Inspection Required before Purchase",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "inspection_required",
+ "oldfieldtype": "Select",
+ "options": "",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "inspection_required",
- "description": "Will also apply to variants",
- "fieldname": "quality_parameters",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Quality Parameters",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_specification_details",
- "oldfieldtype": "Table",
- "options": "Item Quality Inspection Parameter",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "inspection_required_before_delivery",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Inspection Required before Delivery",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "depends_on": "is_stock_item",
- "fieldname": "manufacturing",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Manufacturing",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "icon-cogs",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "eval:(doc.inspection_required_before_purchase || doc.inspection_required_before_delivery)",
+ "description": "Will also apply to variants",
+ "fieldname": "quality_parameters",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Quality Parameters",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "item_specification_details",
+ "oldfieldtype": "Table",
+ "options": "Item Quality Inspection Parameter",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "",
- "fieldname": "default_bom",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Default BOM",
- "length": 0,
- "no_copy": 1,
- "oldfieldname": "default_bom",
- "oldfieldtype": "Link",
- "options": "BOM",
- "permlevel": 0,
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "depends_on": "is_stock_item",
+ "fieldname": "manufacturing",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Manufacturing",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldtype": "Section Break",
+ "options": "fa fa-cogs",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "default": "",
- "description": "If subcontracted to a vendor",
- "fieldname": "is_sub_contracted_item",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Supply Raw Materials for Purchase",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "is_sub_contracted_item",
- "oldfieldtype": "Select",
- "options": "",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "default_bom",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Default BOM",
+ "length": 0,
+ "no_copy": 1,
+ "oldfieldname": "default_bom",
+ "oldfieldtype": "Link",
+ "options": "BOM",
+ "permlevel": 0,
+ "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_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_74",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "default": "",
+ "description": "If subcontracted to a vendor",
+ "fieldname": "is_sub_contracted_item",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Supply Raw Materials for Purchase",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "is_sub_contracted_item",
+ "oldfieldtype": "Select",
+ "options": "",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "customer_code",
- "fieldtype": "Data",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Customer Code",
- "length": 0,
- "no_copy": 1,
- "permlevel": 0,
- "print_hide": 1,
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "column_break_74",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "columns": 0,
- "fieldname": "website_section",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Website",
- "length": 0,
- "no_copy": 0,
- "options": "icon-globe",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "customer_code",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 1,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Customer Code",
+ "length": 0,
+ "no_copy": 1,
+ "permlevel": 0,
+ "print_hide": 1,
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "show_in_website",
- "fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Show in Website",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "columns": 0,
+ "fieldname": "website_section",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website",
+ "length": 0,
+ "no_copy": 0,
+ "options": "fa fa-globe",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "fieldname": "route",
- "fieldtype": "Small Text",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Route",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "show_in_website",
+ "fieldtype": "Check",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Show in Website",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "description": "Items with higher weightage will be shown higher",
- "fieldname": "weightage",
- "fieldtype": "Int",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Weightage",
- "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": 1,
- "set_only_once": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "fieldname": "route",
+ "fieldtype": "Small Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Route",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "description": "Show a slideshow at the top of the page",
- "fieldname": "slideshow",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Slideshow",
- "length": 0,
- "no_copy": 0,
- "options": "Website Slideshow",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "description": "Items with higher weightage will be shown higher",
+ "fieldname": "weightage",
+ "fieldtype": "Int",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Weightage",
+ "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": 1,
+ "set_only_once": 0,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "description": "Item Image (if not slideshow)",
- "fieldname": "website_image",
- "fieldtype": "Attach",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Image",
- "length": 0,
- "no_copy": 0,
- "options": "",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "description": "Show a slideshow at the top of the page",
+ "fieldname": "slideshow",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Slideshow",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Website Slideshow",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "thumbnail",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Thumbnail",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "description": "Item Image (if not slideshow)",
+ "fieldname": "website_image",
+ "fieldtype": "Attach",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Image",
+ "length": 0,
+ "no_copy": 0,
+ "options": "",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "cb72",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "thumbnail",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Thumbnail",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.",
- "fieldname": "website_warehouse",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 1,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Website Warehouse",
- "length": 0,
- "no_copy": 0,
- "options": "Warehouse",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "cb72",
+ "fieldtype": "Column Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "description": "List this Item in multiple groups on the website.",
- "fieldname": "website_item_groups",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Website Item Groups",
- "length": 0,
- "no_copy": 0,
- "options": "Website Item Group",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "description": "Show \"In Stock\" or \"Not in Stock\" based on stock available in this warehouse.",
+ "fieldname": "website_warehouse",
+ "fieldtype": "Link",
+ "hidden": 0,
+ "ignore_user_permissions": 1,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Warehouse",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Warehouse",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "collapsible_depends_on": "website_specifications",
- "columns": 0,
- "depends_on": "show_in_website",
- "fieldname": "sb72",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Website Specifications",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "description": "List this Item in multiple groups on the website.",
+ "fieldname": "website_item_groups",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Item Groups",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Website Item Group",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "fieldname": "copy_from_item_group",
- "fieldtype": "Button",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Copy From Item Group",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 1,
+ "collapsible_depends_on": "website_specifications",
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "fieldname": "sb72",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Specifications",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "fieldname": "website_specifications",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Website Specifications",
- "length": 0,
- "no_copy": 0,
- "options": "Item Website Specification",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "fieldname": "copy_from_item_group",
+ "fieldtype": "Button",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Copy From Item Group",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "show_in_website",
- "fieldname": "web_long_description",
- "fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Website Description",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "fieldname": "website_specifications",
+ "fieldtype": "Table",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Specifications",
+ "length": 0,
+ "no_copy": 0,
+ "options": "Item Website Specification",
+ "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,
"unique": 0
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "total_projected_qty",
- "fieldtype": "Float",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Total Projected Qty",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "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,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "depends_on": "show_in_website",
+ "fieldname": "web_long_description",
+ "fieldtype": "Text Editor",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Website Description",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "total_projected_qty",
+ "fieldtype": "Float",
+ "hidden": 1,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Total Projected Qty",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "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,
"unique": 0
}
- ],
- "hide_heading": 0,
- "hide_toolbar": 0,
- "icon": "icon-tag",
- "idx": 2,
- "image_field": "image",
- "image_view": 0,
- "in_create": 0,
- "in_dialog": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 1,
- "modified": "2016-12-12 18:19:27.154509",
- "modified_by": "Administrator",
- "module": "Stock",
- "name": "Item",
- "owner": "Administrator",
+ ],
+ "hide_heading": 0,
+ "hide_toolbar": 0,
+ "icon": "fa fa-tag",
+ "idx": 2,
+ "image_field": "image",
+ "image_view": 0,
+ "in_create": 0,
+ "in_dialog": 0,
+ "is_submittable": 0,
+ "issingle": 0,
+ "istable": 0,
+ "max_attachments": 1,
+ "modified": "2016-12-13 02:19:54.507883",
+ "modified_by": "Administrator",
+ "module": "Stock",
+ "name": "Item",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 1,
- "is_custom": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Item Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 1,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Item Manager",
+ "set_user_permissions": 0,
+ "share": 1,
+ "submit": 0,
"write": 1
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Stock Manager",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Stock Manager",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Stock User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 1,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Stock User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Sales User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Sales User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Purchase User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Purchase User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Maintenance User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Maintenance User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Accounts User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Accounts User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
- },
+ },
{
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Manufacturing User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
+ "amend": 0,
+ "apply_user_permissions": 0,
+ "cancel": 0,
+ "create": 0,
+ "delete": 0,
+ "email": 0,
+ "export": 0,
+ "if_owner": 0,
+ "import": 0,
+ "is_custom": 0,
+ "permlevel": 0,
+ "print": 0,
+ "read": 1,
+ "report": 0,
+ "role": "Manufacturing User",
+ "set_user_permissions": 0,
+ "share": 0,
+ "submit": 0,
"write": 0
}
- ],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "search_fields": "item_name,description,item_group,customer_code",
- "sort_field": "idx desc, modified desc",
- "sort_order": "DESC",
- "title_field": "item_name",
+ ],
+ "quick_entry": 1,
+ "read_only": 0,
+ "read_only_onload": 0,
+ "search_fields": "item_name,description,item_group,customer_code",
+ "sort_field": "idx desc, modified desc",
+ "sort_order": "DESC",
+ "title_field": "item_name",
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/item_attribute/item_attribute.json b/erpnext/stock/doctype/item_attribute/item_attribute.json
index 338a0bc..8c02928 100644
--- a/erpnext/stock/doctype/item_attribute/item_attribute.json
+++ b/erpnext/stock/doctype/item_attribute/item_attribute.json
@@ -224,7 +224,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-edit",
+ "icon": "fa fa-edit",
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
diff --git a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
index aac9c1c..68edfc9 100644
--- a/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
+++ b/erpnext/stock/doctype/item_attribute_value/item_attribute_value.json
@@ -65,7 +65,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-edit",
+ "icon": "fa fa-edit",
"idx": 0,
"image_view": 0,
"in_create": 0,
diff --git a/erpnext/stock/doctype/item_price/item_price.json b/erpnext/stock/doctype/item_price/item_price.json
index 0dcf264..5f08262 100644
--- a/erpnext/stock/doctype/item_price/item_price.json
+++ b/erpnext/stock/doctype/item_price/item_price.json
@@ -3,30 +3,38 @@
"allow_import": 1,
"allow_rename": 0,
"autoname": "ITEM-PRICE-.#####",
+ "beta": 0,
"creation": "2013-05-02 16:29:48",
"custom": 0,
"description": "Multiple Item prices.",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "price_list_details",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tags",
+ "options": "fa fa-tags",
"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,
@@ -37,19 +45,24 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "price_list",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Price List",
"length": 0,
"no_copy": 0,
"options": "Price List",
"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,
@@ -60,18 +73,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "buying",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Buying",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"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,
@@ -82,18 +100,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "selling",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Selling",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"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,
@@ -104,19 +127,24 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "item_details",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"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,
@@ -127,12 +155,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "item_code",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Item Code",
"length": 0,
"no_copy": 0,
@@ -141,7 +172,9 @@
"options": "Item",
"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": 1,
@@ -152,12 +185,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "price_list_rate",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Rate",
"length": 0,
"no_copy": 0,
@@ -166,7 +202,9 @@
"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,
@@ -177,19 +215,24 @@
"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_list_view": 1,
+ "in_standard_filter": 0,
"label": "Currency",
"length": 0,
"no_copy": 0,
"options": "Currency",
"permlevel": 0,
"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,
@@ -200,17 +243,22 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "col_br_1",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -221,18 +269,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "item_name",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Name",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"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,
@@ -243,18 +296,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "item_description",
"fieldtype": "Text",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Description",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"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,
@@ -265,18 +323,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "section_break_12",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 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,
@@ -287,19 +350,24 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "bulk_import_help",
"fieldtype": "HTML",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Bulk Import Help",
"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,
@@ -309,15 +377,16 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-flag",
+ "icon": "fa fa-flag",
"idx": 1,
+ "image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2015-11-16 06:29:48.400288",
+ "modified": "2016-12-15 14:52:09.842544",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item Price",
@@ -333,6 +402,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -353,6 +423,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -364,7 +435,10 @@
"write": 1
}
],
+ "quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
- "title_field": "item_code"
+ "sort_order": "ASC",
+ "title_field": "item_code",
+ "track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
index 15a5759..525853b 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.js
@@ -37,7 +37,7 @@
'<br><br>',
'<table class="table table-bordered" style="background-color: #f9f9f9;">',
'<tr><td>',
- '<h4><i class="icon-hand-right"></i> ',
+ '<h4><i class="fa fa-hand-right"></i> ',
__('Notes'),
':</h4>',
'<ul>',
diff --git a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
index d6fdd87..227541f 100644
--- a/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
+++ b/erpnext/stock/doctype/landed_cost_voucher/landed_cost_voucher.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -78,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Receipts",
"length": 0,
"no_copy": 0,
@@ -105,6 +108,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Get Items From Purchase Receipts",
"length": 0,
"no_copy": 0,
@@ -131,6 +135,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Receipt Items",
"length": 0,
"no_copy": 1,
@@ -158,6 +163,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -185,6 +191,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"options": "Simple",
@@ -212,6 +219,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -239,6 +247,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -266,6 +275,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -293,6 +303,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Distribute Charges Based On",
"length": 0,
"no_copy": 0,
@@ -321,6 +332,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -347,6 +359,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Landed Cost Help",
"length": 0,
"no_copy": 0,
@@ -365,7 +378,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-usd",
+ "icon": "fa fa-usd",
"idx": 0,
"image_view": 0,
"in_create": 0,
@@ -374,7 +387,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 16:11:19.832518",
+ "modified": "2016-11-07 05:09:46.981120",
"modified_by": "Administrator",
"module": "Stock",
"name": "Landed Cost Voucher",
diff --git a/erpnext/stock/doctype/manufacturer/manufacturer.json b/erpnext/stock/doctype/manufacturer/manufacturer.json
index ea69ca0..0840e56 100644
--- a/erpnext/stock/doctype/manufacturer/manufacturer.json
+++ b/erpnext/stock/doctype/manufacturer/manufacturer.json
@@ -159,7 +159,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-certificate",
+ "icon": "fa fa-certificate",
"idx": 0,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/stock/doctype/material_request/material_request.js b/erpnext/stock/doctype/material_request/material_request.js
index 44b7dea..2b1fb7f 100644
--- a/erpnext/stock/doctype/material_request/material_request.js
+++ b/erpnext/stock/doctype/material_request/material_request.js
@@ -43,7 +43,7 @@
if(doc.docstatus==0) {
cur_frm.add_custom_button(__("Get Items from BOM"),
- cur_frm.cscript.get_items_from_bom, "icon-sitemap", "btn-default");
+ cur_frm.cscript.get_items_from_bom, "fa fa-sitemap", "btn-default");
}
if(doc.docstatus == 1 && doc.status != 'Stopped') {
diff --git a/erpnext/stock/doctype/material_request/material_request.json b/erpnext/stock/doctype/material_request/material_request.json
index 800854d..926415d 100644
--- a/erpnext/stock/doctype/material_request/material_request.json
+++ b/erpnext/stock/doctype/material_request/material_request.json
@@ -23,10 +23,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-pushpin",
+ "options": "fa fa-pushpin",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -78,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Type",
"length": 0,
"no_copy": 0,
@@ -105,6 +108,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -130,6 +134,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -159,6 +164,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -191,6 +197,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -222,11 +229,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -250,6 +258,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -279,11 +288,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -307,6 +317,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Requested For",
"length": 0,
"no_copy": 0,
@@ -334,6 +345,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Transaction Date",
"length": 0,
"no_copy": 1,
@@ -364,6 +376,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -392,6 +405,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -424,6 +438,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "% Ordered",
"length": 0,
"no_copy": 1,
@@ -452,6 +467,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Printing Details",
"length": 0,
"no_copy": 0,
@@ -479,6 +495,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -508,6 +525,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Heading",
"length": 0,
"no_copy": 0,
@@ -536,11 +554,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -564,6 +583,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms",
"length": 0,
"no_copy": 0,
@@ -593,6 +613,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions Content",
"length": 0,
"no_copy": 0,
@@ -612,7 +633,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-ticket",
+ "icon": "fa fa-ticket",
"idx": 70,
"image_view": 0,
"in_create": 0,
@@ -622,7 +643,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-11-03 16:11:40.278048",
+ "modified": "2016-12-15 14:52:32.240406",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request",
diff --git a/erpnext/stock/doctype/material_request_item/material_request_item.json b/erpnext/stock/doctype/material_request_item/material_request_item.json
index f7ca7d9..b1d6ec0 100644
--- a/erpnext/stock/doctype/material_request_item/material_request_item.json
+++ b/erpnext/stock/doctype/material_request_item/material_request_item.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Item Code",
"length": 0,
"no_copy": 0,
@@ -34,6 +35,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
@@ -53,12 +55,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -77,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Name",
"length": 0,
"no_copy": 0,
@@ -87,6 +92,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -106,6 +112,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -114,6 +121,7 @@
"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,
@@ -132,6 +140,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -142,6 +151,7 @@
"print_hide_if_no_value": 0,
"print_width": "250px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -161,6 +171,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -168,6 +179,7 @@
"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,
@@ -186,6 +198,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
@@ -194,6 +207,7 @@
"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,
@@ -212,6 +226,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Quantity and Warehouse",
"length": 0,
"no_copy": 0,
@@ -219,6 +234,7 @@
"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,
@@ -237,6 +253,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Quantity",
"length": 0,
"no_copy": 0,
@@ -247,6 +264,7 @@
"print_hide_if_no_value": 0,
"print_width": "80px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -266,6 +284,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Stock UOM",
"length": 0,
"no_copy": 0,
@@ -277,6 +296,7 @@
"print_hide_if_no_value": 0,
"print_width": "70px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -296,6 +316,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "For Warehouse",
"length": 0,
"no_copy": 0,
@@ -307,6 +328,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -326,12 +348,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -351,6 +375,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Required Date",
"length": 0,
"no_copy": 0,
@@ -361,6 +386,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -380,6 +406,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
@@ -387,6 +414,7 @@
"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,
@@ -406,6 +434,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Group",
"length": 0,
"no_copy": 0,
@@ -416,6 +445,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -434,6 +464,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Brand",
"length": 0,
"no_copy": 0,
@@ -445,6 +476,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -464,6 +496,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Lead Time Date",
"length": 0,
"no_copy": 1,
@@ -473,6 +506,7 @@
"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,
@@ -491,6 +525,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Order",
"length": 0,
"no_copy": 0,
@@ -499,6 +534,7 @@
"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,
@@ -517,6 +553,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -526,6 +563,7 @@
"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,
@@ -544,12 +582,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -568,6 +608,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Min Order Qty",
"length": 0,
"no_copy": 1,
@@ -578,6 +619,7 @@
"print_hide_if_no_value": 0,
"print_width": "70px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -597,6 +639,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Projected Qty",
"length": 0,
"no_copy": 1,
@@ -607,6 +650,7 @@
"print_hide_if_no_value": 0,
"print_width": "70px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -626,6 +670,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Actual Qty",
"length": 0,
"no_copy": 1,
@@ -634,6 +679,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 1,
"reqd": 0,
"search_index": 0,
@@ -652,6 +698,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Completed Qty",
"length": 0,
"no_copy": 1,
@@ -661,6 +708,7 @@
"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,
@@ -679,6 +727,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Page Break",
"length": 0,
"no_copy": 1,
@@ -688,6 +737,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -705,7 +755,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-10-17 04:58:33.317145",
+ "modified": "2016-12-08 14:49:48.397015",
"modified_by": "Administrator",
"module": "Stock",
"name": "Material Request Item",
diff --git a/erpnext/stock/doctype/packing_slip/packing_slip.json b/erpnext/stock/doctype/packing_slip/packing_slip.json
index d8c7952..3359084 100644
--- a/erpnext/stock/doctype/packing_slip/packing_slip.json
+++ b/erpnext/stock/doctype/packing_slip/packing_slip.json
@@ -575,7 +575,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-suitcase",
+ "icon": "fa fa-suitcase",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/stock/doctype/price_list/price_list.js b/erpnext/stock/doctype/price_list/price_list.js
index f109633..23ac6fd 100644
--- a/erpnext/stock/doctype/price_list/price_list.js
+++ b/erpnext/stock/doctype/price_list/price_list.js
@@ -8,6 +8,6 @@
"price_list": cur_frm.doc.name
};
frappe.set_route("Report", "Item Price");
- }, "icon-money");
+ }, "fa fa-money");
}
});
diff --git a/erpnext/stock/doctype/price_list/price_list.json b/erpnext/stock/doctype/price_list/price_list.json
index cc323fa..73674ee 100644
--- a/erpnext/stock/doctype/price_list/price_list.json
+++ b/erpnext/stock/doctype/price_list/price_list.json
@@ -3,30 +3,38 @@
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:price_list_name",
+ "beta": 0,
"creation": "2013-01-25 11:35:09",
"custom": 0,
"description": "Price List Master",
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "1",
"fieldname": "enabled",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Enabled",
"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,
@@ -37,17 +45,22 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "sb_1",
"fieldtype": "Section Break",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -58,12 +71,15 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "price_list_name",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Name",
"length": 0,
"no_copy": 1,
@@ -71,7 +87,9 @@
"oldfieldtype": "Data",
"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,
@@ -82,19 +100,24 @@
"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_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,
@@ -105,18 +128,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "buying",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Buying",
"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,
@@ -127,18 +155,23 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "selling",
"fieldtype": "Check",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Selling",
"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,
@@ -149,17 +182,22 @@
"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_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -170,12 +208,15 @@
"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_list_view": 0,
+ "in_standard_filter": 0,
"label": "Applicable for Countries",
"length": 0,
"no_copy": 0,
@@ -183,7 +224,9 @@
"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,
@@ -193,15 +236,16 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-tags",
+ "icon": "fa fa-tags",
"idx": 1,
+ "image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 1,
- "modified": "2015-11-16 06:29:51.852676",
+ "modified": "2016-11-07 05:32:09.570045",
"modified_by": "Administrator",
"module": "Stock",
"name": "Price List",
@@ -217,6 +261,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -237,6 +282,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -257,6 +303,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -277,6 +324,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -297,6 +345,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
@@ -308,7 +357,9 @@
"write": 0
}
],
+ "quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
- "search_fields": "currency"
+ "search_fields": "currency",
+ "track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index d477189..457a7c2 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -7,21 +7,6 @@
frappe.ui.form.on("Purchase Receipt", {
onload: function(frm) {
- // default values for quotation no
- var qa_no = frappe.meta.get_docfield("Purchase Receipt Item", "qa_no");
- qa_no.get_route_options_for_new_doc = function(field) {
- if(frm.is_new()) return;
- var doc = field.doc;
- return {
- "inspection_type": "Incoming",
- "purchase_receipt_no": frm.doc.name,
- "item_code": doc.item_code,
- "description": doc.description,
- "item_serial_no": doc.serial_no ? doc.serial_no.split("\n")[0] : null,
- "batch_no": doc.batch_no
- }
- }
-
$.each(["warehouse", "rejected_warehouse"], function(i, field) {
frm.set_query(field, "items", function() {
return {
@@ -40,7 +25,8 @@
["Warehouse", "is_group", "=", 0]
]
}
- })
+ });
+
}
});
@@ -190,14 +176,6 @@
}
}
-cur_frm.fields_dict.items.grid.get_field("qa_no").get_query = function(doc) {
- return {
- filters: {
- 'docstatus': 1
- }
- }
-}
-
cur_frm.fields_dict['items'].grid.get_field('bom').get_query = function(doc, cdt, cdn) {
var d = locals[cdt][cdn]
return {
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 5c8a658..b4bad54 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -23,10 +23,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -79,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -107,6 +110,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -136,6 +140,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier",
"length": 0,
"no_copy": 0,
@@ -168,6 +173,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Name",
"length": 0,
"no_copy": 0,
@@ -194,6 +200,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -223,6 +230,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Date",
"length": 0,
"no_copy": 1,
@@ -254,6 +262,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Posting Time",
"length": 0,
"no_copy": 1,
@@ -285,6 +294,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -316,6 +326,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Return",
"length": 0,
"no_copy": 1,
@@ -344,6 +355,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Return Against Purchase Receipt",
"length": 0,
"no_copy": 1,
@@ -372,6 +384,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address and Contact",
"length": 0,
"no_copy": 0,
@@ -399,6 +412,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Select Supplier Address",
"length": 0,
"no_copy": 0,
@@ -426,6 +440,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Person",
"length": 0,
"no_copy": 0,
@@ -454,6 +469,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address",
"length": 0,
"no_copy": 0,
@@ -480,6 +496,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
@@ -506,6 +523,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No",
"length": 0,
"no_copy": 0,
@@ -532,6 +550,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Email",
"length": 0,
"no_copy": 0,
@@ -558,6 +577,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -585,6 +605,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Select Shipping Address",
"length": 0,
"no_copy": 0,
@@ -613,6 +634,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Shipping Address",
"length": 0,
"no_copy": 0,
@@ -640,10 +662,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency and Price List",
"length": 0,
"no_copy": 0,
- "options": "icon-tag",
+ "options": "fa fa-tag",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -667,6 +690,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Currency",
"length": 0,
"no_copy": 0,
@@ -697,6 +721,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -726,6 +751,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -754,6 +780,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List",
"length": 0,
"no_copy": 0,
@@ -782,6 +809,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Currency",
"length": 0,
"no_copy": 0,
@@ -810,6 +838,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Exchange Rate",
"length": 0,
"no_copy": 0,
@@ -837,6 +866,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Ignore Pricing Rule",
"length": 0,
"no_copy": 1,
@@ -863,11 +893,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-shopping-cart",
+ "options": "fa fa-shopping-cart",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -891,6 +922,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -920,6 +952,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Get current stock",
"length": 0,
"no_copy": 0,
@@ -948,6 +981,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
@@ -974,6 +1008,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1002,6 +1037,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1033,6 +1069,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1058,6 +1095,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total",
"length": 0,
"no_copy": 0,
@@ -1086,6 +1124,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Total",
"length": 0,
"no_copy": 0,
@@ -1116,11 +1155,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1145,6 +1185,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1174,6 +1215,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1203,6 +1245,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Calculation",
"length": 0,
"no_copy": 0,
@@ -1231,11 +1274,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-money",
+ "options": "fa fa-money",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1259,6 +1303,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Added (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1288,6 +1333,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Deducted (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1317,6 +1363,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1346,6 +1393,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1373,6 +1421,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Added",
"length": 0,
"no_copy": 0,
@@ -1402,6 +1451,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Taxes and Charges Deducted",
"length": 0,
"no_copy": 0,
@@ -1431,6 +1481,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Taxes and Charges",
"length": 0,
"no_copy": 0,
@@ -1460,6 +1511,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount",
"length": 0,
"no_copy": 0,
@@ -1488,6 +1540,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Apply Additional Discount On",
"length": 0,
"no_copy": 0,
@@ -1516,6 +1569,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1544,6 +1598,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1570,6 +1625,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Percentage",
"length": 0,
"no_copy": 0,
@@ -1597,6 +1653,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Discount Amount",
"length": 0,
"no_copy": 0,
@@ -1625,6 +1682,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1651,6 +1709,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Grand Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1681,6 +1740,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1709,6 +1769,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rounded Total (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -1738,6 +1799,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1764,6 +1826,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Grand Total",
"length": 0,
"no_copy": 0,
@@ -1793,6 +1856,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "In Words",
"length": 0,
"no_copy": 0,
@@ -1822,11 +1886,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-legal",
+ "options": "fa fa-legal",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -1850,6 +1915,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms",
"length": 0,
"no_copy": 0,
@@ -1879,6 +1945,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Terms and Conditions",
"length": 0,
"no_copy": 0,
@@ -1909,11 +1976,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Raw Materials Supplied",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-table",
+ "options": "fa fa-table",
"permlevel": 0,
"print_hide": 1,
"print_hide_if_no_value": 0,
@@ -1939,6 +2007,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Raw Materials Supplied",
"length": 0,
"no_copy": 0,
@@ -1969,6 +2038,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Warehouse",
"length": 0,
"no_copy": 1,
@@ -2000,6 +2070,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplied Items",
"length": 0,
"no_copy": 1,
@@ -2029,6 +2100,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Bill No",
"length": 0,
"no_copy": 0,
@@ -2057,6 +2129,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Bill Date",
"length": 0,
"no_copy": 0,
@@ -2085,11 +2158,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2114,6 +2188,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -2146,6 +2221,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rejected Warehouse",
"length": 0,
"no_copy": 1,
@@ -2175,6 +2251,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -2206,6 +2283,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Range",
"length": 0,
"no_copy": 0,
@@ -2234,6 +2312,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -2262,6 +2341,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "% Amount Billed",
"length": 0,
"no_copy": 1,
@@ -2289,6 +2369,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Printing Settings",
"length": 0,
"no_copy": 0,
@@ -2316,6 +2397,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -2343,6 +2425,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Heading",
"length": 0,
"no_copy": 1,
@@ -2372,6 +2455,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Language",
"length": 0,
"no_copy": 0,
@@ -2399,6 +2483,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Other Details",
"length": 0,
"no_copy": 0,
@@ -2429,6 +2514,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Instructions",
"length": 0,
"no_copy": 0,
@@ -2457,6 +2543,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Remarks",
"length": 0,
"no_copy": 0,
@@ -2484,10 +2571,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Transporter Details",
"length": 0,
"no_copy": 0,
- "options": "icon-truck",
+ "options": "fa fa-truck",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -2511,6 +2599,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Transporter Name",
"length": 0,
"no_copy": 0,
@@ -2539,6 +2628,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -2567,6 +2657,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Vehicle Number",
"length": 0,
"no_copy": 1,
@@ -2598,6 +2689,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Vehicle Date",
"length": 0,
"no_copy": 1,
@@ -2619,7 +2711,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-truck",
+ "icon": "fa fa-truck",
"idx": 261,
"image_view": 0,
"in_create": 0,
@@ -2629,7 +2721,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
- "modified": "2016-11-03 16:12:02.120051",
+ "modified": "2016-11-07 05:57:41.746638",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt",
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 86fb88b..4bcde6a 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -52,7 +52,6 @@
self.set_status()
self.po_required()
self.validate_with_previous_doc()
- self.validate_inspection()
self.validate_uom_is_integer("uom", ["qty", "received_qty"])
self.validate_uom_is_integer("stock_uom", "stock_qty")
@@ -97,13 +96,6 @@
["qty", "warehouse"])
return po_qty, po_warehouse
- def validate_inspection(self):
- for d in self.get('items'): #Enter inspection date for all items that require inspection
- if frappe.db.get_value("Item", d.item_code, "inspection_required") and not d.qa_no:
- frappe.msgprint(_("Quality Inspection required for Item {0}").format(d.item_code))
- if self.docstatus==1:
- raise frappe.ValidationError
-
# Check for Closed status
def check_for_closed_status(self, pc_obj):
check_list =[]
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
index 7059c91..9722d87 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt_dashboard.py
@@ -10,7 +10,7 @@
'internal_links': {
'Purchase Order': ['items', 'purchase_order'],
'Project': ['items', 'project'],
- 'Quality Inspection': ['items', 'qa_no'],
+ 'Quality Inspection': ['items', 'quality_inspection'],
},
'transactions': [
{
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
index f6e1e3f..d8449f1 100755
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Barcode",
"length": 0,
"no_copy": 0,
@@ -31,6 +32,7 @@
"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,
@@ -49,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -56,6 +59,7 @@
"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,
@@ -74,6 +78,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Item Code",
"length": 0,
"no_copy": 0,
@@ -85,6 +90,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
@@ -104,6 +110,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -111,6 +118,7 @@
"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,
@@ -129,6 +137,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Name",
"length": 0,
"no_copy": 0,
@@ -138,6 +147,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -156,6 +166,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -164,6 +175,7 @@
"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,
@@ -182,6 +194,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -192,6 +205,7 @@
"print_hide_if_no_value": 0,
"print_width": "300px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -211,12 +225,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -235,6 +251,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
@@ -243,6 +260,7 @@
"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,
@@ -261,6 +279,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image View",
"length": 0,
"no_copy": 0,
@@ -270,6 +289,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -288,6 +308,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Received and Accepted",
"length": 0,
"no_copy": 0,
@@ -295,6 +316,7 @@
"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,
@@ -313,6 +335,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Recd Quantity",
"length": 0,
"no_copy": 0,
@@ -323,6 +346,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -342,6 +366,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Accepted Quantity",
"length": 0,
"no_copy": 0,
@@ -352,6 +377,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -371,6 +397,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rejected Quantity",
"length": 0,
"no_copy": 0,
@@ -381,6 +408,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -400,12 +428,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -424,6 +454,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "UOM",
"length": 0,
"no_copy": 0,
@@ -435,6 +466,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -454,6 +486,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Stock UOM",
"length": 0,
"no_copy": 0,
@@ -465,6 +498,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -484,6 +518,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Conversion Factor",
"length": 0,
"no_copy": 0,
@@ -494,6 +529,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -513,6 +549,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rate and Amount",
"length": 0,
"no_copy": 0,
@@ -520,6 +557,7 @@
"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,
@@ -538,6 +576,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Rate",
"length": 0,
"no_copy": 0,
@@ -546,6 +585,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -565,6 +605,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Discount on Price List Rate (%)",
"length": 0,
"no_copy": 0,
@@ -572,6 +613,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -590,12 +632,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -614,6 +658,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Price List Rate (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -622,6 +667,7 @@
"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,
@@ -640,12 +686,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -664,6 +712,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Rate",
"length": 0,
"no_copy": 0,
@@ -675,6 +724,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -694,6 +744,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Amount",
"length": 0,
"no_copy": 0,
@@ -704,6 +755,7 @@
"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,
@@ -722,12 +774,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -746,6 +800,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rate (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -757,6 +812,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
@@ -776,6 +832,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -787,6 +844,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -806,6 +864,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Pricing Rule",
"length": 0,
"no_copy": 0,
@@ -814,6 +873,7 @@
"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,
@@ -832,6 +892,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -839,6 +900,7 @@
"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,
@@ -857,6 +919,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Rate",
"length": 0,
"no_copy": 0,
@@ -866,6 +929,7 @@
"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,
@@ -884,6 +948,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Net Amount",
"length": 0,
"no_copy": 0,
@@ -893,6 +958,7 @@
"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,
@@ -911,6 +977,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -918,6 +985,7 @@
"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,
@@ -936,6 +1004,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Rate (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -945,6 +1014,7 @@
"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,
@@ -963,6 +1033,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Net Amount (Company Currency)",
"length": 0,
"no_copy": 0,
@@ -972,6 +1043,7 @@
"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,
@@ -990,6 +1062,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Warehouse and Reference",
"length": 0,
"no_copy": 0,
@@ -997,6 +1070,7 @@
"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,
@@ -1015,6 +1089,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Accepted Warehouse",
"length": 0,
"no_copy": 0,
@@ -1026,6 +1101,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1045,6 +1121,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rejected Warehouse",
"length": 0,
"no_copy": 1,
@@ -1056,6 +1133,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1068,13 +1146,15 @@
"bold": 0,
"collapsible": 0,
"columns": 0,
- "fieldname": "qa_no",
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "quality_inspection",
"fieldtype": "Link",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Quality Inspection",
"length": 0,
"no_copy": 1,
@@ -1085,6 +1165,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1103,6 +1184,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1110,6 +1192,7 @@
"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,
@@ -1128,6 +1211,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Order",
"length": 0,
"no_copy": 1,
@@ -1139,6 +1223,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -1158,6 +1243,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Required By",
"length": 0,
"no_copy": 0,
@@ -1167,6 +1253,7 @@
"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,
@@ -1185,6 +1272,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Qty as per Stock UOM",
"length": 0,
"no_copy": 0,
@@ -1195,6 +1283,7 @@
"print_hide_if_no_value": 0,
"print_width": "100px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1214,6 +1303,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1221,6 +1311,7 @@
"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,
@@ -1239,6 +1330,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Serial No",
"length": 0,
"no_copy": 1,
@@ -1248,6 +1340,7 @@
"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,
@@ -1266,6 +1359,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Batch No",
"length": 0,
"no_copy": 0,
@@ -1276,6 +1370,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1294,6 +1389,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -1302,6 +1398,7 @@
"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,
@@ -1320,6 +1417,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Rejected Serial No",
"length": 0,
"no_copy": 1,
@@ -1327,6 +1425,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1345,6 +1444,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1352,6 +1452,7 @@
"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,
@@ -1370,6 +1471,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -1378,6 +1480,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1398,6 +1501,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Cost Center",
"length": 0,
"no_copy": 0,
@@ -1406,6 +1510,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1424,6 +1529,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Order Item",
"length": 0,
"no_copy": 1,
@@ -1434,6 +1540,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -1453,12 +1560,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -1477,6 +1586,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "BOM",
"length": 0,
"no_copy": 1,
@@ -1486,6 +1596,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1504,6 +1615,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Billed Amt",
"length": 0,
"no_copy": 1,
@@ -1512,6 +1624,7 @@
"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,
@@ -1530,6 +1643,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Landed Cost Voucher Amount",
"length": 0,
"no_copy": 1,
@@ -1537,6 +1651,7 @@
"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,
@@ -1555,6 +1670,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Brand",
"length": 0,
"no_copy": 0,
@@ -1565,6 +1681,7 @@
"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,
@@ -1584,6 +1701,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Group",
"length": 0,
"no_copy": 0,
@@ -1594,6 +1712,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -1612,6 +1731,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Raw Materials Supplied Cost",
"length": 0,
"no_copy": 1,
@@ -1623,6 +1743,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1642,6 +1763,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Tax Amount",
"length": 0,
"no_copy": 1,
@@ -1653,6 +1775,7 @@
"print_hide_if_no_value": 0,
"print_width": "150px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1672,6 +1795,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Valuation Rate",
"length": 0,
"no_copy": 1,
@@ -1683,6 +1807,7 @@
"print_hide_if_no_value": 0,
"print_width": "80px",
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1703,6 +1828,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Tax Rate",
"length": 0,
"no_copy": 0,
@@ -1712,6 +1838,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 1,
+ "remember_last_selected_value": 0,
"report_hide": 1,
"reqd": 0,
"search_index": 0,
@@ -1730,6 +1857,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Page Break",
"length": 0,
"no_copy": 0,
@@ -1739,6 +1867,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -1756,7 +1885,7 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-08-26 04:44:03.973239",
+ "modified": "2016-11-16 16:04:21.778869",
"modified_by": "Administrator",
"module": "Stock",
"name": "Purchase Receipt Item",
diff --git a/erpnext/buying/doctype/quality_inspection/README.md b/erpnext/stock/doctype/quality_inspection/README.md
similarity index 100%
rename from erpnext/buying/doctype/quality_inspection/README.md
rename to erpnext/stock/doctype/quality_inspection/README.md
diff --git a/erpnext/buying/doctype/quality_inspection/__init__.py b/erpnext/stock/doctype/quality_inspection/__init__.py
similarity index 100%
rename from erpnext/buying/doctype/quality_inspection/__init__.py
rename to erpnext/stock/doctype/quality_inspection/__init__.py
diff --git a/erpnext/stock/doctype/quality_inspection/quality_inspection.js b/erpnext/stock/doctype/quality_inspection/quality_inspection.js
new file mode 100644
index 0000000..5d7b6b4
--- /dev/null
+++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.js
@@ -0,0 +1,40 @@
+// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+cur_frm.cscript.refresh = cur_frm.cscript.inspection_type;
+
+// item code based on GRN/DN
+cur_frm.fields_dict['item_code'].get_query = function(doc, cdt, cdn) {
+ if (doc.reference_type && doc.reference_name) {
+ return {
+ query: "erpnext.stock.doctype.quality_inspection.quality_inspection.item_query",
+ filters: {
+ "from": doc.reference_type,
+ "parent": doc.reference_name
+ }
+ }
+ }
+}
+
+// Serial No based on item_code
+cur_frm.fields_dict['item_serial_no'].get_query = function(doc, cdt, cdn) {
+ var filters = {};
+ if (doc.item_code) {
+ filters = {
+ 'item_code': doc.item_code
+ }
+ }
+ return { filters: filters }
+}
+
+cur_frm.set_query("batch_no", function(doc) {
+ return {
+ filters: {
+ "item": doc.item_code
+ }
+ }
+})
+
+cur_frm.add_fetch('item_code', 'item_name', 'item_name');
+cur_frm.add_fetch('item_code', 'description', 'description');
+
diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.json b/erpnext/stock/doctype/quality_inspection/quality_inspection.json
similarity index 83%
rename from erpnext/buying/doctype/quality_inspection/quality_inspection.json
rename to erpnext/stock/doctype/quality_inspection/quality_inspection.json
index 06246cc..3774853 100644
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.json
+++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.json
@@ -8,12 +8,15 @@
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
+ "document_type": "Setup",
"editable_grid": 1,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "naming_series",
"fieldtype": "Select",
"hidden": 0,
@@ -21,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -29,6 +33,7 @@
"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,
@@ -39,6 +44,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "Today",
"fieldname": "report_date",
"fieldtype": "Date",
@@ -47,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Report Date",
"length": 0,
"no_copy": 0,
@@ -56,6 +63,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
@@ -66,6 +74,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_4",
"fieldtype": "Column Break",
"hidden": 0,
@@ -73,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -80,6 +90,7 @@
"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,
@@ -90,6 +101,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "inspection_type",
"fieldtype": "Select",
"hidden": 0,
@@ -97,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Inspection Type",
"length": 0,
"no_copy": 0,
@@ -107,6 +120,7 @@
"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,
@@ -117,74 +131,25 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
- "fieldname": "purchase_receipt_no",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Purchase Receipt No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "purchase_receipt_no",
- "oldfieldtype": "Link",
- "options": "Purchase Receipt",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 1,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "delivery_note_no",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 0,
- "label": "Delivery Note No",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "delivery_note_no",
- "oldfieldtype": "Link",
- "options": "Delivery Note",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 1,
- "set_only_once": 0,
- "unique": 0
- },
- {
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "section_break_7",
- "fieldtype": "Section Break",
+ "columns": 0,
+ "fieldname": "reference_type",
+ "fieldtype": "Select",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Reference Type",
"length": 0,
"no_copy": 0,
+ "options": "\nPurchase Receipt\nPurchase Invoice\nDelivery Note\nSales Invoice",
"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,
@@ -195,6 +160,65 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
+ "depends_on": "",
+ "fieldname": "reference_name",
+ "fieldtype": "Dynamic Link",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 1,
+ "in_list_view": 1,
+ "in_standard_filter": 1,
+ "label": "Reference Name",
+ "length": 0,
+ "no_copy": 0,
+ "oldfieldname": "purchase_receipt_no",
+ "oldfieldtype": "Link",
+ "options": "reference_type",
+ "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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fieldname": "section_break_7",
+ "fieldtype": "Section Break",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 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,
+ "unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
"fieldname": "item_code",
"fieldtype": "Link",
"hidden": 0,
@@ -202,6 +226,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Item Code",
"length": 0,
"no_copy": 0,
@@ -212,6 +237,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
@@ -222,6 +248,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "item_serial_no",
"fieldtype": "Link",
"hidden": 0,
@@ -229,6 +256,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Serial No",
"length": 0,
"no_copy": 0,
@@ -239,6 +267,7 @@
"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,
@@ -249,6 +278,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "batch_no",
"fieldtype": "Link",
"hidden": 0,
@@ -256,6 +286,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Batch No",
"length": 0,
"no_copy": 0,
@@ -266,6 +297,7 @@
"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,
@@ -276,6 +308,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "sample_size",
"fieldtype": "Float",
"hidden": 0,
@@ -283,6 +316,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sample Size",
"length": 0,
"no_copy": 0,
@@ -292,6 +326,7 @@
"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,
@@ -302,6 +337,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break1",
"fieldtype": "Column Break",
"hidden": 0,
@@ -309,6 +345,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -316,6 +353,7 @@
"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,
@@ -327,6 +365,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "item_name",
"fieldtype": "Data",
"hidden": 0,
@@ -334,6 +373,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Name",
"length": 0,
"no_copy": 0,
@@ -342,6 +382,7 @@
"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,
@@ -352,6 +393,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "description",
"fieldtype": "Small Text",
"hidden": 0,
@@ -359,6 +401,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -368,6 +411,7 @@
"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,
@@ -379,6 +423,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "section_break_14",
"fieldtype": "Section Break",
"hidden": 0,
@@ -386,6 +431,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -393,6 +439,7 @@
"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,
@@ -403,6 +450,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "user",
"fieldname": "inspected_by",
"fieldtype": "Link",
@@ -411,6 +459,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Inspected By",
"length": 0,
"no_copy": 0,
@@ -421,6 +470,7 @@
"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,
@@ -431,6 +481,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "verified_by",
"fieldtype": "Data",
"hidden": 0,
@@ -438,6 +489,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Verified By",
"length": 0,
"no_copy": 0,
@@ -447,6 +499,7 @@
"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,
@@ -457,6 +510,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_17",
"fieldtype": "Column Break",
"hidden": 0,
@@ -464,6 +518,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -471,6 +526,7 @@
"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,
@@ -481,6 +537,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "remarks",
"fieldtype": "Text",
"hidden": 0,
@@ -488,6 +545,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Remarks",
"length": 0,
"no_copy": 1,
@@ -497,6 +555,7 @@
"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,
@@ -507,6 +566,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "amended_from",
"fieldtype": "Link",
"hidden": 0,
@@ -514,6 +574,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -524,6 +585,7 @@
"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,
@@ -534,6 +596,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "specification_details",
"fieldtype": "Section Break",
"hidden": 0,
@@ -541,6 +604,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -550,6 +614,7 @@
"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,
@@ -560,6 +625,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "get_specification_details",
"fieldtype": "Button",
"hidden": 0,
@@ -567,6 +633,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Get Specification Details",
"length": 0,
"no_copy": 0,
@@ -575,6 +642,7 @@
"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,
@@ -585,6 +653,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "readings",
"fieldtype": "Table",
"hidden": 0,
@@ -592,6 +661,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Readings",
"length": 0,
"no_copy": 0,
@@ -602,6 +672,7 @@
"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,
@@ -611,7 +682,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-search",
+ "icon": "fa fa-search",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -620,9 +691,9 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-07-31 11:42:40.498926",
+ "modified": "2016-12-15 14:53:04.785375",
"modified_by": "Administrator",
- "module": "Buying",
+ "module": "Stock",
"name": "Quality Inspection",
"owner": "Administrator",
"permissions": [
@@ -636,6 +707,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -650,7 +722,7 @@
"quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
- "search_fields": "item_code, report_date, purchase_receipt_no, delivery_note_no",
+ "search_fields": "item_code, report_date, reference_name",
"sort_order": "ASC",
"track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/buying/doctype/quality_inspection/quality_inspection.py b/erpnext/stock/doctype/quality_inspection/quality_inspection.py
similarity index 73%
rename from erpnext/buying/doctype/quality_inspection/quality_inspection.py
rename to erpnext/stock/doctype/quality_inspection/quality_inspection.py
index 8d85715..c3808f7 100644
--- a/erpnext/buying/doctype/quality_inspection/quality_inspection.py
+++ b/erpnext/stock/doctype/quality_inspection/quality_inspection.py
@@ -24,17 +24,20 @@
child.status = 'Accepted'
def on_submit(self):
- if self.purchase_receipt_no:
- frappe.db.sql("""update `tabPurchase Receipt Item` t1, `tabPurchase Receipt` t2
- set t1.qa_no = %s, t2.modified = %s
- where t1.parent = %s and t1.item_code = %s and t1.parent = t2.name""",
- (self.name, self.modified, self.purchase_receipt_no, self.item_code))
-
+ if self.reference_type and self.reference_name:
+ frappe.db.sql("""update `tab{doctype} Item` t1, `tab{doctype}` t2
+ set t1.quality_inspection = %s, t2.modified = %s
+ where t1.parent = %s and t1.item_code = %s and t1.parent = t2.name"""
+ .format(doctype=self.reference_type),
+ (self.name, self.modified, self.reference_name, self.item_code))
+
def on_cancel(self):
- if self.purchase_receipt_no:
- frappe.db.sql("""update `tabPurchase Receipt Item` set qa_no = '', modified=%s
- where qa_no = %s""", (self.modified, self.name))
-
+ if self.reference_type and self.reference_name:
+ frappe.db.sql("""update `tab{doctype} Item`
+ set quality_inspection = null, modified=%s
+ where quality_inspection = %s"""
+ .format(doctype=self.reference_type), (self.modified, self.name))
+
def item_query(doctype, txt, searchfield, start, page_len, filters):
if filters.get("from"):
from frappe.desk.reportview import get_match_cond
diff --git a/erpnext/buying/doctype/quality_inspection/test_quality_inspection.py b/erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
similarity index 100%
rename from erpnext/buying/doctype/quality_inspection/test_quality_inspection.py
rename to erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
diff --git a/erpnext/buying/doctype/quality_inspection_reading/README.md b/erpnext/stock/doctype/quality_inspection_reading/README.md
similarity index 100%
rename from erpnext/buying/doctype/quality_inspection_reading/README.md
rename to erpnext/stock/doctype/quality_inspection_reading/README.md
diff --git a/erpnext/buying/doctype/quality_inspection_reading/__init__.py b/erpnext/stock/doctype/quality_inspection_reading/__init__.py
similarity index 100%
rename from erpnext/buying/doctype/quality_inspection_reading/__init__.py
rename to erpnext/stock/doctype/quality_inspection_reading/__init__.py
diff --git a/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
similarity index 87%
rename from erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json
rename to erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
index 099c768..a3b43e9 100644
--- a/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json
+++ b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.json
@@ -14,6 +14,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "specification",
"fieldtype": "Data",
"hidden": 0,
@@ -21,6 +22,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Parameter",
"length": 0,
"no_copy": 0,
@@ -30,6 +32,7 @@
"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,
@@ -40,6 +43,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "value",
"fieldtype": "Data",
"hidden": 0,
@@ -47,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Acceptance Criteria",
"length": 0,
"no_copy": 0,
@@ -56,6 +61,7 @@
"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,
@@ -66,6 +72,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "reading_1",
"fieldtype": "Data",
"hidden": 0,
@@ -73,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Reading 1",
"length": 0,
"no_copy": 0,
@@ -82,6 +90,7 @@
"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,
@@ -92,6 +101,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "reading_2",
"fieldtype": "Data",
"hidden": 0,
@@ -99,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Reading 2",
"length": 0,
"no_copy": 0,
@@ -108,6 +119,7 @@
"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,
@@ -118,6 +130,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "reading_3",
"fieldtype": "Data",
"hidden": 0,
@@ -125,6 +138,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Reading 3",
"length": 0,
"no_copy": 0,
@@ -134,6 +148,7 @@
"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,
@@ -144,6 +159,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "reading_4",
"fieldtype": "Data",
"hidden": 0,
@@ -151,6 +167,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Reading 4",
"length": 0,
"no_copy": 0,
@@ -160,6 +177,7 @@
"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,
@@ -170,6 +188,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "reading_5",
"fieldtype": "Data",
"hidden": 0,
@@ -177,6 +196,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reading 5",
"length": 0,
"no_copy": 0,
@@ -186,6 +206,7 @@
"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,
@@ -196,6 +217,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "reading_6",
"fieldtype": "Data",
"hidden": 0,
@@ -203,6 +225,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reading 6",
"length": 0,
"no_copy": 0,
@@ -212,6 +235,7 @@
"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,
@@ -222,6 +246,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "reading_7",
"fieldtype": "Data",
"hidden": 0,
@@ -229,6 +254,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reading 7",
"length": 0,
"no_copy": 0,
@@ -238,6 +264,7 @@
"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,
@@ -248,6 +275,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "reading_8",
"fieldtype": "Data",
"hidden": 0,
@@ -255,6 +283,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reading 8",
"length": 0,
"no_copy": 0,
@@ -264,6 +293,7 @@
"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,
@@ -274,6 +304,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "reading_9",
"fieldtype": "Data",
"hidden": 0,
@@ -281,6 +312,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reading 9",
"length": 0,
"no_copy": 0,
@@ -290,6 +322,7 @@
"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,
@@ -300,6 +333,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "reading_10",
"fieldtype": "Data",
"hidden": 0,
@@ -307,6 +341,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reading 10",
"length": 0,
"no_copy": 0,
@@ -316,6 +351,7 @@
"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,
@@ -326,6 +362,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "Accepted",
"fieldname": "status",
"fieldtype": "Select",
@@ -334,6 +371,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Status",
"length": 0,
"no_copy": 0,
@@ -344,6 +382,7 @@
"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,
@@ -361,9 +400,9 @@
"issingle": 0,
"istable": 1,
"max_attachments": 0,
- "modified": "2016-07-11 03:28:06.296900",
+ "modified": "2016-11-16 03:55:50.046712",
"modified_by": "Administrator",
- "module": "Buying",
+ "module": "Stock",
"name": "Quality Inspection Reading",
"owner": "Administrator",
"permissions": [],
diff --git a/erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.py b/erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.py
similarity index 100%
rename from erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.py
rename to erpnext/stock/doctype/quality_inspection_reading/quality_inspection_reading.py
diff --git a/erpnext/stock/doctype/serial_no/serial_no.json b/erpnext/stock/doctype/serial_no/serial_no.json
index 0c6debd..c7ba178 100644
--- a/erpnext/stock/doctype/serial_no/serial_no.json
+++ b/erpnext/stock/doctype/serial_no/serial_no.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -51,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -76,6 +78,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Serial No",
"length": 0,
"no_copy": 1,
@@ -104,6 +107,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Item Code",
"length": 0,
"no_copy": 0,
@@ -134,6 +138,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Warehouse",
"length": 0,
"no_copy": 1,
@@ -163,6 +168,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -188,6 +194,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Name",
"length": 0,
"no_copy": 0,
@@ -214,6 +221,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -244,6 +252,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Group",
"length": 0,
"no_copy": 0,
@@ -273,6 +282,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Brand",
"length": 0,
"no_copy": 0,
@@ -302,6 +312,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase / Manufacture Details",
"length": 0,
"no_copy": 0,
@@ -328,6 +339,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -354,6 +366,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Creation Document Type",
"length": 0,
"no_copy": 1,
@@ -381,6 +394,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Creation Document No",
"length": 0,
"no_copy": 1,
@@ -408,6 +422,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Creation Date",
"length": 0,
"no_copy": 1,
@@ -436,6 +451,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Creation Time",
"length": 0,
"no_copy": 1,
@@ -462,6 +478,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Incoming Rate",
"length": 0,
"no_copy": 1,
@@ -491,6 +508,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -517,6 +535,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier",
"length": 0,
"no_copy": 1,
@@ -544,6 +563,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Name",
"length": 0,
"no_copy": 1,
@@ -570,6 +590,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Delivery Details",
"length": 0,
"no_copy": 0,
@@ -597,6 +618,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Delivery Document Type",
"length": 0,
"no_copy": 1,
@@ -624,6 +646,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Delivery Document No",
"length": 0,
"no_copy": 1,
@@ -651,6 +674,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Delivery Date",
"length": 0,
"no_copy": 1,
@@ -679,6 +703,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Delivery Time",
"length": 0,
"no_copy": 1,
@@ -705,6 +730,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Cancelled",
"length": 0,
"no_copy": 0,
@@ -734,6 +760,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -760,6 +787,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer",
"length": 0,
"no_copy": 1,
@@ -789,6 +817,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Name",
"length": 0,
"no_copy": 1,
@@ -817,6 +846,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Warranty / AMC Details",
"length": 0,
"no_copy": 0,
@@ -843,6 +873,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -869,6 +900,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Maintenance Status",
"length": 0,
"no_copy": 0,
@@ -899,6 +931,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Warranty Period (Days)",
"length": 0,
"no_copy": 0,
@@ -928,6 +961,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -954,6 +988,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Warranty Expiry Date",
"length": 0,
"no_copy": 0,
@@ -983,6 +1018,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "AMC Expiry Date",
"length": 0,
"no_copy": 0,
@@ -1012,6 +1048,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
@@ -1038,6 +1075,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Serial No Details",
"length": 0,
"no_copy": 0,
@@ -1064,6 +1102,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -1082,7 +1121,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-barcode",
+ "icon": "fa fa-barcode",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -1091,7 +1130,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 16:15:06.053242",
+ "modified": "2016-11-07 05:08:48.659186",
"modified_by": "Administrator",
"module": "Stock",
"name": "Serial No",
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.js b/erpnext/stock/doctype/stock_entry/stock_entry.js
index 561d20e..a5a6ced 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.js
@@ -431,9 +431,25 @@
uom: function(doc, cdt, cdn) {
var d = locals[cdt][cdn];
if(d.uom && d.item_code){
- var arg = {'item_code':d.item_code, 'uom':d.uom, 'qty':d.qty}
- return get_server_fields('get_uom_details', JSON.stringify(arg),
- 'items', doc, cdt, cdn, 1);
+ arg = {
+ 'item_code':d.item_code,
+ 'uom':d.uom,
+ 'qty':d.qty
+ };
+ return frappe.call({
+ doc: cur_frm.doc,
+ method: "get_uom_details",
+ args: arg,
+ callback: function(r) {
+ if(r.message) {
+ var d = locals[cdt][cdn];
+ $.each(r.message, function(k, v) {
+ d[k] = v;
+ });
+ refresh_field("items");
+ }
+ }
+ });
}
},
item_code: function(doc, cdt, cdn) {
@@ -486,7 +502,7 @@
'qty' : d.qty
};
frappe.call({
- method: "erpnext.stock.doctype.stock_entry.stock_entry.get_serial_no",
+ method: "erpnext.stock.get_item_details.get_serial_no",
args: {"args": args},
callback: function(r) {
if (!r.exe){
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index 8b06869..ccf28fd 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -52,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Title",
"length": 0,
"no_copy": 1,
@@ -79,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -109,6 +112,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Purpose",
"length": 0,
"no_copy": 0,
@@ -138,6 +142,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -168,6 +173,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Production Order",
"length": 0,
"no_copy": 0,
@@ -198,6 +204,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Order",
"length": 0,
"no_copy": 0,
@@ -227,6 +234,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Delivery Note No",
"length": 0,
"no_copy": 1,
@@ -257,6 +265,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Invoice No",
"length": 0,
"no_copy": 1,
@@ -285,6 +294,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Purchase Receipt No",
"length": 0,
"no_copy": 1,
@@ -315,6 +325,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "From BOM",
"length": 0,
"no_copy": 0,
@@ -342,6 +353,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -371,6 +383,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Posting Date",
"length": 0,
"no_copy": 1,
@@ -399,6 +412,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Posting Time",
"length": 0,
"no_copy": 1,
@@ -428,6 +442,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
@@ -455,6 +470,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "BOM No",
"length": 0,
"no_copy": 0,
@@ -484,6 +500,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "For Quantity",
"length": 0,
"no_copy": 0,
@@ -512,6 +529,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -540,6 +558,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Use Multi-Level BOM",
"length": 0,
"no_copy": 0,
@@ -567,6 +586,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Get Items",
"length": 0,
"no_copy": 0,
@@ -594,6 +614,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -620,6 +641,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Default Source Warehouse",
"length": 0,
"no_copy": 1,
@@ -649,6 +671,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -674,6 +697,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Default Target Warehouse",
"length": 0,
"no_copy": 1,
@@ -703,6 +727,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"options": "Simple",
@@ -729,6 +754,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -759,6 +785,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Update Rate and Availability",
"length": 0,
"no_copy": 0,
@@ -787,6 +814,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -813,6 +841,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Incoming Value",
"length": 0,
"no_copy": 0,
@@ -841,6 +870,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -867,6 +897,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Outgoing Value",
"length": 0,
"no_copy": 0,
@@ -895,6 +926,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Value Difference (Out - In)",
"length": 0,
"no_copy": 0,
@@ -924,6 +956,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Costs",
"length": 0,
"no_copy": 0,
@@ -951,6 +984,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Additional Costs",
"length": 0,
"no_copy": 0,
@@ -979,6 +1013,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Additional Costs",
"length": 0,
"no_copy": 0,
@@ -1008,6 +1043,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer or Supplier Details",
"length": 0,
"no_copy": 0,
@@ -1035,6 +1071,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier",
"length": 0,
"no_copy": 1,
@@ -1065,6 +1102,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Name",
"length": 0,
"no_copy": 1,
@@ -1094,6 +1132,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Address",
"length": 0,
"no_copy": 1,
@@ -1122,6 +1161,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1149,6 +1189,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer",
"length": 0,
"no_copy": 1,
@@ -1179,6 +1220,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Name",
"length": 0,
"no_copy": 1,
@@ -1208,6 +1250,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Address",
"length": 0,
"no_copy": 1,
@@ -1236,6 +1279,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Printing Settings",
"length": 0,
"no_copy": 0,
@@ -1263,6 +1307,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Print Heading",
"length": 0,
"no_copy": 0,
@@ -1292,6 +1337,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Letter Head",
"length": 0,
"no_copy": 0,
@@ -1320,6 +1366,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
@@ -1347,6 +1394,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -1375,6 +1423,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Remarks",
"length": 0,
"no_copy": 1,
@@ -1403,6 +1452,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1431,6 +1481,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Total Amount",
"length": 0,
"no_copy": 0,
@@ -1458,6 +1509,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -1487,6 +1539,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Credit Note",
"length": 0,
"no_copy": 0,
@@ -1506,7 +1559,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-file-text",
+ "icon": "fa fa-file-text",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -1515,7 +1568,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 16:15:35.929840",
+ "modified": "2016-11-07 05:08:23.746175",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Entry",
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.py b/erpnext/stock/doctype/stock_entry/stock_entry.py
index 65b9d26..c5a03e6 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.py
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.py
@@ -8,7 +8,7 @@
from frappe.utils import cstr, cint, flt, comma_or, getdate, nowdate, formatdate, format_time
from erpnext.stock.utils import get_incoming_rate
from erpnext.stock.stock_ledger import get_previous_sle, NegativeStockError
-from erpnext.stock.get_item_details import get_bin_details, get_default_cost_center, get_conversion_factor, process_args, get_serial_nos_by_fifo
+from erpnext.stock.get_item_details import get_bin_details, get_default_cost_center, get_conversion_factor
from erpnext.manufacturing.doctype.bom.bom import validate_bom_no
import json
@@ -867,17 +867,4 @@
"basic_rate" : get_incoming_rate(args)
}
- return ret
-
-@frappe.whitelist()
-def get_serial_no(args):
- if isinstance(args, basestring):
- args = json.loads(args)
- args = frappe._dict(args)
-
- if args.get('warehouse'):
- if frappe.get_value('Item', {'item_code': args.item_code}, "has_serial_no") == 1:
- args = json.dumps({"item_code": args.get('item_code'),"warehouse": args.get('warehouse'),"qty": args.get('qty')})
- args = process_args(args)
- serial_no = get_serial_nos_by_fifo(args)
- return serial_no
\ No newline at end of file
+ return ret
\ No newline at end of file
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry_list.js b/erpnext/stock/doctype/stock_entry/stock_entry_list.js
index 7f1a751..0e5aeb7 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry_list.js
+++ b/erpnext/stock/doctype/stock_entry/stock_entry_list.js
@@ -9,7 +9,7 @@
data-filter="from_warehouse,=,'+doc.from_warehouse+'">'+doc.from_warehouse+' </span>';
}
if(doc.from_warehouse || doc.to_warehouse) {
- html += '<i class="octicon octicon-arrow-right text-muted"></i> ';
+ html += '<i class="octicon octfa fa-arrow-right text-muted"></i> ';
}
if(doc.to_warehouse) {
html += '<span class="filterable h6"\
diff --git a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
index 9005abb..ed1843e 100644
--- a/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
+++ b/erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.json
@@ -420,7 +420,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
- "columns": 3,
+ "columns": 1,
"fieldname": "qty",
"fieldtype": "Float",
"hidden": 0,
@@ -448,14 +448,14 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
- "columns": 0,
+ "columns": 2,
"fieldname": "basic_rate",
"fieldtype": "Currency",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
- "in_list_view": 0,
+ "in_list_view": 1,
"label": "Basic Rate (as per Stock UOM)",
"length": 0,
"no_copy": 0,
diff --git a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
index d27f629..f5aced3 100644
--- a/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
+++ b/erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
@@ -24,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Item Code",
"length": 0,
"no_copy": 0,
@@ -55,6 +56,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Serial No",
"length": 0,
"no_copy": 0,
@@ -83,6 +85,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Batch No",
"length": 0,
"no_copy": 0,
@@ -111,6 +114,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Warehouse",
"length": 0,
"no_copy": 0,
@@ -142,6 +146,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Posting Date",
"length": 0,
"no_copy": 0,
@@ -172,6 +177,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Posting Time",
"length": 0,
"no_copy": 0,
@@ -202,6 +208,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Voucher Type",
"length": 0,
"no_copy": 0,
@@ -233,6 +240,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Voucher No",
"length": 0,
"no_copy": 0,
@@ -264,6 +272,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Voucher Detail No",
"length": 0,
"no_copy": 0,
@@ -294,6 +303,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Actual Quantity",
"length": 0,
"no_copy": 0,
@@ -324,6 +334,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Incoming Rate",
"length": 0,
"no_copy": 0,
@@ -353,6 +364,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Outgoing Rate",
"length": 0,
"no_copy": 0,
@@ -381,6 +393,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Stock UOM",
"length": 0,
"no_copy": 0,
@@ -412,6 +425,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Actual Qty After Transaction",
"length": 0,
"no_copy": 0,
@@ -442,6 +456,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Valuation Rate",
"length": 0,
"no_copy": 0,
@@ -473,6 +488,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Stock Value",
"length": 0,
"no_copy": 0,
@@ -502,6 +518,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Stock Value Difference",
"length": 0,
"no_copy": 0,
@@ -529,6 +546,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Stock Queue (FIFO)",
"length": 0,
"no_copy": 0,
@@ -557,6 +575,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -584,6 +603,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -615,6 +635,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Fiscal Year",
"length": 0,
"no_copy": 0,
@@ -645,6 +666,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Cancelled",
"length": 0,
"no_copy": 0,
@@ -663,7 +685,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-list",
+ "icon": "fa fa-list",
"idx": 1,
"image_view": 0,
"in_create": 1,
@@ -672,7 +694,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-27 16:31:36.294708",
+ "modified": "2016-12-15 14:45:07.733480",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Ledger Entry",
@@ -706,27 +728,6 @@
"create": 0,
"delete": 0,
"email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "is_custom": 0,
- "permlevel": 0,
- "print": 0,
- "read": 1,
- "report": 0,
- "role": "Item Manager",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
- "write": 0
- },
- {
- "amend": 0,
- "apply_user_permissions": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
"export": 1,
"if_owner": 0,
"import": 0,
diff --git a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
index a547f6b..9d66d4d 100644
--- a/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
+++ b/erpnext/stock/doctype/stock_reconciliation/stock_reconciliation.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -52,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Posting Date",
"length": 0,
"no_copy": 0,
@@ -80,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Posting Time",
"length": 0,
"no_copy": 0,
@@ -108,6 +111,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -133,6 +137,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -160,6 +165,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -187,6 +193,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -213,6 +220,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Items",
"length": 0,
"no_copy": 0,
@@ -241,6 +249,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -268,6 +277,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Difference Account",
"length": 0,
"no_copy": 0,
@@ -296,6 +306,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Cost Center",
"length": 0,
"no_copy": 0,
@@ -323,6 +334,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reconciliation JSON",
"length": 0,
"no_copy": 1,
@@ -349,6 +361,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -375,6 +388,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Difference Amount",
"length": 0,
"no_copy": 0,
@@ -393,7 +407,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-upload-alt",
+ "icon": "fa fa-upload-alt",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -403,7 +417,7 @@
"istable": 0,
"max_attachments": 1,
"menu_index": 0,
- "modified": "2016-11-03 16:15:55.403637",
+ "modified": "2016-11-07 05:59:26.309341",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Reconciliation",
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.json b/erpnext/stock/doctype/stock_settings/stock_settings.json
index 4a6e6e9..6501682 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.json
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.json
@@ -506,7 +506,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-cog",
+ "icon": "fa fa-cog",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/stock/doctype/stock_settings/stock_settings.py b/erpnext/stock/doctype/stock_settings/stock_settings.py
index 7c67a65..68d64a2 100644
--- a/erpnext/stock/doctype/stock_settings/stock_settings.py
+++ b/erpnext/stock/doctype/stock_settings/stock_settings.py
@@ -10,7 +10,7 @@
class StockSettings(Document):
def validate(self):
- for key in ["item_naming_by", "item_group", "stock_uom", "allow_negative_stock"]:
+ for key in ["item_naming_by", "item_group", "stock_uom", "allow_negative_stock", "default_warehouse"]:
frappe.db.set_default(key, self.get(key, ""))
from erpnext.setup.doctype.naming_series.naming_series import set_by_naming_series
diff --git a/erpnext/stock/doctype/warehouse/warehouse.js b/erpnext/stock/doctype/warehouse/warehouse.js
index 8b1b679..8a9ecbd 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.js
+++ b/erpnext/stock/doctype/warehouse/warehouse.js
@@ -12,7 +12,7 @@
if (cint(frm.doc.is_group) == 1) {
frm.add_custom_button(__('Group to Non-Group'),
- function() { convert_to_group_or_ledger(frm); }, 'icon-retweet', 'btn-default')
+ function() { convert_to_group_or_ledger(frm); }, 'fa fa-retweet', 'btn-default')
} else if (cint(frm.doc.is_group) == 0) {
if(frm.doc.__onload && frm.doc.__onload.account) {
frm.add_custom_button(__("General Ledger"), function() {
@@ -25,7 +25,7 @@
}
frm.add_custom_button(__('Non-Group to Group'),
- function() { convert_to_group_or_ledger(frm); }, 'icon-retweet', 'btn-default')
+ function() { convert_to_group_or_ledger(frm); }, 'fa fa-retweet', 'btn-default')
}
cur_frm.toggle_enable(['is_group', 'company'], false);
diff --git a/erpnext/stock/doctype/warehouse/warehouse.json b/erpnext/stock/doctype/warehouse/warehouse.json
index a807e0b..a7556bd 100644
--- a/erpnext/stock/doctype/warehouse/warehouse.json
+++ b/erpnext/stock/doctype/warehouse/warehouse.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Warehouse Detail",
"length": 0,
"no_copy": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Warehouse Name",
"length": 0,
"no_copy": 0,
@@ -79,6 +81,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Is Group",
"length": 0,
"no_copy": 0,
@@ -107,6 +110,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -136,6 +140,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Disabled",
"length": 0,
"no_copy": 0,
@@ -162,6 +167,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -190,6 +196,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Parent Account",
"length": 0,
"no_copy": 0,
@@ -218,6 +225,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Warehouse Contact Info",
"length": 0,
"no_copy": 0,
@@ -244,6 +252,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Email Id",
"length": 0,
"no_copy": 0,
@@ -272,6 +281,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Phone No",
"length": 0,
"no_copy": 0,
@@ -301,6 +311,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No",
"length": 0,
"no_copy": 0,
@@ -330,6 +341,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -356,6 +368,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address Line 1",
"length": 0,
"no_copy": 0,
@@ -384,6 +397,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address Line 2",
"length": 0,
"no_copy": 0,
@@ -412,6 +426,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "City",
"length": 0,
"no_copy": 0,
@@ -440,6 +455,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "State",
"length": 0,
"no_copy": 0,
@@ -468,6 +484,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "PIN",
"length": 0,
"no_copy": 0,
@@ -496,6 +513,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Tree Details",
"length": 0,
"no_copy": 0,
@@ -523,6 +541,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Parent Warehouse",
"length": 0,
"no_copy": 0,
@@ -551,6 +570,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "lft",
"length": 0,
"no_copy": 0,
@@ -578,6 +598,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "rgt",
"length": 0,
"no_copy": 0,
@@ -605,6 +626,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Old Parent",
"length": 0,
"no_copy": 0,
@@ -624,7 +646,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-building",
+ "icon": "fa fa-building",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -633,7 +655,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 16:16:14.242805",
+ "modified": "2016-11-07 05:06:39.128312",
"modified_by": "Administrator",
"module": "Stock",
"name": "Warehouse",
diff --git a/erpnext/stock/get_item_details.py b/erpnext/stock/get_item_details.py
index 98102e6..7bcad08 100644
--- a/erpnext/stock/get_item_details.py
+++ b/erpnext/stock/get_item_details.py
@@ -43,7 +43,7 @@
get_party_item_code(args, item_doc, out)
if out.get("warehouse"):
- out.update(get_bin_details(args.item_code, out.warehouse))
+ out.update(get_bin_details(args.item_code, out.warehouse))
if frappe.db.exists("Product Bundle", args.item_code):
valuation_rate = 0.0
@@ -74,8 +74,7 @@
out.update(get_pricing_rule_for_item(args))
if args.get("doctype") in ("Sales Invoice", "Delivery Note"):
- if item_doc.has_serial_no == 1 and not args.serial_no:
- out.serial_no = get_serial_nos_by_fifo(args)
+ out.serial_no = get_serial_no(out)
if args.transaction_date and item.lead_time_days:
out.schedule_date = out.lead_time_date = add_days(args.transaction_date,
@@ -375,8 +374,21 @@
@frappe.whitelist()
def get_bin_details(item_code, warehouse):
return frappe.db.get_value("Bin", {"item_code": item_code, "warehouse": warehouse},
- ["projected_qty", "actual_qty"], as_dict=True) \
- or {"projected_qty": 0, "actual_qty": 0}
+ ["projected_qty", "actual_qty"], as_dict=True) \
+ or {"projected_qty": 0, "actual_qty": 0}
+
+@frappe.whitelist()
+def get_serial_no_details(item_code, warehouse, qty, serial_no):
+ args = frappe._dict({"item_code":item_code, "warehouse":warehouse, "qty":qty, "serial_no":serial_no})
+ serial_no = get_serial_no(args)
+ return {'serial_no': serial_no}
+
+@frappe.whitelist()
+def get_bin_details_and_serial_nos(item_code, warehouse, qty, serial_no):
+ bin_details_and_serial_nos = {}
+ bin_details_and_serial_nos.update(get_bin_details(item_code, warehouse))
+ bin_details_and_serial_nos.update(get_serial_no_details(item_code, warehouse, qty, serial_no))
+ return bin_details_and_serial_nos
@frappe.whitelist()
def get_batch_qty(batch_no,warehouse,item_code):
@@ -469,7 +481,9 @@
if (not plc_conversion_rate) or (price_list_currency and args.price_list_currency \
and price_list_currency != args.price_list_currency):
- plc_conversion_rate = get_exchange_rate(price_list_currency, args.currency) or plc_conversion_rate
+ # cksgb 19/09/2016: added args.transaction_date as posting_date argument for get_exchange_rate
+ plc_conversion_rate = get_exchange_rate(price_list_currency, args.currency,
+ args.transaction_date) or plc_conversion_rate
return frappe._dict({
"price_list_currency": price_list_currency,
@@ -512,3 +526,16 @@
return out
+@frappe.whitelist()
+def get_serial_no(args):
+ if isinstance(args, basestring):
+ args = json.loads(args)
+ args = frappe._dict(args)
+
+ if args.get('warehouse') and args.get('qty') and args.get('item_code'):
+
+ if frappe.get_value('Item', {'item_code': args.item_code}, "has_serial_no") == 1:
+ args = json.dumps({"item_code": args.get('item_code'),"warehouse": args.get('warehouse'),"qty": args.get('qty')})
+ args = process_args(args)
+ serial_no = get_serial_nos_by_fifo(args)
+ return serial_no
diff --git a/erpnext/stock/page/stock_analytics/stock_analytics.json b/erpnext/stock/page/stock_analytics/stock_analytics.json
index 3b8380a..90e9f2e 100644
--- a/erpnext/stock/page/stock_analytics/stock_analytics.json
+++ b/erpnext/stock/page/stock_analytics/stock_analytics.json
@@ -2,7 +2,7 @@
"creation": "2012-09-21 20:15:14.000000",
"docstatus": 0,
"doctype": "Page",
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
"idx": 1,
"modified": "2013-07-11 14:44:10.000000",
"modified_by": "Administrator",
diff --git a/erpnext/stock/page/stock_balance/stock_balance.js b/erpnext/stock/page/stock_balance/stock_balance.js
index 9494045..3cf93fa 100644
--- a/erpnext/stock/page/stock_balance/stock_balance.js
+++ b/erpnext/stock/page/stock_balance/stock_balance.js
@@ -28,6 +28,17 @@
}
});
+ page.item_group_field = page.add_field({
+ fieldname: 'item_group',
+ label: __('Item Group'),
+ fieldtype:'Link',
+ options:'Item Group',
+ change: function() {
+ page.item_dashboard.start = 0;
+ page.item_dashboard.refresh();
+ }
+ });
+
page.sort_selector = new frappe.ui.SortSelector({
parent: page.wrapper.find('.page-form'),
args: {
@@ -58,6 +69,7 @@
page.item_dashboard.before_refresh = function() {
this.item_code = page.item_field.get_value();
this.warehouse = page.warehouse_field.get_value();
+ this.item_group = page.item_group_field.get_value();
}
page.item_dashboard.refresh();
diff --git a/erpnext/stock/report/item_shortage_report/item_shortage_report.json b/erpnext/stock/report/item_shortage_report/item_shortage_report.json
index 3abdead..3bbc0f6 100644
--- a/erpnext/stock/report/item_shortage_report/item_shortage_report.json
+++ b/erpnext/stock/report/item_shortage_report/item_shortage_report.json
@@ -13,7 +13,8 @@
"module": "Stock",
"name": "Item Shortage Report",
"owner": "Administrator",
+ "query": "SELECT bin.warehouse as \"Warehouse:Link/Warehouse:150\",\n\tbin.item_code as \"Item Code:Link/Item:100\",\n\tbin.actual_qty as \"Actual Quantity:Float:120\",\n\tbin.ordered_qty as \"Ordered Quantity:Float:120\",\n\tbin.planned_qty as \"Planned Quantity:Float:120\",\n\tbin.reserved_qty as \"Reserved Quantity:Float:120\",\n\tbin.projected_qty as \"Project Quantity:Float:120\",\n\titem.item_name as \"Item Name:Data:150\",\n\titem.description as \"Description::200\"\nFROM tabBin as bin\nINNER JOIN tabItem as item\nON bin.item_code=item.name\nWHERE bin.projected_qty<0\nORDER BY bin.projected_qty;",
"ref_doctype": "Bin",
"report_name": "Item Shortage Report",
- "report_type": "Report Builder"
+ "report_type": "Query Report"
}
\ No newline at end of file
diff --git a/erpnext/support/doctype/issue/issue.js b/erpnext/support/doctype/issue/issue.js
index 21ef5b8..2bee422 100644
--- a/erpnext/support/doctype/issue/issue.js
+++ b/erpnext/support/doctype/issue/issue.js
@@ -15,5 +15,21 @@
frm.save();
});
}
+ },
+
+ timeline_refresh: function(frm) {
+ // create button for "Add to Knowledge Base"
+ if(frappe.model.can_create('Help Article')) {
+ $('<button class="btn btn-xs btn-default btn-add-to-kb pull-right" style="margin-top: -2px">'+
+ __('Add to Knowledge Base') + '</button>')
+ .appendTo(frm.timeline.wrapper.find('.comment-header'))
+ .on('click', function() {
+ var content = $(this).parents('.timeline-item:first').find('.timeline-item-content').html();
+ var doc = frappe.model.get_new_doc('Help Article');
+ doc.title = frm.doc.subject;
+ doc.content = content;
+ frappe.set_route('Form', 'Help Article', doc.name);
+ });
+ }
}
});
diff --git a/erpnext/support/doctype/issue/issue.json b/erpnext/support/doctype/issue/issue.json
index b922dd4..8994ef8 100644
--- a/erpnext/support/doctype/issue/issue.json
+++ b/erpnext/support/doctype/issue/issue.json
@@ -9,11 +9,14 @@
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "subject_section",
"fieldtype": "Section Break",
"hidden": 0,
@@ -21,14 +24,16 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Subject",
"length": 0,
"no_copy": 0,
- "options": "icon-flag",
+ "options": "fa fa-flag",
"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,
@@ -39,6 +44,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "naming_series",
"fieldtype": "Select",
"hidden": 0,
@@ -46,6 +52,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -54,6 +61,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -64,6 +72,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"fieldname": "subject",
"fieldtype": "Data",
"hidden": 0,
@@ -71,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Subject",
"length": 0,
"no_copy": 0,
@@ -78,6 +88,7 @@
"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,
@@ -88,6 +99,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"fieldname": "mins_to_first_response",
"fieldtype": "Float",
"hidden": 0,
@@ -95,6 +107,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mins to First Response",
"length": 0,
"no_copy": 0,
@@ -103,6 +116,7 @@
"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,
@@ -113,6 +127,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "cb00",
"fieldtype": "Column Break",
"hidden": 0,
@@ -120,12 +135,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -136,6 +153,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "Open",
"fieldname": "status",
"fieldtype": "Select",
@@ -144,6 +162,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -154,6 +173,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -164,6 +184,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:doc.__islocal",
"fieldname": "raised_by",
"fieldtype": "Data",
@@ -172,6 +193,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Raised By (Email)",
"length": 0,
"no_copy": 0,
@@ -182,6 +204,7 @@
"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,
@@ -192,6 +215,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "customer",
"fieldtype": "Link",
"hidden": 0,
@@ -199,6 +223,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -209,6 +234,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -219,6 +245,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 1,
+ "columns": 0,
"fieldname": "section_break_7",
"fieldtype": "Section Break",
"hidden": 0,
@@ -226,6 +253,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Details",
"length": 0,
"no_copy": 0,
@@ -234,6 +262,7 @@
"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,
@@ -244,6 +273,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"depends_on": "",
"fieldname": "description",
"fieldtype": "Text",
@@ -252,6 +282,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -261,6 +292,7 @@
"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,
@@ -271,6 +303,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_9",
"fieldtype": "Column Break",
"hidden": 0,
@@ -278,6 +311,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -285,6 +319,7 @@
"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,
@@ -295,6 +330,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "resolution_date",
"fieldtype": "Datetime",
@@ -303,6 +339,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Resolution Date",
"length": 0,
"no_copy": 1,
@@ -312,6 +349,7 @@
"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,
@@ -322,6 +360,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "first_responded_on",
"fieldtype": "Datetime",
"hidden": 0,
@@ -329,6 +368,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "First Responded On",
"length": 0,
"no_copy": 0,
@@ -336,6 +376,7 @@
"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,
@@ -346,6 +387,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 1,
+ "columns": 0,
"fieldname": "additional_info",
"fieldtype": "Section Break",
"hidden": 0,
@@ -353,14 +395,16 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
- "options": "icon-pushpin",
+ "options": "fa fa-pushpin",
"permlevel": 0,
"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,
@@ -371,6 +415,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "lead",
"fieldtype": "Link",
"hidden": 0,
@@ -378,6 +423,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Lead",
"length": 0,
"no_copy": 0,
@@ -386,6 +432,7 @@
"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,
@@ -396,6 +443,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "contact",
"fieldtype": "Link",
"hidden": 0,
@@ -403,6 +451,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
@@ -411,6 +460,7 @@
"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,
@@ -421,6 +471,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break_16",
"fieldtype": "Column Break",
"hidden": 0,
@@ -428,6 +479,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -435,6 +487,7 @@
"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,
@@ -445,6 +498,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"fieldname": "customer_name",
"fieldtype": "Data",
"hidden": 0,
@@ -452,6 +506,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Name",
"length": 0,
"no_copy": 0,
@@ -461,6 +516,7 @@
"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,
@@ -471,6 +527,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "project",
"fieldtype": "Link",
"hidden": 0,
@@ -478,6 +535,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Project",
"length": 0,
"no_copy": 0,
@@ -487,6 +545,7 @@
"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,
@@ -497,6 +556,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 1,
+ "columns": 0,
"fieldname": "section_break_19",
"fieldtype": "Section Break",
"hidden": 0,
@@ -504,6 +564,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Resolution",
"length": 0,
"no_copy": 0,
@@ -512,6 +573,7 @@
"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,
@@ -522,6 +584,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "resolution_details",
"fieldtype": "Small Text",
@@ -530,6 +593,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Resolution Details",
"length": 0,
"no_copy": 1,
@@ -539,6 +603,7 @@
"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,
@@ -549,6 +614,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "eval:!doc.__islocal",
"fieldname": "column_break1",
"fieldtype": "Column Break",
@@ -557,6 +623,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -564,6 +631,7 @@
"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,
@@ -574,6 +642,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "Today",
"fieldname": "opening_date",
"fieldtype": "Date",
@@ -582,6 +651,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Opening Date",
"length": 0,
"no_copy": 1,
@@ -591,6 +661,7 @@
"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,
@@ -601,6 +672,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "opening_time",
"fieldtype": "Time",
"hidden": 0,
@@ -608,6 +680,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Opening Time",
"length": 0,
"no_copy": 1,
@@ -617,6 +690,7 @@
"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,
@@ -627,6 +701,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "company",
"fieldtype": "Link",
"hidden": 0,
@@ -634,6 +709,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -642,6 +718,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -652,6 +729,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "content_type",
"fieldtype": "Data",
"hidden": 1,
@@ -659,6 +737,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Content Type",
"length": 0,
"no_copy": 0,
@@ -666,6 +745,7 @@
"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,
@@ -676,6 +756,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "attachment",
"fieldtype": "Attach",
"hidden": 1,
@@ -683,6 +764,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Attachment",
"length": 0,
"no_copy": 0,
@@ -691,6 +773,7 @@
"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,
@@ -700,7 +783,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-ticket",
+ "icon": "fa fa-ticket",
"idx": 7,
"image_view": 0,
"in_create": 0,
@@ -709,7 +792,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-06-14 16:29:21.439025",
+ "modified": "2016-11-07 05:30:07.182340",
"modified_by": "Administrator",
"module": "Support",
"name": "Issue",
@@ -725,6 +808,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
diff --git a/erpnext/support/doctype/warranty_claim/warranty_claim.json b/erpnext/support/doctype/warranty_claim/warranty_claim.json
index 08a91c1..fde52ea 100644
--- a/erpnext/support/doctype/warranty_claim/warranty_claim.json
+++ b/erpnext/support/doctype/warranty_claim/warranty_claim.json
@@ -23,6 +23,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Series",
"length": 0,
"no_copy": 1,
@@ -53,6 +54,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 1,
@@ -83,6 +85,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Issue Date",
"length": 0,
"no_copy": 0,
@@ -111,6 +114,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -139,6 +143,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Serial No",
"length": 0,
"no_copy": 0,
@@ -166,6 +171,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -195,6 +201,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -221,6 +228,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Issue",
"length": 0,
"no_copy": 1,
@@ -249,11 +257,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item and Warranty Details",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-ticket",
+ "options": "fa fa-ticket",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -277,6 +286,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Item Code",
"length": 0,
"no_copy": 0,
@@ -307,6 +317,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Item Name",
"length": 0,
"no_copy": 0,
@@ -336,6 +347,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Description",
"length": 0,
"no_copy": 0,
@@ -365,6 +377,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -392,6 +405,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Warranty / AMC Status",
"length": 0,
"no_copy": 0,
@@ -419,6 +433,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Warranty Expiry Date",
"length": 0,
"no_copy": 0,
@@ -445,6 +460,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "AMC Expiry Date",
"length": 0,
"no_copy": 0,
@@ -472,11 +488,12 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Resolution",
"length": 0,
"no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "icon-thumbs-up",
+ "options": "fa fa-thumbs-up",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -500,6 +517,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Resolution Date",
"length": 0,
"no_copy": 1,
@@ -528,6 +546,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Resolved By",
"length": 0,
"no_copy": 1,
@@ -557,6 +576,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Resolution Details",
"length": 0,
"no_copy": 1,
@@ -586,10 +606,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Details",
"length": 0,
"no_copy": 0,
- "options": "icon-bullhorn",
+ "options": "fa fa-bullhorn",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -614,6 +635,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Name",
"length": 0,
"no_copy": 0,
@@ -640,6 +662,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Person",
"length": 0,
"no_copy": 0,
@@ -668,6 +691,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact",
"length": 0,
"no_copy": 0,
@@ -695,6 +719,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No",
"length": 0,
"no_copy": 0,
@@ -722,6 +747,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Contact Email",
"length": 0,
"no_copy": 0,
@@ -750,6 +776,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Territory",
"length": 0,
"no_copy": 0,
@@ -781,6 +808,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Group",
"length": 0,
"no_copy": 0,
@@ -808,6 +836,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -834,6 +863,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Address",
"length": 0,
"no_copy": 0,
@@ -862,6 +892,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address",
"length": 0,
"no_copy": 0,
@@ -890,6 +921,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Service Address",
"length": 0,
"no_copy": 0,
@@ -918,10 +950,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -945,6 +978,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -974,6 +1008,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -1000,6 +1035,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Raised By",
"length": 0,
"no_copy": 0,
@@ -1028,6 +1064,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "From Company",
"length": 0,
"no_copy": 0,
@@ -1056,6 +1093,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Amended From",
"length": 0,
"no_copy": 1,
@@ -1077,7 +1115,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-bug",
+ "icon": "fa fa-bug",
"idx": 1,
"image_view": 0,
"in_create": 0,
@@ -1086,7 +1124,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-12-13 11:17:40.538428",
+ "modified": "2016-12-15 14:53:43.384773",
"modified_by": "Administrator",
"module": "Support",
"name": "Warranty Claim",
diff --git a/erpnext/support/page/support_analytics/support_analytics.js b/erpnext/support/page/support_analytics/support_analytics.js
index 79a7fd6..01b7b48 100644
--- a/erpnext/support/page/support_analytics/support_analytics.js
+++ b/erpnext/support/page/support_analytics/support_analytics.js
@@ -27,11 +27,11 @@
},
filters: [
- {fieldtype:"Select", label: __("Fiscal Year"), link:"Fiscal Year",
+ {fieldname: "fiscal_year", fieldtype:"Select", label: __("Fiscal Year"), link:"Fiscal Year",
default_value: __("Select Fiscal Year") + "..."},
- {fieldtype:"Date", label: __("From Date")},
- {fieldtype:"Date", label: __("To Date")},
- {fieldtype:"Select", label: __("Range"),
+ {fieldname: "from_date", fieldtype:"Date", label: __("From Date")},
+ {fieldname: "to_date", fieldtype:"Date", label: __("To Date")},
+ {fieldname: "range", fieldtype:"Select", label: __("Range"),
options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"], default_value: "Monthly"}
],
diff --git a/erpnext/support/page/support_analytics/support_analytics.json b/erpnext/support/page/support_analytics/support_analytics.json
index 3d8b486..93eb2d2 100644
--- a/erpnext/support/page/support_analytics/support_analytics.json
+++ b/erpnext/support/page/support_analytics/support_analytics.json
@@ -2,7 +2,7 @@
"creation": "2013-01-04 15:31:45.000000",
"docstatus": 0,
"doctype": "Page",
- "icon": "icon-bar-chart",
+ "icon": "fa fa-bar-chart",
"idx": 1,
"modified": "2013-07-11 14:44:24.000000",
"modified_by": "Administrator",
diff --git a/erpnext/support/web_form/issues/issues.json b/erpnext/support/web_form/issues/issues.json
index 4b7c70c..6474799 100644
--- a/erpnext/support/web_form/issues/issues.json
+++ b/erpnext/support/web_form/issues/issues.json
@@ -1,8 +1,12 @@
{
+ "accept_payment": 0,
"allow_comments": 1,
"allow_delete": 1,
"allow_edit": 1,
+ "allow_incomplete": 0,
"allow_multiple": 1,
+ "allow_print": 0,
+ "amount": 0.0,
"breadcrumbs": "[{\"title\":\"Issues\", \"name\":\"issues\"}]",
"creation": "2016-06-24 15:50:33.186483",
"doc_type": "Issue",
@@ -11,13 +15,16 @@
"idx": 0,
"is_standard": 1,
"login_required": 1,
- "modified": "2016-06-24 15:52:24.768558",
+ "max_attachment_size": 0,
+ "modified": "2016-12-07 04:26:13.917693",
"modified_by": "Administrator",
"module": "Support",
"name": "issues",
"owner": "Administrator",
"published": 1,
"route": "issues",
+ "show_sidebar": 1,
+ "sidebar_items": [],
"success_message": "",
"success_url": "/issues",
"title": "Issue",
@@ -27,6 +34,8 @@
"fieldtype": "Data",
"hidden": 0,
"label": "Subject",
+ "max_length": 0,
+ "max_value": 0,
"read_only": 0,
"reqd": 1
},
@@ -36,15 +45,30 @@
"fieldtype": "Select",
"hidden": 0,
"label": "Status",
+ "max_length": 0,
+ "max_value": 0,
"options": "Open\nReplied\nHold\nClosed",
"read_only": 1,
"reqd": 0
},
{
+ "fieldname": "customer",
+ "fieldtype": "Data",
+ "hidden": 0,
+ "label": "Customer",
+ "max_length": 0,
+ "max_value": 0,
+ "options": "Customer",
+ "read_only": 1,
+ "reqd": 0
+ },
+ {
"fieldname": "description",
"fieldtype": "Text",
"hidden": 0,
"label": "Description",
+ "max_length": 0,
+ "max_value": 0,
"read_only": 0,
"reqd": 0
},
@@ -53,6 +77,8 @@
"fieldtype": "Attach",
"hidden": 0,
"label": "Attachment",
+ "max_length": 0,
+ "max_value": 0,
"read_only": 0,
"reqd": 0
}
diff --git a/erpnext/templates/form_grid/includes/visible_cols.html b/erpnext/templates/form_grid/includes/visible_cols.html
index caa1366..3a0cc8d 100644
--- a/erpnext/templates/form_grid/includes/visible_cols.html
+++ b/erpnext/templates/form_grid/includes/visible_cols.html
@@ -2,7 +2,7 @@
{% var val = doc.get_formatted(df.fieldname);
if((df.fieldname !== "description" && df.fieldname !== "item_name") && val) { %}
<div class="row">
- <div class="col-xs-4 text-ellipsis">
+ <div class="col-xs-4 ellipsis">
<strong title="{%= __(df.label) %}">{%= __(df.label) %}:</strong>
</div>
<div class="col-xs-8">
diff --git a/erpnext/templates/generators/item_group.html b/erpnext/templates/generators/item_group.html
index 674143d..7dac218 100644
--- a/erpnext/templates/generators/item_group.html
+++ b/erpnext/templates/generators/item_group.html
@@ -5,7 +5,7 @@
<div class="page-breadcrumbs" data-html-block="breadcrumbs">
<ul class="breadcrumb">
<li>
- <span class="icon icon-angle-left"></span>
+ <span class="fa fa-angle-left"></span>
<a href="/me">My Account</a>
</li>
</ul>
diff --git a/erpnext/templates/generators/sales_partner.html b/erpnext/templates/generators/sales_partner.html
index 6da6ad0..39138d3 100644
--- a/erpnext/templates/generators/sales_partner.html
+++ b/erpnext/templates/generators/sales_partner.html
@@ -18,7 +18,7 @@
target="_blank">{{ partner_website }}</a></p>{%- endif %}
{% if partner_address -%}<p itemprop="address">{{ partner_address }}</p>{%- endif %}
{% if phone -%}<p itemprop="telephone">{{ phone }}</p>{%- endif %}
- {% if email -%}<p itemprop="email"><span class="icon-envelope"></span> {{ email }}</p>{%- endif %}
+ {% if email -%}<p itemprop="email"><span class="fa fa-envelope"></span> {{ email }}</p>{%- endif %}
</address>
</div>
<div class="col-md-8">
diff --git a/erpnext/templates/includes/issue_row.html b/erpnext/templates/includes/issue_row.html
index f19ea85..c0b0d2b 100644
--- a/erpnext/templates/includes/issue_row.html
+++ b/erpnext/templates/includes/issue_row.html
@@ -5,7 +5,7 @@
<span class="indicator {{ "red" if doc.status=="Open" else "darkgrey" }}">
{{ doc.name }}</span>
</div>
- <div class="col-xs-6 items-preview text-ellipsis">
+ <div class="col-xs-6 items-preview ellipsis">
{{ doc.subject }}</div>
<div class="col-xs-3 text-right small text-muted">
diff --git a/erpnext/templates/includes/product_page.js b/erpnext/templates/includes/product_page.js
index f4d9027..4b23d5e 100644
--- a/erpnext/templates/includes/product_page.js
+++ b/erpnext/templates/includes/product_page.js
@@ -12,17 +12,17 @@
item_code: get_item_code()
},
callback: function(r) {
- $(".item-cart").toggleClass("hide", !!!r.message.price);
+ $(".item-cart").toggleClass("hide", (!!!r.message.price || !!!r.message.stock));
if(r.message && r.message.price) {
$(".item-price")
.html(r.message.price.formatted_price + " per " + r.message.uom);
if(r.message.stock==0) {
- $(".item-stock").html("<div class='help'>Not in stock</div>");
+ $(".item-stock").html("<div style='color: red'>Not in stock</div>");
}
else if(r.message.stock==1) {
$(".item-stock").html("<div style='color: green'>\
- <i class='icon-check'></i> Available (in stock)</div>");
+ <i class='fa fa-check'></i> Available (in stock)</div>");
}
if(r.message.qty) {
diff --git a/erpnext/templates/includes/products_as_list.html b/erpnext/templates/includes/products_as_list.html
index b2069e4..20ca59d 100644
--- a/erpnext/templates/includes/products_as_list.html
+++ b/erpnext/templates/includes/products_as_list.html
@@ -6,12 +6,12 @@
{{ product_image_square(thumbnail or website_image) }}
</div>
<div class='col-xs-9 col-sm-10 text-left'>
- <div class="text-ellipsis product-text strong">{{ item_name }}</div>
+ <div class="ellipsis product-text strong">{{ item_name }}</div>
{% set website_description = website_description or description %}
{% if website_description != item_name %}
- <div class="text-ellipsis text-muted">{{ website_description or description }}</div>
+ <div class="ellipsis text-muted">{{ website_description or description }}</div>
{% elif item_code != item_name %}
- <div class="text-ellipsis text-muted">{{ _('Item Code') }}: {{ item_code }}</div>
+ <div class="ellipsis text-muted">{{ _('Item Code') }}: {{ item_code }}</div>
{% endif %}
</div>
</div>
diff --git a/erpnext/templates/includes/transaction_row.html b/erpnext/templates/includes/transaction_row.html
index f0fee97..10d7605 100644
--- a/erpnext/templates/includes/transaction_row.html
+++ b/erpnext/templates/includes/transaction_row.html
@@ -9,7 +9,7 @@
{{ frappe.utils.format_datetime(doc.modified, "medium") }}
</div>
</div>
- <div class="col-sm-4 items-preview text-ellipsis small">
+ <div class="col-sm-4 items-preview ellipsis small">
{{ doc.items_preview }}
</div>
<div class="col-sm-3 text-right bold">
diff --git a/erpnext/templates/pages/task_info.html b/erpnext/templates/pages/task_info.html
index 1d6574b..7cc5594 100644
--- a/erpnext/templates/pages/task_info.html
+++ b/erpnext/templates/pages/task_info.html
@@ -4,7 +4,7 @@
<div class="page-breadcrumbs" data-html-block="breadcrumbs">
<ul class="breadcrumb">
<li>
- <span class="icon icon-angle-left"></span>
+ <span class="fa fa-angle-left"></span>
<a href="/projects?project={{ doc.project }}">{{ doc.project }}</a>
</li>
</ul>
diff --git a/erpnext/templates/pages/timelog_info.html b/erpnext/templates/pages/timelog_info.html
index 76dbc32..8b2fa6a 100644
--- a/erpnext/templates/pages/timelog_info.html
+++ b/erpnext/templates/pages/timelog_info.html
@@ -1,12 +1,12 @@
{% extends "templates/web.html" %}
{% block title %} {{ doc.name }} {% endblock %}
{% block breadcrumbs %}
-<div class="page-breadcrumbs" data-html-block="breadcrumbs">
+<div class="page-breadcrumbs" data-html-block="breadcrumbs">
<ul class="breadcrumb">
<li>
- <span class="icon icon-angle-left"></span>
+ <span class="fa fa-angle-left"></span>
<a href="/projects?project={{ doc.project }}">{{ doc.project }}</a>
- </li>
+ </li>
</ul>
</div>
{% endblock %}
@@ -18,28 +18,28 @@
<div class="page-content-block">
<div class="row">
- <div class="col-sm-12" style="max-width: 500px;">
+ <div class="col-sm-12" style="max-width: 500px;">
<label for="project" class="control-label text-muted small">Project</label>
- <input type="text" class="form-control" name="project" readonly value= "{{ doc.project }}">
-
+ <input type="text" class="form-control" name="project" readonly value= "{{ doc.project }}">
+
<label for="activity_type" class="control-label text-muted small">Activity Type</label>
- <input type="text" class="form-control" name="activity_type" readonly value= "{{ doc.activity_type }}">
+ <input type="text" class="form-control" name="activity_type" readonly value= "{{ doc.activity_type }}">
<label for="task" class="control-label text-muted small">Task</label>
- <input type="text" class="form-control" name="task" readonly value= "{{ doc.task }}">
+ <input type="text" class="form-control" name="task" readonly value= "{{ doc.task }}">
<label for="from_time" class="control-label text-muted small">From Time</label>
- <input type="text" class="form-control" name="from_time" readonly value= "{{ doc.from_time }}">
-
+ <input type="text" class="form-control" name="from_time" readonly value= "{{ doc.from_time }}">
+
<label for="to_time" class="control-label text-muted small">To Time</label>
- <input type="text" class="form-control" name="to_time" readonly value= "{{ doc.to_time }}">
-
+ <input type="text" class="form-control" name="to_time" readonly value= "{{ doc.to_time }}">
+
<label for="to_time" class="control-label text-muted small">Hours</label>
<input type="text" class="form-control" name="Hours" readonly value= "{{ doc.hours }}">
<label for="status" class="control-label text-muted small">Status</label>
- <input type="text" class="form-control" name="status" readonly value= "{{ doc.status }}">
-
+ <input type="text" class="form-control" name="status" readonly value= "{{ doc.status }}">
+
<label for="Note" class="control-label text-muted small">Note</label>
<textarea class="form-control" name="Hours" readonly> {{ doc.note }} </textarea>
</div>
diff --git a/erpnext/translations/es-PE.csv b/erpnext/translations/es-PE.csv
index 38103c9..9f52df3 100644
--- a/erpnext/translations/es-PE.csv
+++ b/erpnext/translations/es-PE.csv
@@ -119,7 +119,7 @@
DocType: Account,Cost of Goods Sold,Costo de las Ventas
DocType: Journal Entry Account,Sales Order,Ordenes de Venta
DocType: Purchase Invoice Item,Quantity and Rate,Cantidad y Cambio
-DocType: BOM,Item Desription,Descripción del Artículo
+DocType: BOM,Item Description,Descripción del Artículo
DocType: Purchase Invoice,Supplier Name,Nombre del Proveedor
apps/erpnext/erpnext/stock/doctype/packing_slip/packing_slip.js +57,'To Case No.' cannot be less than 'From Case No.','Hasta Caso No.' no puede ser inferior a 'Desde el Caso No.'
DocType: Production Order,Not Started,Sin comenzar
diff --git a/erpnext/translations/zh-tw.csv b/erpnext/translations/zh-tw.csv
index 0f260fa..ca6566a 100644
--- a/erpnext/translations/zh-tw.csv
+++ b/erpnext/translations/zh-tw.csv
@@ -384,7 +384,7 @@
DocType: Delivery Note,% Installed,％已安裝
apps/erpnext/erpnext/public/js/setup_wizard.js +378,Classrooms/ Laboratories etc where lectures can be scheduled.,教室/實驗室等在那裡的演講可以預定。
apps/erpnext/erpnext/accounts/doctype/cost_center/cost_center.js +46,Please enter company name first,請先輸入公司名稱
-DocType: BOM,Item Desription,項目Desription
+DocType: BOM,Item Description,項目Description
DocType: Purchase Invoice,Supplier Name,供應商名稱
apps/erpnext/erpnext/setup/page/welcome_to_erpnext/welcome_to_erpnext.html +25,Read the ERPNext Manual,閱讀ERPNext手冊
DocType: Account,Is Group,是集團
diff --git a/erpnext/utilities/doctype/address/address.json b/erpnext/utilities/doctype/address/address.json
index 3dadbd8..8168b69 100644
--- a/erpnext/utilities/doctype/address/address.json
+++ b/erpnext/utilities/doctype/address/address.json
@@ -22,10 +22,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-map-marker",
+ "options": "fa fa-map-marker",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -50,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address Title",
"length": 0,
"no_copy": 0,
@@ -76,6 +78,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Address Type",
"length": 0,
"no_copy": 0,
@@ -103,6 +106,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address Line 1",
"length": 0,
"no_copy": 0,
@@ -129,6 +133,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Address Line 2",
"length": 0,
"no_copy": 0,
@@ -155,6 +160,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "City/Town",
"length": 0,
"no_copy": 0,
@@ -181,6 +187,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "County",
"length": 0,
"no_copy": 0,
@@ -208,6 +215,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "State",
"length": 0,
"no_copy": 0,
@@ -234,6 +242,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 1,
"label": "Country",
"length": 0,
"no_copy": 0,
@@ -261,6 +270,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Postal Code",
"length": 0,
"no_copy": 0,
@@ -287,6 +297,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
@@ -313,6 +324,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Email Id",
"length": 0,
"no_copy": 0,
@@ -339,6 +351,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Phone",
"length": 0,
"no_copy": 0,
@@ -365,6 +378,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Fax",
"length": 0,
"no_copy": 0,
@@ -393,6 +407,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Preferred Billing Address",
"length": 0,
"no_copy": 0,
@@ -421,6 +436,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Preferred Shipping Address",
"length": 0,
"no_copy": 0,
@@ -447,10 +463,11 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reference",
"length": 0,
"no_copy": 0,
- "options": "icon-pushpin",
+ "options": "fa fa-pushpin",
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
@@ -475,6 +492,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Your Company Address",
"length": 0,
"no_copy": 0,
@@ -503,6 +521,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Company",
"length": 0,
"no_copy": 0,
@@ -532,6 +551,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -560,6 +580,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Name",
"length": 0,
"no_copy": 0,
@@ -587,6 +608,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier",
"length": 0,
"no_copy": 0,
@@ -615,6 +637,7 @@
"ignore_xss_filter": 0,
"in_filter": 1,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Name",
"length": 0,
"no_copy": 0,
@@ -642,6 +665,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Partner",
"length": 0,
"no_copy": 0,
@@ -670,6 +694,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Lead",
"length": 0,
"no_copy": 0,
@@ -698,6 +723,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Lead Name",
"length": 0,
"no_copy": 0,
@@ -715,7 +741,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-map-marker",
+ "icon": "fa fa-map-marker",
"idx": 5,
"image_view": 0,
"in_create": 0,
@@ -724,7 +750,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-11-03 16:16:51.239867",
+ "modified": "2016-11-07 05:47:06.911933",
"modified_by": "Administrator",
"module": "Utilities",
"name": "Address",
diff --git a/erpnext/utilities/doctype/address_template/address_template.json b/erpnext/utilities/doctype/address_template/address_template.json
index 3e263be..6ff93d9 100644
--- a/erpnext/utilities/doctype/address_template/address_template.json
+++ b/erpnext/utilities/doctype/address_template/address_template.json
@@ -10,6 +10,7 @@
"doctype": "DocType",
"document_type": "Setup",
"editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
@@ -23,6 +24,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Country",
"length": 0,
"no_copy": 0,
@@ -31,6 +33,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 1,
@@ -50,6 +53,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 0,
"label": "Is Default",
"length": 0,
"no_copy": 0,
@@ -57,6 +61,7 @@
"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,
@@ -77,6 +82,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Template",
"length": 0,
"no_copy": 0,
@@ -84,6 +90,7 @@
"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,
@@ -93,7 +100,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-map-marker",
+ "icon": "fa fa-map-marker",
"idx": 0,
"image_view": 0,
"in_create": 0,
@@ -102,7 +109,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-09-15 05:42:59.542484",
+ "modified": "2016-11-07 05:47:11.633848",
"modified_by": "Administrator",
"module": "Utilities",
"name": "Address Template",
@@ -119,6 +126,7 @@
"export": 1,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 0,
"read": 1,
diff --git a/erpnext/utilities/doctype/contact/contact.json b/erpnext/utilities/doctype/contact/contact.json
index 486b93b..a183779 100644
--- a/erpnext/utilities/doctype/contact/contact.json
+++ b/erpnext/utilities/doctype/contact/contact.json
@@ -2,16 +2,20 @@
"allow_copy": 0,
"allow_import": 1,
"allow_rename": 1,
+ "beta": 0,
"creation": "2013-01-10 16:34:32",
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
+ "editable_grid": 0,
+ "engine": "InnoDB",
"fields": [
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "contact_section",
"fieldtype": "Section Break",
"hidden": 0,
@@ -19,14 +23,16 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "",
"length": 0,
"no_copy": 0,
- "options": "icon-user",
+ "options": "fa fa-user",
"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,
@@ -37,6 +43,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "first_name",
"fieldtype": "Data",
"hidden": 0,
@@ -44,6 +51,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "First Name",
"length": 0,
"no_copy": 0,
@@ -53,6 +61,7 @@
"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,
@@ -63,6 +72,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"fieldname": "last_name",
"fieldtype": "Data",
"hidden": 0,
@@ -70,6 +80,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Last Name",
"length": 0,
"no_copy": 0,
@@ -79,6 +90,7 @@
"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,
@@ -89,6 +101,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"fieldname": "email_id",
"fieldtype": "Data",
"hidden": 0,
@@ -96,6 +109,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Email Id",
"length": 0,
"no_copy": 0,
@@ -106,6 +120,7 @@
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 1,
@@ -116,6 +131,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "cb00",
"fieldtype": "Column Break",
"hidden": 0,
@@ -123,12 +139,14 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"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,
@@ -139,6 +157,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "Passive",
"fieldname": "status",
"fieldtype": "Select",
@@ -147,6 +166,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
+ "in_standard_filter": 1,
"label": "Status",
"length": 0,
"no_copy": 0,
@@ -155,6 +175,7 @@
"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,
@@ -165,6 +186,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"fieldname": "phone",
"fieldtype": "Data",
"hidden": 0,
@@ -172,6 +194,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Phone",
"length": 0,
"no_copy": 0,
@@ -181,6 +204,7 @@
"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,
@@ -191,6 +215,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "image",
"fieldtype": "Attach Image",
"hidden": 1,
@@ -198,6 +223,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
@@ -206,6 +232,7 @@
"print_hide": 1,
"print_hide_if_no_value": 0,
"read_only": 0,
+ "remember_last_selected_value": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
@@ -216,6 +243,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "contact_details",
"fieldtype": "Section Break",
"hidden": 0,
@@ -223,14 +251,16 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Reference",
"length": 0,
"no_copy": 0,
- "options": "icon-pushpin",
+ "options": "fa fa-pushpin",
"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,
@@ -241,6 +271,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "user",
"fieldtype": "Link",
"hidden": 0,
@@ -248,6 +279,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "User Id",
"length": 0,
"no_copy": 0,
@@ -257,6 +289,7 @@
"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,
@@ -267,6 +300,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"depends_on": "",
"fieldname": "customer",
"fieldtype": "Link",
@@ -275,6 +309,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer",
"length": 0,
"no_copy": 0,
@@ -285,6 +320,7 @@
"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,
@@ -295,6 +331,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"depends_on": "",
"fieldname": "customer_name",
"fieldtype": "Data",
@@ -303,6 +340,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Customer Name",
"length": 0,
"no_copy": 0,
@@ -310,6 +348,7 @@
"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,
@@ -320,6 +359,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "column_break1",
"fieldtype": "Column Break",
"hidden": 0,
@@ -327,6 +367,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"length": 0,
"no_copy": 0,
"oldfieldtype": "Column Break",
@@ -334,6 +375,7 @@
"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,
@@ -345,6 +387,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"depends_on": "",
"fieldname": "supplier",
"fieldtype": "Link",
@@ -353,6 +396,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier",
"length": 0,
"no_copy": 0,
@@ -361,6 +405,7 @@
"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,
@@ -371,6 +416,7 @@
"allow_on_submit": 0,
"bold": 1,
"collapsible": 0,
+ "columns": 0,
"depends_on": "",
"fieldname": "supplier_name",
"fieldtype": "Data",
@@ -379,6 +425,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Supplier Name",
"length": 0,
"no_copy": 0,
@@ -386,6 +433,7 @@
"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,
@@ -396,6 +444,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"depends_on": "",
"fieldname": "sales_partner",
"fieldtype": "Link",
@@ -404,6 +453,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Sales Partner",
"length": 0,
"no_copy": 0,
@@ -412,6 +462,7 @@
"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,
@@ -422,6 +473,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"default": "0",
"depends_on": "eval:(doc.customer || doc.supplier || doc.sales_partner)",
"fieldname": "is_primary_contact",
@@ -431,6 +483,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Is Primary Contact",
"length": 0,
"no_copy": 0,
@@ -440,6 +493,7 @@
"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,
@@ -450,6 +504,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "more_info",
"fieldtype": "Section Break",
"hidden": 0,
@@ -457,14 +512,16 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "More Information",
"length": 0,
"no_copy": 0,
- "options": "icon-file-text",
+ "options": "fa fa-file-text",
"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,
@@ -475,6 +532,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "mobile_no",
"fieldtype": "Data",
"hidden": 0,
@@ -482,6 +540,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Mobile No",
"length": 0,
"no_copy": 0,
@@ -491,6 +550,7 @@
"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,
@@ -501,6 +561,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "Enter department to which this Contact belongs",
"fieldname": "department",
"fieldtype": "Data",
@@ -509,6 +570,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Department",
"length": 0,
"no_copy": 0,
@@ -516,6 +578,7 @@
"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,
@@ -526,6 +589,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"description": "Enter designation of this Contact",
"fieldname": "designation",
"fieldtype": "Data",
@@ -534,6 +598,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Designation",
"length": 0,
"no_copy": 0,
@@ -541,6 +606,7 @@
"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,
@@ -551,6 +617,7 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
+ "columns": 0,
"fieldname": "unsubscribed",
"fieldtype": "Check",
"hidden": 0,
@@ -558,6 +625,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
+ "in_standard_filter": 0,
"label": "Unsubscribed",
"length": 0,
"no_copy": 0,
@@ -565,6 +633,7 @@
"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,
@@ -574,16 +643,17 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-user",
+ "icon": "fa fa-user",
"idx": 1,
"image_field": "image",
+ "image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2016-04-06 05:39:47.125816",
+ "modified": "2016-11-07 05:30:56.576752",
"modified_by": "Administrator",
"module": "Utilities",
"name": "Contact",
@@ -599,6 +669,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -619,6 +690,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -639,6 +711,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -659,6 +732,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -679,6 +753,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -699,6 +774,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -719,6 +795,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -739,6 +816,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -759,6 +837,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -779,6 +858,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -799,6 +879,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"permlevel": 0,
"print": 1,
"read": 1,
@@ -819,6 +900,7 @@
"export": 0,
"if_owner": 0,
"import": 0,
+ "is_custom": 0,
"match": "",
"permlevel": 1,
"print": 0,
@@ -831,6 +913,7 @@
"write": 0
}
],
+ "quick_entry": 0,
"read_only": 0,
"read_only_onload": 0,
"sort_order": "ASC",
diff --git a/erpnext/utilities/doctype/rename_tool/rename_tool.json b/erpnext/utilities/doctype/rename_tool/rename_tool.json
index eff3e08..f9aac1c 100644
--- a/erpnext/utilities/doctype/rename_tool/rename_tool.json
+++ b/erpnext/utilities/doctype/rename_tool/rename_tool.json
@@ -75,7 +75,7 @@
],
"hide_heading": 0,
"hide_toolbar": 1,
- "icon": "icon-magic",
+ "icon": "fa fa-magic",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/utilities/doctype/sms_log/sms_log.json b/erpnext/utilities/doctype/sms_log/sms_log.json
index 0df91f7..ffd9a7f 100644
--- a/erpnext/utilities/doctype/sms_log/sms_log.json
+++ b/erpnext/utilities/doctype/sms_log/sms_log.json
@@ -253,7 +253,7 @@
],
"hide_heading": 0,
"hide_toolbar": 0,
- "icon": "icon-mobile-phone",
+ "icon": "fa fa-mobile-phone",
"idx": 1,
"in_create": 0,
"in_dialog": 0,
diff --git a/erpnext/utilities/web_form/addresses/addresses.json b/erpnext/utilities/web_form/addresses/addresses.json
index 50fe6e9..6d3fefc 100644
--- a/erpnext/utilities/web_form/addresses/addresses.json
+++ b/erpnext/utilities/web_form/addresses/addresses.json
@@ -1,8 +1,12 @@
{
+ "accept_payment": 0,
"allow_comments": 0,
"allow_delete": 0,
"allow_edit": 1,
+ "allow_incomplete": 0,
"allow_multiple": 1,
+ "allow_print": 0,
+ "amount": 0.0,
"creation": "2016-06-24 15:50:33.196990",
"doc_type": "Address",
"docstatus": 0,
@@ -10,13 +14,16 @@
"idx": 0,
"is_standard": 1,
"login_required": 1,
- "modified": "2016-06-24 16:11:28.802353",
+ "max_attachment_size": 0,
+ "modified": "2016-12-07 04:17:02.020768",
"modified_by": "Administrator",
"module": "Utilities",
"name": "addresses",
"owner": "Administrator",
"published": 1,
"route": "address",
+ "show_sidebar": 0,
+ "sidebar_items": [],
"success_url": "/addresses",
"title": "Address",
"web_form_fields": [
@@ -26,6 +33,8 @@
"fieldtype": "Data",
"hidden": 0,
"label": "Address Title",
+ "max_length": 0,
+ "max_value": 0,
"read_only": 0,
"reqd": 0
},
@@ -34,6 +43,8 @@
"fieldtype": "Select",
"hidden": 0,
"label": "Address Type",
+ "max_length": 0,
+ "max_value": 0,
"options": "Billing\nShipping\nOffice\nPersonal\nPlant\nPostal\nShop\nSubsidiary\nWarehouse\nOther",
"read_only": 0,
"reqd": 1
@@ -43,6 +54,8 @@
"fieldtype": "Data",
"hidden": 0,
"label": "Address Line 1",
+ "max_length": 0,
+ "max_value": 0,
"read_only": 0,
"reqd": 1
},
@@ -51,6 +64,8 @@
"fieldtype": "Data",
"hidden": 0,
"label": "Address Line 2",
+ "max_length": 0,
+ "max_value": 0,
"read_only": 0,
"reqd": 0
},
@@ -59,6 +74,8 @@
"fieldtype": "Data",
"hidden": 0,
"label": "City/Town",
+ "max_length": 0,
+ "max_value": 0,
"read_only": 0,
"reqd": 1
},
@@ -67,6 +84,8 @@
"fieldtype": "Data",
"hidden": 0,
"label": "State",
+ "max_length": 0,
+ "max_value": 0,
"read_only": 0,
"reqd": 0
},
@@ -75,6 +94,8 @@
"fieldtype": "Data",
"hidden": 0,
"label": "Postal Code",
+ "max_length": 0,
+ "max_value": 0,
"read_only": 0,
"reqd": 0
},
@@ -83,6 +104,8 @@
"fieldtype": "Link",
"hidden": 0,
"label": "Country",
+ "max_length": 0,
+ "max_value": 0,
"options": "Country",
"read_only": 0,
"reqd": 1
@@ -90,6 +113,8 @@
{
"fieldtype": "Column Break",
"hidden": 0,
+ "max_length": 0,
+ "max_value": 0,
"read_only": 0,
"reqd": 0
},
@@ -98,6 +123,8 @@
"fieldtype": "Data",
"hidden": 0,
"label": "Email Id",
+ "max_length": 0,
+ "max_value": 0,
"read_only": 0,
"reqd": 0
},
@@ -106,6 +133,8 @@
"fieldtype": "Data",
"hidden": 0,
"label": "Phone",
+ "max_length": 0,
+ "max_value": 0,
"read_only": 0,
"reqd": 1
},
@@ -116,6 +145,8 @@
"fieldtype": "Check",
"hidden": 0,
"label": "Preferred Billing Address",
+ "max_length": 0,
+ "max_value": 0,
"read_only": 0,
"reqd": 0
},
@@ -126,6 +157,8 @@
"fieldtype": "Check",
"hidden": 0,
"label": "Preferred Shipping Address",
+ "max_length": 0,
+ "max_value": 0,
"read_only": 0,
"reqd": 0
}
