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

Merge branch 'develop' into ignore-mandatory-in-payment-reconcilitation

Browse Source
This commit is contained in:
Afshan 2021-07-20 20:07:43 +05:30 committed by GitHub
commit 1321c26a03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/stale.yml vendored
View File

@ -1,11 +1,11 @@
# Configuration for probot-stale - https://github.com/probot/stale # Configuration for probot-stale - https://github.com/probot/stale
# Number of days of inactivity before an Issue or Pull Request becomes stale # Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 30 daysUntilStale: 15
# Number of days of inactivity before a stale Issue or Pull Request is closed. # Number of days of inactivity before a stale Issue or Pull Request is closed.
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale. # Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
daysUntilClose: 7 daysUntilClose: 3
# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable # Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
exemptLabels: exemptLabels:

4
erpnext/public/js/utils/customer_quick_entry.js
View File

@ -1,8 +1,8 @@
frappe.provide('frappe.ui.form'); frappe.provide('frappe.ui.form');
frappe.ui.form.CustomerQuickEntryForm = class CustomerQuickEntryForm extends frappe.ui.form.QuickEntryForm { frappe.ui.form.CustomerQuickEntryForm = class CustomerQuickEntryForm extends frappe.ui.form.QuickEntryForm {
constructor(doctype, after_insert) { constructor(doctype, after_insert, init_callback, doc, force) {
super(doctype, after_insert); super(doctype, after_insert, init_callback, doc, force);
this.skip_redirect_on_error = true; this.skip_redirect_on_error = true;
} }

7
erpnext/stock/doctype/item/item.js
View File

@ -100,10 +100,11 @@ frappe.ui.form.on("Item", {
frm.add_custom_button(__('Duplicate'), function() { frm.add_custom_button(__('Duplicate'), function() {
var new_item = frappe.model.copy_doc(frm.doc); var new_item = frappe.model.copy_doc(frm.doc);
if(new_item.item_name===new_item.item_code) { // Duplicate item could have different name, causing "copy paste" error.
if (new_item.item_name===new_item.item_code) {
new_item.item_name = null; new_item.item_name = null;
} }
if(new_item.description===new_item.description) { if (new_item.item_code===new_item.description || new_item.item_code===new_item.description) {
new_item.description = null; new_item.description = null;
} }
frappe.set_route('Form', 'Item', new_item.name); frappe.set_route('Form', 'Item', new_item.name);
@ -186,8 +187,6 @@ frappe.ui.form.on("Item", {
item_code: function(frm) { item_code: function(frm) {
if(!frm.doc.item_name) if(!frm.doc.item_name)
frm.set_value("item_name", frm.doc.item_code); frm.set_value("item_name", frm.doc.item_code);
if(!frm.doc.description)
frm.set_value("description", frm.doc.item_code);
}, },
is_stock_item: function(frm) { is_stock_item: function(frm) {