Merge pull request #23050 from anupamvs/stock-entry-type
fix: deleting unused Stock Entry Type
diff --git a/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js b/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js
index 0b7cff3..2235298 100644
--- a/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js
+++ b/erpnext/accounts/doctype/chart_of_accounts_importer/chart_of_accounts_importer.js
@@ -135,7 +135,7 @@
callback: function(r) {
if(!r.exc) {
clearInterval(frm.page["interval"]);
- frm.page.set_indicator(__('Import Successfull'), 'blue');
+ frm.page.set_indicator(__('Import Successful'), 'blue');
create_reset_button(frm);
}
}
diff --git a/erpnext/accounts/doctype/coupon_code/test_coupon_code.py b/erpnext/accounts/doctype/coupon_code/test_coupon_code.py
index 3a0d416..340b9dd 100644
--- a/erpnext/accounts/doctype/coupon_code/test_coupon_code.py
+++ b/erpnext/accounts/doctype/coupon_code/test_coupon_code.py
@@ -9,6 +9,8 @@
from erpnext.stock.get_item_details import get_item_details
from frappe.test_runner import make_test_objects
+test_dependencies = ['Item']
+
def test_create_test_data():
frappe.set_user("Administrator")
# create test item
@@ -95,7 +97,6 @@
})
coupon_code.insert()
-
class TestCouponCode(unittest.TestCase):
def setUp(self):
test_create_test_data()
diff --git a/erpnext/accounts/doctype/fiscal_year/fiscal_year_dashboard.py b/erpnext/accounts/doctype/fiscal_year/fiscal_year_dashboard.py
index c7604ec..58480df 100644
--- a/erpnext/accounts/doctype/fiscal_year/fiscal_year_dashboard.py
+++ b/erpnext/accounts/doctype/fiscal_year/fiscal_year_dashboard.py
@@ -13,7 +13,7 @@
},
{
'label': _('References'),
- 'items': ['Period Closing Voucher', 'Request for Quotation', 'Tax Withholding Category']
+ 'items': ['Period Closing Voucher', 'Tax Withholding Category']
},
{
'label': _('Target Details'),
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.js b/erpnext/accounts/doctype/journal_entry/journal_entry.js
index a09face..409c15f 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.js
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.js
@@ -638,20 +638,12 @@
return { filters: filters };
},
- reverse_journal_entry: function(frm) {
- var me = frm.doc;
- for(var i=0; i<me.accounts.length; i++) {
- me.accounts[i].credit += me.accounts[i].debit;
- me.accounts[i].debit = me.accounts[i].credit - me.accounts[i].debit;
- me.accounts[i].credit -= me.accounts[i].debit;
- me.accounts[i].credit_in_account_currency = me.accounts[i].credit;
- me.accounts[i].debit_in_account_currency = me.accounts[i].debit;
- me.accounts[i].reference_type = "Journal Entry";
- me.accounts[i].reference_name = me.name
- }
- frm.copy_doc();
- cur_frm.reload_doc();
- }
+ reverse_journal_entry: function() {
+ frappe.model.open_mapped_doc({
+ method: "erpnext.accounts.doctype.journal_entry.journal_entry.make_reverse_journal_entry",
+ frm: cur_frm
+ })
+ },
});
$.extend(erpnext.journal_entry, {
diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py
index dda1708..0a385d0 100644
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py
@@ -1021,3 +1021,34 @@
journal_entry.posting_date = nowdate()
journal_entry.inter_company_journal_entry_reference = name
return journal_entry.as_dict()
+
+@frappe.whitelist()
+def make_reverse_journal_entry(source_name, target_doc=None, ignore_permissions=False):
+ from frappe.model.mapper import get_mapped_doc
+
+ def update_accounts(source, target, source_parent):
+ target.reference_type = "Journal Entry"
+ target.reference_name = source_parent.name
+
+ doclist = get_mapped_doc("Journal Entry", source_name, {
+ "Journal Entry": {
+ "doctype": "Journal Entry",
+ "validation": {
+ "docstatus": ["=", 1]
+ }
+ },
+ "Journal Entry Account": {
+ "doctype": "Journal Entry Account",
+ "field_map": {
+ "account_currency": "account_currency",
+ "exchange_rate": "exchange_rate",
+ "debit_in_account_currency": "credit_in_account_currency",
+ "debit": "credit",
+ "credit_in_account_currency": "debit_in_account_currency",
+ "credit": "debit",
+ },
+ "postprocess": update_accounts,
+ },
+ }, target_doc, ignore_permissions=ignore_permissions)
+
+ return doclist
\ No newline at end of file
diff --git a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
index 479d4b6..53c0758 100644
--- a/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
+++ b/erpnext/accounts/doctype/journal_entry/test_journal_entry.py
@@ -167,6 +167,49 @@
self.assertFalse(gle)
+ def test_reverse_journal_entry(self):
+ from erpnext.accounts.doctype.journal_entry.journal_entry import make_reverse_journal_entry
+ jv = make_journal_entry("_Test Bank USD - _TC",
+ "Sales - _TC", 100, exchange_rate=50, save=False)
+
+ jv.get("accounts")[1].credit_in_account_currency = 5000
+ jv.get("accounts")[1].exchange_rate = 1
+ jv.submit()
+
+ rjv = make_reverse_journal_entry(jv.name)
+ rjv.posting_date = nowdate()
+ rjv.submit()
+
+
+ gl_entries = frappe.db.sql("""select account, account_currency, debit, credit,
+ debit_in_account_currency, credit_in_account_currency
+ from `tabGL Entry` where voucher_type='Journal Entry' and voucher_no=%s
+ order by account asc""", rjv.name, as_dict=1)
+
+ self.assertTrue(gl_entries)
+
+
+ expected_values = {
+ "_Test Bank USD - _TC": {
+ "account_currency": "USD",
+ "debit": 0,
+ "debit_in_account_currency": 0,
+ "credit": 5000,
+ "credit_in_account_currency": 100,
+ },
+ "Sales - _TC": {
+ "account_currency": "INR",
+ "debit": 5000,
+ "debit_in_account_currency": 5000,
+ "credit": 0,
+ "credit_in_account_currency": 0,
+ }
+ }
+
+ for field in ("account_currency", "debit", "debit_in_account_currency", "credit", "credit_in_account_currency"):
+ for i, gle in enumerate(gl_entries):
+ self.assertEqual(expected_values[gle.account][field], gle[field])
+
def test_disallow_change_in_account_currency_for_a_party(self):
# create jv in USD
jv = make_journal_entry("_Test Bank USD - _TC",
diff --git a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
index 8680b71..ba68df7 100644
--- a/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
+++ b/erpnext/accounts/doctype/pos_invoice/pos_invoice.py
@@ -21,7 +21,7 @@
class POSInvoice(SalesInvoice):
def __init__(self, *args, **kwargs):
super(POSInvoice, self).__init__(*args, **kwargs)
-
+
def validate(self):
if not cint(self.is_pos):
frappe.throw(_("POS Invoice should have {} field checked.").format(frappe.bold("Include Payment")))
@@ -58,7 +58,7 @@
if self.redeem_loyalty_points and self.loyalty_points:
self.apply_loyalty_points()
self.set_status(update=True)
-
+
def on_cancel(self):
# run on cancel method of selling controller
super(SalesInvoice, self).on_cancel()
@@ -68,10 +68,10 @@
against_psi_doc = frappe.get_doc("POS Invoice", self.return_against)
against_psi_doc.delete_loyalty_point_entry()
against_psi_doc.make_loyalty_point_entry()
-
+
def validate_stock_availablility(self):
allow_negative_stock = frappe.db.get_value('Stock Settings', None, 'allow_negative_stock')
-
+
for d in self.get('items'):
if d.serial_no:
filters = {
@@ -89,11 +89,11 @@
for s in serial_nos:
if s in reserved_serial_nos:
invalid_serial_nos.append(s)
-
+
if len(invalid_serial_nos):
multiple_nos = 's' if len(invalid_serial_nos) > 1 else ''
frappe.throw(_("Row #{}: Serial No{}. {} has already been transacted into another POS Invoice. \
- Please select valid serial no.".format(d.idx, multiple_nos,
+ Please select valid serial no.".format(d.idx, multiple_nos,
frappe.bold(', '.join(invalid_serial_nos)))), title=_("Not Available"))
else:
if allow_negative_stock:
@@ -105,9 +105,9 @@
.format(d.idx, frappe.bold(d.item_code), frappe.bold(d.warehouse))), title=_("Not Available"))
elif flt(available_stock) < flt(d.qty):
frappe.msgprint(_('Row #{}: Stock quantity not enough for Item Code: {} under warehouse {}. \
- Available quantity {}.'.format(d.idx, frappe.bold(d.item_code),
+ Available quantity {}.'.format(d.idx, frappe.bold(d.item_code),
frappe.bold(d.warehouse), frappe.bold(d.qty))), title=_("Not Available"))
-
+
def validate_serialised_or_batched_item(self):
for d in self.get("items"):
serialized = d.get("has_serial_no")
@@ -125,7 +125,7 @@
if batched and no_batch_selected:
frappe.throw(_('Row #{}: No batch selected against item: {}. Please select a batch or remove it to complete transaction.'
.format(d.idx, frappe.bold(d.item_code))), title=_("Invalid Item"))
-
+
def validate_return_items(self):
if not self.get("is_return"): return
@@ -158,7 +158,7 @@
frappe.throw(_("Row #{0} (Payment Table): Amount must be positive").format(entry.idx))
if self.is_return and entry.amount > 0:
frappe.throw(_("Row #{0} (Payment Table): Amount must be negative").format(entry.idx))
-
+
def validate_pos_return(self):
if self.is_pos and self.is_return:
total_amount_in_payments = 0
@@ -167,12 +167,12 @@
invoice_total = self.rounded_total or self.grand_total
if total_amount_in_payments < invoice_total:
frappe.throw(_("Total payments amount can't be greater than {}".format(-invoice_total)))
-
+
def validate_loyalty_transaction(self):
if self.redeem_loyalty_points and (not self.loyalty_redemption_account or not self.loyalty_redemption_cost_center):
expense_account, cost_center = frappe.db.get_value('Loyalty Program', self.loyalty_program, ["expense_account", "cost_center"])
if not self.loyalty_redemption_account:
- self.loyalty_redemption_account = expense_account
+ self.loyalty_redemption_account = expense_account
if not self.loyalty_redemption_cost_center:
self.loyalty_redemption_cost_center = cost_center
@@ -212,7 +212,7 @@
if update:
self.db_set('status', self.status, update_modified = update_modified)
-
+
def set_pos_fields(self, for_validate=False):
"""Set retail related fields from POS Profiles"""
from erpnext.stock.get_item_details import get_pos_profile_item_details, get_pos_profile
@@ -315,25 +315,25 @@
@frappe.whitelist()
def get_stock_availability(item_code, warehouse):
- latest_sle = frappe.db.sql("""select qty_after_transaction
- from `tabStock Ledger Entry`
+ latest_sle = frappe.db.sql("""select qty_after_transaction
+ from `tabStock Ledger Entry`
where item_code = %s and warehouse = %s
order by posting_date desc, posting_time desc
limit 1""", (item_code, warehouse), as_dict=1)
-
+
pos_sales_qty = frappe.db.sql("""select sum(p_item.qty) as qty
from `tabPOS Invoice` p, `tabPOS Invoice Item` p_item
- where p.name = p_item.parent
- and p.consolidated_invoice is NULL
+ where p.name = p_item.parent
+ and p.consolidated_invoice is NULL
and p.docstatus = 1
and p_item.docstatus = 1
and p_item.item_code = %s
and p_item.warehouse = %s
""", (item_code, warehouse), as_dict=1)
-
+
sle_qty = latest_sle[0].qty_after_transaction or 0 if latest_sle else 0
pos_sales_qty = pos_sales_qty[0].qty or 0 if pos_sales_qty else 0
-
+
if sle_qty and pos_sales_qty and sle_qty > pos_sales_qty:
return sle_qty - pos_sales_qty
else:
@@ -360,14 +360,14 @@
merge_log = frappe.new_doc("POS Invoice Merge Log")
merge_log.posting_date = getdate(nowdate())
for inv in invoices:
- inv_data = frappe.db.get_values("POS Invoice", inv.get('name'),
+ inv_data = frappe.db.get_values("POS Invoice", inv.get('name'),
["customer", "posting_date", "grand_total"], as_dict=1)[0]
merge_log.customer = inv_data.customer
merge_log.append("pos_invoices", {
'pos_invoice': inv.get('name'),
'customer': inv_data.customer,
'posting_date': inv_data.posting_date,
- 'grand_total': inv_data.grand_total
+ 'grand_total': inv_data.grand_total
})
if merge_log.get('pos_invoices'):
diff --git a/erpnext/accounts/doctype/pos_profile/test_pos_profile.py b/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
index 8a4050c..edf8659 100644
--- a/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
+++ b/erpnext/accounts/doctype/pos_profile/test_pos_profile.py
@@ -8,6 +8,8 @@
from erpnext.stock.get_item_details import get_pos_profile
from erpnext.accounts.doctype.pos_profile.pos_profile import get_child_nodes
+test_dependencies = ['Item']
+
class TestPOSProfile(unittest.TestCase):
def test_pos_profile(self):
make_pos_profile()
@@ -88,7 +90,7 @@
"write_off_account": args.write_off_account or "_Test Write Off - _TC",
"write_off_cost_center": args.write_off_cost_center or "_Test Write Off Cost Center - _TC"
})
-
+
payments = [{
'mode_of_payment': 'Cash',
'default': 1
diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
index cff7d5b..aa6194c 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.py
@@ -1,5 +1,4 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
-# MIT License. See license.txt
# For license information, please see license.txt
@@ -208,7 +207,7 @@
def get_pricing_rule_for_item(args, price_list_rate=0, doc=None, for_validate=False):
from erpnext.accounts.doctype.pricing_rule.utils import (get_pricing_rules,
- get_applied_pricing_rules, get_pricing_rule_items, get_product_discount_rule)
+ get_applied_pricing_rules, get_pricing_rule_items, get_product_discount_rule)
if isinstance(doc, string_types):
doc = json.loads(doc)
@@ -237,7 +236,7 @@
update_args_for_pricing_rule(args)
- pricing_rules = (get_applied_pricing_rules(args)
+ pricing_rules = (get_applied_pricing_rules(args.get('pricing_rules'))
if for_validate and args.get("pricing_rules") else get_pricing_rules(args, doc))
if pricing_rules:
@@ -365,8 +364,9 @@
item_details.rate = rate
def remove_pricing_rule_for_item(pricing_rules, item_details, item_code=None):
- from erpnext.accounts.doctype.pricing_rule.utils import get_pricing_rule_items
- for d in json.loads(pricing_rules):
+ from erpnext.accounts.doctype.pricing_rule.utils import (get_applied_pricing_rules,
+ get_pricing_rule_items)
+ for d in get_applied_pricing_rules(pricing_rules):
if not d or not frappe.db.exists("Pricing Rule", d): continue
pricing_rule = frappe.get_cached_doc('Pricing Rule', d)
diff --git a/erpnext/accounts/doctype/pricing_rule/utils.py b/erpnext/accounts/doctype/pricing_rule/utils.py
index 3fd316f..53b0cf7b 100644
--- a/erpnext/accounts/doctype/pricing_rule/utils.py
+++ b/erpnext/accounts/doctype/pricing_rule/utils.py
@@ -447,9 +447,14 @@
apply_pricing_rule_for_free_items(doc, item_details.free_item_data)
doc.set_missing_values()
-def get_applied_pricing_rules(item_row):
- return (json.loads(item_row.get("pricing_rules"))
- if item_row.get("pricing_rules") else [])
+def get_applied_pricing_rules(pricing_rules):
+ if pricing_rules:
+ if pricing_rules.startswith('['):
+ return json.loads(pricing_rules)
+ else:
+ return pricing_rules.split(',')
+
+ return []
def get_product_discount_rule(pricing_rule, item_details, args=None, doc=None):
free_item = pricing_rule.free_item
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index 52a5be0..f6d76e5 100644
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -1,5 +1,4 @@
{
- "actions": [],
"autoname": "hash",
"creation": "2013-05-22 12:43:10",
"doctype": "DocType",
@@ -82,6 +81,7 @@
"item_tax_rate",
"bom",
"include_exploded_items",
+ "purchase_invoice_item",
"col_break6",
"purchase_order",
"po_detail",
@@ -769,12 +769,21 @@
"collapsible": 1,
"fieldname": "col_break7",
"fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "eval:parent.update_stock == 1",
+ "fieldname": "purchase_invoice_item",
+ "fieldtype": "Data",
+ "ignore_user_permissions": 1,
+ "label": "Purchase Invoice Item",
+ "no_copy": 1,
+ "print_hide": 1,
+ "read_only": 1
}
],
"idx": 1,
"istable": 1,
- "links": [],
- "modified": "2020-04-22 10:37:35.103176",
+ "modified": "2020-08-20 11:48:01.398356",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Purchase Invoice Item",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
index 31613e5..2397b7d 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -447,7 +447,7 @@
{
"allow_on_submit": 1,
"fieldname": "po_no",
- "fieldtype": "Small Text",
+ "fieldtype": "Data",
"hide_days": 1,
"hide_seconds": 1,
"label": "Customer's Purchase Order",
@@ -1946,7 +1946,7 @@
"idx": 181,
"is_submittable": 1,
"links": [],
- "modified": "2020-08-03 23:31:12.675040",
+ "modified": "2020-08-27 01:56:28.532140",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice",
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
index f106928..2980213 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice_dashboard.py
@@ -13,7 +13,8 @@
'Auto Repeat': 'reference_document',
},
'internal_links': {
- 'Sales Order': ['items', 'sales_order']
+ 'Sales Order': ['items', 'sales_order'],
+ 'Delivery Note': ['items', 'delivery_note']
},
'transactions': [
{
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index 004d358..fb3dd6a 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -1,5 +1,4 @@
{
- "actions": [],
"autoname": "hash",
"creation": "2013-06-04 11:02:19",
"doctype": "DocType",
@@ -87,6 +86,7 @@
"edit_references",
"sales_order",
"so_detail",
+ "sales_invoice_item",
"column_break_74",
"delivery_note",
"dn_detail",
@@ -790,12 +790,22 @@
"fieldtype": "Link",
"label": "Project",
"options": "Project"
- }
+ },
+ {
+ "depends_on": "eval:parent.update_stock == 1",
+ "fieldname": "sales_invoice_item",
+ "fieldtype": "Data",
+ "ignore_user_permissions": 1,
+ "label": "Sales Invoice Item",
+ "no_copy": 1,
+ "print_hide": 1,
+ "read_only": 1
+ }
],
"idx": 1,
"istable": 1,
"links": [],
- "modified": "2020-07-18 12:24:41.749986",
+ "modified": "2020-08-20 11:24:41.749986",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Sales Invoice Item",
diff --git a/erpnext/accounts/doctype/shipping_rule/shipping_rule.js b/erpnext/accounts/doctype/shipping_rule/shipping_rule.js
index 53ee08a..d0904ee 100644
--- a/erpnext/accounts/doctype/shipping_rule/shipping_rule.js
+++ b/erpnext/accounts/doctype/shipping_rule/shipping_rule.js
@@ -3,6 +3,22 @@
frappe.ui.form.on('Shipping Rule', {
refresh: function(frm) {
+ frm.set_query("cost_center", function() {
+ return {
+ filters: {
+ company: frm.doc.company
+ }
+ }
+ })
+
+ frm.set_query("account", function() {
+ return {
+ filters: {
+ company: frm.doc.company
+ }
+ }
+ })
+
frm.trigger('toggle_reqd');
},
calculate_based_on: function(frm) {
@@ -12,4 +28,4 @@
frm.toggle_reqd("shipping_amount", frm.doc.calculate_based_on === 'Fixed');
frm.toggle_reqd("conditions", frm.doc.calculate_based_on !== 'Fixed');
}
-});
\ No newline at end of file
+});
diff --git a/erpnext/accounts/doctype/tax_category/tax_category.json b/erpnext/accounts/doctype/tax_category/tax_category.json
index 1e3ae45..6f682a0 100644
--- a/erpnext/accounts/doctype/tax_category/tax_category.json
+++ b/erpnext/accounts/doctype/tax_category/tax_category.json
@@ -1,134 +1,66 @@
{
- "allow_copy": 0,
- "allow_events_in_timeline": 0,
- "allow_guest_to_view": 0,
- "allow_import": 0,
- "allow_rename": 0,
+ "actions": [],
+ "allow_rename": 1,
"autoname": "field:title",
- "beta": 0,
"creation": "2018-11-22 23:38:39.668804",
- "custom": 0,
- "docstatus": 0,
"doctype": "DocType",
- "document_type": "",
"editable_grid": 1,
"engine": "InnoDB",
+ "field_order": [
+ "title"
+ ],
"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": 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": 1
}
],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 0,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2020-01-15 17:14:28.951793",
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2020-08-30 19:41:25.783852",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Tax Category",
- "name_case": "",
"owner": "Administrator",
"permissions": [
{
- "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": "System Manager",
- "set_user_permissions": 0,
"share": 1,
- "submit": 0,
"write": 1
},
{
- "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": "Accounts Manager",
- "set_user_permissions": 0,
"share": 1,
- "submit": 0,
"write": 1
},
{
- "amend": 0,
- "cancel": 0,
- "create": 0,
- "delete": 0,
"email": 1,
"export": 1,
- "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": 0
+ "share": 1
}
],
"quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
"sort_field": "modified",
"sort_order": "DESC",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
-}
+ "track_changes": 1
+}
\ No newline at end of file
diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index cf3deb8..01d3903 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -45,8 +45,8 @@
}, as_dict=1)
if accounting_periods:
- frappe.throw(_("You can't create accounting entries in the closed accounting period {0}")
- .format(accounting_periods[0].name), ClosedAccountingPeriod)
+ frappe.throw(_("You cannot create or cancel any accounting entries with in the closed Accounting Period {0}")
+ .format(frappe.bold(accounting_periods[0].name)), ClosedAccountingPeriod)
def process_gl_map(gl_map, merge_entries=True):
if merge_entries:
@@ -301,8 +301,9 @@
})
if gl_entries:
- set_as_cancel(gl_entries[0]['voucher_type'], gl_entries[0]['voucher_no'])
+ validate_accounting_period(gl_entries)
check_freezing_date(gl_entries[0]["posting_date"], adv_adj)
+ set_as_cancel(gl_entries[0]['voucher_type'], gl_entries[0]['voucher_no'])
for entry in gl_entries:
entry['name'] = None
@@ -342,7 +343,7 @@
"""
Set is_cancelled=1 in all original gl entries for the voucher
"""
- frappe.db.sql("""update `tabGL Entry` set is_cancelled = 1,
+ frappe.db.sql("""UPDATE `tabGL Entry` SET is_cancelled = 1,
modified=%s, modified_by=%s
where voucher_type=%s and voucher_no=%s and is_cancelled = 0""",
(now(), frappe.session.user, voucher_type, voucher_no))
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 3ec4d30..f547ca6 100644
--- a/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
+++ b/erpnext/accounts/report/budget_variance_report/budget_variance_report.js
@@ -71,7 +71,22 @@
fieldtype: "Check",
default: 0,
},
- ]
+ ],
+ "formatter": function (value, row, column, data, default_formatter) {
+ value = default_formatter(value, row, column, data);
+
+ if (column.fieldname.includes('variance')) {
+
+ if (data[column.fieldname] < 0) {
+ value = "<span style='color:red'>" + value + "</span>";
+ }
+ else if (data[column.fieldname] > 0) {
+ value = "<span style='color:green'>" + value + "</span>";
+ }
+ }
+
+ return value;
+ }
}
erpnext.dimension_filters.forEach((dimension) => {
diff --git a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
index c2c7207..219871b 100644
--- a/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
+++ b/erpnext/accounts/report/consolidated_financial_statement/consolidated_financial_statement.py
@@ -378,7 +378,7 @@
if filters and filters.get('presentation_currency') != d.default_currency:
currency_info['company'] = d.name
currency_info['company_currency'] = d.default_currency
- convert_to_presentation_currency(gl_entries, currency_info)
+ convert_to_presentation_currency(gl_entries, currency_info, filters.get('company'))
for entry in gl_entries:
key = entry.account_number or entry.account_name
diff --git a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py
index 2cb10b1..10b32fe 100644
--- a/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py
+++ b/erpnext/accounts/report/customer_ledger_summary/customer_ledger_summary.py
@@ -173,7 +173,7 @@
from `tabGL Entry` gle
{join}
where
- gle.docstatus < 2 and gle.party_type=%(party_type)s and ifnull(gle.party, '') != ''
+ gle.docstatus < 2 and gle.is_cancelled = 0 and gle.party_type=%(party_type)s and ifnull(gle.party, '') != ''
and gle.posting_date <= %(to_date)s {conditions}
order by gle.posting_date
""".format(join=join, join_field=join_field, conditions=conditions), self.filters, as_dict=True)
@@ -248,7 +248,7 @@
from
`tabGL Entry`
where
- docstatus < 2
+ docstatus < 2 and is_cancelled = 0
and (voucher_type, voucher_no) in (
select voucher_type, voucher_no from `tabGL Entry` gle, `tabAccount` acc
where acc.name = gle.account and acc.account_type = '{income_or_expense}'
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index 3785ebf..1b65a31 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -14,7 +14,7 @@
from erpnext.accounts.report.utils import get_currency, convert_to_presentation_currency
from erpnext.accounts.utils import get_fiscal_year
from frappe import _
-from frappe.utils import (flt, getdate, get_first_day, add_months, add_days, formatdate, cstr)
+from frappe.utils import (flt, getdate, get_first_day, add_months, add_days, formatdate, cstr, cint)
from six import itervalues
from erpnext.accounts.doctype.accounting_dimension.accounting_dimension import get_accounting_dimensions, get_dimension_with_children
@@ -46,7 +46,7 @@
start_date = year_start_date
months = get_months(year_start_date, year_end_date)
- for i in range(math.ceil(months / months_to_add)):
+ for i in range(cint(math.ceil(months / months_to_add))):
period = frappe._dict({
"from_date": start_date
})
@@ -423,7 +423,7 @@
distributed_cost_center_query=distributed_cost_center_query), gl_filters, as_dict=True) #nosec
if filters and filters.get('presentation_currency'):
- convert_to_presentation_currency(gl_entries, get_currency(filters))
+ convert_to_presentation_currency(gl_entries, get_currency(filters), filters.get('company'))
for entry in gl_entries:
gl_entries_by_account.setdefault(entry.account, []).append(entry)
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.js b/erpnext/accounts/report/general_ledger/general_ledger.js
index 1fc0f79..fb0d359 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.js
+++ b/erpnext/accounts/report/general_ledger/general_ledger.js
@@ -147,6 +147,12 @@
}
},
{
+ "fieldname": "include_dimensions",
+ "label": __("Consider Accounting Dimensions"),
+ "fieldtype": "Check",
+ "default": 0
+ },
+ {
"fieldname": "show_opening_entries",
"label": __("Show Opening Entries"),
"fieldtype": "Check"
diff --git a/erpnext/accounts/report/general_ledger/general_ledger.py b/erpnext/accounts/report/general_ledger/general_ledger.py
index fcd36e4..f735d87 100644
--- a/erpnext/accounts/report/general_ledger/general_ledger.py
+++ b/erpnext/accounts/report/general_ledger/general_ledger.py
@@ -43,8 +43,11 @@
def validate_filters(filters, account_details):
- if not filters.get('company'):
- frappe.throw(_('{0} is mandatory').format(_('Company')))
+ if not filters.get("company"):
+ frappe.throw(_("{0} is mandatory").format(_("Company")))
+
+ if not filters.get("from_date") and not filters.get("to_date"):
+ frappe.throw(_("{0} and {1} are mandatory").format(frappe.bold(_("From Date")), frappe.bold(_("To Date"))))
if filters.get("account") and not account_details.get(filters.account):
frappe.throw(_("Account {0} does not exists").format(filters.account))
@@ -106,15 +109,20 @@
return filters
def get_result(filters, account_details):
- gl_entries = get_gl_entries(filters)
+ accounting_dimensions = []
+ if filters.get("include_dimensions"):
+ accounting_dimensions = get_accounting_dimensions()
- data = get_data_with_opening_closing(filters, account_details, gl_entries)
+ gl_entries = get_gl_entries(filters, accounting_dimensions)
+
+ data = get_data_with_opening_closing(filters, account_details,
+ accounting_dimensions, gl_entries)
result = get_result_as_list(data, filters)
return result
-def get_gl_entries(filters):
+def get_gl_entries(filters, accounting_dimensions):
currency_map = get_currency(filters)
select_fields = """, debit, credit, debit_in_account_currency,
credit_in_account_currency """
@@ -128,11 +136,15 @@
filters['company_fb'] = frappe.db.get_value("Company",
filters.get("company"), 'default_finance_book')
+ dimension_fields = ""
+ if accounting_dimensions:
+ dimension_fields = ', '.join(accounting_dimensions) + ','
+
distributed_cost_center_query = ""
if filters and filters.get('cost_center'):
select_fields_with_percentage = """, debit*(DCC_allocation.percentage_allocation/100) as debit, credit*(DCC_allocation.percentage_allocation/100) as credit, debit_in_account_currency*(DCC_allocation.percentage_allocation/100) as debit_in_account_currency,
credit_in_account_currency*(DCC_allocation.percentage_allocation/100) as credit_in_account_currency """
-
+
distributed_cost_center_query = """
UNION ALL
SELECT name as gl_entry,
@@ -141,12 +153,12 @@
party_type,
party,
voucher_type,
- voucher_no,
+ voucher_no, {dimension_fields}
cost_center, project,
against_voucher_type,
against_voucher,
account_currency,
- remarks, against,
+ remarks, against,
is_opening, `tabGL Entry`.creation {select_fields_with_percentage}
FROM `tabGL Entry`,
(
@@ -160,13 +172,14 @@
{conditions}
AND posting_date <= %(to_date)s
AND cost_center = DCC_allocation.parent
- """.format(select_fields_with_percentage=select_fields_with_percentage, conditions=get_conditions(filters).replace("and cost_center in %(cost_center)s ", ''))
+ """.format(dimension_fields=dimension_fields,select_fields_with_percentage=select_fields_with_percentage, conditions=get_conditions(filters).replace("and cost_center in %(cost_center)s ", ''))
gl_entries = frappe.db.sql(
"""
select
name as gl_entry, posting_date, account, party_type, party,
- voucher_type, voucher_no, cost_center, project,
+ voucher_type, voucher_no, {dimension_fields}
+ cost_center, project,
against_voucher_type, against_voucher, account_currency,
remarks, against, is_opening, creation {select_fields}
from `tabGL Entry`
@@ -174,13 +187,13 @@
{distributed_cost_center_query}
{order_by_statement}
""".format(
- select_fields=select_fields, conditions=get_conditions(filters), distributed_cost_center_query=distributed_cost_center_query,
+ dimension_fields=dimension_fields, select_fields=select_fields, conditions=get_conditions(filters), distributed_cost_center_query=distributed_cost_center_query,
order_by_statement=order_by_statement
),
filters, as_dict=1)
if filters.get('presentation_currency'):
- return convert_to_presentation_currency(gl_entries, currency_map)
+ return convert_to_presentation_currency(gl_entries, currency_map, filters.get('company'))
else:
return gl_entries
@@ -247,12 +260,12 @@
return "and {}".format(" and ".join(conditions)) if conditions else ""
-def get_data_with_opening_closing(filters, account_details, gl_entries):
+def get_data_with_opening_closing(filters, account_details, accounting_dimensions, gl_entries):
data = []
gle_map = initialize_gle_map(gl_entries, filters)
- totals, entries = get_accountwise_gle(filters, gl_entries, gle_map)
+ totals, entries = get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map)
# Opening for filtered account
data.append(totals.opening)
@@ -318,7 +331,7 @@
return gle_map
-def get_accountwise_gle(filters, gl_entries, gle_map):
+def get_accountwise_gle(filters, accounting_dimensions, gl_entries, gle_map):
totals = get_totals_dict()
entries = []
consolidated_gle = OrderedDict()
@@ -350,8 +363,11 @@
if filters.get("group_by") != _('Group by Voucher (Consolidated)'):
gle_map[gle.get(group_by)].entries.append(gle)
elif filters.get("group_by") == _('Group by Voucher (Consolidated)'):
- key = (gle.get("voucher_type"), gle.get("voucher_no"),
- gle.get("account"), gle.get("cost_center"))
+ keylist = [gle.get("voucher_type"), gle.get("voucher_no"), gle.get("account")]
+ for dim in accounting_dimensions:
+ keylist.append(gle.get(dim))
+ keylist.append(gle.get("cost_center"))
+ key = tuple(keylist)
if key not in consolidated_gle:
consolidated_gle.setdefault(key, gle)
else:
@@ -478,7 +494,19 @@
"options": "Project",
"fieldname": "project",
"width": 100
- },
+ }
+ ])
+
+ if filters.get("include_dimensions"):
+ for dim in get_accounting_dimensions(as_list = False):
+ columns.append({
+ "label": _(dim.label),
+ "options": dim.label,
+ "fieldname": dim.fieldname,
+ "width": 100
+ })
+
+ columns.extend([
{
"label": _("Cost Center"),
"options": "Cost Center",
diff --git a/erpnext/accounts/report/utils.py b/erpnext/accounts/report/utils.py
index 4a9af49..9de8d19 100644
--- a/erpnext/accounts/report/utils.py
+++ b/erpnext/accounts/report/utils.py
@@ -6,10 +6,6 @@
from frappe.utils import cint, get_datetime_str, formatdate, flt
__exchange_rates = {}
-P_OR_L_ACCOUNTS = list(
- sum(frappe.get_list('Account', fields=['name'], or_filters=[{'root_type': 'Income'}, {'root_type': 'Expense'}], as_list=True), ())
-)
-
def get_currency(filters):
"""
@@ -73,18 +69,7 @@
return rate
-
-def is_p_or_l_account(account_name):
- """
- Check if the given `account name` is an `Account` with `root_type` of either 'Income'
- or 'Expense'.
- :param account_name:
- :return: Boolean
- """
- return account_name in P_OR_L_ACCOUNTS
-
-
-def convert_to_presentation_currency(gl_entries, currency_info):
+def convert_to_presentation_currency(gl_entries, currency_info, company):
"""
Take a list of GL Entries and change the 'debit' and 'credit' values to currencies
in `currency_info`.
@@ -96,6 +81,9 @@
presentation_currency = currency_info['presentation_currency']
company_currency = currency_info['company_currency']
+ pl_accounts = [d.name for d in frappe.get_list('Account',
+ filters={'report_type': 'Profit and Loss', 'company': company})]
+
for entry in gl_entries:
account = entry['account']
debit = flt(entry['debit'])
@@ -107,7 +95,7 @@
if account_currency != presentation_currency:
value = debit or credit
- date = currency_info['report_date'] if not is_p_or_l_account(account) else entry['posting_date']
+ date = entry['posting_date'] if account in pl_accounts else currency_info['report_date']
converted_value = convert(value, presentation_currency, company_currency, date)
if entry.get('debit'):
diff --git a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js
index a76ffee..518d665 100644
--- a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js
+++ b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.js
@@ -12,7 +12,22 @@
"reqd": 1
},
{
- reqd: 1,
+ "fieldname":"from_date",
+ "label": __("From Date"),
+ "fieldtype": "Date",
+ "width": "80",
+ "reqd": 1,
+ "default": frappe.datetime.add_months(frappe.datetime.get_today(), -1),
+ },
+ {
+ "fieldname":"to_date",
+ "label": __("To Date"),
+ "fieldtype": "Date",
+ "width": "80",
+ "reqd": 1,
+ "default": frappe.datetime.get_today()
+ },
+ {
default: "",
options: "Item",
label: __("Item"),
@@ -45,13 +60,12 @@
}
},
{
- fieldtype: "Link",
+ fieldtype: "MultiSelectList",
label: __("Supplier Quotation"),
- options: "Supplier Quotation",
fieldname: "supplier_quotation",
default: "",
- get_query: () => {
- return { filters: { "docstatus": ["<", 2] } }
+ get_data: function(txt) {
+ return frappe.db.get_link_options('Supplier Quotation', txt, {'docstatus': ["<", 2]});
}
},
{
@@ -63,9 +77,30 @@
get_query: () => {
return { filters: { "docstatus": ["<", 2] } }
}
+ },
+ {
+ fieldtype: "Check",
+ label: __("Include Expired"),
+ fieldname: "include_expired",
+ default: 0
}
],
+ formatter: (value, row, column, data, default_formatter) => {
+ value = default_formatter(value, row, column, data);
+
+ if(column.fieldname === "valid_till" && data.valid_till){
+ if(frappe.datetime.get_diff(data.valid_till, frappe.datetime.nowdate()) <= 1){
+ value = `<div style="color:red">${value}</div>`;
+ }
+ else if (frappe.datetime.get_diff(data.valid_till, frappe.datetime.nowdate()) <= 7){
+ value = `<div style="color:darkorange">${value}</div>`;
+ }
+ }
+
+ return value;
+ },
+
onload: (report) => {
// Create a button for setting the default supplier
report.page.add_inner_button(__("Select Default Supplier"), () => {
diff --git a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py
index a33867a..4426560 100644
--- a/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py
+++ b/erpnext/buying/report/quoted_item_comparison/quoted_item_comparison.py
@@ -16,44 +16,49 @@
supplier_quotation_data = get_data(filters, conditions)
columns = get_columns()
- data, chart_data = prepare_data(supplier_quotation_data)
+ data, chart_data = prepare_data(supplier_quotation_data, filters)
+ message = get_message()
- return columns, data, None, chart_data
+ return columns, data, message, chart_data
def get_conditions(filters):
conditions = ""
+ if filters.get("item_code"):
+ conditions += " AND sqi.item_code = %(item_code)s"
+
if filters.get("supplier_quotation"):
- conditions += " AND sqi.parent = %(supplier_quotation)s"
+ conditions += " AND sqi.parent in %(supplier_quotation)s"
if filters.get("request_for_quotation"):
conditions += " AND sqi.request_for_quotation = %(request_for_quotation)s"
if filters.get("supplier"):
conditions += " AND sq.supplier in %(supplier)s"
+
+ if not filters.get("include_expired"):
+ conditions += " AND sq.status != 'Expired'"
+
return conditions
def get_data(filters, conditions):
- if not filters.get("item_code"):
- return []
-
supplier_quotation_data = frappe.db.sql("""SELECT
- sqi.parent, sqi.qty, sqi.rate, sqi.uom, sqi.request_for_quotation,
- sq.supplier
+ sqi.parent, sqi.item_code, sqi.qty, sqi.rate, sqi.uom, sqi.request_for_quotation,
+ sqi.lead_time_days, sq.supplier, sq.valid_till
FROM
`tabSupplier Quotation Item` sqi,
`tabSupplier Quotation` sq
WHERE
- sqi.item_code = %(item_code)s
- AND sqi.parent = sq.name
+ sqi.parent = sq.name
AND sqi.docstatus < 2
AND sq.company = %(company)s
- AND sq.status != 'Expired'
- {0}""".format(conditions), filters, as_dict=1)
+ AND sq.transaction_date between %(from_date)s and %(to_date)s
+ {0}
+ order by sq.transaction_date, sqi.item_code""".format(conditions), filters, as_dict=1)
return supplier_quotation_data
-def prepare_data(supplier_quotation_data):
- out, suppliers, qty_list = [], [], []
+def prepare_data(supplier_quotation_data, filters):
+ out, suppliers, qty_list, chart_data = [], [], [], []
supplier_wise_map = defaultdict(list)
supplier_qty_price_map = {}
@@ -70,20 +75,24 @@
exchange_rate = 1
row = {
+ "item_code": data.get('item_code'),
"quotation": data.get("parent"),
"qty": data.get("qty"),
"price": flt(data.get("rate") * exchange_rate, float_precision),
"uom": data.get("uom"),
"request_for_quotation": data.get("request_for_quotation"),
+ "valid_till": data.get('valid_till'),
+ "lead_time_days": data.get('lead_time_days')
}
# map for report view of form {'supplier1':[{},{},...]}
supplier_wise_map[supplier].append(row)
# map for chart preparation of the form {'supplier1': {'qty': 'price'}}
- if not supplier in supplier_qty_price_map:
- supplier_qty_price_map[supplier] = {}
- supplier_qty_price_map[supplier][row["qty"]] = row["price"]
+ if filters.get("item_code"):
+ if not supplier in supplier_qty_price_map:
+ supplier_qty_price_map[supplier] = {}
+ supplier_qty_price_map[supplier][row["qty"]] = row["price"]
suppliers.append(supplier)
qty_list.append(data.get("qty"))
@@ -97,7 +106,8 @@
for entry in supplier_wise_map[supplier]:
out.append(entry)
- chart_data = prepare_chart_data(suppliers, qty_list, supplier_qty_price_map)
+ if filters.get("item_code"):
+ chart_data = prepare_chart_data(suppliers, qty_list, supplier_qty_price_map)
return out, chart_data
@@ -117,9 +127,10 @@
data_points_map[qty].append(None)
dataset = []
+ currency_symbol = frappe.db.get_value("Currency", frappe.db.get_default("currency"), "symbol")
for qty in qty_list:
datapoints = {
- "name": _("Price for Qty ") + str(qty),
+ "name": currency_symbol + " (Qty " + str(qty) + " )",
"values": data_points_map[qty]
}
dataset.append(datapoints)
@@ -140,14 +151,21 @@
"label": _("Supplier"),
"fieldtype": "Link",
"options": "Supplier",
+ "width": 150
+ },
+ {
+ "fieldname": "item_code",
+ "label": _("Item"),
+ "fieldtype": "Link",
+ "options": "Item",
"width": 200
},
{
- "fieldname": "quotation",
- "label": _("Supplier Quotation"),
+ "fieldname": "uom",
+ "label": _("UOM"),
"fieldtype": "Link",
- "options": "Supplier Quotation",
- "width": 200
+ "options": "UOM",
+ "width": 90
},
{
"fieldname": "qty",
@@ -163,19 +181,43 @@
"width": 110
},
{
- "fieldname": "uom",
- "label": _("UOM"),
+ "fieldname": "quotation",
+ "label": _("Supplier Quotation"),
"fieldtype": "Link",
- "options": "UOM",
- "width": 90
+ "options": "Supplier Quotation",
+ "width": 200
+ },
+ {
+ "fieldname": "valid_till",
+ "label": _("Valid Till"),
+ "fieldtype": "Date",
+ "width": 100
+ },
+ {
+ "fieldname": "lead_time_days",
+ "label": _("Lead Time (Days)"),
+ "fieldtype": "Int",
+ "width": 100
},
{
"fieldname": "request_for_quotation",
"label": _("Request for Quotation"),
"fieldtype": "Link",
"options": "Request for Quotation",
- "width": 200
+ "width": 150
}
]
- return columns
\ No newline at end of file
+ return columns
+
+def get_message():
+ return """<span class="indicator">
+ Valid till :
+ </span>
+ <span class="indicator orange">
+ Expires in a week or less
+ </span>
+
+ <span class="indicator red">
+ Expires today / Already Expired
+ </span>"""
\ No newline at end of file
diff --git a/erpnext/communication/doctype/call_log/call_log.json b/erpnext/communication/doctype/call_log/call_log.json
index cfc08eb..31e79f1 100644
--- a/erpnext/communication/doctype/call_log/call_log.json
+++ b/erpnext/communication/doctype/call_log/call_log.json
@@ -1,4 +1,5 @@
{
+ "actions": [],
"autoname": "field:id",
"creation": "2019-06-05 12:07:02.634534",
"doctype": "DocType",
@@ -14,6 +15,7 @@
"contact",
"contact_name",
"column_break_10",
+ "customer",
"lead",
"lead_name",
"section_break_5",
@@ -28,7 +30,8 @@
},
{
"fieldname": "section_break_5",
- "fieldtype": "Section Break"
+ "fieldtype": "Section Break",
+ "label": "Call Details"
},
{
"fieldname": "id",
@@ -125,10 +128,19 @@
"in_list_view": 1,
"label": "Lead Name",
"read_only": 1
+ },
+ {
+ "fieldname": "customer",
+ "fieldtype": "Link",
+ "label": "Customer",
+ "options": "Customer",
+ "read_only": 1
}
],
"in_create": 1,
- "modified": "2019-08-06 05:46:53.144683",
+ "index_web_pages_for_search": 1,
+ "links": [],
+ "modified": "2020-08-25 17:08:34.085731",
"modified_by": "Administrator",
"module": "Communication",
"name": "Call Log",
diff --git a/erpnext/communication/doctype/call_log/call_log.py b/erpnext/communication/doctype/call_log/call_log.py
index 5fe3c4e..b31b757 100644
--- a/erpnext/communication/doctype/call_log/call_log.py
+++ b/erpnext/communication/doctype/call_log/call_log.py
@@ -16,6 +16,9 @@
self.contact = get_contact_with_phone_number(number)
self.lead = get_lead_with_phone_number(number)
+ contact = frappe.get_doc("Contact", self.contact)
+ self.customer = contact.get_link_for("Customer")
+
def after_insert(self):
self.trigger_call_popup()
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index 3091193..d61e44b 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -325,7 +325,7 @@
apply_pricing_rule_for_free_items(self, pricing_rule_args.get('free_item_data'))
elif pricing_rule_args.get("validate_applied_rule"):
- for pricing_rule in get_applied_pricing_rules(item):
+ for pricing_rule in get_applied_pricing_rules(item.get('pricing_rules')):
pricing_rule_doc = frappe.get_cached_doc("Pricing Rule", pricing_rule)
for field in ['discount_percentage', 'discount_amount', 'rate']:
if item.get(field) < pricing_rule_doc.get(field):
diff --git a/erpnext/controllers/buying_controller.py b/erpnext/controllers/buying_controller.py
index 89b48f0..ac567b7 100644
--- a/erpnext/controllers/buying_controller.py
+++ b/erpnext/controllers/buying_controller.py
@@ -276,6 +276,9 @@
qty_to_be_received_map = get_qty_to_be_received(purchase_orders)
for item in self.get('items'):
+ if not item.purchase_order:
+ continue
+
# reset raw_material cost
item.rm_supp_cost = 0
@@ -288,6 +291,12 @@
fg_yet_to_be_received = qty_to_be_received_map.get(item_key)
+ if not fg_yet_to_be_received:
+ frappe.throw(_("Row #{0}: Item {1} is already fully received in Purchase Order {2}")
+ .format(item.idx, frappe.bold(item.item_code),
+ frappe.utils.get_link_to_form("Purchase Order", item.purchase_order)),
+ title=_("Limit Crossed"))
+
transferred_batch_qty_map = get_transferred_batch_qty_map(item.purchase_order, item.item_code)
backflushed_batch_qty_map = get_backflushed_batch_qty_map(item.purchase_order, item.item_code)
@@ -559,9 +568,19 @@
"serial_no": cstr(d.serial_no).strip()
})
if self.is_return:
- original_incoming_rate = frappe.db.get_value("Stock Ledger Entry",
- {"voucher_type": "Purchase Receipt", "voucher_no": self.return_against,
- "item_code": d.item_code}, "incoming_rate")
+ filters = {
+ "voucher_type": self.doctype,
+ "voucher_no": self.return_against,
+ "item_code": d.item_code
+ }
+
+ if (self.doctype == "Purchase Invoice" and self.update_stock
+ and d.get("purchase_invoice_item")):
+ filters["voucher_detail_no"] = d.purchase_invoice_item
+ elif self.doctype == "Purchase Receipt" and d.get("purchase_receipt_item"):
+ filters["voucher_detail_no"] = d.purchase_receipt_item
+
+ original_incoming_rate = frappe.db.get_value("Stock Ledger Entry", filters, "incoming_rate")
sle.update({
"outgoing_rate": original_incoming_rate
diff --git a/erpnext/controllers/queries.py b/erpnext/controllers/queries.py
index 37b7e31..c88bf66 100644
--- a/erpnext/controllers/queries.py
+++ b/erpnext/controllers/queries.py
@@ -497,24 +497,18 @@
conditions, bin_conditions = [], []
filter_dict = get_doctype_wise_filters(filters)
- sub_query = """ select round(`tabBin`.actual_qty, 2) from `tabBin`
- where `tabBin`.warehouse = `tabWarehouse`.name
- {bin_conditions} """.format(
- bin_conditions=get_filters_cond(doctype, filter_dict.get("Bin"),
- bin_conditions, ignore_permissions=True))
-
query = """select `tabWarehouse`.name,
- CONCAT_WS(" : ", "Actual Qty", ifnull( ({sub_query}), 0) ) as actual_qty
- from `tabWarehouse`
+ CONCAT_WS(" : ", "Actual Qty", ifnull(round(`tabBin`.actual_qty, 2), 0 )) actual_qty
+ from `tabWarehouse` left join `tabBin`
+ on `tabBin`.warehouse = `tabWarehouse`.name {bin_conditions}
where
- `tabWarehouse`.`{key}` like {txt}
+ `tabWarehouse`.`{key}` like {txt}
{fcond} {mcond}
- order by
- `tabWarehouse`.name desc
+ order by ifnull(`tabBin`.actual_qty, 0) desc
limit
{start}, {page_len}
""".format(
- sub_query=sub_query,
+ bin_conditions=get_filters_cond(doctype, filter_dict.get("Bin"),bin_conditions, ignore_permissions=True),
key=searchfield,
fcond=get_filters_cond(doctype, filter_dict.get("Warehouse"), conditions),
mcond=get_match_cond(doctype),
diff --git a/erpnext/controllers/sales_and_purchase_return.py b/erpnext/controllers/sales_and_purchase_return.py
index 3f127a2..a03dee1 100644
--- a/erpnext/controllers/sales_and_purchase_return.py
+++ b/erpnext/controllers/sales_and_purchase_return.py
@@ -281,6 +281,8 @@
target_doc.rejected_warehouse = source_doc.rejected_warehouse
target_doc.po_detail = source_doc.po_detail
target_doc.pr_detail = source_doc.pr_detail
+ target_doc.purchase_invoice_item = source_doc.name
+
elif doctype == "Delivery Note":
target_doc.against_sales_order = source_doc.against_sales_order
target_doc.against_sales_invoice = source_doc.against_sales_invoice
@@ -296,6 +298,7 @@
target_doc.so_detail = source_doc.so_detail
target_doc.dn_detail = source_doc.dn_detail
target_doc.expense_account = source_doc.expense_account
+ target_doc.sales_invoice_item = source_doc.name
if default_warehouse_for_sales_return:
target_doc.warehouse = default_warehouse_for_sales_return
diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py
index b696ac3..17f3ae5 100644
--- a/erpnext/controllers/selling_controller.py
+++ b/erpnext/controllers/selling_controller.py
@@ -217,7 +217,9 @@
'target_warehouse': p.target_warehouse,
'company': self.company,
'voucher_type': self.doctype,
- 'allow_zero_valuation': d.allow_zero_valuation_rate
+ 'allow_zero_valuation': d.allow_zero_valuation_rate,
+ 'sales_invoice_item': d.get("sales_invoice_item"),
+ 'delivery_note_item': d.get("dn_detail")
}))
else:
il.append(frappe._dict({
@@ -233,7 +235,9 @@
'target_warehouse': d.target_warehouse,
'company': self.company,
'voucher_type': self.doctype,
- 'allow_zero_valuation': d.allow_zero_valuation_rate
+ 'allow_zero_valuation': d.allow_zero_valuation_rate,
+ 'sales_invoice_item': d.get("sales_invoice_item"),
+ 'delivery_note_item': d.get("dn_detail")
}))
return il
@@ -302,7 +306,11 @@
d.conversion_factor = get_conversion_factor(d.item_code, d.uom).get("conversion_factor") or 1.0
return_rate = 0
if cint(self.is_return) and self.return_against and self.docstatus==1:
- return_rate = self.get_incoming_rate_for_return(d.item_code, self.return_against)
+ against_document_no = (d.get("sales_invoice_item")
+ if self.doctype == "Sales Invoice" else d.get("delivery_note_item"))
+
+ return_rate = self.get_incoming_rate_for_return(d.item_code,
+ self.return_against, against_document_no)
# On cancellation or if return entry submission, make stock ledger entry for
# target warehouse first, to update serial no values properly
diff --git a/erpnext/controllers/stock_controller.py b/erpnext/controllers/stock_controller.py
index e8483da..394883d 100644
--- a/erpnext/controllers/stock_controller.py
+++ b/erpnext/controllers/stock_controller.py
@@ -301,14 +301,19 @@
return serialized_items
- def get_incoming_rate_for_return(self, item_code, against_document):
+ def get_incoming_rate_for_return(self, item_code, against_document, against_document_no=None):
incoming_rate = 0.0
+ cond = ''
if against_document and item_code:
+ if against_document_no:
+ cond = " and voucher_detail_no = %s" %(frappe.db.escape(against_document_no))
+
incoming_rate = frappe.db.sql("""select abs(stock_value_difference / actual_qty)
from `tabStock Ledger Entry`
where voucher_type = %s and voucher_no = %s
- and item_code = %s limit 1""",
+ and item_code = %s {0} limit 1""".format(cond),
(self.doctype, against_document, item_code))
+
incoming_rate = incoming_rate[0][0] if incoming_rate else 0.0
return incoming_rate
diff --git a/erpnext/controllers/taxes_and_totals.py b/erpnext/controllers/taxes_and_totals.py
index 2a14be8..92cfdb7 100644
--- a/erpnext/controllers/taxes_and_totals.py
+++ b/erpnext/controllers/taxes_and_totals.py
@@ -9,6 +9,7 @@
from erpnext.controllers.accounts_controller import validate_conversion_rate, \
validate_taxes_and_charges, validate_inclusive_tax
from erpnext.stock.get_item_details import _get_item_tax_template
+from erpnext.accounts.doctype.pricing_rule.utils import get_applied_pricing_rules
class calculate_taxes_and_totals(object):
def __init__(self, doc):
@@ -209,7 +210,7 @@
elif tax.charge_type == "On Previous Row Total":
current_tax_fraction = (tax_rate / 100.0) * \
self.doc.get("taxes")[cint(tax.row_id) - 1].grand_total_fraction_for_current_item
-
+
elif tax.charge_type == "On Item Quantity":
inclusive_tax_amount_per_qty = flt(tax_rate)
@@ -607,7 +608,7 @@
base_rate_with_margin = 0.0
if item.price_list_rate:
if item.pricing_rules and not self.doc.ignore_pricing_rule:
- for d in json.loads(item.pricing_rules):
+ for d in get_applied_pricing_rules(item.pricing_rules):
pricing_rule = frappe.get_cached_doc('Pricing Rule', d)
if (pricing_rule.margin_type == 'Amount' and pricing_rule.currency == self.doc.currency)\
diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py
index e152850..6096053 100644
--- a/erpnext/crm/doctype/opportunity/opportunity.py
+++ b/erpnext/crm/doctype/opportunity/opportunity.py
@@ -325,7 +325,7 @@
doc.save()
@frappe.whitelist()
-def make_opportunity_from_communication(communication, ignore_communication_links=False):
+def make_opportunity_from_communication(communication, company, ignore_communication_links=False):
from erpnext.crm.doctype.lead.lead import make_lead_from_communication
doc = frappe.get_doc("Communication", communication)
@@ -337,6 +337,7 @@
opportunity = frappe.get_doc({
"doctype": "Opportunity",
+ "company": company,
"opportunity_from": opportunity_from,
"party_name": lead
}).insert(ignore_permissions=True)
diff --git a/erpnext/crm/doctype/social_media_post/social_media_post.js b/erpnext/crm/doctype/social_media_post/social_media_post.js
index 3a14f2d..0ce8b44 100644
--- a/erpnext/crm/doctype/social_media_post/social_media_post.js
+++ b/erpnext/crm/doctype/social_media_post/social_media_post.js
@@ -30,14 +30,14 @@
let color = frm.doc.twitter_post_id ? "green" : "red";
let status = frm.doc.twitter_post_id ? "Posted" : "Not Posted";
html += `<div class="col-xs-6">
- <span class="indicator whitespace-nowrap ${color}"><span class="hidden-xs">Twitter : ${status} </span></span>
+ <span class="indicator whitespace-nowrap ${color}"><span>Twitter : ${status} </span></span>
</div>` ;
}
if (frm.doc.linkedin){
let color = frm.doc.linkedin_post_id ? "green" : "red";
let status = frm.doc.linkedin_post_id ? "Posted" : "Not Posted";
html += `<div class="col-xs-6">
- <span class="indicator whitespace-nowrap ${color}"><span class="hidden-xs">LinkedIn : ${status} </span></span>
+ <span class="indicator whitespace-nowrap ${color}"><span>LinkedIn : ${status} </span></span>
</div>` ;
}
html = `<div class="row">${html}</div>`;
diff --git a/erpnext/crm/report/lead_details/lead_details.js b/erpnext/crm/report/lead_details/lead_details.js
new file mode 100644
index 0000000..f92070d
--- /dev/null
+++ b/erpnext/crm/report/lead_details/lead_details.js
@@ -0,0 +1,52 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Lead Details"] = {
+ "filters": [
+ {
+ "fieldname":"company",
+ "label": __("Company"),
+ "fieldtype": "Link",
+ "options": "Company",
+ "default": frappe.defaults.get_user_default("Company"),
+ "reqd": 1
+ },
+ {
+ "fieldname":"from_date",
+ "label": __("From Date"),
+ "fieldtype": "Date",
+ "default": frappe.datetime.add_months(frappe.datetime.get_today(), -12),
+ "reqd": 1
+ },
+ {
+ "fieldname":"to_date",
+ "label": __("To Date"),
+ "fieldtype": "Date",
+ "default": frappe.datetime.get_today(),
+ "reqd": 1
+ },
+ {
+ "fieldname":"status",
+ "label": __("Status"),
+ "fieldtype": "Select",
+ options: [
+ { "value": "Lead", "label": __("Lead") },
+ { "value": "Open", "label": __("Open") },
+ { "value": "Replied", "label": __("Replied") },
+ { "value": "Opportunity", "label": __("Opportunity") },
+ { "value": "Quotation", "label": __("Quotation") },
+ { "value": "Lost Quotation", "label": __("Lost Quotation") },
+ { "value": "Interested", "label": __("Interested") },
+ { "value": "Converted", "label": __("Converted") },
+ { "value": "Do Not Contact", "label": __("Do Not Contact") },
+ ],
+ },
+ {
+ "fieldname":"territory",
+ "label": __("Territory"),
+ "fieldtype": "Link",
+ "options": "Territory",
+ }
+ ]
+};
\ No newline at end of file
diff --git a/erpnext/crm/report/lead_details/lead_details.json b/erpnext/crm/report/lead_details/lead_details.json
index cdeb6bb..7871d08 100644
--- a/erpnext/crm/report/lead_details/lead_details.json
+++ b/erpnext/crm/report/lead_details/lead_details.json
@@ -7,16 +7,15 @@
"doctype": "Report",
"idx": 3,
"is_standard": "Yes",
- "modified": "2020-01-22 16:51:56.591110",
+ "modified": "2020-07-26 23:59:49.897577",
"modified_by": "Administrator",
"module": "CRM",
"name": "Lead Details",
"owner": "Administrator",
"prepared_report": 0,
- "query": "SELECT\n `tabLead`.name as \"Lead Id:Link/Lead:120\",\n `tabLead`.lead_name as \"Lead Name::120\",\n\t`tabLead`.company_name as \"Company Name::120\",\n\t`tabLead`.status as \"Status::120\",\n\tconcat_ws(', ', \n\t\ttrim(',' from `tabAddress`.address_line1), \n\t\ttrim(',' from tabAddress.address_line2)\n\t) as 'Address::180',\n\t`tabAddress`.state as \"State::100\",\n\t`tabAddress`.pincode as \"Pincode::70\",\n\t`tabAddress`.country as \"Country::100\",\n\t`tabLead`.phone as \"Phone::100\",\n\t`tabLead`.mobile_no as \"Mobile No::100\",\n\t`tabLead`.email_id as \"Email Id::120\",\n\t`tabLead`.lead_owner as \"Lead Owner::120\",\n\t`tabLead`.source as \"Source::120\",\n\t`tabLead`.territory as \"Territory::120\",\n\t`tabLead`.notes as \"Notes::360\",\n `tabLead`.owner as \"Owner:Link/User:120\"\nFROM\n\t`tabLead`\n\tleft join `tabDynamic Link` on (\n\t\t`tabDynamic Link`.link_name=`tabLead`.name \n\t\tand `tabDynamic Link`.parenttype = 'Address'\n\t)\n\tleft join `tabAddress` on (\n\t\t`tabAddress`.name=`tabDynamic Link`.parent\n\t)\nWHERE\n\t`tabLead`.docstatus<2\nORDER BY\n\t`tabLead`.name asc",
"ref_doctype": "Lead",
"report_name": "Lead Details",
- "report_type": "Query Report",
+ "report_type": "Script Report",
"roles": [
{
"role": "Sales User"
diff --git a/erpnext/crm/report/lead_details/lead_details.py b/erpnext/crm/report/lead_details/lead_details.py
new file mode 100644
index 0000000..eeaaec2
--- /dev/null
+++ b/erpnext/crm/report/lead_details/lead_details.py
@@ -0,0 +1,158 @@
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe import _
+import frappe
+
+def execute(filters=None):
+ columns, data = get_columns(), get_data(filters)
+ return columns, data
+
+def get_columns():
+ columns = [
+ {
+ "label": _("Lead"),
+ "fieldname": "name",
+ "fieldtype": "Link",
+ "options": "Lead",
+ "width": 150,
+ },
+ {
+ "label": _("Lead Name"),
+ "fieldname": "lead_name",
+ "fieldtype": "Data",
+ "width": 120
+ },
+ {
+ "fieldname":"status",
+ "label": _("Status"),
+ "fieldtype": "Data",
+ "width": 100
+ },
+ {
+ "fieldname":"lead_owner",
+ "label": _("Lead Owner"),
+ "fieldtype": "Link",
+ "options": "User",
+ "width": 100
+ },
+ {
+ "label": _("Territory"),
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "options": "Territory",
+ "width": 100
+ },
+ {
+ "label": _("Source"),
+ "fieldname": "source",
+ "fieldtype": "Data",
+ "width": 120
+ },
+ {
+ "label": _("Email"),
+ "fieldname": "email_id",
+ "fieldtype": "Data",
+ "width": 120
+ },
+ {
+ "label": _("Mobile"),
+ "fieldname": "mobile_no",
+ "fieldtype": "Data",
+ "width": 120
+ },
+ {
+ "label": _("Phone"),
+ "fieldname": "phone",
+ "fieldtype": "Data",
+ "width": 120
+ },
+ {
+ "label": _("Owner"),
+ "fieldname": "owner",
+ "fieldtype": "Link",
+ "options": "user",
+ "width": 120
+ },
+ {
+ "label": _("Company"),
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "options": "Company",
+ "width": 120
+ },
+ {
+ "fieldname":"address",
+ "label": _("Address"),
+ "fieldtype": "Data",
+ "width": 130
+ },
+ {
+ "fieldname":"state",
+ "label": _("State"),
+ "fieldtype": "Data",
+ "width": 100
+ },
+ {
+ "fieldname":"pincode",
+ "label": _("Postal Code"),
+ "fieldtype": "Data",
+ "width": 90
+ },
+ {
+ "fieldname":"country",
+ "label": _("Country"),
+ "fieldtype": "Link",
+ "options": "Country",
+ "width": 100
+ },
+
+ ]
+ return columns
+
+def get_data(filters):
+ return frappe.db.sql("""
+ SELECT
+ `tabLead`.name,
+ `tabLead`.lead_name,
+ `tabLead`.status,
+ `tabLead`.lead_owner,
+ `tabLead`.territory,
+ `tabLead`.source,
+ `tabLead`.email_id,
+ `tabLead`.mobile_no,
+ `tabLead`.phone,
+ `tabLead`.owner,
+ `tabLead`.company,
+ concat_ws(', ',
+ trim(',' from `tabAddress`.address_line1),
+ trim(',' from tabAddress.address_line2)
+ ) AS address,
+ `tabAddress`.state,
+ `tabAddress`.pincode,
+ `tabAddress`.country
+ FROM
+ `tabLead` left join `tabDynamic Link` on (
+ `tabLead`.name = `tabDynamic Link`.link_name and
+ `tabDynamic Link`.parenttype = 'Address')
+ left join `tabAddress` on (
+ `tabAddress`.name=`tabDynamic Link`.parent)
+ WHERE
+ company = %(company)s
+ AND `tabLead`.creation BETWEEN %(from_date)s AND %(to_date)s
+ {conditions}
+ ORDER BY
+ `tabLead`.creation asc """.format(conditions=get_conditions(filters)), filters, as_dict=1)
+
+def get_conditions(filters) :
+ conditions = []
+
+ if filters.get("territory"):
+ conditions.append(" and `tabLead`.territory=%(territory)s")
+
+ if filters.get("status"):
+ conditions.append(" and `tabLead`.status=%(status)s")
+
+ return " ".join(conditions) if conditions else ""
+
diff --git a/erpnext/crm/report/lost_opportunity/lost_opportunity.js b/erpnext/crm/report/lost_opportunity/lost_opportunity.js
new file mode 100644
index 0000000..d79f8c8
--- /dev/null
+++ b/erpnext/crm/report/lost_opportunity/lost_opportunity.js
@@ -0,0 +1,67 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+/* eslint-disable */
+
+frappe.query_reports["Lost Opportunity"] = {
+ "filters": [
+ {
+ "fieldname":"company",
+ "label": __("Company"),
+ "fieldtype": "Link",
+ "options": "Company",
+ "default": frappe.defaults.get_user_default("Company"),
+ "reqd": 1
+ },
+ {
+ "fieldname":"from_date",
+ "label": __("From Date"),
+ "fieldtype": "Date",
+ "default": frappe.datetime.add_months(frappe.datetime.get_today(), -12),
+ "reqd": 1
+ },
+ {
+ "fieldname":"to_date",
+ "label": __("To Date"),
+ "fieldtype": "Date",
+ "default": frappe.datetime.get_today(),
+ "reqd": 1
+ },
+ {
+ "fieldname":"lost_reason",
+ "label": __("Lost Reason"),
+ "fieldtype": "Link",
+ "options": "Opportunity Lost Reason"
+ },
+ {
+ "fieldname":"territory",
+ "label": __("Territory"),
+ "fieldtype": "Link",
+ "options": "Territory"
+ },
+ {
+ "fieldname":"opportunity_from",
+ "label": __("Opportunity From"),
+ "fieldtype": "Link",
+ "options": "DocType",
+ "get_query": function() {
+ return {
+ "filters": {
+ "name": ["in", ["Customer", "Lead"]],
+ }
+ }
+ }
+ },
+ {
+ "fieldname":"party_name",
+ "label": __("Party"),
+ "fieldtype": "Dynamic Link",
+ "options": "opportunity_from"
+ },
+ {
+ "fieldname":"contact_by",
+ "label": __("Next Contact By"),
+ "fieldtype": "Link",
+ "options": "User"
+ },
+ ]
+};
\ No newline at end of file
diff --git a/erpnext/crm/report/lost_opportunity/lost_opportunity.json b/erpnext/crm/report/lost_opportunity/lost_opportunity.json
index e7c5068..e7a8e12 100644
--- a/erpnext/crm/report/lost_opportunity/lost_opportunity.json
+++ b/erpnext/crm/report/lost_opportunity/lost_opportunity.json
@@ -1,13 +1,14 @@
{
"add_total_row": 0,
"creation": "2018-12-31 16:30:57.188837",
+ "disable_prepared_report": 0,
"disabled": 0,
"docstatus": 0,
"doctype": "Report",
"idx": 0,
"is_standard": "Yes",
"json": "{\"order_by\": \"`tabOpportunity`.`modified` desc\", \"filters\": [[\"Opportunity\", \"status\", \"=\", \"Lost\"]], \"fields\": [[\"name\", \"Opportunity\"], [\"opportunity_from\", \"Opportunity\"], [\"party_name\", \"Opportunity\"], [\"customer_name\", \"Opportunity\"], [\"opportunity_type\", \"Opportunity\"], [\"status\", \"Opportunity\"], [\"contact_by\", \"Opportunity\"], [\"docstatus\", \"Opportunity\"], [\"lost_reason\", \"Lost Reason Detail\"]], \"add_totals_row\": 0, \"add_total_row\": 0, \"page_length\": 20}",
- "modified": "2019-06-26 16:33:08.083618",
+ "modified": "2020-07-29 15:49:02.848845",
"modified_by": "Administrator",
"module": "CRM",
"name": "Lost Opportunity",
@@ -15,7 +16,7 @@
"prepared_report": 0,
"ref_doctype": "Opportunity",
"report_name": "Lost Opportunity",
- "report_type": "Report Builder",
+ "report_type": "Script Report",
"roles": [
{
"role": "Sales User"
diff --git a/erpnext/crm/report/lost_opportunity/lost_opportunity.py b/erpnext/crm/report/lost_opportunity/lost_opportunity.py
new file mode 100644
index 0000000..1aa4afe
--- /dev/null
+++ b/erpnext/crm/report/lost_opportunity/lost_opportunity.py
@@ -0,0 +1,131 @@
+# Copyright (c) 2020, Frappe Technologies Pvt. Ltd. and contributors
+# For license information, please see license.txt
+
+from __future__ import unicode_literals
+from frappe import _
+import frappe
+
+def execute(filters=None):
+ columns, data = get_columns(), get_data(filters)
+ return columns, data
+
+def get_columns():
+ columns = [
+ {
+ "label": _("Opportunity"),
+ "fieldname": "name",
+ "fieldtype": "Link",
+ "options": "Opportunity",
+ "width": 170,
+ },
+ {
+ "label": _("Opportunity From"),
+ "fieldname": "opportunity_from",
+ "fieldtype": "Link",
+ "options": "DocType",
+ "width": 130
+ },
+ {
+ "label": _("Party"),
+ "fieldname":"party_name",
+ "fieldtype": "Dynamic Link",
+ "options": "opportunity_from",
+ "width": 160
+ },
+ {
+ "label": _("Customer/Lead Name"),
+ "fieldname":"customer_name",
+ "fieldtype": "Data",
+ "width": 150
+ },
+ {
+ "label": _("Opportunity Type"),
+ "fieldname": "opportunity_type",
+ "fieldtype": "Data",
+ "width": 130
+ },
+ {
+ "label": _("Lost Reasons"),
+ "fieldname": "lost_reason",
+ "fieldtype": "Data",
+ "width": 220
+ },
+ {
+ "label": _("Sales Stage"),
+ "fieldname": "sales_stage",
+ "fieldtype": "Link",
+ "options": "Sales Stage",
+ "width": 150
+ },
+ {
+ "label": _("Territory"),
+ "fieldname": "territory",
+ "fieldtype": "Link",
+ "options": "Territory",
+ "width": 150
+ },
+ {
+ "label": _("Next Contact By"),
+ "fieldname": "contact_by",
+ "fieldtype": "Link",
+ "options": "User",
+ "width": 150
+ }
+ ]
+ return columns
+
+def get_data(filters):
+ return frappe.db.sql("""
+ SELECT
+ `tabOpportunity`.name,
+ `tabOpportunity`.opportunity_from,
+ `tabOpportunity`.party_name,
+ `tabOpportunity`.customer_name,
+ `tabOpportunity`.opportunity_type,
+ `tabOpportunity`.contact_by,
+ GROUP_CONCAT(`tabOpportunity Lost Reason Detail`.lost_reason separator ', ') lost_reason,
+ `tabOpportunity`.sales_stage,
+ `tabOpportunity`.territory
+ FROM
+ `tabOpportunity`
+ {join}
+ WHERE
+ `tabOpportunity`.status = 'Lost' and `tabOpportunity`.company = %(company)s
+ AND `tabOpportunity`.modified BETWEEN %(from_date)s AND %(to_date)s
+ {conditions}
+ GROUP BY
+ `tabOpportunity`.name
+ ORDER BY
+ `tabOpportunity`.creation asc """.format(conditions=get_conditions(filters), join=get_join(filters)), filters, as_dict=1)
+
+
+def get_conditions(filters):
+ conditions = []
+
+ if filters.get("territory"):
+ conditions.append(" and `tabOpportunity`.territory=%(territory)s")
+
+ if filters.get("opportunity_from"):
+ conditions.append(" and `tabOpportunity`.opportunity_from=%(opportunity_from)s")
+
+ if filters.get("party_name"):
+ conditions.append(" and `tabOpportunity`.party_name=%(party_name)s")
+
+ if filters.get("contact_by"):
+ conditions.append(" and `tabOpportunity`.contact_by=%(contact_by)s")
+
+ return " ".join(conditions) if conditions else ""
+
+def get_join(filters):
+ join = """LEFT JOIN `tabOpportunity Lost Reason Detail`
+ ON `tabOpportunity Lost Reason Detail`.parenttype = 'Opportunity' and
+ `tabOpportunity Lost Reason Detail`.parent = `tabOpportunity`.name"""
+
+ if filters.get("lost_reason"):
+ join = """JOIN `tabOpportunity Lost Reason Detail`
+ ON `tabOpportunity Lost Reason Detail`.parenttype = 'Opportunity' and
+ `tabOpportunity Lost Reason Detail`.parent = `tabOpportunity`.name and
+ `tabOpportunity Lost Reason Detail`.lost_reason = '{0}'
+ """.format(filters.get("lost_reason"))
+
+ return join
\ No newline at end of file
diff --git a/erpnext/erpnext_integrations/desk_page/erpnext_integrations/erpnext_integrations.json b/erpnext/erpnext_integrations/desk_page/erpnext_integrations/erpnext_integrations.json
new file mode 100644
index 0000000..8dcc77d
--- /dev/null
+++ b/erpnext/erpnext_integrations/desk_page/erpnext_integrations/erpnext_integrations.json
@@ -0,0 +1,40 @@
+{
+ "cards": [
+ {
+ "hidden": 0,
+ "label": "Marketplace",
+ "links": "[\n {\n \"description\": \"Woocommerce marketplace settings\",\n \"label\": \"Woocommerce Settings\",\n \"name\": \"Woocommerce Settings\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Amazon MWS settings\",\n \"label\": \"Amazon MWS Settings\",\n \"name\": \"Amazon MWS Settings\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Shopify settings\",\n \"label\": \"Shopify Settings\",\n \"name\": \"Shopify Settings\",\n \"type\": \"doctype\"\n }\n]"
+ },
+ {
+ "hidden": 0,
+ "label": "Payments",
+ "links": "[\n {\n \"description\": \"GoCardless payment gateway settings\",\n \"label\": \"GoCardless Settings\",\n \"name\": \"GoCardless Settings\",\n \"type\": \"doctype\"\n }\n]"
+ },
+ {
+ "hidden": 0,
+ "label": "Settings",
+ "links": "[\n {\n \"description\": \"Plaid settings\",\n \"label\": \"Plaid Settings\",\n \"name\": \"Plaid Settings\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Exotel settings\",\n \"label\": \"Exotel Settings\",\n \"name\": \"Exotel Settings\",\n \"type\": \"doctype\"\n }\n]"
+ }
+ ],
+ "category": "Modules",
+ "charts": [],
+ "creation": "2020-08-20 19:30:48.138801",
+ "developer_mode_only": 0,
+ "disable_user_customization": 0,
+ "docstatus": 0,
+ "doctype": "Desk Page",
+ "extends": "Integrations",
+ "extends_another_page": 1,
+ "hide_custom": 1,
+ "idx": 0,
+ "is_standard": 1,
+ "label": "ERPNext Integrations",
+ "modified": "2020-08-23 16:30:51.494655",
+ "modified_by": "Administrator",
+ "module": "ERPNext Integrations",
+ "name": "ERPNext Integrations",
+ "owner": "Administrator",
+ "pin_to_bottom": 0,
+ "pin_to_top": 0,
+ "shortcuts": []
+}
\ No newline at end of file
diff --git a/erpnext/healthcare/doctype/clinical_procedure/test_clinical_procedure.py b/erpnext/healthcare/doctype/clinical_procedure/test_clinical_procedure.py
index 207351f..4ee5f6b 100644
--- a/erpnext/healthcare/doctype/clinical_procedure/test_clinical_procedure.py
+++ b/erpnext/healthcare/doctype/clinical_procedure/test_clinical_procedure.py
@@ -7,6 +7,8 @@
import frappe
from erpnext.healthcare.doctype.patient_appointment.test_patient_appointment import create_healthcare_docs, create_clinical_procedure_template
+test_dependencies = ['Item']
+
class TestClinicalProcedure(unittest.TestCase):
def test_procedure_template_item(self):
patient, medical_department, practitioner = create_healthcare_docs()
diff --git a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
index f7ed31b..2d6b645 100644
--- a/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
+++ b/erpnext/healthcare/doctype/patient_appointment/patient_appointment.js
@@ -226,7 +226,9 @@
primary_action_label: __('Book'),
primary_action: function() {
frm.set_value('appointment_time', selected_slot);
- frm.set_value('duration', duration);
+ if (!frm.doc.duration) {
+ frm.set_value('duration', duration);
+ }
frm.set_value('practitioner', d.get_value('practitioner'));
frm.set_value('department', d.get_value('department'));
frm.set_value('appointment_date', d.get_value('appointment_date'));
diff --git a/erpnext/hr/doctype/department/department.json b/erpnext/hr/doctype/department/department.json
index a54c1d1..dcb6a74 100644
--- a/erpnext/hr/doctype/department/department.json
+++ b/erpnext/hr/doctype/department/department.json
@@ -17,10 +17,10 @@
"payroll_cost_center",
"column_break_9",
"leave_block_list",
- "leave_section",
+ "approvers",
"leave_approvers",
- "expense_section",
"expense_approvers",
+ "shift_request_approver",
"lft",
"rgt",
"old_parent"
@@ -33,14 +33,18 @@
"label": "Department",
"oldfieldname": "department_name",
"oldfieldtype": "Data",
- "reqd": 1
+ "reqd": 1,
+ "show_days": 1,
+ "show_seconds": 1
},
{
"fieldname": "parent_department",
"fieldtype": "Link",
"in_list_view": 1,
"label": "Parent Department",
- "options": "Department"
+ "options": "Department",
+ "show_days": 1,
+ "show_seconds": 1
},
{
"fieldname": "company",
@@ -48,7 +52,9 @@
"in_standard_filter": 1,
"label": "Company",
"options": "Company",
- "reqd": 1
+ "reqd": 1,
+ "show_days": 1,
+ "show_seconds": 1
},
{
"bold": 1,
@@ -56,17 +62,23 @@
"fieldname": "is_group",
"fieldtype": "Check",
"in_list_view": 1,
- "label": "Is Group"
+ "label": "Is Group",
+ "show_days": 1,
+ "show_seconds": 1
},
{
"default": "0",
"fieldname": "disabled",
"fieldtype": "Check",
- "label": "Disabled"
+ "label": "Disabled",
+ "show_days": 1,
+ "show_seconds": 1
},
{
"fieldname": "section_break_4",
- "fieldtype": "Section Break"
+ "fieldtype": "Section Break",
+ "show_days": 1,
+ "show_seconds": 1
},
{
"description": "Days for which Holidays are blocked for this department.",
@@ -74,31 +86,25 @@
"fieldtype": "Link",
"in_list_view": 1,
"label": "Leave Block List",
- "options": "Leave Block List"
+ "options": "Leave Block List",
+ "show_days": 1,
+ "show_seconds": 1
},
{
- "fieldname": "leave_section",
- "fieldtype": "Section Break",
- "label": "Leave Approvers"
- },
- {
- "description": "The first Leave Approver in the list will be set as the default Leave Approver.",
"fieldname": "leave_approvers",
"fieldtype": "Table",
"label": "Leave Approver",
- "options": "Department Approver"
+ "options": "Department Approver",
+ "show_days": 1,
+ "show_seconds": 1
},
{
- "fieldname": "expense_section",
- "fieldtype": "Section Break",
- "label": "Expense Approvers"
- },
- {
- "description": "The first Expense Approver in the list will be set as the default Expense Approver.",
"fieldname": "expense_approvers",
"fieldtype": "Table",
"label": "Expense Approver",
- "options": "Department Approver"
+ "options": "Department Approver",
+ "show_days": 1,
+ "show_seconds": 1
},
{
"fieldname": "lft",
@@ -106,7 +112,9 @@
"hidden": 1,
"label": "lft",
"print_hide": 1,
- "read_only": 1
+ "read_only": 1,
+ "show_days": 1,
+ "show_seconds": 1
},
{
"fieldname": "rgt",
@@ -114,7 +122,9 @@
"hidden": 1,
"label": "rgt",
"print_hide": 1,
- "read_only": 1
+ "read_only": 1,
+ "show_days": 1,
+ "show_seconds": 1
},
{
"fieldname": "old_parent",
@@ -122,28 +132,52 @@
"hidden": 1,
"ignore_user_permissions": 1,
"label": "Old Parent",
- "print_hide": 1
+ "print_hide": 1,
+ "show_days": 1,
+ "show_seconds": 1
},
{
"fieldname": "column_break_3",
- "fieldtype": "Column Break"
+ "fieldtype": "Column Break",
+ "show_days": 1,
+ "show_seconds": 1
},
{
"fieldname": "payroll_cost_center",
"fieldtype": "Link",
"label": "Payroll Cost Center",
- "options": "Cost Center"
+ "options": "Cost Center",
+ "show_days": 1,
+ "show_seconds": 1
},
{
"fieldname": "column_break_9",
- "fieldtype": "Column Break"
+ "fieldtype": "Column Break",
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "description": "The first Approver in the list will be set as the default Approver.",
+ "fieldname": "approvers",
+ "fieldtype": "Section Break",
+ "label": "Approvers",
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "fieldname": "shift_request_approver",
+ "fieldtype": "Table",
+ "label": "Shift Request Approver",
+ "options": "Department Approver",
+ "show_days": 1,
+ "show_seconds": 1
}
],
"icon": "fa fa-sitemap",
"idx": 1,
"is_tree": 1,
"links": [],
- "modified": "2020-05-05 18:49:28.503931",
+ "modified": "2020-06-23 15:42:00.563272",
"modified_by": "Administrator",
"module": "HR",
"name": "Department",
diff --git a/erpnext/hr/doctype/department_approver/department_approver.py b/erpnext/hr/doctype/department_approver/department_approver.py
index afd54b8..9b2de0e 100644
--- a/erpnext/hr/doctype/department_approver/department_approver.py
+++ b/erpnext/hr/doctype/department_approver/department_approver.py
@@ -15,12 +15,12 @@
def get_approvers(doctype, txt, searchfield, start, page_len, filters):
if not filters.get("employee"):
- frappe.throw(_("Please select Employee Record first."))
+ frappe.throw(_("Please select Employee first."))
approvers = []
department_details = {}
department_list = []
- employee = frappe.get_value("Employee", filters.get("employee"), ["department", "leave_approver", "expense_approver"], as_dict=True)
+ employee = frappe.get_value("Employee", filters.get("employee"), ["department", "leave_approver", "expense_approver", "shift_request_approver"], as_dict=True)
employee_department = filters.get("department") or employee.department
if employee_department:
@@ -37,13 +37,18 @@
if filters.get("doctype") == "Expense Claim" and employee.expense_approver:
approvers.append(frappe.db.get_value("User", employee.expense_approver, ['name', 'first_name', 'last_name']))
+ if filters.get("doctype") == "Shift Request" and employee.shift_request_approver:
+ approvers.append(frappe.db.get_value("User", employee.shift_request_approver, ['name', 'first_name', 'last_name']))
if filters.get("doctype") == "Leave Application":
parentfield = "leave_approvers"
field_name = "Leave Approver"
- else:
+ elif filters.get("doctype") == "Expense Claim":
parentfield = "expense_approvers"
field_name = "Expense Approver"
+ elif filters.get("doctype") == "Shift Request":
+ parentfield = "shift_request_approver"
+ field_name = "Shift Request Approver"
if department_list:
for d in department_list:
approvers += frappe.db.sql("""select user.name, user.first_name, user.last_name from
diff --git a/erpnext/hr/doctype/employee/employee.json b/erpnext/hr/doctype/employee/employee.json
index f2afe06..8c02e4f 100644
--- a/erpnext/hr/doctype/employee/employee.json
+++ b/erpnext/hr/doctype/employee/employee.json
@@ -51,10 +51,14 @@
"column_break_31",
"grade",
"branch",
+ "approvers_section",
+ "expense_approver",
+ "leave_approver",
+ "column_break_45",
+ "shift_request_approver",
"attendance_and_leave_details",
"leave_policy",
"attendance_device_id",
- "leave_approver",
"column_break_44",
"holiday_list",
"default_shift",
@@ -62,7 +66,6 @@
"salary_mode",
"payroll_cost_center",
"column_break_52",
- "expense_approver",
"bank_name",
"bank_ac_no",
"health_insurance_section",
@@ -806,14 +809,37 @@
"fieldname": "expense_approver",
"fieldtype": "Link",
"label": "Expense Approver",
- "options": "User"
+ "options": "User",
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "fieldname": "approvers_section",
+ "fieldtype": "Section Break",
+ "label": "Approvers",
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "fieldname": "column_break_45",
+ "fieldtype": "Column Break",
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "fieldname": "shift_request_approver",
+ "fieldtype": "Link",
+ "label": "Shift Request Approver",
+ "options": "User",
+ "show_days": 1,
+ "show_seconds": 1
}
],
"icon": "fa fa-user",
"idx": 24,
"image_field": "image",
"links": [],
- "modified": "2020-07-03 21:28:04.109189",
+ "modified": "2020-07-28 01:36:04.109189",
"modified_by": "Administrator",
"module": "HR",
"name": "Employee",
diff --git a/erpnext/hr/doctype/expense_claim/expense_claim_list.js b/erpnext/hr/doctype/expense_claim/expense_claim_list.js
index 6195ad4..9bafc18 100644
--- a/erpnext/hr/doctype/expense_claim/expense_claim_list.js
+++ b/erpnext/hr/doctype/expense_claim/expense_claim_list.js
@@ -1,5 +1,5 @@
frappe.listview_settings['Expense Claim'] = {
- add_fields: ["total_claimed_amount", "docstatus"],
+ add_fields: ["total_claimed_amount", "docstatus", "company"],
get_indicator: function(doc) {
if(doc.status == "Paid") {
return [__("Paid"), "green", "status,=,Paid"];
diff --git a/erpnext/hr/doctype/job_offer/job_offer.py b/erpnext/hr/doctype/job_offer/job_offer.py
index e7e1a37..c397a3f 100644
--- a/erpnext/hr/doctype/job_offer/job_offer.py
+++ b/erpnext/hr/doctype/job_offer/job_offer.py
@@ -3,6 +3,7 @@
from __future__ import unicode_literals
import frappe
+from frappe.utils import cint
from frappe.model.document import Document
from frappe.model.mapper import get_mapped_doc
from frappe import _
@@ -24,8 +25,12 @@
check_vacancies = frappe.get_single("HR Settings").check_vacancies
if staffing_plan and check_vacancies:
job_offers = self.get_job_offer(staffing_plan.from_date, staffing_plan.to_date)
- if staffing_plan.vacancies - len(job_offers) <= 0:
- frappe.throw(_("There are no vacancies under staffing plan {0}").format(frappe.bold(get_link_to_form("Staffing Plan", staffing_plan.parent))))
+ if not staffing_plan.get("vacancies") or cint(staffing_plan.vacancies) - len(job_offers) <= 0:
+ error_variable = 'for ' + frappe.bold(self.designation)
+ if staffing_plan.get("parent"):
+ error_variable = frappe.bold(get_link_to_form("Staffing Plan", staffing_plan.parent))
+
+ frappe.throw(_("There are no vacancies under staffing plan {0}").format(error_variable))
def on_change(self):
update_job_applicant(self.status, self.job_applicant)
@@ -60,7 +65,7 @@
AND %s between sp.from_date and sp.to_date
""", (designation, company, offer_date), as_dict=1)
- return frappe._dict(detail[0]) if detail else None
+ return frappe._dict(detail[0]) if (detail and detail[0].parent) else None
@frappe.whitelist()
def make_employee(source_name, target_doc=None):
diff --git a/erpnext/hr/doctype/shift_assignment/shift_assignment.json b/erpnext/hr/doctype/shift_assignment/shift_assignment.json
index 72cbba8..ce2a10f 100644
--- a/erpnext/hr/doctype/shift_assignment/shift_assignment.json
+++ b/erpnext/hr/doctype/shift_assignment/shift_assignment.json
@@ -10,9 +10,11 @@
"employee",
"employee_name",
"shift_type",
+ "status",
"column_break_3",
"company",
- "date",
+ "start_date",
+ "end_date",
"shift_request",
"department",
"amended_from"
@@ -60,12 +62,6 @@
"reqd": 1
},
{
- "fieldname": "date",
- "fieldtype": "Date",
- "in_list_view": 1,
- "label": "Date"
- },
- {
"fieldname": "shift_request",
"fieldtype": "Link",
"label": "Shift Request",
@@ -80,11 +76,36 @@
"options": "Shift Assignment",
"print_hide": 1,
"read_only": 1
+ },
+ {
+ "fieldname": "start_date",
+ "fieldtype": "Date",
+ "in_list_view": 1,
+ "label": "Start Date",
+ "reqd": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "fieldname": "end_date",
+ "fieldtype": "Date",
+ "label": "End Date",
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "allow_on_submit": 1,
+ "default": "Active",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "label": "Status",
+ "options": "Active\nInactive",
+ "show_days": 1,
+ "show_seconds": 1
}
],
"is_submittable": 1,
"links": [],
- "modified": "2019-12-12 15:49:06.956901",
+ "modified": "2020-06-15 14:27:54.310773",
"modified_by": "Administrator",
"module": "HR",
"name": "Shift Assignment",
diff --git a/erpnext/hr/doctype/shift_assignment/shift_assignment.py b/erpnext/hr/doctype/shift_assignment/shift_assignment.py
index 40c78cd..f8b7334 100644
--- a/erpnext/hr/doctype/shift_assignment/shift_assignment.py
+++ b/erpnext/hr/doctype/shift_assignment/shift_assignment.py
@@ -11,38 +11,63 @@
from erpnext.hr.doctype.holiday_list.holiday_list import is_holiday
from datetime import timedelta, datetime
-class OverlapError(frappe.ValidationError): pass
-
class ShiftAssignment(Document):
def validate(self):
self.validate_overlapping_dates()
+ if self.end_date and self.end_date <= self.start_date:
+ frappe.throw(_("End Date must not be lesser than Start Date"))
+
def validate_overlapping_dates(self):
- if not self.name:
- self.name = "New Shift Assignment"
+ if not self.name:
+ self.name = "New Shift Assignment"
- d = frappe.db.sql("""
- select
- name, shift_type, date
- from `tabShift Assignment`
- where employee = %(employee)s and docstatus < 2
- and date = %(date)s
- and name != %(name)s""", {
- "employee": self.employee,
- "shift_type": self.shift_type,
- "date": self.date,
- "name": self.name
- }, as_dict = 1)
+ condition = """and (
+ end_date is null
+ or
+ %(start_date)s between start_date and end_date
+ """
- for date_overlap in d:
- if date_overlap['name']:
- self.throw_overlap_error(date_overlap)
+ if self.end_date:
+ condition += """ or
+ %(end_date)s between start_date and end_date
+ or
+ start_date between %(start_date)s and %(end_date)s
+ ) """
+ else:
+ condition += """ ) """
- def throw_overlap_error(self, d):
- msg = _("Employee {0} has already applied for {1} on {2} : ").format(self.employee,
- d['shift_type'], formatdate(d['date'])) \
- + """ <b><a href="#Form/Shift Assignment/{0}">{0}</a></b>""".format(d["name"])
- frappe.throw(msg, OverlapError)
+ assigned_shifts = frappe.db.sql("""
+ select name, shift_type, start_date ,end_date, docstatus, status
+ from `tabShift Assignment`
+ where
+ employee=%(employee)s and docstatus = 1
+ and name != %(name)s
+ and status = "Active"
+ {0}
+ """.format(condition), {
+ "employee": self.employee,
+ "shift_type": self.shift_type,
+ "start_date": self.start_date,
+ "end_date": self.end_date,
+ "name": self.name
+ }, as_dict = 1)
+
+ if len(assigned_shifts):
+ self.throw_overlap_error(assigned_shifts[0])
+
+ def throw_overlap_error(self, shift_details):
+ shift_details = frappe._dict(shift_details)
+ if shift_details.docstatus == 1 and shift_details.status == "Active":
+ msg = _("Employee {0} already has Active Shift {1}: {2}").format(frappe.bold(self.employee), frappe.bold(self.shift_type), frappe.bold(shift_details.name))
+ if shift_details.start_date:
+ msg += _(" from {0}").format(getdate(self.start_date).strftime("%d-%m-%Y"))
+ title = "Ongoing Shift"
+ if shift_details.end_date:
+ msg += _(" to {0}").format(getdate(self.end_date).strftime("%d-%m-%Y"))
+ title = "Active Shift"
+ if msg:
+ frappe.throw(msg, title=title)
@frappe.whitelist()
def get_events(start, end, filters=None):
@@ -62,19 +87,22 @@
return events
def add_assignments(events, start, end, conditions=None):
- query = """select name, date, employee_name,
+ query = """select name, start_date, end_date, employee_name,
employee, docstatus
from `tabShift Assignment` where
- date <= %(date)s
- and docstatus < 2"""
+ start_date >= %(start_date)s
+ or end_date <= %(end_date)s
+ or (%(start_date)s between start_date and end_date and %(end_date)s between start_date and end_date)
+ and docstatus = 1"""
if conditions:
query += conditions
- for d in frappe.db.sql(query, {"date":start, "date":end}, as_dict=True):
+ for d in frappe.db.sql(query, {"start_date":start, "end_date":end}, as_dict=True):
e = {
"name": d.name,
"doctype": "Shift Assignment",
- "date": d.date,
+ "start_date": d.start_date,
+ "end_date": d.end_date if d.end_date else nowdate(),
"title": cstr(d.employee_name) + \
cstr(d.shift_type),
"docstatus": d.docstatus
@@ -92,7 +120,16 @@
:param next_shift_direction: One of: None, 'forward', 'reverse'. Direction to look for next shift if shift not found on given date.
"""
default_shift = frappe.db.get_value('Employee', employee, 'default_shift')
- shift_type_name = frappe.db.get_value('Shift Assignment', {'employee':employee, 'date': for_date, 'docstatus': '1'}, 'shift_type')
+ shift_type_name = None
+ shift_assignment_details = frappe.db.get_value('Shift Assignment', {'employee':employee, 'start_date':('<=', for_date), 'docstatus': '1', 'status': "Active"}, ['shift_type', 'end_date'])
+
+ if shift_assignment_details:
+ shift_type_name = shift_assignment_details[0]
+
+ # if end_date present means that shift is over after end_date else it is a ongoing shift.
+ if shift_assignment_details[1] and for_date >= shift_assignment_details[1] :
+ shift_type_name = None
+
if not shift_type_name and consider_default_shift:
shift_type_name = default_shift
if shift_type_name:
@@ -117,16 +154,20 @@
direction = '<' if next_shift_direction == 'reverse' else '>'
sort_order = 'desc' if next_shift_direction == 'reverse' else 'asc'
dates = frappe.db.get_all('Shift Assignment',
- 'date',
- {'employee':employee, 'date':(direction, for_date), 'docstatus': '1'},
+ ['start_date', 'end_date'],
+ {'employee':employee, 'start_date':(direction, for_date), 'docstatus': '1', "status": "Active"},
as_list=True,
- limit=MAX_DAYS, order_by="date "+sort_order)
- for date in dates:
- shift_details = get_employee_shift(employee, date[0], consider_default_shift, None)
- if shift_details:
- shift_type_name = shift_details.shift_type.name
- for_date = date[0]
- break
+ limit=MAX_DAYS, order_by="start_date "+sort_order)
+
+ if dates:
+ for date in dates:
+ if date[1] and date[1] < for_date:
+ continue
+ shift_details = get_employee_shift(employee, date[0], consider_default_shift, None)
+ if shift_details:
+ shift_type_name = shift_details.shift_type.name
+ for_date = date[0]
+ break
return get_shift_details(shift_type_name, for_date)
@@ -134,7 +175,7 @@
def get_employee_shift_timings(employee, for_timestamp=now_datetime(), consider_default_shift=False):
"""Returns previous shift, current/upcoming shift, next_shift for the given timestamp and employee
"""
- # write and verify a test case for midnight shift.
+ # write and verify a test case for midnight shift.
prev_shift = curr_shift = next_shift = None
curr_shift = get_employee_shift(employee, for_timestamp.date(), consider_default_shift, 'forward')
if curr_shift:
diff --git a/erpnext/hr/doctype/shift_assignment/shift_assignment_calendar.js b/erpnext/hr/doctype/shift_assignment/shift_assignment_calendar.js
index c2c9bc0..17a986d 100644
--- a/erpnext/hr/doctype/shift_assignment/shift_assignment_calendar.js
+++ b/erpnext/hr/doctype/shift_assignment/shift_assignment_calendar.js
@@ -3,8 +3,8 @@
frappe.views.calendar["Shift Assignment"] = {
field_map: {
- "start": "date",
- "end": "date",
+ "start": "start_date",
+ "end": "end_date",
"id": "name",
"docstatus": 1
},
diff --git a/erpnext/hr/doctype/shift_assignment/test_shift_assignment.py b/erpnext/hr/doctype/shift_assignment/test_shift_assignment.py
index 7fe80a2..4c3c1ed 100644
--- a/erpnext/hr/doctype/shift_assignment/test_shift_assignment.py
+++ b/erpnext/hr/doctype/shift_assignment/test_shift_assignment.py
@@ -5,7 +5,7 @@
import frappe
import unittest
-from frappe.utils import nowdate
+from frappe.utils import nowdate, add_days
test_dependencies = ["Shift Type"]
@@ -20,8 +20,61 @@
"shift_type": "Day Shift",
"company": "_Test Company",
"employee": "_T-Employee-00001",
- "date": nowdate()
+ "start_date": nowdate()
}).insert()
shift_assignment.submit()
self.assertEqual(shift_assignment.docstatus, 1)
+
+ def test_overlapping_for_ongoing_shift(self):
+ # shift should be Ongoing if Only start_date is present and status = Active
+
+ shift_assignment_1 = frappe.get_doc({
+ "doctype": "Shift Assignment",
+ "shift_type": "Day Shift",
+ "company": "_Test Company",
+ "employee": "_T-Employee-00001",
+ "start_date": nowdate(),
+ "status": 'Active'
+ }).insert()
+ shift_assignment_1.submit()
+
+ self.assertEqual(shift_assignment_1.docstatus, 1)
+
+ shift_assignment = frappe.get_doc({
+ "doctype": "Shift Assignment",
+ "shift_type": "Day Shift",
+ "company": "_Test Company",
+ "employee": "_T-Employee-00001",
+ "start_date": add_days(nowdate(), 2)
+ })
+
+ self.assertRaises(frappe.ValidationError, shift_assignment.save)
+
+ def test_overlapping_for_fixed_period_shift(self):
+ # shift should is for Fixed period if Only start_date and end_date both are present and status = Active
+
+ shift_assignment_1 = frappe.get_doc({
+ "doctype": "Shift Assignment",
+ "shift_type": "Day Shift",
+ "company": "_Test Company",
+ "employee": "_T-Employee-00001",
+ "start_date": nowdate(),
+ "end_date": add_days(nowdate(), 30),
+ "status": 'Active'
+ }).insert()
+ shift_assignment_1.submit()
+
+
+ # it should not allowed within period of any shift.
+ shift_assignment_3 = frappe.get_doc({
+ "doctype": "Shift Assignment",
+ "shift_type": "Day Shift",
+ "company": "_Test Company",
+ "employee": "_T-Employee-00001",
+ "start_date":add_days(nowdate(), 10),
+ "end_date": add_days(nowdate(), 35),
+ "status": 'Active'
+ })
+
+ self.assertRaises(frappe.ValidationError, shift_assignment_3.save)
\ No newline at end of file
diff --git a/erpnext/hr/doctype/shift_request/shift_request.js b/erpnext/hr/doctype/shift_request/shift_request.js
index 1db7c7d..b17a6f3 100644
--- a/erpnext/hr/doctype/shift_request/shift_request.js
+++ b/erpnext/hr/doctype/shift_request/shift_request.js
@@ -2,7 +2,16 @@
// For license information, please see license.txt
frappe.ui.form.on('Shift Request', {
- refresh: function(frm) {
-
- }
+ setup: function(frm) {
+ frm.set_query("approver", function() {
+ return {
+ query: "erpnext.hr.doctype.department_approver.department_approver.get_approvers",
+ filters: {
+ employee: frm.doc.employee,
+ doctype: frm.doc.doctype
+ }
+ };
+ });
+ frm.set_query("employee", erpnext.queries.employee);
+ },
});
diff --git a/erpnext/hr/doctype/shift_request/shift_request.json b/erpnext/hr/doctype/shift_request/shift_request.json
index dd05647..64cbdff 100644
--- a/erpnext/hr/doctype/shift_request/shift_request.json
+++ b/erpnext/hr/doctype/shift_request/shift_request.json
@@ -1,396 +1,155 @@
{
- "allow_copy": 0,
- "allow_guest_to_view": 0,
- "allow_import": 1,
- "allow_rename": 0,
- "autoname": "HR-SHR-.YY.-.MM.-.#####",
- "beta": 0,
- "creation": "2018-04-13 16:32:27.974273",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "",
- "editable_grid": 1,
- "engine": "InnoDB",
+ "actions": [],
+ "allow_import": 1,
+ "autoname": "HR-SHR-.YY.-.MM.-.#####",
+ "creation": "2018-04-13 16:32:27.974273",
+ "doctype": "DocType",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "shift_type",
+ "employee",
+ "employee_name",
+ "department",
+ "status",
+ "column_break_4",
+ "company",
+ "approver",
+ "from_date",
+ "to_date",
+ "amended_from"
+ ],
"fields": [
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "shift_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": 0,
- "label": "Shift Type",
- "length": 0,
- "no_copy": 0,
- "options": "Shift Type",
- "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
- },
+ "fieldname": "shift_type",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Shift Type",
+ "options": "Shift Type",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "employee",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 1,
- "in_standard_filter": 0,
- "label": "Employee",
- "length": 0,
- "no_copy": 0,
- "options": "Employee",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "employee",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Employee",
+ "options": "Employee",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_from": "employee.employee_name",
- "fieldname": "employee_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": "Employee Name",
- "length": 0,
- "no_copy": 0,
- "options": "",
- "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
- },
+ "fetch_from": "employee.employee_name",
+ "fieldname": "employee_name",
+ "fieldtype": "Data",
+ "label": "Employee Name",
+ "read_only": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fetch_from": "employee.department",
- "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": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fetch_from": "employee.department",
+ "fieldname": "department",
+ "fieldtype": "Link",
+ "label": "Department",
+ "options": "Department",
+ "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_4",
- "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
- },
+ "fieldname": "column_break_4",
+ "fieldtype": "Column Break"
+ },
{
- "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": 1,
- "in_standard_filter": 0,
- "label": "Company",
- "length": 0,
- "no_copy": 0,
- "options": "Company",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
- },
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "in_list_view": 1,
+ "label": "Company",
+ "options": "Company",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "from_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": "From 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
- },
+ "fieldname": "from_date",
+ "fieldtype": "Date",
+ "label": "From Date",
+ "reqd": 1
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "to_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": "To 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
- },
+ "fieldname": "to_date",
+ "fieldtype": "Date",
+ "label": "To Date"
+ },
{
- "allow_bulk_edit": 0,
- "allow_in_quick_entry": 0,
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "columns": 0,
- "fieldname": "amended_from",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_global_search": 0,
- "in_list_view": 0,
- "in_standard_filter": 0,
- "label": "Amended From",
- "length": 0,
- "no_copy": 1,
- "options": "Shift Request",
- "permlevel": 0,
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "remember_last_selected_value": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "translatable": 0,
- "unique": 0
+ "fieldname": "amended_from",
+ "fieldtype": "Link",
+ "label": "Amended From",
+ "no_copy": 1,
+ "options": "Shift Request",
+ "print_hide": 1,
+ "read_only": 1
+ },
+ {
+ "default": "Draft",
+ "fieldname": "status",
+ "fieldtype": "Select",
+ "label": "Status",
+ "options": "Draft\nApproved\nRejected",
+ "reqd": 1
+ },
+ {
+ "fetch_from": "employee.shift_request_approver",
+ "fetch_if_empty": 1,
+ "fieldname": "approver",
+ "fieldtype": "Link",
+ "label": "Approver",
+ "options": "User",
+ "reqd": 1
}
- ],
- "has_web_view": 0,
- "hide_heading": 0,
- "hide_toolbar": 0,
- "idx": 0,
- "image_view": 0,
- "in_create": 0,
- "is_submittable": 1,
- "issingle": 0,
- "istable": 0,
- "max_attachments": 0,
- "modified": "2018-08-21 16:15:36.577448",
- "modified_by": "Administrator",
- "module": "HR",
- "name": "Shift Request",
- "name_case": "",
- "owner": "Administrator",
+ ],
+ "is_submittable": 1,
+ "links": [],
+ "modified": "2020-08-10 17:59:31.550558",
+ "modified_by": "Administrator",
+ "module": "HR",
+ "name": "Shift Request",
+ "owner": "Administrator",
"permissions": [
{
- "amend": 0,
- "cancel": 0,
- "create": 1,
- "delete": 0,
- "email": 1,
- "export": 1,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "Employee",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 1,
+ "create": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "Employee",
+ "share": 1,
"write": 1
- },
+ },
{
- "amend": 1,
- "cancel": 1,
- "create": 1,
- "delete": 1,
- "email": 1,
- "export": 1,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "HR Manager",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 1,
+ "amend": 1,
+ "cancel": 1,
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR Manager",
+ "share": 1,
+ "submit": 1,
"write": 1
- },
+ },
{
- "amend": 0,
- "cancel": 0,
- "create": 1,
- "delete": 0,
- "email": 1,
- "export": 1,
- "if_owner": 0,
- "import": 0,
- "permlevel": 0,
- "print": 1,
- "read": 1,
- "report": 1,
- "role": "HR User",
- "set_user_permissions": 0,
- "share": 1,
- "submit": 1,
+ "create": 1,
+ "email": 1,
+ "export": 1,
+ "print": 1,
+ "read": 1,
+ "report": 1,
+ "role": "HR User",
+ "share": 1,
+ "submit": 1,
"write": 1
}
- ],
- "quick_entry": 0,
- "read_only": 0,
- "read_only_onload": 0,
- "show_name_in_global_search": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "title_field": "employee_name",
- "track_changes": 1,
- "track_seen": 0,
- "track_views": 0
+ ],
+ "sort_field": "modified",
+ "sort_order": "DESC",
+ "title_field": "employee_name",
+ "track_changes": 1
}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/shift_request/shift_request.py b/erpnext/hr/doctype/shift_request/shift_request.py
index ff5de08..1c2801b 100644
--- a/erpnext/hr/doctype/shift_request/shift_request.py
+++ b/erpnext/hr/doctype/shift_request/shift_request.py
@@ -14,19 +14,26 @@
def validate(self):
self.validate_dates()
self.validate_shift_request_overlap_dates()
+ self.validate_approver()
+ self.validate_default_shift()
def on_submit(self):
- date_list = self.get_working_days(self.from_date, self.to_date)
- for date in date_list:
+ if self.status not in ["Approved", "Rejected"]:
+ frappe.throw(_("Only Shift Request with status 'Approved' and 'Rejected' can be submitted"))
+ if self.status == "Approved":
assignment_doc = frappe.new_doc("Shift Assignment")
assignment_doc.company = self.company
assignment_doc.shift_type = self.shift_type
assignment_doc.employee = self.employee
- assignment_doc.date = date
+ assignment_doc.start_date = self.from_date
+ if self.to_date:
+ assignment_doc.end_date = self.to_date
assignment_doc.shift_request = self.name
assignment_doc.insert()
assignment_doc.submit()
+ frappe.msgprint(_("Shift Assignment: {0} created for Employee: {1}").format(frappe.bold(assignment_doc.name), frappe.bold(self.employee)))
+
def on_cancel(self):
shift_assignment_list = frappe.get_list("Shift Assignment", {'employee': self.employee, 'shift_request': self.name})
if shift_assignment_list:
@@ -34,6 +41,19 @@
shift_assignment_doc = frappe.get_doc("Shift Assignment", shift['name'])
shift_assignment_doc.cancel()
+ def validate_default_shift(self):
+ default_shift = frappe.get_value("Employee", self.employee, "default_shift")
+ if self.shift_type == default_shift:
+ frappe.throw(_("You can not request for your Default Shift: {0}").format(frappe.bold(self.shift_type)))
+
+ def validate_approver(self):
+ department = frappe.get_value("Employee", self.employee, "department")
+ shift_approver = frappe.get_value("Employee", self.employee, "shift_request_approver")
+ approvers = frappe.db.sql("""select approver from `tabDepartment Approver` where parent= %s and parentfield = 'shift_request_approver'""", (department))
+ approvers = [approver[0] for approver in approvers]
+ approvers.append(shift_approver)
+ if self.approver not in approvers:
+ frappe.throw(_("Only Approvers can Approve this Request."))
def validate_dates(self):
if self.from_date and self.to_date and (getdate(self.to_date) < getdate(self.from_date)):
@@ -68,28 +88,4 @@
msg = _("Employee {0} has already applied for {1} between {2} and {3} : ").format(self.employee,
d['shift_type'], formatdate(d['from_date']), formatdate(d['to_date'])) \
+ """ <b><a href="#Form/Shift Request/{0}">{0}</a></b>""".format(d["name"])
- frappe.throw(msg, OverlapError)
-
- def get_working_days(self, start_date, end_date):
- start_date, end_date = getdate(start_date), getdate(end_date)
-
- from datetime import timedelta
-
- date_list = []
- employee_holiday_list = []
-
- employee_holidays = frappe.db.sql("""select holiday_date from `tabHoliday`
- where parent in (select holiday_list from `tabEmployee`
- where name = %s)""",self.employee,as_dict=1)
-
- for d in employee_holidays:
- employee_holiday_list.append(d.holiday_date)
-
- reference_date = start_date
-
- while reference_date <= end_date:
- if reference_date not in employee_holiday_list:
- date_list.append(reference_date)
- reference_date += timedelta(days=1)
-
- return date_list
\ No newline at end of file
+ frappe.throw(msg, OverlapError)
\ No newline at end of file
diff --git a/erpnext/hr/doctype/shift_request/test_shift_request.py b/erpnext/hr/doctype/shift_request/test_shift_request.py
index 1d0cf71..3dcfcbf 100644
--- a/erpnext/hr/doctype/shift_request/test_shift_request.py
+++ b/erpnext/hr/doctype/shift_request/test_shift_request.py
@@ -5,7 +5,7 @@
import frappe
import unittest
-from frappe.utils import nowdate
+from frappe.utils import nowdate, add_days
class TestShiftRequest(unittest.TestCase):
def setUp(self):
@@ -13,14 +13,20 @@
frappe.db.sql("delete from `tab{doctype}`".format(doctype=doctype))
def test_make_shift_request(self):
+ department = frappe.get_value("Employee", "_T-Employee-00001", 'department')
+ set_shift_approver(department)
+ approver = frappe.db.sql("""select approver from `tabDepartment Approver` where parent= %s and parentfield = 'shift_request_approver'""", (department))[0][0]
+
shift_request = frappe.get_doc({
"doctype": "Shift Request",
"shift_type": "Day Shift",
"company": "_Test Company",
"employee": "_T-Employee-00001",
"employee_name": "_Test Employee",
- "start_date": nowdate(),
- "end_date": nowdate()
+ "from_date": nowdate(),
+ "to_date": add_days(nowdate(), 10),
+ "approver": approver,
+ "status": "Approved"
})
shift_request.insert()
shift_request.submit()
@@ -34,4 +40,10 @@
self.assertEqual(shift_request.employee, employee)
shift_request.cancel()
shift_assignment_doc = frappe.get_doc("Shift Assignment", {"shift_request": d.get('shift_request')})
- self.assertEqual(shift_assignment_doc.docstatus, 2)
\ No newline at end of file
+ self.assertEqual(shift_assignment_doc.docstatus, 2)
+
+def set_shift_approver(department):
+ department_doc = frappe.get_doc("Department", department)
+ department_doc.append('shift_request_approver',{'approver': "test1@example.com"})
+ department_doc.save()
+ department_doc.reload()
\ No newline at end of file
diff --git a/erpnext/hr/doctype/shift_type/shift_type.js b/erpnext/hr/doctype/shift_type/shift_type.js
index e633545..ba53312 100644
--- a/erpnext/hr/doctype/shift_type/shift_type.js
+++ b/erpnext/hr/doctype/shift_type/shift_type.js
@@ -4,7 +4,7 @@
frappe.ui.form.on('Shift Type', {
refresh: function(frm) {
frm.add_custom_button(
- 'Mark Auto Attendance',
+ 'Mark Attendance',
() => frm.call({
doc: frm.doc,
method: 'process_auto_attendance',
diff --git a/erpnext/hr/doctype/shift_type/shift_type.py b/erpnext/hr/doctype/shift_type/shift_type.py
index 1973564..054e7e3 100644
--- a/erpnext/hr/doctype/shift_type/shift_type.py
+++ b/erpnext/hr/doctype/shift_type/shift_type.py
@@ -79,9 +79,10 @@
mark_attendance(employee, date, 'Absent', self.name)
def get_assigned_employee(self, from_date=None, consider_default_shift=False):
- filters = {'date':('>=', from_date), 'shift_type': self.name, 'docstatus': '1'}
+ filters = {'start_date':('>', from_date), 'shift_type': self.name, 'docstatus': '1'}
if not from_date:
- del filters['date']
+ del filters["start_date"]
+
assigned_employees = frappe.get_all('Shift Assignment', 'employee', filters, as_list=True)
assigned_employees = [x[0] for x in assigned_employees]
diff --git a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
index db1d191..1b92358 100644
--- a/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
+++ b/erpnext/hr/report/employee_leave_balance/employee_leave_balance.py
@@ -132,6 +132,9 @@
if filters.get('employee'):
conditions['name'] = filters.get('employee')
+ if filters.get('company'):
+ conditions['company'] = filters.get('company')
+
return conditions
def get_department_leave_approver_map(department=None):
diff --git a/erpnext/loan_management/doctype/loan/test_loan.py b/erpnext/loan_management/doctype/loan/test_loan.py
index 23815d598..2f6cd25 100644
--- a/erpnext/loan_management/doctype/loan/test_loan.py
+++ b/erpnext/loan_management/doctype/loan/test_loan.py
@@ -17,6 +17,8 @@
from erpnext.loan_management.doctype.loan.loan import create_loan_security_unpledge
from erpnext.loan_management.doctype.loan_security_unpledge.loan_security_unpledge import get_pledged_security_qty
from erpnext.loan_management.doctype.loan_application.loan_application import create_pledge
+from erpnext.loan_management.doctype.loan_disbursement.loan_disbursement import get_disbursal_amount
+from erpnext.loan_management.doctype.loan_repayment.loan_repayment import calculate_amounts
class TestLoan(unittest.TestCase):
def setUp(self):
@@ -193,18 +195,14 @@
make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
process_loan_interest_accrual_for_demand_loans(posting_date = last_date)
- repayment_entry = create_repayment_entry(loan.name, self.applicant2, add_days(last_date, 5),
+ repayment_entry = create_repayment_entry(loan.name, self.applicant2, add_days(last_date, 6),
"Loan Closure", flt(loan.loan_amount + accrued_interest_amount))
repayment_entry.submit()
amounts = frappe.db.get_value('Loan Interest Accrual', {'loan': loan.name}, ['paid_interest_amount',
'paid_principal_amount'])
- unaccrued_interest_amount = (loan.loan_amount * loan.rate_of_interest * 6) \
- / (days_in_year(get_datetime(first_date).year) * 100)
-
- self.assertEquals(flt(amounts[0] + unaccrued_interest_amount, 3),
- flt(accrued_interest_amount, 3))
+ self.assertEquals(flt(amounts[0], 2),flt(accrued_interest_amount, 2))
self.assertEquals(flt(repayment_entry.penalty_amount, 5), 0)
loan.load_from_db()
@@ -306,9 +304,6 @@
"Loan Closure", flt(loan.loan_amount + accrued_interest_amount))
repayment_entry.submit()
- amounts = frappe.db.get_value('Loan Interest Accrual', {'loan': loan.name}, ['paid_interest_amount',
- 'paid_principal_amount'])
-
loan.load_from_db()
self.assertEquals(loan.status, "Loan Closure Requested")
@@ -323,6 +318,97 @@
self.assertEqual(loan.status, 'Closed')
self.assertEquals(sum(pledged_qty.values()), 0)
+ def test_disbursal_check_with_shortfall(self):
+ pledges = [{
+ "loan_security": "Test Security 2",
+ "qty": 8000.00,
+ "haircut": 50,
+ }]
+
+ loan_application = create_loan_application('_Test Company', self.applicant2,
+ 'Stock Loan', pledges, "Repay Over Number of Periods", 12)
+
+ create_pledge(loan_application)
+
+ loan = create_loan_with_security(self.applicant2, "Stock Loan", "Repay Over Number of Periods", 12, loan_application)
+ loan.submit()
+
+ #Disbursing 7,00,000 from the allowed 10,00,000 according to security pledge
+ make_loan_disbursement_entry(loan.name, 700000)
+
+ frappe.db.sql("""UPDATE `tabLoan Security Price` SET loan_security_price = 100
+ where loan_security='Test Security 2'""")
+
+ create_process_loan_security_shortfall()
+ loan_security_shortfall = frappe.get_doc("Loan Security Shortfall", {"loan": loan.name})
+ self.assertTrue(loan_security_shortfall)
+
+ self.assertEqual(get_disbursal_amount(loan.name), 0)
+
+ frappe.db.sql(""" UPDATE `tabLoan Security Price` SET loan_security_price = 250
+ where loan_security='Test Security 2'""")
+
+ def test_disbursal_check_without_shortfall(self):
+ pledges = [{
+ "loan_security": "Test Security 2",
+ "qty": 8000.00,
+ "haircut": 50,
+ }]
+
+ loan_application = create_loan_application('_Test Company', self.applicant2,
+ 'Stock Loan', pledges, "Repay Over Number of Periods", 12)
+
+ create_pledge(loan_application)
+
+ loan = create_loan_with_security(self.applicant2, "Stock Loan", "Repay Over Number of Periods", 12, loan_application)
+ loan.submit()
+
+ #Disbursing 7,00,000 from the allowed 10,00,000 according to security pledge
+ make_loan_disbursement_entry(loan.name, 700000)
+
+ self.assertEqual(get_disbursal_amount(loan.name), 300000)
+
+ def test_pending_loan_amount_after_closure_request(self):
+ pledge = [{
+ "loan_security": "Test Security 1",
+ "qty": 4000.00
+ }]
+
+ loan_application = create_loan_application('_Test Company', self.applicant2, 'Demand Loan', pledge)
+ create_pledge(loan_application)
+
+ loan = create_demand_loan(self.applicant2, "Demand Loan", loan_application, posting_date=get_first_day(nowdate()))
+ loan.submit()
+
+ self.assertEquals(loan.loan_amount, 1000000)
+
+ first_date = '2019-10-01'
+ last_date = '2019-10-30'
+
+ no_of_days = date_diff(last_date, first_date) + 1
+
+ no_of_days += 6
+
+ accrued_interest_amount = (loan.loan_amount * loan.rate_of_interest * no_of_days) \
+ / (days_in_year(get_datetime(first_date).year) * 100)
+
+ make_loan_disbursement_entry(loan.name, loan.loan_amount, disbursement_date=first_date)
+ process_loan_interest_accrual_for_demand_loans(posting_date = last_date)
+
+ amounts = calculate_amounts(loan.name, add_days(last_date, 6), "Regular Repayment")
+
+ repayment_entry = create_repayment_entry(loan.name, self.applicant2, add_days(last_date, 6),
+ "Loan Closure", flt(loan.loan_amount + accrued_interest_amount))
+ repayment_entry.submit()
+
+ amounts = frappe.db.get_value('Loan Interest Accrual', {'loan': loan.name}, ['paid_interest_amount',
+ 'paid_principal_amount'])
+
+ loan.load_from_db()
+ self.assertEquals(loan.status, "Loan Closure Requested")
+
+ amounts = calculate_amounts(loan.name, add_days(last_date, 6), "Regular Repayment")
+ self.assertEquals(amounts['pending_principal_amount'], 0.0)
def create_loan_accounts():
if not frappe.db.exists("Account", "Loans and Advances (Assets) - _TC"):
diff --git a/erpnext/loan_management/doctype/loan_application/loan_application.js b/erpnext/loan_management/doctype/loan_application/loan_application.js
index b56fce1..1365274 100644
--- a/erpnext/loan_management/doctype/loan_application/loan_application.js
+++ b/erpnext/loan_management/doctype/loan_application/loan_application.js
@@ -33,18 +33,18 @@
if (frm.doc.is_secured_loan) {
frappe.db.get_value("Loan Security Pledge", {"loan_application": frm.doc.name, "docstatus": 1}, "name", (r) => {
- if (!r) {
+ if (Object.keys(r).length === 0) {
frm.add_custom_button(__('Loan Security Pledge'), function() {
- frm.trigger('create_loan_security_pledge')
+ frm.trigger('create_loan_security_pledge');
},__('Create'))
}
});
}
frappe.db.get_value("Loan", {"loan_application": frm.doc.name, "docstatus": 1}, "name", (r) => {
- if (!r) {
+ if (Object.keys(r).length === 0) {
frm.add_custom_button(__('Loan'), function() {
- frm.trigger('create_loan')
+ frm.trigger('create_loan');
},__('Create'))
} else {
frm.set_df_property('status', 'read_only', 1);
@@ -54,7 +54,7 @@
},
create_loan: function(frm) {
if (frm.doc.status != "Approved") {
- frappe.throw(__("Cannot create loan until application is approved"))
+ frappe.throw(__("Cannot create loan until application is approved"));
}
frappe.model.open_mapped_doc({
diff --git a/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py b/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py
index 6c27e12..260fada 100644
--- a/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py
+++ b/erpnext/loan_management/doctype/loan_disbursement/loan_disbursement.py
@@ -67,28 +67,10 @@
disbursed_amount = self.disbursed_amount + loan_details.disbursed_amount
total_payment = loan_details.total_payment
- if disbursed_amount > loan_details.loan_amount and loan_details.is_term_loan:
- frappe.throw(_("Disbursed Amount cannot be greater than loan amount"))
+ possible_disbursal_amount = get_disbursal_amount(self.against_loan)
- if loan_details.status == 'Disbursed':
- pending_principal_amount = flt(loan_details.total_payment) - flt(loan_details.total_interest_payable) \
- - flt(loan_details.total_principal_paid)
- else:
- pending_principal_amount = loan_details.disbursed_amount
-
- security_value = 0.0
- if loan_details.is_secured_loan:
- security_value = get_total_pledged_security_value(self.against_loan)
-
- if not security_value:
- security_value = loan_details.loan_amount
-
- if pending_principal_amount + self.disbursed_amount > flt(security_value):
- allowed_amount = security_value - pending_principal_amount
- if allowed_amount < 0:
- allowed_amount = 0
-
- frappe.throw(_("Disbursed Amount cannot be greater than {0}").format(allowed_amount))
+ if self.disbursed_amount > possible_disbursal_amount:
+ frappe.throw(_("Disbursed Amount cannot be greater than {0}").format(possible_disbursal_amount))
if loan_details.status == "Disbursed" and not loan_details.is_term_loan:
process_loan_interest_accrual_for_demand_loans(posting_date=add_days(self.disbursement_date, -1),
@@ -176,3 +158,32 @@
security_value += (loan_security_price_map.get(security) * qty * hair_cut_map.get(security))/100
return security_value
+
+@frappe.whitelist()
+def get_disbursal_amount(loan):
+ loan_details = frappe.get_all("Loan", fields = ["loan_amount", "disbursed_amount", "total_payment",
+ "total_principal_paid", "total_interest_payable", "status", "is_term_loan", "is_secured_loan"],
+ filters= { "name": loan })[0]
+
+ if loan_details.is_secured_loan and frappe.get_all('Loan Security Shortfall', filters={'loan': loan,
+ 'status': 'Pending'}):
+ return 0
+
+ if loan_details.status == 'Disbursed':
+ pending_principal_amount = flt(loan_details.total_payment) - flt(loan_details.total_interest_payable) \
+ - flt(loan_details.total_principal_paid)
+ else:
+ pending_principal_amount = flt(loan_details.disbursed_amount)
+
+ security_value = 0.0
+ if loan_details.is_secured_loan:
+ security_value = get_total_pledged_security_value(loan)
+
+ if not security_value and not loan_details.is_secured_loan:
+ security_value = flt(loan_details.loan_amount)
+
+ disbursal_amount = flt(security_value) - flt(pending_principal_amount)
+
+ return disbursal_amount
+
+
diff --git a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py b/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
index c5111fd..1d3fa71 100644
--- a/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
+++ b/erpnext/loan_management/doctype/loan_interest_accrual/loan_interest_accrual.py
@@ -85,8 +85,11 @@
if no_of_days <= 0:
return
- pending_principal_amount = flt(loan.total_payment) - flt(loan.total_interest_payable) \
- - flt(loan.total_principal_paid)
+ if loan.status == 'Disbursed':
+ pending_principal_amount = flt(loan.total_payment) - flt(loan.total_interest_payable) \
+ - flt(loan.total_principal_paid)
+ else:
+ pending_principal_amount = loan.disbursed_amount
interest_per_day = (pending_principal_amount * loan.rate_of_interest) / (days_in_year(get_datetime(posting_date).year) * 100)
payable_interest = interest_per_day * no_of_days
@@ -107,7 +110,7 @@
def make_accrual_interest_entry_for_demand_loans(posting_date, process_loan_interest, open_loans=None, loan_type=None):
query_filters = {
- "status": "Disbursed",
+ "status": ('in', ['Disbursed', 'Partially Disbursed']),
"docstatus": 1
}
@@ -118,8 +121,9 @@
if not open_loans:
open_loans = frappe.get_all("Loan",
- fields=["name", "total_payment", "total_amount_paid", "loan_account", "interest_income_account", "is_term_loan",
- "disbursement_date", "applicant_type", "applicant", "rate_of_interest", "total_interest_payable", "repayment_start_date"],
+ fields=["name", "total_payment", "total_amount_paid", "loan_account", "interest_income_account",
+ "is_term_loan", "status", "disbursement_date", "disbursed_amount", "applicant_type", "applicant",
+ "rate_of_interest", "total_interest_payable", "total_principal_paid", "repayment_start_date"],
filters=query_filters)
for loan in open_loans:
diff --git a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
index 9605045..7d83e32 100644
--- a/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
+++ b/erpnext/loan_management/doctype/loan_repayment/loan_repayment.py
@@ -116,6 +116,7 @@
def allocate_amounts(self, paid_entries):
self.set('repayment_details', [])
self.principal_amount_paid = 0
+ total_interest_paid = 0
interest_paid = self.amount_paid - self.penalty_amount
if self.amount_paid - self.penalty_amount > 0 and paid_entries:
@@ -137,12 +138,19 @@
interest_paid = 0
paid_principal=0
+ total_interest_paid += interest_amount
self.append('repayment_details', {
'loan_interest_accrual': lia,
'paid_interest_amount': interest_amount,
'paid_principal_amount': paid_principal
})
+ if self.payment_type == 'Loan Closure' and total_interest_paid < self.interest_payable:
+ unaccrued_interest = self.interest_payable - total_interest_paid
+ interest_paid -= unaccrued_interest
+ if self.repayment_details:
+ self.repayment_details[-1].paid_interest_amount += unaccrued_interest
+
if interest_paid:
self.principal_amount_paid += interest_paid
@@ -281,7 +289,7 @@
due_date = add_days(entry.posting_date, 1)
no_of_late_days = date_diff(posting_date,
- add_days(due_date, loan_type_details.grace_period_in_days))
+ add_days(due_date, loan_type_details.grace_period_in_days))
if no_of_late_days > 0 and (not against_loan_doc.repay_from_salary):
penalty_amount += (entry.interest_amount * (loan_type_details.penalty_interest_rate / 100) * no_of_late_days)/365
@@ -297,7 +305,10 @@
if not final_due_date:
final_due_date = add_days(due_date, loan_type_details.grace_period_in_days)
- pending_principal_amount = against_loan_doc.total_payment - against_loan_doc.total_principal_paid - against_loan_doc.total_interest_payable
+ if against_loan_doc.status in ('Disbursed', 'Loan Closure Requested'):
+ pending_principal_amount = against_loan_doc.total_payment - against_loan_doc.total_principal_paid - against_loan_doc.total_interest_payable
+ else:
+ pending_principal_amount = against_loan_doc.disbursed_amount
if payment_type == "Loan Closure":
if due_date:
diff --git a/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py b/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py
index 02efe24..0f42bde 100644
--- a/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py
+++ b/erpnext/loan_management/doctype/loan_security_shortfall/loan_security_shortfall.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
import frappe
-from frappe.utils import get_datetime
+from frappe.utils import get_datetime, flt
from frappe.model.document import Document
from six import iteritems
from erpnext.loan_management.doctype.loan_security_unpledge.loan_security_unpledge import get_pledged_security_qty
@@ -51,13 +51,19 @@
"valid_upto": (">=", update_time)
}, as_list=1))
- loans = frappe.get_all('Loan', fields=['name', 'loan_amount', 'total_principal_paid'],
- filters={'status': 'Disbursed', 'is_secured_loan': 1})
+ loans = frappe.get_all('Loan', fields=['name', 'loan_amount', 'total_principal_paid', 'total_payment',
+ 'total_interest_payable', 'disbursed_amount', 'status'],
+ filters={'status': ('in',['Disbursed','Partially Disbursed']), 'is_secured_loan': 1})
loan_security_map = {}
for loan in loans:
- outstanding_amount = loan.loan_amount - loan.total_principal_paid
+ if loan.status == 'Disbursed':
+ outstanding_amount = flt(loan.total_payment) - flt(loan.total_interest_payable) \
+ - flt(loan.total_principal_paid)
+ else:
+ outstanding_amount = loan.disbursed_amount
+
pledged_securities = get_pledged_security_qty(loan.name)
ltv_ratio = ''
security_value = 0.0
diff --git a/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py b/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py
index 5e9d82a..f6b28da 100644
--- a/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py
+++ b/erpnext/loan_management/doctype/loan_security_unpledge/loan_security_unpledge.py
@@ -43,8 +43,10 @@
"valid_upto": (">=", get_datetime())
}, as_list=1))
- loan_amount, principal_paid = frappe.get_value("Loan", self.loan, ['loan_amount', 'total_principal_paid'])
- pending_principal_amount = loan_amount - principal_paid
+ total_payment, principal_paid, interest_payable = frappe.get_value("Loan", self.loan, ['total_payment', 'total_principal_paid',
+ 'total_interest_payable'])
+
+ pending_principal_amount = flt(total_payment) - flt(interest_payable) - flt(principal_paid)
security_value = 0
for security in self.securities:
@@ -60,7 +62,7 @@
security_value += qty_after_unpledge * loan_security_price_map.get(security.loan_security)
- if not security_value and pending_principal_amount > 0:
+ if not security_value and flt(pending_principal_amount, 2) > 0:
frappe.throw("Cannot Unpledge, loan to value ratio is breaching")
if security_value and (pending_principal_amount/security_value) * 100 > ltv_ratio:
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
index add7bbf..cba6a2d 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/maintenance_schedule.py
@@ -67,16 +67,16 @@
for key in scheduled_date:
description =frappe._("Reference: {0}, Item Code: {1} and Customer: {2}").format(self.name, d.item_code, self.customer)
- frappe.get_doc({
+ event = frappe.get_doc({
"doctype": "Event",
"owner": email_map.get(d.sales_person, self.owner),
"subject": description,
"description": description,
"starts_on": cstr(key["scheduled_date"]) + " 10:00:00",
"event_type": "Private",
- "ref_type": self.doctype,
- "ref_name": self.name
- }).insert(ignore_permissions=1)
+ })
+ event.add_participant(self.doctype, self.name)
+ event.insert(ignore_permissions=1)
frappe.db.set(self, 'status', 'Submitted')
diff --git a/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py b/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py
index d8ae17b..3c307e9 100644
--- a/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py
+++ b/erpnext/maintenance/doctype/maintenance_schedule/test_maintenance_schedule.py
@@ -2,6 +2,7 @@
# Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and Contributors
# See license.txt
from __future__ import unicode_literals
+from frappe.utils.data import get_datetime, add_days
import frappe
import unittest
@@ -9,4 +10,39 @@
# test_records = frappe.get_test_records('Maintenance Schedule')
class TestMaintenanceSchedule(unittest.TestCase):
- pass
+ def test_events_should_be_created_and_deleted(self):
+ ms = make_maintenance_schedule()
+ ms.generate_schedule()
+ ms.submit()
+
+ all_events = get_events(ms)
+ self.assertTrue(len(all_events) > 0)
+
+ ms.cancel()
+ events_after_cancel = get_events(ms)
+ self.assertTrue(len(events_after_cancel) == 0)
+
+def get_events(ms):
+ return frappe.get_all("Event Participants", filters={
+ "reference_doctype": ms.doctype,
+ "reference_docname": ms.name,
+ "parenttype": "Event"
+ })
+
+def make_maintenance_schedule():
+ ms = frappe.new_doc("Maintenance Schedule")
+ ms.company = "_Test Company"
+ ms.customer = "_Test Customer"
+ ms.transaction_date = get_datetime()
+
+ ms.append("items", {
+ "item_code": "_Test Item",
+ "start_date": get_datetime(),
+ "end_date": add_days(get_datetime(), 32),
+ "periodicity": "Weekly",
+ "no_of_visits": 4,
+ "sales_person": "Sales Team",
+ })
+ ms.insert(ignore_permissions=True)
+
+ return ms
diff --git a/erpnext/manufacturing/doctype/bom/bom.py b/erpnext/manufacturing/doctype/bom/bom.py
index c51f655..3189433 100644
--- a/erpnext/manufacturing/doctype/bom/bom.py
+++ b/erpnext/manufacturing/doctype/bom/bom.py
@@ -494,7 +494,7 @@
'image' : d.image,
'stock_uom' : d.stock_uom,
'stock_qty' : flt(d.stock_qty),
- 'rate' : flt(d.base_rate) / flt(d.conversion_factor),
+ 'rate' : flt(d.base_rate) / (flt(d.conversion_factor) or 1.0),
'include_item_in_manufacturing': d.include_item_in_manufacturing
}))
diff --git a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
index e6c10ad..742d18c 100644
--- a/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
+++ b/erpnext/manufacturing/doctype/bom_update_tool/bom_update_tool.py
@@ -90,6 +90,7 @@
update_cost()
def replace_bom(args):
+ frappe.db.auto_commit_on_many_writes = 1
args = frappe._dict(args)
doc = frappe.get_doc("BOM Update Tool")
@@ -97,6 +98,8 @@
doc.new_bom = args.new_bom
doc.replace_bom()
+ frappe.db.auto_commit_on_many_writes = 0
+
def update_cost():
frappe.db.auto_commit_on_many_writes = 1
bom_list = get_boms_in_bottom_up_order()
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.js b/erpnext/manufacturing/doctype/job_card/job_card.js
index bab0dfb..b051b32 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.js
+++ b/erpnext/manufacturing/doctype/job_card/job_card.js
@@ -2,6 +2,17 @@
// For license information, please see license.txt
frappe.ui.form.on('Job Card', {
+ setup: function(frm) {
+ frm.set_query('operation', function() {
+ return {
+ query: 'erpnext.manufacturing.doctype.job_card.job_card.get_operations',
+ filters: {
+ 'work_order': frm.doc.work_order
+ }
+ };
+ });
+ },
+
refresh: function(frm) {
frappe.flags.pause_job = 0;
frappe.flags.resume_job = 0;
@@ -20,12 +31,60 @@
}
}
+ frm.trigger("toggle_operation_number");
+
if (frm.doc.docstatus == 0 && (frm.doc.for_quantity > frm.doc.total_completed_qty || !frm.doc.for_quantity)
- && (!frm.doc.items.length || frm.doc.for_quantity == frm.doc.transferred_qty)) {
+ && (frm.doc.items || !frm.doc.items.length || frm.doc.for_quantity == frm.doc.transferred_qty)) {
frm.trigger("prepare_timer_buttons");
}
},
+ operation: function(frm) {
+ frm.trigger("toggle_operation_number");
+
+ if (frm.doc.operation && frm.doc.work_order) {
+ frappe.call({
+ method: "erpnext.manufacturing.doctype.job_card.job_card.get_operation_details",
+ args: {
+ "work_order":frm.doc.work_order,
+ "operation":frm.doc.operation
+ },
+ callback: function (r) {
+ if (r.message) {
+ if (r.message.length == 1) {
+ frm.set_value("operation_id", r.message[0].name);
+ } else {
+ let args = [];
+
+ r.message.forEach((row) => {
+ args.push({ "label": row.idx, "value": row.name });
+ });
+
+ let description = __("Operation {0} added multiple times in the work order {1}",
+ [frm.doc.operation, frm.doc.work_order]);
+
+ frm.set_df_property("operation_row_number", "options", args);
+ frm.set_df_property("operation_row_number", "description", description);
+ }
+
+ frm.trigger("toggle_operation_number");
+ }
+ }
+ })
+ }
+ },
+
+ operation_row_number(frm) {
+ if (frm.doc.operation_row_number) {
+ frm.set_value("operation_id", frm.doc.operation_row_number);
+ }
+ },
+
+ toggle_operation_number(frm) {
+ frm.toggle_display("operation_row_number", !frm.doc.operation_id && frm.doc.operation);
+ frm.toggle_reqd("operation_row_number", !frm.doc.operation_id && frm.doc.operation);
+ },
+
prepare_timer_buttons: function(frm) {
frm.trigger("make_dashboard");
if (!frm.doc.job_started) {
@@ -35,9 +94,9 @@
fieldname: 'employee'}, d => {
if (d.employee) {
frm.set_value("employee", d.employee);
+ } else {
+ frm.events.start_job(frm);
}
-
- frm.events.start_job(frm);
}, __("Enter Value"), __("Start"));
} else {
frm.events.start_job(frm);
@@ -82,9 +141,7 @@
frm.set_value('current_time' , 0);
}
- frm.save("Save", () => {}, "", () => {
- frm.doc.time_logs.pop(-1);
- });
+ frm.save();
},
complete_job: function(frm, completed_time, completed_qty) {
@@ -116,6 +173,8 @@
employee: function(frm) {
if (frm.doc.job_started && !frm.doc.current_time) {
frm.trigger("reset_timer");
+ } else {
+ frm.events.start_job(frm);
}
},
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.json b/erpnext/manufacturing/doctype/job_card/job_card.json
index fba670c..087ab6b 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.json
+++ b/erpnext/manufacturing/doctype/job_card/job_card.json
@@ -11,6 +11,7 @@
"bom_no",
"workstation",
"operation",
+ "operation_row_number",
"column_break_4",
"posting_date",
"company",
@@ -291,11 +292,15 @@
"no_copy": 1,
"print_hide": 1,
"read_only": 1
+ },
+ {
+ "fieldname": "operation_row_number",
+ "fieldtype": "Select",
+ "label": "Operation Row Number"
}
],
"is_submittable": 1,
- "links": [],
- "modified": "2020-04-20 15:14:00.273441",
+ "modified": "2020-08-24 15:21:21.398267",
"modified_by": "Administrator",
"module": "Manufacturing",
"name": "Job Card",
@@ -347,7 +352,6 @@
"write": 1
}
],
- "quick_entry": 1,
"sort_field": "modified",
"sort_order": "DESC",
"title_field": "operation",
diff --git a/erpnext/manufacturing/doctype/job_card/job_card.py b/erpnext/manufacturing/doctype/job_card/job_card.py
index c29d4ba..8855e0a 100644
--- a/erpnext/manufacturing/doctype/job_card/job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/job_card.py
@@ -15,10 +15,13 @@
class OverlapError(frappe.ValidationError): pass
+class OperationMismatchError(frappe.ValidationError): pass
+
class JobCard(Document):
def validate(self):
self.validate_time_logs()
self.set_status()
+ self.validate_operation_id()
def validate_time_logs(self):
self.total_completed_qty = 0.0
@@ -209,11 +212,10 @@
for_quantity, time_in_mins = 0, 0
from_time_list, to_time_list = [], []
- field = "operation_id" if self.operation_id else "operation"
+ field = "operation_id"
data = frappe.get_all('Job Card',
fields = ["sum(total_time_in_mins) as time_in_mins", "sum(total_completed_qty) as completed_qty"],
- filters = {"docstatus": 1, "work_order": self.work_order,
- "workstation": self.workstation, field: self.get(field)})
+ filters = {"docstatus": 1, "work_order": self.work_order, field: self.get(field)})
if data and len(data) > 0:
for_quantity = data[0].completed_qty
@@ -226,14 +228,13 @@
FROM `tabJob Card` jc, `tabJob Card Time Log` jctl
WHERE
jctl.parent = jc.name and jc.work_order = %s
- and jc.workstation = %s and jc.{0} = %s and jc.docstatus = 1
- """.format(field), (self.work_order, self.workstation, self.get(field)), as_dict=1)
+ and jc.{0} = %s and jc.docstatus = 1
+ """.format(field), (self.work_order, self.get(field)), as_dict=1)
wo = frappe.get_doc('Work Order', self.work_order)
- work_order_field = "name" if field == "operation_id" else field
for data in wo.operations:
- if data.get(work_order_field) == self.get(field) and data.workstation == self.workstation:
+ if data.get("name") == self.get(field):
data.completed_qty = for_quantity
data.actual_operation_time = time_in_mins
data.actual_start_time = time_data[0].start_time if time_data else None
@@ -306,6 +307,37 @@
if update_status:
self.db_set('status', self.status)
+ def validate_operation_id(self):
+ if (self.get("operation_id") and self.get("operation_row_number") and self.operation and self.work_order and
+ frappe.get_cached_value("Work Order Operation", self.operation_row_number, "name") != self.operation_id):
+ work_order = frappe.bold(get_link_to_form("Work Order", self.work_order))
+ frappe.throw(_("Operation {0} does not belong to the work order {1}")
+ .format(frappe.bold(self.operation), work_order), OperationMismatchError)
+
+@frappe.whitelist()
+def get_operation_details(work_order, operation):
+ if work_order and operation:
+ return frappe.get_all("Work Order Operation", fields = ["name", "idx"],
+ filters = {
+ "parent": work_order,
+ "operation": operation
+ }
+ )
+
+@frappe.whitelist()
+def get_operations(doctype, txt, searchfield, start, page_len, filters):
+ if filters.get("work_order"):
+ args = {"parent": filters.get("work_order")}
+ if txt:
+ args["operation"] = ("like", "%{0}%".format(txt))
+
+ return frappe.get_all("Work Order Operation",
+ filters = args,
+ fields = ["distinct operation as operation"],
+ limit_start = start,
+ limit_page_length = page_len,
+ order_by="idx asc", as_list=1)
+
@frappe.whitelist()
def make_material_request(source_name, target_doc=None):
def update_item(obj, target, source_parent):
diff --git a/erpnext/manufacturing/doctype/job_card/test_job_card.py b/erpnext/manufacturing/doctype/job_card/test_job_card.py
index ca05fea..b6a6c33 100644
--- a/erpnext/manufacturing/doctype/job_card/test_job_card.py
+++ b/erpnext/manufacturing/doctype/job_card/test_job_card.py
@@ -4,6 +4,72 @@
from __future__ import unicode_literals
import unittest
+import frappe
+from frappe.utils import random_string
+from erpnext.manufacturing.doctype.workstation.test_workstation import make_workstation
+from erpnext.manufacturing.doctype.work_order.test_work_order import make_wo_order_test_record
+from erpnext.manufacturing.doctype.job_card.job_card import OperationMismatchError
class TestJobCard(unittest.TestCase):
- pass
+ def test_job_card(self):
+ data = frappe.get_cached_value('BOM',
+ {'docstatus': 1, 'with_operations': 1, 'company': '_Test Company'}, ['name', 'item'])
+
+ if data:
+ bom, bom_item = data
+
+ work_order = make_wo_order_test_record(item=bom_item, qty=1, bom_no=bom)
+
+ job_cards = frappe.get_all('Job Card',
+ filters = {'work_order': work_order.name}, fields = ["operation_id", "name"])
+
+ if job_cards:
+ job_card = job_cards[0]
+ frappe.db.set_value("Job Card", job_card.name, "operation_row_number", job_card.operation_id)
+
+ doc = frappe.get_doc("Job Card", job_card.name)
+ doc.operation_id = "Test Data"
+ self.assertRaises(OperationMismatchError, doc.save)
+
+ for d in job_cards:
+ frappe.delete_doc("Job Card", d.name)
+
+ def test_job_card_with_different_work_station(self):
+ data = frappe.get_cached_value('BOM',
+ {'docstatus': 1, 'with_operations': 1, 'company': '_Test Company'}, ['name', 'item'])
+
+ if data:
+ bom, bom_item = data
+
+ work_order = make_wo_order_test_record(item=bom_item, qty=1, bom_no=bom)
+
+ job_cards = frappe.get_all('Job Card',
+ filters = {'work_order': work_order.name},
+ fields = ["operation_id", "workstation", "name", "for_quantity"])
+
+ job_card = job_cards[0]
+
+ if job_card:
+ workstation = frappe.db.get_value("Workstation",
+ {"name": ("not in", [job_card.workstation])}, "name")
+
+ if not workstation or job_card.workstation == workstation:
+ workstation = make_workstation(workstation_name=random_string(5)).name
+
+ doc = frappe.get_doc("Job Card", job_card.name)
+ doc.workstation = workstation
+ doc.append("time_logs", {
+ "from_time": "2009-01-01 12:06:25",
+ "to_time": "2009-01-01 12:37:25",
+ "time_in_mins": "31.00002",
+ "completed_qty": job_card.for_quantity
+ })
+ doc.submit()
+
+ completed_qty = frappe.db.get_value("Work Order Operation", job_card.operation_id, "completed_qty")
+ self.assertEqual(completed_qty, job_card.for_quantity)
+
+ doc.cancel()
+
+ for d in job_cards:
+ frappe.delete_doc("Job Card", d.name)
\ No newline at end of file
diff --git a/erpnext/manufacturing/doctype/work_order/test_work_order.py b/erpnext/manufacturing/doctype/work_order/test_work_order.py
index 2260bef..b7c7c32 100644
--- a/erpnext/manufacturing/doctype/work_order/test_work_order.py
+++ b/erpnext/manufacturing/doctype/work_order/test_work_order.py
@@ -7,7 +7,7 @@
import frappe
from frappe.utils import flt, time_diff_in_hours, now, add_months, cint, today
from erpnext.stock.doctype.purchase_receipt.test_purchase_receipt import set_perpetual_inventory
-from erpnext.manufacturing.doctype.work_order.work_order import (make_stock_entry,
+from erpnext.manufacturing.doctype.work_order.work_order import (make_stock_entry,
ItemHasVariantError, stop_unstop, StockOverProductionError, OverProductionError, CapacityError)
from erpnext.stock.doctype.stock_entry import test_stock_entry
from erpnext.stock.utils import get_bin
diff --git a/erpnext/manufacturing/doctype/workstation/test_workstation.py b/erpnext/manufacturing/doctype/workstation/test_workstation.py
index 2169260..8266cf7 100644
--- a/erpnext/manufacturing/doctype/workstation/test_workstation.py
+++ b/erpnext/manufacturing/doctype/workstation/test_workstation.py
@@ -20,3 +20,18 @@
"_Test Workstation 1", "Operation 1", "2013-02-02 05:00:00", "2013-02-02 20:00:00")
self.assertRaises(WorkstationHolidayError, check_if_within_operating_hours,
"_Test Workstation 1", "Operation 1", "2013-02-01 10:00:00", "2013-02-02 20:00:00")
+
+def make_workstation(**args):
+ args = frappe._dict(args)
+
+ try:
+ doc = frappe.get_doc({
+ "doctype": "Workstation",
+ "workstation_name": args.workstation_name
+ })
+
+ doc.insert()
+
+ return doc
+ except frappe.DuplicateEntryError:
+ return frappe.get_doc("Workstation", args.workstation_name)
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/member/member.json b/erpnext/non_profit/doctype/member/member.json
index bb73a84..77cdb94 100644
--- a/erpnext/non_profit/doctype/member/member.json
+++ b/erpnext/non_profit/doctype/member/member.json
@@ -133,7 +133,8 @@
{
"fieldname": "email_id",
"fieldtype": "Data",
- "label": "Email Address"
+ "label": "Email Address",
+ "options": "Email"
},
{
"fieldname": "subscription_id",
@@ -176,7 +177,7 @@
],
"image_field": "image",
"links": [],
- "modified": "2020-04-07 14:20:33.215700",
+ "modified": "2020-08-06 10:06:01.153564",
"modified_by": "Administrator",
"module": "Non Profit",
"name": "Member",
diff --git a/erpnext/non_profit/doctype/member/member.py b/erpnext/non_profit/doctype/member/member.py
index c52082c..797736a 100644
--- a/erpnext/non_profit/doctype/member/member.py
+++ b/erpnext/non_profit/doctype/member/member.py
@@ -9,6 +9,7 @@
from frappe.contacts.address_and_contact import load_address_and_contact
from frappe.utils import cint
from frappe.integrations.utils import get_payment_gateway_controller
+from erpnext.non_profit.doctype.membership_type.membership_type import get_membership_type
class Member(Document):
def onload(self):
@@ -74,19 +75,23 @@
return create_member(user_details)
def create_member(user_details):
+ user_details = frappe._dict(user_details)
member = frappe.new_doc("Member")
member.update({
"member_name": user_details.fullname,
"email_id": user_details.email,
- "pan_number": user_details.pan,
+ "pan_number": user_details.pan or None,
"membership_type": user_details.plan_id,
- "customer": create_customer(user_details)
+ "subscription_id": user_details.subscription_id or None
})
member.insert(ignore_permissions=True)
+ member.customer = create_customer(user_details, member.name)
+ member.save(ignore_permissions=True)
+
return member
-def create_customer(user_details):
+def create_customer(user_details, member=None):
customer = frappe.new_doc("Customer")
customer.customer_name = user_details.fullname
customer.customer_type = "Individual"
@@ -107,7 +112,13 @@
"link_name": customer.name
})
- contact.save()
+ if member:
+ contact.append("links", {
+ "link_doctype": "Member",
+ "link_name": member
+ })
+
+ contact.save(ignore_permissions=True)
except frappe.DuplicateEntryError:
return customer.name
@@ -139,12 +150,31 @@
user_details = frappe._dict(user_details)
member = get_or_create_member(user_details)
- if not member:
- member = create_member(user_details)
subscription = member.setup_subscription()
member.subscription_id = subscription.get('subscription_id')
member.save(ignore_permissions=True)
- return subscription
\ No newline at end of file
+ return subscription
+
+@frappe.whitelist(allow_guest=True)
+def register_member(fullname, email, rzpay_plan_id, subscription_id, pan=None, mobile=None):
+ plan = get_membership_type(rzpay_plan_id)
+ if not plan:
+ raise frappe.DoesNotExistError
+
+ member = frappe.db.exists("Member", {'email': email, 'subscription_id': subscription_id })
+ if member:
+ return member
+ else:
+ member = create_member(dict(
+ fullname=fullname,
+ email=email,
+ plan_id=plan,
+ subscription_id=subscription_id,
+ pan=pan,
+ mobile=mobile
+ ))
+
+ return member.name
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/membership/membership.js b/erpnext/non_profit/doctype/membership/membership.js
index 554549a..ee8a8c0 100644
--- a/erpnext/non_profit/doctype/membership/membership.js
+++ b/erpnext/non_profit/doctype/membership/membership.js
@@ -8,6 +8,24 @@
})
},
+ refresh: function(frm) {
+ !frm.doc.invoice && frm.add_custom_button("Generate Invoice", () => {
+ frm.call("generate_invoice", {
+ save: true
+ }).then(() => {
+ frm.reload_doc();
+ });
+ });
+
+ frappe.db.get_single_value("Membership Settings", "send_email").then(val => {
+ if (val) frm.add_custom_button("Send Acknowledgement", () => {
+ frm.call("send_acknowlement").then(() => {
+ frm.reload_doc();
+ });
+ });
+ })
+ },
+
onload: function(frm) {
frm.add_fetch('membership_type', 'amount', 'amount');
}
diff --git a/erpnext/non_profit/doctype/membership/membership.json b/erpnext/non_profit/doctype/membership/membership.json
index 238f4c3..95bb3a5 100644
--- a/erpnext/non_profit/doctype/membership/membership.json
+++ b/erpnext/non_profit/doctype/membership/membership.json
@@ -19,10 +19,10 @@
"paid",
"currency",
"amount",
+ "invoice",
"razorpay_details_section",
"subscription_id",
- "payment_id",
- "webhook_payload"
+ "payment_id"
],
"fields": [
{
@@ -118,17 +118,15 @@
"read_only": 1
},
{
- "fieldname": "webhook_payload",
- "fieldtype": "Code",
- "hidden": 1,
- "label": "Webhook Payload",
- "options": "JSON",
- "read_only": 1
+ "fieldname": "invoice",
+ "fieldtype": "Link",
+ "label": "Invoice",
+ "options": "Sales Invoice"
}
],
"index_web_pages_for_search": 1,
"links": [],
- "modified": "2020-07-27 14:28:11.532696",
+ "modified": "2020-07-31 13:57:02.328995",
"modified_by": "Administrator",
"module": "Non Profit",
"name": "Membership",
diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py
index 729e111..f058004 100644
--- a/erpnext/non_profit/doctype/membership/membership.py
+++ b/erpnext/non_profit/doctype/membership/membership.py
@@ -10,6 +10,7 @@
from frappe.model.document import Document
from frappe.email import sendmail_to_system_managers
from frappe.utils import add_days, add_years, nowdate, getdate, add_months, get_link_to_form
+from erpnext.non_profit.doctype.member.member import create_member
from frappe import _
import erpnext
@@ -57,11 +58,95 @@
self.load_from_db()
self.db_set('paid', 1)
+ def generate_invoice(self, save=True):
+ if not (self.paid or self.currency or self.amount):
+ frappe.throw(_("The payment for this membership is not paid. To generate invoice fill the payment details"))
+
+ if self.invoice:
+ frappe.throw(_("An invoice is already linked to this document"))
+
+ member = frappe.get_doc("Member", self.member)
+ plan = frappe.get_doc("Membership Type", self.membership_type)
+ settings = frappe.get_doc("Membership Settings")
+
+ if not member.customer:
+ frappe.throw(_("No customer linked to member {}", [member.name]))
+
+ if not settings.debit_account:
+ frappe.throw(_("You need to set <b>Debit Account</b> in Membership Settings"))
+
+ if not settings.company:
+ frappe.throw(_("You need to set <b>Default Company</b> for invoicing in Membership Settings"))
+
+ invoice = make_invoice(self, member, plan, settings)
+ self.invoice = invoice.name
+
+ if save:
+ self.save()
+
+ return invoice
+
+ def send_acknowlement(self):
+ settings = frappe.get_doc("Membership Settings")
+ if not settings.send_email:
+ frappe.throw(_("You need to enable <b>Send Acknowledge Email</b> in Membership Settings"))
+
+ member = frappe.get_doc("Member", self.member)
+ plan = frappe.get_doc("Membership Type", self.membership_type)
+ email = member.email_id if member.email_id else member.email
+ attachments = [frappe.attach_print("Membership", self.name, print_format=settings.membership_print_format)]
+
+ if self.invoice and settings.send_invoice:
+ attachments.append(frappe.attach_print("Sales Invoice", self.invoice, print_format=settings.inv_print_format))
+
+ email_template = frappe.get_doc("Email Template", settings.email_template)
+ context = { "doc": self, "member": member}
+
+ email_args = {
+ "recipients": [email],
+ "message": frappe.render_template(email_template.get("response"), context),
+ "subject": frappe.render_template(email_template.get("subject"), context),
+ "attachments": attachments,
+ "reference_doctype": self.doctype,
+ "reference_name": self.name
+ }
+
+ if not frappe.flags.in_test:
+ frappe.enqueue(method=frappe.sendmail, queue='short', timeout=300, is_async=True, **email_args)
+ else:
+ frappe.sendmail(**email_args)
+
+ def generate_and_send_invoice(self):
+ invoice = self.generate_invoice(False)
+ self.send_acknowlement()
+
+def make_invoice(membership, member, plan, settings):
+ invoice = frappe.get_doc({
+ 'doctype': 'Sales Invoice',
+ 'customer': member.customer,
+ 'debit_to': settings.debit_account,
+ 'currency': membership.currency,
+ 'is_pos': 0,
+ 'items': [
+ {
+ 'item_code': plan.linked_item,
+ 'rate': membership.amount,
+ 'qty': 1
+ }
+ ]
+ })
+
+ invoice.insert(ignore_permissions=True)
+ invoice.submit()
+
+ return invoice
+
def get_member_based_on_subscription(subscription_id, email):
members = frappe.get_all("Member", filters={
'subscription_id': subscription_id,
'email_id': email
}, order_by="creation desc")
+
try:
return frappe.get_doc("Member", members[0]['name'])
except:
@@ -77,16 +162,15 @@
controller.verify_signature(data, signature, key)
-
@frappe.whitelist(allow_guest=True)
def trigger_razorpay_subscription(*args, **kwargs):
data = frappe.request.get_data(as_text=True)
try:
verify_signature(data)
except Exception as e:
- signature = frappe.request.headers.get('X-Razorpay-Signature')
- log = "{0} \n\n {1} \n\n {2} \n\n {3}".format(e, frappe.get_traceback(), signature, data)
- frappe.log_error(e, "Webhook Verification Error")
+ log = frappe.log_error(e, "Webhook Verification Error")
+ notify_failure(log)
+ return { 'status': 'Failed', 'reason': e}
if isinstance(data, six.string_types):
data = json.loads(data)
@@ -99,35 +183,42 @@
payment = frappe._dict(payment)
try:
- data_json = json.dumps(data, indent=4, sort_keys=True)
+ if not data.event == "subscription.charged":
+ return
+
member = get_member_based_on_subscription(subscription.id, payment.email)
- except Exception as e:
- error_log = frappe.log_error(frappe.get_traceback() + '\n' + data_json , _("Membership Webhook Failed"))
- notify_failure(error_log)
- return { status: 'Failed' }
+ if not member:
+ member = create_member(frappe._dict({
+ 'fullname': payment.email,
+ 'email': payment.email,
+ 'plan_id': get_plan_from_razorpay_id(subscription.plan_id)
+ }))
- if not member:
- return { status: 'Failed' }
- try:
- if data.event == "subscription.activated":
+ member.subscription_id = subscription.id
member.customer_id = payment.customer_id
- elif data.event == "subscription.charged":
- membership = frappe.new_doc("Membership")
- membership.update({
- "member": member.name,
- "membership_status": "Current",
- "membership_type": member.membership_type,
- "currency": "INR",
- "paid": 1,
- "payment_id": payment.id,
- "webhook_payload": data_json,
- "from_date": datetime.fromtimestamp(subscription.current_start),
- "to_date": datetime.fromtimestamp(subscription.current_end),
- "amount": payment.amount / 100 # Convert to rupees from paise
- })
- membership.insert(ignore_permissions=True)
+ if subscription.notes and type(subscription.notes) == dict:
+ notes = '\n'.join("{}: {}".format(k, v) for k, v in subscription.notes.items())
+ member.add_comment("Comment", notes)
+ elif subscription.notes and type(subscription.notes) == str:
+ member.add_comment("Comment", subscription.notes)
- # Update these values anyway
+
+ # Update Membership
+ membership = frappe.new_doc("Membership")
+ membership.update({
+ "member": member.name,
+ "membership_status": "Current",
+ "membership_type": member.membership_type,
+ "currency": "INR",
+ "paid": 1,
+ "payment_id": payment.id,
+ "from_date": datetime.fromtimestamp(subscription.current_start),
+ "to_date": datetime.fromtimestamp(subscription.current_end),
+ "amount": payment.amount / 100 # Convert to rupees from paise
+ })
+ membership.insert(ignore_permissions=True)
+
+ # Update membership values
member.subscription_start = datetime.fromtimestamp(subscription.start_at)
member.subscription_end = datetime.fromtimestamp(subscription.end_at)
member.subscription_activated = 1
@@ -135,9 +226,9 @@
except Exception as e:
log = frappe.log_error(e, "Error creating membership entry")
notify_failure(log)
- return { status: 'Failed' }
+ return { 'status': 'Failed', 'reason': e}
- return { status: 'Success' }
+ return { 'status': 'Success' }
def notify_failure(log):
@@ -152,3 +243,11 @@
sendmail_to_system_managers("[Important] [ERPNext] Razorpay membership webhook failed , please check.", content)
except:
pass
+
+def get_plan_from_razorpay_id(plan_id):
+ plan = frappe.get_all("Membership Type", filters={'razorpay_plan_id': plan_id}, order_by="creation desc")
+
+ try:
+ return plan[0]['name']
+ except:
+ return None
\ No newline at end of file
diff --git a/erpnext/non_profit/doctype/membership_settings/membership_settings.js b/erpnext/non_profit/doctype/membership_settings/membership_settings.js
index 8c0e3a4..1d89402 100644
--- a/erpnext/non_profit/doctype/membership_settings/membership_settings.js
+++ b/erpnext/non_profit/doctype/membership_settings/membership_settings.js
@@ -10,7 +10,39 @@
})
});
}
+
+ frm.set_query('inv_print_format', function(doc) {
+ return {
+ filters: {
+ "doc_type": "Sales Invoice"
+ }
+ };
+ });
+
+ frm.set_query('membership_print_format', function(doc) {
+ return {
+ filters: {
+ "doc_type": "Membership"
+ }
+ };
+ });
+
+ frm.set_query('debit_account', function(doc) {
+ return {
+ filters: {
+ 'account_type': 'Receivable',
+ 'is_group': 0,
+ 'company': frm.doc.company
+ }
+ };
+ });
+
+ let docs_url = "https://docs.erpnext.com/docs/user/manual/en/non_profit/membership";
+
+ frm.set_intro(__("You can learn more about memberships in the manual. ") + `<a href='${docs_url}'>${__('ERPNext Docs')}</a>`, true);
+
frm.trigger("add_generate_button");
+ frm.trigger("add_copy_buttonn");
},
add_generate_button: function(frm) {
@@ -27,4 +59,12 @@
});
});
},
+
+ add_copy_buttonn: function(frm) {
+ if (frm.doc.webhook_secret) {
+ frm.add_custom_button(__("Copy Webhook URL"), () => {
+ frappe.utils.copy_to_clipboard(`https://${frappe.boot.sitename}/api/method/erpnext.non_profit.doctype.membership.membership.trigger_razorpay_subscription`);
+ });
+ }
+ }
});
diff --git a/erpnext/non_profit/doctype/membership_settings/membership_settings.json b/erpnext/non_profit/doctype/membership_settings/membership_settings.json
index 52b9d01..5b6bab5 100644
--- a/erpnext/non_profit/doctype/membership_settings/membership_settings.json
+++ b/erpnext/non_profit/doctype/membership_settings/membership_settings.json
@@ -9,7 +9,17 @@
"razorpay_settings_section",
"billing_cycle",
"billing_frequency",
- "webhook_secret"
+ "webhook_secret",
+ "column_break_6",
+ "enable_auto_invoicing",
+ "company",
+ "debit_account",
+ "column_break_9",
+ "send_email",
+ "send_invoice",
+ "membership_print_format",
+ "inv_print_format",
+ "email_template"
],
"fields": [
{
@@ -41,11 +51,79 @@
"fieldtype": "Password",
"label": "Webhook Secret",
"read_only": 1
+ },
+ {
+ "fieldname": "column_break_6",
+ "fieldtype": "Section Break",
+ "label": "Invoicing"
+ },
+ {
+ "default": "0",
+ "fieldname": "enable_auto_invoicing",
+ "fieldtype": "Check",
+ "label": "Enable Auto Invoicing",
+ "mandatory_depends_on": "eval:doc.send_invoice"
+ },
+ {
+ "depends_on": "eval:doc.enable_auto_invoicing",
+ "fieldname": "debit_account",
+ "fieldtype": "Link",
+ "label": "Debit Account",
+ "mandatory_depends_on": "eval:doc.enable_auto_invoicing",
+ "options": "Account"
+ },
+ {
+ "fieldname": "column_break_9",
+ "fieldtype": "Column Break"
+ },
+ {
+ "depends_on": "eval:doc.enable_auto_invoicing",
+ "fieldname": "company",
+ "fieldtype": "Link",
+ "label": "Company",
+ "mandatory_depends_on": "eval:doc.enable_auto_invoicing",
+ "options": "Company"
+ },
+ {
+ "default": "0",
+ "depends_on": "eval:doc.enable_auto_invoicing && doc.send_email",
+ "fieldname": "send_invoice",
+ "fieldtype": "Check",
+ "label": "Send Invoice with Email"
+ },
+ {
+ "default": "0",
+ "fieldname": "send_email",
+ "fieldtype": "Check",
+ "label": "Send Membership Acknowledgement"
+ },
+ {
+ "depends_on": "eval: doc.send_invoice",
+ "fieldname": "inv_print_format",
+ "fieldtype": "Link",
+ "label": "Invoice Print Format",
+ "mandatory_depends_on": "eval: doc.send_invoice",
+ "options": "Print Format"
+ },
+ {
+ "depends_on": "eval:doc.send_email",
+ "fieldname": "membership_print_format",
+ "fieldtype": "Link",
+ "label": "Membership Print Format",
+ "options": "Print Format"
+ },
+ {
+ "depends_on": "eval:doc.send_email",
+ "fieldname": "email_template",
+ "fieldtype": "Link",
+ "label": "Email Template",
+ "mandatory_depends_on": "eval:doc.send_email",
+ "options": "Email Template"
}
],
"issingle": 1,
"links": [],
- "modified": "2020-05-22 12:38:27.103759",
+ "modified": "2020-08-05 17:26:37.287395",
"modified_by": "Administrator",
"module": "Non Profit",
"name": "Membership Settings",
@@ -60,6 +138,23 @@
"role": "System Manager",
"share": 1,
"write": 1
+ },
+ {
+ "create": 1,
+ "delete": 1,
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "role": "Non Profit Manager",
+ "share": 1,
+ "write": 1
+ },
+ {
+ "email": 1,
+ "print": 1,
+ "read": 1,
+ "role": "Non Profit Member",
+ "share": 1
}
],
"quick_entry": 1,
diff --git a/erpnext/non_profit/doctype/membership_type/membership_type.js b/erpnext/non_profit/doctype/membership_type/membership_type.js
index 226981d..43311a2 100644
--- a/erpnext/non_profit/doctype/membership_type/membership_type.js
+++ b/erpnext/non_profit/doctype/membership_type/membership_type.js
@@ -5,6 +5,10 @@
refresh: function(frm) {
frappe.db.get_single_value("Membership Settings", "enable_razorpay").then(val => {
if (val) frm.set_df_property('razorpay_plan_id', 'hidden', false);
- })
+ });
+
+ frappe.db.get_single_value("Membership Settings", "enable_auto_invoicing").then(val => {
+ if (val) frm.set_df_property('linked_item', 'hidden', false);
+ });
}
});
diff --git a/erpnext/non_profit/doctype/membership_type/membership_type.json b/erpnext/non_profit/doctype/membership_type/membership_type.json
index 319078f..6ce1ecd 100644
--- a/erpnext/non_profit/doctype/membership_type/membership_type.json
+++ b/erpnext/non_profit/doctype/membership_type/membership_type.json
@@ -8,7 +8,8 @@
"field_order": [
"membership_type",
"amount",
- "razorpay_plan_id"
+ "razorpay_plan_id",
+ "linked_item"
],
"fields": [
{
@@ -33,10 +34,17 @@
"hidden": 1,
"label": "Razorpay Plan ID",
"unique": 1
+ },
+ {
+ "fieldname": "linked_item",
+ "fieldtype": "Link",
+ "label": "Linked Item",
+ "options": "Item",
+ "unique": 1
}
],
"links": [],
- "modified": "2020-03-30 12:54:07.850857",
+ "modified": "2020-08-05 15:21:43.595745",
"modified_by": "Administrator",
"module": "Non Profit",
"name": "Membership Type",
diff --git a/erpnext/non_profit/doctype/membership_type/membership_type.py b/erpnext/non_profit/doctype/membership_type/membership_type.py
index ed6b549..b95b043 100644
--- a/erpnext/non_profit/doctype/membership_type/membership_type.py
+++ b/erpnext/non_profit/doctype/membership_type/membership_type.py
@@ -4,6 +4,10 @@
from __future__ import unicode_literals
from frappe.model.document import Document
+import frappe
class MembershipType(Document):
pass
+
+def get_membership_type(razorpay_id):
+ return frappe.db.exists("Membership Type", {"razorpay_plan_id": razorpay_id})
\ No newline at end of file
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 361fe83..4b9c566 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -718,6 +718,9 @@
erpnext.patches.v12_0.update_item_tax_template_company
erpnext.patches.v13_0.move_branch_code_to_bank_account
erpnext.patches.v13_0.healthcare_lab_module_rename_doctypes
+erpnext.patches.v13_0.add_standard_navbar_items #4
erpnext.patches.v13_0.stock_entry_enhancements
erpnext.patches.v12_0.update_state_code_for_daman_and_diu
erpnext.patches.v12_0.rename_lost_reason_detail
+erpnext.patches.v13_0.drop_razorpay_payload_column
+erpnext.patches.v13_0.update_start_end_date_for_old_shift_assignment
diff --git a/erpnext/patches/v12_0/create_irs_1099_field_united_states.py b/erpnext/patches/v12_0/create_irs_1099_field_united_states.py
index 43bd0cc..7feaffd 100644
--- a/erpnext/patches/v12_0/create_irs_1099_field_united_states.py
+++ b/erpnext/patches/v12_0/create_irs_1099_field_united_states.py
@@ -7,6 +7,7 @@
frappe.reload_doc('accounts', 'doctype', 'allowed_to_transact_with', force=True)
frappe.reload_doc('accounts', 'doctype', 'pricing_rule_detail', force=True)
frappe.reload_doc('crm', 'doctype', 'lost_reason_detail', force=True)
+ frappe.reload_doc('setup', 'doctype', 'quotation_lost_reason_detail', force=True)
company = frappe.get_all('Company', filters = {'country': 'United States'})
if not company:
diff --git a/erpnext/patches/v12_0/rename_lost_reason_detail.py b/erpnext/patches/v12_0/rename_lost_reason_detail.py
index 044d023..d0dc356 100644
--- a/erpnext/patches/v12_0/rename_lost_reason_detail.py
+++ b/erpnext/patches/v12_0/rename_lost_reason_detail.py
@@ -3,6 +3,7 @@
def execute():
if frappe.db.exists("DocType", "Lost Reason Detail"):
+ frappe.reload_doc("crm", "doctype", "opportunity_lost_reason")
frappe.reload_doc("crm", "doctype", "opportunity_lost_reason_detail")
frappe.reload_doc("setup", "doctype", "quotation_lost_reason_detail")
@@ -10,8 +11,8 @@
frappe.db.sql("""INSERT INTO `tabQuotation Lost Reason Detail` SELECT * FROM `tabLost Reason Detail` WHERE `parenttype` = 'Quotation'""")
- frappe.db.sql("""INSERT INTO `tabQuotation Lost Reason` (`name`, `creation`, `modified`, `modified_by`, `owner`, `docstatus`, `parent`, `parentfield`, `parenttype`, `idx`, `_comments`, `_assign`, `_user_tags`, `_liked_by`, `order_lost_reason`)
- SELECT o.`name`, o.`creation`, o.`modified`, o.`modified_by`, o.`owner`, o.`docstatus`, o.`parent`, o.`parentfield`, o.`parenttype`, o.`idx`, o.`_comments`, o.`_assign`, o.`_user_tags`, o.`_liked_by`, o.`lost_reason`
+ frappe.db.sql("""INSERT INTO `tabQuotation Lost Reason` (`name`, `creation`, `modified`, `modified_by`, `owner`, `docstatus`, `parent`, `parentfield`, `parenttype`, `idx`, `_comments`, `_assign`, `_user_tags`, `_liked_by`, `order_lost_reason`)
+ SELECT o.`name`, o.`creation`, o.`modified`, o.`modified_by`, o.`owner`, o.`docstatus`, o.`parent`, o.`parentfield`, o.`parenttype`, o.`idx`, o.`_comments`, o.`_assign`, o.`_user_tags`, o.`_liked_by`, o.`lost_reason`
FROM `tabOpportunity Lost Reason` o LEFT JOIN `tabQuotation Lost Reason` q ON q.name = o.name WHERE q.name IS NULL""")
-
+
frappe.delete_doc("DocType", "Lost Reason Detail")
\ No newline at end of file
diff --git a/erpnext/patches/v13_0/add_standard_navbar_items.py b/erpnext/patches/v13_0/add_standard_navbar_items.py
new file mode 100644
index 0000000..d05b258
--- /dev/null
+++ b/erpnext/patches/v13_0/add_standard_navbar_items.py
@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+# import frappe
+from erpnext.setup.install import add_standard_navbar_items
+
+def execute():
+ # Add standard navbar items for ERPNext in Navbar Settings
+ add_standard_navbar_items()
diff --git a/erpnext/patches/v13_0/drop_razorpay_payload_column.py b/erpnext/patches/v13_0/drop_razorpay_payload_column.py
new file mode 100644
index 0000000..8980fd0
--- /dev/null
+++ b/erpnext/patches/v13_0/drop_razorpay_payload_column.py
@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+ if frappe.db.exists("DocType", "Membership"):
+ if 'webhook_payload' in frappe.db.get_table_columns("Membership"):
+ frappe.db.sql("alter table `tabMembership` drop column webhook_payload")
\ No newline at end of file
diff --git a/erpnext/patches/v13_0/update_start_end_date_for_old_shift_assignment.py b/erpnext/patches/v13_0/update_start_end_date_for_old_shift_assignment.py
new file mode 100644
index 0000000..0f521cb
--- /dev/null
+++ b/erpnext/patches/v13_0/update_start_end_date_for_old_shift_assignment.py
@@ -0,0 +1,13 @@
+# Copyright (c) 2019, Frappe and Contributors
+# License: GNU General Public License v3. See license.txt
+
+from __future__ import unicode_literals
+
+import frappe
+
+def execute():
+ frappe.reload_doc('hr', 'doctype', 'shift_assignment')
+ if frappe.db.has_column('Shift Assignment', 'date'):
+ frappe.db.sql("""update `tabShift Assignment`
+ set end_date=date, start_date=date
+ where date IS NOT NULL and start_date IS NULL and end_date IS NULL;""")
diff --git a/erpnext/payroll/doctype/salary_detail/salary_detail.json b/erpnext/payroll/doctype/salary_detail/salary_detail.json
index adb54f2..cc87cae 100644
--- a/erpnext/payroll/doctype/salary_detail/salary_detail.json
+++ b/erpnext/payroll/doctype/salary_detail/salary_detail.json
@@ -7,27 +7,30 @@
"field_order": [
"salary_component",
"abbr",
- "statistical_component",
"column_break_3",
- "deduct_full_tax_on_selected_payroll_date",
+ "amount",
+ "section_break_5",
+ "additional_salary",
+ "statistical_component",
"depends_on_payment_days",
- "is_tax_applicable",
"exempted_from_income_tax",
+ "is_tax_applicable",
+ "column_break_11",
"is_flexible_benefit",
"variable_based_on_taxable_salary",
+ "do_not_include_in_total",
+ "deduct_full_tax_on_selected_payroll_date",
"section_break_2",
"condition",
+ "column_break_18",
"amount_based_on_formula",
"formula",
- "amount",
- "do_not_include_in_total",
+ "section_break_19",
"default_amount",
"additional_amount",
+ "column_break_24",
"tax_on_flexible_benefit",
- "tax_on_additional_salary",
- "section_break_11",
- "additional_salary",
- "condition_and_formula_help"
+ "tax_on_additional_salary"
],
"fields": [
{
@@ -110,9 +113,11 @@
"read_only": 1
},
{
+ "collapsible": 1,
"depends_on": "eval:doc.is_flexible_benefit != 1",
"fieldname": "section_break_2",
- "fieldtype": "Section Break"
+ "fieldtype": "Section Break",
+ "label": "Condtion and formula"
},
{
"allow_on_submit": 1,
@@ -182,22 +187,11 @@
"read_only": 1
},
{
- "depends_on": "eval:doc.parenttype=='Salary Structure'",
- "fieldname": "section_break_11",
- "fieldtype": "Column Break"
- },
- {
- "depends_on": "eval:doc.parenttype=='Salary Structure'",
- "fieldname": "condition_and_formula_help",
- "fieldtype": "HTML",
- "label": "Condition and Formula Help",
- "options": "<h3>Condition and Formula Help</h3>\n\n<p>Notes:</p>\n\n<ol>\n<li>Use field <code>base</code> for using base salary of the Employee</li>\n<li>Use Salary Component abbreviations in conditions and formulas. <code>BS = Basic Salary</code></li>\n<li>Use field name for employee details in conditions and formulas. <code>Employment Type = employment_type</code><code>Branch = branch</code></li>\n<li>Use field name from Salary Slip in conditions and formulas. <code>Payment Days = payment_days</code><code>Leave without pay = leave_without_pay</code></li>\n<li>Direct Amount can also be entered based on Condtion. See example 3</li></ol>\n\n<h4>Examples</h4>\n<ol>\n<li>Calculating Basic Salary based on <code>base</code>\n<pre><code>Condition: base < 10000</code></pre>\n<pre><code>Formula: base * .2</code></pre></li>\n<li>Calculating HRA based on Basic Salary<code>BS</code> \n<pre><code>Condition: BS > 2000</code></pre>\n<pre><code>Formula: BS * .1</code></pre></li>\n<li>Calculating TDS based on Employment Type<code>employment_type</code> \n<pre><code>Condition: employment_type==\"Intern\"</code></pre>\n<pre><code>Amount: 1000</code></pre></li>\n</ol>"
- },
- {
"fieldname": "additional_salary",
"fieldtype": "Link",
"label": "Additional Salary ",
- "options": "Additional Salary"
+ "options": "Additional Salary",
+ "read_only": 1
},
{
"default": "0",
@@ -207,11 +201,43 @@
"fieldtype": "Check",
"label": "Exempted from Income Tax",
"read_only": 1
+ },
+ {
+ "collapsible": 1,
+ "fieldname": "section_break_5",
+ "fieldtype": "Section Break",
+ "label": "Component properties and references ",
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "fieldname": "column_break_11",
+ "fieldtype": "Column Break",
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "fieldname": "section_break_19",
+ "fieldtype": "Section Break",
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "fieldname": "column_break_18",
+ "fieldtype": "Column Break",
+ "show_days": 1,
+ "show_seconds": 1
+ },
+ {
+ "fieldname": "column_break_24",
+ "fieldtype": "Column Break",
+ "show_days": 1,
+ "show_seconds": 1
}
],
"istable": 1,
"links": [],
- "modified": "2020-06-22 23:21:26.300951",
+ "modified": "2020-07-01 12:13:41.956495",
"modified_by": "Administrator",
"module": "Payroll",
"name": "Salary Detail",
diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.js b/erpnext/payroll/doctype/salary_slip/salary_slip.js
index 4b623e5..7b69dbe 100644
--- a/erpnext/payroll/doctype/salary_slip/salary_slip.js
+++ b/erpnext/payroll/doctype/salary_slip/salary_slip.js
@@ -123,13 +123,13 @@
doc: frm.doc,
callback: function(r, rt) {
frm.refresh();
- if (frm.doc.absent_days){
+ if (r.message){
frm.fields_dict.absent_days.set_description("Unmarked Days is treated as "+ r.message +". You can can change this in " + frappe.utils.get_form_link("Payroll Settings", "Payroll Settings", true));
}
}
});
}
-})
+});
frappe.ui.form.on('Salary Slip Timesheet', {
time_sheet: function(frm, dt, dn) {
diff --git a/erpnext/payroll/doctype/salary_slip/salary_slip.json b/erpnext/payroll/doctype/salary_slip/salary_slip.json
index 27a974a..619c45f 100644
--- a/erpnext/payroll/doctype/salary_slip/salary_slip.json
+++ b/erpnext/payroll/doctype/salary_slip/salary_slip.json
@@ -20,15 +20,17 @@
"company",
"letter_head",
"section_break_10",
- "salary_slip_based_on_timesheet",
"start_date",
"end_date",
"salary_structure",
+ "column_break_18",
+ "salary_slip_based_on_timesheet",
"payroll_frequency",
- "column_break_15",
+ "section_break_20",
"total_working_days",
"unmarked_days",
"leave_without_pay",
+ "column_break_24",
"absent_days",
"payment_days",
"hourly_wages",
@@ -201,10 +203,6 @@
"label": "End Date"
},
{
- "fieldname": "column_break_15",
- "fieldtype": "Column Break"
- },
- {
"fieldname": "salary_structure",
"fieldtype": "Link",
"label": "Salary Structure",
@@ -490,13 +488,25 @@
"fieldtype": "Float",
"hidden": 1,
"label": "Unmarked days"
+ },
+ {
+ "fieldname": "section_break_20",
+ "fieldtype": "Section Break"
+ },
+ {
+ "fieldname": "column_break_24",
+ "fieldtype": "Column Break"
+ },
+ {
+ "fieldname": "column_break_18",
+ "fieldtype": "Column Break"
}
],
"icon": "fa fa-file-text",
"idx": 9,
"is_submittable": 1,
"links": [],
- "modified": "2020-07-22 12:41:03.659422",
+ "modified": "2020-08-11 17:37:54.274384",
"modified_by": "Administrator",
"module": "Payroll",
"name": "Salary Slip",
diff --git a/erpnext/portal/doctype/homepage/homepage.js b/erpnext/portal/doctype/homepage/homepage.js
index ca34d69..c7c66e0 100644
--- a/erpnext/portal/doctype/homepage/homepage.js
+++ b/erpnext/portal/doctype/homepage/homepage.js
@@ -21,34 +21,6 @@
});
frappe.ui.form.on('Homepage Featured Product', {
- item_code: function(frm, cdt, cdn) {
- var featured_product = frappe.model.get_doc(cdt, cdn);
- if (featured_product.item_code) {
- frappe.call({
- method: 'frappe.client.get_value',
- args: {
- 'doctype': 'Item',
- 'filters': {'name': featured_product.item_code},
- 'fieldname': [
- 'item_name',
- 'web_long_description',
- 'description',
- 'image',
- 'thumbnail'
- ]
- },
- callback: function(r) {
- if (!r.exc) {
- $.extend(featured_product, r.message);
- if (r.message.web_long_description) {
- featured_product.description = r.message.web_long_description;
- }
- frm.refresh_field('products');
- }
- }
- });
- }
- },
view: function(frm, cdt, cdn){
var child= locals[cdt][cdn]
diff --git a/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json b/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json
index c8b4ae9..01c32ef 100644
--- a/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json
+++ b/erpnext/portal/doctype/homepage_featured_product/homepage_featured_product.json
@@ -1,301 +1,116 @@
{
- "allow_copy": 0,
- "allow_import": 0,
- "allow_rename": 0,
- "autoname": "hash",
- "beta": 0,
- "creation": "2016-04-22 05:57:06.261401",
- "custom": 0,
- "docstatus": 0,
- "doctype": "DocType",
- "document_type": "Document",
- "editable_grid": 1,
+ "actions": [],
+ "autoname": "hash",
+ "creation": "2016-04-22 05:57:06.261401",
+ "doctype": "DocType",
+ "document_type": "Document",
+ "editable_grid": 1,
+ "engine": "InnoDB",
+ "field_order": [
+ "item_code",
+ "col_break1",
+ "item_name",
+ "view",
+ "section_break_5",
+ "description",
+ "column_break_7",
+ "image",
+ "thumbnail",
+ "route"
+ ],
"fields": [
{
- "allow_on_submit": 0,
- "bold": 1,
- "collapsible": 0,
- "fieldname": "item_code",
- "fieldtype": "Link",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Item Code",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_code",
- "oldfieldtype": "Link",
- "options": "Item",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "print_width": "150px",
- "read_only": 0,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 1,
- "set_only_once": 0,
- "unique": 0,
+ "bold": 1,
+ "fieldname": "item_code",
+ "fieldtype": "Link",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Item Code",
+ "oldfieldname": "item_code",
+ "oldfieldtype": "Link",
+ "options": "Item",
+ "print_width": "150px",
+ "reqd": 1,
+ "search_index": 1,
"width": "150px"
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "col_break1",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "item_name",
- "fieldtype": "Data",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 1,
- "label": "Item Name",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "item_name",
- "oldfieldtype": "Data",
- "options": "",
- "permlevel": 0,
- "precision": "",
- "print_hide": 1,
- "print_hide_if_no_value": 0,
- "print_width": "150",
- "read_only": 1,
- "report_hide": 0,
- "reqd": 1,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "fetch_from": "item_code.item_name",
+ "fetch_if_empty": 1,
+ "fieldname": "item_name",
+ "fieldtype": "Data",
+ "in_list_view": 1,
+ "label": "Item Name",
+ "oldfieldname": "item_name",
+ "oldfieldtype": "Data",
+ "print_hide": 1,
+ "print_width": "150",
+ "read_only": 1,
+ "reqd": 1,
"width": "150"
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "view",
- "fieldtype": "Button",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 1,
- "label": "View",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "view",
+ "fieldtype": "Button",
+ "in_list_view": 1,
+ "label": "View"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 1,
- "fieldname": "section_break_5",
- "fieldtype": "Section Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Description",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "collapsible": 1,
+ "fieldname": "section_break_5",
+ "fieldtype": "Section Break",
+ "label": "Description"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "description",
- "fieldtype": "Text Editor",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 1,
- "in_list_view": 1,
- "label": "Description",
- "length": 0,
- "no_copy": 0,
- "oldfieldname": "description",
- "oldfieldtype": "Small Text",
- "options": "",
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "print_width": "300px",
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0,
+ "fetch_from": "item_code.web_long_description",
+ "fieldname": "description",
+ "fieldtype": "Text Editor",
+ "in_filter": 1,
+ "in_list_view": 1,
+ "label": "Description",
+ "oldfieldname": "description",
+ "oldfieldtype": "Small Text",
+ "print_width": "300px",
"width": "300px"
- },
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "column_break_7",
- "fieldtype": "Column Break",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "column_break_7",
+ "fieldtype": "Column Break"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "image",
- "fieldtype": "Attach Image",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Image",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fetch_from": "item_code.website_image",
+ "fetch_if_empty": 1,
+ "fieldname": "image",
+ "fieldtype": "Attach Image",
+ "label": "Image"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "thumbnail",
- "fieldtype": "Attach Image",
- "hidden": 1,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "Thumbnail",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 0,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
- },
+ "fieldname": "thumbnail",
+ "fieldtype": "Attach Image",
+ "hidden": 1,
+ "label": "Thumbnail"
+ },
{
- "allow_on_submit": 0,
- "bold": 0,
- "collapsible": 0,
- "fieldname": "route",
- "fieldtype": "Small Text",
- "hidden": 0,
- "ignore_user_permissions": 0,
- "ignore_xss_filter": 0,
- "in_filter": 0,
- "in_list_view": 0,
- "label": "route",
- "length": 0,
- "no_copy": 0,
- "permlevel": 0,
- "precision": "",
- "print_hide": 0,
- "print_hide_if_no_value": 0,
- "read_only": 1,
- "report_hide": 0,
- "reqd": 0,
- "search_index": 0,
- "set_only_once": 0,
- "unique": 0
+ "fieldname": "route",
+ "fieldtype": "Small Text",
+ "label": "route",
+ "read_only": 1
}
- ],
- "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": "2016-08-09 06:09:34.731971",
- "modified_by": "Administrator",
- "module": "Portal",
- "name": "Homepage Featured Product",
- "name_case": "",
- "owner": "Administrator",
- "permissions": [],
- "quick_entry": 1,
- "read_only": 0,
- "read_only_onload": 0,
- "sort_field": "modified",
- "sort_order": "DESC",
- "track_seen": 0
+ ],
+ "index_web_pages_for_search": 1,
+ "istable": 1,
+ "links": [],
+ "modified": "2020-08-25 15:27:49.573537",
+ "modified_by": "Administrator",
+ "module": "Portal",
+ "name": "Homepage Featured Product",
+ "owner": "Administrator",
+ "permissions": [],
+ "quick_entry": 1,
+ "sort_field": "modified",
+ "sort_order": "DESC"
}
\ No newline at end of file
diff --git a/erpnext/public/js/communication.js b/erpnext/public/js/communication.js
index 9432d42..26e5ab8 100644
--- a/erpnext/public/js/communication.js
+++ b/erpnext/public/js/communication.js
@@ -7,7 +7,7 @@
},
setup_custom_buttons: (frm) => {
- let confirm_msg = "Are you sure you want to create {0} from this email";
+ let confirm_msg = "Are you sure you want to create {0} from this email?";
if(frm.doc.reference_doctype !== "Issue") {
frm.add_custom_button(__("Issue"), () => {
frappe.confirm(__(confirm_msg, [__("Issue")]), () => {
@@ -62,17 +62,36 @@
},
make_opportunity_from_communication: (frm) => {
- return frappe.call({
- method: "erpnext.crm.doctype.opportunity.opportunity.make_opportunity_from_communication",
- args: {
- communication: frm.doc.name
- },
- freeze: true,
- callback: (r) => {
- if(r.message) {
- frm.reload_doc()
+ const fields = [{
+ fieldtype: 'Link',
+ label: __('Select a Company'),
+ fieldname: 'company',
+ options: 'Company',
+ reqd: 1,
+ default: frappe.defaults.get_user_default("Company")
+ }];
+
+ frappe.prompt(fields, data => {
+ frappe.call({
+ method: "erpnext.crm.doctype.opportunity.opportunity.make_opportunity_from_communication",
+ args: {
+ communication: frm.doc.name,
+ company: data.company
+ },
+ freeze: true,
+ callback: (r) => {
+ if(r.message) {
+ frm.reload_doc();
+ frappe.show_alert({
+ message: __("Opportunity {0} created",
+ ['<a href="#Form/Opportunity/'+r.message+'">' + r.message + '</a>']),
+ indicator: 'green'
+ });
+ }
}
- }
- })
+ });
+ },
+ 'Create an Opportunity',
+ 'Create');
}
-});
\ No newline at end of file
+});
diff --git a/erpnext/public/js/conf.js b/erpnext/public/js/conf.js
index 9870f81..2af9140 100644
--- a/erpnext/public/js/conf.js
+++ b/erpnext/public/js/conf.js
@@ -3,32 +3,6 @@
frappe.provide('erpnext');
-// add toolbar icon
-$(document).bind('toolbar_setup', function() {
- frappe.app.name = "ERPNext";
-
- frappe.help_feedback_link = '<p><a class="text-muted" \
- href="https://discuss.erpnext.com">Feedback</a></p>'
-
-
- $('[data-link="docs"]').attr("href", "https://erpnext.com/docs")
- $('[data-link="issues"]').attr("href", "https://github.com/frappe/erpnext/issues")
-
-
- // default documentation goes to erpnext
- // $('[data-link-type="documentation"]').attr('data-path', '/erpnext/manual/index');
-
- // additional help links for erpnext
- var $help_menu = $('.dropdown-help ul .documentation-links');
- $('<li><a data-link-type="forum" href="https://erpnext.com/docs/user/manual" \
- target="_blank">'+__('Documentation')+'</a></li>').insertBefore($help_menu);
- $('<li><a data-link-type="forum" href="https://discuss.erpnext.com" \
- target="_blank">'+__('User Forum')+'</a></li>').insertBefore($help_menu);
- $('<li><a href="https://github.com/frappe/erpnext/issues" \
- target="_blank">'+__('Report an Issue')+'</a></li>').insertBefore($help_menu);
-
-});
-
// preferred modules for breadcrumbs
$.extend(frappe.breadcrumbs.preferred, {
"Item Group": "Stock",
diff --git a/erpnext/public/js/controllers/buying.js b/erpnext/public/js/controllers/buying.js
index a4cc68b..cb76c87 100644
--- a/erpnext/public/js/controllers/buying.js
+++ b/erpnext/public/js/controllers/buying.js
@@ -503,11 +503,11 @@
if(!r.exc && r.message) {
remove_empty_first_row(frm);
- for ( var i=0; i< r.message.length; i++ ) {
+ for (var i=0; i< r.message.length; i++) {
var d = frm.add_child("items");
var item = r.message[i];
- for ( var key in item) {
- if ( !is_null(item[key]) ) {
+ for (var key in item) {
+ if (!is_null(item[key]) && key !== "doctype") {
d[key] = item[key];
}
}
diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js
index 436a232..792235f 100644
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -781,10 +781,23 @@
else var date = this.frm.doc.transaction_date;
if (frappe.meta.get_docfield(this.frm.doctype, "shipping_address") &&
- in_list(['Purchase Order', 'Purchase Receipt', 'Purchase Invoice'], this.frm.doctype)){
+ in_list(['Purchase Order', 'Purchase Receipt', 'Purchase Invoice'], this.frm.doctype)) {
erpnext.utils.get_shipping_address(this.frm, function(){
set_party_account(set_pricing);
})
+
+ // Get default company billing address in Purchase Invoice, Order and Receipt
+ frappe.call({
+ 'method': 'frappe.contacts.doctype.address.address.get_default_address',
+ 'args': {
+ 'doctype': 'Company',
+ 'name': this.frm.doc.company
+ },
+ 'callback': function(r) {
+ me.frm.set_value('billing_address', r.message);
+ }
+ });
+
} else {
set_party_account(set_pricing);
}
diff --git a/erpnext/public/less/products.less b/erpnext/public/less/products.less
index 79f57b3..5e744ce 100644
--- a/erpnext/public/less/products.less
+++ b/erpnext/public/less/products.less
@@ -22,6 +22,8 @@
}
.filter-options {
+ margin-left: -5px;
+ padding-left: 5px;
max-height: 300px;
overflow: auto;
}
diff --git a/erpnext/regional/india/taxes.js b/erpnext/regional/india/taxes.js
index fbccc6b..3b6a28f 100644
--- a/erpnext/regional/india/taxes.js
+++ b/erpnext/regional/india/taxes.js
@@ -6,6 +6,9 @@
shipping_address: function(frm) {
frm.trigger('get_tax_template');
},
+ supplier_address: function(frm) {
+ frm.trigger('get_tax_template');
+ },
tax_category: function(frm) {
frm.trigger('get_tax_template');
},
diff --git a/erpnext/regional/india/utils.py b/erpnext/regional/india/utils.py
index fe7e0c8..69e47a4 100644
--- a/erpnext/regional/india/utils.py
+++ b/erpnext/regional/india/utils.py
@@ -1,6 +1,7 @@
from __future__ import unicode_literals
import frappe, re, json
from frappe import _
+import erpnext
from frappe.utils import cstr, flt, date_diff, nowdate, round_based_on_smallest_currency_fraction, money_in_words
from erpnext.regional.india import states, state_numbers
from erpnext.controllers.taxes_and_totals import get_itemised_tax, get_itemised_taxable_amount
@@ -673,25 +674,34 @@
if country != 'India':
return
+ if not doc.total_taxes_and_charges:
+ return
+
if doc.reverse_charge == 'Y':
gst_accounts = get_gst_accounts(doc.company)
gst_account_list = gst_accounts.get('cgst_account') + gst_accounts.get('sgst_account') \
+ gst_accounts.get('igst_account')
+ base_gst_tax = 0
gst_tax = 0
+
for tax in doc.get('taxes'):
if tax.category not in ("Total", "Valuation and Total"):
continue
if flt(tax.base_tax_amount_after_discount_amount) and tax.account_head in gst_account_list:
- gst_tax += tax.base_tax_amount_after_discount_amount
+ base_gst_tax += tax.base_tax_amount_after_discount_amount
+ gst_tax += tax.tax_amount_after_discount_amount
doc.taxes_and_charges_added -= gst_tax
doc.total_taxes_and_charges -= gst_tax
+ doc.base_taxes_and_charges_added -= base_gst_tax
+ doc.base_total_taxes_and_charges -= base_gst_tax
- update_totals(gst_tax, doc)
+ update_totals(gst_tax, base_gst_tax, doc)
-def update_totals(gst_tax, doc):
+def update_totals(gst_tax, base_gst_tax, doc):
+ doc.base_grand_total -= base_gst_tax
doc.grand_total -= gst_tax
if doc.meta.get_field("rounded_total"):
@@ -707,13 +717,14 @@
doc.outstanding_amount = doc.rounded_total or doc.grand_total
doc.in_words = money_in_words(doc.grand_total, doc.currency)
+ doc.base_in_words = money_in_words(doc.base_grand_total, erpnext.get_company_currency(doc.company))
doc.set_payment_schedule()
def make_regional_gl_entries(gl_entries, doc):
country = frappe.get_cached_value('Company', doc.company, 'country')
if country != 'India':
- return
+ return gl_entries
if doc.reverse_charge == 'Y':
gst_accounts = get_gst_accounts(doc.company)
@@ -724,6 +735,7 @@
if tax.category not in ("Total", "Valuation and Total"):
continue
+ dr_or_cr = "credit" if tax.add_deduct_tax == "Add" else "debit"
if flt(tax.base_tax_amount_after_discount_amount) and tax.account_head in gst_account_list:
account_currency = get_account_currency(tax.account_head)
@@ -733,8 +745,8 @@
"cost_center": tax.cost_center,
"posting_date": doc.posting_date,
"against": doc.supplier,
- "credit": tax.base_tax_amount_after_discount_amount,
- "credits_in_account_currency": tax.base_tax_amount_after_discount_amount \
+ dr_or_cr: tax.base_tax_amount_after_discount_amount,
+ dr_or_cr + "_in_account_currency": tax.base_tax_amount_after_discount_amount \
if account_currency==doc.company_currency \
else tax.tax_amount_after_discount_amount
}, account_currency, item=tax)
diff --git a/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.js b/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.js
index dfdf9dc..b757d53 100644
--- a/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.js
+++ b/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.js
@@ -46,5 +46,28 @@
],
onload: (report) => {
fetch_gstins(report);
+
+ report.page.add_inner_button(__("Download JSON"), function () {
+ var filters = report.get_values();
+
+ frappe.call({
+ method: 'erpnext.regional.report.hsn_wise_summary_of_outward_supplies.hsn_wise_summary_of_outward_supplies.get_json',
+ args: {
+ data: report.data,
+ report_name: report.report_name,
+ filters: filters
+ },
+ callback: function(r) {
+ if (r.message) {
+ const args = {
+ cmd: 'erpnext.regional.report.hsn_wise_summary_of_outward_supplies.hsn_wise_summary_of_outward_supplies.download_json_file',
+ data: r.message.data,
+ report_name: r.message.report_name
+ };
+ open_url_post(frappe.request.url, args);
+ }
+ }
+ });
+ });
}
};
diff --git a/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py b/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
index 222dfa1..59389ce 100644
--- a/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
+++ b/erpnext/regional/report/hsn_wise_summary_of_outward_supplies/hsn_wise_summary_of_outward_supplies.py
@@ -4,9 +4,13 @@
from __future__ import unicode_literals
import frappe, erpnext
from frappe import _
-from frappe.utils import flt
+from frappe.utils import flt, getdate, cstr
from frappe.model.meta import get_field_precision
from frappe.utils.xlsxutils import handle_html
+from six import iteritems
+import json
+from erpnext.regional.india.utils import get_gst_accounts
+from erpnext.regional.report.gstr_1.gstr_1 import get_company_gstin_number
def execute(filters=None):
return _execute(filters)
@@ -21,21 +25,24 @@
itemised_tax, tax_columns = get_tax_accounts(item_list, columns, company_currency)
data = []
+ added_item = []
for d in item_list:
- row = [d.gst_hsn_code, d.description, d.stock_uom, d.stock_qty]
- total_tax = 0
- for tax in tax_columns:
- item_tax = itemised_tax.get(d.name, {}).get(tax, {})
- total_tax += flt(item_tax.get("tax_amount"))
+ if (d.parent, d.item_code) not in added_item:
+ row = [d.gst_hsn_code, d.description, d.stock_uom, d.stock_qty]
+ total_tax = 0
+ for tax in tax_columns:
+ item_tax = itemised_tax.get((d.parent, d.item_code), {}).get(tax, {})
+ total_tax += flt(item_tax.get("tax_amount", 0))
- row += [d.base_net_amount + total_tax]
- row += [d.base_net_amount]
+ row += [d.base_net_amount + total_tax]
+ row += [d.base_net_amount]
- for tax in tax_columns:
- item_tax = itemised_tax.get(d.name, {}).get(tax, {})
- row += [item_tax.get("tax_amount", 0)]
+ for tax in tax_columns:
+ item_tax = itemised_tax.get((d.parent, d.item_code), {}).get(tax, {})
+ row += [item_tax.get("tax_amount", 0)]
- data.append(row)
+ data.append(row)
+ added_item.append((d.parent, d.item_code))
if data:
data = get_merged_data(columns, data) # merge same hsn code data
return columns, data
@@ -103,7 +110,7 @@
match_conditions = " and {0} ".format(match_conditions)
- return frappe.db.sql("""
+ items = frappe.db.sql("""
select
`tabSales Invoice Item`.name, `tabSales Invoice Item`.base_price_list_rate,
`tabSales Invoice Item`.gst_hsn_code, `tabSales Invoice Item`.stock_qty,
@@ -118,10 +125,9 @@
""" % (conditions, match_conditions), filters, as_dict=1)
+ return items
-def get_tax_accounts(item_list, columns, company_currency,
- doctype="Sales Invoice", tax_doctype="Sales Taxes and Charges"):
- import json
+def get_tax_accounts(item_list, columns, company_currency, doctype="Sales Invoice", tax_doctype="Sales Taxes and Charges"):
item_row_map = {}
tax_columns = []
invoice_item_row = {}
@@ -137,7 +143,7 @@
tax_details = frappe.db.sql("""
select
- parent, description, item_wise_tax_detail,
+ parent, account_head, item_wise_tax_detail,
base_tax_amount_after_discount_amount
from `tab%s`
where
@@ -149,11 +155,11 @@
""" % (tax_doctype, '%s', ', '.join(['%s']*len(invoice_item_row)), conditions),
tuple([doctype] + list(invoice_item_row)))
- for parent, description, item_wise_tax_detail, tax_amount in tax_details:
- description = handle_html(description)
- if description not in tax_columns and tax_amount:
+ for parent, account_head, item_wise_tax_detail, tax_amount in tax_details:
+
+ if account_head not in tax_columns and tax_amount:
# as description is text editor earlier and markup can break the column convention in reports
- tax_columns.append(description)
+ tax_columns.append(account_head)
if item_wise_tax_detail:
try:
@@ -171,50 +177,113 @@
for d in item_row_map.get(parent, {}).get(item_code, []):
item_tax_amount = tax_amount
if item_tax_amount:
- itemised_tax.setdefault(d.name, {})[description] = frappe._dict({
+ itemised_tax.setdefault((parent, item_code), {})[account_head] = frappe._dict({
"tax_amount": flt(item_tax_amount, tax_amount_precision)
})
except ValueError:
continue
tax_columns.sort()
- for desc in tax_columns:
- columns.append(desc + " Amount:Currency/currency:160")
+ for account_head in tax_columns:
+ columns.append({
+ "label": account_head,
+ "fieldname": frappe.scrub(account_head),
+ "fieldtype": "Float",
+ "width": 110
+ })
- # columns += ["Total Amount:Currency/currency:110"]
return itemised_tax, tax_columns
def get_merged_data(columns, data):
merged_hsn_dict = {} # to group same hsn under one key and perform row addition
- add_column_index = [] # store index of columns that needs to be added
- tax_col = len(get_columns())
- fields_to_merge = ["stock_qty", "total_amount", "taxable_amount"] # columns for which index needs to be found
-
- for i,d in enumerate(columns):
- # check if fieldname in to_merge list and ignore tax-columns
- if i < tax_col and d["fieldname"] in fields_to_merge:
- add_column_index.append(i)
+ result = []
for row in data:
- if row[0] in merged_hsn_dict:
- to_add_row = merged_hsn_dict.get(row[0])
+ merged_hsn_dict.setdefault(row[0], {})
+ for i, d in enumerate(columns):
+ if d['fieldtype'] not in ('Int', 'Float', 'Currency'):
+ merged_hsn_dict[row[0]][d['fieldname']] = row[i]
+ else:
+ if merged_hsn_dict.get(row[0], {}).get(d['fieldname'], ''):
+ merged_hsn_dict[row[0]][d['fieldname']] += row[i]
+ else:
+ merged_hsn_dict[row[0]][d['fieldname']] = row[i]
- # add columns from the add_column_index table
- for k in add_column_index:
- to_add_row[k] += row[k]
+ for key, value in iteritems(merged_hsn_dict):
+ result.append(value)
- # add tax columns
- for k in range(len(columns)):
- if tax_col <= k < len(columns):
- to_add_row[k] += row[k]
+ return result
- # update hsn dict with the newly added data
- merged_hsn_dict[row[0]] = to_add_row
- else:
- merged_hsn_dict[row[0]] = row
+@frappe.whitelist()
+def get_json(filters, report_name, data):
+ filters = json.loads(filters)
+ report_data = json.loads(data)
+ gstin = filters.get('company_gstin') or get_company_gstin_number(filters["company"])
- # extract data rows to be displayed in report
- data = [merged_hsn_dict[d] for d in merged_hsn_dict]
+ if not filters.get('from_date') or not filters.get('to_date'):
+ frappe.throw(_("Please enter From Date and To Date to generate JSON"))
+
+ fp = "%02d%s" % (getdate(filters["to_date"]).month, getdate(filters["to_date"]).year)
+
+ gst_json = {"version": "GST2.3.4",
+ "hash": "hash", "gstin": gstin, "fp": fp}
+
+ gst_json["hsn"] = {
+ "data": get_hsn_wise_json_data(filters, report_data)
+ }
+
+ return {
+ 'report_name': report_name,
+ 'data': gst_json
+ }
+
+@frappe.whitelist()
+def download_json_file():
+ '''download json content in a file'''
+ data = frappe._dict(frappe.local.form_dict)
+ frappe.response['filename'] = frappe.scrub("{0}".format(data['report_name'])) + '.json'
+ frappe.response['filecontent'] = data['data']
+ frappe.response['content_type'] = 'application/json'
+ frappe.response['type'] = 'download'
+
+def get_hsn_wise_json_data(filters, report_data):
+
+ filters = frappe._dict(filters)
+ gst_accounts = get_gst_accounts(filters.company)
+ data = []
+ count = 1
+
+ for hsn in report_data:
+ row = {
+ "num": count,
+ "hsn_sc": hsn.get("gst_hsn_code"),
+ "desc": hsn.get("description"),
+ "uqc": hsn.get("stock_uom").upper(),
+ "qty": hsn.get("stock_qty"),
+ "val": flt(hsn.get("total_amount"), 2),
+ "txval": flt(hsn.get("taxable_amount", 2)),
+ "iamt": 0.0,
+ "camt": 0.0,
+ "samt": 0.0,
+ "csamt": 0.0
+
+ }
+
+ for account in gst_accounts.get('igst_account'):
+ row['iamt'] += flt(hsn.get(frappe.scrub(cstr(account)), 0.0), 2)
+
+ for account in gst_accounts.get('cgst_account'):
+ row['camt'] += flt(hsn.get(frappe.scrub(cstr(account)), 0.0), 2)
+
+ for account in gst_accounts.get('sgst_account'):
+ row['samt'] += flt(hsn.get(frappe.scrub(cstr(account)), 0.0), 2)
+
+ for account in gst_accounts.get('cess_account'):
+ row['csamt'] += flt(hsn.get(frappe.scrub(cstr(account)), 0.0), 2)
+
+ data.append(row)
+ count +=1
return data
+
diff --git a/erpnext/selling/desk_page/retail/retail.json b/erpnext/selling/desk_page/retail/retail.json
index 7b30af2..581e14c 100644
--- a/erpnext/selling/desk_page/retail/retail.json
+++ b/erpnext/selling/desk_page/retail/retail.json
@@ -3,7 +3,7 @@
{
"hidden": 0,
"label": "Retail Operations",
- "links": "[\n {\n \"description\": \"Setup default values for POS Invoices\",\n \"label\": \"Point-of-Sale Profile\",\n \"name\": \"POS Profile\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"dependencies\": [\n \"POS Profile\"\n ],\n \"description\": \"Point of Sale\",\n \"label\": \"POS\",\n \"name\": \"pos\",\n \"onboard\": 1,\n \"type\": \"page\"\n },\n {\n \"description\": \"Cashier Closing\",\n \"label\": \"Cashier Closing\",\n \"name\": \"Cashier Closing\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Setup mode of POS (Online / Offline)\",\n \"label\": \"POS Settings\",\n \"name\": \"POS Settings\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"To make Customer based incentive schemes.\",\n \"label\": \"Loyalty Program\",\n \"name\": \"Loyalty Program\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"To view logs of Loyalty Points assigned to a Customer.\",\n \"label\": \"Loyalty Point Entry\",\n \"name\": \"Loyalty Point Entry\",\n \"type\": \"doctype\"\n }\n]"
+ "links": "[\n {\n \"description\": \"Setup default values for POS Invoices\",\n \"label\": \"Point of Sale Profile\",\n \"name\": \"POS Profile\",\n \"onboard\": 1,\n \"type\": \"doctype\"\n },\n {\n \"dependencies\": [\n \"POS Profile\"\n ],\n \"description\": \"Point of Sale\",\n \"label\": \"Point of Sale\",\n \"name\": \"point-of-sale\",\n \"onboard\": 1,\n \"type\": \"page\"\n },\n {\n \"description\": \"Setup mode of POS (Online / Offline)\",\n \"label\": \"POS Settings\",\n \"name\": \"POS Settings\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"Cashier Closing\",\n \"label\": \"Cashier Closing\",\n \"name\": \"Cashier Closing\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"To make Customer based incentive schemes.\",\n \"label\": \"Loyalty Program\",\n \"name\": \"Loyalty Program\",\n \"type\": \"doctype\"\n },\n {\n \"description\": \"To view logs of Loyalty Points assigned to a Customer.\",\n \"label\": \"Loyalty Point Entry\",\n \"name\": \"Loyalty Point Entry\",\n \"type\": \"doctype\"\n }\n]"
}
],
"category": "Domains",
@@ -14,10 +14,11 @@
"docstatus": 0,
"doctype": "Desk Page",
"extends_another_page": 0,
+ "hide_custom": 0,
"idx": 0,
"is_standard": 1,
"label": "Retail",
- "modified": "2020-04-26 22:42:39.346750",
+ "modified": "2020-08-20 18:00:07.515691",
"modified_by": "Administrator",
"module": "Selling",
"name": "Retail",
@@ -25,5 +26,27 @@
"pin_to_bottom": 0,
"pin_to_top": 0,
"restrict_to_domain": "Retail",
- "shortcuts": []
+ "shortcuts": [
+ {
+ "color": "#9deca2",
+ "doc_view": "",
+ "format": "{} Active",
+ "label": "Point of Sale Profile",
+ "link_to": "POS Profile",
+ "stats_filter": "{\n \"disabled\": 0\n}",
+ "type": "DocType"
+ },
+ {
+ "doc_view": "",
+ "label": "Point of Sale",
+ "link_to": "point-of-sale",
+ "type": "Page"
+ },
+ {
+ "doc_view": "",
+ "label": "POS Settings",
+ "link_to": "POS Settings",
+ "type": "DocType"
+ }
+ ]
}
\ No newline at end of file
diff --git a/erpnext/selling/desk_page/selling/selling.json b/erpnext/selling/desk_page/selling/selling.json
index 2252382..4c09ee9 100644
--- a/erpnext/selling/desk_page/selling/selling.json
+++ b/erpnext/selling/desk_page/selling/selling.json
@@ -18,7 +18,7 @@
{
"hidden": 0,
"label": "Key Reports",
- "links": "[\n {\n \"dependencies\": [\n \"Sales Order\"\n ],\n \"doctype\": \"Sales Order\",\n \"is_query_report\": true,\n \"label\": \"Sales Analytics\",\n \"name\": \"Sales Analytics\",\n \"onboard\": 1,\n \"type\": \"report\"\n },\n {\n \"dependencies\": [\n \"Sales Order\"\n ],\n \"doctype\": \"Sales Order\",\n \"is_query_report\": true,\n \"label\": \"Sales Order Analysis\",\n \"name\": \"Sales Order Analysis\",\n \"onboard\": 1,\n \"type\": \"report\"\n },\n {\n \"icon\": \"fa fa-bar-chart\",\n \"label\": \"Sales Funnel\",\n \"name\": \"sales-funnel\",\n \"onboard\": 1,\n \"type\": \"page\"\n },\n {\n \"dependencies\": [\n \"Sales Order\"\n ],\n \"doctype\": \"Sales Order\",\n \"is_query_report\": true,\n \"label\": \"Sales Order Trends\",\n \"name\": \"Sales Order Trends\",\n \"type\": \"report\"\n },\n {\n \"dependencies\": [\n \"Quotation\"\n ],\n \"doctype\": \"Quotation\",\n \"is_query_report\": true,\n \"label\": \"Quotation Trends\",\n \"name\": \"Quotation Trends\",\n \"type\": \"report\"\n },\n {\n \"dependencies\": [\n \"Customer\"\n ],\n \"doctype\": \"Customer\",\n \"icon\": \"fa fa-bar-chart\",\n \"is_query_report\": true,\n \"label\": \"Customer Acquisition and Loyalty\",\n \"name\": \"Customer Acquisition and Loyalty\",\n \"type\": \"report\"\n },\n {\n \"dependencies\": [\n \"Sales Order\"\n ],\n \"doctype\": \"Sales Order\",\n \"is_query_report\": true,\n \"label\": \"Inactive Customers\",\n \"name\": \"Inactive Customers\",\n \"type\": \"report\"\n },\n {\n \"dependencies\": [\n \"Sales Order\"\n ],\n \"doctype\": \"Sales Order\",\n \"is_query_report\": true,\n \"label\": \"Sales Person-wise Transaction Summary\",\n \"name\": \"Sales Person-wise Transaction Summary\",\n \"type\": \"report\"\n },\n {\n \"dependencies\": [\n \"Item\"\n ],\n \"doctype\": \"Item\",\n \"is_query_report\": true,\n \"label\": \"Item-wise Sales History\",\n \"name\": \"Item-wise Sales History\",\n \"type\": \"report\"\n }\n]"
+ "links": "[\n {\n \n \"doctype\": \"Sales Order\",\n \"is_query_report\": true,\n \"label\": \"Sales Analytics\",\n \"name\": \"Sales Analytics\",\n \"onboard\": 1,\n \"type\": \"report\"\n },\n {\n \"dependencies\": [\n \"Sales Order\"\n ],\n \"doctype\": \"Sales Order\",\n \"is_query_report\": true,\n \"label\": \"Sales Order Analysis\",\n \"name\": \"Sales Order Analysis\",\n \"onboard\": 1,\n \"type\": \"report\"\n },\n {\n \"icon\": \"fa fa-bar-chart\",\n \"label\": \"Sales Funnel\",\n \"name\": \"sales-funnel\",\n \"onboard\": 1,\n \"type\": \"page\"\n },\n {\n \"dependencies\": [\n \"Sales Order\"\n ],\n \"doctype\": \"Sales Order\",\n \"is_query_report\": true,\n \"label\": \"Sales Order Trends\",\n \"name\": \"Sales Order Trends\",\n \"type\": \"report\"\n },\n {\n \"dependencies\": [\n \"Quotation\"\n ],\n \"doctype\": \"Quotation\",\n \"is_query_report\": true,\n \"label\": \"Quotation Trends\",\n \"name\": \"Quotation Trends\",\n \"type\": \"report\"\n },\n {\n \"dependencies\": [\n \"Customer\"\n ],\n \"doctype\": \"Customer\",\n \"icon\": \"fa fa-bar-chart\",\n \"is_query_report\": true,\n \"label\": \"Customer Acquisition and Loyalty\",\n \"name\": \"Customer Acquisition and Loyalty\",\n \"type\": \"report\"\n },\n {\n \"dependencies\": [\n \"Sales Order\"\n ],\n \"doctype\": \"Sales Order\",\n \"is_query_report\": true,\n \"label\": \"Inactive Customers\",\n \"name\": \"Inactive Customers\",\n \"type\": \"report\"\n },\n {\n \"dependencies\": [\n \"Sales Order\"\n ],\n \"doctype\": \"Sales Order\",\n \"is_query_report\": true,\n \"label\": \"Sales Person-wise Transaction Summary\",\n \"name\": \"Sales Person-wise Transaction Summary\",\n \"type\": \"report\"\n },\n {\n \"dependencies\": [\n \"Item\"\n ],\n \"doctype\": \"Item\",\n \"is_query_report\": true,\n \"label\": \"Item-wise Sales History\",\n \"name\": \"Item-wise Sales History\",\n \"type\": \"report\"\n }\n]"
},
{
"hidden": 0,
@@ -44,7 +44,7 @@
"idx": 0,
"is_standard": 1,
"label": "Selling",
- "modified": "2020-06-29 19:26:35.139097",
+ "modified": "2020-08-15 10:12:53.131621",
"modified_by": "Administrator",
"module": "Selling",
"name": "Selling",
diff --git a/erpnext/selling/doctype/customer/customer.py b/erpnext/selling/doctype/customer/customer.py
index 93d4832..911fe51 100644
--- a/erpnext/selling/doctype/customer/customer.py
+++ b/erpnext/selling/doctype/customer/customer.py
@@ -184,10 +184,10 @@
def validate_credit_limit_on_change(self):
if self.get("__islocal") or not self.credit_limits:
return
-
+
past_credit_limits = [d.credit_limit
for d in frappe.db.get_all("Customer Credit Limit", filters={'parent': self.name}, fields=["credit_limit"], order_by="company")]
-
+
current_credit_limits = [d.credit_limit for d in sorted(self.credit_limits, key=lambda k: k.company)]
if past_credit_limits == current_credit_limits:
diff --git a/erpnext/selling/doctype/customer/customer_dashboard.py b/erpnext/selling/doctype/customer/customer_dashboard.py
index 09e474d..532c11b 100644
--- a/erpnext/selling/doctype/customer/customer_dashboard.py
+++ b/erpnext/selling/doctype/customer/customer_dashboard.py
@@ -33,7 +33,7 @@
},
{
'label': _('Support'),
- 'items': ['Issue']
+ 'items': ['Issue', 'Maintenance Visit', 'Installation Note', 'Warranty Claim']
},
{
'label': _('Projects'),
diff --git a/erpnext/selling/doctype/quotation/quotation.py b/erpnext/selling/doctype/quotation/quotation.py
index ab095eb..20ae19f 100644
--- a/erpnext/selling/doctype/quotation/quotation.py
+++ b/erpnext/selling/doctype/quotation/quotation.py
@@ -285,9 +285,17 @@
return customer
else:
raise
- except frappe.MandatoryError:
+ except frappe.MandatoryError as e:
+ mandatory_fields = e.args[0].split(':')[1].split(',')
+ mandatory_fields = [customer.meta.get_label(field.strip()) for field in mandatory_fields]
+
frappe.local.message_log = []
- frappe.throw(_("Please create Customer from Lead {0}").format(lead_name))
+ lead_link = frappe.utils.get_link_to_form("Lead", lead_name)
+ message = _("Could not auto create Customer due to the following missing mandatory field(s):") + "<br>"
+ message += "<br><ul><li>" + "</li><li>".join(mandatory_fields) + "</li></ul>"
+ message += _("Please create Customer from Lead {0}.").format(lead_link)
+
+ frappe.throw(message, title=_("Mandatory Missing"))
else:
return customer_name
else:
diff --git a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
index 4126bc6..05a760d 100644
--- a/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
+++ b/erpnext/selling/doctype/sales_order/sales_order_dashboard.py
@@ -10,6 +10,7 @@
'Payment Entry': 'reference_name',
'Payment Request': 'reference_name',
'Auto Repeat': 'reference_document',
+ 'Maintenance Visit': 'prevdoc_docname'
},
'internal_links': {
'Quotation': ['items', 'prevdoc_docname']
@@ -17,7 +18,7 @@
'transactions': [
{
'label': _('Fulfillment'),
- 'items': ['Sales Invoice', 'Pick List', 'Delivery Note']
+ 'items': ['Sales Invoice', 'Pick List', 'Delivery Note', 'Maintenance Visit']
},
{
'label': _('Purchasing'),
diff --git a/erpnext/selling/page/point_of_sale/pos_item_cart.js b/erpnext/selling/page/point_of_sale/pos_item_cart.js
index c23a6ad..eadeb8f 100644
--- a/erpnext/selling/page/point_of_sale/pos_item_cart.js
+++ b/erpnext/selling/page/point_of_sale/pos_item_cart.js
@@ -356,7 +356,7 @@
onchange: function() {
if (this.value || this.value == 0) {
const frm = me.events.get_frm();
- frappe.model.set_value(frm.doc.doctype, frm.doc.name, 'additional_discount_percentage', this.value);
+ frappe.model.set_value(frm.doc.doctype, frm.doc.name, 'additional_discount_percentage', flt(this.value));
me.hide_discount_control(this.value);
}
},
@@ -948,4 +948,4 @@
show ? this.$component.removeClass('d-none') : this.$component.addClass('d-none');
}
-}
\ No newline at end of file
+}
diff --git a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js
index 24326b2..30e0918 100644
--- a/erpnext/selling/page/point_of_sale/pos_past_order_summary.js
+++ b/erpnext/selling/page/point_of_sale/pos_past_order_summary.js
@@ -86,7 +86,7 @@
this.$summary_container.append(
`<div class="summary-btns flex summary-btns justify-between w-full f-shrink-0"></div>`
)
-
+
this.$summary_btns = this.$summary_container.find('.summary-btns');
}
@@ -110,7 +110,10 @@
{fieldname:'print', fieldtype:'Data', label:'Print Preview'}
],
primary_action: () => {
- this.events.get_frm().print_preview.printit(true);
+ const frm = this.events.get_frm();
+ frm.doc = this.doc;
+ frm.print_preview.lang_code = frm.doc.language;
+ frm.print_preview.printit(true);
},
primary_action_label: __('Print'),
});
@@ -174,7 +177,7 @@
<div class="flex">
<div class="text-md-0 text-dark-grey text-bold w-fit">Tax Charges</div>
<div class="flex ml-6 text-dark-grey">
- ${
+ ${
doc.taxes.map((t, i) => {
let margin_left = '';
if (i !== 0) margin_left = 'ml-2';
@@ -271,6 +274,7 @@
// this.print_dialog.show();
const frm = this.events.get_frm();
frm.doc = this.doc;
+ frm.print_preview.lang_code = frm.doc.language;
frm.print_preview.printit(true);
});
}
@@ -284,9 +288,9 @@
this.$summary_container.find('.print-btn').click();
});
}
-
+
toggle_component(show) {
- show ?
+ show ?
this.$component.removeClass('d-none') :
this.$component.addClass('d-none');
}
@@ -372,9 +376,9 @@
}
get_condition_btn_map(after_submission) {
- if (after_submission)
+ if (after_submission)
return [{ condition: true, visible_btns: ['Print Receipt', 'Email Receipt', 'New Order'] }];
-
+
return [
{ condition: this.doc.docstatus === 0, visible_btns: ['Edit Order'] },
{ condition: !this.doc.is_return && this.doc.docstatus === 1, visible_btns: ['Print Receipt', 'Email Receipt', 'Return']},
@@ -384,7 +388,7 @@
load_summary_of(doc, after_submission=false) {
this.$summary_wrapper.removeClass("d-none");
-
+
after_submission ?
this.switch_to_post_submit_summary() : this.switch_to_recent_invoice_summary();
diff --git a/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
index 857b982..ae216ca 100644
--- a/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
+++ b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/item_group_wise_sales_target_variance.py
@@ -63,13 +63,13 @@
"label": _(partner_doctype),
"fieldtype": "Link",
"options": partner_doctype,
- "width": 100
+ "width": 150
}, {
"fieldname": "item_group",
"label": _("Item Group"),
"fieldtype": "Link",
"options": "Item Group",
- "width": 100
+ "width": 150
}]
for period in period_list:
@@ -81,19 +81,19 @@
"label": _("Target ({})").format(period.label),
"fieldtype": fieldtype,
"options": options,
- "width": 100
+ "width": 150
}, {
"fieldname": period.key,
"label": _("Achieved ({})").format(period.label),
"fieldtype": fieldtype,
"options": options,
- "width": 100
+ "width": 150
}, {
"fieldname": variance_key,
"label": _("Variance ({})").format(period.label),
"fieldtype": fieldtype,
"options": options,
- "width": 100
+ "width": 150
}])
columns.extend([{
@@ -101,19 +101,19 @@
"label": _("Total Target"),
"fieldtype": fieldtype,
"options": options,
- "width": 100
+ "width": 150
}, {
"fieldname": "total_achieved",
"label": _("Total Achieved"),
"fieldtype": fieldtype,
"options": options,
- "width": 100
+ "width": 150
}, {
"fieldname": "total_variance",
"label": _("Total Variance"),
"fieldtype": fieldtype,
"options": options,
- "width": 100
+ "width": 150
}])
return columns
@@ -154,10 +154,10 @@
if (r.get(sales_field) == d.parent and r.item_group == d.item_group and
period.from_date <= r.get(date_field) and r.get(date_field) <= period.to_date):
details[p_key] += r.get(qty_or_amount_field, 0)
- details[variance_key] = details.get(target_key) - details.get(p_key)
+ details[variance_key] = details.get(p_key) - details.get(target_key)
details["total_achieved"] += details.get(p_key)
- details["total_variance"] = details.get("total_target") - details.get("total_achieved")
+ details["total_variance"] = details.get("total_achieved") - details.get("total_target")
return rows
diff --git a/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js
index f99f68c..38bb127 100644
--- a/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js
+++ b/erpnext/selling/report/sales_partner_target_variance_based_on_item_group/sales_partner_target_variance_based_on_item_group.js
@@ -44,5 +44,20 @@
options: "Quantity\nAmount",
default: "Quantity"
},
- ]
+ ],
+ "formatter": function (value, row, column, data, default_formatter) {
+ value = default_formatter(value, row, column, data);
+
+ if (column.fieldname.includes('variance')) {
+
+ if (data[column.fieldname] < 0) {
+ value = "<span style='color:red'>" + value + "</span>";
+ }
+ else if (data[column.fieldname] > 0) {
+ value = "<span style='color:green'>" + value + "</span>";
+ }
+ }
+
+ return value;
+ }
}
diff --git a/erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js b/erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js
index 9f6bfc4..a8e2fad 100644
--- a/erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js
+++ b/erpnext/selling/report/sales_person_target_variance_based_on_item_group/sales_person_target_variance_based_on_item_group.js
@@ -44,5 +44,20 @@
options: "Quantity\nAmount",
default: "Quantity"
},
- ]
+ ],
+ "formatter": function (value, row, column, data, default_formatter) {
+ value = default_formatter(value, row, column, data);
+
+ if (column.fieldname.includes('variance')) {
+
+ if (data[column.fieldname] < 0) {
+ value = "<span style='color:red'>" + value + "</span>";
+ }
+ else if (data[column.fieldname] > 0) {
+ value = "<span style='color:green'>" + value + "</span>";
+ }
+ }
+
+ return value;
+ }
}
diff --git a/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js b/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js
index dd9607f..263391a 100644
--- a/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js
+++ b/erpnext/selling/report/territory_target_variance_based_on_item_group/territory_target_variance_based_on_item_group.js
@@ -44,5 +44,20 @@
options: "Quantity\nAmount",
default: "Quantity"
},
- ]
+ ],
+ "formatter": function (value, row, column, data, default_formatter) {
+ value = default_formatter(value, row, column, data);
+
+ if (column.fieldname.includes('variance')) {
+
+ if (data[column.fieldname] < 0) {
+ value = "<span style='color:red'>" + value + "</span>";
+ }
+ else if (data[column.fieldname] > 0) {
+ value = "<span style='color:green'>" + value + "</span>";
+ }
+ }
+
+ return value;
+ }
}
diff --git a/erpnext/setup/doctype/company/delete_company_transactions.py b/erpnext/setup/doctype/company/delete_company_transactions.py
index 8ecc13b..c94831e 100644
--- a/erpnext/setup/doctype/company/delete_company_transactions.py
+++ b/erpnext/setup/doctype/company/delete_company_transactions.py
@@ -26,7 +26,8 @@
tabDocField where fieldtype='Link' and options='Company'"""):
if doctype not in ("Account", "Cost Center", "Warehouse", "Budget",
"Party Account", "Employee", "Sales Taxes and Charges Template",
- "Purchase Taxes and Charges Template", "POS Profile", 'BOM'):
+ "Purchase Taxes and Charges Template", "POS Profile", "BOM",
+ "Company", "Bank Account"):
delete_for_doctype(doctype, company_name)
# reset company values
diff --git a/erpnext/setup/install.py b/erpnext/setup/install.py
index aa9fbc0..4f0f572 100644
--- a/erpnext/setup/install.py
+++ b/erpnext/setup/install.py
@@ -7,6 +7,7 @@
from erpnext.accounts.doctype.cash_flow_mapper.default_cash_flow_mapper import DEFAULT_MAPPERS
from .default_success_action import get_default_success_action
from frappe import _
+from frappe.utils import cint
from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to
from frappe.custom.doctype.custom_field.custom_field import create_custom_field
from erpnext.setup.default_energy_point_rules import get_default_energy_point_rules
@@ -25,12 +26,13 @@
create_default_success_action()
create_default_energy_point_rules()
add_company_to_session_defaults()
+ add_standard_navbar_items()
frappe.db.commit()
def check_setup_wizard_not_completed():
- if frappe.db.get_default('desktop:home_page') != 'setup-wizard':
- message = """ERPNext can only be installed on a fresh site where the setup wizard is not completed.
+ if cint(frappe.db.get_single_value('System Settings', 'setup_complete') or 0):
+ message = """ERPNext can only be installed on a fresh site where the setup wizard is not completed.
You can reinstall this site (after saving your data) using: bench --site [sitename] reinstall"""
frappe.throw(message)
@@ -103,3 +105,45 @@
"ref_doctype": "Company"
})
settings.save()
+
+def add_standard_navbar_items():
+ navbar_settings = frappe.get_single("Navbar Settings")
+
+ erpnext_navbar_items = [
+ {
+ 'item_label': 'Documentation',
+ 'item_type': 'Route',
+ 'route': 'https://erpnext.com/docs/user/manual',
+ 'is_standard': 1
+ },
+ {
+ 'item_label': 'User Forum',
+ 'item_type': 'Route',
+ 'route': 'https://discuss.erpnext.com',
+ 'is_standard': 1
+ },
+ {
+ 'item_label': 'Report an Issue',
+ 'item_type': 'Route',
+ 'route': 'https://github.com/frappe/erpnext/issues',
+ 'is_standard': 1
+ }
+ ]
+
+ current_nabvar_items = navbar_settings.help_dropdown
+ navbar_settings.set('help_dropdown', [])
+
+ for item in erpnext_navbar_items:
+ navbar_settings.append('help_dropdown', item)
+
+ for item in current_nabvar_items:
+ navbar_settings.append('help_dropdown', {
+ 'item_label': item.item_label,
+ 'item_type': item.item_type,
+ 'route': item.route,
+ 'action': item.action,
+ 'is_standard': item.is_standard,
+ 'hidden': item.hidden
+ })
+
+ navbar_settings.save()
diff --git a/erpnext/stock/doctype/item/item.py b/erpnext/stock/doctype/item/item.py
index d209f48..d22fda8 100644
--- a/erpnext/stock/doctype/item/item.py
+++ b/erpnext/stock/doctype/item/item.py
@@ -111,6 +111,7 @@
self.synced_with_hub = 0
self.validate_has_variants()
+ self.validate_attributes_in_variants()
self.validate_stock_exists_for_template_item()
self.validate_attributes()
self.validate_variant_attributes()
@@ -806,6 +807,77 @@
if frappe.db.exists("Item", {"variant_of": self.name}):
frappe.throw(_("Item has variants."))
+ def validate_attributes_in_variants(self):
+ if not self.has_variants or self.get("__islocal"):
+ return
+
+ old_doc = self.get_doc_before_save()
+ old_doc_attributes = set([attr.attribute for attr in old_doc.attributes])
+ own_attributes = [attr.attribute for attr in self.attributes]
+
+ # Check if old attributes were removed from the list
+ # Is old_attrs is a subset of new ones
+ # that means we need not check any changes
+ if old_doc_attributes.issubset(set(own_attributes)):
+ return
+
+ from collections import defaultdict
+
+ # get all item variants
+ items = [item["name"] for item in frappe.get_all("Item", {"variant_of": self.name})]
+
+ # get all deleted attributes
+ deleted_attribute = list(old_doc_attributes.difference(set(own_attributes)))
+
+ # fetch all attributes of these items
+ item_attributes = frappe.get_all(
+ "Item Variant Attribute",
+ filters={
+ "parent": ["in", items],
+ "attribute": ["in", deleted_attribute]
+ },
+ fields=["attribute", "parent"]
+ )
+ not_included = defaultdict(list)
+
+ for attr in item_attributes:
+ if attr["attribute"] not in own_attributes:
+ not_included[attr["parent"]].append(attr["attribute"])
+
+ if not len(not_included):
+ return
+
+ def body(docnames):
+ docnames.sort()
+ return "<br>".join(docnames)
+
+ def table_row(title, body):
+ return """<tr>
+ <td>{0}</td>
+ <td>{1}</td>
+ </tr>""".format(title, body)
+
+ rows = ''
+ for docname, attr_list in not_included.items():
+ link = "<a href='#Form/Item/{0}'>{0}</a>".format(frappe.bold(_(docname)))
+ rows += table_row(link, body(attr_list))
+
+ error_description = _('The following deleted attributes exist in Variants but not in the Template. You can either delete the Variants or keep the attribute(s) in template.')
+
+ message = """
+ <div>{0}</div><br>
+ <table class="table">
+ <thead>
+ <td>{1}</td>
+ <td>{2}</td>
+ </thead>
+ {3}
+ </table>
+ """.format(error_description, _('Variant Items'), _('Attributes'), rows)
+
+ frappe.throw(message, title=_("Variant Attribute Error"), is_minimizable=True, wide=True)
+
+
def validate_stock_exists_for_template_item(self):
if self.stock_ledger_created() and self._doc_before_save:
if (cint(self._doc_before_save.has_variants) != cint(self.has_variants)
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
index d0ba001..4e173ff 100644
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.py
@@ -227,6 +227,14 @@
if not stock_value_diff:
continue
+ # If PR is sub-contracted and fg item rate is zero
+ # in that case if account for shource and target warehouse are same,
+ # then GL entries should not be posted
+ if flt(stock_value_diff) == flt(d.rm_supp_cost) \
+ and warehouse_account.get(self.supplier_warehouse) \
+ and warehouse_account[d.warehouse]["account"] == warehouse_account[self.supplier_warehouse]["account"]:
+ continue
+
gl_entries.append(self.get_gl_dict({
"account": warehouse_account[d.warehouse]["account"],
"against": stock_rbnb,
@@ -242,16 +250,16 @@
credit_amount = flt(d.base_net_amount, d.precision("base_net_amount")) \
if credit_currency == self.company_currency else flt(d.net_amount, d.precision("net_amount"))
-
- gl_entries.append(self.get_gl_dict({
- "account": warehouse_account[d.from_warehouse]['account'] \
- if d.from_warehouse else stock_rbnb,
- "against": warehouse_account[d.warehouse]["account"],
- "cost_center": d.cost_center,
- "remarks": self.get("remarks") or _("Accounting Entry for Stock"),
- "debit": -1 * flt(d.base_net_amount, d.precision("base_net_amount")),
- "debit_in_account_currency": -1 * credit_amount
- }, credit_currency, item=d))
+ if credit_amount:
+ gl_entries.append(self.get_gl_dict({
+ "account": warehouse_account[d.from_warehouse]['account'] \
+ if d.from_warehouse else stock_rbnb,
+ "against": warehouse_account[d.warehouse]["account"],
+ "cost_center": d.cost_center,
+ "remarks": self.get("remarks") or _("Accounting Entry for Stock"),
+ "debit": -1 * flt(d.base_net_amount, d.precision("base_net_amount")),
+ "debit_in_account_currency": -1 * credit_amount
+ }, credit_currency, item=d))
negative_expense_to_be_booked += flt(d.item_tax_amount)
diff --git a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
index d97b9e8..67161aa 100644
--- a/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
+++ b/erpnext/stock/doctype/purchase_receipt/test_purchase_receipt.py
@@ -3,6 +3,7 @@
from __future__ import unicode_literals
import unittest
+import json
import frappe, erpnext
import frappe.defaults
from frappe.utils import cint, flt, cstr, today, random_string
@@ -18,6 +19,28 @@
set_perpetual_inventory(0)
frappe.db.set_value("Buying Settings", None, "allow_multiple_items", 1)
+ def test_reverse_purchase_receipt_sle(self):
+
+ frappe.db.set_value('UOM', '_Test UOM', 'must_be_whole_number', 0)
+
+ pr = make_purchase_receipt(qty=0.5)
+
+ sl_entry = frappe.db.get_all("Stock Ledger Entry", {"voucher_type": "Purchase Receipt",
+ "voucher_no": pr.name}, ['actual_qty'])
+
+ self.assertEqual(len(sl_entry), 1)
+ self.assertEqual(sl_entry[0].actual_qty, 0.5)
+
+ pr.cancel()
+
+ sl_entry_cancelled = frappe.db.get_all("Stock Ledger Entry", {"voucher_type": "Purchase Receipt",
+ "voucher_no": pr.name}, ['actual_qty'], order_by='creation')
+
+ self.assertEqual(len(sl_entry_cancelled), 2)
+ self.assertEqual(sl_entry_cancelled[1].actual_qty, -0.5)
+
+ frappe.db.set_value('UOM', '_Test UOM', 'must_be_whole_number', 1)
+
def test_make_purchase_invoice(self):
pr = make_purchase_receipt(do_not_save=True)
self.assertRaises(frappe.ValidationError, make_purchase_invoice, pr.name)
@@ -121,6 +144,87 @@
rm_supp_cost = sum([d.amount for d in pr.get("supplied_items")])
self.assertEqual(pr.get("items")[0].rm_supp_cost, flt(rm_supp_cost, 2))
+ def test_subcontracting_gle_fg_item_rate_zero(self):
+ from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
+ set_perpetual_inventory()
+ frappe.db.set_value("Buying Settings", None, "backflush_raw_materials_of_subcontract_based_on", "BOM")
+ make_stock_entry(item_code="_Test Item", target="Work In Progress - TCP1", qty=100, basic_rate=100, company="_Test Company with perpetual inventory")
+ make_stock_entry(item_code="_Test Item Home Desktop 100", target="Work In Progress - TCP1",
+ qty=100, basic_rate=100, company="_Test Company with perpetual inventory")
+ pr = make_purchase_receipt(item_code="_Test FG Item", qty=10, rate=0, is_subcontracted="Yes",
+ company="_Test Company with perpetual inventory", warehouse='Stores - TCP1', supplier_warehouse='Work In Progress - TCP1')
+
+ gl_entries = get_gl_entries("Purchase Receipt", pr.name)
+
+ self.assertFalse(gl_entries)
+
+ set_perpetual_inventory(0)
+
+ def test_subcontracting_over_receipt(self):
+ """
+ Behaviour: Raise multiple PRs against one PO that in total
+ receive more than the required qty in the PO.
+ Expected Result: Error Raised for Over Receipt against PO.
+ """
+ from erpnext.stock.doctype.stock_entry.test_stock_entry import make_stock_entry
+ from erpnext.buying.doctype.purchase_order.test_purchase_order import (update_backflush_based_on,
+ make_subcontracted_item, create_purchase_order)
+ from erpnext.buying.doctype.purchase_order.purchase_order import (make_purchase_receipt,
+ make_rm_stock_entry as make_subcontract_transfer_entry)
+
+ update_backflush_based_on("Material Transferred for Subcontract")
+ item_code = "_Test Subcontracted FG Item 1"
+ make_subcontracted_item(item_code)
+
+ po = create_purchase_order(item_code=item_code, qty=1,
+ is_subcontracted="Yes", supplier_warehouse="_Test Warehouse 1 - _TC")
+
+ #stock raw materials in a warehouse before transfer
+ make_stock_entry(target="_Test Warehouse - _TC",
+ item_code="_Test Item Home Desktop 100", qty=1, basic_rate=100)
+ make_stock_entry(target="_Test Warehouse - _TC",
+ item_code = "Test Extra Item 1", qty=1, basic_rate=100)
+ make_stock_entry(target="_Test Warehouse - _TC",
+ item_code = "_Test Item", qty=1, basic_rate=100)
+
+ rm_items = [
+ {
+ "item_code": item_code,
+ "rm_item_code": po.supplied_items[0].rm_item_code,
+ "item_name": "_Test Item",
+ "qty": po.supplied_items[0].required_qty,
+ "warehouse": "_Test Warehouse - _TC",
+ "stock_uom": "Nos"
+ },
+ {
+ "item_code": item_code,
+ "rm_item_code": po.supplied_items[1].rm_item_code,
+ "item_name": "Test Extra Item 1",
+ "qty": po.supplied_items[1].required_qty,
+ "warehouse": "_Test Warehouse - _TC",
+ "stock_uom": "Nos"
+ },
+ {
+ "item_code": item_code,
+ "rm_item_code": po.supplied_items[2].rm_item_code,
+ "item_name": "_Test Item Home Desktop 100",
+ "qty": po.supplied_items[2].required_qty,
+ "warehouse": "_Test Warehouse - _TC",
+ "stock_uom": "Nos"
+ }
+ ]
+ rm_item_string = json.dumps(rm_items)
+ se = frappe.get_doc(make_subcontract_transfer_entry(po.name, rm_item_string))
+ se.to_warehouse = "_Test Warehouse 1 - _TC"
+ se.save()
+ se.submit()
+
+ pr1 = make_purchase_receipt(po.name)
+ pr2 = make_purchase_receipt(po.name)
+
+ pr1.submit()
+ self.assertRaises(frappe.ValidationError, pr2.submit)
+
def test_serial_no_supplier(self):
pr = make_purchase_receipt(item_code="_Test Serialized Item With Series", qty=1)
self.assertEqual(frappe.db.get_value("Serial No", pr.get("items")[0].serial_no, "supplier"),
@@ -688,7 +792,7 @@
"received_qty": received_qty,
"rejected_qty": rejected_qty,
"rejected_warehouse": args.rejected_warehouse or "_Test Rejected Warehouse - _TC" if rejected_qty != 0 else "",
- "rate": args.rate or 50,
+ "rate": args.rate if args.rate != None else 50,
"conversion_factor": args.conversion_factor or 1.0,
"serial_no": args.serial_no,
"stock_uom": args.stock_uom or "_Test UOM",
diff --git a/erpnext/stock/stock_ledger.py b/erpnext/stock/stock_ledger.py
index e1b3730..f4490f1 100644
--- a/erpnext/stock/stock_ledger.py
+++ b/erpnext/stock/stock_ledger.py
@@ -31,7 +31,7 @@
sle['posting_time'] = now_datetime().strftime('%H:%M:%S.%f')
if cancel:
- sle['actual_qty'] = -flt(sle.get('actual_qty'), 0)
+ sle['actual_qty'] = -flt(sle.get('actual_qty'))
if sle['actual_qty'] < 0 and not sle.get('outgoing_rate'):
sle['outgoing_rate'] = get_incoming_outgoing_rate_for_cancel(sle.item_code,
diff --git a/erpnext/support/doctype/issue/issue.js b/erpnext/support/doctype/issue/issue.js
index 9e15757..858564a 100644
--- a/erpnext/support/doctype/issue/issue.js
+++ b/erpnext/support/doctype/issue/issue.js
@@ -209,11 +209,11 @@
frm.dashboard.set_headline_alert(
'<div class="row">' +
- '<div class="col-xs-6">' +
- '<span class="indicator whitespace-nowrap '+ time_to_respond.indicator +'"><span class="hidden-xs">Time to Respond: '+ time_to_respond.diff_display +'</span></span> ' +
+ '<div class="col-xs-12 col-sm-6">' +
+ '<span class="indicator whitespace-nowrap '+ time_to_respond.indicator +'"><span>Time to Respond: '+ time_to_respond.diff_display +'</span></span> ' +
'</div>' +
- '<div class="col-xs-6">' +
- '<span class="indicator whitespace-nowrap '+ time_to_resolve.indicator +'"><span class="hidden-xs">Time to Resolve: '+ time_to_resolve.diff_display +'</span></span> ' +
+ '<div class="col-xs-12 col-sm-6">' +
+ '<span class="indicator whitespace-nowrap '+ time_to_resolve.indicator +'"><span>Time to Resolve: '+ time_to_resolve.diff_display +'</span></span> ' +
'</div>' +
'</div>'
);
diff --git a/erpnext/templates/generators/item/item_add_to_cart.html b/erpnext/templates/generators/item/item_add_to_cart.html
index 2a70d8d..40bc0c7 100644
--- a/erpnext/templates/generators/item/item_add_to_cart.html
+++ b/erpnext/templates/generators/item/item_add_to_cart.html
@@ -27,22 +27,25 @@
{% endif %}
</div>
{% endif %}
- {% if product_info.price and (cart_settings.allow_items_not_in_stock or product_info.in_stock) %}
<div class="mt-3">
- <a href="/cart"
- class="btn btn-light btn-view-in-cart {% if not product_info.qty %}hidden{% endif %}"
- role="button"
- >
- {{ _("View in Cart") }}
- </a>
- <button
- data-item-code="{{item_code}}"
- class="btn btn-outline-primary btn-add-to-cart {% if product_info.qty %}hidden{% endif %}"
- >
- {{ _("Add to Cart") }}
- </button>
+ {% if product_info.price and (cart_settings.allow_items_not_in_stock or product_info.in_stock) %}
+ <a href="/cart"
+ class="btn btn-light btn-view-in-cart {% if not product_info.qty %}hidden{% endif %}"
+ role="button"
+ >
+ {{ _("View in Cart") }}
+ </a>
+ <button
+ data-item-code="{{item_code}}"
+ class="btn btn-outline-primary btn-add-to-cart {% if product_info.qty %}hidden{% endif %}"
+ >
+ {{ _("Add to Cart") }}
+ </button>
+ {% endif %}
+ {% if cart_settings.show_contact_us_button %}
+ {% include "templates/generators/item/item_inquiry.html" %}
+ {% endif %}
</div>
- {% endif %}
</div>
</div>
diff --git a/erpnext/templates/generators/item/item_configure.html b/erpnext/templates/generators/item/item_configure.html
index b8b0d98..73f9ec9 100644
--- a/erpnext/templates/generators/item/item_configure.html
+++ b/erpnext/templates/generators/item/item_configure.html
@@ -10,14 +10,11 @@
{{ _('Configure') }}
</button>
{% endif %}
- {% if cart_settings.show_contact_us_button | int %}
- <button class="btn btn-link btn-inquiry" data-item-code="{{ doc.name }}">
- {{ _('Contact Us') }}
- </button>
+ {% if cart_settings.show_contact_us_button %}
+ {% include "templates/generators/item/item_inquiry.html" %}
{% endif %}
</div>
<script>
{% include "templates/generators/item/item_configure.js" %}
-{% include "templates/generators/item/item_inquiry.js" %}
</script>
{% endif %}
diff --git a/erpnext/templates/generators/item/item_inquiry.html b/erpnext/templates/generators/item/item_inquiry.html
new file mode 100644
index 0000000..83653b6
--- /dev/null
+++ b/erpnext/templates/generators/item/item_inquiry.html
@@ -0,0 +1,11 @@
+{% if shopping_cart and shopping_cart.cart_settings.enabled %}
+{% set cart_settings = shopping_cart.cart_settings %}
+ {% if cart_settings.show_contact_us_button | int %}
+ <button class="btn btn-inquiry btn-primary-light" data-item-code="{{ doc.name }}">
+ {{ _('Contact Us') }}
+ </button>
+ {% endif %}
+<script>
+{% include "templates/generators/item/item_inquiry.js" %}
+</script>
+{% endif %}
diff --git a/erpnext/templates/generators/item/item_inquiry.js b/erpnext/templates/generators/item/item_inquiry.js
index 52ddae2..e7db3a3 100644
--- a/erpnext/templates/generators/item/item_inquiry.js
+++ b/erpnext/templates/generators/item/item_inquiry.js
@@ -22,6 +22,13 @@
},
{
fieldtype: 'Data',
+ label: __('Phone Number'),
+ fieldname: 'phone',
+ options: 'Phone',
+ reqd: 1
+ },
+ {
+ fieldtype: 'Data',
label: __('Subject'),
fieldname: 'subject',
reqd: 1