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

Merge branch 'develop'

Browse Source
This commit is contained in:
Nabin Hait
2015-11-19 14:34:29 +05:30
parent a5ac1f024e 19ce11aa9c
commit 690023538e
275 changed files with 9883 additions and 6178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__version__.py
View File

@@ -1,2 +1,2 @@
from __future__ import unicode_literals from __future__ import unicode_literals
__version__ = '6.9.2' __version__ = '6.10.0'

31
erpnext/accounts/doctype/account/account.json
View File

@@ -20,6 +20,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"permlevel": 0, "permlevel": 0,
@@ -41,6 +42,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -63,6 +65,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Account Name", "label": "Account Name",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "account_name", "oldfieldname": "account_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -87,6 +90,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Group", "label": "Is Group",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -109,6 +113,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -132,7 +137,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Root Type", "label": "Root Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nAsset\nLiability\nIncome\nExpense\nEquity", "options": "\nAsset\nLiability\nIncome\nExpense\nEquity",
"permlevel": 0, "permlevel": 0,
@@ -154,7 +160,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Report Type", "label": "Report Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nBalance Sheet\nProfit and Loss", "options": "\nBalance Sheet\nProfit and Loss",
"permlevel": 0, "permlevel": 0,
@@ -178,6 +185,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Currency", "label": "Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Currency", "options": "Currency",
"permlevel": 0, "permlevel": 0,
@@ -200,6 +208,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -222,6 +231,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Parent Account", "label": "Parent Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "parent_account", "oldfieldname": "parent_account",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -246,7 +256,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Account Type", "label": "Account Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "account_type", "oldfieldname": "account_type",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -272,6 +283,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Rate", "label": "Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "tax_rate", "oldfieldname": "tax_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -295,7 +307,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Frozen", "label": "Frozen",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "freeze_account", "oldfieldname": "freeze_account",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -320,6 +333,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Warehouse", "label": "Warehouse",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Warehouse", "options": "Warehouse",
"permlevel": 0, "permlevel": 0,
@@ -341,7 +355,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Balance must be", "label": "Balance must be",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nDebit\nCredit", "options": "\nDebit\nCredit",
"permlevel": 0, "permlevel": 0,
@@ -364,6 +379,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Lft", "label": "Lft",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -385,6 +401,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Rgt", "label": "Rgt",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -406,6 +423,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Old Parent", "label": "Old Parent",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -426,7 +444,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:37.436071", "max_attachments": 0,
"modified": "2015-11-16 06:29:41.535663",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Account", "name": "Account",

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

@@ -15,7 +15,7 @@ class BankReconciliation(Document):
condition = "" condition = ""
if not self.include_reconciled_entries: if not self.include_reconciled_entries:
condition = "and ifnull(clearance_date, '') in ('', '0000-00-00')" condition = "and (clearance_date is null or clearance_date='0000-00-00')"
dl = frappe.db.sql("""select t1.name, t1.cheque_no, t1.cheque_date, t2.debit, dl = frappe.db.sql("""select t1.name, t1.cheque_no, t1.cheque_date, t2.debit,

13
erpnext/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.json
View File

@@ -18,6 +18,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Voucher ID", "label": "Voucher ID",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "voucher_id", "oldfieldname": "voucher_id",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -42,6 +43,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Clearance Date", "label": "Clearance Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "clearance_date", "oldfieldname": "clearance_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -65,6 +67,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Against Account", "label": "Against Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "against_account", "oldfieldname": "against_account",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -88,6 +91,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Cheque Number", "label": "Cheque Number",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "cheque_number", "oldfieldname": "cheque_number",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -111,6 +115,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Debit", "label": "Debit",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "debit", "oldfieldname": "debit",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -135,6 +140,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Credit", "label": "Credit",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "credit", "oldfieldname": "credit",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -159,6 +165,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reference Type", "label": "Reference Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "DocType", "options": "DocType",
"permlevel": 0, "permlevel": 0,
@@ -182,6 +189,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reference Name", "label": "Reference Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "reference_type", "options": "reference_type",
"permlevel": 0, "permlevel": 0,
@@ -205,6 +213,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Posting Date", "label": "Posting Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "posting_date", "oldfieldname": "posting_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -228,6 +237,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Cheque Date", "label": "Cheque Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "cheque_date", "oldfieldname": "cheque_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -249,7 +259,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:39.149782", "max_attachments": 0,
"modified": "2015-11-16 06:29:42.254366",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Bank Reconciliation Detail", "name": "Bank Reconciliation Detail",

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

@@ -19,6 +19,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Account", "label": "Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "account", "oldfieldname": "account",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -43,6 +44,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Budget Allocated", "label": "Budget Allocated",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "budget_allocated", "oldfieldname": "budget_allocated",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -67,6 +69,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -89,7 +92,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:40.727468", "max_attachments": 0,
"modified": "2015-11-16 06:29:43.050558",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Budget Detail", "name": "Budget Detail",

21
erpnext/accounts/doctype/c_form/c_form.json
View File

@@ -18,6 +18,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -40,7 +41,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Series", "label": "Series",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "C-FORM-", "options": "C-FORM-",
"permlevel": 0, "permlevel": 0,
@@ -63,6 +65,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "C-Form No", "label": "C-Form No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -84,6 +87,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Received Date", "label": "Received Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -105,6 +109,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Customer", "label": "Customer",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Customer", "options": "Customer",
"permlevel": 0, "permlevel": 0,
@@ -126,6 +131,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -149,6 +155,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
@@ -171,6 +178,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Fiscal Year", "label": "Fiscal Year",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Fiscal Year", "options": "Fiscal Year",
"permlevel": 0, "permlevel": 0,
@@ -192,7 +200,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Quarter", "label": "Quarter",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nI\nII\nIII\nIV", "options": "\nI\nII\nIII\nIV",
"permlevel": 0, "permlevel": 0,
@@ -215,6 +224,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total Amount", "label": "Total Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -237,6 +247,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "State", "label": "State",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -257,6 +268,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -278,6 +290,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Invoices", "label": "Invoices",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "C-Form Invoice Detail", "options": "C-Form Invoice Detail",
"permlevel": 0, "permlevel": 0,
@@ -300,6 +313,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total Invoiced Amount", "label": "Total Invoiced Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -322,6 +336,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amended From", "label": "Amended From",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "C-Form", "options": "C-Form",
"permlevel": 0, "permlevel": 0,
@@ -344,7 +359,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 3, "max_attachments": 3,
"modified": "2015-10-02 07:38:40.926061", "modified": "2015-11-16 06:29:43.143528",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "C-Form", "name": "C-Form",

12
erpnext/accounts/doctype/c_form/test_c_form.py Normal file
View File

@@ -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('C-Form')
class TestCForm(unittest.TestCase):
pass

8
erpnext/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.json
View File

@@ -18,6 +18,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Invoice No", "label": "Invoice No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Sales Invoice", "options": "Sales Invoice",
"permlevel": 0, "permlevel": 0,
@@ -42,6 +43,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Invoice Date", "label": "Invoice Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -66,6 +68,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Territory", "label": "Territory",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Territory", "options": "Territory",
"permlevel": 0, "permlevel": 0,
@@ -90,6 +93,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Net Total", "label": "Net Total",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -114,6 +118,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Grand Total", "label": "Grand Total",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -136,7 +141,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:41.105885", "max_attachments": 0,
"modified": "2015-11-16 06:29:43.221484",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "C-Form Invoice Detail", "name": "C-Form Invoice Detail",

15
erpnext/accounts/doctype/cost_center/cost_center.json
View File

@@ -21,6 +21,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -42,6 +43,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Cost Center Name", "label": "Cost Center Name",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "cost_center_name", "oldfieldname": "cost_center_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -65,6 +67,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Parent Cost Center", "label": "Parent Cost Center",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "parent_cost_center", "oldfieldname": "parent_cost_center",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -89,6 +92,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company_name", "oldfieldname": "company_name",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -112,6 +116,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -135,6 +140,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Group", "label": "Is Group",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -158,6 +164,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Budget", "label": "Budget",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -180,6 +187,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Distribution Id", "label": "Distribution Id",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "distribution_id", "oldfieldname": "distribution_id",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -205,6 +213,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Budgets", "label": "Budgets",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "budget_details", "oldfieldname": "budget_details",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -229,6 +238,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "lft", "label": "lft",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "lft", "oldfieldname": "lft",
"oldfieldtype": "Int", "oldfieldtype": "Int",
@@ -252,6 +262,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "rgt", "label": "rgt",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "rgt", "oldfieldname": "rgt",
"oldfieldtype": "Int", "oldfieldtype": "Int",
@@ -275,6 +286,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "old_parent", "label": "old_parent",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "old_parent", "oldfieldname": "old_parent",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -298,7 +310,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:42.617993", "max_attachments": 0,
"modified": "2015-11-16 06:29:43.870712",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Cost Center", "name": "Cost Center",

8
erpnext/accounts/doctype/fiscal_year/fiscal_year.json
View File

@@ -22,6 +22,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Year Name", "label": "Year Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "year", "oldfieldname": "year",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -45,6 +46,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Disabled", "label": "Disabled",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -67,6 +69,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Year Start Date", "label": "Year Start Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "year_start_date", "oldfieldname": "year_start_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -90,6 +93,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Year End Date", "label": "Year End Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -111,6 +115,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Companies", "label": "Companies",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Fiscal Year Company", "options": "Fiscal Year Company",
"permlevel": 0, "permlevel": 0,
@@ -133,7 +138,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:50.942038", "max_attachments": 0,
"modified": "2015-11-16 06:29:47.289982",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Fiscal Year", "name": "Fiscal Year",

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

@@ -19,6 +19,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
@@ -39,7 +40,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:51.045350", "max_attachments": 0,
"modified": "2015-11-16 06:29:47.344839",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Fiscal Year Company", "name": "Fiscal Year Company",

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

@@ -19,6 +19,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Posting Date", "label": "Posting Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "posting_date", "oldfieldname": "posting_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -42,6 +43,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Transaction Date", "label": "Transaction Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "transaction_date", "oldfieldname": "transaction_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -65,6 +67,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Account", "label": "Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "account", "oldfieldname": "account",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -89,6 +92,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Party Type", "label": "Party Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "DocType", "options": "DocType",
"permlevel": 0, "permlevel": 0,
@@ -111,6 +115,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Party", "label": "Party",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "party_type", "options": "party_type",
"permlevel": 0, "permlevel": 0,
@@ -133,6 +138,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Cost Center", "label": "Cost Center",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "cost_center", "oldfieldname": "cost_center",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -157,6 +163,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Debit Amount", "label": "Debit Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "debit", "oldfieldname": "debit",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -182,6 +189,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Credit Amount", "label": "Credit Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "credit", "oldfieldname": "credit",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -207,6 +215,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Account Currency", "label": "Account Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Currency", "options": "Currency",
"permlevel": 0, "permlevel": 0,
@@ -230,6 +239,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Debit Amount in Account Currency", "label": "Debit Amount in Account Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -253,6 +263,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Credit Amount in Account Currency", "label": "Credit Amount in Account Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -276,6 +287,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Against", "label": "Against",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "against", "oldfieldname": "against",
"oldfieldtype": "Text", "oldfieldtype": "Text",
@@ -299,6 +311,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Against Voucher Type", "label": "Against Voucher Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "against_voucher_type", "oldfieldname": "against_voucher_type",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -323,6 +336,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Against Voucher", "label": "Against Voucher",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "against_voucher", "oldfieldname": "against_voucher",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -347,6 +361,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Voucher Type", "label": "Voucher Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "voucher_type", "oldfieldname": "voucher_type",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -371,6 +386,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Voucher No", "label": "Voucher No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "voucher_no", "oldfieldname": "voucher_no",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -395,6 +411,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Remarks", "label": "Remarks",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "remarks", "oldfieldname": "remarks",
"oldfieldtype": "Text", "oldfieldtype": "Text",
@@ -418,6 +435,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Opening", "label": "Is Opening",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "is_opening", "oldfieldname": "is_opening",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -442,6 +460,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Advance", "label": "Is Advance",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "is_advance", "oldfieldname": "is_advance",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -466,6 +485,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Fiscal Year", "label": "Fiscal Year",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -490,6 +510,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -513,7 +534,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-20 12:10:59.771050", "max_attachments": 0,
"modified": "2015-11-16 06:29:47.382225",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "GL Entry", "name": "GL Entry",

10
erpnext/accounts/doctype/gl_entry/gl_entry.py
View File

@@ -120,7 +120,7 @@ def validate_balance_type(account, adv_adj=False):
if not adv_adj and account: if not adv_adj and account:
balance_must_be = frappe.db.get_value("Account", account, "balance_must_be") balance_must_be = frappe.db.get_value("Account", account, "balance_must_be")
if balance_must_be: if balance_must_be:
balance = frappe.db.sql("""select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0)) balance = frappe.db.sql("""select sum(debit) - sum(credit)
from `tabGL Entry` where account = %s""", account)[0][0] from `tabGL Entry` where account = %s""", account)[0][0]
if (balance_must_be=="Debit" and flt(balance) < 0) or \ if (balance_must_be=="Debit" and flt(balance) < 0) or \
@@ -142,14 +142,14 @@ def check_freezing_date(posting_date, adv_adj=False):
def update_outstanding_amt(account, party_type, party, against_voucher_type, against_voucher, on_cancel=False): def update_outstanding_amt(account, party_type, party, against_voucher_type, against_voucher, on_cancel=False):
if party_type and party: if party_type and party:
party_condition = " and ifnull(party_type, '')='{0}' and ifnull(party, '')='{1}'"\ party_condition = " and party_type='{0}' and party='{1}'"\
.format(frappe.db.escape(party_type), frappe.db.escape(party)) .format(frappe.db.escape(party_type), frappe.db.escape(party))
else: else:
party_condition = "" party_condition = ""
# get final outstanding amt # get final outstanding amt
bal = flt(frappe.db.sql(""" bal = flt(frappe.db.sql("""
select sum(ifnull(debit_in_account_currency, 0)) - sum(ifnull(credit_in_account_currency, 0)) select sum(debit_in_account_currency) - sum(credit_in_account_currency)
from `tabGL Entry` from `tabGL Entry`
where against_voucher_type=%s and against_voucher=%s where against_voucher_type=%s and against_voucher=%s
and account = %s {0}""".format(party_condition), and account = %s {0}""".format(party_condition),
@@ -159,9 +159,9 @@ def update_outstanding_amt(account, party_type, party, against_voucher_type, aga
bal = -bal bal = -bal
elif against_voucher_type == "Journal Entry": elif against_voucher_type == "Journal Entry":
against_voucher_amount = flt(frappe.db.sql(""" against_voucher_amount = flt(frappe.db.sql("""
select sum(ifnull(debit_in_account_currency, 0)) - sum(ifnull(credit_in_account_currency, 0)) select sum(debit_in_account_currency) - sum(credit_in_account_currency)
from `tabGL Entry` where voucher_type = 'Journal Entry' and voucher_no = %s from `tabGL Entry` where voucher_type = 'Journal Entry' and voucher_no = %s
and account = %s and ifnull(against_voucher, '') = '' {0}""" and account = %s and (against_voucher is null or against_voucher='') {0}"""
.format(party_condition), (against_voucher, account))[0][0]) .format(party_condition), (against_voucher, account))[0][0])
if not against_voucher_amount: if not against_voucher_amount:

16
erpnext/accounts/doctype/gl_entry/test_gl_entry.py
View File

@@ -9,17 +9,17 @@ class TestGLEntry(unittest.TestCase):
def test_round_off_entry(self): def test_round_off_entry(self):
frappe.db.set_value("Company", "_Test Company", "round_off_account", "_Test Write Off - _TC") frappe.db.set_value("Company", "_Test Company", "round_off_account", "_Test Write Off - _TC")
frappe.db.set_value("Company", "_Test Company", "round_off_cost_center", "_Test Cost Center - _TC") frappe.db.set_value("Company", "_Test Company", "round_off_cost_center", "_Test Cost Center - _TC")
jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC", jv = make_journal_entry("_Test Account Cost for Goods Sold - _TC",
"_Test Bank - _TC", 100, "_Test Cost Center - _TC", submit=False) "_Test Bank - _TC", 100, "_Test Cost Center - _TC", submit=False)
jv.get("accounts")[0].debit = 100.01 jv.get("accounts")[0].debit = 100.01
jv.flags.ignore_validate = True jv.flags.ignore_validate = True
jv.submit() jv.submit()
round_off_entry = frappe.db.sql("""select name from `tabGL Entry` round_off_entry = frappe.db.sql("""select name from `tabGL Entry`
where voucher_type='Journal Entry' and voucher_no = %s where voucher_type='Journal Entry' and voucher_no = %s
and account='_Test Write Off - _TC' and cost_center='_Test Cost Center - _TC' and account='_Test Write Off - _TC' and cost_center='_Test Cost Center - _TC'
and ifnull(debit, 0) = 0 and ifnull(credit, 0) = '.01'""", jv.name) and debit = 0 and credit = '.01'""", jv.name)
self.assertTrue(round_off_entry) self.assertTrue(round_off_entry)

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

@@ -19,6 +19,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-flag", "options": "icon-flag",
"permlevel": 0, "permlevel": 0,
@@ -42,6 +43,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Title", "label": "Title",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -64,7 +66,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Entry Type", "label": "Entry Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "voucher_type", "oldfieldname": "voucher_type",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -88,7 +91,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Series", "label": "Series",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "naming_series", "oldfieldname": "naming_series",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -112,6 +116,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -135,6 +140,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Posting Date", "label": "Posting Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "posting_date", "oldfieldname": "posting_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -158,6 +164,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-table", "options": "icon-table",
@@ -181,6 +188,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Accounting Entries", "label": "Accounting Entries",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "entries", "oldfieldname": "entries",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -204,6 +212,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -226,6 +235,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Reference Number", "label": "Reference Number",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "cheque_no", "oldfieldname": "cheque_no",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -249,6 +259,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reference Date", "label": "Reference Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "cheque_date", "oldfieldname": "cheque_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -272,6 +283,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "User Remark", "label": "User Remark",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "user_remark", "oldfieldname": "user_remark",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -294,6 +306,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -315,6 +328,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Total Debit", "label": "Total Debit",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "total_debit", "oldfieldname": "total_debit",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -339,6 +353,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Total Credit", "label": "Total Credit",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "total_credit", "oldfieldname": "total_credit",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -364,6 +379,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Difference (Dr - Cr)", "label": "Difference (Dr - Cr)",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "difference", "oldfieldname": "difference",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -389,6 +405,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Make Difference Entry", "label": "Make Difference Entry",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Button", "oldfieldtype": "Button",
"permlevel": 0, "permlevel": 0,
@@ -411,6 +428,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Multi Currency", "label": "Multi Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -433,6 +451,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total Amount", "label": "Total Amount",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -455,6 +474,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total Amount in Words", "label": "Total Amount in Words",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -476,6 +496,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reference", "label": "Reference",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-pushpin", "options": "icon-pushpin",
"permlevel": 0, "permlevel": 0,
@@ -498,6 +519,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Clearance Date", "label": "Clearance Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "clearance_date", "oldfieldname": "clearance_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -522,6 +544,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Remark", "label": "Remark",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "remark", "oldfieldname": "remark",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -544,6 +567,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -565,6 +589,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Bill No", "label": "Bill No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "bill_no", "oldfieldname": "bill_no",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -588,6 +613,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Bill Date", "label": "Bill Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "bill_date", "oldfieldname": "bill_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -611,6 +637,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Due Date", "label": "Due Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "due_date", "oldfieldname": "due_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -635,6 +662,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off", "label": "Write Off",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -658,7 +686,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off Based On", "label": "Write Off Based On",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Accounts Receivable\nAccounts Payable", "options": "Accounts Receivable\nAccounts Payable",
"permlevel": 0, "permlevel": 0,
@@ -682,6 +711,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Get Outstanding Invoices", "label": "Get Outstanding Invoices",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "get_outstanding_invoices", "options": "get_outstanding_invoices",
"permlevel": 0, "permlevel": 0,
@@ -703,6 +733,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -726,6 +757,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off Amount", "label": "Write Off Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -748,6 +780,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Printing Settings", "label": "Printing Settings",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -770,6 +803,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Pay To / Recd From", "label": "Pay To / Recd From",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -790,6 +824,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -812,6 +847,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Letter Head", "label": "Letter Head",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Letter Head", "options": "Letter Head",
"permlevel": 0, "permlevel": 0,
@@ -834,6 +870,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Print Heading", "label": "Print Heading",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "select_print_heading", "oldfieldname": "select_print_heading",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -858,6 +895,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "More Information", "label": "More Information",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-file-text", "options": "icon-file-text",
@@ -881,6 +919,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -905,6 +944,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Fiscal Year", "label": "Fiscal Year",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -928,6 +968,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -952,7 +993,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Opening", "label": "Is Opening",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "is_opening", "oldfieldname": "is_opening",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -978,6 +1020,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Stock Entry", "label": "Stock Entry",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Stock Entry", "options": "Stock Entry",
"permlevel": 0, "permlevel": 0,
@@ -1001,6 +1044,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amended From", "label": "Amended From",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -1024,7 +1068,8 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:54.074343", "max_attachments": 0,
"modified": "2015-11-16 06:29:48.813805",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Journal Entry", "name": "Journal Entry",

81
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@@ -2,7 +2,7 @@
# License: GNU General Public License v3. See license.txt # License: GNU General Public License v3. See license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe, json
from frappe.utils import cstr, flt, fmt_money, formatdate from frappe.utils import cstr, flt, fmt_money, formatdate
from frappe import msgprint, _, scrub from frappe import msgprint, _, scrub
from erpnext.controllers.accounts_controller import AccountsController from erpnext.controllers.accounts_controller import AccountsController
@@ -28,7 +28,7 @@ class JournalEntry(AccountsController):
self.validate_entries_for_advance() self.validate_entries_for_advance()
self.validate_multi_currency() self.validate_multi_currency()
self.set_amounts_in_company_currency() self.set_amounts_in_company_currency()
self.validate_debit_and_credit() self.validate_total_debit_and_credit()
self.validate_against_jv() self.validate_against_jv()
self.validate_reference_doc() self.validate_reference_doc()
self.set_against_account() self.set_against_account()
@@ -121,7 +121,7 @@ class JournalEntry(AccountsController):
against_entries = frappe.db.sql("""select * from `tabJournal Entry Account` against_entries = frappe.db.sql("""select * from `tabJournal Entry Account`
where account = %s and docstatus = 1 and parent = %s where account = %s and docstatus = 1 and parent = %s
and ifnull(reference_type, '') in ("", "Sales Order", "Purchase Order") and (reference_type is null or reference_type in ("", "Sales Order", "Purchase Order"))
""", (d.account, d.reference_name), as_dict=True) """, (d.account, d.reference_name), as_dict=True)
if not against_entries: if not against_entries:
@@ -252,7 +252,13 @@ class JournalEntry(AccountsController):
if flt(d.debit > 0): d.against_account = ", ".join(list(set(accounts_credited))) if flt(d.debit > 0): d.against_account = ", ".join(list(set(accounts_credited)))
if flt(d.credit > 0): d.against_account = ", ".join(list(set(accounts_debited))) if flt(d.credit > 0): d.against_account = ", ".join(list(set(accounts_debited)))
def validate_debit_and_credit(self): def validate_total_debit_and_credit(self):
self.set_total_debit_credit()
if self.difference:
frappe.throw(_("Total Debit must be equal to Total Credit. The difference is {0}")
.format(self.difference))
def set_total_debit_credit(self):
self.total_debit, self.total_credit, self.difference = 0, 0, 0 self.total_debit, self.total_credit, self.difference = 0, 0, 0
for d in self.get("accounts"): for d in self.get("accounts"):
if d.debit and d.credit: if d.debit and d.credit:
@@ -264,10 +270,6 @@ class JournalEntry(AccountsController):
self.difference = flt(self.total_debit, self.precision("total_debit")) - \ self.difference = flt(self.total_debit, self.precision("total_debit")) - \
flt(self.total_credit, self.precision("total_credit")) flt(self.total_credit, self.precision("total_credit"))
if self.difference:
frappe.throw(_("Total Debit must be equal to Total Credit. The difference is {0}")
.format(self.difference))
def validate_multi_currency(self): def validate_multi_currency(self):
alternate_currency = [] alternate_currency = []
for d in self.get("accounts"): for d in self.get("accounts"):
@@ -283,7 +285,7 @@ class JournalEntry(AccountsController):
frappe.throw(_("Please check Multi Currency option to allow accounts with other currency")) frappe.throw(_("Please check Multi Currency option to allow accounts with other currency"))
self.set_exchange_rate() self.set_exchange_rate()
def set_amounts_in_company_currency(self): def set_amounts_in_company_currency(self):
for d in self.get("accounts"): for d in self.get("accounts"):
d.debit = flt(flt(d.debit_in_account_currency)*flt(d.exchange_rate), d.precision("debit")) d.debit = flt(flt(d.debit_in_account_currency)*flt(d.exchange_rate), d.precision("debit"))
@@ -404,7 +406,7 @@ class JournalEntry(AccountsController):
blank_row.debit_in_account_currency = abs(diff) blank_row.debit_in_account_currency = abs(diff)
blank_row.debit = abs(diff) blank_row.debit = abs(diff)
self.validate_debit_and_credit() self.validate_total_debit_and_credit()
def get_outstanding_invoices(self): def get_outstanding_invoices(self):
self.set('accounts', []) self.set('accounts', [])
@@ -432,7 +434,7 @@ class JournalEntry(AccountsController):
elif self.write_off_based_on == 'Accounts Payable': elif self.write_off_based_on == 'Accounts Payable':
jd2.credit = total jd2.credit = total
self.validate_debit_and_credit() self.validate_total_debit_and_credit()
def get_values(self): def get_values(self):
@@ -520,14 +522,14 @@ def get_default_bank_cash_account(company, voucher_type, mode_of_payment=None):
"account_currency": account_details.account_currency, "account_currency": account_details.account_currency,
"account_type": account_details.account_type "account_type": account_details.account_type
} }
@frappe.whitelist() @frappe.whitelist()
def get_payment_entry_against_order(dt, dn): def get_payment_entry_against_order(dt, dn):
ref_doc = frappe.get_doc(dt, dn) ref_doc = frappe.get_doc(dt, dn)
if flt(ref_doc.per_billed, 2) > 0: if flt(ref_doc.per_billed, 2) > 0:
frappe.throw(_("Can only make payment against unbilled {0}").format(dt)) frappe.throw(_("Can only make payment against unbilled {0}").format(dt))
if dt == "Sales Order": if dt == "Sales Order":
party_type = "Customer" party_type = "Customer"
amount_field_party = "credit_in_account_currency" amount_field_party = "credit_in_account_currency"
@@ -536,15 +538,15 @@ def get_payment_entry_against_order(dt, dn):
party_type = "Supplier" party_type = "Supplier"
amount_field_party = "debit_in_account_currency" amount_field_party = "debit_in_account_currency"
amount_field_bank = "credit_in_account_currency" amount_field_bank = "credit_in_account_currency"
party_account = get_party_account(party_type, ref_doc.get(party_type.lower()), ref_doc.company) party_account = get_party_account(party_type, ref_doc.get(party_type.lower()), ref_doc.company)
party_account_currency = get_account_currency(party_account) party_account_currency = get_account_currency(party_account)
if party_account_currency == ref_doc.company_currency: if party_account_currency == ref_doc.company_currency:
amount = flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid) amount = flt(ref_doc.base_grand_total) - flt(ref_doc.advance_paid)
else: else:
amount = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid) amount = flt(ref_doc.grand_total) - flt(ref_doc.advance_paid)
return get_payment_entry(ref_doc, { return get_payment_entry(ref_doc, {
"party_type": party_type, "party_type": party_type,
"party_account": party_account, "party_account": party_account,
@@ -555,35 +557,40 @@ def get_payment_entry_against_order(dt, dn):
"remarks": 'Advance Payment received against {0} {1}'.format(dt, dn), "remarks": 'Advance Payment received against {0} {1}'.format(dt, dn),
"is_advance": "Yes" "is_advance": "Yes"
}) })
@frappe.whitelist() @frappe.whitelist()
def get_payment_entry_against_invoice(dt, dn): def get_payment_entry_against_invoice(dt, dn):
ref_doc = frappe.get_doc(dt, dn) ref_doc = frappe.get_doc(dt, dn)
if dt == "Sales Invoice": if dt == "Sales Invoice":
party_type = "Customer" party_type = "Customer"
party_account = ref_doc.debit_to party_account = ref_doc.debit_to
amount_field_party = "credit_in_account_currency"
amount_field_bank = "debit_in_account_currency"
else: else:
party_type = "Supplier" party_type = "Supplier"
party_account = ref_doc.credit_to party_account = ref_doc.credit_to
if (dt=="Sales Invoice" and ref_doc.outstanding_amount > 0) \
or (dt=="Purchase Invoice" and ref_doc.outstanding_amount < 0):
amount_field_party = "credit_in_account_currency"
amount_field_bank = "debit_in_account_currency"
else:
amount_field_party = "debit_in_account_currency" amount_field_party = "debit_in_account_currency"
amount_field_bank = "credit_in_account_currency" amount_field_bank = "credit_in_account_currency"
return get_payment_entry(ref_doc, { return get_payment_entry(ref_doc, {
"party_type": party_type, "party_type": party_type,
"party_account": party_account, "party_account": party_account,
"party_account_currency": ref_doc.party_account_currency, "party_account_currency": ref_doc.party_account_currency,
"amount_field_party": amount_field_party, "amount_field_party": amount_field_party,
"amount_field_bank": amount_field_bank, "amount_field_bank": amount_field_bank,
"amount": ref_doc.outstanding_amount, "amount": abs(ref_doc.outstanding_amount),
"remarks": 'Payment received against {0} {1}. {2}'.format(dt, dn, ref_doc.remarks), "remarks": 'Payment received against {0} {1}. {2}'.format(dt, dn, ref_doc.remarks),
"is_advance": "No" "is_advance": "No"
}) })
def get_payment_entry(ref_doc, args): def get_payment_entry(ref_doc, args):
cost_center = frappe.db.get_value("Company", ref_doc.company, "cost_center") cost_center = frappe.db.get_value("Company", ref_doc.company, "cost_center")
exchange_rate = get_exchange_rate(args.get("party_account"), args.get("party_account_currency"), exchange_rate = get_exchange_rate(args.get("party_account"), args.get("party_account_currency"),
ref_doc.company, ref_doc.doctype, ref_doc.name) ref_doc.company, ref_doc.doctype, ref_doc.name)
jv = frappe.new_doc("Journal Entry") jv = frappe.new_doc("Journal Entry")
@@ -592,7 +599,7 @@ def get_payment_entry(ref_doc, args):
"company": ref_doc.company, "company": ref_doc.company,
"remark": args.get("remarks") "remark": args.get("remarks")
}) })
party_row = jv.append("accounts", { party_row = jv.append("accounts", {
"account": args.get("party_account"), "account": args.get("party_account"),
"party_type": args.get("party_type"), "party_type": args.get("party_type"),
@@ -601,7 +608,7 @@ def get_payment_entry(ref_doc, args):
"account_type": frappe.db.get_value("Account", args.get("party_account"), "account_type"), "account_type": frappe.db.get_value("Account", args.get("party_account"), "account_type"),
"account_currency": args.get("party_account_currency") or \ "account_currency": args.get("party_account_currency") or \
get_account_currency(args.get("party_account")), get_account_currency(args.get("party_account")),
"account_balance": get_balance_on(args.get("party_account")), "balance": get_balance_on(args.get("party_account")),
"party_balance": get_balance_on(party=args.get("party"), party_type=args.get("party_type")), "party_balance": get_balance_on(party=args.get("party"), party_type=args.get("party_type")),
"exchange_rate": exchange_rate, "exchange_rate": exchange_rate,
args.get("amount_field_party"): args.get("amount"), args.get("amount_field_party"): args.get("amount"),
@@ -614,11 +621,11 @@ def get_payment_entry(ref_doc, args):
bank_account = get_default_bank_cash_account(ref_doc.company, "Bank Entry") bank_account = get_default_bank_cash_account(ref_doc.company, "Bank Entry")
if bank_account: if bank_account:
bank_row.update(bank_account) bank_row.update(bank_account)
bank_row.exchange_rate = get_exchange_rate(bank_account["account"], bank_row.exchange_rate = get_exchange_rate(bank_account["account"],
bank_account["account_currency"], ref_doc.company) bank_account["account_currency"], ref_doc.company)
bank_row.cost_center = cost_center bank_row.cost_center = cost_center
if bank_row.account_currency == args.get("party_account_currency"): if bank_row.account_currency == args.get("party_account_currency"):
bank_row.set(args.get("amount_field_bank"), args.get("amount")) bank_row.set(args.get("amount_field_bank"), args.get("amount"))
else: else:
@@ -630,7 +637,8 @@ def get_payment_entry(ref_doc, args):
jv.multi_currency = 1 jv.multi_currency = 1
jv.set_amounts_in_company_currency() jv.set_amounts_in_company_currency()
jv.set_total_debit_credit()
return jv.as_dict() return jv.as_dict()
@frappe.whitelist() @frappe.whitelist()
@@ -646,24 +654,27 @@ def get_against_jv(doctype, txt, searchfield, start, page_len, filters):
return frappe.db.sql("""select jv.name, jv.posting_date, jv.user_remark return frappe.db.sql("""select jv.name, jv.posting_date, jv.user_remark
from `tabJournal Entry` jv, `tabJournal Entry Account` jv_detail from `tabJournal Entry` jv, `tabJournal Entry Account` jv_detail
where jv_detail.parent = jv.name and jv_detail.account = %s and ifnull(jv_detail.party, '') = %s where jv_detail.parent = jv.name and jv_detail.account = %s and ifnull(jv_detail.party, '') = %s
and ifnull(jv_detail.reference_type, '') = '' and (jv_detail.reference_type is null or jv_detail.reference_type = '')
and jv.docstatus = 1 and jv.{0} like %s order by jv.name desc limit %s, %s""".format(searchfield), and jv.docstatus = 1 and jv.`{0}` like %s order by jv.name desc limit %s, %s""".format(frappe.db.escape(searchfield)),
(filters.get("account"), cstr(filters.get("party")), "%{0}%".format(txt), start, page_len)) (filters.get("account"), cstr(filters.get("party")), "%{0}%".format(txt), start, page_len))
@frappe.whitelist() @frappe.whitelist()
def get_outstanding(args): def get_outstanding(args):
if not frappe.has_permission("Account"): if not frappe.has_permission("Account"):
frappe.msgprint(_("No Permission"), raise_exception=1) frappe.msgprint(_("No Permission"), raise_exception=1)
args = eval(args)
if isinstance(args, basestring):
args = json.loads(args)
company_currency = get_company_currency(args.get("company")) company_currency = get_company_currency(args.get("company"))
if args.get("doctype") == "Journal Entry": if args.get("doctype") == "Journal Entry":
condition = " and party=%(party)s" if args.get("party") else "" condition = " and party=%(party)s" if args.get("party") else ""
against_jv_amount = frappe.db.sql(""" against_jv_amount = frappe.db.sql("""
select sum(ifnull(debit_in_account_currency, 0)) - sum(ifnull(credit_in_account_currency, 0)) select sum(debit_in_account_currency) - sum(credit_in_account_currency)
from `tabJournal Entry Account` where parent=%(docname)s and account=%(account)s {0} from `tabJournal Entry Account` where parent=%(docname)s and account=%(account)s {0}
and ifnull(reference_type, '')=''""".format(condition), args) and (reference_type is null or reference_type = '')""".format(condition), args)
against_jv_amount = flt(against_jv_amount[0][0]) if against_jv_amount else 0 against_jv_amount = flt(against_jv_amount[0][0]) if against_jv_amount else 0
amount_field = "credit_in_account_currency" if against_jv_amount > 0 else "debit_in_account_currency" amount_field = "credit_in_account_currency" if against_jv_amount > 0 else "debit_in_account_currency"

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

@@ -19,6 +19,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Account", "label": "Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "account", "oldfieldname": "account",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -45,6 +46,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Account Type", "label": "Account Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -67,6 +69,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Account Balance", "label": "Account Balance",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "balance", "oldfieldname": "balance",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -93,6 +96,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Cost Center", "label": "Cost Center",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "cost_center", "oldfieldname": "cost_center",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -118,6 +122,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -139,6 +144,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Party Type", "label": "Party Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "DocType", "options": "DocType",
"permlevel": 0, "permlevel": 0,
@@ -161,6 +167,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Party", "label": "Party",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "party_type", "options": "party_type",
"permlevel": 0, "permlevel": 0,
@@ -183,6 +190,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Party Balance", "label": "Party Balance",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "account_currency", "options": "account_currency",
"permlevel": 0, "permlevel": 0,
@@ -208,6 +216,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Currency", "label": "Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -230,6 +239,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Account Currency", "label": "Account Currency",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Currency", "options": "Currency",
"permlevel": 0, "permlevel": 0,
@@ -252,6 +262,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -274,6 +285,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Exchange Rate", "label": "Exchange Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "6", "precision": "6",
@@ -296,6 +308,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amount", "label": "Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -317,6 +330,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Debit in Account Currency", "label": "Debit in Account Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "account_currency", "options": "account_currency",
"permlevel": 0, "permlevel": 0,
@@ -340,6 +354,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Debit in Company Currency", "label": "Debit in Company Currency",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "debit", "oldfieldname": "debit",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -364,6 +379,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -385,6 +401,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Credit in Account Currency", "label": "Credit in Account Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "account_currency", "options": "account_currency",
"permlevel": 0, "permlevel": 0,
@@ -408,6 +425,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Credit in Company Currency", "label": "Credit in Company Currency",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "credit", "oldfieldname": "credit",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -433,6 +451,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reference", "label": "Reference",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -454,6 +473,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reference Type", "label": "Reference Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim", "options": "\nSales Invoice\nPurchase Invoice\nJournal Entry\nSales Order\nPurchase Order\nExpense Claim",
"permlevel": 0, "permlevel": 0,
@@ -477,6 +497,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Reference Name", "label": "Reference Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "reference_type", "options": "reference_type",
"permlevel": 0, "permlevel": 0,
@@ -499,6 +520,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -520,6 +542,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Advance", "label": "Is Advance",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "is_advance", "oldfieldname": "is_advance",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -544,6 +567,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Against Account", "label": "Against Account",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "against_account", "oldfieldname": "against_account",
"oldfieldtype": "Text", "oldfieldtype": "Text",
@@ -565,7 +589,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-20 12:10:22.203395", "max_attachments": 0,
"modified": "2015-11-16 06:29:48.961988",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Journal Entry Account", "name": "Journal Entry Account",

5
erpnext/accounts/doctype/mode_of_payment/mode_of_payment.json
View File

@@ -20,6 +20,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Mode of Payment", "label": "Mode of Payment",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "mode_of_payment", "oldfieldname": "mode_of_payment",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -43,6 +44,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Accounts", "label": "Accounts",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Mode of Payment Account", "options": "Mode of Payment Account",
"permlevel": 0, "permlevel": 0,
@@ -65,7 +67,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:57.318104", "max_attachments": 0,
"modified": "2015-11-16 06:29:50.335559",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Mode of Payment", "name": "Mode of Payment",

20
erpnext/accounts/doctype/mode_of_payment/mode_of_payment.py
View File

@@ -5,6 +5,24 @@ from __future__ import unicode_literals
import frappe import frappe
from frappe.model.document import Document from frappe.model.document import Document
from frappe import _
class ModeofPayment(Document): class ModeofPayment(Document):
pass def validate(self):
self.validate_accounts()
self.validate_repeating_companies()
def validate_repeating_companies(self):
"""Error when Same Company is entered multiple times in accounts"""
accounts_list = []
for entry in self.accounts:
accounts_list.append(entry.company)
if len(accounts_list)!= len(set(accounts_list)):
frappe.throw(_("Same Company is entered more than once"))
def validate_accounts(self):
for entry in self.accounts:
"""Error when Company of Ledger account doesn't match with Company Selected"""
if frappe.db.get_value("Account", entry.default_account, "company") != entry.company:
frappe.throw(_("Account does not match with Company"))

5
erpnext/accounts/doctype/mode_of_payment_account/mode_of_payment_account.json
View File

@@ -19,6 +19,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
@@ -43,6 +44,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Default Account", "label": "Default Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Account", "options": "Account",
"permlevel": 0, "permlevel": 0,
@@ -63,7 +65,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:57.388194", "max_attachments": 0,
"modified": "2015-11-16 06:29:50.367895",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Mode of Payment Account", "name": "Mode of Payment Account",

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

@@ -21,6 +21,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Distribution Name", "label": "Distribution Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "distribution_id", "oldfieldname": "distribution_id",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -44,6 +45,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Fiscal Year", "label": "Fiscal Year",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -68,6 +70,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Monthly Distribution Percentages", "label": "Monthly Distribution Percentages",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "budget_distribution_details", "oldfieldname": "budget_distribution_details",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -91,7 +94,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:57.594541", "max_attachments": 0,
"modified": "2015-11-16 06:29:50.431735",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Monthly Distribution", "name": "Monthly Distribution",

5
erpnext/accounts/doctype/monthly_distribution_percentage/monthly_distribution_percentage.json
View File

@@ -19,6 +19,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Month", "label": "Month",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "month", "oldfieldname": "month",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -42,6 +43,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Percentage Allocation", "label": "Percentage Allocation",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "percentage_allocation", "oldfieldname": "percentage_allocation",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -63,7 +65,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:57.670950", "max_attachments": 0,
"modified": "2015-11-16 06:29:50.468982",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Monthly Distribution Percentage", "name": "Monthly Distribution Percentage",

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

@@ -19,6 +19,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
@@ -41,6 +42,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -63,6 +65,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Account", "label": "Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Account", "options": "Account",
"permlevel": 0, "permlevel": 0,
@@ -82,7 +85,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:59.582533", "max_attachments": 0,
"modified": "2015-11-16 06:29:51.450360",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Party Account", "name": "Party Account",

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

@@ -33,7 +33,7 @@ class PaymentReconciliation(Document):
t1.name = t2.parent and t1.docstatus = 1 and t2.docstatus = 1 t1.name = t2.parent and t1.docstatus = 1 and t2.docstatus = 1
and t2.party_type = %(party_type)s and t2.party = %(party)s and t2.party_type = %(party_type)s and t2.party = %(party)s
and t2.account = %(account)s and {dr_or_cr} > 0 and t2.account = %(account)s and {dr_or_cr} > 0
and ifnull(t2.reference_type, '') in ('', 'Sales Order', 'Purchase Order') and (t2.reference_type is null or t2.reference_type in ('', 'Sales Order', 'Purchase Order'))
{cond} {cond}
and (CASE and (CASE
WHEN t1.voucher_type in ('Debit Note', 'Credit Note') WHEN t1.voucher_type in ('Debit Note', 'Credit Note')

9
erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
View File

@@ -19,6 +19,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Invoice Type", "label": "Invoice Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Sales Invoice\nPurchase Invoice\nJournal Entry", "options": "Sales Invoice\nPurchase Invoice\nJournal Entry",
"permlevel": 0, "permlevel": 0,
@@ -41,6 +42,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Invoice Number", "label": "Invoice Number",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "", "options": "",
"permlevel": 0, "permlevel": 0,
@@ -63,6 +65,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Invoice Date", "label": "Invoice Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -84,6 +87,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -105,6 +109,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Amount", "label": "Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -126,6 +131,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Outstanding Amount", "label": "Outstanding Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -144,7 +150,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-16 06:14:07.460813", "max_attachments": 0,
"modified": "2015-11-16 06:29:51.516537",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Reconciliation Invoice", "name": "Payment Reconciliation Invoice",

13
erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
View File

@@ -19,6 +19,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Journal Entry", "label": "Journal Entry",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Journal Entry", "options": "Journal Entry",
"permlevel": 0, "permlevel": 0,
@@ -41,6 +42,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Posting Date", "label": "Posting Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -62,6 +64,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Amount", "label": "Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -83,6 +86,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Advance", "label": "Is Advance",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -104,6 +108,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Voucher Detail Number", "label": "Voucher Detail Number",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -125,6 +130,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -146,6 +152,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Invoice Number", "label": "Invoice Number",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "", "options": "",
"permlevel": 0, "permlevel": 0,
@@ -168,6 +175,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Allocated amount", "label": "Allocated amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -190,6 +198,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -211,6 +220,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Remark", "label": "Remark",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -229,7 +239,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:59.835936", "max_attachments": 0,
"modified": "2015-11-16 06:29:51.563989",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Reconciliation Payment", "name": "Payment Reconciliation Payment",

72
erpnext/accounts/doctype/payment_tool/payment_tool.py
View File

@@ -8,6 +8,7 @@ from frappe.utils import flt
from frappe.model.document import Document from frappe.model.document import Document
import json import json
from erpnext.accounts.utils import get_account_currency from erpnext.accounts.utils import get_account_currency
from erpnext.accounts.doctype.journal_entry.journal_entry import get_exchange_rate
class PaymentTool(Document): class PaymentTool(Document):
def make_journal_entry(self): def make_journal_entry(self):
@@ -19,7 +20,15 @@ class PaymentTool(Document):
jv.company = self.company jv.company = self.company
jv.cheque_no = self.reference_no jv.cheque_no = self.reference_no
jv.cheque_date = self.reference_date jv.cheque_date = self.reference_date
party_account_currency, party_account_type = frappe.db.get_value("Account", self.party_account,
["account_currency", "account_type"])
bank_account_currency, bank_account_type = None, None
if self.payment_account:
bank_account_currency, bank_account_type = frappe.db.get_value("Account", self.payment_account,
["account_currency", "account_type"])
if not self.total_payment_amount: if not self.total_payment_amount:
frappe.throw(_("Please enter Payment Amount in atleast one row")) frappe.throw(_("Please enter Payment Amount in atleast one row"))
@@ -27,27 +36,56 @@ class PaymentTool(Document):
if not frappe.db.get_value(v.against_voucher_type, {"name": v.against_voucher_no}): if not frappe.db.get_value(v.against_voucher_type, {"name": v.against_voucher_no}):
frappe.throw(_("Row {0}: {1} is not a valid {2}").format(v.idx, v.against_voucher_no, frappe.throw(_("Row {0}: {1} is not a valid {2}").format(v.idx, v.against_voucher_no,
v.against_voucher_type)) v.against_voucher_type))
if v.payment_amount: if v.payment_amount:
exchange_rate = get_exchange_rate(self.party_account, party_account_currency,
self.company, v.against_voucher_type, v.against_voucher_no)
d1 = jv.append("accounts") d1 = jv.append("accounts")
d1.account = self.party_account d1.account = self.party_account
d1.party_type = self.party_type d1.party_type = self.party_type
d1.party = self.party d1.party = self.party
d1.account_currency = party_account_currency
d1.account_type = party_account_type
d1.balance = get_balance_on(self.party_account) d1.balance = get_balance_on(self.party_account)
d1.party_balance = get_balance_on(party=self.party, party_type=self.party_type)
d1.exchange_rate = exchange_rate
d1.set("debit_in_account_currency" if self.received_or_paid=="Paid" \ d1.set("debit_in_account_currency" if self.received_or_paid=="Paid" \
else "credit_in_account_currency", flt(v.payment_amount)) else "credit_in_account_currency", flt(v.payment_amount))
d1.set("reference_type", v.against_voucher_type) d1.reference_type = v.against_voucher_type
d1.set("reference_name", v.against_voucher_no) d1.reference_name = v.against_voucher_no
d1.set('is_advance', 'Yes' if v.against_voucher_type in ['Sales Order', 'Purchase Order'] else 'No') d1.is_advance = 'Yes' \
total_payment_amount = flt(total_payment_amount) + \ if v.against_voucher_type in ['Sales Order', 'Purchase Order'] else 'No'
flt(d1.debit_in_account_currency) - flt(d1.credit_in_account_currency)
amount = flt(d1.debit_in_account_currency) - flt(d1.credit_in_account_currency)
if bank_account_currency == party_account_currency:
total_payment_amount += amount
else:
total_payment_amount += amount*exchange_rate
d2 = jv.append("accounts") d2 = jv.append("accounts")
d2.account = self.payment_account
d2.set('debit_in_account_currency' if total_payment_amount < 0 \
else 'credit_in_account_currency', abs(total_payment_amount))
if self.payment_account: if self.payment_account:
d2.balance = get_balance_on(self.payment_account) bank_account_currency, bank_account_type = frappe.db.get_value("Account", self.payment_account,
["account_currency", "account_type"])
d2.account = self.payment_account
d2.account_currency = bank_account_currency
d2.account_type = bank_account_type
d2.exchange_rate = get_exchange_rate(self.payment_account, self.company)
d2.account_balance = get_balance_on(self.payment_account)
amount_field_bank = 'debit_in_account_currency' if total_payment_amount < 0 \
else 'credit_in_account_currency'
d2.set(amount_field_bank, abs(total_payment_amount))
company_currency = frappe.db.get_value("Company", self.company, "default_currency")
if party_account_currency != company_currency or \
(bank_account_currency and bank_account_currency != company_currency):
jv.multi_currency = 1
jv.set_amounts_in_company_currency()
jv.set_total_debit_credit()
return jv.as_dict() return jv.as_dict()
@@ -85,8 +123,8 @@ def get_orders_to_be_billed(party_type, party, party_account_currency, company_c
orders = frappe.db.sql(""" orders = frappe.db.sql("""
select select
name as voucher_no, name as voucher_no,
ifnull({ref_field}, 0) as invoice_amount, {ref_field} as invoice_amount,
(ifnull({ref_field}, 0) - ifnull(advance_paid, 0)) as outstanding_amount, ({ref_field} - advance_paid) as outstanding_amount,
transaction_date as posting_date transaction_date as posting_date
from from
`tab{voucher_type}` `tab{voucher_type}`
@@ -94,8 +132,8 @@ def get_orders_to_be_billed(party_type, party, party_account_currency, company_c
{party_type} = %s {party_type} = %s
and docstatus = 1 and docstatus = 1
and ifnull(status, "") != "Stopped" and ifnull(status, "") != "Stopped"
and ifnull({ref_field}, 0) > ifnull(advance_paid, 0) and {ref_field} > advance_paid
and abs(100 - ifnull(per_billed, 0)) > 0.01 and abs(100 - per_billed) > 0.01
""".format(**{ """.format(**{
"ref_field": ref_field, "ref_field": ref_field,
"voucher_type": voucher_type, "voucher_type": voucher_type,
@@ -116,7 +154,7 @@ def get_against_voucher_amount(against_voucher_type, against_voucher_no, party_a
ref_field = "base_grand_total" if party_account_currency == company_currency else "grand_total" ref_field = "base_grand_total" if party_account_currency == company_currency else "grand_total"
if against_voucher_type in ["Sales Order", "Purchase Order"]: if against_voucher_type in ["Sales Order", "Purchase Order"]:
select_cond = "{0} as total_amount, ifnull({0}, 0) - ifnull(advance_paid, 0) as outstanding_amount"\ select_cond = "{0} as total_amount, {0} - advance_paid as outstanding_amount"\
.format(ref_field) .format(ref_field)
elif against_voucher_type in ["Sales Invoice", "Purchase Invoice"]: elif against_voucher_type in ["Sales Invoice", "Purchase Invoice"]:
select_cond = "{0} as total_amount, outstanding_amount".format(ref_field) select_cond = "{0} as total_amount, outstanding_amount".format(ref_field)
@@ -125,6 +163,6 @@ def get_against_voucher_amount(against_voucher_type, against_voucher_no, party_a
select_cond = "{0} as total_amount".format(ref_field) select_cond = "{0} as total_amount".format(ref_field)
details = frappe.db.sql("""select {0} from `tab{1}` where name = %s""" details = frappe.db.sql("""select {0} from `tab{1}` where name = %s"""
.format(select_cond, against_voucher_type), against_voucher_no, as_dict=1) .format(select_cond, frappe.db.escape(against_voucher_type)), against_voucher_no, as_dict=1)
return details[0] if details else {} return details[0] if details else {}

9
erpnext/accounts/doctype/payment_tool_detail/payment_tool_detail.json
View File

@@ -19,6 +19,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Against Voucher Type", "label": "Against Voucher Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "DocType", "options": "DocType",
"permlevel": 0, "permlevel": 0,
@@ -43,6 +44,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Against Voucher No", "label": "Against Voucher No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "against_voucher_type", "options": "against_voucher_type",
"permlevel": 0, "permlevel": 0,
@@ -64,6 +66,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -86,6 +89,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Total Amount", "label": "Total Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "party_account_currency", "options": "party_account_currency",
"permlevel": 0, "permlevel": 0,
@@ -108,6 +112,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Outstanding Amount", "label": "Outstanding Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "party_account_currency", "options": "party_account_currency",
"permlevel": 0, "permlevel": 0,
@@ -130,6 +135,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Payment Amount", "label": "Payment Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "party_account_currency", "options": "party_account_currency",
"permlevel": 0, "permlevel": 0,
@@ -149,7 +155,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:59.950506", "max_attachments": 0,
"modified": "2015-11-16 06:29:51.626386",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Tool Detail", "name": "Payment Tool Detail",

14
erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.js
View File

@@ -10,12 +10,12 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
// ***************** Get Account Head ***************** // ***************** Get Account Head *****************
cur_frm.fields_dict['closing_account_head'].get_query = function(doc, cdt, cdn) { cur_frm.fields_dict['closing_account_head'].get_query = function(doc, cdt, cdn) {
return{ return {
filters:{ filters: [
"company": doc.company, ['Account', 'company', '=', doc.company],
"root_type": "Liability", ['Account', 'is_group', '=', '0'],
"freeze_account": "No", ['Account', 'freeze_account', '=', 'No'],
"is_group": 0 ['Account', 'root_type', 'in', 'Liability, Equity']
} ]
} }
} }

12
erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.json
View File

@@ -18,6 +18,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -41,6 +42,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Transaction Date", "label": "Transaction Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "transaction_date", "oldfieldname": "transaction_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -64,6 +66,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Posting Date", "label": "Posting Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "posting_date", "oldfieldname": "posting_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -87,6 +90,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Closing Fiscal Year", "label": "Closing Fiscal Year",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -111,6 +115,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amended From", "label": "Amended From",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -135,6 +140,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -158,6 +164,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -181,6 +188,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Closing Account Head", "label": "Closing Account Head",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "closing_account_head", "oldfieldname": "closing_account_head",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -205,6 +213,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Remarks", "label": "Remarks",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "remarks", "oldfieldname": "remarks",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -227,7 +236,8 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-21 12:40:58.278256", "max_attachments": 0,
"modified": "2015-11-16 06:29:51.671436",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Period Closing Voucher", "name": "Period Closing Voucher",

26
erpnext/accounts/doctype/period_closing_voucher/period_closing_voucher.py
View File

@@ -22,21 +22,21 @@ class PeriodClosingVoucher(AccountsController):
def validate_account_head(self): def validate_account_head(self):
closing_account_type = frappe.db.get_value("Account", self.closing_account_head, "root_type") closing_account_type = frappe.db.get_value("Account", self.closing_account_head, "root_type")
if closing_account_type != "Liability": if closing_account_type != "Liability":
frappe.throw(_("Closing Account {0} must be of type 'Liability'") frappe.throw(_("Closing Account {0} must be of type 'Liability'")
.format(self.closing_account_head)) .format(self.closing_account_head))
account_currency = get_account_currency(self.closing_account_head) account_currency = get_account_currency(self.closing_account_head)
company_currency = frappe.db.get_value("Company", self.company, "default_currency") company_currency = frappe.db.get_value("Company", self.company, "default_currency")
if account_currency != company_currency: if account_currency != company_currency:
frappe.throw(_("Currency of the Closing Account must be {0}").format(company_currency)) frappe.throw(_("Currency of the Closing Account must be {0}").format(company_currency))
def validate_posting_date(self): def validate_posting_date(self):
from erpnext.accounts.utils import get_fiscal_year, validate_fiscal_year from erpnext.accounts.utils import get_fiscal_year, validate_fiscal_year
validate_fiscal_year(self.posting_date, self.fiscal_year, label=_("Posting Date"), doc=self) validate_fiscal_year(self.posting_date, self.fiscal_year, label=_("Posting Date"), doc=self)
self.year_start_date = get_fiscal_year(self.posting_date, self.fiscal_year)[1] self.year_start_date = get_fiscal_year(self.posting_date, self.fiscal_year)[1]
pce = frappe.db.sql("""select name from `tabPeriod Closing Voucher` pce = frappe.db.sql("""select name from `tabPeriod Closing Voucher`
@@ -50,7 +50,7 @@ class PeriodClosingVoucher(AccountsController):
gl_entries = [] gl_entries = []
net_pl_balance = 0 net_pl_balance = 0
pl_accounts = self.get_pl_balances() pl_accounts = self.get_pl_balances()
for acc in pl_accounts: for acc in pl_accounts:
if flt(acc.balance_in_company_currency): if flt(acc.balance_in_company_currency):
gl_entries.append(self.get_gl_dict({ gl_entries.append(self.get_gl_dict({
@@ -67,7 +67,7 @@ class PeriodClosingVoucher(AccountsController):
})) }))
net_pl_balance += flt(acc.balance_in_company_currency) net_pl_balance += flt(acc.balance_in_company_currency)
if net_pl_balance: if net_pl_balance:
gl_entries.append(self.get_gl_dict({ gl_entries.append(self.get_gl_dict({
"account": self.closing_account_head, "account": self.closing_account_head,
@@ -76,20 +76,20 @@ class PeriodClosingVoucher(AccountsController):
"credit_in_account_currency": abs(net_pl_balance) if net_pl_balance < 0 else 0, "credit_in_account_currency": abs(net_pl_balance) if net_pl_balance < 0 else 0,
"credit": abs(net_pl_balance) if net_pl_balance < 0 else 0 "credit": abs(net_pl_balance) if net_pl_balance < 0 else 0
})) }))
from erpnext.accounts.general_ledger import make_gl_entries from erpnext.accounts.general_ledger import make_gl_entries
make_gl_entries(gl_entries) make_gl_entries(gl_entries)
def get_pl_balances(self): def get_pl_balances(self):
"""Get balance for pl accounts""" """Get balance for pl accounts"""
return frappe.db.sql(""" return frappe.db.sql("""
select select
t1.account, t2.account_currency, sum(ifnull(t1.debit_in_account_currency,0))-sum(ifnull(t1.credit_in_account_currency,0)) t1.account, t2.account_currency,
as balance_in_account_currency, sum(t1.debit_in_account_currency) - sum(t1.credit_in_account_currency) as balance_in_account_currency,
sum(ifnull(t1.debit,0))-sum(ifnull(t1.credit,0)) as balance_in_company_currency sum(t1.debit) - sum(t1.credit) as balance_in_company_currency
from `tabGL Entry` t1, `tabAccount` t2 from `tabGL Entry` t1, `tabAccount` t2
where t1.account = t2.name and ifnull(t2.report_type, '') = 'Profit and Loss' where t1.account = t2.name and t2.report_type = 'Profit and Loss'
and t2.docstatus < 2 and t2.company = %s and t2.docstatus < 2 and t2.company = %s
and t1.posting_date between %s and %s and t1.posting_date between %s and %s
group by t1.account group by t1.account
""", (self.company, self.get("year_start_date"), self.posting_date), as_dict=1) """, (self.company, self.get("year_start_date"), self.posting_date), as_dict=1)

54
erpnext/accounts/doctype/period_closing_voucher/test_period_closing_voucher.py
View File

@@ -12,60 +12,60 @@ from erpnext.accounts.doctype.journal_entry.test_journal_entry import make_journ
class TestPeriodClosingVoucher(unittest.TestCase): class TestPeriodClosingVoucher(unittest.TestCase):
def test_closing_entry(self): def test_closing_entry(self):
year_start_date = get_fiscal_year(today())[1] year_start_date = get_fiscal_year(today())[1]
make_journal_entry("_Test Bank - _TC", "Sales - _TC", 400, make_journal_entry("_Test Bank - _TC", "Sales - _TC", 400,
"_Test Cost Center - _TC", submit=True) "_Test Cost Center - _TC", submit=True)
make_journal_entry("_Test Account Cost for Goods Sold - _TC", make_journal_entry("_Test Account Cost for Goods Sold - _TC",
"_Test Bank - _TC", 600, "_Test Cost Center - _TC", submit=True) "_Test Bank - _TC", 600, "_Test Cost Center - _TC", submit=True)
random_expense_account = frappe.db.sql(""" random_expense_account = frappe.db.sql("""
select t1.account, select t1.account,
sum(ifnull(t1.debit,0))-sum(ifnull(t1.credit,0)) as balance, sum(t1.debit) - sum(t1.credit) as balance,
sum(ifnull(t1.debit_in_account_currency,0))-sum(ifnull(t1.credit_in_account_currency,0)) \ sum(t1.debit_in_account_currency) - sum(t1.credit_in_account_currency) \
as balance_in_account_currency as balance_in_account_currency
from `tabGL Entry` t1, `tabAccount` t2 from `tabGL Entry` t1, `tabAccount` t2
where t1.account = t2.name and ifnull(t2.root_type, '') = 'Expense' where t1.account = t2.name and t2.root_type = 'Expense'
and t2.docstatus < 2 and t2.company = '_Test Company' and t2.docstatus < 2 and t2.company = '_Test Company'
and t1.posting_date between %s and %s and t1.posting_date between %s and %s
group by t1.account group by t1.account
having sum(ifnull(t1.debit,0)) > sum(ifnull(t1.credit,0)) having sum(t1.debit) > sum(t1.credit)
limit 1""", (year_start_date, today()), as_dict=True) limit 1""", (year_start_date, today()), as_dict=True)
profit_or_loss = frappe.db.sql("""select sum(ifnull(t1.debit,0))-sum(ifnull(t1.credit,0)) as balance profit_or_loss = frappe.db.sql("""select sum(t1.debit) - sum(t1.credit) as balance
from `tabGL Entry` t1, `tabAccount` t2 from `tabGL Entry` t1, `tabAccount` t2
where t1.account = t2.name and ifnull(t2.report_type, '') = 'Profit and Loss' where t1.account = t2.name and t2.report_type = 'Profit and Loss'
and t2.docstatus < 2 and t2.company = '_Test Company' and t2.docstatus < 2 and t2.company = '_Test Company'
and t1.posting_date between %s and %s""", (year_start_date, today())) and t1.posting_date between %s and %s""", (year_start_date, today()))
profit_or_loss = flt(profit_or_loss[0][0]) if profit_or_loss else 0 profit_or_loss = flt(profit_or_loss[0][0]) if profit_or_loss else 0
pcv = self.make_period_closing_voucher() pcv = self.make_period_closing_voucher()
# Check value for closing account # Check value for closing account
gle_amount_for_closing_account = frappe.db.sql("""select ifnull(debit, 0) - ifnull(credit, 0) gle_amount_for_closing_account = frappe.db.sql("""select debit - credit
from `tabGL Entry` where voucher_type='Period Closing Voucher' and voucher_no=%s from `tabGL Entry` where voucher_type='Period Closing Voucher' and voucher_no=%s
and account = '_Test Account Reserves and Surplus - _TC'""", pcv.name) and account = '_Test Account Reserves and Surplus - _TC'""", pcv.name)
gle_amount_for_closing_account = flt(gle_amount_for_closing_account[0][0]) \ gle_amount_for_closing_account = flt(gle_amount_for_closing_account[0][0]) \
if gle_amount_for_closing_account else 0 if gle_amount_for_closing_account else 0
self.assertEqual(gle_amount_for_closing_account, profit_or_loss) self.assertEqual(gle_amount_for_closing_account, profit_or_loss)
if random_expense_account: if random_expense_account:
# Check posted value for teh above random_expense_account # Check posted value for teh above random_expense_account
gle_for_random_expense_account = frappe.db.sql(""" gle_for_random_expense_account = frappe.db.sql("""
select ifnull(debit, 0) - ifnull(credit, 0) as amount, select debit - credit as amount,
ifnull(debit_in_account_currency, 0) - ifnull(credit_in_account_currency, 0) debit_in_account_currency - credit_in_account_currency
as amount_in_account_currency as amount_in_account_currency
from `tabGL Entry` from `tabGL Entry`
where voucher_type='Period Closing Voucher' and voucher_no=%s and account =%s""", where voucher_type='Period Closing Voucher' and voucher_no=%s and account =%s""",
(pcv.name, random_expense_account[0].account), as_dict=True) (pcv.name, random_expense_account[0].account), as_dict=True)
self.assertEqual(gle_for_random_expense_account[0].amount, -1*random_expense_account[0].balance) self.assertEqual(gle_for_random_expense_account[0].amount, -1*random_expense_account[0].balance)
self.assertEqual(gle_for_random_expense_account[0].amount_in_account_currency, self.assertEqual(gle_for_random_expense_account[0].amount_in_account_currency,
-1*random_expense_account[0].balance_in_account_currency) -1*random_expense_account[0].balance_in_account_currency)
def make_period_closing_voucher(self): def make_period_closing_voucher(self):
pcv = frappe.get_doc({ pcv = frappe.get_doc({
"doctype": "Period Closing Voucher", "doctype": "Period Closing Voucher",
@@ -77,7 +77,7 @@ class TestPeriodClosingVoucher(unittest.TestCase):
}) })
pcv.insert() pcv.insert()
pcv.submit() pcv.submit()
return pcv return pcv

29
erpnext/accounts/doctype/pos_profile/pos_profile.json
View File

@@ -19,6 +19,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Applicable for User", "label": "Applicable for User",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "user", "oldfieldname": "user",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -43,6 +44,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Series", "label": "Series",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "naming_series", "oldfieldname": "naming_series",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -67,6 +69,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Warehouse", "label": "Warehouse",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "warehouse", "oldfieldname": "warehouse",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -93,6 +96,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Update Stock", "label": "Update Stock",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -113,6 +117,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -135,6 +140,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Customer", "label": "Customer",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "customer_account", "oldfieldname": "customer_account",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -159,6 +165,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -183,6 +190,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Currency", "label": "Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "currency", "oldfieldname": "currency",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -207,6 +215,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Mode of Payment", "label": "Mode of Payment",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Mode of Payment", "options": "Mode of Payment",
"permlevel": 0, "permlevel": 0,
@@ -229,6 +238,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -251,6 +261,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Print Format", "label": "Print Format",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Print Format", "options": "Print Format",
"permlevel": 0, "permlevel": 0,
@@ -274,6 +285,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Letter Head", "label": "Letter Head",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "letter_head", "oldfieldname": "letter_head",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -298,6 +310,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Print Heading", "label": "Print Heading",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "select_print_heading", "oldfieldname": "select_print_heading",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -322,6 +335,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Terms and Conditions", "label": "Terms and Conditions",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "tc_name", "oldfieldname": "tc_name",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -345,6 +359,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -368,6 +383,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Territory", "label": "Territory",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "territory", "oldfieldname": "territory",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -392,6 +408,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List", "label": "Price List",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "price_list_name", "oldfieldname": "price_list_name",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -415,6 +432,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -437,6 +455,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off Account", "label": "Write Off Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Account", "options": "Account",
"permlevel": 0, "permlevel": 0,
@@ -460,6 +479,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off Cost Center", "label": "Write Off Cost Center",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Cost Center", "options": "Cost Center",
"permlevel": 0, "permlevel": 0,
@@ -483,6 +503,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges", "label": "Taxes and Charges",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "charge", "oldfieldname": "charge",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -506,6 +527,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -528,6 +550,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Cash/Bank Account", "label": "Cash/Bank Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "cash_bank_account", "oldfieldname": "cash_bank_account",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -552,6 +575,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Income Account", "label": "Income Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "income_account", "oldfieldname": "income_account",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -577,6 +601,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Expense Account", "label": "Expense Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Account", "options": "Account",
"permlevel": 0, "permlevel": 0,
@@ -599,6 +624,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Cost Center", "label": "Cost Center",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "cost_center", "oldfieldname": "cost_center",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -622,7 +648,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:39:00.196535", "max_attachments": 0,
"modified": "2015-11-16 06:29:51.741253",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "POS Profile", "name": "POS Profile",

49
erpnext/accounts/doctype/pricing_rule/pricing_rule.json
View File

@@ -20,6 +20,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -41,6 +42,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Title", "label": "Title",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -63,7 +65,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Apply On", "label": "Apply On",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nItem Code\nItem Group\nBrand", "options": "\nItem Code\nItem Group\nBrand",
"permlevel": 0, "permlevel": 0,
@@ -87,6 +90,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Item Code", "label": "Item Code",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Item", "options": "Item",
"permlevel": 0, "permlevel": 0,
@@ -110,6 +114,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Brand", "label": "Brand",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Brand", "options": "Brand",
"permlevel": 0, "permlevel": 0,
@@ -133,6 +138,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Item Group", "label": "Item Group",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Item Group", "options": "Item Group",
"permlevel": 0, "permlevel": 0,
@@ -154,6 +160,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -176,7 +183,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Priority", "label": "Priority",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20", "options": "\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n17\n18\n19\n20",
"permlevel": 0, "permlevel": 0,
@@ -199,6 +207,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Disable", "label": "Disable",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -219,6 +228,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -241,6 +251,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Selling", "label": "Selling",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -262,6 +273,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Buying", "label": "Buying",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -282,6 +294,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -304,7 +317,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Applicable For", "label": "Applicable For",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nCustomer\nCustomer Group\nTerritory\nSales Partner\nCampaign\nSupplier\nSupplier Type", "options": "\nCustomer\nCustomer Group\nTerritory\nSales Partner\nCampaign\nSupplier\nSupplier Type",
"permlevel": 0, "permlevel": 0,
@@ -328,6 +342,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Customer", "label": "Customer",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Customer", "options": "Customer",
"permlevel": 0, "permlevel": 0,
@@ -351,6 +366,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Customer Group", "label": "Customer Group",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Customer Group", "options": "Customer Group",
"permlevel": 0, "permlevel": 0,
@@ -374,6 +390,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Territory", "label": "Territory",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Territory", "options": "Territory",
"permlevel": 0, "permlevel": 0,
@@ -397,6 +414,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Sales Partner", "label": "Sales Partner",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Sales Partner", "options": "Sales Partner",
"permlevel": 0, "permlevel": 0,
@@ -420,6 +438,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Campaign", "label": "Campaign",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Campaign", "options": "Campaign",
"permlevel": 0, "permlevel": 0,
@@ -443,6 +462,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier", "label": "Supplier",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Supplier", "options": "Supplier",
"permlevel": 0, "permlevel": 0,
@@ -466,6 +486,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier Type", "label": "Supplier Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Supplier Type", "options": "Supplier Type",
"permlevel": 0, "permlevel": 0,
@@ -487,6 +508,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -509,6 +531,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Min Qty", "label": "Min Qty",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -529,6 +552,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -551,6 +575,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Max Qty", "label": "Max Qty",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -571,6 +596,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -594,6 +620,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Valid From", "label": "Valid From",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -615,6 +642,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Valid Upto", "label": "Valid Upto",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -635,6 +663,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -656,6 +685,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
@@ -678,6 +708,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -699,7 +730,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price or Discount", "label": "Price or Discount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nPrice\nDiscount Percentage", "options": "\nPrice\nDiscount Percentage",
"permlevel": 0, "permlevel": 0,
@@ -721,6 +753,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -743,6 +776,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price", "label": "Price",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -765,6 +799,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Discount on Price List Rate (%)", "label": "Discount on Price List Rate (%)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -787,6 +822,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "For Price List", "label": "For Price List",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Price List", "options": "Price List",
"permlevel": 0, "permlevel": 0,
@@ -809,6 +845,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Simple", "options": "Simple",
"permlevel": 0, "permlevel": 0,
@@ -831,6 +868,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Pricing Rule Help", "label": "Pricing Rule Help",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -851,7 +889,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:39:00.632196", "max_attachments": 0,
"modified": "2015-11-16 06:29:51.958974",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Pricing Rule", "name": "Pricing Rule",

6
erpnext/accounts/doctype/pricing_rule/pricing_rule.py
View File

@@ -179,7 +179,7 @@ def get_pricing_rules(args):
if parent_groups: if parent_groups:
if allow_blank: parent_groups.append('') if allow_blank: parent_groups.append('')
condition = " ifnull("+field+", '') in ('" + \ condition = " ifnull("+field+", '') in ('" + \
"', '".join([d.replace("'", "\\'").replace('"', '\\"').replace("%", "%%") for d in parent_groups])+"')" "', '".join([frappe.db.escape(d) for d in parent_groups])+"')"
return condition return condition
@@ -206,8 +206,8 @@ def get_pricing_rules(args):
return frappe.db.sql("""select * from `tabPricing Rule` return frappe.db.sql("""select * from `tabPricing Rule`
where (item_code=%(item_code)s {item_group_condition} or brand=%(brand)s) where (item_code=%(item_code)s {item_group_condition} or brand=%(brand)s)
and docstatus < 2 and ifnull(disable, 0) = 0 and docstatus < 2 and disable = 0
and ifnull({transaction_type}, 0) = 1 {conditions} and {transaction_type} = 1 {conditions}
order by priority desc, name desc""".format( order by priority desc, name desc""".format(
item_group_condition=item_group_condition, item_group_condition=item_group_condition,
transaction_type=args.transaction_type, conditions=conditions), args, as_dict=1) transaction_type=args.transaction_type, conditions=conditions), args, as_dict=1)

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

@@ -20,6 +20,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Title", "label": "Title",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -41,7 +42,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Series", "label": "Series",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "naming_series", "oldfieldname": "naming_series",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -66,6 +68,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier", "label": "Supplier",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "supplier", "oldfieldname": "supplier",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -91,6 +94,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier Name", "label": "Supplier Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "supplier_name", "oldfieldname": "supplier_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -114,6 +118,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Address", "label": "Address",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -135,6 +140,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact", "label": "Contact",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -156,6 +162,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Mobile No", "label": "Mobile No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -177,6 +184,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact Email", "label": "Contact Email",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -197,6 +205,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -221,6 +230,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Date", "label": "Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "posting_date", "oldfieldname": "posting_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -245,6 +255,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier Invoice No", "label": "Supplier Invoice No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "bill_no", "oldfieldname": "bill_no",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -268,6 +279,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier Invoice Date", "label": "Supplier Invoice Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "bill_date", "oldfieldname": "bill_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -291,6 +303,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amended From", "label": "Amended From",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -315,6 +328,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -339,6 +353,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Return", "label": "Is Return",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -362,6 +377,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Return Against Purchase Invoice", "label": "Return Against Purchase Invoice",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Purchase Invoice", "options": "Purchase Invoice",
"permlevel": 0, "permlevel": 0,
@@ -385,6 +401,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Currency and Price List", "label": "Currency and Price List",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-tag", "options": "icon-tag",
"permlevel": 0, "permlevel": 0,
@@ -407,6 +424,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Currency", "label": "Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "currency", "oldfieldname": "currency",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -432,6 +450,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Exchange Rate", "label": "Exchange Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "conversion_rate", "oldfieldname": "conversion_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -455,6 +474,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -476,6 +496,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List", "label": "Price List",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Price List", "options": "Price List",
"permlevel": 0, "permlevel": 0,
@@ -498,6 +519,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List Currency", "label": "Price List Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Currency", "options": "Currency",
"permlevel": 0, "permlevel": 0,
@@ -520,6 +542,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List Exchange Rate", "label": "Price List Exchange Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "9", "precision": "9",
@@ -542,6 +565,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Ignore Pricing Rule", "label": "Ignore Pricing Rule",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 1, "permlevel": 1,
"print_hide": 1, "print_hide": 1,
@@ -563,6 +587,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-shopping-cart", "options": "icon-shopping-cart",
@@ -586,6 +611,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Items", "label": "Items",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "entries", "oldfieldname": "entries",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -609,6 +635,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -630,6 +657,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total (Company Currency)", "label": "Total (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -654,6 +682,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Total (Company Currency)", "label": "Net Total (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "net_total", "oldfieldname": "net_total",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -677,6 +706,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -698,6 +728,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total", "label": "Total",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -721,6 +752,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Total", "label": "Net Total",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "net_total_import", "oldfieldname": "net_total_import",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -745,6 +777,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money", "options": "icon-money",
@@ -768,6 +801,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges", "label": "Taxes and Charges",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "purchase_other_charges", "oldfieldname": "purchase_other_charges",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -792,6 +826,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Purchase Taxes and Charges", "label": "Purchase Taxes and Charges",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "purchase_tax_details", "oldfieldname": "purchase_tax_details",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -816,6 +851,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges Calculation", "label": "Taxes and Charges Calculation",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "HTML", "oldfieldtype": "HTML",
"permlevel": 0, "permlevel": 0,
@@ -838,6 +874,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money", "options": "icon-money",
@@ -861,6 +898,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges Added (Company Currency)", "label": "Taxes and Charges Added (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "other_charges_added", "oldfieldname": "other_charges_added",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -885,6 +923,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges Deducted (Company Currency)", "label": "Taxes and Charges Deducted (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "other_charges_deducted", "oldfieldname": "other_charges_deducted",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -909,6 +948,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total Taxes and Charges (Company Currency)", "label": "Total Taxes and Charges (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "total_tax", "oldfieldname": "total_tax",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -932,6 +972,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -954,6 +995,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges Added", "label": "Taxes and Charges Added",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "other_charges_added_import", "oldfieldname": "other_charges_added_import",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -978,6 +1020,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges Deducted", "label": "Taxes and Charges Deducted",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "other_charges_deducted_import", "oldfieldname": "other_charges_deducted_import",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1002,6 +1045,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total Taxes and Charges", "label": "Total Taxes and Charges",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -1026,6 +1070,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Additional Discount", "label": "Additional Discount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1048,7 +1093,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Apply Additional Discount On", "label": "Apply Additional Discount On",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nGrand Total\nNet Total", "options": "\nGrand Total\nNet Total",
"permlevel": 0, "permlevel": 0,
@@ -1071,6 +1117,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1093,6 +1140,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Additional Discount Amount", "label": "Additional Discount Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -1116,6 +1164,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Additional Discount Amount (Company Currency)", "label": "Additional Discount Amount (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -1138,6 +1187,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1160,6 +1210,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Grand Total (Company Currency)", "label": "Grand Total (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "grand_total", "oldfieldname": "grand_total",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1185,6 +1236,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "In Words (Company Currency)", "label": "In Words (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "in_words", "oldfieldname": "in_words",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -1207,6 +1259,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -1230,6 +1283,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Grand Total", "label": "Grand Total",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "grand_total_import", "oldfieldname": "grand_total_import",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1254,6 +1308,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "In Words", "label": "In Words",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "in_words_import", "oldfieldname": "in_words_import",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -1277,6 +1332,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total Advance", "label": "Total Advance",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "total_advance", "oldfieldname": "total_advance",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1301,6 +1357,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Outstanding Amount", "label": "Outstanding Amount",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "outstanding_amount", "oldfieldname": "outstanding_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1327,6 +1384,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off", "label": "Write Off",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1349,6 +1407,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off Amount", "label": "Write Off Amount",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -1371,6 +1430,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off Amount (Company Currency)", "label": "Write Off Amount (Company Currency)",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -1393,6 +1453,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1416,6 +1477,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off Account", "label": "Write Off Account",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Account", "options": "Account",
"permlevel": 0, "permlevel": 0,
@@ -1439,6 +1501,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off Cost Center", "label": "Write Off Cost Center",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Cost Center", "options": "Cost Center",
"permlevel": 0, "permlevel": 0,
@@ -1462,6 +1525,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Advance Payments", "label": "Advance Payments",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money", "options": "icon-money",
@@ -1485,6 +1549,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Get Advances Paid", "label": "Get Advances Paid",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Button", "oldfieldtype": "Button",
"options": "get_advances", "options": "get_advances",
@@ -1508,6 +1573,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Advances", "label": "Advances",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "advance_allocation_details", "oldfieldname": "advance_allocation_details",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -1533,6 +1599,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Terms and Conditions", "label": "Terms and Conditions",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-legal", "options": "icon-legal",
"permlevel": 0, "permlevel": 0,
@@ -1555,6 +1622,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Terms", "label": "Terms",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Terms and Conditions", "options": "Terms and Conditions",
"permlevel": 0, "permlevel": 0,
@@ -1577,6 +1645,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Terms and Conditions1", "label": "Terms and Conditions1",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -1599,6 +1668,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact Details", "label": "Contact Details",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-bullhorn", "options": "icon-bullhorn",
"permlevel": 0, "permlevel": 0,
@@ -1621,6 +1691,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier Address", "label": "Supplier Address",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Address", "options": "Address",
"permlevel": 0, "permlevel": 0,
@@ -1642,6 +1713,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -1664,6 +1736,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact Person", "label": "Contact Person",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Contact", "options": "Contact",
"permlevel": 0, "permlevel": 0,
@@ -1686,6 +1759,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Printing Settings", "label": "Printing Settings",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1708,6 +1782,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Letter Head", "label": "Letter Head",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Letter Head", "options": "Letter Head",
"permlevel": 0, "permlevel": 0,
@@ -1731,6 +1806,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Print Heading", "label": "Print Heading",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "select_print_heading", "oldfieldname": "select_print_heading",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -1755,6 +1831,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "More Information", "label": "More Information",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-file-text", "options": "icon-file-text",
@@ -1779,6 +1856,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Credit To", "label": "Credit To",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "credit_to", "oldfieldname": "credit_to",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -1803,6 +1881,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Party Account Currency", "label": "Party Account Currency",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Currency", "options": "Currency",
"permlevel": 0, "permlevel": 0,
@@ -1827,7 +1906,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Opening", "label": "Is Opening",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "is_opening", "oldfieldname": "is_opening",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -1852,6 +1932,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Due Date", "label": "Due Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "due_date", "oldfieldname": "due_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -1875,6 +1956,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Against Expense Account", "label": "Against Expense Account",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "against_expense_account", "oldfieldname": "against_expense_account",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -1897,6 +1979,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -1918,6 +2001,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Mode of Payment", "label": "Mode of Payment",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "mode_of_payment", "oldfieldname": "mode_of_payment",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -1942,6 +2026,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Fiscal Year", "label": "Fiscal Year",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -1966,6 +2051,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Remarks", "label": "Remarks",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "remarks", "oldfieldname": "remarks",
"oldfieldtype": "Text", "oldfieldtype": "Text",
@@ -1991,6 +2077,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Recurring Invoice", "label": "Recurring Invoice",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-time", "options": "icon-time",
"permlevel": 0, "permlevel": 0,
@@ -2015,6 +2102,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Recurring", "label": "Is Recurring",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2037,7 +2125,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Recurring Type", "label": "Recurring Type",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Monthly\nQuarterly\nHalf-yearly\nYearly", "options": "Monthly\nQuarterly\nHalf-yearly\nYearly",
"permlevel": 0, "permlevel": 0,
@@ -2062,6 +2151,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "From Date", "label": "From Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2085,6 +2175,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "To Date", "label": "To Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2108,6 +2199,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Repeat on Day of Month", "label": "Repeat on Day of Month",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2131,6 +2223,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "End Date", "label": "End Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2151,6 +2244,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2175,6 +2269,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Next Date", "label": "Next Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2198,6 +2293,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Recurring Id", "label": "Recurring Id",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2221,6 +2317,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Notification Email Address", "label": "Notification Email Address",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2243,6 +2340,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Recurring Print Format", "label": "Recurring Print Format",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Print Format", "options": "Print Format",
"permlevel": 0, "permlevel": 0,
@@ -2265,7 +2363,8 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-12 16:23:32.141069", "max_attachments": 0,
"modified": "2015-11-16 06:29:52.962561",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice", "name": "Purchase Invoice",

15
erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
View File

@@ -106,7 +106,7 @@ class PurchaseInvoice(BuyingController):
def check_for_stopped_or_closed_status(self): def check_for_stopped_or_closed_status(self):
check_list = [] check_list = []
pc_obj = frappe.get_doc('Purchase Common') pc_obj = frappe.get_doc('Purchase Common')
for d in self.get('items'): for d in self.get('items'):
if d.purchase_order and not d.purchase_order in check_list and not d.purchase_receipt: if d.purchase_order and not d.purchase_order in check_list and not d.purchase_receipt:
check_list.append(d.purchase_order) check_list.append(d.purchase_order)
@@ -176,9 +176,10 @@ class PurchaseInvoice(BuyingController):
throw(_("Purchse Order number required for Item {0}").format(d.item_code)) throw(_("Purchse Order number required for Item {0}").format(d.item_code))
def pr_required(self): def pr_required(self):
stock_items = self.get_stock_items()
if frappe.db.get_value("Buying Settings", None, "pr_required") == 'Yes': if frappe.db.get_value("Buying Settings", None, "pr_required") == 'Yes':
for d in self.get('items'): for d in self.get('items'):
if not d.purchase_receipt: if not d.purchase_receipt and d.item_code in stock_items:
throw(_("Purchase Receipt number required for Item {0}").format(d.item_code)) throw(_("Purchase Receipt number required for Item {0}").format(d.item_code))
def validate_write_off_account(self): def validate_write_off_account(self):
@@ -395,7 +396,7 @@ class PurchaseInvoice(BuyingController):
def on_cancel(self): def on_cancel(self):
self.check_for_stopped_or_closed_status() self.check_for_stopped_or_closed_status()
if not self.is_return: if not self.is_return:
from erpnext.accounts.utils import remove_against_link_from_jv from erpnext.accounts.utils import remove_against_link_from_jv
remove_against_link_from_jv(self.doctype, self.name) remove_against_link_from_jv(self.doctype, self.name)
@@ -438,10 +439,10 @@ def get_expense_account(doctype, txt, searchfield, start, page_len, filters):
or tabAccount.account_type in ("Expense Account", "Fixed Asset", "Temporary")) or tabAccount.account_type in ("Expense Account", "Fixed Asset", "Temporary"))
and tabAccount.is_group=0 and tabAccount.is_group=0
and tabAccount.docstatus!=2 and tabAccount.docstatus!=2
and tabAccount.company = '%(company)s' and tabAccount.company = %(company)s
and tabAccount.%(key)s LIKE '%(txt)s' and tabAccount.{key} LIKE %(txt)s
%(mcond)s""" % {'company': filters['company'], 'key': searchfield, {mcond}""".format( key=frappe.db.escape(searchfield), mcond=get_match_cond(doctype) ),
'txt': "%%%s%%" % frappe.db.escape(txt), 'mcond':get_match_cond(doctype)}) { 'company': filters['company'], 'txt': "%%%s%%" % frappe.db.escape(txt) })
@frappe.whitelist() @frappe.whitelist()
def make_debit_note(source_name, target_doc=None): def make_debit_note(source_name, target_doc=None):

2
erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
View File

@@ -221,7 +221,7 @@ class TestPurchaseInvoice(unittest.TestCase):
test_recurring_document(self, test_records) test_recurring_document(self, test_records)
def test_total_purchase_cost_for_project(self): def test_total_purchase_cost_for_project(self):
existing_purchase_cost = frappe.db.sql("""select sum(ifnull(base_net_amount, 0)) existing_purchase_cost = frappe.db.sql("""select sum(base_net_amount)
from `tabPurchase Invoice Item` where project_name = '_Test Project' and docstatus=1""") from `tabPurchase Invoice Item` where project_name = '_Test Project' and docstatus=1""")
existing_purchase_cost = existing_purchase_cost and existing_purchase_cost[0][0] or 0 existing_purchase_cost = existing_purchase_cost and existing_purchase_cost[0][0] or 0

9
erpnext/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.json
View File

@@ -18,6 +18,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Journal Entry", "label": "Journal Entry",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "journal_voucher", "oldfieldname": "journal_voucher",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -44,6 +45,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Journal Entry Detail No", "label": "Journal Entry Detail No",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "jv_detail_no", "oldfieldname": "jv_detail_no",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -69,6 +71,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Remarks", "label": "Remarks",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "remarks", "oldfieldname": "remarks",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -93,6 +96,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -114,6 +118,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Advance Amount", "label": "Advance Amount",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "advance_amount", "oldfieldname": "advance_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -140,6 +145,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Allocated Amount", "label": "Allocated Amount",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "allocated_amount", "oldfieldname": "allocated_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -164,7 +170,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:03.538046", "max_attachments": 0,
"modified": "2015-11-16 06:29:53.288895",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice Advance", "name": "Purchase Invoice Advance",

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

@@ -19,6 +19,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Item", "label": "Item",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_code", "oldfieldname": "item_code",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -42,6 +43,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -63,6 +65,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Item Name", "label": "Item Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_name", "oldfieldname": "item_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -86,6 +89,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Description", "label": "Description",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -108,6 +112,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Description", "label": "Description",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "description", "oldfieldname": "description",
"oldfieldtype": "Text", "oldfieldtype": "Text",
@@ -133,6 +138,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Image", "label": "Image",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -155,6 +161,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Image View", "label": "Image View",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "image", "options": "image",
"permlevel": 0, "permlevel": 0,
@@ -178,6 +185,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Quantity and Rate", "label": "Quantity and Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -199,6 +207,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Qty", "label": "Qty",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "qty", "oldfieldname": "qty",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -221,6 +230,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -242,6 +252,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "UOM", "label": "UOM",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "UOM", "options": "UOM",
"permlevel": 0, "permlevel": 0,
@@ -264,6 +275,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Conversion Factor", "label": "Conversion Factor",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -284,6 +296,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -305,6 +318,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List Rate", "label": "Price List Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -328,6 +342,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Discount on Price List Rate (%)", "label": "Discount on Price List Rate (%)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -348,6 +363,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -369,6 +385,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List Rate (Company Currency)", "label": "Price List Rate (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -390,6 +407,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -411,6 +429,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Rate ", "label": "Rate ",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "import_rate", "oldfieldname": "import_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -435,6 +454,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Amount", "label": "Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "import_amount", "oldfieldname": "import_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -458,6 +478,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -479,6 +500,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Rate (Company Currency)", "label": "Rate (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "rate", "oldfieldname": "rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -503,6 +525,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amount (Company Currency)", "label": "Amount (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "amount", "oldfieldname": "amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -527,6 +550,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Pricing Rule", "label": "Pricing Rule",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Pricing Rule", "options": "Pricing Rule",
"permlevel": 0, "permlevel": 0,
@@ -548,6 +572,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -570,6 +595,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Rate", "label": "Net Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -593,6 +619,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Amount", "label": "Net Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -615,6 +642,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -637,6 +665,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Rate (Company Currency)", "label": "Net Rate (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -660,6 +689,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Amount (Company Currency)", "label": "Net Amount (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -683,6 +713,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Accounting", "label": "Accounting",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -704,6 +735,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Expense Head", "label": "Expense Head",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "expense_head", "oldfieldname": "expense_head",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -729,6 +761,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -750,6 +783,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Project Name", "label": "Project Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Project", "options": "Project",
"permlevel": 0, "permlevel": 0,
@@ -773,6 +807,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Cost Center", "label": "Cost Center",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "cost_center", "oldfieldname": "cost_center",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -799,6 +834,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reference", "label": "Reference",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -820,6 +856,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Brand", "label": "Brand",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "brand", "oldfieldname": "brand",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -844,6 +881,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Item Group", "label": "Item Group",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_group", "oldfieldname": "item_group",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -869,6 +907,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Item Tax Rate", "label": "Item Tax Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_tax_rate", "oldfieldname": "item_tax_rate",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -892,6 +931,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Item Tax Amount", "label": "Item Tax Amount",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -916,6 +956,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Purchase Order", "label": "Purchase Order",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "purchase_order", "oldfieldname": "purchase_order",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -939,6 +980,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -960,6 +1002,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Purchase Order Item", "label": "Purchase Order Item",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "po_detail", "oldfieldname": "po_detail",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -983,6 +1026,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Purchase Receipt", "label": "Purchase Receipt",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "purchase_receipt", "oldfieldname": "purchase_receipt",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -1007,6 +1051,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Page Break", "label": "Page Break",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -1028,6 +1073,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "PR Detail", "label": "PR Detail",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "pr_detail", "oldfieldname": "pr_detail",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -1051,6 +1097,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Valuation Rate", "label": "Valuation Rate",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -1073,6 +1120,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Raw Materials Supplied Cost", "label": "Raw Materials Supplied Cost",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -1093,7 +1141,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-19 03:04:52.304768", "max_attachments": 0,
"modified": "2015-11-16 06:29:53.343792",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Invoice Item", "name": "Purchase Invoice Item",

30
erpnext/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.json
View File

@@ -19,7 +19,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Consider Tax or Charge for", "label": "Consider Tax or Charge for",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "category", "oldfieldname": "category",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -44,7 +45,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Add or Deduct", "label": "Add or Deduct",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "add_deduct_tax", "oldfieldname": "add_deduct_tax",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -68,7 +70,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Type", "label": "Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "charge_type", "oldfieldname": "charge_type",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -94,6 +97,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reference Row #", "label": "Reference Row #",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "row_id", "oldfieldname": "row_id",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -118,6 +122,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Is this Tax included in Basic Rate?", "label": "Is this Tax included in Basic Rate?",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -139,6 +144,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -160,6 +166,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Account Head", "label": "Account Head",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "account_head", "oldfieldname": "account_head",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -185,6 +192,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Cost Center", "label": "Cost Center",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "cost_center", "oldfieldname": "cost_center",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -209,6 +217,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Description", "label": "Description",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "description", "oldfieldname": "description",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -233,6 +242,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -255,6 +265,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Rate", "label": "Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "rate", "oldfieldname": "rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -277,6 +288,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -299,6 +311,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Amount", "label": "Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "tax_amount", "oldfieldname": "tax_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -323,6 +336,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Tax Amount After Discount Amount", "label": "Tax Amount After Discount Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -346,6 +360,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total", "label": "Total",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "total", "oldfieldname": "total",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -369,6 +384,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -391,6 +407,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amount (Company Currency)", "label": "Amount (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -414,6 +431,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total (Company Currency)", "label": "Total (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -437,6 +455,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Tax Amount After Discount Amount", "label": "Tax Amount After Discount Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -460,6 +479,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Item Wise Tax Detail ", "label": "Item Wise Tax Detail ",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_wise_tax_detail", "oldfieldname": "item_wise_tax_detail",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -483,6 +503,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Parenttype", "label": "Parenttype",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "parenttype", "oldfieldname": "parenttype",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -504,7 +525,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:06.372275", "max_attachments": 0,
"modified": "2015-11-16 06:29:54.644704",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Taxes and Charges", "name": "Purchase Taxes and Charges",

10
erpnext/accounts/doctype/purchase_taxes_and_charges_template/purchase_taxes_and_charges_template.json
View File

@@ -21,6 +21,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Title", "label": "Title",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "title", "oldfieldname": "title",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -44,6 +45,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Default", "label": "Default",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -65,6 +67,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Disabled", "label": "Disabled",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -87,6 +90,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -109,6 +113,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
@@ -131,6 +136,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -153,6 +159,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Purchase Taxes and Charges", "label": "Purchase Taxes and Charges",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "purchase_tax_details", "oldfieldname": "purchase_tax_details",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -176,7 +183,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:39:06.563868", "max_attachments": 0,
"modified": "2015-11-16 06:29:54.729312",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Purchase Taxes and Charges Template", "name": "Purchase Taxes and Charges Template",

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

@@ -48,7 +48,7 @@ def get_items(price_list, sales_or_purchase, item=None):
ON ON
(item_det.item_code=i.name or item_det.item_code=i.variant_of) (item_det.item_code=i.name or item_det.item_code=i.variant_of)
where where
ifnull(i.has_variants, 0) = 0 and i.has_variants = 0 and
{condition} {condition}
order by order by
{order_by} {order_by}

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

@@ -21,6 +21,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-user", "options": "icon-user",
"permlevel": 0, "permlevel": 0,
@@ -44,6 +45,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Title", "label": "Title",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -66,6 +68,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Series", "label": "Series",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "naming_series", "oldfieldname": "naming_series",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -90,6 +93,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Customer", "label": "Customer",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "customer", "oldfieldname": "customer",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -115,6 +119,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Customer Name", "label": "Customer Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "customer_name", "oldfieldname": "customer_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -138,6 +143,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Address", "label": "Address",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -159,6 +165,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact", "label": "Contact",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -180,6 +187,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Mobile No", "label": "Mobile No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -201,6 +209,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact Email", "label": "Contact Email",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -222,6 +231,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Is POS", "label": "Is POS",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "is_pos", "oldfieldname": "is_pos",
"oldfieldtype": "Check", "oldfieldtype": "Check",
@@ -246,6 +256,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Return", "label": "Is Return",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -267,6 +278,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -290,6 +302,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Date", "label": "Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "posting_date", "oldfieldname": "posting_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -313,6 +326,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Payment Due Date", "label": "Payment Due Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "due_date", "oldfieldname": "due_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -336,6 +350,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -360,6 +375,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amended From", "label": "Amended From",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -385,6 +401,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Return Against Sales Invoice", "label": "Return Against Sales Invoice",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Sales Invoice", "options": "Sales Invoice",
"permlevel": 0, "permlevel": 0,
@@ -408,6 +425,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Shipping Address Name", "label": "Shipping Address Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Address", "options": "Address",
"permlevel": 0, "permlevel": 0,
@@ -431,6 +449,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Shipping Address", "label": "Shipping Address",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -453,6 +472,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Currency and Price List", "label": "Currency and Price List",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "", "options": "",
"permlevel": 0, "permlevel": 0,
@@ -475,6 +495,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Currency", "label": "Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "currency", "oldfieldname": "currency",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -500,6 +521,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Exchange Rate", "label": "Exchange Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "conversion_rate", "oldfieldname": "conversion_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -523,6 +545,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -545,6 +568,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List", "label": "Price List",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "price_list_name", "oldfieldname": "price_list_name",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -569,6 +593,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List Currency", "label": "Price List Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Currency", "options": "Currency",
"permlevel": 0, "permlevel": 0,
@@ -592,6 +617,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List Exchange Rate", "label": "Price List Exchange Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "9", "precision": "9",
@@ -614,6 +640,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Ignore Pricing Rule", "label": "Ignore Pricing Rule",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 1, "permlevel": 1,
"print_hide": 1, "print_hide": 1,
@@ -635,6 +662,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-shopping-cart", "options": "icon-shopping-cart",
@@ -658,6 +686,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Update Stock", "label": "Update Stock",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "update_stock", "oldfieldname": "update_stock",
"oldfieldtype": "Check", "oldfieldtype": "Check",
@@ -681,6 +710,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Items", "label": "Items",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "entries", "oldfieldname": "entries",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -705,6 +735,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Packing List", "label": "Packing List",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-suitcase", "options": "icon-suitcase",
"permlevel": 0, "permlevel": 0,
@@ -727,6 +758,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Packed Items", "label": "Packed Items",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Packed Item", "options": "Packed Item",
"permlevel": 0, "permlevel": 0,
@@ -749,6 +781,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Product Bundle Help", "label": "Product Bundle Help",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -769,6 +802,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -790,6 +824,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total (Company Currency)", "label": "Total (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -813,6 +848,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Total (Company Currency)", "label": "Net Total (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "net_total", "oldfieldname": "net_total",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -836,6 +872,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -857,6 +894,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total", "label": "Total",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -880,6 +918,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Total", "label": "Net Total",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -902,6 +941,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money", "options": "icon-money",
@@ -925,6 +965,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges", "label": "Taxes and Charges",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "charge", "oldfieldname": "charge",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -948,6 +989,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -969,6 +1011,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Shipping Rule", "label": "Shipping Rule",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Button", "oldfieldtype": "Button",
"options": "Shipping Rule", "options": "Shipping Rule",
@@ -991,6 +1034,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -1012,6 +1056,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Sales Taxes and Charges", "label": "Sales Taxes and Charges",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "other_charges", "oldfieldname": "other_charges",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -1036,6 +1081,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges Calculation", "label": "Taxes and Charges Calculation",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "HTML", "oldfieldtype": "HTML",
"permlevel": 0, "permlevel": 0,
@@ -1057,6 +1103,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -1078,6 +1125,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total Taxes and Charges (Company Currency)", "label": "Total Taxes and Charges (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "other_charges_total", "oldfieldname": "other_charges_total",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1101,6 +1149,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1123,6 +1172,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total Taxes and Charges", "label": "Total Taxes and Charges",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -1146,6 +1196,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Additional Discount", "label": "Additional Discount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1169,6 +1220,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Apply Additional Discount On", "label": "Apply Additional Discount On",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nGrand Total\nNet Total", "options": "\nGrand Total\nNet Total",
"permlevel": 0, "permlevel": 0,
@@ -1191,6 +1243,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -1212,6 +1265,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Additional Discount Amount", "label": "Additional Discount Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -1234,6 +1288,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Additional Discount Amount (Company Currency)", "label": "Additional Discount Amount (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -1257,6 +1312,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money", "options": "icon-money",
@@ -1280,6 +1336,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Grand Total (Company Currency)", "label": "Grand Total (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "grand_total", "oldfieldname": "grand_total",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1304,6 +1361,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Rounded Total (Company Currency)", "label": "Rounded Total (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "rounded_total", "oldfieldname": "rounded_total",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1329,6 +1387,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "In Words (Company Currency)", "label": "In Words (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "in_words", "oldfieldname": "in_words",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -1351,6 +1410,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -1374,6 +1434,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Grand Total", "label": "Grand Total",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "grand_total_export", "oldfieldname": "grand_total_export",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1398,6 +1459,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Rounded Total", "label": "Rounded Total",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "rounded_total_export", "oldfieldname": "rounded_total_export",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1422,6 +1484,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "In Words", "label": "In Words",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "in_words_export", "oldfieldname": "in_words_export",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -1445,6 +1508,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total Advance", "label": "Total Advance",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "total_advance", "oldfieldname": "total_advance",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1469,6 +1533,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Outstanding Amount", "label": "Outstanding Amount",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "outstanding_amount", "oldfieldname": "outstanding_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1494,6 +1559,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Advance Payments", "label": "Advance Payments",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money", "options": "icon-money",
@@ -1517,6 +1583,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Get Advances Received", "label": "Get Advances Received",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Button", "oldfieldtype": "Button",
"options": "get_advances", "options": "get_advances",
@@ -1540,6 +1607,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Advances", "label": "Advances",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "advance_adjustment_details", "oldfieldname": "advance_adjustment_details",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -1566,6 +1634,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Payments", "label": "Payments",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-money", "options": "icon-money",
"permlevel": 0, "permlevel": 0,
@@ -1588,6 +1657,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Mode of Payment", "label": "Mode of Payment",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "mode_of_payment", "oldfieldname": "mode_of_payment",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -1613,6 +1683,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Cash/Bank Account", "label": "Cash/Bank Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "cash_bank_account", "oldfieldname": "cash_bank_account",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -1637,6 +1708,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -1660,6 +1732,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Paid Amount", "label": "Paid Amount",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "paid_amount", "oldfieldname": "paid_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1684,6 +1757,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Paid Amount (Company Currency)", "label": "Paid Amount (Company Currency)",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -1709,6 +1783,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off", "label": "Write Off",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -1732,6 +1807,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off Amount", "label": "Write Off Amount",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -1754,6 +1830,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off Amount (Company Currency)", "label": "Write Off Amount (Company Currency)",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -1778,6 +1855,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off Outstanding Amount", "label": "Write Off Outstanding Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -1799,6 +1877,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1822,6 +1901,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off Account", "label": "Write Off Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Account", "options": "Account",
"permlevel": 0, "permlevel": 0,
@@ -1845,6 +1925,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Write Off Cost Center", "label": "Write Off Cost Center",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Cost Center", "options": "Cost Center",
"permlevel": 0, "permlevel": 0,
@@ -1868,6 +1949,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Terms", "label": "Terms",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "", "options": "",
@@ -1891,6 +1973,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Terms", "label": "Terms",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "tc_name", "oldfieldname": "tc_name",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -1915,6 +1998,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Terms and Conditions Details", "label": "Terms and Conditions Details",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "terms", "oldfieldname": "terms",
"oldfieldtype": "Text Editor", "oldfieldtype": "Text Editor",
@@ -1938,6 +2022,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Printing Settings", "label": "Printing Settings",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1960,6 +2045,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Letter Head", "label": "Letter Head",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "letter_head", "oldfieldname": "letter_head",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -1983,6 +2069,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -2005,6 +2092,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Print Heading", "label": "Print Heading",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "select_print_heading", "oldfieldname": "select_print_heading",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -2030,6 +2118,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "More Information", "label": "More Information",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-bullhorn", "options": "icon-bullhorn",
"permlevel": 0, "permlevel": 0,
@@ -2052,6 +2141,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Project Name", "label": "Project Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "project_name", "oldfieldname": "project_name",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -2077,6 +2167,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Territory", "label": "Territory",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Territory", "options": "Territory",
"permlevel": 0, "permlevel": 0,
@@ -2100,6 +2191,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Customer Group", "label": "Customer Group",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Customer Group", "options": "Customer Group",
"permlevel": 0, "permlevel": 0,
@@ -2121,6 +2213,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -2143,6 +2236,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Customer Address", "label": "Customer Address",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Address", "options": "Address",
"permlevel": 0, "permlevel": 0,
@@ -2165,6 +2259,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact Person", "label": "Contact Person",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Contact", "options": "Contact",
"permlevel": 0, "permlevel": 0,
@@ -2188,6 +2283,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Campaign", "label": "Campaign",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "campaign", "oldfieldname": "campaign",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -2212,6 +2308,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Source", "label": "Source",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "source", "oldfieldname": "source",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -2236,6 +2333,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Accounting Details", "label": "Accounting Details",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-file-text", "options": "icon-file-text",
@@ -2260,6 +2358,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Debit To", "label": "Debit To",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "debit_to", "oldfieldname": "debit_to",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -2284,6 +2383,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Party Account Currency", "label": "Party Account Currency",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Currency", "options": "Currency",
"permlevel": 0, "permlevel": 0,
@@ -2309,6 +2409,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Opening Entry", "label": "Is Opening Entry",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "is_opening", "oldfieldname": "is_opening",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -2333,6 +2434,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "C-Form Applicable", "label": "C-Form Applicable",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "No\nYes", "options": "No\nYes",
"permlevel": 0, "permlevel": 0,
@@ -2355,6 +2457,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "C-Form No", "label": "C-Form No",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "C-Form", "options": "C-Form",
"permlevel": 0, "permlevel": 0,
@@ -2376,6 +2479,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -2398,6 +2502,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Posting Time", "label": "Posting Time",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "posting_time", "oldfieldname": "posting_time",
"oldfieldtype": "Time", "oldfieldtype": "Time",
@@ -2421,6 +2526,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Fiscal Year", "label": "Fiscal Year",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -2445,6 +2551,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Remarks", "label": "Remarks",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "remarks", "oldfieldname": "remarks",
"oldfieldtype": "Text", "oldfieldtype": "Text",
@@ -2469,6 +2576,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Commission", "label": "Commission",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-group", "options": "icon-group",
@@ -2492,6 +2600,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Sales Partner", "label": "Sales Partner",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "sales_partner", "oldfieldname": "sales_partner",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -2515,6 +2624,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -2538,6 +2648,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Commission Rate (%)", "label": "Commission Rate (%)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "commission_rate", "oldfieldname": "commission_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -2561,6 +2672,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total Commission", "label": "Total Commission",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "total_commission", "oldfieldname": "total_commission",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -2586,6 +2698,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Sales Team", "label": "Sales Team",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2607,6 +2720,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Sales Team1", "label": "Sales Team1",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "sales_team", "oldfieldname": "sales_team",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -2633,6 +2747,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Recurring", "label": "Recurring",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-time", "options": "icon-time",
"permlevel": 0, "permlevel": 0,
@@ -2654,6 +2769,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2678,6 +2794,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Recurring", "label": "Is Recurring",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2701,6 +2818,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Recurring Type", "label": "Recurring Type",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly", "options": "\nMonthly\nQuarterly\nHalf-yearly\nYearly",
"permlevel": 0, "permlevel": 0,
@@ -2725,6 +2843,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "From Date", "label": "From Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -2748,6 +2867,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "To Date", "label": "To Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -2771,6 +2891,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Repeat on Day of Month", "label": "Repeat on Day of Month",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2794,6 +2915,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "End Date", "label": "End Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2814,6 +2936,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2838,6 +2961,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Next Date", "label": "Next Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2861,6 +2985,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Recurring Id", "label": "Recurring Id",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2884,6 +3009,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Notification Email Address", "label": "Notification Email Address",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -2906,6 +3032,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Recurring Print Format", "label": "Recurring Print Format",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Print Format", "options": "Print Format",
"permlevel": 0, "permlevel": 0,
@@ -2929,6 +3056,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Against Income Account", "label": "Against Income Account",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "against_income_account", "oldfieldname": "against_income_account",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -2951,7 +3079,8 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-26 12:12:40.616546", "max_attachments": 0,
"modified": "2015-11-16 06:29:55.906783",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice", "name": "Sales Invoice",

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

@@ -155,7 +155,7 @@ class SalesInvoice(SellingController):
'second_join_field': 'so_detail', 'second_join_field': 'so_detail',
'overflow_type': 'delivery', 'overflow_type': 'delivery',
'extra_cond': """ and exists(select name from `tabSales Invoice` 'extra_cond': """ and exists(select name from `tabSales Invoice`
where name=`tabSales Invoice Item`.parent and ifnull(update_stock, 0) = 1)""" where name=`tabSales Invoice Item`.parent and update_stock = 1)"""
}, },
{ {
'source_dt': 'Sales Invoice Item', 'source_dt': 'Sales Invoice Item',
@@ -359,8 +359,8 @@ class SalesInvoice(SellingController):
"""check for does customer belong to same project as entered..""" """check for does customer belong to same project as entered.."""
if self.project_name and self.customer: if self.project_name and self.customer:
res = frappe.db.sql("""select name from `tabProject` res = frappe.db.sql("""select name from `tabProject`
where name = %s and (customer = %s or where name = %s and (customer = %s or customer is null or customer = '')""",
ifnull(customer,'')='')""", (self.project_name, self.customer)) (self.project_name, self.customer))
if not res: if not res:
throw(_("Customer {0} does not belong to project {1}").format(self.customer,self.project_name)) throw(_("Customer {0} does not belong to project {1}").format(self.customer,self.project_name))
@@ -379,6 +379,8 @@ class SalesInvoice(SellingController):
msgprint(_("Item Code required at Row No {0}").format(d.idx), raise_exception=True) msgprint(_("Item Code required at Row No {0}").format(d.idx), raise_exception=True)
def validate_warehouse(self): def validate_warehouse(self):
super(SalesInvoice, self).validate_warehouse()
for d in self.get('items'): for d in self.get('items'):
if not d.warehouse: if not d.warehouse:
frappe.throw(_("Warehouse required at Row No {0}").format(d.idx)) frappe.throw(_("Warehouse required at Row No {0}").format(d.idx))
@@ -434,7 +436,7 @@ class SalesInvoice(SellingController):
if not warehouse: if not warehouse:
global_pos_profile = frappe.db.sql("""select name, warehouse from `tabPOS Profile` global_pos_profile = frappe.db.sql("""select name, warehouse from `tabPOS Profile`
where ifnull(user,'') = '' and company = %s""", self.company) where (user is null or user = '') and company = %s""", self.company)
if global_pos_profile: if global_pos_profile:
warehouse = global_pos_profile[0][1] warehouse = global_pos_profile[0][1]

9
erpnext/accounts/doctype/sales_invoice_advance/sales_invoice_advance.json
View File

@@ -18,6 +18,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Journal Entry", "label": "Journal Entry",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "journal_voucher", "oldfieldname": "journal_voucher",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -44,6 +45,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Remarks", "label": "Remarks",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "remarks", "oldfieldname": "remarks",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -69,6 +71,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Journal Entry Detail No", "label": "Journal Entry Detail No",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "jv_detail_no", "oldfieldname": "jv_detail_no",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -93,6 +96,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -114,6 +118,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Advance amount", "label": "Advance amount",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "advance_amount", "oldfieldname": "advance_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -140,6 +145,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Allocated amount", "label": "Allocated amount",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "allocated_amount", "oldfieldname": "allocated_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -164,7 +170,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:09.979547", "max_attachments": 0,
"modified": "2015-11-16 06:29:56.263776",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice Advance", "name": "Sales Invoice Advance",

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

@@ -19,6 +19,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Barcode", "label": "Barcode",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -40,6 +41,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Item", "label": "Item",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_code", "oldfieldname": "item_code",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -63,6 +65,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -84,6 +87,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Item Name", "label": "Item Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_name", "oldfieldname": "item_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -107,6 +111,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Customer's Item Code", "label": "Customer's Item Code",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -128,6 +133,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Edit Description", "label": "Edit Description",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -150,6 +156,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Description", "label": "Description",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "description", "oldfieldname": "description",
"oldfieldtype": "Text", "oldfieldtype": "Text",
@@ -174,6 +181,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -196,6 +204,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Image View", "label": "Image View",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "image", "options": "image",
"permlevel": 0, "permlevel": 0,
@@ -219,6 +228,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Image", "label": "Image",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -241,6 +251,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -262,6 +273,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Quantity", "label": "Quantity",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "qty", "oldfieldname": "qty",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -285,6 +297,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List Rate", "label": "Price List Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "ref_rate", "oldfieldname": "ref_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -310,6 +323,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Discount on Price List Rate (%)", "label": "Discount on Price List Rate (%)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "adj_rate", "oldfieldname": "adj_rate",
"oldfieldtype": "Float", "oldfieldtype": "Float",
@@ -332,6 +346,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -353,6 +368,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "UOM", "label": "UOM",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "UOM", "options": "UOM",
"permlevel": 0, "permlevel": 0,
@@ -375,6 +391,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List Rate (Company Currency)", "label": "Price List Rate (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "base_ref_rate", "oldfieldname": "base_ref_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -398,6 +415,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -419,6 +437,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Rate", "label": "Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "export_rate", "oldfieldname": "export_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -443,6 +462,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Amount", "label": "Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "export_amount", "oldfieldname": "export_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -466,6 +486,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -487,6 +508,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Rate (Company Currency)", "label": "Rate (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "basic_rate", "oldfieldname": "basic_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -511,6 +533,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amount (Company Currency)", "label": "Amount (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "amount", "oldfieldname": "amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -535,6 +558,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Pricing Rule", "label": "Pricing Rule",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Pricing Rule", "options": "Pricing Rule",
"permlevel": 0, "permlevel": 0,
@@ -556,6 +580,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -578,6 +603,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Rate", "label": "Net Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -601,6 +627,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Amount", "label": "Net Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -623,6 +650,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -645,6 +673,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Rate (Company Currency)", "label": "Net Rate (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -668,6 +697,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Amount (Company Currency)", "label": "Net Amount (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -692,6 +722,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Drop Ship", "label": "Drop Ship",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -714,6 +745,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Delivered By Supplier", "label": "Delivered By Supplier",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -736,6 +768,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Accounting Details", "label": "Accounting Details",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -757,6 +790,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Income Account", "label": "Income Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "income_account", "oldfieldname": "income_account",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -783,6 +817,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Expense Account", "label": "Expense Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Account", "options": "Account",
"permlevel": 0, "permlevel": 0,
@@ -805,6 +840,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -827,6 +863,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Cost Center", "label": "Cost Center",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "cost_center", "oldfieldname": "cost_center",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -854,6 +891,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Stock Details", "label": "Stock Details",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -875,6 +913,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Warehouse", "label": "Warehouse",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "warehouse", "oldfieldname": "warehouse",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -899,6 +938,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Target Warehouse", "label": "Target Warehouse",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Warehouse", "options": "Warehouse",
"permlevel": 0, "permlevel": 0,
@@ -922,6 +962,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Serial No", "label": "Serial No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "serial_no", "oldfieldname": "serial_no",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -945,6 +986,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Batch No", "label": "Batch No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Batch", "options": "Batch",
"permlevel": 0, "permlevel": 0,
@@ -968,6 +1010,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Item Group", "label": "Item Group",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_group", "oldfieldname": "item_group",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -992,6 +1035,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Brand Name", "label": "Brand Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "brand", "oldfieldname": "brand",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -1015,6 +1059,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Item Tax Rate", "label": "Item Tax Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_tax_rate", "oldfieldname": "item_tax_rate",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -1037,6 +1082,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -1058,6 +1104,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Available Batch Qty at Warehouse", "label": "Available Batch Qty at Warehouse",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1082,6 +1129,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Available Qty at Warehouse", "label": "Available Qty at Warehouse",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "actual_qty", "oldfieldname": "actual_qty",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1105,6 +1153,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "References", "label": "References",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1127,6 +1176,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Time Log Batch", "label": "Time Log Batch",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Time Log Batch", "options": "Time Log Batch",
"permlevel": 0, "permlevel": 0,
@@ -1149,6 +1199,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Sales Order", "label": "Sales Order",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "sales_order", "oldfieldname": "sales_order",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -1173,6 +1224,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Sales Order Item", "label": "Sales Order Item",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "so_detail", "oldfieldname": "so_detail",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -1195,6 +1247,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1217,6 +1270,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Delivery Note", "label": "Delivery Note",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "delivery_note", "oldfieldname": "delivery_note",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -1241,6 +1295,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Delivery Note Item", "label": "Delivery Note Item",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "dn_detail", "oldfieldname": "dn_detail",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -1264,6 +1319,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Delivered Qty", "label": "Delivered Qty",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "delivered_qty", "oldfieldname": "delivered_qty",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1286,6 +1342,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1308,6 +1365,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Page Break", "label": "Page Break",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -1327,7 +1385,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-11-02 15:14:02.306067", "max_attachments": 0,
"modified": "2015-11-16 06:29:56.335017",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Invoice Item", "name": "Sales Invoice Item",

24
erpnext/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.json
View File

@@ -18,7 +18,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Type", "label": "Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "charge_type", "oldfieldname": "charge_type",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -44,6 +45,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reference Row #", "label": "Reference Row #",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "row_id", "oldfieldname": "row_id",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -67,6 +69,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Account Head", "label": "Account Head",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "account_head", "oldfieldname": "account_head",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -92,6 +95,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Cost Center", "label": "Cost Center",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "cost_center_other_charges", "oldfieldname": "cost_center_other_charges",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -115,6 +119,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -137,6 +142,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Description", "label": "Description",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "description", "oldfieldname": "description",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -163,6 +169,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Is this Tax included in Basic Rate?", "label": "Is this Tax included in Basic Rate?",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -185,6 +192,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -207,6 +215,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Rate", "label": "Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "rate", "oldfieldname": "rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -229,6 +238,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -251,6 +261,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Amount", "label": "Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -274,6 +285,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total", "label": "Total",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -297,6 +309,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Tax Amount After Discount Amount", "label": "Tax Amount After Discount Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -319,6 +332,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -341,6 +355,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amount (Company Currency)", "label": "Amount (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "tax_amount", "oldfieldname": "tax_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -365,6 +380,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total (Company Currency)", "label": "Total (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "total", "oldfieldname": "total",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -390,6 +406,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Tax Amount After Discount Amount (Company Currency)", "label": "Tax Amount After Discount Amount (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -412,6 +429,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Item Wise Tax Detail", "label": "Item Wise Tax Detail",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_wise_tax_detail", "oldfieldname": "item_wise_tax_detail",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -435,6 +453,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Parenttype", "label": "Parenttype",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "parenttype", "oldfieldname": "parenttype",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -456,7 +475,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:11.977789", "max_attachments": 0,
"modified": "2015-11-16 06:29:57.263576",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Taxes and Charges", "name": "Sales Taxes and Charges",

10
erpnext/accounts/doctype/sales_taxes_and_charges_template/sales_taxes_and_charges_template.json
View File

@@ -21,6 +21,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Title", "label": "Title",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "title", "oldfieldname": "title",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -44,6 +45,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Default", "label": "Default",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -65,6 +67,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Disabled", "label": "Disabled",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -86,6 +89,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -107,6 +111,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -130,6 +135,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -152,6 +158,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Sales Taxes and Charges", "label": "Sales Taxes and Charges",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "other_charges", "oldfieldname": "other_charges",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -175,7 +182,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:39:12.157257", "max_attachments": 0,
"modified": "2015-11-16 06:29:57.346680",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Sales Taxes and Charges Template", "name": "Sales Taxes and Charges Template",

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

@@ -16,7 +16,7 @@ def valdiate_taxes_and_charges_template(doc):
if doc.is_default == 1: if doc.is_default == 1:
frappe.db.sql("""update `tab{0}` set is_default = 0 frappe.db.sql("""update `tab{0}` set is_default = 0
where ifnull(is_default,0) = 1 and name != %s and company = %s""".format(doc.doctype), where is_default = 1 and name != %s and company = %s""".format(doc.doctype),
(doc.name, doc.company)) (doc.name, doc.company))
for tax in doc.get("taxes"): for tax in doc.get("taxes"):

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

@@ -21,6 +21,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Shipping Rule Label", "label": "Shipping Rule Label",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -42,6 +43,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Disabled", "label": "Disabled",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -64,7 +66,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Calculate Based On", "label": "Calculate Based On",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Net Total\nNet Weight", "options": "Net Total\nNet Weight",
"permlevel": 0, "permlevel": 0,
@@ -88,6 +91,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Shipping Rule Conditions", "label": "Shipping Rule Conditions",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -109,6 +113,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Shipping Rule Conditions", "label": "Shipping Rule Conditions",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Shipping Rule Condition", "options": "Shipping Rule Condition",
"permlevel": 0, "permlevel": 0,
@@ -132,6 +137,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Valid for Countries", "label": "Valid for Countries",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -153,6 +159,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Worldwide Shipping", "label": "Worldwide Shipping",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -176,6 +183,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Valid for Countries", "label": "Valid for Countries",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Shipping Rule Country", "options": "Shipping Rule Country",
"permlevel": 0, "permlevel": 0,
@@ -199,6 +207,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -220,6 +229,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
@@ -241,6 +251,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -262,6 +273,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Shipping Account", "label": "Shipping Account",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Account", "options": "Account",
"permlevel": 0, "permlevel": 0,
@@ -284,6 +296,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Cost Center", "label": "Cost Center",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Cost Center", "options": "Cost Center",
"permlevel": 0, "permlevel": 0,
@@ -305,7 +318,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:39:12.778062", "max_attachments": 0,
"modified": "2015-11-16 06:29:57.633071",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Shipping Rule", "name": "Shipping Rule",

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

@@ -19,6 +19,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "From Value", "label": "From Value",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -40,6 +41,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "To Value", "label": "To Value",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -61,6 +63,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Shipping Amount", "label": "Shipping Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -81,7 +84,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:12.974539", "max_attachments": 0,
"modified": "2015-11-16 06:29:57.700694",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Shipping Rule Condition", "name": "Shipping Rule Condition",

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

@@ -19,6 +19,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Country", "label": "Country",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Country", "options": "Country",
"permlevel": 0, "permlevel": 0,
@@ -39,7 +40,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:13.035775", "max_attachments": 0,
"modified": "2015-11-16 06:29:57.731755",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Shipping Rule Country", "name": "Shipping Rule Country",

30
erpnext/accounts/doctype/tax_rule/tax_rule.json
View File

@@ -20,7 +20,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Tax Type", "label": "Tax Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Sales\nPurchase", "options": "Sales\nPurchase",
"permlevel": 0, "permlevel": 0,
@@ -44,6 +45,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Use for Shopping Cart", "label": "Use for Shopping Cart",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -65,6 +67,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -88,6 +91,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Sales Tax Template", "label": "Sales Tax Template",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Sales Taxes and Charges Template", "options": "Sales Taxes and Charges Template",
"permlevel": 0, "permlevel": 0,
@@ -112,6 +116,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Purchase Tax Template", "label": "Purchase Tax Template",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Purchase Taxes and Charges Template", "options": "Purchase Taxes and Charges Template",
"permlevel": 0, "permlevel": 0,
@@ -135,6 +140,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Filters", "label": "Filters",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -158,6 +164,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Customer", "label": "Customer",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Customer", "options": "Customer",
"permlevel": 0, "permlevel": 0,
@@ -182,6 +189,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier", "label": "Supplier",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Supplier", "options": "Supplier",
"permlevel": 0, "permlevel": 0,
@@ -205,6 +213,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Billing City", "label": "Billing City",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -227,6 +236,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Billing State", "label": "Billing State",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -249,6 +259,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Billing Country", "label": "Billing Country",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Country", "options": "Country",
"permlevel": 0, "permlevel": 0,
@@ -271,6 +282,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -294,6 +306,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Customer Group", "label": "Customer Group",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Customer Group", "options": "Customer Group",
"permlevel": 0, "permlevel": 0,
@@ -318,6 +331,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier Type", "label": "Supplier Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Supplier Type", "options": "Supplier Type",
"permlevel": 0, "permlevel": 0,
@@ -341,6 +355,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Shipping City", "label": "Shipping City",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -363,6 +378,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Shipping State", "label": "Shipping State",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -385,6 +401,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Shipping Country", "label": "Shipping Country",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Country", "options": "Country",
"permlevel": 0, "permlevel": 0,
@@ -408,6 +425,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Validity", "label": "Validity",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -430,6 +448,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "From Date", "label": "From Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -451,6 +470,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -473,6 +493,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "To Date", "label": "To Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -494,6 +515,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -517,6 +539,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Priority", "label": "Priority",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -538,6 +561,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -560,6 +584,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company", "options": "Company",
"permlevel": 0, "permlevel": 0,
@@ -580,7 +605,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:39:16.298546", "max_attachments": 0,
"modified": "2015-11-16 06:29:59.201327",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Tax Rule", "name": "Tax Rule",

36
erpnext/accounts/general_ledger.py
View File

@@ -27,25 +27,25 @@ def process_gl_map(gl_map, merge_entries=True):
gl_map = merge_similar_entries(gl_map) gl_map = merge_similar_entries(gl_map)
for entry in gl_map: for entry in gl_map:
# toggle debit, credit if negative entry # toggle debit, credit if negative entry
if flt(entry.debit) < 0: if flt(entry.debit) < 0:
entry.credit = flt(entry.credit) - flt(entry.debit) entry.credit = flt(entry.credit) - flt(entry.debit)
entry.debit = 0.0 entry.debit = 0.0
if flt(entry.debit_in_account_currency) < 0: if flt(entry.debit_in_account_currency) < 0:
entry.credit_in_account_currency = \ entry.credit_in_account_currency = \
flt(entry.credit_in_account_currency) - flt(entry.debit_in_account_currency) flt(entry.credit_in_account_currency) - flt(entry.debit_in_account_currency)
entry.debit_in_account_currency = 0.0 entry.debit_in_account_currency = 0.0
if flt(entry.credit) < 0: if flt(entry.credit) < 0:
entry.debit = flt(entry.debit) - flt(entry.credit) entry.debit = flt(entry.debit) - flt(entry.credit)
entry.credit = 0.0 entry.credit = 0.0
if flt(entry.credit_in_account_currency) < 0: if flt(entry.credit_in_account_currency) < 0:
entry.debit_in_account_currency = \ entry.debit_in_account_currency = \
flt(entry.debit_in_account_currency) - flt(entry.credit_in_account_currency) flt(entry.debit_in_account_currency) - flt(entry.credit_in_account_currency)
entry.credit_in_account_currency = 0.0 entry.credit_in_account_currency = 0.0
return gl_map return gl_map
def merge_similar_entries(gl_map): def merge_similar_entries(gl_map):
@@ -81,7 +81,7 @@ def check_if_in_list(gle, gl_map):
def save_entries(gl_map, adv_adj, update_outstanding): def save_entries(gl_map, adv_adj, update_outstanding):
validate_account_for_auto_accounting_for_stock(gl_map) validate_account_for_auto_accounting_for_stock(gl_map)
round_off_debit_credit(gl_map) round_off_debit_credit(gl_map)
for entry in gl_map: for entry in gl_map:
make_entry(entry, adv_adj, update_outstanding) make_entry(entry, adv_adj, update_outstanding)
# check against budget # check against budget
@@ -99,7 +99,7 @@ def validate_account_for_auto_accounting_for_stock(gl_map):
if cint(frappe.db.get_single_value("Accounts Settings", "auto_accounting_for_stock")) \ if cint(frappe.db.get_single_value("Accounts Settings", "auto_accounting_for_stock")) \
and gl_map[0].voucher_type=="Journal Entry": and gl_map[0].voucher_type=="Journal Entry":
aii_accounts = [d[0] for d in frappe.db.sql("""select name from tabAccount aii_accounts = [d[0] for d in frappe.db.sql("""select name from tabAccount
where account_type = 'Warehouse' and ifnull(warehouse, '')!=''""")] where account_type = 'Warehouse' and (warehouse != '' and warehouse is not null)""")]
for entry in gl_map: for entry in gl_map:
if entry.account in aii_accounts: if entry.account in aii_accounts:
@@ -109,36 +109,36 @@ def validate_account_for_auto_accounting_for_stock(gl_map):
def round_off_debit_credit(gl_map): def round_off_debit_credit(gl_map):
precision = get_field_precision(frappe.get_meta("GL Entry").get_field("debit"), precision = get_field_precision(frappe.get_meta("GL Entry").get_field("debit"),
currency=frappe.db.get_value("Company", gl_map[0].company, "default_currency", cache=True)) currency=frappe.db.get_value("Company", gl_map[0].company, "default_currency", cache=True))
debit_credit_diff = 0.0 debit_credit_diff = 0.0
for entry in gl_map: for entry in gl_map:
entry.debit = flt(entry.debit, precision) entry.debit = flt(entry.debit, precision)
entry.credit = flt(entry.credit, precision) entry.credit = flt(entry.credit, precision)
debit_credit_diff += entry.debit - entry.credit debit_credit_diff += entry.debit - entry.credit
debit_credit_diff = flt(debit_credit_diff, precision) debit_credit_diff = flt(debit_credit_diff, precision)
if abs(debit_credit_diff) >= (5.0 / (10**precision)): if abs(debit_credit_diff) >= (5.0 / (10**precision)):
frappe.throw(_("Debit and Credit not equal for {0} #{1}. Difference is {2}.") frappe.throw(_("Debit and Credit not equal for {0} #{1}. Difference is {2}.")
.format(gl_map[0].voucher_type, gl_map[0].voucher_no, debit_credit_diff)) .format(gl_map[0].voucher_type, gl_map[0].voucher_no, debit_credit_diff))
elif abs(debit_credit_diff) >= (1.0 / (10**precision)): elif abs(debit_credit_diff) >= (1.0 / (10**precision)):
make_round_off_gle(gl_map, debit_credit_diff) make_round_off_gle(gl_map, debit_credit_diff)
def make_round_off_gle(gl_map, debit_credit_diff): def make_round_off_gle(gl_map, debit_credit_diff):
round_off_account, round_off_cost_center = frappe.db.get_value("Company", gl_map[0].company, round_off_account, round_off_cost_center = frappe.db.get_value("Company", gl_map[0].company,
["round_off_account", "round_off_cost_center"]) or [None, None] ["round_off_account", "round_off_cost_center"]) or [None, None]
if not round_off_account: if not round_off_account:
frappe.throw(_("Please mention Round Off Account in Company")) frappe.throw(_("Please mention Round Off Account in Company"))
if not round_off_cost_center: if not round_off_cost_center:
frappe.throw(_("Please mention Round Off Cost Center in Company")) frappe.throw(_("Please mention Round Off Cost Center in Company"))
round_off_gle = frappe._dict() round_off_gle = frappe._dict()
for k in ["voucher_type", "voucher_no", "company", for k in ["voucher_type", "voucher_no", "company",
"posting_date", "remarks", "fiscal_year", "is_opening"]: "posting_date", "remarks", "fiscal_year", "is_opening"]:
round_off_gle[k] = gl_map[0][k] round_off_gle[k] = gl_map[0][k]
round_off_gle.update({ round_off_gle.update({
"account": round_off_account, "account": round_off_account,
"debit": abs(debit_credit_diff) if debit_credit_diff < 0 else 0, "debit": abs(debit_credit_diff) if debit_credit_diff < 0 else 0,
@@ -149,7 +149,7 @@ def make_round_off_gle(gl_map, debit_credit_diff):
"against_voucher_type": None, "against_voucher_type": None,
"against_voucher": None "against_voucher": None
}) })
gl_map.append(round_off_gle) gl_map.append(round_off_gle)

8
erpnext/accounts/page/accounts_browser/accounts_browser.py
View File

@@ -25,9 +25,9 @@ def get_children():
acc = frappe.db.sql(""" select acc = frappe.db.sql(""" select
name as value, is_group as expandable %s name as value, is_group as expandable %s
from `tab%s` from `tab%s`
where ifnull(parent_%s,'') = '' where ifnull(`parent_%s`,'') = ''
and `company` = %s and docstatus<2 and `company` = %s and docstatus<2
order by name""" % (select_cond, ctype, ctype.lower().replace(' ','_'), '%s'), order by name""" % (select_cond, frappe.db.escape(ctype), frappe.db.escape(ctype.lower().replace(' ','_')), '%s'),
company, as_dict=1) company, as_dict=1)
if args["parent"]=="Accounts": if args["parent"]=="Accounts":
@@ -38,9 +38,9 @@ def get_children():
acc = frappe.db.sql("""select acc = frappe.db.sql("""select
name as value, is_group as expandable %s name as value, is_group as expandable %s
from `tab%s` from `tab%s`
where ifnull(parent_%s,'') = %s where ifnull(`parent_%s`,'') = %s
and docstatus<2 and docstatus<2
order by name""" % (select_cond, ctype, ctype.lower().replace(' ','_'), '%s'), order by name""" % (select_cond, frappe.db.escape(ctype), frappe.db.escape(ctype.lower().replace(' ','_')), '%s'),
args['parent'], as_dict=1) args['parent'], as_dict=1)
if ctype == 'Account': if ctype == 'Account':

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

@@ -216,7 +216,7 @@ class ReceivablePayableReport(object):
self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party, self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party,
voucher_type, voucher_no, against_voucher_type, against_voucher, account_currency, remarks, {0} voucher_type, voucher_no, against_voucher_type, against_voucher, account_currency, remarks, {0}
from `tabGL Entry` from `tabGL Entry`
where docstatus < 2 and party_type=%s and ifnull(party, '') != '' {1} where docstatus < 2 and party_type=%s and (party is not null and party != '') {1}
order by posting_date, party""" order by posting_date, party"""
.format(select_fields, conditions), values, as_dict=True) .format(select_fields, conditions), values, as_dict=True)

2
erpnext/accounts/report/bank_reconciliation_statement/bank_reconciliation_statement.py
View File

@@ -24,7 +24,7 @@ def execute(filters=None):
total_credit += flt(d[3]) total_credit += flt(d[3])
amounts_not_reflected_in_system = frappe.db.sql(""" amounts_not_reflected_in_system = frappe.db.sql("""
select sum(ifnull(jvd.debit_in_account_currency, 0) - ifnull(jvd.credit_in_account_currency, 0)) select sum(jvd.debit_in_account_currency - jvd.credit_in_account_currency)
from `tabJournal Entry Account` jvd, `tabJournal Entry` jv from `tabJournal Entry Account` jvd, `tabJournal Entry` jv
where jvd.parent = jv.name and jv.docstatus=1 and jvd.account=%s where jvd.parent = jv.name and jv.docstatus=1 and jvd.account=%s
and jv.posting_date > %s and jv.clearance_date <= %s and ifnull(jv.is_opening, 'No') = 'No' and jv.posting_date > %s and jv.clearance_date <= %s and ifnull(jv.is_opening, 'No') = 'No'

6
erpnext/accounts/report/general_ledger/general_ledger.py
View File

@@ -102,15 +102,15 @@ def get_result(filters, account_details):
return result return result
def get_gl_entries(filters): def get_gl_entries(filters):
select_fields = """, sum(ifnull(debit_in_account_currency, 0)) as debit_in_account_currency, select_fields = """, sum(debit_in_account_currency) as debit_in_account_currency,
sum(ifnull(credit_in_account_currency, 0)) as credit_in_account_currency""" \ sum(credit_in_account_currency) as credit_in_account_currency""" \
if filters.get("show_in_account_currency") else "" if filters.get("show_in_account_currency") else ""
group_by_condition = "group by voucher_type, voucher_no, account, cost_center" \ group_by_condition = "group by voucher_type, voucher_no, account, cost_center" \
if filters.get("group_by_voucher") else "group by name" if filters.get("group_by_voucher") else "group by name"
gl_entries = frappe.db.sql("""select posting_date, account, party_type, party, gl_entries = frappe.db.sql("""select posting_date, account, party_type, party,
sum(ifnull(debit, 0)) as debit, sum(ifnull(credit, 0)) as credit, sum(debit) as debit, sum(credit) as credit,
voucher_type, voucher_no, cost_center, remarks, against, is_opening {select_fields} voucher_type, voucher_no, cost_center, remarks, against, is_opening {select_fields}
from `tabGL Entry` from `tabGL Entry`
where company=%(company)s {conditions} where company=%(company)s {conditions}

2
erpnext/accounts/report/gross_profit/gross_profit.py
View File

@@ -208,7 +208,7 @@ class GrossProfitGenerator(object):
else: else:
self.average_buying_rate[item_code] = flt(frappe.db.sql("""select avg(valuation_rate) self.average_buying_rate[item_code] = flt(frappe.db.sql("""select avg(valuation_rate)
from `tabStock Ledger Entry` from `tabStock Ledger Entry`
where item_code = %s and ifnull(qty_after_transaction,0) > 0""", item_code)[0][0]) where item_code = %s and qty_after_transaction > 0""", item_code)[0][0])
return self.average_buying_rate[item_code] return self.average_buying_rate[item_code]

2
erpnext/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py
View File

@@ -88,7 +88,7 @@ def get_tax_accounts(item_list, columns):
tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail, charge_type, base_tax_amount_after_discount_amount tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail, charge_type, base_tax_amount_after_discount_amount
from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice' from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice'
and docstatus = 1 and ifnull(account_head, '') != '' and category in ('Total', 'Valuation and Total') and docstatus = 1 and (account_head is not null and account_head != '') and category in ('Total', 'Valuation and Total')
and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)), tuple(invoice_wise_items.keys())) and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)), tuple(invoice_wise_items.keys()))
for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details: for parent, account_head, item_wise_tax_detail, charge_type, tax_amount in tax_details:

2
erpnext/accounts/report/item_wise_sales_register/item_wise_sales_register.py
View File

@@ -86,7 +86,7 @@ def get_tax_accounts(item_list, columns):
tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail, tax_details = frappe.db.sql("""select parent, account_head, item_wise_tax_detail,
charge_type, base_tax_amount_after_discount_amount charge_type, base_tax_amount_after_discount_amount
from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice' from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice'
and docstatus = 1 and ifnull(account_head, '') != '' and docstatus = 1 and (account_head is not null and account_head != '')
and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)), and parent in (%s)""" % ', '.join(['%s']*len(invoice_wise_items)),
tuple(invoice_wise_items.keys())) tuple(invoice_wise_items.keys()))

12
erpnext/accounts/report/purchase_register/purchase_register.py
View File

@@ -29,7 +29,7 @@ def execute(filters=None):
purchase_receipt = list(set(invoice_po_pr_map.get(inv.name, {}).get("purchase_receipt", []))) purchase_receipt = list(set(invoice_po_pr_map.get(inv.name, {}).get("purchase_receipt", [])))
project_name = list(set(invoice_po_pr_map.get(inv.name, {}).get("project_name", []))) project_name = list(set(invoice_po_pr_map.get(inv.name, {}).get("project_name", [])))
row = [inv.name, inv.posting_date, inv.supplier, inv.supplier_name, row = [inv.name, inv.posting_date, inv.supplier, inv.supplier_name,
supplier_details.get(inv.supplier), supplier_details.get(inv.supplier),
inv.credit_to, ", ".join(project_name), inv.bill_no, inv.bill_date, inv.remarks, inv.credit_to, ", ".join(project_name), inv.bill_no, inv.bill_date, inv.remarks,
", ".join(purchase_order), ", ".join(purchase_receipt)] ", ".join(purchase_order), ", ".join(purchase_receipt)]
@@ -54,7 +54,7 @@ def execute(filters=None):
# total tax, grand total, outstanding amount & rounded total # total tax, grand total, outstanding amount & rounded total
row += [total_tax, inv.base_grand_total, flt(inv.base_grand_total, 2), inv.outstanding_amount] row += [total_tax, inv.base_grand_total, flt(inv.base_grand_total, 2), inv.outstanding_amount]
data.append(row) data.append(row)
return columns, data return columns, data
@@ -71,13 +71,15 @@ def get_columns(invoice_list):
if invoice_list: if invoice_list:
expense_accounts = frappe.db.sql_list("""select distinct expense_account expense_accounts = frappe.db.sql_list("""select distinct expense_account
from `tabPurchase Invoice Item` where docstatus = 1 and ifnull(expense_account, '') != '' from `tabPurchase Invoice Item` where docstatus = 1
and (expense_account is not null and expense_account != '')
and parent in (%s) order by expense_account""" % and parent in (%s) order by expense_account""" %
', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list])) ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]))
tax_accounts = frappe.db.sql_list("""select distinct account_head tax_accounts = frappe.db.sql_list("""select distinct account_head
from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice' from `tabPurchase Taxes and Charges` where parenttype = 'Purchase Invoice'
and docstatus = 1 and ifnull(account_head, '') != '' and category in ('Total', 'Valuation and Total') and docstatus = 1 and (account_head is not null and account_head != '')
and category in ('Total', 'Valuation and Total')
and parent in (%s) order by account_head""" % and parent in (%s) order by account_head""" %
', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list])) ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]))
@@ -143,7 +145,7 @@ def get_invoice_tax_map(invoice_list, invoice_expense_map, expense_accounts):
return invoice_expense_map, invoice_tax_map return invoice_expense_map, invoice_tax_map
def get_invoice_po_pr_map(invoice_list): def get_invoice_po_pr_map(invoice_list):
pi_items = frappe.db.sql("""select parent, purchase_order, purchase_receipt, po_detail, pi_items = frappe.db.sql("""select parent, purchase_order, purchase_receipt, po_detail,
project_name from `tabPurchase Invoice Item` where parent in (%s) project_name from `tabPurchase Invoice Item` where parent in (%s)
and (ifnull(purchase_order, '') != '' or ifnull(purchase_receipt, '') != '')""" % and (ifnull(purchase_order, '') != '' or ifnull(purchase_receipt, '') != '')""" %
', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1) ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)

2
erpnext/accounts/report/sales_register/sales_register.py
View File

@@ -79,7 +79,7 @@ def get_columns(invoice_list):
tax_accounts = frappe.db.sql_list("""select distinct account_head tax_accounts = frappe.db.sql_list("""select distinct account_head
from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice' from `tabSales Taxes and Charges` where parenttype = 'Sales Invoice'
and docstatus = 1 and ifnull(base_tax_amount_after_discount_amount, 0) != 0 and docstatus = 1 and base_tax_amount_after_discount_amount != 0
and parent in (%s) order by account_head""" % and parent in (%s) order by account_head""" %
', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list])) ', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]))

2
erpnext/accounts/report/trial_balance/trial_balance.py
View File

@@ -85,7 +85,7 @@ def get_rootwise_opening_balances(filters, report_type):
gle = frappe.db.sql(""" gle = frappe.db.sql("""
select select
account, sum(ifnull(debit, 0)) as opening_debit, sum(ifnull(credit, 0)) as opening_credit account, sum(debit) as opening_debit, sum(credit) as opening_credit
from `tabGL Entry` from `tabGL Entry`
where where
company=%(company)s company=%(company)s

4
erpnext/accounts/report/trial_balance_for_party/trial_balance_for_party.py
View File

@@ -76,7 +76,7 @@ def get_data(filters, show_party_name):
def get_opening_balances(filters): def get_opening_balances(filters):
gle = frappe.db.sql(""" gle = frappe.db.sql("""
select party, sum(ifnull(debit, 0)) as opening_debit, sum(ifnull(credit, 0)) as opening_credit select party, sum(debit) as opening_debit, sum(credit) as opening_credit
from `tabGL Entry` from `tabGL Entry`
where company=%(company)s where company=%(company)s
and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != '' and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != ''
@@ -96,7 +96,7 @@ def get_opening_balances(filters):
def get_balances_within_period(filters): def get_balances_within_period(filters):
gle = frappe.db.sql(""" gle = frappe.db.sql("""
select party, sum(ifnull(debit, 0)) as debit, sum(ifnull(credit, 0)) as credit select party, sum(debit) as debit, sum(credit) as credit
from `tabGL Entry` from `tabGL Entry`
where company=%(company)s where company=%(company)s
and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != '' and ifnull(party_type, '') = %(party_type)s and ifnull(party, '') != ''

34
erpnext/accounts/utils.py
View File

@@ -21,7 +21,7 @@ def get_fiscal_year(date=None, fiscal_year=None, label="Date", verbose=1, compan
def get_fiscal_years(transaction_date=None, fiscal_year=None, label="Date", verbose=1, company=None): def get_fiscal_years(transaction_date=None, fiscal_year=None, label="Date", verbose=1, company=None):
# if year start date is 2012-04-01, year end date should be 2013-03-31 (hence subdate) # if year start date is 2012-04-01, year end date should be 2013-03-31 (hence subdate)
cond = " ifnull(disabled, 0) = 0" cond = " disabled = 0"
if fiscal_year: if fiscal_year:
cond += " and fy.name = %(fiscal_year)s" cond += " and fy.name = %(fiscal_year)s"
else: else:
@@ -65,7 +65,7 @@ def get_balance_on(account=None, date=None, party_type=None, party=None, in_acco
cond = [] cond = []
if date: if date:
cond.append("posting_date <= '%s'" % date) cond.append("posting_date <= '%s'" % frappe.db.escape(cstr(date)))
else: else:
# get balance of all entries that exist # get balance of all entries that exist
date = nowdate() date = nowdate()
@@ -105,17 +105,17 @@ def get_balance_on(account=None, date=None, party_type=None, party=None, in_acco
if acc.account_currency == frappe.db.get_value("Company", acc.company, "default_currency"): if acc.account_currency == frappe.db.get_value("Company", acc.company, "default_currency"):
in_account_currency = False in_account_currency = False
else: else:
cond.append("""gle.account = "%s" """ % (account.replace('"', '\\"'), )) cond.append("""gle.account = "%s" """ % (frappe.db.escape(account), ))
if party_type and party: if party_type and party:
cond.append("""gle.party_type = "%s" and gle.party = "%s" """ % cond.append("""gle.party_type = "%s" and gle.party = "%s" """ %
(party_type.replace('"', '\\"'), party.replace('"', '\\"'))) (frappe.db.escape(party_type), frappe.db.escape(party)))
if account or (party_type and party): if account or (party_type and party):
if in_account_currency: if in_account_currency:
select_field = "sum(ifnull(debit_in_account_currency, 0)) - sum(ifnull(credit_in_account_currency, 0))" select_field = "sum(debit_in_account_currency) - sum(credit_in_account_currency)"
else: else:
select_field = "sum(ifnull(debit, 0)) - sum(ifnull(credit, 0))" select_field = "sum(debit) - sum(credit)"
bal = frappe.db.sql(""" bal = frappe.db.sql("""
SELECT {0} SELECT {0}
FROM `tabGL Entry` gle FROM `tabGL Entry` gle
@@ -181,7 +181,7 @@ def check_if_jv_modified(args):
select t2.{dr_or_cr} from `tabJournal Entry` t1, `tabJournal Entry Account` t2 select t2.{dr_or_cr} from `tabJournal Entry` t1, `tabJournal Entry Account` t2
where t1.name = t2.parent and t2.account = %(account)s where t1.name = t2.parent and t2.account = %(account)s
and t2.party_type = %(party_type)s and t2.party = %(party)s and t2.party_type = %(party_type)s and t2.party = %(party)s
and ifnull(t2.reference_type, '') in ("", "Sales Order", "Purchase Order") and (t2.reference_type is null or t2.reference_type in ("", "Sales Order", "Purchase Order"))
and t1.name = %(voucher_no)s and t2.name = %(voucher_detail_no)s and t1.name = %(voucher_no)s and t2.name = %(voucher_detail_no)s
and t1.docstatus=1 """.format(dr_or_cr = args.get("dr_or_cr")), args) and t1.docstatus=1 """.format(dr_or_cr = args.get("dr_or_cr")), args)
@@ -282,7 +282,7 @@ def fix_total_debit_credit():
sum(debit) - sum(credit) as diff sum(debit) - sum(credit) as diff
from `tabGL Entry` from `tabGL Entry`
group by voucher_type, voucher_no group by voucher_type, voucher_no
having sum(ifnull(debit, 0)) != sum(ifnull(credit, 0))""", as_dict=1) having sum(debit) != sum(credit)""", as_dict=1)
for d in vouchers: for d in vouchers:
if abs(d.diff) > 0: if abs(d.diff) > 0:
@@ -301,7 +301,7 @@ def get_stock_and_account_difference(account_list=None, posting_date=None):
difference = {} difference = {}
account_warehouse = dict(frappe.db.sql("""select name, warehouse from tabAccount account_warehouse = dict(frappe.db.sql("""select name, warehouse from tabAccount
where account_type = 'Warehouse' and ifnull(warehouse, '') != '' where account_type = 'Warehouse' and (warehouse is not null and warehouse != '')
and name in (%s)""" % ', '.join(['%s']*len(account_list)), account_list)) and name in (%s)""" % ', '.join(['%s']*len(account_list)), account_list))
for account, warehouse in account_warehouse.items(): for account, warehouse in account_warehouse.items():
@@ -372,7 +372,7 @@ def get_actual_expense(args):
if args.get("month_end_date") else "" if args.get("month_end_date") else ""
return flt(frappe.db.sql(""" return flt(frappe.db.sql("""
select sum(ifnull(debit, 0)) - sum(ifnull(credit, 0)) select sum(debit) - sum(credit)
from `tabGL Entry` from `tabGL Entry`
where account='%(account)s' and cost_center='%(cost_center)s' where account='%(account)s' and cost_center='%(cost_center)s'
and fiscal_year='%(fiscal_year)s' and company='%(company)s' %(condition)s and fiscal_year='%(fiscal_year)s' and company='%(company)s' %(condition)s
@@ -392,14 +392,14 @@ def get_stock_rbnb_difference(posting_date, company):
from `tabStock Ledger Entry` where company=%s""", company) from `tabStock Ledger Entry` where company=%s""", company)
pr_valuation_amount = frappe.db.sql(""" pr_valuation_amount = frappe.db.sql("""
select sum(ifnull(pr_item.valuation_rate, 0) * ifnull(pr_item.qty, 0) * ifnull(pr_item.conversion_factor, 0)) select sum(pr_item.valuation_rate * pr_item.qty * pr_item.conversion_factor)
from `tabPurchase Receipt Item` pr_item, `tabPurchase Receipt` pr from `tabPurchase Receipt Item` pr_item, `tabPurchase Receipt` pr
where pr.name = pr_item.parent and pr.docstatus=1 and pr.company=%s where pr.name = pr_item.parent and pr.docstatus=1 and pr.company=%s
and pr.posting_date <= %s and pr_item.item_code in (%s)""" % and pr.posting_date <= %s and pr_item.item_code in (%s)""" %
('%s', '%s', ', '.join(['%s']*len(stock_items))), tuple([company, posting_date] + stock_items))[0][0] ('%s', '%s', ', '.join(['%s']*len(stock_items))), tuple([company, posting_date] + stock_items))[0][0]
pi_valuation_amount = frappe.db.sql(""" pi_valuation_amount = frappe.db.sql("""
select sum(ifnull(pi_item.valuation_rate, 0) * ifnull(pi_item.qty, 0) * ifnull(pi_item.conversion_factor, 0)) select sum(pi_item.valuation_rate * pi_item.qty * pi_item.conversion_factor)
from `tabPurchase Invoice Item` pi_item, `tabPurchase Invoice` pi from `tabPurchase Invoice Item` pi_item, `tabPurchase Invoice` pi
where pi.name = pi_item.parent and pi.docstatus=1 and pi.company=%s where pi.name = pi_item.parent and pi.docstatus=1 and pi.company=%s
and pi.posting_date <= %s and pi_item.item_code in (%s)""" % and pi.posting_date <= %s and pi_item.item_code in (%s)""" %
@@ -420,18 +420,18 @@ def get_outstanding_invoices(party_type, party, account, condition=None):
precision = frappe.get_precision("Sales Invoice", "outstanding_amount") precision = frappe.get_precision("Sales Invoice", "outstanding_amount")
if party_type=="Customer": if party_type=="Customer":
dr_or_cr = "ifnull(debit_in_account_currency, 0) - ifnull(credit_in_account_currency, 0)" dr_or_cr = "debit_in_account_currency - credit_in_account_currency"
payment_dr_or_cr = "ifnull(payment_gl_entry.credit_in_account_currency, 0) - ifnull(payment_gl_entry.debit_in_account_currency, 0)" payment_dr_or_cr = "payment_gl_entry.credit_in_account_currency - payment_gl_entry.debit_in_account_currency"
else: else:
dr_or_cr = "ifnull(credit_in_account_currency, 0) - ifnull(debit_in_account_currency, 0)" dr_or_cr = "credit_in_account_currency - debit_in_account_currency"
payment_dr_or_cr = "ifnull(payment_gl_entry.debit_in_account_currency, 0) - ifnull(payment_gl_entry.credit_in_account_currency, 0)" payment_dr_or_cr = "payment_gl_entry.debit_in_account_currency - payment_gl_entry.credit_in_account_currency"
invoice_list = frappe.db.sql("""select invoice_list = frappe.db.sql("""select
voucher_no, voucher_type, posting_date, voucher_no, voucher_type, posting_date,
ifnull(sum({dr_or_cr}), 0) as invoice_amount, ifnull(sum({dr_or_cr}), 0) as invoice_amount,
( (
select select
ifnull(sum(ifnull({payment_dr_or_cr}, 0)), 0) ifnull(sum({payment_dr_or_cr}), 0)
from `tabGL Entry` payment_gl_entry from `tabGL Entry` payment_gl_entry
where where
payment_gl_entry.against_voucher_type = invoice_gl_entry.voucher_type payment_gl_entry.against_voucher_type = invoice_gl_entry.voucher_type

37
erpnext/buying/doctype/purchase_order/purchase_order.js
View File

@@ -18,9 +18,27 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
var me = this; var me = this;
this._super(); this._super();
// this.frm.dashboard.reset(); // this.frm.dashboard.reset();
var allow_receipt = false;
var is_drop_ship = false;
for (var i in cur_frm.doc.items) {
var item = cur_frm.doc.items[i];
if(item.delivered_by_supplier !== 1) {
allow_receipt = true;
}
else {
is_drop_ship = true
}
if(is_drop_ship && allow_receipt) {
break;
}
}
cur_frm.set_df_property("drop_ship", "hidden", !is_drop_ship);
if(doc.docstatus == 1 && !in_list(["Stopped", "Closed", "Delivered"], doc.status)) { if(doc.docstatus == 1 && !in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
if (this.frm.has_perm("submit")) { if (this.frm.has_perm("submit")) {
if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100) { if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100) {
cur_frm.add_custom_button(__('Stop'), this.stop_purchase_order); cur_frm.add_custom_button(__('Stop'), this.stop_purchase_order);
@@ -29,7 +47,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
cur_frm.add_custom_button(__('Close'), this.close_purchase_order); cur_frm.add_custom_button(__('Close'), this.close_purchase_order);
} }
if(doc.delivered_by_supplier && doc.status!="Delivered"){ if(is_drop_ship && doc.status!="Delivered"){
cur_frm.add_custom_button(__('Mark as Delivered'), this.delivered_by_supplier); cur_frm.add_custom_button(__('Mark as Delivered'), this.delivered_by_supplier);
} }
@@ -37,7 +55,12 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry); cur_frm.add_custom_button(__('Payment'), cur_frm.cscript.make_bank_entry);
} }
if(flt(doc.per_received, 2) < 100 && this.frm.doc.__onload.has_stock_item) { } else if(doc.docstatus===0) {
cur_frm.cscript.add_from_mappers();
}
if(doc.docstatus == 1 && !in_list(["Stopped", "Closed"], doc.status)) {
if(flt(doc.per_received, 2) < 100 && this.frm.doc.__onload.has_stock_item && allow_receipt) {
cur_frm.add_custom_button(__('Receive'), this.make_purchase_receipt).addClass("btn-primary"); cur_frm.add_custom_button(__('Receive'), this.make_purchase_receipt).addClass("btn-primary");
if(doc.is_subcontracted==="Yes") { if(doc.is_subcontracted==="Yes") {
@@ -47,13 +70,9 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
} }
if(flt(doc.per_billed, 2) < 100) if(flt(doc.per_billed, 2) < 100)
cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice); cur_frm.add_custom_button(__('Invoice'), this.make_purchase_invoice);
} else if(doc.docstatus===0) {
cur_frm.cscript.add_from_mappers();
} }
if(doc.docstatus == 1 && in_list(["Stopped", "Closed", "Delivered"], doc.status)) { if(doc.docstatus == 1 && in_list(["Stopped", "Closed", "Delivered"], doc.status)) {
if (this.frm.has_perm("submit")) { if (this.frm.has_perm("submit")) {
cur_frm.add_custom_button(__('Re-open'), this.unstop_purchase_order); cur_frm.add_custom_button(__('Re-open'), this.unstop_purchase_order);

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

File diff suppressed because it is too large Load Diff

37
erpnext/buying/doctype/purchase_order/purchase_order.py
View File

@@ -51,6 +51,7 @@ class PurchaseOrder(BuyingController):
self.validate_for_subcontracting() self.validate_for_subcontracting()
self.validate_minimum_order_qty() self.validate_minimum_order_qty()
self.create_raw_materials_supplied("supplied_items") self.create_raw_materials_supplied("supplied_items")
self.set_received_qty_and_billed_amount_for_drop_ship_items()
def validate_with_previous_doc(self): def validate_with_previous_doc(self):
super(PurchaseOrder, self).validate_with_previous_doc({ super(PurchaseOrder, self).validate_with_previous_doc({
@@ -137,9 +138,11 @@ class PurchaseOrder(BuyingController):
"""update requested qty (before ordered_qty is updated)""" """update requested qty (before ordered_qty is updated)"""
item_wh_list = [] item_wh_list = []
for d in self.get("items"): for d in self.get("items"):
if (not po_item_rows or d.name in po_item_rows) and [d.item_code, d.warehouse] not in item_wh_list \ if (not po_item_rows or d.name in po_item_rows) \
and frappe.db.get_value("Item", d.item_code, "is_stock_item") and d.warehouse: and [d.item_code, d.warehouse] not in item_wh_list \
item_wh_list.append([d.item_code, d.warehouse]) and frappe.db.get_value("Item", d.item_code, "is_stock_item") \
and d.warehouse and not d.delivered_by_supplier:
item_wh_list.append([d.item_code, d.warehouse])
for item_code, warehouse in item_wh_list: for item_code, warehouse in item_wh_list:
update_bin_qty(item_code, warehouse, { update_bin_qty(item_code, warehouse, {
@@ -164,13 +167,13 @@ class PurchaseOrder(BuyingController):
clear_doctype_notifications(self) clear_doctype_notifications(self)
def on_submit(self): def on_submit(self):
if self.delivered_by_supplier == 1: if self.has_drop_ship_item():
self.update_status_updater() self.update_status_updater()
super(PurchaseOrder, self).on_submit() super(PurchaseOrder, self).on_submit()
purchase_controller = frappe.get_doc("Purchase Common") purchase_controller = frappe.get_doc("Purchase Common")
self.update_prevdoc_status() self.update_prevdoc_status()
self.update_requested_qty() self.update_requested_qty()
self.update_ordered_qty() self.update_ordered_qty()
@@ -181,7 +184,7 @@ class PurchaseOrder(BuyingController):
purchase_controller.update_last_purchase_rate(self, is_submit = 1) purchase_controller.update_last_purchase_rate(self, is_submit = 1)
def on_cancel(self): def on_cancel(self):
if self.delivered_by_supplier == 1: if self.has_drop_ship_item():
self.update_status_updater() self.update_status_updater()
pc_obj = frappe.get_doc('Purchase Common') pc_obj = frappe.get_doc('Purchase Common')
@@ -234,7 +237,7 @@ class PurchaseOrder(BuyingController):
"""Update delivered qty in Sales Order for drop ship""" """Update delivered qty in Sales Order for drop ship"""
sales_orders_to_update = [] sales_orders_to_update = []
for item in self.items: for item in self.items:
if item.prevdoc_doctype == "Sales Order": if item.prevdoc_doctype == "Sales Order" and item.delivered_by_supplier == 1:
if item.prevdoc_docname not in sales_orders_to_update: if item.prevdoc_docname not in sales_orders_to_update:
sales_orders_to_update.append(item.prevdoc_docname) sales_orders_to_update.append(item.prevdoc_docname)
@@ -244,6 +247,21 @@ class PurchaseOrder(BuyingController):
so.set_status(update=True) so.set_status(update=True)
so.notify_update() so.notify_update()
def has_drop_ship_item(self):
is_drop_ship = False
for item in self.items:
if item.delivered_by_supplier == 1:
is_drop_ship = True
return is_drop_ship
def set_received_qty_and_billed_amount_for_drop_ship_items(self):
for item in self.items:
if item.delivered_by_supplier == 1:
item.received_qty = item.qty
item.billed_amt = item.amount
@frappe.whitelist() @frappe.whitelist()
def stop_or_unstop_purchase_orders(names, status): def stop_or_unstop_purchase_orders(names, status):
if not frappe.has_permission("Purchase Order", "write"): if not frappe.has_permission("Purchase Order", "write"):
@@ -262,7 +280,6 @@ def stop_or_unstop_purchase_orders(names, status):
frappe.local.message_log = [] frappe.local.message_log = []
def set_missing_values(source, target): def set_missing_values(source, target):
target.ignore_pricing_rule = 1 target.ignore_pricing_rule = 1
target.run_method("set_missing_values") target.run_method("set_missing_values")
@@ -292,7 +309,7 @@ def make_purchase_receipt(source_name, target_doc=None):
"parenttype": "prevdoc_doctype", "parenttype": "prevdoc_doctype",
}, },
"postprocess": update_item, "postprocess": update_item,
"condition": lambda doc: doc.received_qty < doc.qty "condition": lambda doc: doc.received_qty < doc.qty and doc.delivered_by_supplier!=1
}, },
"Purchase Taxes and Charges": { "Purchase Taxes and Charges": {
"doctype": "Purchase Taxes and Charges", "doctype": "Purchase Taxes and Charges",
@@ -328,7 +345,7 @@ def make_purchase_invoice(source_name, target_doc=None):
"parent": "purchase_order", "parent": "purchase_order",
}, },
"postprocess": update_item, "postprocess": update_item,
"condition": lambda doc: doc.base_amount==0 or doc.billed_amt < doc.amount "condition": lambda doc: (doc.base_amount==0 or doc.billed_amt < doc.amount) and doc.delivered_by_supplier!=1
}, },
"Purchase Taxes and Charges": { "Purchase Taxes and Charges": {
"doctype": "Purchase Taxes and Charges", "doctype": "Purchase Taxes and Charges",

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

File diff suppressed because it is too large Load Diff

12
erpnext/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.json
View File

@@ -18,6 +18,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Item Code", "label": "Item Code",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "main_item_code", "oldfieldname": "main_item_code",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -41,6 +42,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Raw Material Item Code", "label": "Raw Material Item Code",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "rm_item_code", "oldfieldname": "rm_item_code",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -64,6 +66,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Supplied Qty", "label": "Supplied Qty",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "required_qty", "oldfieldname": "required_qty",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -87,6 +90,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Rate", "label": "Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "rate", "oldfieldname": "rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -111,6 +115,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amount", "label": "Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "amount", "oldfieldname": "amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -135,6 +140,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "BOM Detail No", "label": "BOM Detail No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "bom_detail_no", "oldfieldname": "bom_detail_no",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -158,6 +164,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Reference Name", "label": "Reference Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "reference_name", "oldfieldname": "reference_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -181,6 +188,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Conversion Factor", "label": "Conversion Factor",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "conversion_factor", "oldfieldname": "conversion_factor",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -204,6 +212,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Stock Uom", "label": "Stock Uom",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "stock_uom", "oldfieldname": "stock_uom",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -226,7 +235,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:05.021801", "max_attachments": 0,
"modified": "2015-11-16 06:29:54.025077",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Order Item Supplied", "name": "Purchase Order Item Supplied",

18
erpnext/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.json
View File

@@ -18,6 +18,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Item Code", "label": "Item Code",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "main_item_code", "oldfieldname": "main_item_code",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -41,6 +42,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Raw Material Item Code", "label": "Raw Material Item Code",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "rm_item_code", "oldfieldname": "rm_item_code",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -64,6 +66,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Description", "label": "Description",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "description", "oldfieldname": "description",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -89,6 +92,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Batch No", "label": "Batch No",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Batch", "options": "Batch",
"permlevel": 0, "permlevel": 0,
@@ -111,6 +115,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Serial No", "label": "Serial No",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -131,6 +136,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -152,6 +158,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Required Qty", "label": "Required Qty",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "required_qty", "oldfieldname": "required_qty",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -175,6 +182,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Consumed Qty", "label": "Consumed Qty",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "consumed_qty", "oldfieldname": "consumed_qty",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -198,6 +206,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Stock Uom", "label": "Stock Uom",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "stock_uom", "oldfieldname": "stock_uom",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -222,6 +231,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Rate", "label": "Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "rate", "oldfieldname": "rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -246,6 +256,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amount", "label": "Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "amount", "oldfieldname": "amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -270,6 +281,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Conversion Factor", "label": "Conversion Factor",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "conversion_factor", "oldfieldname": "conversion_factor",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -293,6 +305,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Current Stock", "label": "Current Stock",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "current_stock", "oldfieldname": "current_stock",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -316,6 +329,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Reference Name", "label": "Reference Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "reference_name", "oldfieldname": "reference_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -339,6 +353,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "BOM Detail No", "label": "BOM Detail No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "bom_detail_no", "oldfieldname": "bom_detail_no",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -360,7 +375,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:06.224300", "max_attachments": 0,
"modified": "2015-11-16 06:29:54.573531",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Purchase Receipt Item Supplied", "name": "Purchase Receipt Item Supplied",

30
erpnext/buying/doctype/quality_inspection/quality_inspection.json
View File

@@ -18,7 +18,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Series", "label": "Series",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "QI-", "options": "QI-",
"permlevel": 0, "permlevel": 0,
@@ -42,6 +43,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Report Date", "label": "Report Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "report_date", "oldfieldname": "report_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -64,6 +66,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -85,7 +88,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Inspection Type", "label": "Inspection Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "inspection_type", "oldfieldname": "inspection_type",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -110,6 +114,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Purchase Receipt No", "label": "Purchase Receipt No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "purchase_receipt_no", "oldfieldname": "purchase_receipt_no",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -134,6 +139,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Delivery Note No", "label": "Delivery Note No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "delivery_note_no", "oldfieldname": "delivery_note_no",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -157,6 +163,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -179,6 +186,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Item Code", "label": "Item Code",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_code", "oldfieldname": "item_code",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -203,6 +211,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Item Serial No", "label": "Item Serial No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_serial_no", "oldfieldname": "item_serial_no",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -227,6 +236,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Batch No", "label": "Batch No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "batch_no", "oldfieldname": "batch_no",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -251,6 +261,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Sample Size", "label": "Sample Size",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "sample_size", "oldfieldname": "sample_size",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -273,6 +284,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -296,6 +308,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Item Name", "label": "Item Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -318,6 +331,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Description", "label": "Description",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "description", "oldfieldname": "description",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -341,6 +355,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -364,6 +379,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Inspected By", "label": "Inspected By",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "inspected_by", "oldfieldname": "inspected_by",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -388,6 +404,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Verified By", "label": "Verified By",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "verified_by", "oldfieldname": "verified_by",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -410,6 +427,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -432,6 +450,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Remarks", "label": "Remarks",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "remarks", "oldfieldname": "remarks",
"oldfieldtype": "Text", "oldfieldtype": "Text",
@@ -455,6 +474,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amended From", "label": "Amended From",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -479,6 +499,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "Simple", "options": "Simple",
@@ -502,6 +523,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Get Specification Details", "label": "Get Specification Details",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "get_item_specification_details", "options": "get_item_specification_details",
"permlevel": 0, "permlevel": 0,
@@ -524,6 +546,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Readings", "label": "Readings",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "qa_specification_details", "oldfieldname": "qa_specification_details",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -547,7 +570,8 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:39:06.674821", "max_attachments": 0,
"modified": "2015-11-16 06:29:54.786379",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Quality Inspection", "name": "Quality Inspection",

18
erpnext/buying/doctype/quality_inspection_reading/quality_inspection_reading.json
View File

@@ -19,6 +19,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Parameter", "label": "Parameter",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "specification", "oldfieldname": "specification",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -42,6 +43,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Acceptance Criteria", "label": "Acceptance Criteria",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "value", "oldfieldname": "value",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -65,6 +67,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Reading 1", "label": "Reading 1",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "reading_1", "oldfieldname": "reading_1",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -88,6 +91,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Reading 2", "label": "Reading 2",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "reading_2", "oldfieldname": "reading_2",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -111,6 +115,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Reading 3", "label": "Reading 3",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "reading_3", "oldfieldname": "reading_3",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -134,6 +139,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Reading 4", "label": "Reading 4",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "reading_4", "oldfieldname": "reading_4",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -157,6 +163,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reading 5", "label": "Reading 5",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "reading_5", "oldfieldname": "reading_5",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -180,6 +187,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reading 6", "label": "Reading 6",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "reading_6", "oldfieldname": "reading_6",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -203,6 +211,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reading 7", "label": "Reading 7",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "reading_7", "oldfieldname": "reading_7",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -226,6 +235,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reading 8", "label": "Reading 8",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "reading_8", "oldfieldname": "reading_8",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -249,6 +259,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reading 9", "label": "Reading 9",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "reading_9", "oldfieldname": "reading_9",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -272,6 +283,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Reading 10", "label": "Reading 10",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "reading_10", "oldfieldname": "reading_10",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -295,7 +307,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Status", "label": "Status",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "status", "oldfieldname": "status",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -318,7 +331,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:39:06.876419", "max_attachments": 0,
"modified": "2015-11-16 06:29:54.873250",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Quality Inspection Reading", "name": "Quality Inspection Reading",

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

@@ -21,6 +21,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-user", "options": "icon-user",
@@ -43,7 +44,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Series", "label": "Series",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "naming_series", "oldfieldname": "naming_series",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -68,6 +70,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier Name", "label": "Supplier Name",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "supplier_name", "oldfieldname": "supplier_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -90,6 +93,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -112,6 +116,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Supplier Type", "label": "Supplier Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "supplier_type", "oldfieldname": "supplier_type",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -136,6 +141,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Frozen", "label": "Is Frozen",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -157,6 +163,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -179,6 +186,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Billing Currency", "label": "Billing Currency",
"length": 0,
"no_copy": 1, "no_copy": 1,
"options": "Currency", "options": "Currency",
"permlevel": 0, "permlevel": 0,
@@ -201,6 +209,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List", "label": "Price List",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Price List", "options": "Price List",
"permlevel": 0, "permlevel": 0,
@@ -222,6 +231,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -244,6 +254,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges", "label": "Taxes and Charges",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Purchase Taxes and Charges Template", "options": "Purchase Taxes and Charges Template",
"permlevel": 0, "permlevel": 0,
@@ -266,6 +277,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Credit Days", "label": "Credit Days",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -288,6 +300,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Address and Contacts", "label": "Address and Contacts",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"options": "icon-map-marker", "options": "icon-map-marker",
@@ -311,6 +324,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Address HTML", "label": "Address HTML",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -331,6 +345,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -353,6 +368,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact HTML", "label": "Contact HTML",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -375,6 +391,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Default Payable Accounts", "label": "Default Payable Accounts",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -398,6 +415,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Accounts", "label": "Accounts",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Party Account", "options": "Party Account",
"permlevel": 0, "permlevel": 0,
@@ -421,6 +439,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier Details", "label": "Supplier Details",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -443,6 +462,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Website", "label": "Website",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "website", "oldfieldname": "website",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -467,6 +487,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier Details", "label": "Supplier Details",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "supplier_details", "oldfieldname": "supplier_details",
"oldfieldtype": "Code", "oldfieldtype": "Code",
@@ -490,6 +511,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Communications", "label": "Communications",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Communication", "options": "Communication",
"permlevel": 0, "permlevel": 0,
@@ -511,7 +533,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:39:14.767820", "max_attachments": 0,
"modified": "2015-11-16 06:29:58.500467",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier", "name": "Supplier",

2
erpnext/buying/doctype/supplier/supplier.py
View File

@@ -93,7 +93,7 @@ def get_dashboard_info(supplier):
{"supplier": supplier, "docstatus": ["!=", 2] }, "count(*)") {"supplier": supplier, "docstatus": ["!=", 2] }, "count(*)")
billing_this_year = frappe.db.sql(""" billing_this_year = frappe.db.sql("""
select sum(ifnull(credit_in_account_currency, 0)) - sum(ifnull(debit_in_account_currency, 0)) select sum(credit_in_account_currency) - sum(debit_in_account_currency)
from `tabGL Entry` from `tabGL Entry`
where voucher_type='Purchase Invoice' and party_type = 'Supplier' where voucher_type='Purchase Invoice' and party_type = 'Supplier'
and party=%s and fiscal_year = %s""", and party=%s and fiscal_year = %s""",

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

@@ -20,6 +20,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-user", "options": "icon-user",
"permlevel": 0, "permlevel": 0,
@@ -43,6 +44,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Title", "label": "Title",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -64,7 +66,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Series", "label": "Series",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "naming_series", "oldfieldname": "naming_series",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -90,6 +93,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier", "label": "Supplier",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "supplier", "oldfieldname": "supplier",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -114,6 +118,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Name", "label": "Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -135,6 +140,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Address", "label": "Address",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -156,6 +162,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact", "label": "Contact",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -177,6 +184,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Mobile No", "label": "Mobile No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -198,6 +206,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact Email", "label": "Contact Email",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -218,6 +227,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -242,6 +252,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Date", "label": "Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "transaction_date", "oldfieldname": "transaction_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -265,6 +276,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amended From", "label": "Amended From",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -290,6 +302,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -314,6 +327,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Currency and Price List", "label": "Currency and Price List",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-tag", "options": "icon-tag",
"permlevel": 0, "permlevel": 0,
@@ -336,6 +350,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Currency", "label": "Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "currency", "oldfieldname": "currency",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -361,6 +376,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Exchange Rate", "label": "Exchange Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "conversion_rate", "oldfieldname": "conversion_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -384,6 +400,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -407,6 +424,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List", "label": "Price List",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Price List", "options": "Price List",
"permlevel": 0, "permlevel": 0,
@@ -430,6 +448,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List Currency", "label": "Price List Currency",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Currency", "options": "Currency",
"permlevel": 0, "permlevel": 0,
@@ -453,6 +472,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List Exchange Rate", "label": "Price List Exchange Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "9", "precision": "9",
@@ -475,6 +495,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Ignore Pricing Rule", "label": "Ignore Pricing Rule",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 1, "permlevel": 1,
"print_hide": 1, "print_hide": 1,
@@ -496,6 +517,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-shopping-cart", "options": "icon-shopping-cart",
@@ -519,6 +541,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Items", "label": "Items",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "po_details", "oldfieldname": "po_details",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -542,6 +565,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -563,6 +587,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total (Company Currency)", "label": "Total (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -586,6 +611,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Total (Company Currency)", "label": "Net Total (Company Currency)",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "net_total", "oldfieldname": "net_total",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -609,6 +635,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -630,6 +657,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total", "label": "Total",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -653,6 +681,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Total", "label": "Net Total",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "net_total_import", "oldfieldname": "net_total_import",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -677,6 +706,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges", "label": "Taxes and Charges",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money", "options": "icon-money",
@@ -701,6 +731,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges", "label": "Taxes and Charges",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "purchase_other_charges", "oldfieldname": "purchase_other_charges",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -725,6 +756,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Purchase Taxes and Charges", "label": "Purchase Taxes and Charges",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "purchase_tax_details", "oldfieldname": "purchase_tax_details",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -749,6 +781,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges Calculation", "label": "Taxes and Charges Calculation",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldtype": "HTML", "oldfieldtype": "HTML",
"permlevel": 0, "permlevel": 0,
@@ -771,6 +804,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-money", "options": "icon-money",
@@ -794,6 +828,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges Added (Company Currency)", "label": "Taxes and Charges Added (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "other_charges_added", "oldfieldname": "other_charges_added",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -818,6 +853,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges Deducted (Company Currency)", "label": "Taxes and Charges Deducted (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "other_charges_deducted", "oldfieldname": "other_charges_deducted",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -842,6 +878,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total Taxes and Charges (Company Currency)", "label": "Total Taxes and Charges (Company Currency)",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "total_tax", "oldfieldname": "total_tax",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -865,6 +902,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -887,6 +925,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges Added", "label": "Taxes and Charges Added",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "other_charges_added_import", "oldfieldname": "other_charges_added_import",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -911,6 +950,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Taxes and Charges Deducted", "label": "Taxes and Charges Deducted",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "other_charges_deducted_import", "oldfieldname": "other_charges_deducted_import",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -935,6 +975,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Total Taxes and Charges", "label": "Total Taxes and Charges",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -959,6 +1000,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Additional Discount", "label": "Additional Discount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -981,7 +1023,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Apply Additional Discount On", "label": "Apply Additional Discount On",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nGrand Total\nNet Total", "options": "\nGrand Total\nNet Total",
"permlevel": 0, "permlevel": 0,
@@ -1004,6 +1047,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1026,6 +1070,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Additional Discount Amount", "label": "Additional Discount Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -1049,6 +1094,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Additional Discount Amount (Company Currency)", "label": "Additional Discount Amount (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -1071,6 +1117,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1093,6 +1140,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Grand Total (Company Currency)", "label": "Grand Total (Company Currency)",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "grand_total", "oldfieldname": "grand_total",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1118,6 +1166,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "In Words (Company Currency)", "label": "In Words (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "in_words", "oldfieldname": "in_words",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -1141,6 +1190,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Rounded Total (Company Currency)", "label": "Rounded Total (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "rounded_total", "oldfieldname": "rounded_total",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1164,6 +1214,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -1186,6 +1237,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Grand Total", "label": "Grand Total",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "grand_total_import", "oldfieldname": "grand_total_import",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -1210,6 +1262,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "In Words", "label": "In Words",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "in_words_import", "oldfieldname": "in_words_import",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -1234,6 +1287,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Terms and Conditions", "label": "Terms and Conditions",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-legal", "options": "icon-legal",
@@ -1257,6 +1311,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Terms", "label": "Terms",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "tc_name", "oldfieldname": "tc_name",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -1281,6 +1336,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Terms and Conditions", "label": "Terms and Conditions",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "terms", "oldfieldname": "terms",
"oldfieldtype": "Text Editor", "oldfieldtype": "Text Editor",
@@ -1305,6 +1361,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact Details", "label": "Contact Details",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-bullhorn", "options": "icon-bullhorn",
"permlevel": 0, "permlevel": 0,
@@ -1327,6 +1384,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier Address", "label": "Supplier Address",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Address", "options": "Address",
"permlevel": 0, "permlevel": 0,
@@ -1349,6 +1407,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact Person", "label": "Contact Person",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Contact", "options": "Contact",
"permlevel": 0, "permlevel": 0,
@@ -1371,6 +1430,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Printing Settings", "label": "Printing Settings",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -1393,6 +1453,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Print Heading", "label": "Print Heading",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "select_print_heading", "oldfieldname": "select_print_heading",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -1417,6 +1478,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Letter Head", "label": "Letter Head",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "letter_head", "oldfieldname": "letter_head",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -1441,6 +1503,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "More Information", "label": "More Information",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-file-text", "options": "icon-file-text",
@@ -1463,7 +1526,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Status", "label": "Status",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "status", "oldfieldname": "status",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -1488,7 +1552,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Is Subcontracted", "label": "Is Subcontracted",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "\nYes\nNo", "options": "\nYes\nNo",
"permlevel": 0, "permlevel": 0,
@@ -1510,6 +1575,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -1531,6 +1597,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Fiscal Year", "label": "Fiscal Year",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -1554,7 +1621,8 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:39:15.027459", "max_attachments": 0,
"modified": "2015-11-16 06:29:58.617934",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation", "name": "Supplier Quotation",

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

@@ -19,6 +19,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Item Code", "label": "Item Code",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_code", "oldfieldname": "item_code",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -44,6 +45,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Supplier Part Number", "label": "Supplier Part Number",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 1, "print_hide": 1,
@@ -64,6 +66,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -86,6 +89,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Item Name", "label": "Item Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_name", "oldfieldname": "item_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -109,6 +113,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Description", "label": "Description",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -131,6 +136,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Description", "label": "Description",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "description", "oldfieldname": "description",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -155,6 +161,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -176,6 +183,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Image", "label": "Image",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -198,6 +206,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Image View", "label": "Image View",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "image", "options": "image",
"permlevel": 0, "permlevel": 0,
@@ -221,6 +230,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Quantity and Rate", "label": "Quantity and Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -242,6 +252,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Quantity", "label": "Quantity",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "qty", "oldfieldname": "qty",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -267,6 +278,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List Rate", "label": "Price List Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -290,6 +302,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Discount on Price List Rate (%)", "label": "Discount on Price List Rate (%)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -310,6 +323,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -331,6 +345,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "UOM", "label": "UOM",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "uom", "oldfieldname": "uom",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -357,6 +372,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Price List Rate (Company Currency)", "label": "Price List Rate (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -378,6 +394,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -399,6 +416,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Rate ", "label": "Rate ",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "import_rate", "oldfieldname": "import_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -423,6 +441,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Amount", "label": "Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "import_amount", "oldfieldname": "import_amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -446,6 +465,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -467,6 +487,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Rate (Company Currency)", "label": "Rate (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "purchase_rate", "oldfieldname": "purchase_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -493,6 +514,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amount (Company Currency)", "label": "Amount (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "amount", "oldfieldname": "amount",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -517,6 +539,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Pricing Rule", "label": "Pricing Rule",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Pricing Rule", "options": "Pricing Rule",
"permlevel": 0, "permlevel": 0,
@@ -538,6 +561,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -560,6 +584,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Rate", "label": "Net Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -582,6 +607,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Amount", "label": "Net Amount",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
@@ -604,6 +630,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -626,6 +653,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Rate (Company Currency)", "label": "Net Rate (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -649,6 +677,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Net Amount (Company Currency)", "label": "Net Amount (Company Currency)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Company:company:default_currency", "options": "Company:company:default_currency",
"permlevel": 0, "permlevel": 0,
@@ -672,6 +701,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Warehouse and Reference", "label": "Warehouse and Reference",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -693,6 +723,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Warehouse", "label": "Warehouse",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "warehouse", "oldfieldname": "warehouse",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -717,6 +748,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Project Name", "label": "Project Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Project", "options": "Project",
"permlevel": 0, "permlevel": 0,
@@ -739,6 +771,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Prevdoc DocType", "label": "Prevdoc DocType",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "prevdoc_doctype", "oldfieldname": "prevdoc_doctype",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -762,6 +795,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Material Request No", "label": "Material Request No",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "prevdoc_docname", "oldfieldname": "prevdoc_docname",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -787,6 +821,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -808,6 +843,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Material Request Detail No", "label": "Material Request Detail No",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "prevdoc_detail_docname", "oldfieldname": "prevdoc_detail_docname",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -831,6 +867,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Brand", "label": "Brand",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "brand", "oldfieldname": "brand",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -856,6 +893,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Item Group", "label": "Item Group",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_group", "oldfieldname": "item_group",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -881,6 +919,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Item Tax Rate", "label": "Item Tax Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_tax_rate", "oldfieldname": "item_tax_rate",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -904,6 +943,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Page Break", "label": "Page Break",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "page_break", "oldfieldname": "page_break",
"oldfieldtype": "Check", "oldfieldtype": "Check",
@@ -925,7 +965,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-19 03:04:51.597343", "max_attachments": 0,
"modified": "2015-11-16 06:29:58.833849",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Buying", "module": "Buying",
"name": "Supplier Quotation Item", "name": "Supplier Quotation Item",

24
erpnext/config/docs.py
View File

@@ -2,22 +2,18 @@ source_link = "https://github.com/frappe/erpnext"
docs_base_url = "https://frappe.github.io/erpnext" docs_base_url = "https://frappe.github.io/erpnext"
headline = "Learn ERPNext Inside Out" headline = "Learn ERPNext Inside Out"
sub_heading = "Find detailed explanation for all ERPNext features" sub_heading = "Find detailed explanation for all ERPNext features"
long_description = """ long_description = """ERPNext is a fully featured ERP system designed for Small and Medium Sized
ERPNext helps you to manage all your business information in one application and use it to manage operations and take decisions based on data. business. ERPNext covers a wide range of features including Accounting, CRM,
Inventory management, Selling, Purchasing, Manufacturing, Projects, HR &
Payroll, Website, E-Commerce and much more.
Among other things, ERPNext will help you to: ERPNext is based on the Frappe Framework is highly customizable and extendable.
You can create Custom Form, Fields, Scripts and can also create your own Apps
to extend ERPNext functionality.
- Track all Invoices and Payments. ERPNext is Open Source under the GNU General Public Licence v3 and has been
- Know what quantity of which product is available in stock. listed as one of the Best Open Source Softwares in the world by my online
- Identify open customer queries. blogs."""
- Manage payroll.
- Assign tasks and follow up on them.
- Maintain a database of all your customers, suppliers and their contacts.
- Prepare quotes.
- Get reminders on maintenance schedules.
- Publish your website.
And a lot lot lot more."""
def get_context(context): def get_context(context):
context.top_bar_items = [ context.top_bar_items = [

15
erpnext/controllers/accounts_controller.py
View File

@@ -152,13 +152,14 @@ class AccountsController(TransactionBase):
ret = get_item_details(args) ret = get_item_details(args)
for fieldname, value in ret.items(): for fieldname, value in ret.items():
if item.meta.get_field(fieldname) and \ if item.meta.get_field(fieldname) and value is not None:
(item.get(fieldname) is None or fieldname in force_item_fields) \ if (item.get(fieldname) is None or fieldname in force_item_fields):
and value is not None:
item.set(fieldname, value) item.set(fieldname, value)
if fieldname == "cost_center" and item.meta.get_field("cost_center") \ elif fieldname == "cost_center" and not item.get("cost_center"):
and not item.get("cost_center") and value is not None: item.set(fieldname, value)
elif fieldname == "conversion_factor" and not item.get("conversion_factor"):
item.set(fieldname, value) item.set(fieldname, value)
if ret.get("pricing_rule"): if ret.get("pricing_rule"):
@@ -257,7 +258,7 @@ class AccountsController(TransactionBase):
self.set(parentfield, self.get(parentfield, {"allocated_amount": ["not in", [0, None, ""]]})) self.set(parentfield, self.get(parentfield, {"allocated_amount": ["not in", [0, None, ""]]}))
frappe.db.sql("""delete from `tab%s` where parentfield=%s and parent = %s frappe.db.sql("""delete from `tab%s` where parentfield=%s and parent = %s
and ifnull(allocated_amount, 0) = 0""" % (childtype, '%s', '%s'), (parentfield, self.name)) and allocated_amount = 0""" % (childtype, '%s', '%s'), (parentfield, self.name))
def get_advances(self, account_head, party_type, party, child_doctype, parentfield, dr_or_cr, against_order_field): def get_advances(self, account_head, party_type, party, child_doctype, parentfield, dr_or_cr, against_order_field):
"""Returns list of advances against Account, Party, Reference""" """Returns list of advances against Account, Party, Reference"""
@@ -375,7 +376,7 @@ class AccountsController(TransactionBase):
advance_paid = frappe.db.sql(""" advance_paid = frappe.db.sql("""
select select
sum(ifnull({dr_or_cr}, 0)) sum({dr_or_cr})
from from
`tabJournal Entry Account` `tabJournal Entry Account`
where where

11
erpnext/controllers/buying_controller.py
View File

@@ -52,15 +52,6 @@ class BuyingController(StockController):
self.supplier = supplier self.supplier = supplier
break break
def validate_warehouse(self):
from erpnext.stock.utils import validate_warehouse_company
warehouses = list(set([d.warehouse for d in
self.get("items") if getattr(d, "warehouse", None)]))
for w in warehouses:
validate_warehouse_company(w, self.company)
def validate_stock_or_nonstock_items(self): def validate_stock_or_nonstock_items(self):
if self.meta.get_field("taxes") and not self.get_stock_items(): if self.meta.get_field("taxes") and not self.get_stock_items():
tax_for_valuation = [d.account_head for d in self.get("taxes") tax_for_valuation = [d.account_head for d in self.get("taxes")
@@ -234,7 +225,7 @@ class BuyingController(StockController):
def get_items_from_bom(self, item_code, bom): def get_items_from_bom(self, item_code, bom):
bom_items = frappe.db.sql("""select t2.item_code, bom_items = frappe.db.sql("""select t2.item_code,
ifnull(t2.qty, 0) / ifnull(t1.quantity, 1) as qty_consumed_per_unit, t2.qty / ifnull(t1.quantity, 1) as qty_consumed_per_unit,
t2.rate, t2.stock_uom, t2.name, t2.description t2.rate, t2.stock_uom, t2.name, t2.description
from `tabBOM` t1, `tabBOM Item` t2, tabItem t3 from `tabBOM` t1, `tabBOM Item` t2, tabItem t3
where t2.parent = t1.name and t1.item = %s where t2.parent = t1.name and t1.item = %s

2
erpnext/controllers/queries.py
View File

@@ -165,7 +165,7 @@ def item_query(doctype, txt, searchfield, start, page_len, filters):
concat(substr(tabItem.description, 1, 40), "..."), description) as decription concat(substr(tabItem.description, 1, 40), "..."), description) as decription
from tabItem from tabItem
where tabItem.docstatus < 2 where tabItem.docstatus < 2
and ifnull(tabItem.has_variants, 0)=0 and tabItem.has_variants=0
and tabItem.disabled=0 and tabItem.disabled=0
and (tabItem.end_of_life > %(today)s or ifnull(tabItem.end_of_life, '0000-00-00')='0000-00-00') and (tabItem.end_of_life > %(today)s or ifnull(tabItem.end_of_life, '0000-00-00')='0000-00-00')
and (tabItem.`{key}` LIKE %(txt)s and (tabItem.`{key}` LIKE %(txt)s

2
erpnext/controllers/recurring_document.py
View File

@@ -37,7 +37,7 @@ def manage_recurring_documents(doctype, next_date=None, commit=True):
condition = " and ifnull(status, '') != 'Stopped'" if doctype in ("Sales Order", "Purchase Order") else "" condition = " and ifnull(status, '') != 'Stopped'" if doctype in ("Sales Order", "Purchase Order") else ""
recurring_documents = frappe.db.sql("""select name, recurring_id recurring_documents = frappe.db.sql("""select name, recurring_id
from `tab{0}` where ifnull(is_recurring, 0)=1 from `tab{0}` where is_recurring=1
and docstatus=1 and next_date=%s and docstatus=1 and next_date=%s
and next_date <= ifnull(end_date, '2199-12-31') {1}""".format(doctype, condition), next_date) and next_date <= ifnull(end_date, '2199-12-31') {1}""".format(doctype, condition), next_date)

2
erpnext/controllers/sales_and_purchase_return.py
View File

@@ -110,7 +110,7 @@ def get_already_returned_items(doc):
`tab{0} Item` child, `tab{1}` par `tab{0} Item` child, `tab{1}` par
where where
child.parent = par.name and par.docstatus = 1 child.parent = par.name and par.docstatus = 1
and ifnull(par.is_return, 0) = 1 and par.return_against = %s and child.qty < 0 and par.is_return = 1 and par.return_against = %s and child.qty < 0
group by item_code group by item_code
""".format(doc.doctype, doc.doctype), doc.return_against)) """.format(doc.doctype, doc.doctype), doc.return_against))

2
erpnext/controllers/selling_controller.py
View File

@@ -202,7 +202,7 @@ class SellingController(StockController):
delivered_via_si = frappe.db.sql("""select sum(si_item.qty) delivered_via_si = frappe.db.sql("""select sum(si_item.qty)
from `tabSales Invoice Item` si_item, `tabSales Invoice` si from `tabSales Invoice Item` si_item, `tabSales Invoice` si
where si_item.parent = si.name and ifnull(si.update_stock, 0) = 1 where si_item.parent = si.name and si.update_stock = 1
and si_item.so_detail = %s and si.docstatus = 1 and si_item.so_detail = %s and si.docstatus = 1
and si_item.sales_order = %s and si_item.sales_order = %s
and si.name != %s""", (so_detail, so, current_docname)) and si.name != %s""", (so_detail, so, current_docname))

8
erpnext/controllers/status_updater.py
View File

@@ -229,7 +229,7 @@ class StatusUpdater(Document):
if args.get('target_parent_field'): if args.get('target_parent_field'):
frappe.db.sql("""update `tab%(target_parent_dt)s` frappe.db.sql("""update `tab%(target_parent_dt)s`
set %(target_parent_field)s = round((select sum(if(%(target_ref_field)s > set %(target_parent_field)s = round((select sum(if(%(target_ref_field)s >
ifnull(%(target_field)s, 0), %(target_field)s, %(target_field)s, %(target_field)s,
%(target_ref_field)s))/sum(%(target_ref_field)s)*100 %(target_ref_field)s))/sum(%(target_ref_field)s)*100
from `tab%(target_dt)s` where parent="%(name)s"), 2) %(set_modified)s from `tab%(target_dt)s` where parent="%(name)s"), 2) %(set_modified)s
where name='%(name)s'""" % args) where name='%(name)s'""" % args)
@@ -237,7 +237,7 @@ class StatusUpdater(Document):
# update field # update field
if args.get('status_field'): if args.get('status_field'):
frappe.db.sql("""update `tab%(target_parent_dt)s` frappe.db.sql("""update `tab%(target_parent_dt)s`
set %(status_field)s = if(ifnull(%(target_parent_field)s,0)<0.001, set %(status_field)s = if(%(target_parent_field)s<0.001,
'Not %(keyword)s', if(%(target_parent_field)s>=99.99, 'Not %(keyword)s', if(%(target_parent_field)s>=99.99,
'Fully %(keyword)s', 'Partly %(keyword)s')) 'Fully %(keyword)s', 'Partly %(keyword)s'))
where name='%(name)s'""" % args) where name='%(name)s'""" % args)
@@ -264,10 +264,10 @@ class StatusUpdater(Document):
def update_billing_status(self, zero_amount_refdoc, ref_dt, ref_fieldname): def update_billing_status(self, zero_amount_refdoc, ref_dt, ref_fieldname):
for ref_dn in zero_amount_refdoc: for ref_dn in zero_amount_refdoc:
ref_doc_qty = flt(frappe.db.sql("""select sum(ifnull(qty, 0)) from `tab%s Item` ref_doc_qty = flt(frappe.db.sql("""select sum(qty) from `tab%s Item`
where parent=%s""" % (ref_dt, '%s'), (ref_dn))[0][0]) where parent=%s""" % (ref_dt, '%s'), (ref_dn))[0][0])
billed_qty = flt(frappe.db.sql("""select sum(ifnull(qty, 0)) billed_qty = flt(frappe.db.sql("""select sum(qty)
from `tab%s Item` where %s=%s and docstatus=1""" % from `tab%s Item` where %s=%s and docstatus=1""" %
(self.doctype, ref_fieldname, '%s'), (ref_dn))[0][0]) (self.doctype, ref_fieldname, '%s'), (ref_dn))[0][0])

13
erpnext/controllers/stock_controller.py
View File

@@ -221,7 +221,7 @@ class StockController(AccountsController):
def get_incoming_rate_for_sales_return(self, item_code, warehouse, against_document): def get_incoming_rate_for_sales_return(self, item_code, warehouse, against_document):
incoming_rate = 0.0 incoming_rate = 0.0
if against_document and item_code: if against_document and item_code:
incoming_rate = frappe.db.sql("""select abs(ifnull(stock_value_difference, 0) / actual_qty) incoming_rate = frappe.db.sql("""select abs(stock_value_difference / actual_qty)
from `tabStock Ledger Entry` from `tabStock Ledger Entry`
where voucher_type = %s and voucher_no = %s where voucher_type = %s and voucher_no = %s
and item_code = %s and warehouse=%s limit 1""", and item_code = %s and warehouse=%s limit 1""",
@@ -303,6 +303,15 @@ class StockController(AccountsController):
})) }))
self.make_sl_entries(sl_entries) self.make_sl_entries(sl_entries)
def validate_warehouse(self):
from erpnext.stock.utils import validate_warehouse_company
warehouses = list(set([d.warehouse for d in
self.get("items") if getattr(d, "warehouse", None)]))
for w in warehouses:
validate_warehouse_company(w, self.company)
def update_gl_entries_after(posting_date, posting_time, for_warehouses=None, for_items=None, def update_gl_entries_after(posting_date, posting_time, for_warehouses=None, for_items=None,
warehouse_account=None): warehouse_account=None):
@@ -376,6 +385,6 @@ def get_warehouse_account():
warehouse_account = frappe._dict() warehouse_account = frappe._dict()
for d in frappe.db.sql("""select warehouse, name, account_currency from tabAccount for d in frappe.db.sql("""select warehouse, name, account_currency from tabAccount
where account_type = 'Warehouse' and ifnull(warehouse, '') != ''""", as_dict=1): where account_type = 'Warehouse' and (warehouse is not null and warehouse != '')""", as_dict=1):
warehouse_account.setdefault(d.warehouse, d) warehouse_account.setdefault(d.warehouse, d)
return warehouse_account return warehouse_account

2
erpnext/controllers/website_list_for_contact.py
View File

@@ -13,7 +13,7 @@ def get_list_context(context=None):
"global_number_format": frappe.db.get_default("number_format") or "#,###.##", "global_number_format": frappe.db.get_default("number_format") or "#,###.##",
"currency": frappe.db.get_default("currency"), "currency": frappe.db.get_default("currency"),
"currency_symbols": json.dumps(dict(frappe.db.sql("""select name, symbol "currency_symbols": json.dumps(dict(frappe.db.sql("""select name, symbol
from tabCurrency where ifnull(enabled,0)=1"""))), from tabCurrency where enabled=1"""))),
"row_template": "templates/includes/transaction_row.html", "row_template": "templates/includes/transaction_row.html",
"get_list": get_transaction_list "get_list": get_transaction_list
} }

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

@@ -20,6 +20,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-user", "options": "icon-user",
"permlevel": 0, "permlevel": 0,
@@ -41,7 +42,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Series", "label": "Series",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "naming_series", "oldfieldname": "naming_series",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -66,6 +68,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Person Name", "label": "Person Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "lead_name", "oldfieldname": "lead_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -89,6 +92,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Organization Name", "label": "Organization Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company_name", "oldfieldname": "company_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -112,6 +116,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Email Id", "label": "Email Id",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "email_id", "oldfieldname": "email_id",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -135,6 +140,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -157,7 +163,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Status", "label": "Status",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "status", "oldfieldname": "status",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -181,7 +188,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Source", "label": "Source",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "source", "oldfieldname": "source",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -207,6 +215,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "From Customer", "label": "From Customer",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "customer", "oldfieldname": "customer",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -233,6 +242,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Campaign Name", "label": "Campaign Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "campaign_name", "oldfieldname": "campaign_name",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -256,6 +266,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -279,6 +290,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Lead Owner", "label": "Lead Owner",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "lead_owner", "oldfieldname": "lead_owner",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -302,6 +314,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -324,6 +337,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Next Contact By", "label": "Next Contact By",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "contact_by", "oldfieldname": "contact_by",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -350,6 +364,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Next Contact Date", "label": "Next Contact Date",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "contact_date", "oldfieldname": "contact_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -374,6 +389,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Address & Contact", "label": "Address & Contact",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"options": "icon-map-marker", "options": "icon-map-marker",
@@ -398,6 +414,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Address Desc", "label": "Address Desc",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "<em>Addresses will appear only when you save the lead</em>", "options": "<em>Addresses will appear only when you save the lead</em>",
"permlevel": 0, "permlevel": 0,
@@ -420,6 +437,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Address HTML", "label": "Address HTML",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -440,6 +458,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -461,6 +480,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Phone", "label": "Phone",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "contact_no", "oldfieldname": "contact_no",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -484,6 +504,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Mobile No.", "label": "Mobile No.",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "mobile_no", "oldfieldname": "mobile_no",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -507,6 +528,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Fax", "label": "Fax",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fax", "oldfieldname": "fax",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -530,6 +552,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Website", "label": "Website",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "website", "oldfieldname": "website",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -554,6 +577,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Territory", "label": "Territory",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "territory", "oldfieldname": "territory",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -578,6 +602,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "More Information", "label": "More Information",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-file-text", "options": "icon-file-text",
@@ -600,7 +625,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Lead Type", "label": "Lead Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "type", "oldfieldname": "type",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -624,7 +650,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Market Segment", "label": "Market Segment",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "market_segment", "oldfieldname": "market_segment",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -649,6 +676,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Industry", "label": "Industry",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "industry", "oldfieldname": "industry",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -672,7 +700,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Request Type", "label": "Request Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "request_type", "oldfieldname": "request_type",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -697,6 +726,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Fiscal Year", "label": "Fiscal Year",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -720,6 +750,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -743,6 +774,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -767,6 +799,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Unsubscribed", "label": "Unsubscribed",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -788,6 +821,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Blog Subscriber", "label": "Blog Subscriber",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -808,7 +842,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:55.014441", "max_attachments": 0,
"modified": "2015-11-16 06:29:49.250337",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Lead", "name": "Lead",

12
erpnext/crm/doctype/newsletter/newsletter.json
View File

@@ -21,6 +21,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Newsletter List", "label": "Newsletter List",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Newsletter List", "options": "Newsletter List",
"permlevel": 0, "permlevel": 0,
@@ -44,6 +45,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Subject", "label": "Subject",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -66,6 +68,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Sender", "label": "Sender",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -87,6 +90,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Email Sent?", "label": "Email Sent?",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -108,6 +112,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -129,6 +134,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Message", "label": "Message",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -151,6 +157,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -173,6 +180,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Test Email Id", "label": "Test Email Id",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -194,6 +202,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Test", "label": "Test",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "test_send", "options": "test_send",
"permlevel": 0, "permlevel": 0,
@@ -215,7 +224,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:57.733269", "max_attachments": 0,
"modified": "2015-11-16 06:29:50.506090",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Newsletter", "name": "Newsletter",

5
erpnext/crm/doctype/newsletter_list/newsletter_list.json
View File

@@ -20,6 +20,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Title", "label": "Title",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -43,6 +44,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Total Subscribers", "label": "Total Subscribers",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -62,7 +64,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:57.839265", "max_attachments": 0,
"modified": "2015-11-16 06:29:50.643141",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Newsletter List", "name": "Newsletter List",

6
erpnext/crm/doctype/newsletter_list_subscriber/newsletter_list_subscriber.json
View File

@@ -20,6 +20,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Newsletter List", "label": "Newsletter List",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Newsletter List", "options": "Newsletter List",
"permlevel": 0, "permlevel": 0,
@@ -43,6 +44,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Email", "label": "Email",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -65,6 +67,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Unsubscribed", "label": "Unsubscribed",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -84,7 +87,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:57.901238", "max_attachments": 0,
"modified": "2015-11-16 06:29:50.675306",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Newsletter List Subscriber", "name": "Newsletter List Subscriber",

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

@@ -21,6 +21,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-user", "options": "icon-user",
"permlevel": 0, "permlevel": 0,
@@ -42,7 +43,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Series", "label": "Series",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "naming_series", "oldfieldname": "naming_series",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -66,7 +68,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Opportunity From", "label": "Opportunity From",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "enquiry_from", "oldfieldname": "enquiry_from",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -92,6 +95,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Customer", "label": "Customer",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "customer", "oldfieldname": "customer",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -117,6 +121,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Lead", "label": "Lead",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "lead", "oldfieldname": "lead",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -142,6 +147,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Customer / Lead Name", "label": "Customer / Lead Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -162,6 +168,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -185,6 +192,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Title", "label": "Title",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -207,7 +215,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Opportunity Type", "label": "Opportunity Type",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "enquiry_type", "oldfieldname": "enquiry_type",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -232,7 +241,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Status", "label": "Status",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "status", "oldfieldname": "status",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -258,6 +268,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Lost Reason", "label": "Lost Reason",
"length": 0,
"no_copy": 1, "no_copy": 1,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -279,6 +290,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "With Items", "label": "With Items",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -302,6 +314,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-shopping-cart", "options": "icon-shopping-cart",
@@ -326,6 +339,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Items", "label": "Items",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "enquiry_details", "oldfieldname": "enquiry_details",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -352,6 +366,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact Info", "label": "Contact Info",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "icon-bullhorn", "options": "icon-bullhorn",
"permlevel": 0, "permlevel": 0,
@@ -375,6 +390,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Customer / Lead Address", "label": "Customer / Lead Address",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Address", "options": "Address",
"permlevel": 0, "permlevel": 0,
@@ -397,6 +413,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Address", "label": "Address",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "address", "oldfieldname": "address",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -422,6 +439,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Territory", "label": "Territory",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Territory", "options": "Territory",
"permlevel": 0, "permlevel": 0,
@@ -446,6 +464,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Customer Group", "label": "Customer Group",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "customer_group", "oldfieldname": "customer_group",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -469,6 +488,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -491,6 +511,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact Person", "label": "Contact Person",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Contact", "options": "Contact",
"permlevel": 0, "permlevel": 0,
@@ -514,6 +535,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact", "label": "Contact",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -536,6 +558,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact Email", "label": "Contact Email",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -558,6 +581,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Contact Mobile No", "label": "Contact Mobile No",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -580,6 +604,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Source", "label": "Source",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "icon-file-text", "options": "icon-file-text",
@@ -602,7 +627,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Source", "label": "Source",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "source", "oldfieldname": "source",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -628,6 +654,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Campaign", "label": "Campaign",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "campaign", "oldfieldname": "campaign",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -651,6 +678,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -674,6 +702,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -699,6 +728,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Opportunity Date", "label": "Opportunity Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "transaction_date", "oldfieldname": "transaction_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -723,6 +753,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Fiscal Year", "label": "Fiscal Year",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -748,6 +779,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Next Contact", "label": "Next Contact",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -771,6 +803,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Next Contact By", "label": "Next Contact By",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "contact_by", "oldfieldname": "contact_by",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -797,6 +830,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Next Contact Date", "label": "Next Contact Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "contact_date", "oldfieldname": "contact_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -819,6 +853,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -842,6 +877,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "To Discuss", "label": "To Discuss",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "to_discuss", "oldfieldname": "to_discuss",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -865,6 +901,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amended From", "label": "Amended From",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -889,7 +926,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:58.453338", "max_attachments": 0,
"modified": "2015-11-16 06:29:50.931180",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Opportunity", "name": "Opportunity",

16
erpnext/crm/doctype/opportunity_item/opportunity_item.json
View File

@@ -18,6 +18,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Item Code", "label": "Item Code",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_code", "oldfieldname": "item_code",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -41,6 +42,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -62,6 +64,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Qty", "label": "Qty",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "qty", "oldfieldname": "qty",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -86,6 +89,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Item Group", "label": "Item Group",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_group", "oldfieldname": "item_group",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -110,6 +114,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Brand", "label": "Brand",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "brand", "oldfieldname": "brand",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -133,6 +138,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -155,6 +161,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "UOM", "label": "UOM",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "uom", "oldfieldname": "uom",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -179,6 +186,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Item Name", "label": "Item Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "item_name", "oldfieldname": "item_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -202,6 +210,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Description", "label": "Description",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "description", "oldfieldname": "description",
"oldfieldtype": "Text", "oldfieldtype": "Text",
@@ -226,6 +235,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -248,6 +258,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Image", "label": "Image",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "", "options": "",
"permlevel": 0, "permlevel": 0,
@@ -271,6 +282,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Image View", "label": "Image View",
"length": 0,
"no_copy": 0, "no_copy": 0,
"options": "image", "options": "image",
"permlevel": 0, "permlevel": 0,
@@ -294,6 +306,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Basic Rate", "label": "Basic Rate",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "basic_rate", "oldfieldname": "basic_rate",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -316,7 +329,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-19 03:04:51.988510", "max_attachments": 0,
"modified": "2015-11-16 06:29:51.062309",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "CRM", "module": "CRM",
"name": "Opportunity Item", "name": "Opportunity Item",

26
erpnext/hooks.py
View File

@@ -4,32 +4,10 @@ from frappe import _
app_name = "erpnext" app_name = "erpnext"
app_title = "ERPNext" app_title = "ERPNext"
app_publisher = "Frappe Technologies Pvt. Ltd." app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = """## ERPNext app_description = """ERP made simple"""
ERPNext is a fully featured ERP system designed for Small and Medium Sized
business. ERPNext covers a wide range of features including Accounting, CRM,
Inventory management, Selling, Purchasing, Manufacturing, Projects, HR &
Payroll, Website, E-Commerce and much more.
ERPNext is based on the Frappe Framework is highly customizable and extendable.
You can create Custom Form, Fields, Scripts and can also create your own Apps
to extend ERPNext functionality.
ERPNext is Open Source under the GNU General Public Licence v3 and has been
listed as one of the Best Open Source Softwares in the world by my online
blogs.
### Links
- Website: [https://erpnext.com](https://erpnext.com)
- GitHub: [https://github.com/frappe/erpnext](https://github.com/frappe/erpnext)
- Forum: [https://discuss.erpnext.com](https://discuss.erpnext.com)
- Frappe Framework: [https://frappe.io](https://frappe.io)
"""
app_icon = "icon-th" app_icon = "icon-th"
app_color = "#e74c3c" app_color = "#e74c3c"
app_version = "6.9.2" app_version = "6.10.0"
app_email = "info@erpnext.com" app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)" app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext" source_link = "https://github.com/frappe/erpnext"

24
erpnext/hr/doctype/appraisal/appraisal.json
View File

@@ -19,6 +19,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"permlevel": 0, "permlevel": 0,
@@ -42,6 +43,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Appraisal Template", "label": "Appraisal Template",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "kra_template", "oldfieldname": "kra_template",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -68,6 +70,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "For Employee", "label": "For Employee",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "employee", "oldfieldname": "employee",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -93,6 +96,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "For Employee Name", "label": "For Employee Name",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "employee_name", "oldfieldname": "employee_name",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -116,6 +120,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Column Break", "oldfieldtype": "Column Break",
"permlevel": 0, "permlevel": 0,
@@ -140,7 +145,8 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Status", "label": "Status",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "status", "oldfieldname": "status",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -166,6 +172,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 1, "in_list_view": 1,
"label": "Start Date", "label": "Start Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "start_date", "oldfieldname": "start_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -190,6 +197,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "End Date", "label": "End Date",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "end_date", "oldfieldname": "end_date",
"oldfieldtype": "Date", "oldfieldtype": "Date",
@@ -214,6 +222,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Goals", "label": "Goals",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Section Break", "oldfieldtype": "Section Break",
"options": "Simple", "options": "Simple",
@@ -237,6 +246,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Goals", "label": "Goals",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "appraisal_details", "oldfieldname": "appraisal_details",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -261,6 +271,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Calculate Total Score", "label": "Calculate Total Score",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldtype": "Button", "oldfieldtype": "Button",
"options": "calculate_total", "options": "calculate_total",
@@ -284,6 +295,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Total Score (Out of 5)", "label": "Total Score (Out of 5)",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "total_score", "oldfieldname": "total_score",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -307,6 +319,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -329,6 +342,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Remarks", "label": "Remarks",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -351,6 +365,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "", "label": "",
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"print_hide": 0, "print_hide": 0,
@@ -372,6 +387,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Company", "label": "Company",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "company", "oldfieldname": "company",
"oldfieldtype": "Link", "oldfieldtype": "Link",
@@ -395,6 +411,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -417,6 +434,7 @@
"in_filter": 1, "in_filter": 1,
"in_list_view": 0, "in_list_view": 0,
"label": "Fiscal Year", "label": "Fiscal Year",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "fiscal_year", "oldfieldname": "fiscal_year",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -441,6 +459,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Amended From", "label": "Amended From",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "amended_from", "oldfieldname": "amended_from",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -465,7 +484,8 @@
"is_submittable": 1, "is_submittable": 1,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:38.259403", "max_attachments": 0,
"modified": "2015-11-16 06:29:41.850937",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Appraisal", "name": "Appraisal",

10
erpnext/hr/doctype/appraisal_goal/appraisal_goal.json
View File

@@ -20,6 +20,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Goal", "label": "Goal",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "kra", "oldfieldname": "kra",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -44,6 +45,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -66,6 +68,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Weightage (%)", "label": "Weightage (%)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "per_weightage", "oldfieldname": "per_weightage",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -90,6 +93,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -112,6 +116,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Score (0-5)", "label": "Score (0-5)",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "score", "oldfieldname": "score",
"oldfieldtype": "Select", "oldfieldtype": "Select",
@@ -137,6 +142,7 @@
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
@@ -159,6 +165,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Score Earned", "label": "Score Earned",
"length": 0,
"no_copy": 1, "no_copy": 1,
"oldfieldname": "score_earned", "oldfieldname": "score_earned",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -182,7 +189,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:38.437815", "max_attachments": 0,
"modified": "2015-11-16 06:29:41.929884",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Appraisal Goal", "name": "Appraisal Goal",

6
erpnext/hr/doctype/appraisal_template/appraisal_template.json
View File

@@ -20,6 +20,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Appraisal Template Title", "label": "Appraisal Template Title",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "kra_title", "oldfieldname": "kra_title",
"oldfieldtype": "Data", "oldfieldtype": "Data",
@@ -43,6 +44,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Description", "label": "Description",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "description", "oldfieldname": "description",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -68,6 +70,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Goals", "label": "Goals",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "kra_sheet", "oldfieldname": "kra_sheet",
"oldfieldtype": "Table", "oldfieldtype": "Table",
@@ -91,7 +94,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"modified": "2015-10-02 07:38:38.527810", "max_attachments": 0,
"modified": "2015-11-16 06:29:41.974626",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Appraisal Template", "name": "Appraisal Template",

5
erpnext/hr/doctype/appraisal_template_goal/appraisal_template_goal.json
View File

@@ -20,6 +20,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "KRA", "label": "KRA",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "kra", "oldfieldname": "kra",
"oldfieldtype": "Small Text", "oldfieldtype": "Small Text",
@@ -45,6 +46,7 @@
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Weightage (%)", "label": "Weightage (%)",
"length": 0,
"no_copy": 0, "no_copy": 0,
"oldfieldname": "per_weightage", "oldfieldname": "per_weightage",
"oldfieldtype": "Currency", "oldfieldtype": "Currency",
@@ -68,7 +70,8 @@
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 1, "istable": 1,
"modified": "2015-10-02 07:38:38.594066", "max_attachments": 0,
"modified": "2015-11-16 06:29:42.006632",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Appraisal Template Goal", "name": "Appraisal Template Goal",

Some files were not shown because too many files have changed in this diff Show More