Merge branch 'remove-move-stock-summary' of github.com:scmmishra/erpnext into remove-move-stock-summary
diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js
index fcbd10f..dd20632 100644
--- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js
+++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.js
@@ -9,6 +9,26 @@
frappe.set_route("List", frm.doc.document_type);
});
}
+
+ let button = frm.doc.disabled ? "Enable" : "Disable";
+
+ frm.add_custom_button(__(button), function() {
+
+ frm.set_value('disabled', 1 - frm.doc.disabled);
+
+ frappe.call({
+ method: "erpnext.accounts.doctype.accounting_dimension.accounting_dimension.disable_dimension",
+ args: {
+ doc: frm.doc
+ },
+ freeze: true,
+ callback: function(r) {
+ let message = frm.doc.disabled ? "Dimension Disabled" : "Dimension Enabled";
+ frm.save();
+ frappe.show_alert({message:__(message), indicator:'green'});
+ }
+ });
+ });
},
document_type: function(frm) {
@@ -21,13 +41,4 @@
}
});
},
-
- disabled: function(frm) {
- frappe.call({
- method: "erpnext.accounts.doctype.accounting_dimension.accounting_dimension.disable_dimension",
- args: {
- doc: frm.doc
- }
- });
- }
});
diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json
index 1e2bb92..57543a0 100644
--- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json
+++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.json
@@ -38,7 +38,8 @@
"default": "0",
"fieldname": "disabled",
"fieldtype": "Check",
- "label": "Disable"
+ "label": "Disable",
+ "read_only": 1
},
{
"default": "0",
@@ -53,7 +54,7 @@
"label": "Mandatory For Profit and Loss Account"
}
],
- "modified": "2019-05-27 18:18:17.792726",
+ "modified": "2019-07-07 18:56:19.517450",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Accounting Dimension",
diff --git a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
index 91d03be..15ace72 100644
--- a/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
+++ b/erpnext/accounts/doctype/accounting_dimension/accounting_dimension.py
@@ -121,11 +121,11 @@
@frappe.whitelist()
def disable_dimension(doc):
if frappe.flags.in_test:
- frappe.enqueue(start_dimension_disabling, doc=doc)
+ toggle_disabling(doc=doc)
else:
- start_dimension_disabling(doc=doc)
+ frappe.enqueue(toggle_disabling, doc=doc)
-def start_dimension_disabling(doc):
+def toggle_disabling(doc):
doc = json.loads(doc)
if doc.get('disabled'):
diff --git a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
index 28807c4..90cdf83 100644
--- a/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
+++ b/erpnext/accounts/doctype/bank_reconciliation/bank_reconciliation.py
@@ -103,7 +103,7 @@
for d in self.get('payment_entries'):
if d.clearance_date:
if not d.payment_document:
- frappe.throw(_("Row #{0}: Payment document is required to complete the trasaction"))
+ frappe.throw(_("Row #{0}: Payment document is required to complete the transaction"))
if d.cheque_date and getdate(d.clearance_date) < getdate(d.cheque_date):
frappe.throw(_("Row #{0}: Clearance date {1} cannot be before Cheque Date {2}")
@@ -113,10 +113,8 @@
if not d.clearance_date:
d.clearance_date = None
- frappe.db.set_value(d.payment_document, d.payment_entry, "clearance_date", d.clearance_date)
- frappe.db.sql("""update `tab{0}` set clearance_date = %s, modified = %s
- where name=%s""".format(d.payment_document),
- (d.clearance_date, nowdate(), d.payment_entry))
+ payment_entry = frappe.get_doc(d.payment_document, d.payment_entry)
+ payment_entry.db_set('clearance_date', d.clearance_date)
clearance_date_updated = True
diff --git a/erpnext/accounts/doctype/gl_entry/gl_entry.json b/erpnext/accounts/doctype/gl_entry/gl_entry.json
index 333d39a..a232a95 100644
--- a/erpnext/accounts/doctype/gl_entry/gl_entry.json
+++ b/erpnext/accounts/doctype/gl_entry/gl_entry.json
@@ -848,6 +848,39 @@
"set_only_once": 0,
"translatable": 0,
"unique": 0
+ },
+ {
+ "allow_bulk_edit": 0,
+ "allow_in_quick_entry": 0,
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "columns": 0,
+ "fetch_if_empty": 0,
+ "fieldname": "due_date",
+ "fieldtype": "Date",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_global_search": 0,
+ "in_list_view": 0,
+ "in_standard_filter": 0,
+ "label": "Due Date",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "remember_last_selected_value": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "translatable": 0,
+ "unique": 0
}
],
"has_web_view": 0,
@@ -861,7 +894,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2019-01-07 07:05:00.366399",
+ "modified": "2019-05-01 07:05:00.366399",
"modified_by": "Administrator",
"module": "Accounts",
"name": "GL Entry",
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index 3132c93..8fbddb9 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -498,6 +498,7 @@
self.get_gl_dict({
"account": d.account,
"party_type": d.party_type,
+ "due_date": self.due_date,
"party": d.party,
"against": d.against_account,
"debit": flt(d.debit, d.precision("debit")),
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.js b/erpnext/accounts/doctype/payment_entry/payment_entry.js
index 2c382c5..f17b2cb 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.js
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.js
@@ -302,7 +302,7 @@
},
() => frm.set_value("party_balance", r.message.party_balance),
() => frm.set_value("party_name", r.message.party_name),
- () => frm.events.get_outstanding_documents(frm),
+ () => frm.clear_table("references"),
() => frm.events.hide_unhide_fields(frm),
() => frm.events.set_dynamic_labels(frm),
() => {
@@ -323,9 +323,7 @@
frm.events.set_account_currency_and_balance(frm, frm.doc.paid_from,
"paid_from_account_currency", "paid_from_account_balance", function(frm) {
- if (frm.doc.payment_type == "Receive") {
- frm.events.get_outstanding_documents(frm);
- } else if (frm.doc.payment_type == "Pay") {
+ if (frm.doc.payment_type == "Pay") {
frm.events.paid_amount(frm);
}
}
@@ -337,9 +335,7 @@
frm.events.set_account_currency_and_balance(frm, frm.doc.paid_to,
"paid_to_account_currency", "paid_to_account_balance", function(frm) {
- if(frm.doc.payment_type == "Pay") {
- frm.events.get_outstanding_documents(frm);
- } else if (frm.doc.payment_type == "Receive") {
+ if (frm.doc.payment_type == "Receive") {
if(frm.doc.paid_from_account_currency == frm.doc.paid_to_account_currency) {
if(frm.doc.source_exchange_rate) {
frm.set_value("target_exchange_rate", frm.doc.source_exchange_rate);
@@ -533,26 +529,87 @@
frm.events.set_unallocated_amount(frm);
},
- get_outstanding_documents: function(frm) {
+ get_outstanding_invoice: function(frm) {
+ const today = frappe.datetime.get_today();
+ const fields = [
+ {fieldtype:"Section Break", label: __("Posting Date")},
+ {fieldtype:"Date", label: __("From Date"),
+ fieldname:"from_posting_date", default:frappe.datetime.add_days(today, -30)},
+ {fieldtype:"Column Break"},
+ {fieldtype:"Date", label: __("To Date"), fieldname:"to_posting_date", default:today},
+ {fieldtype:"Section Break", label: __("Due Date")},
+ {fieldtype:"Date", label: __("From Date"), fieldname:"from_due_date"},
+ {fieldtype:"Column Break"},
+ {fieldtype:"Date", label: __("To Date"), fieldname:"to_due_date"},
+ {fieldtype:"Section Break", label: __("Outstanding Amount")},
+ {fieldtype:"Float", label: __("Greater Than Amount"),
+ fieldname:"outstanding_amt_greater_than", default: 0},
+ {fieldtype:"Column Break"},
+ {fieldtype:"Float", label: __("Less Than Amount"), fieldname:"outstanding_amt_less_than"},
+ {fieldtype:"Section Break"},
+ {fieldtype:"Check", label: __("Allocate Payment Amount"), fieldname:"allocate_payment_amount", default:1},
+ ];
+
+ frappe.prompt(fields, function(filters){
+ frappe.flags.allocate_payment_amount = true;
+ frm.events.validate_filters_data(frm, filters);
+ frm.events.get_outstanding_documents(frm, filters);
+ }, __("Filters"), __("Get Outstanding Invoices"));
+ },
+
+ validate_filters_data: function(frm, filters) {
+ const fields = {
+ 'Posting Date': ['from_posting_date', 'to_posting_date'],
+ 'Due Date': ['from_posting_date', 'to_posting_date'],
+ 'Advance Amount': ['from_posting_date', 'to_posting_date'],
+ };
+
+ for (let key in fields) {
+ let from_field = fields[key][0];
+ let to_field = fields[key][1];
+
+ if (filters[from_field] && !filters[to_field]) {
+ frappe.throw(__("Error: {0} is mandatory field",
+ [to_field.replace(/_/g, " ")]
+ ));
+ } else if (filters[from_field] && filters[from_field] > filters[to_field]) {
+ frappe.throw(__("{0}: {1} must be less than {2}",
+ [key, from_field.replace(/_/g, " "), to_field.replace(/_/g, " ")]
+ ));
+ }
+ }
+ },
+
+ get_outstanding_documents: function(frm, filters) {
frm.clear_table("references");
- if(!frm.doc.party) return;
+ if(!frm.doc.party) {
+ return;
+ }
frm.events.check_mandatory_to_fetch(frm);
var company_currency = frappe.get_doc(":Company", frm.doc.company).default_currency;
+ var args = {
+ "posting_date": frm.doc.posting_date,
+ "company": frm.doc.company,
+ "party_type": frm.doc.party_type,
+ "payment_type": frm.doc.payment_type,
+ "party": frm.doc.party,
+ "party_account": frm.doc.payment_type=="Receive" ? frm.doc.paid_from : frm.doc.paid_to,
+ "cost_center": frm.doc.cost_center
+ }
+
+ for (let key in filters) {
+ args[key] = filters[key];
+ }
+
+ frappe.flags.allocate_payment_amount = filters['allocate_payment_amount'];
+
return frappe.call({
method: 'erpnext.accounts.doctype.payment_entry.payment_entry.get_outstanding_reference_documents',
args: {
- args: {
- "posting_date": frm.doc.posting_date,
- "company": frm.doc.company,
- "party_type": frm.doc.party_type,
- "payment_type": frm.doc.payment_type,
- "party": frm.doc.party,
- "party_account": frm.doc.payment_type=="Receive" ? frm.doc.paid_from : frm.doc.paid_to,
- "cost_center": frm.doc.cost_center
- }
+ args:args
},
callback: function(r, rt) {
if(r.message) {
@@ -608,25 +665,11 @@
frm.events.allocate_party_amount_against_ref_docs(frm,
(frm.doc.payment_type=="Receive" ? frm.doc.paid_amount : frm.doc.received_amount));
+
}
});
},
- allocate_payment_amount: function(frm) {
- if(frm.doc.payment_type == 'Internal Transfer'){
- return
- }
-
- if(frm.doc.references.length == 0){
- frm.events.get_outstanding_documents(frm);
- }
- if(frm.doc.payment_type == 'Internal Transfer') {
- frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.paid_amount);
- } else {
- frm.events.allocate_party_amount_against_ref_docs(frm, frm.doc.received_amount);
- }
- },
-
allocate_party_amount_against_ref_docs: function(frm, paid_amount) {
var total_positive_outstanding_including_order = 0;
var total_negative_outstanding = 0;
@@ -677,7 +720,7 @@
$.each(frm.doc.references || [], function(i, row) {
row.allocated_amount = 0 //If allocate payment amount checkbox is unchecked, set zero to allocate amount
- if(frm.doc.allocate_payment_amount){
+ if(frappe.flags.allocate_payment_amount){
if(row.outstanding_amount > 0 && allocated_positive_outstanding > 0) {
if(row.outstanding_amount >= allocated_positive_outstanding) {
row.allocated_amount = allocated_positive_outstanding;
@@ -958,7 +1001,7 @@
},
() => {
if(frm.doc.payment_type != "Internal") {
- frm.events.get_outstanding_documents(frm);
+ frm.clear_table("references");
}
}
]);
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.json b/erpnext/accounts/doctype/payment_entry/payment_entry.json
index fcaa570..a85eccd 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.json
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.json
@@ -40,7 +40,7 @@
"target_exchange_rate",
"base_received_amount",
"section_break_14",
- "allocate_payment_amount",
+ "get_outstanding_invoice",
"references",
"section_break_34",
"total_allocated_amount",
@@ -325,19 +325,15 @@
"reqd": 1
},
{
- "collapsible": 1,
- "collapsible_depends_on": "references",
"depends_on": "eval:(doc.party && doc.paid_from && doc.paid_to && doc.paid_amount && doc.received_amount)",
"fieldname": "section_break_14",
"fieldtype": "Section Break",
"label": "Reference"
},
{
- "default": "1",
- "depends_on": "eval:in_list(['Pay', 'Receive'], doc.payment_type)",
- "fieldname": "allocate_payment_amount",
- "fieldtype": "Check",
- "label": "Allocate Payment Amount"
+ "fieldname": "get_outstanding_invoice",
+ "fieldtype": "Button",
+ "label": "Get Outstanding Invoice"
},
{
"fieldname": "references",
@@ -570,7 +566,7 @@
}
],
"is_submittable": 1,
- "modified": "2019-05-25 22:02:40.575822",
+ "modified": "2019-05-27 15:53:21.108857",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Entry",
diff --git a/erpnext/accounts/doctype/payment_entry/payment_entry.py b/erpnext/accounts/doctype/payment_entry/payment_entry.py
index ea76126..699f046 100644
--- a/erpnext/accounts/doctype/payment_entry/payment_entry.py
+++ b/erpnext/accounts/doctype/payment_entry/payment_entry.py
@@ -574,8 +574,8 @@
# Get negative outstanding sales /purchase invoices
negative_outstanding_invoices = []
if args.get("party_type") not in ["Student", "Employee"] and not args.get("voucher_no"):
- negative_outstanding_invoices = get_negative_outstanding_invoices(args.get("party_type"),
- args.get("party"), args.get("party_account"), party_account_currency, company_currency)
+ negative_outstanding_invoices = get_negative_outstanding_invoices(args.get("party_type"), args.get("party"),
+ args.get("party_account"), args.get("company"), party_account_currency, company_currency)
# Get positive outstanding sales /purchase invoices/ Fees
condition = ""
@@ -585,10 +585,23 @@
# Add cost center condition
if args.get("cost_center") and get_allow_cost_center_in_entry_of_bs_account():
- condition += " and cost_center='%s'" % args.get("cost_center")
+ condition += " and cost_center='%s'" % args.get("cost_center")
+
+ date_fields_dict = {
+ 'posting_date': ['from_posting_date', 'to_posting_date'],
+ 'due_date': ['from_due_date', 'to_due_date']
+ }
+
+ for fieldname, date_fields in date_fields_dict.items():
+ if args.get(date_fields[0]) and args.get(date_fields[1]):
+ condition += " and {0} between '{1}' and '{2}'".format(fieldname,
+ args.get(date_fields[0]), args.get(date_fields[1]))
+
+ if args.get("company"):
+ condition += " and company = {0}".format(frappe.db.escape(args.get("company")))
outstanding_invoices = get_outstanding_invoices(args.get("party_type"), args.get("party"),
- args.get("party_account"), condition=condition)
+ args.get("party_account"), filters=args, condition=condition, limit=100)
for d in outstanding_invoices:
d["exchange_rate"] = 1
@@ -606,12 +619,19 @@
orders_to_be_billed = []
if (args.get("party_type") != "Student"):
orders_to_be_billed = get_orders_to_be_billed(args.get("posting_date"),args.get("party_type"),
- args.get("party"), party_account_currency, company_currency)
+ args.get("party"), args.get("company"), party_account_currency, company_currency, filters=args)
- return negative_outstanding_invoices + outstanding_invoices + orders_to_be_billed
+ data = negative_outstanding_invoices + outstanding_invoices + orders_to_be_billed
+
+ if not data:
+ frappe.msgprint(_("No outstanding invoices found for the {0} <b>{1}</b>.")
+ .format(args.get("party_type").lower(), args.get("party")))
+
+ return data
-def get_orders_to_be_billed(posting_date, party_type, party, party_account_currency, company_currency, cost_center=None):
+def get_orders_to_be_billed(posting_date, party_type, party,
+ company, party_account_currency, company_currency, cost_center=None, filters=None):
if party_type == "Customer":
voucher_type = 'Sales Order'
elif party_type == "Supplier":
@@ -641,6 +661,7 @@
where
{party_type} = %s
and docstatus = 1
+ and company = %s
and ifnull(status, "") != "Closed"
and {ref_field} > advance_paid
and abs(100 - per_billed) > 0.01
@@ -652,10 +673,14 @@
"voucher_type": voucher_type,
"party_type": scrub(party_type),
"condition": condition
- }), party, as_dict=True)
+ }), (party, company), as_dict=True)
order_list = []
for d in orders:
+ if not (d.outstanding_amount >= filters.get("outstanding_amt_greater_than")
+ and d.outstanding_amount <= filters.get("outstanding_amt_less_than")):
+ continue
+
d["voucher_type"] = voucher_type
# This assumes that the exchange rate required is the one in the SO
d["exchange_rate"] = get_exchange_rate(party_account_currency, company_currency, posting_date)
@@ -663,7 +688,8 @@
return order_list
-def get_negative_outstanding_invoices(party_type, party, party_account, party_account_currency, company_currency, cost_center=None):
+def get_negative_outstanding_invoices(party_type, party, party_account,
+ company, party_account_currency, company_currency, cost_center=None):
voucher_type = "Sales Invoice" if party_type == "Customer" else "Purchase Invoice"
supplier_condition = ""
if voucher_type == "Purchase Invoice":
@@ -684,7 +710,8 @@
from
`tab{voucher_type}`
where
- {party_type} = %s and {party_account} = %s and docstatus = 1 and outstanding_amount < 0
+ {party_type} = %s and {party_account} = %s and docstatus = 1 and
+ company = %s and outstanding_amount < 0
{supplier_condition}
order by
posting_date, name
@@ -696,7 +723,7 @@
"party_type": scrub(party_type),
"party_account": "debit_to" if party_type == "Customer" else "credit_to",
"cost_center": cost_center
- }), (party, party_account), as_dict=True)
+ }), (party, party_account, company), as_dict=True)
@frappe.whitelist()
@@ -924,7 +951,6 @@
pe.paid_to_account_currency = party_account_currency if payment_type=="Pay" else bank.account_currency
pe.paid_amount = paid_amount
pe.received_amount = received_amount
- pe.allocate_payment_amount = 1
pe.letter_head = doc.get("letter_head")
if pe.party_type in ["Customer", "Supplier"]:
diff --git a/erpnext/accounts/doctype/pos_profile/pos_profile.js b/erpnext/accounts/doctype/pos_profile/pos_profile.js
index 10f127a..5e94118 100755
--- a/erpnext/accounts/doctype/pos_profile/pos_profile.js
+++ b/erpnext/accounts/doctype/pos_profile/pos_profile.js
@@ -8,6 +8,10 @@
return { filters: { selling: 1 } };
});
+ frm.set_query("tc_name", function() {
+ return { filters: { selling: 1 } };
+ });
+
erpnext.queries.setup_queries(frm, "Warehouse", function() {
return erpnext.queries.warehouse(frm.doc);
});
diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
index a6f6ace..219d989 100644
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
@@ -337,7 +337,8 @@
if not self.is_return:
self.update_against_document_in_jv()
self.update_billing_status_for_zero_amount_refdoc("Purchase Order")
- self.update_billing_status_in_pr()
+
+ self.update_billing_status_in_pr()
# Updating stock ledger should always be called after updating prevdoc status,
# because updating ordered qty in bin depends upon updated ordered qty in PO
@@ -416,6 +417,7 @@
"account": self.credit_to,
"party_type": "Supplier",
"party": self.supplier,
+ "due_date": self.due_date,
"against": self.against_expense_account,
"credit": grand_total_in_company_currency,
"credit_in_account_currency": grand_total_in_company_currency \
@@ -484,9 +486,13 @@
"credit": flt(item.rm_supp_cost)
}, warehouse_account[self.supplier_warehouse]["account_currency"], item=item))
elif not item.is_fixed_asset or (item.is_fixed_asset and is_cwip_accounting_disabled()):
+
+ expense_account = (item.expense_account
+ if (not item.enable_deferred_expense or self.is_return) else item.deferred_expense_account)
+
gl_entries.append(
self.get_gl_dict({
- "account": item.expense_account if not item.enable_deferred_expense else item.deferred_expense_account,
+ "account": expense_account,
"against": self.supplier,
"debit": flt(item.base_net_amount, item.precision("base_net_amount")),
"debit_in_account_currency": (flt(item.base_net_amount,
@@ -769,7 +775,8 @@
if not self.is_return:
self.update_billing_status_for_zero_amount_refdoc("Purchase Order")
- self.update_billing_status_in_pr()
+
+ self.update_billing_status_in_pr()
# Updating stock ledger should always be called after updating prevdoc status,
# because updating ordered qty in bin depends upon updated ordered qty in PO
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index b725c73..f8bb971 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -734,6 +734,7 @@
"account": self.debit_to,
"party_type": "Customer",
"party": self.customer,
+ "due_date": self.due_date,
"against": self.against_income_account,
"debit": grand_total_in_company_currency,
"debit_in_account_currency": grand_total_in_company_currency \
@@ -783,10 +784,13 @@
asset.db_set("disposal_date", self.posting_date)
asset.set_status("Sold" if self.docstatus==1 else None)
else:
- account_currency = get_account_currency(item.income_account)
+ income_account = (item.income_account
+ if (not item.enable_deferred_revenue or self.is_return) else item.deferred_revenue_account)
+
+ account_currency = get_account_currency(income_account)
gl_entries.append(
self.get_gl_dict({
- "account": item.income_account if not item.enable_deferred_revenue else item.deferred_revenue_account,
+ "account": income_account,
"against": self.customer,
"credit": flt(item.base_net_amount, item.precision("base_net_amount")),
"credit_in_account_currency": (flt(item.base_net_amount, item.precision("base_net_amount"))
diff --git a/erpnext/accounts/report/accounts_payable/accounts_payable.js b/erpnext/accounts/report/accounts_payable/accounts_payable.js
index 70f193e..f6a561f 100644
--- a/erpnext/accounts/report/accounts_payable/accounts_payable.js
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js
@@ -108,3 +108,14 @@
});
}
}
+
+erpnext.dimension_filters.then((dimensions) => {
+ dimensions.forEach((dimension) => {
+ frappe.query_reports["Accounts Payable"].filters.splice(9, 0 ,{
+ "fieldname": dimension["fieldname"],
+ "label": __(dimension["label"]),
+ "fieldtype": "Link",
+ "options": dimension["document_type"]
+ });
+ });
+});
diff --git a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
index 06499ad..ec4f0c9 100644
--- a/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
+++ b/erpnext/accounts/report/accounts_payable_summary/accounts_payable_summary.js
@@ -92,3 +92,14 @@
});
}
}
+
+erpnext.dimension_filters.then((dimensions) => {
+ dimensions.forEach((dimension) => {
+ frappe.query_reports["Accounts Payable Summary"].filters.splice(9, 0 ,{
+ "fieldname": dimension["fieldname"],
+ "label": __(dimension["label"]),
+ "fieldtype": "Link",
+ "options": dimension["document_type"]
+ });
+ });
+});
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
index 3661afe..2a45454 100644
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.js
@@ -172,3 +172,14 @@
});
}
}
+
+erpnext.dimension_filters.then((dimensions) => {
+ dimensions.forEach((dimension) => {
+ frappe.query_reports["Accounts Receivable"].filters.splice(9, 0 ,{
+ "fieldname": dimension["fieldname"],
+ "label": __(dimension["label"]),
+ "fieldtype": "Link",
+ "options": dimension["document_type"]
+ });
+ });
+});
diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
index 2973748..0cda2c1 100755
--- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py
@@ -5,6 +5,7 @@
import frappe, erpnext
from frappe import _, scrub
from frappe.utils import getdate, nowdate, flt, cint, formatdate, cstr
+from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
class ReceivablePayableReport(object):
def __init__(self, filters=None):
@@ -553,6 +554,14 @@
conditions.append("account in (%s)" % ','.join(['%s'] *len(accounts)))
values += accounts
+ accounting_dimensions = get_accounting_dimensions()
+
+ if accounting_dimensions:
+ for dimension in accounting_dimensions:
+ if self.filters.get(dimension):
+ conditions.append("{0} = %s".format(dimension))
+ values.append(self.filters.get(dimension))
+
return " and ".join(conditions), values
def get_gl_entries_for(self, party, party_type, against_voucher_type, against_voucher):
diff --git a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
index f9162ad..a7c0787 100644
--- a/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
+++ b/erpnext/accounts/report/accounts_receivable_summary/accounts_receivable_summary.js
@@ -116,3 +116,14 @@
});
}
}
+
+erpnext.dimension_filters.then((dimensions) => {
+ dimensions.forEach((dimension) => {
+ frappe.query_reports["Accounts Receivable Summary"].filters.splice(9, 0 ,{
+ "fieldname": dimension["fieldname"],
+ "label": __(dimension["label"]),
+ "fieldtype": "Link",
+ "options": dimension["document_type"]
+ });
+ });
+});
diff --git a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
index b2072f0..f2a33a8 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
@@ -63,9 +63,7 @@
]
}
-let dimension_filters = erpnext.get_dimension_filters();
-
-dimension_filters.then((dimensions) => {
+erpnext.dimension_filters.then((dimensions) => {
dimensions.forEach((dimension) => {
frappe.query_reports["Budget Variance Report"].filters[4].options.push(dimension["document_type"]);
});
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index 32af644..ea82575 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -159,9 +159,7 @@
]
}
-let dimension_filters = erpnext.get_dimension_filters();
-
-dimension_filters.then((dimensions) => {
+erpnext.dimension_filters.then((dimensions) => {
dimensions.forEach((dimension) => {
frappe.query_reports["General Ledger"].filters.splice(15, 0 ,{
"fieldname": dimension["fieldname"],
diff --git a/erpnext/accounts/report/profitability_analysis/profitability_analysis.js b/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
index 80b50b9..d6864b5 100644
--- a/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
+++ b/erpnext/accounts/report/profitability_analysis/profitability_analysis.js
@@ -16,7 +16,7 @@
"fieldname": "based_on",
"label": __("Based On"),
"fieldtype": "Select",
- "options": "Cost Center\nProject",
+ "options": ["Cost Center", "Project"],
"default": "Cost Center",
"reqd": 1
},
@@ -104,5 +104,10 @@
"parent_field": "parent_account",
"initial_depth": 3
}
-});
+ erpnext.dimension_filters.then((dimensions) => {
+ dimensions.forEach((dimension) => {
+ frappe.query_reports["Profitability Analysis"].filters[1].options.push(dimension["document_type"]);
+ });
+ });
+});
diff --git a/erpnext/accounts/report/profitability_analysis/profitability_analysis.py b/erpnext/accounts/report/profitability_analysis/profitability_analysis.py
index a0d8c5f..6e9b31f 100644
--- a/erpnext/accounts/report/profitability_analysis/profitability_analysis.py
+++ b/erpnext/accounts/report/profitability_analysis/profitability_analysis.py
@@ -24,8 +24,17 @@
if based_on == 'cost_center':
return frappe.db.sql("""select name, parent_cost_center as parent_account, cost_center_name as account_name, lft, rgt
from `tabCost Center` where company=%s order by name""", company, as_dict=True)
- else:
+ elif based_on == 'project':
return frappe.get_all('Project', fields = ["name"], filters = {'company': company}, order_by = 'name')
+ else:
+ filters = {}
+ doctype = frappe.unscrub(based_on)
+ has_company = frappe.db.has_column(doctype, 'company')
+
+ if has_company:
+ filters.update({'company': company})
+
+ return frappe.get_all(doctype, fields = ["name"], filters = filters, order_by = 'name')
def get_data(accounts, filters, based_on):
if not accounts:
@@ -42,7 +51,7 @@
accumulate_values_into_parents(accounts, accounts_by_name)
data = prepare_data(accounts, filters, total_row, parent_children_map, based_on)
- data = filter_out_zero_value_rows(data, parent_children_map,
+ data = filter_out_zero_value_rows(data, parent_children_map,
show_zero_values=filters.get("show_zero_values"))
return data
@@ -112,14 +121,14 @@
for key in value_fields:
row[key] = flt(d.get(key, 0.0), 3)
-
+
if abs(row[key]) >= 0.005:
# ignore zero values
has_value = True
row["has_value"] = has_value
data.append(row)
-
+
data.extend([{},total_row])
return data
@@ -174,7 +183,7 @@
if from_date:
additional_conditions.append("and posting_date >= %(from_date)s")
- gl_entries = frappe.db.sql("""select posting_date, {based_on} as based_on, debit, credit,
+ gl_entries = frappe.db.sql("""select posting_date, {based_on} as based_on, debit, credit,
is_opening, (select root_type from `tabAccount` where name = account) as type
from `tabGL Entry` where company=%(company)s
{additional_conditions}
diff --git a/erpnext/accounts/report/sales_register/sales_register.js b/erpnext/accounts/report/sales_register/sales_register.js
index 0b48882c..442aa12 100644
--- a/erpnext/accounts/report/sales_register/sales_register.js
+++ b/erpnext/accounts/report/sales_register/sales_register.js
@@ -67,3 +67,14 @@
}
]
}
+
+erpnext.dimension_filters.then((dimensions) => {
+ dimensions.forEach((dimension) => {
+ frappe.query_reports["Sales Register"].filters.splice(7, 0 ,{
+ "fieldname": dimension["fieldname"],
+ "label": __(dimension["label"]),
+ "fieldtype": "Link",
+ "options": dimension["document_type"]
+ });
+ });
+});
diff --git a/erpnext/accounts/report/sales_register/sales_register.py b/erpnext/accounts/report/sales_register/sales_register.py
index de60995..d08056f 100644
--- a/erpnext/accounts/report/sales_register/sales_register.py
+++ b/erpnext/accounts/report/sales_register/sales_register.py
@@ -5,6 +5,7 @@
import frappe
from frappe.utils import flt
from frappe import msgprint, _
+from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions
def execute(filters=None):
return _execute(filters)
@@ -163,6 +164,16 @@
where parent=`tabSales Invoice`.name
and ifnull(`tabSales Invoice Item`.item_group, '') = %(item_group)s)"""
+ accounting_dimensions = get_accounting_dimensions()
+
+ if accounting_dimensions:
+ for dimension in accounting_dimensions:
+ if filters.get(dimension):
+ conditions += """ and exists(select name from `tabSales Invoice Item`
+ where parent=`tabSales Invoice`.name
+ and ifnull(`tabSales Invoice Item`.{0}, '') = %({0})s)""".format(dimension)
+
+
return conditions
def get_invoices(filters, additional_query_columns):
diff --git a/erpnext/accounts/report/trial_balance/trial_balance.js b/erpnext/accounts/report/trial_balance/trial_balance.js
index 8bc7280..73d2ab3 100644
--- a/erpnext/accounts/report/trial_balance/trial_balance.js
+++ b/erpnext/accounts/report/trial_balance/trial_balance.js
@@ -96,9 +96,7 @@
}
});
-let dimension_filters = erpnext.get_dimension_filters();
-
-dimension_filters.then((dimensions) => {
+erpnext.dimension_filters.then((dimensions) => {
dimensions.forEach((dimension) => {
frappe.query_reports["Trial Balance"].filters.splice(5, 0 ,{
"fieldname": dimension["fieldname"],
diff --git a/erpnext/accounts/utils.py b/erpnext/accounts/utils.py
index 7a1f6c5..542c7e4 100644
--- a/erpnext/accounts/utils.py
+++ b/erpnext/accounts/utils.py
@@ -628,7 +628,7 @@
return held_invoices
-def get_outstanding_invoices(party_type, party, account, condition=None):
+def get_outstanding_invoices(party_type, party, account, condition=None, filters=None):
outstanding_invoices = []
precision = frappe.get_precision("Sales Invoice", "outstanding_amount") or 2
@@ -644,7 +644,8 @@
invoice_list = frappe.db.sql("""
select
- voucher_no, voucher_type, posting_date, ifnull(sum({dr_or_cr}), 0) as invoice_amount
+ voucher_no, voucher_type, posting_date, due_date,
+ ifnull(sum({dr_or_cr}), 0) as invoice_amount
from
`tabGL Entry`
where
@@ -677,7 +678,7 @@
""".format(payment_dr_or_cr=payment_dr_or_cr), {
"party_type": party_type,
"party": party,
- "account": account,
+ "account": account
}, as_dict=True)
pe_map = frappe._dict()
@@ -688,10 +689,12 @@
payment_amount = pe_map.get((d.voucher_type, d.voucher_no), 0)
outstanding_amount = flt(d.invoice_amount - payment_amount, precision)
if outstanding_amount > 0.5 / (10**precision):
- if not d.voucher_type == "Purchase Invoice" or d.voucher_no not in held_invoices:
- due_date = frappe.db.get_value(
- d.voucher_type, d.voucher_no, "posting_date" if party_type == "Employee" else "due_date")
+ if (filters.get("outstanding_amt_greater_than") and
+ not (outstanding_amount >= filters.get("outstanding_amt_greater_than") and
+ outstanding_amount <= filters.get("outstanding_amt_less_than"))):
+ continue
+ if not d.voucher_type == "Purchase Invoice" or d.voucher_no not in held_invoices:
outstanding_invoices.append(
frappe._dict({
'voucher_no': d.voucher_no,
@@ -700,7 +703,7 @@
'invoice_amount': flt(d.invoice_amount),
'payment_amount': payment_amount,
'outstanding_amount': outstanding_amount,
- 'due_date': due_date
+ 'due_date': d.due_date
})
)
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index d74bc0e..47c9f0a 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -206,10 +206,11 @@
if(locate(%(_txt)s, name), locate(%(_txt)s, name), 99999),
idx desc, name
limit %(start)s, %(page_len)s """.format(
- fcond=get_filters_cond(doctype, filters, conditions),
+ fcond=get_filters_cond(doctype, filters, conditions).replace('%', '%%'),
mcond=get_match_cond(doctype),
- key=searchfield), {
- 'txt': '%' + txt + '%',
+ key=frappe.db.escape(searchfield)),
+ {
+ 'txt': "%"+frappe.db.escape(txt)+"%",
'_txt': txt.replace("%", ""),
'start': start or 0,
'page_len': page_len or 20
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index 8cf11f7..2fddcdf 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -75,7 +75,7 @@
items_returned = False
for d in doc.get("items"):
- if flt(d.qty) < 0 or d.get('received_qty') < 0:
+ if d.item_code and (flt(d.qty) < 0 or d.get('received_qty') < 0):
if d.item_code not in valid_items:
frappe.throw(_("Row # {0}: Returned Item {1} does not exists in {2} {3}")
.format(d.idx, d.item_code, doc.doctype, doc.return_against))
@@ -107,6 +107,9 @@
items_returned = True
+ elif d.item_name:
+ items_returned = True
+
if not items_returned:
frappe.throw(_("Atleast one item should be entered with negative quantity in return document"))
diff --git a/erpnext/controllers/status_updater.py b/erpnext/controllers/status_updater.py
index f70870b..b193ac2 100644
--- a/erpnext/controllers/status_updater.py
+++ b/erpnext/controllers/status_updater.py
@@ -294,7 +294,7 @@
frappe.db.sql("""update `tab%(target_parent_dt)s`
set %(target_parent_field)s = round(
ifnull((select
- ifnull(sum(if(%(target_ref_field)s > %(target_field)s, abs(%(target_field)s), abs(%(target_ref_field)s))), 0)
+ ifnull(sum(if(abs(%(target_ref_field)s) > abs(%(target_field)s), abs(%(target_field)s), abs(%(target_ref_field)s))), 0)
/ sum(abs(%(target_ref_field)s)) * 100
from `tab%(target_dt)s` where parent="%(name)s" having sum(abs(%(target_ref_field)s)) > 0), 0), 6)
%(update_modified)s
diff --git a/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py b/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py
index 5e7f276..35c9f72 100644
--- a/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py
+++ b/erpnext/hr/doctype/employee_onboarding/test_employee_onboarding.py
@@ -12,7 +12,7 @@
class TestEmployeeOnboarding(unittest.TestCase):
def test_employee_onboarding_incomplete_task(self):
if frappe.db.exists('Employee Onboarding', {'employee_name': 'Test Researcher'}):
- return frappe.get_doc('Employee Onboarding', {'employee_name': 'Test Researcher'})
+ frappe.delete_doc('Employee Onboarding', {'employee_name': 'Test Researcher'})
_set_up()
applicant = get_job_applicant()
onboarding = frappe.new_doc('Employee Onboarding')
@@ -39,9 +39,10 @@
# complete the task
project = frappe.get_doc('Project', onboarding.project)
- project.load_tasks()
- project.tasks[0].status = 'Completed'
- project.save()
+ for task in frappe.get_all('Task', dict(project=project.name)):
+ task = frappe.get_doc('Task', task.name)
+ task.status = 'Completed'
+ task.save()
# make employee
onboarding.reload()
@@ -71,4 +72,3 @@
project = "Employee Onboarding : Test Researcher - test@researcher.com"
frappe.db.sql("delete from tabProject where name=%s", project)
frappe.db.sql("delete from tabTask where project=%s", project)
- frappe.db.sql("delete from `tabProject Task` where parent=%s", project)
diff --git a/erpnext/hr/doctype/expense_claim/test_expense_claim.py b/erpnext/hr/doctype/expense_claim/test_expense_claim.py
index 92fdc09..6618a4f 100644
--- a/erpnext/hr/doctype/expense_claim/test_expense_claim.py
+++ b/erpnext/hr/doctype/expense_claim/test_expense_claim.py
@@ -10,33 +10,36 @@
test_records = frappe.get_test_records('Expense Claim')
test_dependencies = ['Employee']
+company_name = '_Test Company 4'
+
class TestExpenseClaim(unittest.TestCase):
def test_total_expense_claim_for_project(self):
frappe.db.sql("""delete from `tabTask` where project = "_Test Project 1" """)
- frappe.db.sql("""delete from `tabProject Task` where parent = "_Test Project 1" """)
frappe.db.sql("""delete from `tabProject` where name = "_Test Project 1" """)
- frappe.db.sql("delete from `tabExpense Claim` where project='_Test Project 1'")
+ frappe.db.sql("update `tabExpense Claim` set project = '', task = ''")
frappe.get_doc({
"project_name": "_Test Project 1",
- "doctype": "Project",
+ "doctype": "Project"
}).save()
- task = frappe.get_doc({
- "doctype": "Task",
- "subject": "_Test Project Task 1",
- "project": "_Test Project 1"
- }).save()
+ task = frappe.get_doc(dict(
+ doctype = 'Task',
+ subject = '_Test Project Task 1',
+ status = 'Open',
+ project = '_Test Project 1'
+ )).insert()
- task_name = frappe.db.get_value("Task", {"project": "_Test Project 1"})
- payable_account = get_payable_account("Wind Power LLC")
- make_expense_claim(payable_account, 300, 200, "Wind Power LLC","Travel Expenses - WP", "_Test Project 1", task_name)
+ task_name = task.name
+ payable_account = get_payable_account(company_name)
+
+ make_expense_claim(payable_account, 300, 200, company_name, "Travel Expenses - _TC4", "_Test Project 1", task_name)
self.assertEqual(frappe.db.get_value("Task", task_name, "total_expense_claim"), 200)
self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_expense_claim"), 200)
- expense_claim2 = make_expense_claim(payable_account, 600, 500, "Wind Power LLC", "Travel Expenses - WP","_Test Project 1", task_name)
+ expense_claim2 = make_expense_claim(payable_account, 600, 500, company_name, "Travel Expenses - _TC4","_Test Project 1", task_name)
self.assertEqual(frappe.db.get_value("Task", task_name, "total_expense_claim"), 700)
self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_expense_claim"), 700)
@@ -48,8 +51,8 @@
self.assertEqual(frappe.db.get_value("Project", "_Test Project 1", "total_expense_claim"), 200)
def test_expense_claim_status(self):
- payable_account = get_payable_account("Wind Power LLC")
- expense_claim = make_expense_claim(payable_account, 300, 200, "Wind Power LLC", "Travel Expenses - WP")
+ payable_account = get_payable_account(company_name)
+ expense_claim = make_expense_claim(payable_account, 300, 200, company_name, "Travel Expenses - _TC4")
je_dict = make_bank_entry("Expense Claim", expense_claim.name)
je = frappe.get_doc(je_dict)
@@ -66,9 +69,9 @@
self.assertEqual(expense_claim.status, "Unpaid")
def test_expense_claim_gl_entry(self):
- payable_account = get_payable_account("Wind Power LLC")
+ payable_account = get_payable_account(company_name)
taxes = generate_taxes()
- expense_claim = make_expense_claim(payable_account, 300, 200, "Wind Power LLC", "Travel Expenses - WP", do_not_submit=True, taxes=taxes)
+ expense_claim = make_expense_claim(payable_account, 300, 200, company_name, "Travel Expenses - _TC4", do_not_submit=True, taxes=taxes)
expense_claim.submit()
gl_entries = frappe.db.sql("""select account, debit, credit
@@ -78,9 +81,9 @@
self.assertTrue(gl_entries)
expected_values = dict((d[0], d) for d in [
- ['CGST - WP',10.0, 0.0],
- [payable_account, 0.0, 210.0],
- ["Travel Expenses - WP", 200.0, 0.0]
+ ['CGST - _TC4',18.0, 0.0],
+ [payable_account, 0.0, 218.0],
+ ["Travel Expenses - _TC4", 200.0, 0.0]
])
for gle in gl_entries:
@@ -89,14 +92,14 @@
self.assertEquals(expected_values[gle.account][2], gle.credit)
def test_rejected_expense_claim(self):
- payable_account = get_payable_account("Wind Power LLC")
+ payable_account = get_payable_account(company_name)
expense_claim = frappe.get_doc({
"doctype": "Expense Claim",
"employee": "_T-Employee-00001",
"payable_account": payable_account,
"approval_status": "Rejected",
"expenses":
- [{ "expense_type": "Travel", "default_account": "Travel Expenses - WP", "amount": 300, "sanctioned_amount": 200 }]
+ [{ "expense_type": "Travel", "default_account": "Travel Expenses - _TC4", "amount": 300, "sanctioned_amount": 200 }]
})
expense_claim.submit()
@@ -111,9 +114,9 @@
def generate_taxes():
parent_account = frappe.db.get_value('Account',
- {'company': "Wind Power LLC", 'is_group':1, 'account_type': 'Tax'},
+ {'company': company_name, 'is_group':1, 'account_type': 'Tax'},
'name')
- account = create_account(company="Wind Power LLC", account_name="CGST", account_type="Tax", parent_account=parent_account)
+ account = create_account(company=company_name, account_name="CGST", account_type="Tax", parent_account=parent_account)
return {'taxes':[{
"account_head": account,
"rate": 0,
@@ -124,15 +127,18 @@
def make_expense_claim(payable_account, amount, sanctioned_amount, company, account, project=None, task_name=None, do_not_submit=False, taxes=None):
employee = frappe.db.get_value("Employee", {"status": "Active"})
+ currency = frappe.db.get_value('Company', company, 'default_currency')
expense_claim = {
"doctype": "Expense Claim",
"employee": employee,
"payable_account": payable_account,
"approval_status": "Approved",
"company": company,
+ 'currency': currency,
"expenses":
[{"expense_type": "Travel",
"default_account": account,
+ 'currency': currency,
"amount": amount,
"sanctioned_amount": sanctioned_amount}]}
if taxes:
diff --git a/erpnext/hr/doctype/job_offer/job_offer.js b/erpnext/hr/doctype/job_offer/job_offer.js
index 1ee35af..c3d83c4 100755
--- a/erpnext/hr/doctype/job_offer/job_offer.js
+++ b/erpnext/hr/doctype/job_offer/job_offer.js
@@ -4,6 +4,12 @@
frappe.provide("erpnext.job_offer");
frappe.ui.form.on("Job Offer", {
+ onload: function (frm) {
+ frm.set_query("select_terms", function() {
+ return { filters: { hr: 1 } };
+ });
+ },
+
select_terms: function (frm) {
erpnext.utils.get_terms(frm.doc.select_terms, frm.doc, function (r) {
if (!r.exc) {
diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js
index 89efb93..0bbf689 100644
--- a/erpnext/manufacturing/doctype/blanket_order/blanket_order.js
+++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order.js
@@ -2,6 +2,10 @@
// For license information, please see license.txt
frappe.ui.form.on('Blanket Order', {
+ onload: function(frm) {
+ frm.trigger('set_tc_name_filter');
+ },
+
setup: function(frm) {
frm.add_fetch("customer", "customer_name", "customer_name");
frm.add_fetch("supplier", "supplier_name", "supplier_name");
@@ -44,4 +48,23 @@
}
});
},
+
+ set_tc_name_filter: function(frm) {
+ if (frm.doc.blanket_order_type === 'Selling') {
+ frm.set_query("tc_name", function() {
+ return { filters: { selling: 1 } };
+ });
+ }
+ if (frm.doc.blanket_order_type === 'Purchasing') {
+ frm.set_query("tc_name", function() {
+ return { filters: { buying: 1 } };
+ });
+ }
+ },
+
+ blanket_order_type: function (frm) {
+ frm.trigger('set_tc_name_filter');
+ }
});
+
+
diff --git a/erpnext/manufacturing/doctype/blanket_order/blanket_order_dashboard.py b/erpnext/manufacturing/doctype/blanket_order/blanket_order_dashboard.py
new file mode 100644
index 0000000..ed319a0
--- /dev/null
+++ b/erpnext/manufacturing/doctype/blanket_order/blanket_order_dashboard.py
@@ -0,0 +1,12 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+ return {
+ 'fieldname': 'blanket_order',
+ 'transactions': [
+ {
+ 'items': ['Purchase Order', 'Sales Order']
+ }
+ ]
+ }
diff --git a/erpnext/manufacturing/doctype/bom/bom_dashboard.py b/erpnext/manufacturing/doctype/bom/bom_dashboard.py
new file mode 100644
index 0000000..803ece7
--- /dev/null
+++ b/erpnext/manufacturing/doctype/bom/bom_dashboard.py
@@ -0,0 +1,27 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+ return {
+ 'fieldname': 'bom_no',
+ 'non_standard_fieldnames': {
+ 'Item': 'default_bom',
+ 'Purchase Order': 'bom',
+ 'Purchase Receipt': 'bom',
+ 'Purchase Invoice': 'bom'
+ },
+ 'transactions': [
+ {
+ 'label': _('Stock'),
+ 'items': ['Item', 'Stock Entry', 'Quality Inspection']
+ },
+ {
+ 'label': _('Manufacture'),
+ 'items': ['BOM', 'Work Order', 'Job Card', 'Production Plan']
+ },
+ {
+ 'label': _('Purchase'),
+ 'items': ['Purchase Order', 'Purchase Receipt', 'Purchase Invoice']
+ }
+ ]
+ }
diff --git a/erpnext/manufacturing/doctype/job_card/job_card_dashboard.py b/erpnext/manufacturing/doctype/job_card/job_card_dashboard.py
index d48bccf..c2aa2bd 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card_dashboard.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card_dashboard.py
@@ -10,4 +10,4 @@
'items': ['Material Request', 'Stock Entry']
}
]
- }
\ No newline at end of file
+ }
diff --git a/erpnext/manufacturing/doctype/operation/operation_dashboard.py b/erpnext/manufacturing/doctype/operation/operation_dashboard.py
new file mode 100644
index 0000000..8deb9ec
--- /dev/null
+++ b/erpnext/manufacturing/doctype/operation/operation_dashboard.py
@@ -0,0 +1,13 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+ return {
+ 'fieldname': 'operation',
+ 'transactions': [
+ {
+ 'label': _('Manufacture'),
+ 'items': ['BOM', 'Work Order', 'Job Card', 'Timesheet']
+ }
+ ]
+ }
diff --git a/erpnext/manufacturing/doctype/routing/routing_dashboard.py b/erpnext/manufacturing/doctype/routing/routing_dashboard.py
new file mode 100644
index 0000000..ab309cc
--- /dev/null
+++ b/erpnext/manufacturing/doctype/routing/routing_dashboard.py
@@ -0,0 +1,12 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+ return {
+ 'fieldname': 'routing',
+ 'transactions': [
+ {
+ 'items': ['BOM']
+ }
+ ]
+ }
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/workstation/workstation_dashboard.py b/erpnext/manufacturing/doctype/workstation/workstation_dashboard.py
new file mode 100644
index 0000000..9e0d1d1
--- /dev/null
+++ b/erpnext/manufacturing/doctype/workstation/workstation_dashboard.py
@@ -0,0 +1,13 @@
+from __future__ import unicode_literals
+from frappe import _
+
+def get_data():
+ return {
+ 'fieldname': 'workstation',
+ 'transactions': [
+ {
+ 'label': _('Manufacture'),
+ 'items': ['BOM', 'Routing', 'Work Order', 'Job Card', 'Operation', 'Timesheet']
+ }
+ ]
+ }
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 72db8ad..571c2dc 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -615,3 +615,7 @@
erpnext.patches.v12_0.set_quotation_status
erpnext.patches.v12_0.set_priority_for_support
erpnext.patches.v12_0.delete_priority_property_setter
+execute:frappe.delete_doc("DocType", "Project Task")
+erpnext.patches.v11_1.update_default_supplier_in_item_defaults
+erpnext.patches.v12_0.update_due_date_in_gle
+erpnext.patches.v12_0.add_default_buying_selling_terms_in_company
diff --git a/erpnext/patches/v11_1/update_default_supplier_in_item_defaults.py b/erpnext/patches/v11_1/update_default_supplier_in_item_defaults.py
new file mode 100644
index 0000000..347dec1
--- /dev/null
+++ b/erpnext/patches/v11_1/update_default_supplier_in_item_defaults.py
@@ -0,0 +1,25 @@
+# Copyright (c) 2018, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ '''
+ default supplier was not set in the item defaults for multi company instance,
+ this patch will set the default supplier
+
+ '''
+ if not frappe.db.has_column('Item', 'default_supplier'):
+ return
+
+ frappe.reload_doc('stock', 'doctype', 'item_default')
+ frappe.reload_doc('stock', 'doctype', 'item')
+
+ companies = frappe.get_all("Company")
+ if len(companies) > 1:
+ frappe.db.sql(""" UPDATE `tabItem Default`, `tabItem`
+ SET `tabItem Default`.default_supplier = `tabItem`.default_supplier
+ WHERE
+ `tabItem Default`.parent = `tabItem`.name and `tabItem Default`.default_supplier is null
+ and `tabItem`.default_supplier is not null and `tabItem`.default_supplier != '' """)
\ No newline at end of file
diff --git a/erpnext/patches/v12_0/add_default_buying_selling_terms_in_company.py b/erpnext/patches/v12_0/add_default_buying_selling_terms_in_company.py
new file mode 100644
index 0000000..484f81a
--- /dev/null
+++ b/erpnext/patches/v12_0/add_default_buying_selling_terms_in_company.py
@@ -0,0 +1,19 @@
+# Copyright (c) 2019, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+import frappe
+from frappe.model.utils.rename_field import rename_field
+
+def execute():
+ frappe.reload_doc("setup", "doctype", "company")
+ if frappe.db.has_column('Company', 'default_terms'):
+ rename_field('Company', "default_terms", "default_selling_terms")
+
+ for company in frappe.get_all("Company", ["name", "default_selling_terms", "default_buying_terms"]):
+ if company.default_selling_terms and not company.default_buying_terms:
+ frappe.db.set_value("Company", company.name, "default_buying_terms", company.default_selling_terms)
+
+ frappe.reload_doc("setup", "doctype", "terms_and_conditions")
+ frappe.db.sql("update `tabTerms and Conditions` set selling=1, buying=1, hr=1")
diff --git a/erpnext/patches/v12_0/set_task_status.py b/erpnext/patches/v12_0/set_task_status.py
index 32b8177..70f6509 100644
--- a/erpnext/patches/v12_0/set_task_status.py
+++ b/erpnext/patches/v12_0/set_task_status.py
@@ -2,10 +2,9 @@
def execute():
frappe.reload_doctype('Task')
- frappe.reload_doctype('Project Task')
# add "Completed" if customized
- for doctype in ('Task', 'Project Task'):
+ for doctype in ('Task'):
property_setter_name = frappe.db.exists('Property Setter', dict(doc_type = doctype, field_name = 'status', property = 'options'))
if property_setter_name:
property_setter = frappe.get_doc('Property Setter', property_setter_name)
diff --git a/erpnext/patches/v12_0/update_due_date_in_gle.py b/erpnext/patches/v12_0/update_due_date_in_gle.py
new file mode 100644
index 0000000..4c47a82
--- /dev/null
+++ b/erpnext/patches/v12_0/update_due_date_in_gle.py
@@ -0,0 +1,17 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ frappe.reload_doc("accounts", "doctype", "gl_entry")
+
+ for doctype in ["Sales Invoice", "Purchase Invoice", "Journal Entry"]:
+ frappe.reload_doc("accounts", "doctype", frappe.scrub(doctype))
+
+ frappe.db.sql(""" UPDATE `tabGL Entry`, `tab{doctype}`
+ SET
+ `tabGL Entry`.due_date = `tab{doctype}`.due_date
+ WHERE
+ `tabGL Entry`.voucher_no = `tab{doctype}`.name and `tabGL Entry`.party is not null
+ and `tabGL Entry`.voucher_type in ('Sales Invoice', 'Purchase Invoice', 'Journal Entry')
+ and account in (select name from `tabAccount` where account_type in ('Receivable', 'Payable') )""" #nosec
+ .format(doctype=doctype))
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index 528c7cd..5613f08 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -1,23 +1,6 @@
// Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
// License: GNU General Public License v3. See license.txt
frappe.ui.form.on("Project", {
- setup: function (frm) {
- frm.set_indicator_formatter('title',
- function (doc) {
- let indicator = 'orange';
- if (doc.status == 'Overdue') {
- indicator = 'red';
- } else if (doc.status == 'Cancelled') {
- indicator = 'dark grey';
- } else if (doc.status == 'Completed') {
- indicator = 'green';
- }
- return indicator;
- }
- );
- },
-
-
onload: function (frm) {
var so = frappe.meta.get_docfield("Project", "sales_order");
so.get_route_options_for_new_doc = function (field) {
@@ -99,58 +82,4 @@
});
},
- tasks_refresh: function (frm) {
- var grid = frm.get_field('tasks').grid;
- grid.wrapper.find('select[data-fieldname="status"]').each(function () {
- if ($(this).val() === 'Open') {
- $(this).addClass('input-indicator-open');
- } else {
- $(this).removeClass('input-indicator-open');
- }
- });
- },
-
- status: function(frm) {
- if (frm.doc.status === 'Cancelled') {
- frappe.confirm(__('Set tasks in this project as cancelled?'), () => {
- frm.doc.tasks = frm.doc.tasks.map(task => {
- task.status = 'Cancelled';
- return task;
- });
- frm.refresh_field('tasks');
- });
- }
- }
-});
-
-frappe.ui.form.on("Project Task", {
- edit_task: function(frm, doctype, name) {
- var doc = frappe.get_doc(doctype, name);
- if(doc.task_id) {
- frappe.set_route("Form", "Task", doc.task_id);
- } else {
- frappe.msgprint(__("Save the document first."));
- }
- },
-
- edit_timesheet: function(frm, cdt, cdn) {
- var child = locals[cdt][cdn];
- frappe.route_options = {"project": frm.doc.project_name, "task": child.task_id};
- frappe.set_route("List", "Timesheet");
- },
-
- make_timesheet: function(frm, cdt, cdn) {
- var child = locals[cdt][cdn];
- frappe.model.with_doctype('Timesheet', function() {
- var doc = frappe.model.get_new_doc('Timesheet');
- var row = frappe.model.add_child(doc, 'time_logs');
- row.project = frm.doc.project_name;
- row.task = child.task_id;
- frappe.set_route('Form', doc.doctype, doc.name);
- })
- },
-
- status: function(frm, doctype, name) {
- frm.trigger('tasks_refresh');
- },
});
diff --git a/erpnext/projects/doctype/project/project.json b/erpnext/projects/doctype/project/project.json
index 2fc507b..b4536c0 100644
--- a/erpnext/projects/doctype/project/project.json
+++ b/erpnext/projects/doctype/project/project.json
@@ -1,1974 +1,487 @@
{
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:project_name",
- "beta": 0,
"creation": "2013-03-07 11:55:07",
- "custom": 0,
- "docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
- "editable_grid": 0,
"engine": "InnoDB",
+ "field_order": [
+ "project_name",
+ "status",
+ "project_type",
+ "is_active",
+ "percent_complete_method",
+ "percent_complete",
+ "column_break_5",
+ "project_template",
+ "expected_start_date",
+ "expected_end_date",
+ "priority",
+ "department",
+ "customer_details",
+ "customer",
+ "column_break_14",
+ "sales_order",
+ "users_section",
+ "users",
+ "copied_from",
+ "section_break0",
+ "notes",
+ "section_break_18",
+ "actual_start_date",
+ "actual_time",
+ "column_break_20",
+ "actual_end_date",
+ "project_details",
+ "estimated_costing",
+ "total_costing_amount",
+ "total_expense_claim",
+ "total_purchase_cost",
+ "company",
+ "column_break_28",
+ "total_sales_amount",
+ "total_billable_amount",
+ "total_billed_amount",
+ "total_consumed_material_cost",
+ "cost_center",
+ "margin",
+ "gross_margin",
+ "column_break_37",
+ "per_gross_margin",
+ "monitor_progress",
+ "collect_progress",
+ "holiday_list",
+ "frequency",
+ "from_time",
+ "to_time",
+ "first_email",
+ "second_email",
+ "daily_time_to_send",
+ "day_to_send",
+ "weekly_time_to_send",
+ "column_break_45",
+ "message"
+ ],
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
"fieldname": "project_name",
"fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Project Name",
- "length": 0,
- "no_copy": 0,
"oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
"reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
"unique": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"default": "Open",
"fieldname": "status",
"fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
"in_standard_filter": 1,
"label": "Status",
- "length": 0,
"no_copy": 1,
"oldfieldname": "status",
"oldfieldtype": "Select",
"options": "Open\nCompleted\nCancelled",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
"reqd": 1,
- "search_index": 1,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "search_index": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "project_type",
"fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
"in_list_view": 1,
"in_standard_filter": 1,
"label": "Project Type",
- "length": 0,
- "no_copy": 0,
"oldfieldname": "project_type",
"oldfieldtype": "Data",
- "options": "Project Type",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "Project Type"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "is_active",
"fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Is Active",
- "length": 0,
- "no_copy": 0,
"oldfieldname": "is_active",
"oldfieldtype": "Select",
- "options": "Yes\nNo",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "Yes\nNo"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"default": "Task Completion",
"fieldname": "percent_complete_method",
"fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "% Complete Method",
- "length": 0,
- "no_copy": 0,
- "options": "Task Completion\nTask Progress\nTask Weight",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "Task Completion\nTask Progress\nTask Weight"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
"bold": 1,
- "collapsible": 0,
- "columns": 0,
"fieldname": "percent_complete",
"fieldtype": "Percent",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "% Completed",
- "length": 0,
"no_copy": 1,
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "read_only": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "column_break_5",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "fieldtype": "Column Break"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "project_template",
"fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "From Template",
- "length": 0,
- "no_copy": 0,
- "options": "Project Template",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "Project Template"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "expected_start_date",
"fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Expected Start Date",
- "length": 0,
- "no_copy": 0,
"oldfieldname": "project_start_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "oldfieldtype": "Date"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
"bold": 1,
- "collapsible": 0,
- "columns": 0,
"fieldname": "expected_end_date",
"fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
"in_list_view": 1,
- "in_standard_filter": 0,
"label": "Expected End Date",
- "length": 0,
- "no_copy": 0,
"oldfieldname": "completion_date",
- "oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "oldfieldtype": "Date"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "priority",
"fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
"in_standard_filter": 1,
"label": "Priority",
- "length": 0,
- "no_copy": 0,
"oldfieldname": "priority",
"oldfieldtype": "Select",
- "options": "Medium\nLow\nHigh",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "Medium\nLow\nHigh"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "department",
"fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Department",
- "length": 0,
- "no_copy": 0,
- "options": "Department",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "Department"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
"collapsible": 1,
- "columns": 0,
"fieldname": "customer_details",
"fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Customer Details",
- "length": 0,
- "no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "fa fa-user",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "fa fa-user"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "customer",
"fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
"in_global_search": 1,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Customer",
- "length": 0,
- "no_copy": 0,
"oldfieldname": "customer",
"oldfieldtype": "Link",
"options": "Customer",
- "permlevel": 0,
"print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 1,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "search_index": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "column_break_14",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "fieldtype": "Column Break"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "sales_order",
"fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Sales Order",
- "length": 0,
- "no_copy": 0,
- "options": "Sales Order",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "Sales Order"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
"collapsible": 1,
- "columns": 0,
"fieldname": "users_section",
"fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Users",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "label": "Users"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"description": "Project will be accessible on the website to these users",
"fieldname": "users",
"fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Users",
- "length": 0,
- "no_copy": 0,
- "options": "Project User",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "Project User"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "sb_milestones",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Tasks",
- "length": 0,
- "no_copy": 0,
- "oldfieldtype": "Section Break",
- "options": "fa fa-flag",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "tasks",
- "fieldtype": "Table",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Tasks",
- "length": 0,
- "no_copy": 0,
- "options": "Project Task",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "copied_from",
"fieldtype": "Data",
"hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Copied From",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "read_only": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
"collapsible": 1,
- "columns": 0,
"fieldname": "section_break0",
"fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Notes",
- "length": 0,
- "no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "fa fa-list",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "fa fa-list"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "notes",
"fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Notes",
- "length": 0,
- "no_copy": 0,
"oldfieldname": "notes",
- "oldfieldtype": "Text Editor",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "oldfieldtype": "Text Editor"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
"collapsible": 1,
- "columns": 0,
"fieldname": "section_break_18",
"fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Start and End Dates",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "label": "Start and End Dates"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "actual_start_date",
"fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Actual Start Date",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "read_only": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "actual_time",
"fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Actual Time (in Hours)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "read_only": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "column_break_20",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "fieldtype": "Column Break"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "actual_end_date",
"fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Actual End Date",
- "length": 0,
- "no_copy": 0,
"oldfieldname": "act_completion_date",
"oldfieldtype": "Date",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "read_only": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
"collapsible": 1,
- "columns": 0,
"fieldname": "project_details",
"fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Costing and Billing",
- "length": 0,
- "no_copy": 0,
"oldfieldtype": "Section Break",
- "options": "fa fa-money",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "fa fa-money"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "estimated_costing",
"fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
"in_list_view": 1,
- "in_standard_filter": 0,
"label": "Estimated Cost",
- "length": 0,
- "no_copy": 0,
"oldfieldname": "project_value",
"oldfieldtype": "Currency",
- "options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "Company:company:default_currency"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
"fieldname": "total_costing_amount",
"fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Total Costing Amount (via Timesheets)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "read_only": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
"fieldname": "total_expense_claim",
"fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Total Expense Claim (via Expense Claims)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "read_only": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "total_purchase_cost",
"fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Total Purchase Cost (via Purchase Invoice)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "read_only": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "company",
"fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Company",
- "length": 0,
- "no_copy": 0,
"options": "Company",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "remember_last_selected_value": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "column_break_28",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "fieldtype": "Column Break"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "total_sales_amount",
"fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Total Sales Amount (via Sales Order)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "read_only": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "description": "",
"fieldname": "total_billable_amount",
"fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Total Billable Amount (via Timesheets)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "read_only": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "total_billed_amount",
"fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Total Billed Amount (via Sales Invoices)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "read_only": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "total_consumed_material_cost",
"fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Total Consumed Material Cost (via Stock Entry)",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "read_only": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "cost_center",
"fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Default Cost Center",
- "length": 0,
- "no_copy": 0,
- "options": "Cost Center",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "Cost Center"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
"collapsible": 1,
- "columns": 0,
"fieldname": "margin",
"fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Margin",
- "length": 0,
- "no_copy": 0,
"oldfieldtype": "Column Break",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0,
"width": "50%"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "gross_margin",
"fieldtype": "Currency",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Gross Margin",
- "length": 0,
- "no_copy": 0,
"oldfieldname": "gross_margin_value",
"oldfieldtype": "Currency",
"options": "Company:company:default_currency",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "read_only": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "column_break_37",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "fieldtype": "Column Break"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "per_gross_margin",
"fieldtype": "Percent",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Gross Margin %",
- "length": 0,
- "no_copy": 0,
"oldfieldname": "per_gross_margin",
"oldfieldtype": "Currency",
- "options": "",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "read_only": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
"collapsible": 1,
- "columns": 0,
"fieldname": "monitor_progress",
"fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Monitor Progress",
- "length": 0,
- "no_copy": 0,
- "options": "",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "label": "Monitor Progress"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
+ "default": "0",
"fieldname": "collect_progress",
"fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Collect Progress",
- "length": 0,
- "no_copy": 0,
- "options": "",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "label": "Collect Progress"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"depends_on": "collect_progress",
"fieldname": "holiday_list",
"fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Holiday List",
- "length": 0,
- "no_copy": 0,
- "options": "Holiday List",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "Holiday List"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"depends_on": "eval:doc.collect_progress == true",
"fieldname": "frequency",
"fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Frequency To Collect Progress",
- "length": 0,
- "no_copy": 0,
- "options": "Hourly\nTwice Daily\nDaily\nWeekly",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "Hourly\nTwice Daily\nDaily\nWeekly"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"depends_on": "eval:(doc.frequency == \"Hourly\" && doc.collect_progress)",
"fieldname": "from_time",
"fieldtype": "Time",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "From Time",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "label": "From Time"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"depends_on": "eval:(doc.frequency == \"Hourly\" && doc.collect_progress)",
"fieldname": "to_time",
"fieldtype": "Time",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "To Time",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "label": "To Time"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"depends_on": "eval:(doc.frequency == \"Twice Daily\" && doc.collect_progress == true)\n\n",
"fieldname": "first_email",
"fieldtype": "Time",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "First Email",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "label": "First Email"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"depends_on": "eval:(doc.frequency == \"Twice Daily\" && doc.collect_progress == true)",
"fieldname": "second_email",
"fieldtype": "Time",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Second Email",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "label": "Second Email"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"depends_on": "eval:(doc.frequency == \"Daily\" && doc.collect_progress == true)",
"fieldname": "daily_time_to_send",
"fieldtype": "Time",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Time to send",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "label": "Time to send"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"depends_on": "eval:(doc.frequency == \"Weekly\" && doc.collect_progress == true)",
"fieldname": "day_to_send",
"fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Day to Send",
- "length": 0,
- "no_copy": 0,
- "options": "Monday\nTuesday\nWednesday\nThursday\nFriday\nSaturday\nSunday",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "Monday\nTuesday\nWednesday\nThursday\nFriday\nSaturday\nSunday"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"depends_on": "eval:(doc.frequency == \"Weekly\" && doc.collect_progress == true)",
"fieldname": "weekly_time_to_send",
"fieldtype": "Time",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Time to send",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "label": "Time to send"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "column_break_45",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "fieldtype": "Column Break"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"depends_on": "collect_progress",
"description": "Message will sent to users to get their status on the project",
"fieldname": "message",
"fieldtype": "Text",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Message",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "label": "Message"
}
],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
"icon": "fa fa-puzzle-piece",
"idx": 29,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
"max_attachments": 4,
- "modified": "2019-02-18 17:56:04.789560",
+ "modified": "2019-06-25 16:14:43.887151",
"modified_by": "Administrator",
"module": "Projects",
"name": "Project",
"owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Projects User",
- "set_user_permissions": 0,
"share": 1,
- "submit": 0,
"write": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
"permlevel": 1,
- "print": 0,
"read": 1,
"report": 1,
- "role": "All",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
- "write": 0
+ "role": "All"
},
{
- "amend": 0,
- "cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Projects Manager",
- "set_user_permissions": 0,
"share": 1,
- "submit": 0,
"write": 1
}
],
"quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
"search_fields": "customer, status, priority, is_active",
"show_name_in_global_search": 1,
"sort_order": "DESC",
"timeline_field": "customer",
- "track_changes": 0,
- "track_seen": 1,
- "track_views": 0
+ "track_seen": 1
}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project/project.py b/erpnext/projects/doctype/project/project.py
index 55a6892..6176cf8 100644
--- a/erpnext/projects/doctype/project/project.py
+++ b/erpnext/projects/doctype/project/project.py
@@ -19,10 +19,6 @@
return '{0}: {1}'.format(_(self.status), frappe.safe_decode(self.project_name))
def onload(self):
- """Load project tasks for quick view"""
- if not self.get('__unsaved') and not self.get("tasks"):
- self.load_tasks()
-
self.set_onload('activity_summary', frappe.db.sql('''select activity_type,
sum(hours) as total_hours
from `tabTimesheet Detail` where project=%s and docstatus < 2 group by activity_type
@@ -33,57 +29,19 @@
def before_print(self):
self.onload()
- def load_tasks(self):
- """Load `tasks` from the database"""
- if frappe.flags.in_import:
- return
- project_task_custom_fields = frappe.get_all("Custom Field", {"dt": "Project Task"}, "fieldname")
-
- self.tasks = []
- for task in self.get_tasks():
- task_map = {
- "title": task.subject,
- "status": task.status,
- "start_date": task.exp_start_date,
- "end_date": task.exp_end_date,
- "description": task.description,
- "task_id": task.name,
- "task_weight": task.task_weight
- }
-
- self.map_custom_fields(task, task_map, project_task_custom_fields)
-
- self.append("tasks", task_map)
-
- def get_tasks(self):
- if self.name is None:
- return {}
- else:
- filters = {"project": self.name}
-
- if self.get("deleted_task_list"):
- filters.update({
- 'name': ("not in", self.deleted_task_list)
- })
-
- return frappe.get_all("Task", "*", filters, order_by="exp_start_date asc, status asc")
def validate(self):
- self.validate_weights()
- self.sync_tasks()
- self.tasks = []
- self.load_tasks()
if not self.is_new():
self.copy_from_template()
- self.validate_dates()
self.send_welcome_email()
- self.update_percent_complete(from_validate=True)
+ self.update_costing()
+ self.update_percent_complete()
def copy_from_template(self):
'''
Copy tasks from template
'''
- if self.project_template and not len(self.tasks or []):
+ if self.project_template and not frappe.db.get_all('Task', dict(project = self.name), limit=1):
# has a template, and no loaded tasks, so lets create
if not self.expected_start_date:
@@ -108,104 +66,6 @@
task_weight = task.task_weight
)).insert()
- # reload tasks after project
- self.load_tasks()
-
- def validate_dates(self):
- if self.tasks:
- for d in self.tasks:
- if self.expected_start_date:
- if d.start_date and getdate(d.start_date) < getdate(self.expected_start_date):
- frappe.throw(_("Start date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>")
- .format(d.title, self.name, self.expected_start_date))
- if d.end_date and getdate(d.end_date) < getdate(self.expected_start_date):
- frappe.throw(_("End date of task <b>{0}</b> cannot be less than <b>{1}</b> expected start date <b>{2}</b>")
- .format(d.title, self.name, self.expected_start_date))
-
- if self.expected_end_date:
- if d.start_date and getdate(d.start_date) > getdate(self.expected_end_date):
- frappe.throw(_("Start date of task <b>{0}</b> cannot be greater than <b>{1}</b> expected end date <b>{2}</b>")
- .format(d.title, self.name, self.expected_end_date))
- if d.end_date and getdate(d.end_date) > getdate(self.expected_end_date):
- frappe.throw(_("End date of task <b>{0}</b> cannot be greater than <b>{1}</b> expected end date <b>{2}</b>")
- .format(d.title, self.name, self.expected_end_date))
-
- if self.expected_start_date and self.expected_end_date:
- if getdate(self.expected_end_date) < getdate(self.expected_start_date):
- frappe.throw(_("Expected End Date can not be less than Expected Start Date"))
-
- def validate_weights(self):
- for task in self.tasks:
- if task.task_weight is not None:
- if task.task_weight < 0:
- frappe.throw(_("Task weight cannot be negative"))
-
- def sync_tasks(self):
- """sync tasks and remove table"""
- if not hasattr(self, "deleted_task_list"):
- self.set("deleted_task_list", [])
-
- if self.flags.dont_sync_tasks: return
- task_names = []
-
- existing_task_data = {}
-
- fields = ["title", "status", "start_date", "end_date", "description", "task_weight", "task_id"]
- exclude_fieldtype = ["Button", "Column Break",
- "Section Break", "Table", "Read Only", "Attach", "Attach Image", "Color", "Geolocation", "HTML", "Image"]
-
- custom_fields = frappe.get_all("Custom Field", {"dt": "Project Task",
- "fieldtype": ("not in", exclude_fieldtype)}, "fieldname")
-
- for d in custom_fields:
- fields.append(d.fieldname)
-
- for d in frappe.get_all('Project Task',
- fields = fields,
- filters = {'parent': self.name}):
- existing_task_data.setdefault(d.task_id, d)
-
- for t in self.tasks:
- if t.task_id:
- task = frappe.get_doc("Task", t.task_id)
- else:
- task = frappe.new_doc("Task")
- task.project = self.name
-
- if not t.task_id or self.is_row_updated(t, existing_task_data, fields):
- task.update({
- "subject": t.title,
- "status": t.status,
- "exp_start_date": t.start_date,
- "exp_end_date": t.end_date,
- "description": t.description,
- "task_weight": t.task_weight
- })
-
- self.map_custom_fields(t, task, custom_fields)
-
- task.flags.ignore_links = True
- task.flags.from_project = True
- task.flags.ignore_feed = True
-
- if t.task_id:
- task.update({
- "modified_by": frappe.session.user,
- "modified": now()
- })
-
- task.run_method("validate")
- task.db_update()
- else:
- task.save(ignore_permissions = True)
- task_names.append(task.name)
- else:
- task_names.append(task.name)
-
- # delete
- for t in frappe.get_all("Task", ["name"], {"project": self.name, "name": ("not in", task_names)}):
- self.deleted_task_list.append(t.name)
-
def is_row_updated(self, row, existing_task_data, fields):
if self.get("__islocal") or not existing_task_data: return True
@@ -215,48 +75,43 @@
if row.get(field) != d.get(field):
return True
- def map_custom_fields(self, source, target, custom_fields):
- for field in custom_fields:
- target.update({
- field.fieldname: source.get(field.fieldname)
- })
-
def update_project(self):
+ '''Called externally by Task'''
self.update_percent_complete()
self.update_costing()
+ self.db_update()
def after_insert(self):
self.copy_from_template()
if self.sales_order:
frappe.db.set_value("Sales Order", self.sales_order, "project", self.name)
- def update_percent_complete(self, from_validate=False):
- if not self.tasks: return
- total = frappe.db.sql("""select count(name) from tabTask where project=%s""", self.name)[0][0]
+ def update_percent_complete(self):
+ total = frappe.db.count('Task', dict(project=self.name))
- if not total and self.percent_complete:
+ if not total:
self.percent_complete = 0
+ else:
+ if (self.percent_complete_method == "Task Completion" and total > 0) or (
+ not self.percent_complete_method and total > 0):
+ completed = frappe.db.sql("""select count(name) from tabTask where
+ project=%s and status in ('Cancelled', 'Completed')""", self.name)[0][0]
+ self.percent_complete = flt(flt(completed) / total * 100, 2)
- if (self.percent_complete_method == "Task Completion" and total > 0) or (
- not self.percent_complete_method and total > 0):
- completed = frappe.db.sql("""select count(name) from tabTask where
- project=%s and status in ('Cancelled', 'Completed')""", self.name)[0][0]
- self.percent_complete = flt(flt(completed) / total * 100, 2)
+ if (self.percent_complete_method == "Task Progress" and total > 0):
+ progress = frappe.db.sql("""select sum(progress) from tabTask where
+ project=%s""", self.name)[0][0]
+ self.percent_complete = flt(flt(progress) / total, 2)
- if (self.percent_complete_method == "Task Progress" and total > 0):
- progress = frappe.db.sql("""select sum(progress) from tabTask where
- project=%s""", self.name)[0][0]
- self.percent_complete = flt(flt(progress) / total, 2)
-
- if (self.percent_complete_method == "Task Weight" and total > 0):
- weight_sum = frappe.db.sql("""select sum(task_weight) from tabTask where
- project=%s""", self.name)[0][0]
- weighted_progress = frappe.db.sql("""select progress, task_weight from tabTask where
- project=%s""", self.name, as_dict=1)
- pct_complete = 0
- for row in weighted_progress:
- pct_complete += row["progress"] * frappe.utils.safe_div(row["task_weight"], weight_sum)
- self.percent_complete = flt(flt(pct_complete), 2)
+ if (self.percent_complete_method == "Task Weight" and total > 0):
+ weight_sum = frappe.db.sql("""select sum(task_weight) from tabTask where
+ project=%s""", self.name)[0][0]
+ weighted_progress = frappe.db.sql("""select progress, task_weight from tabTask where
+ project=%s""", self.name, as_dict=1)
+ pct_complete = 0
+ for row in weighted_progress:
+ pct_complete += row["progress"] * frappe.utils.safe_div(row["task_weight"], weight_sum)
+ self.percent_complete = flt(flt(pct_complete), 2)
# don't update status if it is cancelled
if self.status == 'Cancelled':
@@ -268,9 +123,6 @@
else:
self.status = "Open"
- if not from_validate:
- self.db_update()
-
def update_costing(self):
from_time_sheet = frappe.db.sql("""select
sum(costing_amount) as costing_amount,
@@ -297,7 +149,6 @@
self.update_sales_amount()
self.update_billed_amount()
self.calculate_gross_margin()
- self.db_update()
def calculate_gross_margin(self):
expense_amount = (flt(self.total_costing_amount) + flt(self.total_expense_claim)
@@ -348,57 +199,6 @@
content=content.format(*messages))
user.welcome_email_sent = 1
- def on_update(self):
- self.delete_task()
- self.load_tasks()
- self.update_project()
- self.update_dependencies_on_duplicated_project()
-
- def delete_task(self):
- if not self.get('deleted_task_list'): return
-
- for d in self.get('deleted_task_list'):
- # unlink project
- frappe.db.set_value('Task', d, 'project', '')
-
- self.deleted_task_list = []
-
- def update_dependencies_on_duplicated_project(self):
- if self.flags.dont_sync_tasks: return
- if not self.copied_from:
- self.copied_from = self.name
-
- if self.name != self.copied_from and self.get('__unsaved'):
- # duplicated project
- dependency_map = {}
- for task in self.tasks:
- _task = frappe.db.get_value(
- 'Task',
- {"subject": task.title, "project": self.copied_from},
- ['name', 'depends_on_tasks'],
- as_dict=True
- )
-
- if _task is None:
- continue
-
- name = _task.name
-
- dependency_map[task.title] = [x['subject'] for x in frappe.get_list(
- 'Task Depends On', {"parent": name}, ['subject'])]
-
- for key, value in iteritems(dependency_map):
- task_name = frappe.db.get_value('Task', {"subject": key, "project": self.name })
-
- task_doc = frappe.get_doc('Task', task_name)
-
- for dt in value:
- dt_name = frappe.db.get_value('Task', {"subject": dt, "project": self.name})
- task_doc.append('depends_on', {"task": dt_name})
-
- task_doc.db_update()
-
-
def get_timeline_data(doctype, name):
'''Return timeline for attendance'''
return dict(frappe.db.sql('''select unix_timestamp(from_time), count(*)
diff --git a/erpnext/projects/doctype/project/test_project.py b/erpnext/projects/doctype/project/test_project.py
index beb1f13..06c62b6 100644
--- a/erpnext/projects/doctype/project/test_project.py
+++ b/erpnext/projects/doctype/project/test_project.py
@@ -19,18 +19,18 @@
project = get_project('Test Project with Template')
- project.load_tasks()
+ tasks = frappe.get_all('Task', '*', dict(project=project.name), order_by='creation asc')
- task1 = project.tasks[0]
- self.assertEqual(task1.title, 'Task 1')
+ task1 = tasks[0]
+ self.assertEqual(task1.subject, 'Task 1')
self.assertEqual(task1.description, 'Task 1 description')
- self.assertEqual(getdate(task1.start_date), getdate('2019-01-01'))
- self.assertEqual(getdate(task1.end_date), getdate('2019-01-04'))
+ self.assertEqual(getdate(task1.exp_start_date), getdate('2019-01-01'))
+ self.assertEqual(getdate(task1.exp_end_date), getdate('2019-01-04'))
- self.assertEqual(len(project.tasks), 4)
- task4 = project.tasks[3]
- self.assertEqual(task4.title, 'Task 4')
- self.assertEqual(getdate(task4.end_date), getdate('2019-01-06'))
+ self.assertEqual(len(tasks), 4)
+ task4 = tasks[3]
+ self.assertEqual(task4.subject, 'Task 4')
+ self.assertEqual(getdate(task4.exp_end_date), getdate('2019-01-06'))
def get_project(name):
template = get_project_template()
diff --git a/erpnext/projects/doctype/project/test_records.json b/erpnext/projects/doctype/project/test_records.json
index 9379c22..567f359 100644
--- a/erpnext/projects/doctype/project/test_records.json
+++ b/erpnext/projects/doctype/project/test_records.json
@@ -1,12 +1,6 @@
[
{
"project_name": "_Test Project",
- "status": "Open",
- "tasks":[
- {
- "title": "_Test Task",
- "status": "Open"
- }
- ]
+ "status": "Open"
}
]
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project_task/__init__.py b/erpnext/projects/doctype/project_task/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/erpnext/projects/doctype/project_task/__init__.py
+++ /dev/null
diff --git a/erpnext/projects/doctype/project_task/project_task.json b/erpnext/projects/doctype/project_task/project_task.json
deleted file mode 100644
index e26c191..0000000
--- a/erpnext/projects/doctype/project_task/project_task.json
+++ /dev/null
@@ -1,430 +0,0 @@
-{
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "beta": 0,
- "creation": "2015-02-22 11:15:28.201059",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Other",
- "editable_grid": 1,
- "engine": "InnoDB",
- "fields": [
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 3,
- "fieldname": "title",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Title",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 3,
- "default": "Open",
- "fieldname": "status",
- "fieldtype": "Select",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Status",
- "length": 0,
- "no_copy": 1,
- "options": "Open\nWorking\nPending Review\nOverdue\nCompleted\nCancelled",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "depends_on": "task_id",
- "fieldname": "edit_task",
- "fieldtype": "Button",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "View Task",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "edit_timesheet",
- "fieldtype": "Button",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "View Timesheet",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "make_timesheet",
- "fieldtype": "Button",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Make Timesheet",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "column_break_6",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 2,
- "fieldname": "start_date",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Start Date",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 2,
- "default": "",
- "fieldname": "end_date",
- "fieldtype": "Date",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "End Date",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "task_weight",
- "fieldtype": "Float",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Weight",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "section_break_6",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "description",
- "fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Description",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
- {
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "task_id",
- "fieldtype": "Link",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Task ID",
- "length": 0,
- "no_copy": 1,
- "options": "Task",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 1,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- }
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 1,
- "max_attachments": 0,
- "modified": "2019-02-19 12:30:52.648868",
- "modified_by": "Administrator",
- "module": "Projects",
- "name": "Project Task",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
-}
\ No newline at end of file
diff --git a/erpnext/projects/doctype/project_task/project_task.py b/erpnext/projects/doctype/project_task/project_task.py
deleted file mode 100644
index 5f9d8d7..0000000
--- a/erpnext/projects/doctype/project_task/project_task.py
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors and contributors
-# For license information, please see license.txt
-
-from __future__ import unicode_literals
-import frappe
-from frappe.model.document import Document
-
-class ProjectTask(Document):
- pass
diff --git a/erpnext/projects/doctype/task/task.py b/erpnext/projects/doctype/task/task.py
index d8fc199..50557f1 100755
--- a/erpnext/projects/doctype/task/task.py
+++ b/erpnext/projects/doctype/task/task.py
@@ -158,12 +158,6 @@
if check_if_child_exists(self.name):
throw(_("Child Task exists for this Task. You can not delete this Task."))
- if self.project:
- tasks = frappe.get_doc('Project', self.project).tasks
- for task in tasks:
- if task.get('task_id') == self.name:
- frappe.delete_doc('Project Task', task.name)
-
self.update_nsm_model()
def update_status(self):
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index 97c823d..824b8d9 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -61,6 +61,14 @@
});
}
+ if(this.frm.fields_dict.tc_name) {
+ this.frm.set_query("tc_name", function() {
+ return{
+ filters: { 'buying': 1 }
+ }
+ });
+ }
+
me.frm.set_query('supplier', erpnext.queries.supplier);
me.frm.set_query('contact_person', erpnext.queries.contact_query);
me.frm.set_query('supplier_address', erpnext.queries.address_query);
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index a3ecea1..11fdb8b 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -585,8 +585,17 @@
me.frm.set_value("letter_head", company_doc.default_letter_head);
}
}
- if (company_doc.default_terms && me.frm.doc.doctype != "Purchase Invoice" && frappe.meta.has_field(me.frm.doc.doctype, "tc_name")) {
- me.frm.set_value("tc_name", company_doc.default_terms);
+ let selling_doctypes_for_tc = ["Sales Invoice", "Quotation", "Sales Order", "Delivery Note"];
+ if (company_doc.default_selling_terms && frappe.meta.has_field(me.frm.doc.doctype, "tc_name") &&
+ selling_doctypes_for_tc.indexOf(me.frm.doc.doctype) != -1) {
+ me.frm.set_value("tc_name", company_doc.default_selling_terms);
+ }
+ let buying_doctypes_for_tc = ["Request for Quotation", "Supplier Quotation", "Purchase Order",
+ "Material Request", "Purchase Receipt"];
+ // Purchase Invoice is excluded as per issue #3345
+ if (company_doc.default_buying_terms && frappe.meta.has_field(me.frm.doc.doctype, "tc_name") &&
+ buying_doctypes_for_tc.indexOf(me.frm.doc.doctype) != -1) {
+ me.frm.set_value("tc_name", company_doc.default_buying_terms);
}
frappe.run_serially([
diff --git a/erpnext/public/js/financial_statements.js b/erpnext/public/js/financial_statements.js
index d1113a4..89cb13d 100644
--- a/erpnext/public/js/financial_statements.js
+++ b/erpnext/public/js/financial_statements.js
@@ -129,9 +129,7 @@
}
]
- let dimension_filters = erpnext.get_dimension_filters();
-
- dimension_filters.then((dimensions) => {
+ erpnext.dimension_filters.then((dimensions) => {
dimensions.forEach((dimension) => {
filters.push({
"fieldname": dimension["fieldname"],
diff --git a/erpnext/public/js/sms_manager.js b/erpnext/public/js/sms_manager.js
index 6ce8bb1..a058da2 100644
--- a/erpnext/public/js/sms_manager.js
+++ b/erpnext/public/js/sms_manager.js
@@ -20,8 +20,10 @@
'Purchase Receipt' : 'Items has been received against purchase receipt: ' + doc.name
}
- if (in_list(['Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice'], doc.doctype))
+ if (in_list(['Sales Order', 'Delivery Note', 'Sales Invoice'], doc.doctype))
this.show(doc.contact_person, 'Customer', doc.customer, '', default_msg[doc.doctype]);
+ else if (doc.doctype === 'Quotation')
+ this.show(doc.contact_person, 'Customer', doc.party_name, '', default_msg[doc.doctype]);
else if (in_list(['Purchase Order', 'Purchase Receipt'], doc.doctype))
this.show(doc.contact_person, 'Supplier', doc.supplier, '', default_msg[doc.doctype]);
else if (doc.doctype == 'Lead')
diff --git a/erpnext/public/js/utils/dimension_tree_filter.js b/erpnext/public/js/utils/dimension_tree_filter.js
index fef4507..549f95e 100644
--- a/erpnext/public/js/utils/dimension_tree_filter.js
+++ b/erpnext/public/js/utils/dimension_tree_filter.js
@@ -7,12 +7,12 @@
"Landed Cost Item", "Asset Value Adjustment", "Loyalty Program", "Fee Schedule", "Fee Structure", "Stock Reconciliation",
"Travel Request", "Fees", "POS Profile"];
-let dimension_filters = erpnext.get_dimension_filters();
+erpnext.dimension_filters = erpnext.get_dimension_filters();
erpnext.doctypes_with_dimensions.forEach((doctype) => {
frappe.ui.form.on(doctype, {
onload: function(frm) {
- dimension_filters.then((dimensions) => {
+ erpnext.dimension_filters.then((dimensions) => {
dimensions.forEach((dimension) => {
frappe.model.with_doctype(dimension['document_type'], () => {
if (frappe.meta.has_field(dimension['document_type'], 'is_group')) {
diff --git a/erpnext/regional/report/gstr_1/gstr_1.py b/erpnext/regional/report/gstr_1/gstr_1.py
index eff5780..e8c170e 100644
--- a/erpnext/regional/report/gstr_1/gstr_1.py
+++ b/erpnext/regional/report/gstr_1/gstr_1.py
@@ -74,7 +74,6 @@
for inv, items_based_on_rate in self.items_based_on_tax_rate.items():
invoice_details = self.invoices.get(inv)
-
for rate, items in items_based_on_rate.items():
place_of_supply = invoice_details.get("place_of_supply")
ecommerce_gstin = invoice_details.get("ecommerce_gstin")
@@ -85,7 +84,7 @@
"rate": "",
"taxable_value": 0,
"cess_amount": 0,
- "type": 0
+ "type": ""
})
row = b2cs_output.get((rate, place_of_supply, ecommerce_gstin))
@@ -94,6 +93,7 @@
row["rate"] = rate
row["taxable_value"] += sum([abs(net_amount)
for item_code, net_amount in self.invoice_items.get(inv).items() if item_code in items])
+ row["cess_amount"] += flt(self.invoice_cess.get(inv), 2)
row["type"] = "E" if ecommerce_gstin else "OE"
for key, value in iteritems(b2cs_output):
@@ -123,6 +123,10 @@
row += [tax_rate or 0, taxable_value]
+ for column in self.other_columns:
+ if column.get('fieldname') == 'cess_amount':
+ row.append(flt(self.invoice_cess.get(invoice), 2))
+
return row, taxable_value
def get_invoice_data(self):
@@ -327,7 +331,7 @@
"fieldtype": "Data"
},
{
- "fieldname": "invoice_type",
+ "fieldname": "gst_category",
"label": "Invoice Type",
"fieldtype": "Data"
},
@@ -564,12 +568,18 @@
out = get_b2b_json(res, gstin)
gst_json["b2b"] = out
+
elif filters["type_of_business"] == "B2C Large":
for item in report_data[:-1]:
res.setdefault(item["place_of_supply"], []).append(item)
out = get_b2cl_json(res, gstin)
gst_json["b2cl"] = out
+
+ elif filters["type_of_business"] == "B2C Small":
+ out = get_b2cs_json(report_data[:-1], gstin)
+ gst_json["b2cs"] = out
+
elif filters["type_of_business"] == "EXPORT":
for item in report_data[:-1]:
res.setdefault(item["export_type"], []).append(item)
@@ -605,6 +615,45 @@
return out
+def get_b2cs_json(data, gstin):
+
+ company_state_number = gstin[0:2]
+
+ out = []
+ for d in data:
+
+ pos = d.get('place_of_supply').split('-')[0]
+ tax_details = {}
+
+ rate = d.get('rate', 0)
+ tax = flt((d["taxable_value"]*rate)/100.0, 2)
+
+ if company_state_number == pos:
+ tax_details.update({"camt": flt(tax/2.0, 2), "samt": flt(tax/2.0, 2)})
+ else:
+ tax_details.update({"iamt": tax})
+
+ inv = {
+ "sply_ty": "INTRA" if company_state_number == pos else "INTER",
+ "pos": pos,
+ "typ": d.get('type'),
+ "txval": flt(d.get('taxable_value'), 2),
+ "rt": rate,
+ "iamt": flt(tax_details.get('iamt'), 2),
+ "camt": flt(tax_details.get('camt'), 2),
+ "samt": flt(tax_details.get('samt'), 2),
+ "csamt": flt(d.get('cess_amount'), 2)
+ }
+
+ if d.get('type') == "E" and d.get('ecommerce_gstin'):
+ inv.update({
+ "etin": d.get('ecommerce_gstin')
+ })
+
+ out.append(inv)
+
+ return out
+
def get_b2cl_json(res, gstin):
out = []
for pos in res:
diff --git a/erpnext/selling/doctype/sales_order/sales_order.py b/erpnext/selling/doctype/sales_order/sales_order.py
index 8ad3bf0..6c0b02d 100755
--- a/erpnext/selling/doctype/sales_order/sales_order.py
+++ b/erpnext/selling/doctype/sales_order/sales_order.py
@@ -547,12 +547,6 @@
"base_grand_total" : "estimated_costing",
}
},
- "Sales Order Item": {
- "doctype": "Project Task",
- "field_map": {
- "item_code": "title",
- },
- }
}, target_doc, postprocess)
return doc
diff --git a/erpnext/selling/sales_common.js b/erpnext/selling/sales_common.js
index 9bae58b..a2bae56 100644
--- a/erpnext/selling/sales_common.js
+++ b/erpnext/selling/sales_common.js
@@ -59,6 +59,12 @@
});
}
+ if(this.frm.fields_dict.tc_name) {
+ this.frm.set_query("tc_name", function() {
+ return { filters: { selling: 1 } };
+ });
+ }
+
if(!this.frm.fields_dict["items"]) {
return;
}
@@ -145,6 +151,11 @@
},
discount_amount: function(doc, cdt, cdn) {
+
+ if(doc.name === cdn) {
+ return;
+ }
+
var item = frappe.get_doc(cdt, cdn);
item.discount_percentage = 0.0;
this.apply_discount_on_item(doc, cdt, cdn, 'discount_amount');
diff --git a/erpnext/setup/doctype/company/company.js b/erpnext/setup/doctype/company/company.js
index 1e6056e..313de67 100644
--- a/erpnext/setup/doctype/company/company.js
+++ b/erpnext/setup/doctype/company/company.js
@@ -17,6 +17,14 @@
filters: {"is_group": 1}
}
});
+
+ frm.set_query("default_selling_terms", function() {
+ return { filters: { selling: 1 } };
+ });
+
+ frm.set_query("default_buying_terms", function() {
+ return { filters: { buying: 1 } };
+ });
},
company_name: function(frm) {
diff --git a/erpnext/setup/doctype/company/company.json b/erpnext/setup/doctype/company/company.json
index bb652ca..bc34189 100644
--- a/erpnext/setup/doctype/company/company.json
+++ b/erpnext/setup/doctype/company/company.json
@@ -1,769 +1,776 @@
{
- "allow_import": 1,
- "allow_rename": 1,
- "autoname": "field:company_name",
- "creation": "2013-04-10 08:35:39",
- "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.",
- "doctype": "DocType",
- "document_type": "Setup",
- "engine": "InnoDB",
- "field_order": [
- "details",
- "company_name",
- "abbr",
- "change_abbr",
- "is_group",
- "cb0",
- "domain",
- "parent_company",
- "charts_section",
- "default_currency",
- "default_letter_head",
- "default_holiday_list",
- "default_finance_book",
- "standard_working_hours",
- "default_terms",
- "default_warehouse_for_sales_return",
- "column_break_10",
- "country",
- "create_chart_of_accounts_based_on",
- "chart_of_accounts",
- "existing_company",
- "tax_id",
- "date_of_establishment",
- "sales_settings",
- "monthly_sales_target",
- "sales_monthly_history",
- "column_break_goals",
- "transactions_annual_history",
- "total_monthly_sales",
- "default_settings",
- "default_bank_account",
- "default_cash_account",
- "default_receivable_account",
- "round_off_account",
- "round_off_cost_center",
- "write_off_account",
- "discount_allowed_account",
- "discount_received_account",
- "exchange_gain_loss_account",
- "unrealized_exchange_gain_loss_account",
- "column_break0",
- "allow_account_creation_against_child_company",
- "default_payable_account",
- "default_employee_advance_account",
- "default_expense_account",
- "default_income_account",
- "default_deferred_revenue_account",
- "default_deferred_expense_account",
- "default_payroll_payable_account",
- "default_expense_claim_payable_account",
- "section_break_22",
- "cost_center",
- "column_break_26",
- "credit_limit",
- "payment_terms",
- "auto_accounting_for_stock_settings",
- "enable_perpetual_inventory",
- "default_inventory_account",
- "stock_adjustment_account",
- "column_break_32",
- "stock_received_but_not_billed",
- "expenses_included_in_valuation",
- "fixed_asset_depreciation_settings",
- "accumulated_depreciation_account",
- "depreciation_expense_account",
- "series_for_depreciation_entry",
- "expenses_included_in_asset_valuation",
- "column_break_40",
- "disposal_account",
- "depreciation_cost_center",
- "capital_work_in_progress_account",
- "asset_received_but_not_billed",
- "budget_detail",
- "exception_budget_approver_role",
- "company_info",
- "company_logo",
- "date_of_incorporation",
- "address_html",
- "date_of_commencement",
- "phone_no",
- "fax",
- "email",
- "website",
- "column_break1",
- "company_description",
- "registration_info",
- "registration_details",
- "delete_company_transactions",
- "lft",
- "rgt",
- "old_parent"
- ],
- "fields": [
- {
- "fieldname": "details",
- "fieldtype": "Section Break",
- "oldfieldtype": "Section Break"
- },
- {
- "fieldname": "company_name",
- "fieldtype": "Data",
- "label": "Company",
- "oldfieldname": "company_name",
- "oldfieldtype": "Data",
- "reqd": 1,
- "unique": 1
- },
- {
- "fieldname": "abbr",
- "fieldtype": "Data",
- "label": "Abbr",
- "oldfieldname": "abbr",
- "oldfieldtype": "Data",
- "reqd": 1
- },
- {
- "depends_on": "eval:!doc.__islocal && in_list(frappe.user_roles, \"System Manager\")",
- "fieldname": "change_abbr",
- "fieldtype": "Button",
- "label": "Change Abbreviation"
- },
- {
- "bold": 1,
- "default": "0",
- "fieldname": "is_group",
- "fieldtype": "Check",
- "label": "Is Group"
- },
- {
- "fieldname": "default_finance_book",
- "fieldtype": "Link",
- "label": "Default Finance Book",
- "options": "Finance Book"
- },
- {
- "fieldname": "cb0",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "domain",
- "fieldtype": "Link",
- "label": "Domain",
- "options": "Domain"
- },
- {
- "fieldname": "parent_company",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Parent Company",
- "options": "Company"
- },
- {
- "fieldname": "company_logo",
- "fieldtype": "Attach Image",
- "hidden": 1,
- "label": "Company Logo"
- },
- {
- "fieldname": "company_description",
- "fieldtype": "Text Editor",
- "label": "Company Description"
- },
- {
- "collapsible": 1,
- "fieldname": "sales_settings",
- "fieldtype": "Section Break",
- "label": "Sales Settings"
- },
- {
- "fieldname": "sales_monthly_history",
- "fieldtype": "Small Text",
- "hidden": 1,
- "label": "Sales Monthly History",
- "no_copy": 1,
- "read_only": 1
- },
- {
- "fieldname": "transactions_annual_history",
- "fieldtype": "Code",
- "hidden": 1,
- "label": "Transactions Annual History",
- "no_copy": 1,
- "read_only": 1
- },
- {
- "fieldname": "monthly_sales_target",
- "fieldtype": "Currency",
- "label": "Monthly Sales Target",
- "options": "default_currency"
- },
- {
- "fieldname": "column_break_goals",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "total_monthly_sales",
- "fieldtype": "Currency",
- "label": "Total Monthly Sales",
- "no_copy": 1,
- "options": "default_currency",
- "read_only": 1
- },
- {
- "fieldname": "charts_section",
- "fieldtype": "Section Break",
- "label": "Default Values"
- },
- {
- "fieldname": "default_currency",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Currency",
- "options": "Currency",
- "reqd": 1
- },
- {
- "fieldname": "default_letter_head",
- "fieldtype": "Link",
- "label": "Default Letter Head",
- "options": "Letter Head"
- },
- {
- "fieldname": "default_holiday_list",
- "fieldtype": "Link",
- "label": "Default Holiday List",
- "options": "Holiday List"
- },
- {
- "fieldname": "standard_working_hours",
- "fieldtype": "Float",
- "label": "Standard Working Hours"
- },
- {
- "fieldname": "default_terms",
- "fieldtype": "Link",
- "label": "Default Terms",
- "options": "Terms and Conditions"
- },
- {
- "fieldname": "default_warehouse_for_sales_return",
- "fieldtype": "Link",
- "label": "Default warehouse for Sales Return",
- "options": "Warehouse"
- },
- {
- "fieldname": "column_break_10",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "country",
- "fieldtype": "Link",
- "in_list_view": 1,
- "label": "Country",
- "options": "Country",
- "reqd": 1
- },
- {
- "fieldname": "create_chart_of_accounts_based_on",
- "fieldtype": "Select",
- "label": "Create Chart Of Accounts Based On",
- "options": "\nStandard Template\nExisting Company"
- },
- {
- "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"",
- "fieldname": "chart_of_accounts",
- "fieldtype": "Select",
- "label": "Chart Of Accounts Template",
- "no_copy": 1
- },
- {
- "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Existing Company\"",
- "fieldname": "existing_company",
- "fieldtype": "Link",
- "label": "Existing Company ",
- "no_copy": 1,
- "options": "Company"
- },
- {
- "fieldname": "tax_id",
- "fieldtype": "Data",
- "label": "Tax ID"
- },
- {
- "fieldname": "date_of_establishment",
- "fieldtype": "Date",
- "label": "Date of Establishment"
- },
- {
- "fieldname": "default_settings",
- "fieldtype": "Section Break",
- "label": "Accounts Settings",
- "oldfieldtype": "Section Break"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_bank_account",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Bank Account",
- "no_copy": 1,
- "oldfieldname": "default_bank_account",
- "oldfieldtype": "Link",
- "options": "Account"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_cash_account",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Cash Account",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_receivable_account",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Receivable Account",
- "no_copy": 1,
- "oldfieldname": "receivables_group",
- "oldfieldtype": "Link",
- "options": "Account"
- },
- {
- "fieldname": "round_off_account",
- "fieldtype": "Link",
- "label": "Round Off Account",
- "options": "Account"
- },
- {
- "fieldname": "round_off_cost_center",
- "fieldtype": "Link",
- "label": "Round Off Cost Center",
- "options": "Cost Center"
- },
- {
- "fieldname": "write_off_account",
- "fieldtype": "Link",
- "label": "Write Off Account",
- "options": "Account"
- },
- {
- "fieldname": "discount_allowed_account",
- "fieldtype": "Link",
- "label": "Discount Allowed Account",
- "options": "Account"
- },
- {
- "fieldname": "discount_received_account",
- "fieldtype": "Link",
- "label": "Discount Received Account",
- "options": "Account"
- },
- {
- "fieldname": "exchange_gain_loss_account",
- "fieldtype": "Link",
- "label": "Exchange Gain / Loss Account",
- "options": "Account"
- },
- {
- "fieldname": "unrealized_exchange_gain_loss_account",
- "fieldtype": "Link",
- "label": "Unrealized Exchange Gain/Loss Account",
- "options": "Account"
- },
- {
- "fieldname": "column_break0",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "width": "50%"
- },
- {
- "default": "0",
- "depends_on": "eval:doc.parent_company",
- "fieldname": "allow_account_creation_against_child_company",
- "fieldtype": "Check",
- "label": "Allow Account Creation Against Child Company"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_payable_account",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Payable Account",
- "no_copy": 1,
- "oldfieldname": "payables_group",
- "oldfieldtype": "Link",
- "options": "Account"
- },
- {
- "fieldname": "default_employee_advance_account",
- "fieldtype": "Link",
- "label": "Default Employee Advance Account",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_expense_account",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Cost of Goods Sold Account",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_income_account",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Income Account",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_deferred_revenue_account",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Deferred Revenue Account",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_deferred_expense_account",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Deferred Expense Account",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_payroll_payable_account",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Payroll Payable Account",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "default_expense_claim_payable_account",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Expense Claim Payable Account",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "fieldname": "section_break_22",
- "fieldtype": "Section Break"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "cost_center",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Default Cost Center",
- "no_copy": 1,
- "options": "Cost Center"
- },
- {
- "fieldname": "column_break_26",
- "fieldtype": "Column Break"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "credit_limit",
- "fieldtype": "Currency",
- "label": "Credit Limit",
- "oldfieldname": "credit_limit",
- "oldfieldtype": "Currency",
- "options": "default_currency"
- },
- {
- "fieldname": "payment_terms",
- "fieldtype": "Link",
- "label": "Default Payment Terms Template",
- "options": "Payment Terms Template"
- },
- {
- "depends_on": "eval:!doc.__islocal",
- "fieldname": "auto_accounting_for_stock_settings",
- "fieldtype": "Section Break",
- "label": "Stock Settings"
- },
- {
- "default": "1",
- "fieldname": "enable_perpetual_inventory",
- "fieldtype": "Check",
- "label": "Enable Perpetual Inventory"
- },
- {
- "fieldname": "default_inventory_account",
- "fieldtype": "Link",
- "label": "Default Inventory Account",
- "options": "Account"
- },
- {
- "fieldname": "stock_adjustment_account",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Stock Adjustment Account",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "fieldname": "column_break_32",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "stock_received_but_not_billed",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Stock Received But Not Billed",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "fieldname": "expenses_included_in_valuation",
- "fieldtype": "Link",
- "ignore_user_permissions": 1,
- "label": "Expenses Included In Valuation",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "collapsible": 1,
- "fieldname": "fixed_asset_depreciation_settings",
- "fieldtype": "Section Break",
- "label": "Fixed Asset Depreciation Settings"
- },
- {
- "fieldname": "accumulated_depreciation_account",
- "fieldtype": "Link",
- "label": "Accumulated Depreciation Account",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "fieldname": "depreciation_expense_account",
- "fieldtype": "Link",
- "label": "Depreciation Expense Account",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "fieldname": "series_for_depreciation_entry",
- "fieldtype": "Data",
- "label": "Series for Asset Depreciation Entry (Journal Entry)"
- },
- {
- "fieldname": "expenses_included_in_asset_valuation",
- "fieldtype": "Link",
- "label": "Expenses Included In Asset Valuation",
- "options": "Account"
- },
- {
- "fieldname": "column_break_40",
- "fieldtype": "Column Break"
- },
- {
- "fieldname": "disposal_account",
- "fieldtype": "Link",
- "label": "Gain/Loss Account on Asset Disposal",
- "no_copy": 1,
- "options": "Account"
- },
- {
- "fieldname": "depreciation_cost_center",
- "fieldtype": "Link",
- "label": "Asset Depreciation Cost Center",
- "no_copy": 1,
- "options": "Cost Center"
- },
- {
- "fieldname": "capital_work_in_progress_account",
- "fieldtype": "Link",
- "label": "Capital Work In Progress Account",
- "options": "Account"
- },
- {
- "fieldname": "asset_received_but_not_billed",
- "fieldtype": "Link",
- "label": "Asset Received But Not Billed",
- "options": "Account"
- },
- {
- "collapsible": 1,
- "fieldname": "budget_detail",
- "fieldtype": "Section Break",
- "label": "Budget Detail"
- },
- {
- "fieldname": "exception_budget_approver_role",
- "fieldtype": "Link",
- "label": "Exception Budget Approver Role",
- "options": "Role"
- },
- {
- "collapsible": 1,
- "description": "For reference only.",
- "fieldname": "company_info",
- "fieldtype": "Section Break",
- "label": "Company Info"
- },
- {
- "fieldname": "date_of_incorporation",
- "fieldtype": "Date",
- "label": "Date of Incorporation"
- },
- {
- "fieldname": "address_html",
- "fieldtype": "HTML"
- },
- {
- "fieldname": "column_break1",
- "fieldtype": "Column Break",
- "oldfieldtype": "Column Break",
- "width": "50%"
- },
- {
- "depends_on": "eval:doc.date_of_incorporation",
- "fieldname": "date_of_commencement",
- "fieldtype": "Date",
- "label": "Date of Commencement"
- },
- {
- "fieldname": "phone_no",
- "fieldtype": "Data",
- "label": "Phone No",
- "oldfieldname": "phone_no",
- "oldfieldtype": "Data",
- "options": "Phone"
- },
- {
- "fieldname": "fax",
- "fieldtype": "Data",
- "label": "Fax",
- "oldfieldname": "fax",
- "oldfieldtype": "Data",
- "options": "Phone"
- },
- {
- "fieldname": "email",
- "fieldtype": "Data",
- "label": "Email",
- "oldfieldname": "email",
- "oldfieldtype": "Data",
- "options": "Email"
- },
- {
- "fieldname": "website",
- "fieldtype": "Data",
- "label": "Website",
- "oldfieldname": "website",
- "oldfieldtype": "Data"
- },
- {
- "fieldname": "registration_info",
- "fieldtype": "Section Break",
- "oldfieldtype": "Section Break",
- "width": "50%"
- },
- {
- "description": "Company registration numbers for your reference. Tax numbers etc.",
- "fieldname": "registration_details",
- "fieldtype": "Code",
- "label": "Registration Details",
- "oldfieldname": "registration_details",
- "oldfieldtype": "Code"
- },
- {
- "fieldname": "delete_company_transactions",
- "fieldtype": "Button",
- "label": "Delete Company Transactions"
- },
- {
- "fieldname": "lft",
- "fieldtype": "Int",
- "hidden": 1,
- "label": "Lft",
- "print_hide": 1,
- "read_only": 1,
- "search_index": 1
- },
- {
- "fieldname": "rgt",
- "fieldtype": "Int",
- "hidden": 1,
- "label": "Rgt",
- "print_hide": 1,
- "read_only": 1,
- "search_index": 1
- },
- {
- "fieldname": "old_parent",
- "fieldtype": "Data",
- "hidden": 1,
- "label": "old_parent",
- "print_hide": 1,
- "read_only": 1
- }
- ],
- "icon": "fa fa-building",
- "idx": 1,
- "image_field": "company_logo",
- "modified": "2019-06-14 14:36:11.363309",
- "modified_by": "Administrator",
- "module": "Setup",
- "name": "Company",
- "owner": "Administrator",
- "permissions": [
- {
- "create": 1,
- "delete": 1,
- "email": 1,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "System Manager",
- "share": 1,
- "write": 1
- },
- {
- "email": 1,
- "print": 1,
- "read": 1,
- "role": "Accounts User"
- },
- {
- "read": 1,
- "role": "Employee"
- },
- {
- "read": 1,
- "role": "Sales User"
- },
- {
- "read": 1,
- "role": "Purchase User"
- },
- {
- "read": 1,
- "role": "Stock User"
- },
- {
- "read": 1,
- "role": "Projects User"
- }
- ],
- "show_name_in_global_search": 1,
- "sort_field": "modified",
- "sort_order": "ASC",
- "track_changes": 1
- }
\ No newline at end of file
+ "allow_import": 1,
+ "allow_rename": 1,
+ "autoname": "field:company_name",
+ "creation": "2013-04-10 08:35:39",
+ "description": "Legal Entity / Subsidiary with a separate Chart of Accounts belonging to the Organization.",
+ "doctype": "DocType",
+ "document_type": "Setup",
+ "engine": "InnoDB",
+ "field_order": [
+ "details",
+ "company_name",
+ "abbr",
+ "change_abbr",
+ "is_group",
+ "cb0",
+ "domain",
+ "parent_company",
+ "charts_section",
+ "default_currency",
+ "default_letter_head",
+ "default_holiday_list",
+ "default_finance_book",
+ "standard_working_hours",
+ "default_selling_terms",
+ "default_buying_terms",
+ "default_warehouse_for_sales_return",
+ "column_break_10",
+ "country",
+ "create_chart_of_accounts_based_on",
+ "chart_of_accounts",
+ "existing_company",
+ "tax_id",
+ "date_of_establishment",
+ "sales_settings",
+ "monthly_sales_target",
+ "sales_monthly_history",
+ "column_break_goals",
+ "transactions_annual_history",
+ "total_monthly_sales",
+ "default_settings",
+ "default_bank_account",
+ "default_cash_account",
+ "default_receivable_account",
+ "round_off_account",
+ "round_off_cost_center",
+ "write_off_account",
+ "discount_allowed_account",
+ "discount_received_account",
+ "exchange_gain_loss_account",
+ "unrealized_exchange_gain_loss_account",
+ "column_break0",
+ "allow_account_creation_against_child_company",
+ "default_payable_account",
+ "default_employee_advance_account",
+ "default_expense_account",
+ "default_income_account",
+ "default_deferred_revenue_account",
+ "default_deferred_expense_account",
+ "default_payroll_payable_account",
+ "default_expense_claim_payable_account",
+ "section_break_22",
+ "cost_center",
+ "column_break_26",
+ "credit_limit",
+ "payment_terms",
+ "auto_accounting_for_stock_settings",
+ "enable_perpetual_inventory",
+ "default_inventory_account",
+ "stock_adjustment_account",
+ "column_break_32",
+ "stock_received_but_not_billed",
+ "expenses_included_in_valuation",
+ "fixed_asset_depreciation_settings",
+ "accumulated_depreciation_account",
+ "depreciation_expense_account",
+ "series_for_depreciation_entry",
+ "expenses_included_in_asset_valuation",
+ "column_break_40",
+ "disposal_account",
+ "depreciation_cost_center",
+ "capital_work_in_progress_account",
+ "asset_received_but_not_billed",
+ "budget_detail",
+ "exception_budget_approver_role",
+ "company_info",
+ "company_logo",
+ "date_of_incorporation",
+ "address_html",
+ "date_of_commencement",
+ "phone_no",
+ "fax",
+ "email",
+ "website",
+ "column_break1",
+ "company_description",
+ "registration_info",
+ "registration_details",
+ "delete_company_transactions",
+ "lft",
+ "rgt",
+ "old_parent"
+ ],
+ "fields": [
+ {
+ "fieldname": "details",
+ "fieldtype": "Section Break",
+ "oldfieldtype": "Section Break"
+ },
+ {
+ "fieldname": "company_name",
+ "fieldtype": "Data",
+ "label": "Company",
+ "oldfieldname": "company_name",
+ "oldfieldtype": "Data",
+ "reqd": 1,
+ "unique": 1
+ },
+ {
+ "fieldname": "abbr",
+ "fieldtype": "Data",
+ "label": "Abbr",
+ "oldfieldname": "abbr",
+ "oldfieldtype": "Data",
+ "reqd": 1
+ },
+ {
+ "depends_on": "eval:!doc.__islocal && in_list(frappe.user_roles, \"System Manager\")",
+ "fieldname": "change_abbr",
+ "fieldtype": "Button",
+ "label": "Change Abbreviation"
+ },
+ {
+ "bold": 1,
+ "default": "0",
+ "fieldname": "is_group",
+ "fieldtype": "Check",
+ "label": "Is Group"
+ },
+ {
+ "fieldname": "default_finance_book",
+ "fieldtype": "Link",
+ "label": "Default Finance Book",
+ "options": "Finance Book"
+ },
+ {
+ "fieldname": "cb0",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "domain",
+ "fieldtype": "Link",
+ "label": "Domain",
+ "options": "Domain"
+ },
+ {
+ "fieldname": "parent_company",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Parent Company",
+ "options": "Company"
+ },
+ {
+ "fieldname": "company_logo",
+ "fieldtype": "Attach Image",
+ "hidden": 1,
+ "label": "Company Logo"
+ },
+ {
+ "fieldname": "company_description",
+ "fieldtype": "Text Editor",
+ "label": "Company Description"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "sales_settings",
+ "fieldtype": "Section Break",
+ "label": "Sales Settings"
+ },
+ {
+ "fieldname": "sales_monthly_history",
+ "fieldtype": "Small Text",
+ "hidden": 1,
+ "label": "Sales Monthly History",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "transactions_annual_history",
+ "fieldtype": "Code",
+ "hidden": 1,
+ "label": "Transactions Annual History",
+ "no_copy": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "monthly_sales_target",
+ "fieldtype": "Currency",
+ "label": "Monthly Sales Target",
+ "options": "default_currency"
+ },
+ {
+ "fieldname": "column_break_goals",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "total_monthly_sales",
+ "fieldtype": "Currency",
+ "label": "Total Monthly Sales",
+ "no_copy": 1,
+ "options": "default_currency",
+ "read_only": 1
+ },
+ {
+ "fieldname": "charts_section",
+ "fieldtype": "Section Break",
+ "label": "Default Values"
+ },
+ {
+ "fieldname": "default_currency",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Default Currency",
+ "options": "Currency",
+ "reqd": 1
+ },
+ {
+ "fieldname": "default_letter_head",
+ "fieldtype": "Link",
+ "label": "Default Letter Head",
+ "options": "Letter Head"
+ },
+ {
+ "fieldname": "default_holiday_list",
+ "fieldtype": "Link",
+ "label": "Default Holiday List",
+ "options": "Holiday List"
+ },
+ {
+ "fieldname": "standard_working_hours",
+ "fieldtype": "Float",
+ "label": "Standard Working Hours"
+ },
+ {
+ "fieldname": "default_warehouse_for_sales_return",
+ "fieldtype": "Link",
+ "label": "Default warehouse for Sales Return",
+ "options": "Warehouse"
+ },
+ {
+ "fieldname": "column_break_10",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "country",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Country",
+ "options": "Country",
+ "reqd": 1
+ },
+ {
+ "fieldname": "create_chart_of_accounts_based_on",
+ "fieldtype": "Select",
+ "label": "Create Chart Of Accounts Based On",
+ "options": "\nStandard Template\nExisting Company"
+ },
+ {
+ "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Standard Template\"",
+ "fieldname": "chart_of_accounts",
+ "fieldtype": "Select",
+ "label": "Chart Of Accounts Template",
+ "no_copy": 1
+ },
+ {
+ "depends_on": "eval:doc.create_chart_of_accounts_based_on===\"Existing Company\"",
+ "fieldname": "existing_company",
+ "fieldtype": "Link",
+ "label": "Existing Company ",
+ "no_copy": 1,
+ "options": "Company"
+ },
+ {
+ "fieldname": "tax_id",
+ "fieldtype": "Data",
+ "label": "Tax ID"
+ },
+ {
+ "fieldname": "date_of_establishment",
+ "fieldtype": "Date",
+ "label": "Date of Establishment"
+ },
+ {
+ "fieldname": "default_settings",
+ "fieldtype": "Section Break",
+ "label": "Accounts Settings",
+ "oldfieldtype": "Section Break"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_bank_account",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Default Bank Account",
+ "no_copy": 1,
+ "oldfieldname": "default_bank_account",
+ "oldfieldtype": "Link",
+ "options": "Account"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_cash_account",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Default Cash Account",
+ "no_copy": 1,
+ "options": "Account"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_receivable_account",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Default Receivable Account",
+ "no_copy": 1,
+ "oldfieldname": "receivables_group",
+ "oldfieldtype": "Link",
+ "options": "Account"
+ },
+ {
+ "fieldname": "round_off_account",
+ "fieldtype": "Link",
+ "label": "Round Off Account",
+ "options": "Account"
+ },
+ {
+ "fieldname": "round_off_cost_center",
+ "fieldtype": "Link",
+ "label": "Round Off Cost Center",
+ "options": "Cost Center"
+ },
+ {
+ "fieldname": "write_off_account",
+ "fieldtype": "Link",
+ "label": "Write Off Account",
+ "options": "Account"
+ },
+ {
+ "fieldname": "discount_allowed_account",
+ "fieldtype": "Link",
+ "label": "Discount Allowed Account",
+ "options": "Account"
+ },
+ {
+ "fieldname": "discount_received_account",
+ "fieldtype": "Link",
+ "label": "Discount Received Account",
+ "options": "Account"
+ },
+ {
+ "fieldname": "exchange_gain_loss_account",
+ "fieldtype": "Link",
+ "label": "Exchange Gain / Loss Account",
+ "options": "Account"
+ },
+ {
+ "fieldname": "unrealized_exchange_gain_loss_account",
+ "fieldtype": "Link",
+ "label": "Unrealized Exchange Gain/Loss Account",
+ "options": "Account"
+ },
+ {
+ "fieldname": "column_break0",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "width": "50%"
+ },
+ {
+ "default": "0",
+ "depends_on": "eval:doc.parent_company",
+ "fieldname": "allow_account_creation_against_child_company",
+ "fieldtype": "Check",
+ "label": "Allow Account Creation Against Child Company"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_payable_account",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Default Payable Account",
+ "no_copy": 1,
+ "oldfieldname": "payables_group",
+ "oldfieldtype": "Link",
+ "options": "Account"
+ },
+ {
+ "fieldname": "default_employee_advance_account",
+ "fieldtype": "Link",
+ "label": "Default Employee Advance Account",
+ "no_copy": 1,
+ "options": "Account"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_expense_account",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Default Cost of Goods Sold Account",
+ "no_copy": 1,
+ "options": "Account"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_income_account",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Default Income Account",
+ "no_copy": 1,
+ "options": "Account"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_deferred_revenue_account",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Default Deferred Revenue Account",
+ "no_copy": 1,
+ "options": "Account"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_deferred_expense_account",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Default Deferred Expense Account",
+ "no_copy": 1,
+ "options": "Account"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_payroll_payable_account",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Default Payroll Payable Account",
+ "no_copy": 1,
+ "options": "Account"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "default_expense_claim_payable_account",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Default Expense Claim Payable Account",
+ "no_copy": 1,
+ "options": "Account"
+ },
+ {
+ "fieldname": "section_break_22",
+ "fieldtype": "Section Break"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "cost_center",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Default Cost Center",
+ "no_copy": 1,
+ "options": "Cost Center"
+ },
+ {
+ "fieldname": "column_break_26",
+ "fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "credit_limit",
+ "fieldtype": "Currency",
+ "label": "Credit Limit",
+ "oldfieldname": "credit_limit",
+ "oldfieldtype": "Currency",
+ "options": "default_currency"
+ },
+ {
+ "fieldname": "payment_terms",
+ "fieldtype": "Link",
+ "label": "Default Payment Terms Template",
+ "options": "Payment Terms Template"
+ },
+ {
+ "depends_on": "eval:!doc.__islocal",
+ "fieldname": "auto_accounting_for_stock_settings",
+ "fieldtype": "Section Break",
+ "label": "Stock Settings"
+ },
+ {
+ "default": "1",
+ "fieldname": "enable_perpetual_inventory",
+ "fieldtype": "Check",
+ "label": "Enable Perpetual Inventory"
+ },
+ {
+ "fieldname": "default_inventory_account",
+ "fieldtype": "Link",
+ "label": "Default Inventory Account",
+ "options": "Account"
+ },
+ {
+ "fieldname": "stock_adjustment_account",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Stock Adjustment Account",
+ "no_copy": 1,
+ "options": "Account"
+ },
+ {
+ "fieldname": "column_break_32",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "stock_received_but_not_billed",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Stock Received But Not Billed",
+ "no_copy": 1,
+ "options": "Account"
+ },
+ {
+ "fieldname": "expenses_included_in_valuation",
+ "fieldtype": "Link",
+ "ignore_user_permissions": 1,
+ "label": "Expenses Included In Valuation",
+ "no_copy": 1,
+ "options": "Account"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "fixed_asset_depreciation_settings",
+ "fieldtype": "Section Break",
+ "label": "Fixed Asset Depreciation Settings"
+ },
+ {
+ "fieldname": "accumulated_depreciation_account",
+ "fieldtype": "Link",
+ "label": "Accumulated Depreciation Account",
+ "no_copy": 1,
+ "options": "Account"
+ },
+ {
+ "fieldname": "depreciation_expense_account",
+ "fieldtype": "Link",
+ "label": "Depreciation Expense Account",
+ "no_copy": 1,
+ "options": "Account"
+ },
+ {
+ "fieldname": "series_for_depreciation_entry",
+ "fieldtype": "Data",
+ "label": "Series for Asset Depreciation Entry (Journal Entry)"
+ },
+ {
+ "fieldname": "expenses_included_in_asset_valuation",
+ "fieldtype": "Link",
+ "label": "Expenses Included In Asset Valuation",
+ "options": "Account"
+ },
+ {
+ "fieldname": "column_break_40",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "disposal_account",
+ "fieldtype": "Link",
+ "label": "Gain/Loss Account on Asset Disposal",
+ "no_copy": 1,
+ "options": "Account"
+ },
+ {
+ "fieldname": "depreciation_cost_center",
+ "fieldtype": "Link",
+ "label": "Asset Depreciation Cost Center",
+ "no_copy": 1,
+ "options": "Cost Center"
+ },
+ {
+ "fieldname": "capital_work_in_progress_account",
+ "fieldtype": "Link",
+ "label": "Capital Work In Progress Account",
+ "options": "Account"
+ },
+ {
+ "fieldname": "asset_received_but_not_billed",
+ "fieldtype": "Link",
+ "label": "Asset Received But Not Billed",
+ "options": "Account"
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "budget_detail",
+ "fieldtype": "Section Break",
+ "label": "Budget Detail"
+ },
+ {
+ "fieldname": "exception_budget_approver_role",
+ "fieldtype": "Link",
+ "label": "Exception Budget Approver Role",
+ "options": "Role"
+ },
+ {
+ "collapsible": 1,
+ "description": "For reference only.",
+ "fieldname": "company_info",
+ "fieldtype": "Section Break",
+ "label": "Company Info"
+ },
+ {
+ "fieldname": "date_of_incorporation",
+ "fieldtype": "Date",
+ "label": "Date of Incorporation"
+ },
+ {
+ "fieldname": "address_html",
+ "fieldtype": "HTML"
+ },
+ {
+ "fieldname": "column_break1",
+ "fieldtype": "Column Break",
+ "oldfieldtype": "Column Break",
+ "width": "50%"
+ },
+ {
+ "depends_on": "eval:doc.date_of_incorporation",
+ "fieldname": "date_of_commencement",
+ "fieldtype": "Date",
+ "label": "Date of Commencement"
+ },
+ {
+ "fieldname": "phone_no",
+ "fieldtype": "Data",
+ "label": "Phone No",
+ "oldfieldname": "phone_no",
+ "oldfieldtype": "Data",
+ "options": "Phone"
+ },
+ {
+ "fieldname": "fax",
+ "fieldtype": "Data",
+ "label": "Fax",
+ "oldfieldname": "fax",
+ "oldfieldtype": "Data",
+ "options": "Phone"
+ },
+ {
+ "fieldname": "email",
+ "fieldtype": "Data",
+ "label": "Email",
+ "oldfieldname": "email",
+ "oldfieldtype": "Data",
+ "options": "Email"
+ },
+ {
+ "fieldname": "website",
+ "fieldtype": "Data",
+ "label": "Website",
+ "oldfieldname": "website",
+ "oldfieldtype": "Data"
+ },
+ {
+ "fieldname": "registration_info",
+ "fieldtype": "Section Break",
+ "oldfieldtype": "Section Break",
+ "width": "50%"
+ },
+ {
+ "description": "Company registration numbers for your reference. Tax numbers etc.",
+ "fieldname": "registration_details",
+ "fieldtype": "Code",
+ "label": "Registration Details",
+ "oldfieldname": "registration_details",
+ "oldfieldtype": "Code"
+ },
+ {
+ "fieldname": "delete_company_transactions",
+ "fieldtype": "Button",
+ "label": "Delete Company Transactions"
+ },
+ {
+ "fieldname": "lft",
+ "fieldtype": "Int",
+ "hidden": 1,
+ "label": "Lft",
+ "print_hide": 1,
+ "read_only": 1,
+ "search_index": 1
+ },
+ {
+ "fieldname": "rgt",
+ "fieldtype": "Int",
+ "hidden": 1,
+ "label": "Rgt",
+ "print_hide": 1,
+ "read_only": 1,
+ "search_index": 1
+ },
+ {
+ "fieldname": "old_parent",
+ "fieldtype": "Data",
+ "hidden": 1,
+ "label": "old_parent",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "fieldname": "default_selling_terms",
+ "fieldtype": "Link",
+ "label": "Default Selling Terms",
+ "options": "Terms and Conditions"
+ },
+ {
+ "fieldname": "default_buying_terms",
+ "fieldtype": "Link",
+ "label": "Default Buying Terms",
+ "options": "Terms and Conditions"
+ }
+ ],
+ "icon": "fa fa-building",
+ "idx": 1,
+ "image_field": "company_logo",
+ "modified": "2019-07-04 22:20:45.104307",
+ "modified_by": "Administrator",
+ "module": "Setup",
+ "name": "Company",
+ "owner": "Administrator",
+ "permissions": [
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "System Manager",
+ "share": 1,
+ "write": 1
+ },
+ {
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "role": "Accounts User"
+ },
+ {
+ "read": 1,
+ "role": "Employee"
+ },
+ {
+ "read": 1,
+ "role": "Sales User"
+ },
+ {
+ "read": 1,
+ "role": "Purchase User"
+ },
+ {
+ "read": 1,
+ "role": "Stock User"
+ },
+ {
+ "read": 1,
+ "role": "Projects User"
+ }
+ ],
+ "show_name_in_global_search": 1,
+ "sort_field": "modified",
+ "sort_order": "ASC",
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
index c1d459f..aba6a79 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.json
@@ -1,288 +1,142 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:title",
- "beta": 0,
"creation": "2013-01-10 16:34:24",
- "custom": 0,
"description": "Standard Terms and Conditions that can be added to Sales and Purchases.\n\nExamples:\n\n1. Validity of the offer.\n1. Payment Terms (In Advance, On Credit, part advance etc).\n1. What is extra (or payable by the Customer).\n1. Safety / usage warning.\n1. Warranty if any.\n1. Returns Policy.\n1. Terms of shipping, if applicable.\n1. Ways of addressing disputes, indemnity, liability, etc.\n1. Address and Contact of your Company.",
- "docstatus": 0,
"doctype": "DocType",
"document_type": "Setup",
- "editable_grid": 0,
+ "engine": "InnoDB",
+ "field_order": [
+ "title",
+ "disabled",
+ "applicable_modules_section",
+ "selling",
+ "buying",
+ "hr",
+ "section_break_7",
+ "terms",
+ "terms_and_conditions_help"
+ ],
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "title",
"fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Title",
- "length": 0,
"no_copy": 1,
"oldfieldname": "title",
"oldfieldtype": "Data",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
"reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
"unique": 1
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
+ "default": "0",
"fieldname": "disabled",
"fieldtype": "Check",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
"in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Disabled",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "label": "Disabled"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
+ "allow_in_quick_entry": 1,
"fieldname": "terms",
"fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
"in_global_search": 1,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Terms and Conditions",
- "length": 0,
- "no_copy": 0,
"oldfieldname": "terms",
- "oldfieldtype": "Text Editor",
- "permlevel": 0,
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "oldfieldtype": "Text Editor"
},
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
"fieldname": "terms_and_conditions_help",
"fieldtype": "HTML",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
"label": "Terms and Conditions Help",
- "length": 0,
- "no_copy": 0,
- "options": "<h4>Standard Terms and Conditions Example</h4>\n\n<pre>Delivery Terms for Order number {{ name }}\n\n-Order Date : {{ transaction_date }} \n-Expected Delivery Date : {{ delivery_date }}\n</pre>\n\n<h4>How to get fieldnames</h4>\n\n<p>The fieldnames you can use in your email template are the fields in the document from which you are sending the email. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Sales Invoice)</p>\n\n<h4>Templating</h4>\n\n<p>Templates are compiled using the Jinja Templating Langauge. To learn more about Jinja, <a class=\"strong\" href=\"http://jinja.pocoo.org/docs/dev/templates/\">read this documentation.</a></p>",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "options": "<h4>Standard Terms and Conditions Example</h4>\n\n<pre>Delivery Terms for Order number {{ name }}\n\n-Order Date : {{ transaction_date }} \n-Expected Delivery Date : {{ delivery_date }}\n</pre>\n\n<h4>How to get fieldnames</h4>\n\n<p>The fieldnames you can use in your email template are the fields in the document from which you are sending the email. You can find out the fields of any documents via Setup > Customize Form View and selecting the document type (e.g. Sales Invoice)</p>\n\n<h4>Templating</h4>\n\n<p>Templates are compiled using the Jinja Templating Langauge. To learn more about Jinja, <a class=\"strong\" href=\"http://jinja.pocoo.org/docs/dev/templates/\">read this documentation.</a></p>"
+ },
+ {
+ "fieldname": "applicable_modules_section",
+ "fieldtype": "Section Break",
+ "label": "Applicable Modules"
+ },
+ {
+ "default": "1",
+ "fieldname": "selling",
+ "fieldtype": "Check",
+ "label": "Selling"
+ },
+ {
+ "default": "1",
+ "fieldname": "buying",
+ "fieldtype": "Check",
+ "label": "Buying"
+ },
+ {
+ "default": "1",
+ "fieldname": "hr",
+ "fieldtype": "Check",
+ "label": "HR"
+ },
+ {
+ "fieldname": "section_break_7",
+ "fieldtype": "Section Break"
}
],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
"icon": "icon-legal",
"idx": 1,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-08-29 06:36:33.131473",
+ "modified": "2019-07-04 13:31:30.393425",
"modified_by": "Administrator",
"module": "Setup",
"name": "Terms and Conditions",
"owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
"export": 1,
- "if_owner": 0,
"import": 1,
- "permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Sales Master Manager",
- "set_user_permissions": 0,
"share": 1,
- "submit": 0,
"write": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
"read": 1,
- "report": 0,
- "role": "Sales User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
- "write": 0
+ "role": "Sales User"
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
"read": 1,
- "report": 0,
- "role": "Purchase User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
- "write": 0
+ "role": "Purchase User"
},
{
- "amend": 0,
- "cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "System Manager",
- "set_user_permissions": 0,
"share": 1,
- "submit": 0,
"write": 1
},
{
- "amend": 0,
- "cancel": 0,
"create": 1,
"delete": 1,
"email": 1,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
"print": 1,
"read": 1,
"report": 1,
"role": "Accounts User",
- "set_user_permissions": 0,
"share": 1,
- "submit": 0,
"write": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
- "email": 0,
- "export": 0,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 0,
"read": 1,
- "report": 0,
- "role": "Stock User",
- "set_user_permissions": 0,
- "share": 0,
- "submit": 0,
- "write": 0
+ "role": "Stock User"
}
],
"quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
"show_name_in_global_search": 1,
- "sort_order": "ASC",
- "track_changes": 0,
- "track_seen": 0,
- "track_views": 0
+ "sort_field": "modified",
+ "sort_order": "ASC"
}
\ No newline at end of file
diff --git a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
index a2152a6..372cc6d 100644
--- a/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
+++ b/erpnext/setup/doctype/terms_and_conditions/terms_and_conditions.py
@@ -3,9 +3,11 @@
from __future__ import unicode_literals
import frappe
+from frappe import _, throw
import json
from frappe.model.document import Document
from frappe.utils.jinja import validate_template
+from frappe.utils import cint
from six import string_types
@@ -13,6 +15,8 @@
def validate(self):
if self.terms:
validate_template(self.terms)
+ if not cint(self.buying) and not cint(self.selling) and not cint(self.hr) and not cint(self.disabled):
+ throw(_("At least one of the Applicable Modules should be selected"))
@frappe.whitelist()
def get_terms_and_conditions(template_name, doc):
diff --git a/erpnext/shopping_cart/cart.py b/erpnext/shopping_cart/cart.py
index 95bd9ba..4019e07 100644
--- a/erpnext/shopping_cart/cart.py
+++ b/erpnext/shopping_cart/cart.py
@@ -251,11 +251,13 @@
if quotation:
qdoc = frappe.get_doc("Quotation", quotation[0].name)
else:
+ [company, price_list] = frappe.db.get_value("Shopping Cart Settings", None, ["company", "price_list"])
qdoc = frappe.get_doc({
"doctype": "Quotation",
"naming_series": get_shopping_cart_settings().quotation_series or "QTN-CART-",
"quotation_to": party.doctype,
- "company": frappe.db.get_value("Shopping Cart Settings", None, "company"),
+ "company": company,
+ "selling_price_list": price_list,
"order_type": "Shopping Cart",
"status": "Draft",
"docstatus": 0,
diff --git a/erpnext/startup/boot.py b/erpnext/startup/boot.py
index a5bd93f..4ca43a8 100644
--- a/erpnext/startup/boot.py
+++ b/erpnext/startup/boot.py
@@ -33,7 +33,7 @@
FROM `tabCompany`
LIMIT 1""") and 'Yes' or 'No'
- bootinfo.docs += frappe.db.sql("""select name, default_currency, cost_center, default_terms,
+ bootinfo.docs += frappe.db.sql("""select name, default_currency, cost_center, default_selling_terms, default_buying_terms,
default_letter_head, default_bank_account, enable_perpetual_inventory, country from `tabCompany`""",
as_dict=1, update={"doctype":":Company"})
diff --git a/erpnext/stock/dashboard/item_dashboard.js b/erpnext/stock/dashboard/item_dashboard.js
index ed325a1..c84acc5 100644
--- a/erpnext/stock/dashboard/item_dashboard.js
+++ b/erpnext/stock/dashboard/item_dashboard.js
@@ -19,13 +19,24 @@
this.content.on('click', '.btn-move', function() {
let item = unescape($(this).attr('data-item'));
let warehouse = unescape($(this).attr('data-warehouse'));
- open_stock_entry(item, warehouse, "Material Transfer");
+ let actual_qty = unescape($(this).attr('data-actual_qty'));
+ let disable_quick_entry = Number(unescape($(this).attr('data-disable_quick_entry')));
+
+ if (disable_quick_entry) open_stock_entry(item, warehouse, "Material Transfer");
+
+ else erpnext.stock.move_item(item, warehouse, null, actual_qty, null, function() { me.refresh(); })
});
this.content.on('click', '.btn-add', function() {
let item = unescape($(this).attr('data-item'));
let warehouse = unescape($(this).attr('data-warehouse'));
- open_stock_entry(item, warehouse);
+ let actual_qty = unescape($(this).attr('data-actual_qty'));
+ let disable_quick_entry = Number(unescape($(this).attr('data-disable_quick_entry')));
+ let rate = unescape($(this).attr('data-rate'));
+
+ if (disable_quick_entry) open_stock_entry(item, warehouse);
+
+ else erpnext.stock.move_item(item, null, warehouse, actual_qty, rate, function() { me.refresh(); })
});
function open_stock_entry(item, warehouse, entry_type) {
@@ -124,4 +135,89 @@
show_item: show_item || false
}
}
-})
\ No newline at end of file
+})
+
+erpnext.stock.move_item = function(item, source, target, actual_qty, rate, callback) {
+ var dialog = new frappe.ui.Dialog({
+ title: target ? __('Add Item') : __('Move Item'),
+ fields: [
+ {fieldname: 'item_code', label: __('Item'),
+ fieldtype: 'Link', options: 'Item', read_only: 1},
+ {fieldname: 'source', label: __('Source Warehouse'),
+ fieldtype: 'Link', options: 'Warehouse', read_only: 1},
+ {fieldname: 'target', label: __('Target Warehouse'),
+ fieldtype: 'Link', options: 'Warehouse', reqd: 1},
+ {fieldname: 'qty', label: __('Quantity'), reqd: 1,
+ fieldtype: 'Float', description: __('Available {0}', [actual_qty]) },
+ {fieldname: 'rate', label: __('Rate'), fieldtype: 'Currency', hidden: 1 },
+ ],
+ })
+ dialog.show();
+ dialog.get_field('item_code').set_input(item);
+
+ if(source) {
+ dialog.get_field('source').set_input(source);
+ } else {
+ dialog.get_field('source').df.hidden = 1;
+ dialog.get_field('source').refresh();
+ }
+
+ if(rate) {
+ dialog.get_field('rate').set_value(rate);
+ dialog.get_field('rate').df.hidden = 0;
+ dialog.get_field('rate').refresh();
+ }
+
+ if(target) {
+ dialog.get_field('target').df.read_only = 1;
+ dialog.get_field('target').value = target;
+ dialog.get_field('target').refresh();
+ }
+
+ dialog.set_primary_action(__('Submit'), function() {
+ var values = dialog.get_values();
+ if(!values) {
+ return;
+ }
+ if(source && values.qty > actual_qty) {
+ frappe.msgprint(__('Quantity must be less than or equal to {0}', [actual_qty]));
+ return;
+ }
+ if(values.source === values.target) {
+ frappe.msgprint(__('Source and target warehouse must be different'));
+ }
+
+ frappe.call({
+ method: 'erpnext.stock.doctype.stock_entry.stock_entry_utils.make_stock_entry',
+ args: values,
+ freeze: true,
+ callback: function(r) {
+ frappe.show_alert(__('Stock Entry {0} created',
+ ['<a href="#Form/Stock Entry/'+r.message.name+'">' + r.message.name+ '</a>']));
+ dialog.hide();
+ callback(r);
+ },
+ });
+ });
+
+ $('<p style="margin-left: 10px;"><a class="link-open text-muted small">'
+ + __("Add more items or open full form") + '</a></p>')
+ .appendTo(dialog.body)
+ .find('.link-open')
+ .on('click', function() {
+ frappe.model.with_doctype('Stock Entry', function() {
+ var doc = frappe.model.get_new_doc('Stock Entry');
+ doc.from_warehouse = dialog.get_value('source');
+ doc.to_warehouse = dialog.get_value('target');
+ var row = frappe.model.add_child(doc, 'items');
+ row.item_code = dialog.get_value('item_code');
+ row.f_warehouse = dialog.get_value('target');
+ row.t_warehouse = dialog.get_value('target');
+ row.qty = dialog.get_value('qty');
+ row.conversion_factor = 1;
+ row.transfer_qty = dialog.get_value('qty');
+ row.basic_rate = dialog.get_value('rate');
+ frappe.set_route('Form', doc.doctype, doc.name);
+ })
+ });
+}
\ No newline at end of file
diff --git a/erpnext/stock/dashboard/item_dashboard.py b/erpnext/stock/dashboard/item_dashboard.py
index 487c765..7634ff0 100644
--- a/erpnext/stock/dashboard/item_dashboard.py
+++ b/erpnext/stock/dashboard/item_dashboard.py
@@ -44,7 +44,9 @@
for item in items:
item.update({
- 'item_name': frappe.get_cached_value("Item", item.item_code, 'item_name')
+ 'item_name': frappe.get_cached_value("Item", item.item_code, 'item_name'),
+ 'disable_quick_entry': frappe.get_cached_value("Item", item.item_code, 'has_batch_no')
+ or frappe.get_cached_value("Item", item.item_code, 'has_serial_no'),
})
return items
diff --git a/erpnext/stock/dashboard/item_dashboard_list.html b/erpnext/stock/dashboard/item_dashboard_list.html
index 5a3fa2e..e1914ed 100644
--- a/erpnext/stock/dashboard/item_dashboard_list.html
+++ b/erpnext/stock/dashboard/item_dashboard_list.html
@@ -43,11 +43,13 @@
<div class="col-sm-2 text-right" style="margin-top: 8px;">
{% if d.actual_qty %}
<button class="btn btn-default btn-xs btn-move"
+ data-disable_quick_entry="{{ d.disable_quick_entry }}"
data-warehouse="{{ d.warehouse }}"
data-actual_qty="{{ d.actual_qty }}"
data-item="{{ escape(d.item_code) }}">{{ __("Move") }}</a>
{% endif %}
<button style="margin-left: 7px;" class="btn btn-default btn-xs btn-add"
+ data-disable_quick_entry="{{ d.disable_quick_entry }}"
data-warehouse="{{ d.warehouse }}"
data-actual_qty="{{ d.actual_qty }}"
data-item="{{ escape(d.item_code) }}"
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js
index 6bcdc2b..569a03a 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.js
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.js
@@ -77,8 +77,34 @@
},
+
print_without_amount: function(frm) {
erpnext.stock.delivery_note.set_print_hide(frm.doc);
+ },
+
+ refresh: function(frm) {
+ if (frm.doc.docstatus === 1 && frm.doc.is_return === 1 && frm.doc.per_billed !== 100) {
+ frm.add_custom_button(__('Credit Note'), function() {
+ frappe.confirm(__("Are you sure you want to make credit note?"),
+ function() {
+ frm.trigger("make_credit_note");
+ }
+ );
+ }, __('Create'));
+
+ frm.page.set_inner_btn_group_as_primary(__('Create'));
+ }
+ },
+
+ make_credit_note: function(frm) {
+ frm.call({
+ method: "make_return_invoice",
+ doc: frm.doc,
+ freeze: true,
+ callback: function() {
+ frm.reload_doc();
+ }
+ });
}
});
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py
index 1e522b8..ec7df2d 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.py
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.py
@@ -333,7 +333,10 @@
return_invoice.is_return = True
return_invoice.save()
return_invoice.submit()
- frappe.msgprint(_("Credit Note {0} has been created automatically").format(return_invoice.name))
+
+ credit_note_link = frappe.utils.get_link_to_form('Sales Invoice', return_invoice.name)
+
+ frappe.msgprint(_("Credit Note {0} has been created automatically").format(credit_note_link))
except:
frappe.throw(_("Could not create Credit Note automatically, please uncheck 'Issue Credit Note' and submit again"))
diff --git a/erpnext/stock/doctype/item/item.json b/erpnext/stock/doctype/item/item.json
index 3936bf7..164ffa4 100644
--- a/erpnext/stock/doctype/item/item.json
+++ b/erpnext/stock/doctype/item/item.json
@@ -76,7 +76,6 @@
"is_customer_provided_item",
"customer",
"supplier_details",
- "manufacturers",
"delivered_by_supplier",
"column_break2",
"supplier_items",
@@ -1022,12 +1021,6 @@
"fieldtype": "Check",
"label": "Synced With Hub",
"read_only": 1
- },
- {
- "fieldname": "manufacturers",
- "fieldtype": "Table",
- "label": "Manufacturers",
- "options": "Item Manufacturer"
}
],
"has_web_view": 1,
@@ -1035,7 +1028,7 @@
"idx": 2,
"image_field": "image",
"max_attachments": 1,
- "modified": "2019-06-02 04:45:59.911507",
+ "modified": "2019-07-05 12:18:13.977931",
"modified_by": "Administrator",
"module": "Stock",
"name": "Item",
@@ -1097,4 +1090,4 @@
"sort_order": "DESC",
"title_field": "item_name",
"track_changes": 1
- }
\ No newline at end of file
+ }
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index 80d4e17..6484b93 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -122,6 +122,7 @@
self.validate_item_defaults()
self.validate_customer_provided_part()
self.update_defaults_from_item_group()
+ self.validate_auto_reorder_enabled_in_stock_settings()
self.cant_change()
if not self.get("__islocal"):
@@ -859,6 +860,12 @@
filters={"production_item": self.name, "docstatus": 1}):
return True
+ def validate_auto_reorder_enabled_in_stock_settings(self):
+ if self.reorder_levels:
+ enabled = frappe.db.get_single_value('Stock Settings', 'auto_indent')
+ if not enabled:
+ frappe.msgprint(msg=_("You have to enable auto re-order in Stock Settings to maintain re-order levels."), title=_("Enable Auto Re-Order"), indicator="orange")
+
def get_timeline_data(doctype, name):
'''returns timeline data based on stock ledger entry'''
out = {}
diff --git a/erpnext/stock/doctype/item/item_dashboard.py b/erpnext/stock/doctype/item/item_dashboard.py
index b3733d3..dd4676a 100644
--- a/erpnext/stock/doctype/item/item_dashboard.py
+++ b/erpnext/stock/doctype/item/item_dashboard.py
@@ -41,7 +41,7 @@
},
{
'label': _('Manufacture'),
- 'items': ['Work Order', 'Item Manufacturer']
+ 'items': ['Production Plan', 'Work Order', 'Item Manufacturer']
}
]
- }
\ No newline at end of file
+ }
diff --git a/erpnext/stock/doctype/material_request/material_request.py b/erpnext/stock/doctype/material_request/material_request.py
index ef5f24e..2b079e7 100644
--- a/erpnext/stock/doctype/material_request/material_request.py
+++ b/erpnext/stock/doctype/material_request/material_request.py
@@ -370,19 +370,20 @@
def get_material_requests_based_on_supplier(supplier):
supplier_items = [d.parent for d in frappe.db.get_all("Item Default",
{"default_supplier": supplier}, 'parent')]
- if supplier_items:
- material_requests = frappe.db.sql_list("""select distinct mr.name
- from `tabMaterial Request` mr, `tabMaterial Request Item` mr_item
- where mr.name = mr_item.parent
- and mr_item.item_code in (%s)
- and mr.material_request_type = 'Purchase'
- and mr.per_ordered < 99.99
- and mr.docstatus = 1
- and mr.status != 'Stopped'
- order by mr_item.item_code ASC""" % ', '.join(['%s']*len(supplier_items)),
- tuple(supplier_items))
- else:
- material_requests = []
+ if not supplier_items:
+ frappe.throw(_("{0} is not the default supplier for any items.".format(supplier)))
+
+ material_requests = frappe.db.sql_list("""select distinct mr.name
+ from `tabMaterial Request` mr, `tabMaterial Request Item` mr_item
+ where mr.name = mr_item.parent
+ and mr_item.item_code in (%s)
+ and mr.material_request_type = 'Purchase'
+ and mr.per_ordered < 99.99
+ and mr.docstatus = 1
+ and mr.status != 'Stopped'
+ order by mr_item.item_code ASC""" % ', '.join(['%s']*len(supplier_items)),
+ tuple(supplier_items))
+
return material_requests, supplier_items
@frappe.whitelist()
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
index e82aa2c..a2d3e75 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.js
@@ -38,6 +38,29 @@
if(frm.doc.company) {
frm.trigger("toggle_display_account_head");
}
+
+ if (frm.doc.docstatus === 1 && frm.doc.is_return === 1 && frm.doc.per_billed !== 100) {
+ frm.add_custom_button(__('Debit Note'), function() {
+ frappe.confirm(__("Are you sure you want to make debit note?"),
+ function() {
+ frm.trigger("make_debit_note");
+ }
+ );
+ }, __('Create'));
+
+ frm.page.set_inner_btn_group_as_primary(__('Create'));
+ }
+ },
+
+ make_debit_note: function(frm) {
+ frm.call({
+ method: "make_return_invoice",
+ doc: frm.doc,
+ freeze: true,
+ callback: function() {
+ frm.reload_doc();
+ }
+ });
},
company: function(frm) {
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index 67cd7f8..df28bec 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -387,6 +387,16 @@
self.load_from_db()
+ def make_return_invoice(self):
+ return_invoice = make_purchase_invoice(self.name)
+ return_invoice.is_return = True
+ return_invoice.save()
+ return_invoice.submit()
+
+ debit_note_link = frappe.utils.get_link_to_form('Purchase Invoice', return_invoice.name)
+
+ frappe.msgprint(_("Debit Note {0} has been created automatically").format(debit_note_link))
+
def update_billed_amount_based_on_po(po_detail, update_modified=True):
# Billed against Sales Order directly
billed_against_po = frappe.db.sql("""select sum(amount) from `tabPurchase Invoice Item`
diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py
index 93f13f1..ad1c263 100644
--- a/erpnext/support/doctype/issue/issue.py
+++ b/erpnext/support/doctype/issue/issue.py
@@ -258,15 +258,15 @@
if not doc.first_responded_on: # first_responded_on set when first reply is sent to customer
variance = round(time_diff_in_hours(doc.response_by, current_time), 2)
- frappe.db.set_value("Issue", doc.name, "response_by_variance", variance)
+ frappe.db.set_value(dt="Issue", dn=doc.name, field="response_by_variance", val=variance, update_modified=False)
if variance < 0:
- frappe.db.set_value("Issue", doc.name, "agreement_fulfilled", "Failed")
+ frappe.db.set_value(dt="Issue", dn=doc.name, field="agreement_fulfilled", val="Failed", update_modified=False)
if not doc.resolution_date: # resolution_date set when issue has been closed
variance = round(time_diff_in_hours(doc.resolution_by, current_time), 2)
- frappe.db.set_value("Issue", doc.name, "resolution_by_variance", variance)
+ frappe.db.set_value(dt="Issue", dn=doc.name, field="resolution_by_variance", val=variance, update_modified=False)
if variance < 0:
- frappe.db.set_value("Issue", doc.name, "agreement_fulfilled", "Failed")
+ frappe.db.set_value(dt="Issue", dn=doc.name, field="agreement_fulfilled", val="Failed", update_modified=False)
def get_list_context(context=None):
return {