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

Merge branch 'develop' into auto-attendance-issue

Browse Source
This commit is contained in:
Jannat Patel 2021-10-08 20:15:40 +05:30 committed by GitHub
commit 128709155b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 126 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,21 +52,35 @@ erpnext.accounts.PaymentReconciliationController = class PaymentReconciliationCo
refresh() {
this.frm.disable_save();
this.frm.set_df_property('invoices', 'cannot_delete_rows', true);
this.frm.set_df_property('payments', 'cannot_delete_rows', true);
this.frm.set_df_property('allocation', 'cannot_delete_rows', true);
this.frm.set_df_property('invoices', 'cannot_add_rows', true);
this.frm.set_df_property('payments', 'cannot_add_rows', true);
this.frm.set_df_property('allocation', 'cannot_add_rows', true);
if (this.frm.doc.receivable_payable_account) {
this.frm.add_custom_button(__('Get Unreconciled Entries'), () =>
this.frm.trigger("get_unreconciled_entries")
);
this.frm.change_custom_button_type('Get Unreconciled Entries', null, 'primary');
}
if (this.frm.doc.invoices.length && this.frm.doc.payments.length) {
this.frm.add_custom_button(__('Allocate'), () =>
this.frm.trigger("allocate")
);
this.frm.change_custom_button_type('Allocate', null, 'primary');
this.frm.change_custom_button_type('Get Unreconciled Entries', null, 'default');
}
if (this.frm.doc.allocation.length) {
this.frm.add_custom_button(__('Reconcile'), () =>
this.frm.trigger("reconcile")
);
this.frm.change_custom_button_type('Reconcile', null, 'primary');
this.frm.change_custom_button_type('Get Unreconciled Entries', null, 'default');
this.frm.change_custom_button_type('Allocate', null, 'default');
}
}

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

@ -12,15 +12,16 @@
"receivable_payable_account",
"col_break1",
"from_invoice_date",
"to_invoice_date",
"minimum_invoice_amount",
"maximum_invoice_amount",
"invoice_limit",
"column_break_13",
"from_payment_date",
"to_payment_date",
"minimum_invoice_amount",
"minimum_payment_amount",
"column_break_11",
"to_invoice_date",
"to_payment_date",
"maximum_invoice_amount",
"maximum_payment_amount",
"column_break_13",
"invoice_limit",
"payment_limit",
"bank_cash_account",
"sec_break1",
@ -79,6 +80,7 @@
},
{
"depends_on": "eval:(doc.payments).length || (doc.invoices).length",
"description": "If you need to reconcile particular transactions against each other, then please select accordingly. If not, all the transactions will be allocated in FIFO order.",
"fieldname": "sec_break1",
"fieldtype": "Section Break",
"label": "Unreconciled Entries"
@ -163,6 +165,7 @@
"label": "Maximum Payment Amount"
},
{
"description": "System will fetch all the entries if limit value is zero.",
"fieldname": "payment_limit",
"fieldtype": "Int",
"label": "Payment Limit"
@ -171,13 +174,17 @@
"fieldname": "maximum_invoice_amount",
"fieldtype": "Currency",
"label": "Maximum Invoice Amount"
},
{
"fieldname": "column_break_11",
"fieldtype": "Column Break"
}
],
"hide_toolbar": 1,
"icon": "icon-resize-horizontal",
"issingle": 1,
"links": [],
"modified": "2021-08-30 13:05:51.977861",
"modified": "2021-10-04 20:27:11.114194",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Reconciliation",

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

@ -14,8 +14,8 @@
"section_break_6",
"allocated_amount",
"unreconciled_amount",
"amount",
"column_break_8",
"amount",
"is_advance",
"section_break_5",
"difference_amount",
@ -127,12 +127,13 @@
"fieldname": "reference_row",
"fieldtype": "Data",
"hidden": 1,
"label": "Reference Row"
"label": "Reference Row",
"read_only": 1
}
],
"istable": 1,
"links": [],
"modified": "2021-09-20 17:23:09.455803",
"modified": "2021-10-06 11:48:59.616562",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Reconciliation Allocation",

8
erpnext/payroll/doctype/salary_slip/salary_slip.json
View File

@ -329,7 +329,7 @@
{
"fieldname": "earning_deduction",
"fieldtype": "Section Break",
"label": "Earning & Deduction",
"label": "Earnings & Deductions",
"oldfieldtype": "Section Break"
},
{
@ -380,7 +380,7 @@
"depends_on": "total_loan_repayment",
"fieldname": "loan_repayment",
"fieldtype": "Section Break",
"label": "Loan repayment"
"label": "Loan Repayment"
},
{
"fieldname": "loans",
@ -425,7 +425,7 @@
{
"fieldname": "net_pay_info",
"fieldtype": "Section Break",
"label": "net pay info"
"label": "Net Pay Info"
},
{
"fieldname": "net_pay",
@ -647,7 +647,7 @@
"idx": 9,
"is_submittable": 1,
"links": [],
"modified": "2021-09-01 10:35:52.374549",
"modified": "2021-10-08 11:47:47.098248",
"modified_by": "Administrator",
"module": "Payroll",
"name": "Salary Slip",

213
erpnext/public/js/help_links.js
View File

@ -5,7 +5,7 @@ const docsUrl = "https://erpnext.com/docs/";
frappe.help.help_links["Form/Rename Tool"] = [
{
label: "Bulk Rename",
url: docsUrl + "user/manual/en/setting-up/data/bulk-rename",
url: docsUrl + "user/manual/en/using-erpnext/articles/bulk-rename",
},
];
@ -59,10 +59,23 @@ frappe.help.help_links["Form/System Settings"] = [
},
];
frappe.help.help_links["data-import-tool"] = [
frappe.help.help_links["Form/Data Import"] = [
{
label: "Importing and Exporting Data",
url: docsUrl + "user/manual/en/setting-up/data/data-import-tool",
url: docsUrl + "user/manual/en/setting-up/data/data-import",
},
{
label: "Overwriting Data from Data Import Tool",
url:
docsUrl +
"user/manual/en/setting-up/articles/overwriting-data-from-data-import-tool",
},
];
frappe.help.help_links["List/Data Import"] = [
{
label: "Importing and Exporting Data",
url: docsUrl + "user/manual/en/setting-up/data/data-import",
},
{
label: "Overwriting Data from Data Import Tool",
@ -101,14 +114,14 @@ frappe.help.help_links["Form/Global Defaults"] = [
},
];
frappe.help.help_links["Form/Email Digest"] = [
frappe.help.help_links["List/Print Heading"] = [
{
label: "Email Digest",
url: docsUrl + "user/manual/en/setting-up/email/email-digest",
label: "Print Heading",
url: docsUrl + "user/manual/en/setting-up/print/print-headings",
},
];
frappe.help.help_links["List/Print Heading"] = [
frappe.help.help_links["Form/Print Heading"] = [
{
label: "Print Heading",
url: docsUrl + "user/manual/en/setting-up/print/print-headings",
@ -153,18 +166,25 @@ frappe.help.help_links["List/Email Account"] = [
frappe.help.help_links["List/Notification"] = [
{
label: "Notification",
url: docsUrl + "user/manual/en/setting-up/email/notifications",
url: docsUrl + "user/manual/en/setting-up/notifications",
},
];
frappe.help.help_links["Form/Notification"] = [
{
label: "Notification",
url: docsUrl + "user/manual/en/setting-up/email/notifications",
url: docsUrl + "user/manual/en/setting-up/notifications",
},
];
frappe.help.help_links["List/Email Digest"] = [
frappe.help.help_links["Form/Email Digest"] = [
{
label: "Email Digest",
url: docsUrl + "user/manual/en/setting-up/email/email-digest",
},
];
frappe.help.help_links["Form/Email Digest"] = [
{
label: "Email Digest",
url: docsUrl + "user/manual/en/setting-up/email/email-digest",
@ -174,7 +194,7 @@ frappe.help.help_links["List/Email Digest"] = [
frappe.help.help_links["List/Auto Email Report"] = [
{
label: "Auto Email Reports",
url: docsUrl + "user/manual/en/setting-up/email/email-reports",
url: docsUrl + "user/manual/en/setting-up/email/auto-email-reports",
},
];
@ -188,14 +208,7 @@ frappe.help.help_links["Form/Print Settings"] = [
frappe.help.help_links["print-format-builder"] = [
{
label: "Print Format Builder",
url: docsUrl + "user/manual/en/setting-up/print/print-settings",
},
];
frappe.help.help_links["List/Print Heading"] = [
{
label: "Print Heading",
url: docsUrl + "user/manual/en/setting-up/print/print-headings",
url: docsUrl + "user/manual/en/setting-up/print/print-format-builder",
},
];
@ -300,7 +313,7 @@ frappe.help.help_links["List/Sales Order"] = [
},
{
label: "Recurring Sales Order",
url: docsUrl + "user/manual/en/accounts/recurring-orders-and-invoices",
url: docsUrl + "user/manual/en/accounts/articles/recurring-orders-and-invoices",
},
{
label: "Applying Discount",
@ -315,7 +328,7 @@ frappe.help.help_links["Form/Sales Order"] = [
},
{
label: "Recurring Sales Order",
url: docsUrl + "user/manual/en/accounts/recurring-orders-and-invoices",
url: docsUrl + "user/manual/en/accounts/articles/recurring-orders-and-invoices",
},
{
label: "Applying Discount",
@ -344,14 +357,14 @@ frappe.help.help_links["Form/Sales Order"] = [
frappe.help.help_links["Form/Product Bundle"] = [
{
label: "Product Bundle",
url: docsUrl + "user/manual/en/selling/setup/product-bundle",
url: docsUrl + "user/manual/en/selling/product-bundle",
},
];
frappe.help.help_links["Form/Selling Settings"] = [
{
label: "Selling Settings",
url: docsUrl + "user/manual/en/selling/setup/selling-settings",
url: docsUrl + "user/manual/en/selling/selling-settings",
},
];
@ -397,7 +410,7 @@ frappe.help.help_links["List/Purchase Order"] = [
},
{
label: "Recurring Purchase Order",
url: docsUrl + "user/manual/en/accounts/recurring-orders-and-invoices",
url: docsUrl + "user/manual/en/accounts/articles/recurring-orders-and-invoices",
},
];
@ -420,7 +433,7 @@ frappe.help.help_links["Form/Purchase Order"] = [
},
{
label: "Recurring Purchase Order",
url: docsUrl + "user/manual/en/accounts/recurring-orders-and-invoices",
url: docsUrl + "user/manual/en/accounts/articles/recurring-orders-and-invoices",
},
{
label: "Subcontracting",
@ -435,24 +448,17 @@ frappe.help.help_links["List/Purchase Taxes and Charges Template"] = [
},
];
frappe.help.help_links["List/POS Profile"] = [
{
label: "POS Profile",
url: docsUrl + "user/manual/en/setting-up/pos-setting",
},
];
frappe.help.help_links["List/Price List"] = [
{
label: "Price List",
url: docsUrl + "user/manual/en/setting-up/price-lists",
url: docsUrl + "user/manual/en/stock/price-lists",
},
];
frappe.help.help_links["List/Authorization Rule"] = [
{
label: "Authorization Rule",
url: docsUrl + "user/manual/en/setting-up/authorization-rule",
url: docsUrl + "user/manual/en/customize-erpnext/authorization-rule",
},
];
@ -468,27 +474,14 @@ frappe.help.help_links["List/Stock Reconciliation"] = [
label: "Stock Reconciliation",
url:
docsUrl +
"user/manual/en/setting-up/stock-reconciliation-for-non-serialized-item",
"user/manual/en/stock/stock-reconciliation",
},
];
frappe.help.help_links["Tree/Territory"] = [
{
label: "Territory",
url: docsUrl + "user/manual/en/setting-up/territory",
},
];
frappe.help.help_links["Form/Dropbox Backup"] = [
{
label: "Dropbox Backup",
url: docsUrl + "user/manual/en/setting-up/third-party-backups",
},
{
label: "Setting Up Dropbox Backup",
url:
docsUrl +
"user/manual/en/setting-up/articles/setting-up-dropbox-backups",
url: docsUrl + "user/manual/en/selling/territory",
},
];
@ -501,12 +494,6 @@ frappe.help.help_links["List/Company"] = [
label: "Company",
url: docsUrl + "user/manual/en/setting-up/company-setup",
},
{
label: "Managing Multiple Companies",
url:
docsUrl +
"user/manual/en/setting-up/articles/managing-multiple-companies",
},
{
label: "Delete All Related Transactions for a Company",
url:
@ -517,21 +504,6 @@ frappe.help.help_links["List/Company"] = [
//Accounts
frappe.help.help_links["modules/Accounts"] = [
{
label: "Introduction to Accounts",
url: docsUrl + "user/manual/en/accounts/",
},
{
label: "Chart of Accounts",
url: docsUrl + "user/manual/en/accounts/chart-of-accounts.html",
},
{
label: "Multi Currency Accounting",
url: docsUrl + "user/manual/en/accounts/multi-currency-accounting",
},
];
frappe.help.help_links["Tree/Account"] = [
{
label: "Chart of Accounts",
@ -552,7 +524,7 @@ frappe.help.help_links["Form/Sales Invoice"] = [
},
{
label: "Accounts Opening Balance",
url: docsUrl + "user/manual/en/accounts/opening-accounts",
url: docsUrl + "user/manual/en/accounts/opening-balance",
},
{
label: "Sales Return",
@ -560,7 +532,7 @@ frappe.help.help_links["Form/Sales Invoice"] = [
},
{
label: "Recurring Sales Invoice",
url: docsUrl + "user/manual/en/accounts/recurring-orders-and-invoices",
url: docsUrl + "user/manual/en/accounts/articles/recurring-orders-and-invoices",
},
];
@ -571,7 +543,7 @@ frappe.help.help_links["List/Sales Invoice"] = [
},
{
label: "Accounts Opening Balance",
url: docsUrl + "user/manual/en/accounts/opening-accounts",
url: docsUrl + "user/manual/en/accounts/opening-balances",
},
{
label: "Sales Return",
@ -579,21 +551,28 @@ frappe.help.help_links["List/Sales Invoice"] = [
},
{
label: "Recurring Sales Invoice",
url: docsUrl + "user/manual/en/accounts/recurring-orders-and-invoices",
url: docsUrl + "user/manual/en/accounts/articles/recurring-orders-and-invoices",
},
];
frappe.help.help_links["pos"] = [
frappe.help.help_links["point-of-sale"] = [
{
label: "Point of Sale Invoice",
url: docsUrl + "user/manual/en/accounts/point-of-sale-pos-invoice",
url: docsUrl + "user/manual/en/accounts/point-of-sales",
},
];
frappe.help.help_links["List/POS Profile"] = [
{
label: "Point of Sale Profile",
url: docsUrl + "user/manual/en/setting-up/pos-setting",
url: docsUrl + "user/manual/en/accounts/pos-profile",
},
];
frappe.help.help_links["Form/POS Profile"] = [
{
label: "POS Profile",
url: docsUrl + "user/manual/en/accounts/pos-profile",
},
];
@ -604,11 +583,11 @@ frappe.help.help_links["List/Purchase Invoice"] = [
},
{
label: "Accounts Opening Balance",
url: docsUrl + "user/manual/en/accounts/opening-accounts",
url: docsUrl + "user/manual/en/accounts/opening-balance",
},
{
label: "Recurring Purchase Invoice",
url: docsUrl + "user/manual/en/accounts/recurring-orders-and-invoices",
url: docsUrl + "user/manual/en/accounts/articles/recurring-orders-and-invoices",
},
];
@ -623,7 +602,7 @@ frappe.help.help_links["List/Journal Entry"] = [
},
{
label: "Accounts Opening Balance",
url: docsUrl + "user/manual/en/accounts/opening-accounts",
url: docsUrl + "user/manual/en/accounts/opening-balance",
},
];
@ -644,7 +623,7 @@ frappe.help.help_links["List/Payment Request"] = [
frappe.help.help_links["List/Asset"] = [
{
label: "Managing Fixed Assets",
url: docsUrl + "user/manual/en/accounts/opening-balance/fixed_assets",
url: docsUrl + "user/manual/en/asset",
},
];
@ -659,6 +638,8 @@ frappe.help.help_links["Tree/Cost Center"] = [
{ label: "Budgeting", url: docsUrl + "user/manual/en/accounts/budgeting" },
];
//Stock
frappe.help.help_links["List/Item"] = [
{ label: "Item", url: docsUrl + "user/manual/en/stock/item" },
{
@ -676,7 +657,7 @@ frappe.help.help_links["List/Item"] = [
},
{
label: "Managing Fixed Assets",
url: docsUrl + "user/manual/en/accounts/opening-balance/fixed_assets",
url: docsUrl + "user/manual/en/asset",
},
{
label: "Item Codification",
@ -711,7 +692,7 @@ frappe.help.help_links["Form/Item"] = [
},
{
label: "Managing Fixed Assets",
url: docsUrl + "user/manual/en/accounts/opening-balance/fixed_assets",
url: docsUrl + "user/manual/en/asset",
},
{
label: "Item Codification",
@ -771,10 +752,6 @@ frappe.help.help_links["Form/Delivery Note"] = [
url:
docsUrl + "user/manual/en/stock/articles/track-items-using-barcode",
},
{
label: "Subcontracting",
url: docsUrl + "user/manual/en/manufacturing/subcontracting",
},
];
frappe.help.help_links["List/Installation Note"] = [
@ -784,21 +761,10 @@ frappe.help.help_links["List/Installation Note"] = [
},
];
frappe.help.help_links["Tree"] = [
{
label: "Managing Tree Structure Masters",
url:
docsUrl +
"user/manual/en/setting-up/articles/managing-tree-structure-masters",
},
];
frappe.help.help_links["List/Budget"] = [
{ label: "Budgeting", url: docsUrl + "user/manual/en/accounts/budgeting" },
];
//Stock
frappe.help.help_links["List/Material Request"] = [
{
label: "Material Request",
@ -861,6 +827,10 @@ frappe.help.help_links["Form/Serial No"] = [
{ label: "Serial No", url: docsUrl + "user/manual/en/stock/serial-no" },
];
frappe.help.help_links["List/Batch"] = [
{ label: "Batch", url: docsUrl + "user/manual/en/stock/batch" },
];
frappe.help.help_links["Form/Batch"] = [
{ label: "Batch", url: docsUrl + "user/manual/en/stock/batch" },
];
@ -868,35 +838,35 @@ frappe.help.help_links["Form/Batch"] = [
frappe.help.help_links["Form/Packing Slip"] = [
{
label: "Packing Slip",
url: docsUrl + "user/manual/en/stock/tools/packing-slip",
url: docsUrl + "user/manual/en/stock/packing-slip",
},
];
frappe.help.help_links["Form/Quality Inspection"] = [
{
label: "Quality Inspection",
url: docsUrl + "user/manual/en/stock/tools/quality-inspection",
url: docsUrl + "user/manual/en/stock/quality-inspection",
},
];
frappe.help.help_links["Form/Landed Cost Voucher"] = [
{
label: "Landed Cost Voucher",
url: docsUrl + "user/manual/en/stock/tools/landed-cost-voucher",
url: docsUrl + "user/manual/en/stock/landed-cost-voucher",
},
];
frappe.help.help_links["Tree/Item Group"] = [
{
label: "Item Group",
url: docsUrl + "user/manual/en/stock/setup/item-group",
url: docsUrl + "user/manual/en/stock/item-group",
},
];
frappe.help.help_links["Form/Item Attribute"] = [
{
label: "Item Attribute",
url: docsUrl + "user/manual/en/stock/setup/item-attribute",
url: docsUrl + "user/manual/en/stock/item-attribute",
},
];
@ -911,7 +881,7 @@ frappe.help.help_links["Form/UOM"] = [
frappe.help.help_links["Form/Stock Reconciliation"] = [
{
label: "Opening Stock Entry",
url: docsUrl + "user/manual/en/stock/opening-stock",
url: docsUrl + "user/manual/en/stock/stock-reconciliation",
},
];
@ -938,13 +908,13 @@ frappe.help.help_links["Form/Newsletter"] = [
];
frappe.help.help_links["Form/Campaign"] = [
{ label: "Campaign", url: docsUrl + "user/manual/en/CRM/setup/campaign" },
{ label: "Campaign", url: docsUrl + "user/manual/en/CRM/campaign" },
];
frappe.help.help_links["Tree/Sales Person"] = [
{
label: "Sales Person",
url: docsUrl + "user/manual/en/CRM/setup/sales-person",
url: docsUrl + "user/manual/en/CRM/sales-person",
},
];
@ -953,30 +923,13 @@ frappe.help.help_links["Form/Sales Person"] = [
label: "Sales Person Target",
url:
docsUrl +
"user/manual/en/selling/setup/sales-person-target-allocation",
"user/manual/en/selling/sales-person-target-allocation",
},
];
//Support
frappe.help.help_links["List/Feedback Trigger"] = [
{
label: "Feedback Trigger",
url: docsUrl + "user/manual/en/setting-up/feedback/setting-up-feedback",
},
];
frappe.help.help_links["List/Feedback Request"] = [
{
label: "Feedback Request",
url: docsUrl + "user/manual/en/setting-up/feedback/submit-feedback",
},
];
frappe.help.help_links["List/Feedback Request"] = [
{
label: "Feedback Request",
url: docsUrl + "user/manual/en/setting-up/feedback/submit-feedback",
label: "Sales Person in Transactions",
url:
docsUrl +
"user/manual/en/selling/articles/sales-persons-in-the-sales-transactions",
},
];
@ -1019,7 +972,7 @@ frappe.help.help_links["Form/Operation"] = [
frappe.help.help_links["Form/BOM Update Tool"] = [
{
label: "BOM Update Tool",
url: docsUrl + "user/manual/en/manufacturing/tools/bom-update-tool",
url: docsUrl + "user/manual/en/manufacturing/bom-update-tool",
},
];
@ -1036,7 +989,7 @@ frappe.help.help_links["Form/Customize Form"] = [
},
];
frappe.help.help_links["Form/Custom Field"] = [
frappe.help.help_links["List/Custom Field"] = [
{
label: "Custom Field",
url: docsUrl + "user/manual/en/customize-erpnext/custom-field",

1
erpnext/public/js/utils.js
View File

@ -712,6 +712,7 @@ erpnext.utils.map_current_doc = function(opts) {
allow_child_item_selection: opts.allow_child_item_selection,
child_fieldname: opts.child_fielname,
child_columns: opts.child_columns,
size: opts.size,
action: function(selections, args) {
let values = selections;
if (values.length === 0) {

4
erpnext/selling/doctype/sales_order/sales_order.py
View File

@ -110,7 +110,7 @@ class SalesOrder(SellingController):
if self.order_type == 'Sales' and not self.skip_delivery_note:
delivery_date_list = [d.delivery_date for d in self.get("items") if d.delivery_date]
max_delivery_date = max(delivery_date_list) if delivery_date_list else None
if not self.delivery_date:
if (max_delivery_date and not self.delivery_date) or (max_delivery_date and getdate(self.delivery_date) != getdate(max_delivery_date)):
self.delivery_date = max_delivery_date
if self.delivery_date:
for d in self.get("items"):
@ -119,8 +119,6 @@ class SalesOrder(SellingController):
if getdate(self.transaction_date) > getdate(d.delivery_date):
frappe.msgprint(_("Expected Delivery Date should be after Sales Order Date"),
indicator='orange', title=_('Warning'))
if getdate(self.delivery_date) != getdate(max_delivery_date):
self.delivery_date = max_delivery_date
else:
frappe.throw(_("Please enter Delivery Date"))

5
erpnext/stock/doctype/delivery_note/delivery_note.json
View File

@ -395,8 +395,7 @@
"fieldtype": "Link",
"label": "Billing Address Name",
"options": "Address",
"print_hide": 1,
"read_only": 1
"print_hide": 1
},
{
"fieldname": "tax_id",
@ -1309,7 +1308,7 @@
"idx": 146,
"is_submittable": 1,
"links": [],
"modified": "2021-09-28 13:10:09.761714",
"modified": "2021-10-08 14:29:13.428984",
"modified_by": "Administrator",
"module": "Stock",
"name": "Delivery Note",

5
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.json
View File

@ -142,6 +142,7 @@
"oldfieldtype": "Data",
"print_width": "150px",
"read_only": 1,
"search_index": 1,
"width": "150px"
},
{
@ -316,7 +317,7 @@
"in_create": 1,
"index_web_pages_for_search": 1,
"links": [],
"modified": "2020-09-07 11:10:35.318872",
"modified": "2021-10-08 12:42:51.857631",
"modified_by": "Administrator",
"module": "Stock",
"name": "Stock Ledger Entry",
@ -338,4 +339,4 @@
],
"sort_field": "modified",
"sort_order": "DESC"
}
}

1
erpnext/stock/doctype/stock_ledger_entry/stock_ledger_entry.py
View File

@ -181,4 +181,3 @@ def on_doctype_update():
frappe.db.add_index("Stock Ledger Entry", ["voucher_no", "voucher_type"])
frappe.db.add_index("Stock Ledger Entry", ["batch_no", "item_code", "warehouse"])
frappe.db.add_index("Stock Ledger Entry", ["voucher_detail_no"])