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

fix: Linting fixes and other checks

Browse Source
This commit is contained in:
Deepesh Garg 2021-05-16 17:46:07 +05:30
parent 77dcee9d67
commit e2f83ffaa4
5 changed files with 53 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/payment_entry/payment_entry.json
View File

@ -864,7 +864,7 @@
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
"modified": "2021-02-27 13:56:20.007336", "modified": "2021-05-15 13:05:16.958866",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Entry", "name": "Payment Entry",

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

@ -251,11 +251,9 @@ class PurchaseInvoice(BuyingController):
if self.update_stock and (not item.from_warehouse): if self.update_stock and (not item.from_warehouse):
if for_validate and item.expense_account and item.expense_account != warehouse_account[item.warehouse]["account"]: if for_validate and item.expense_account and item.expense_account != warehouse_account[item.warehouse]["account"]:
msg = _("Row {}: Expense Head changed to {} ").format(item.idx, frappe.bold(warehouse_account[item.warehouse]["account"])) msg = _("Row {0}: Expense Head changed to {1} because account {2} is not linked to warehouse {3} or it is not the default inventory account").format(
msg += _("because account {} is not linked to warehouse {} ").format(frappe.bold(item.expense_account), frappe.bold(item.warehouse)) item.idx, frappe.bold(warehouse_account[item.warehouse]["account"]), frappe.bold(item.expense_account), frappe.bold(item.warehouse))
msg += _("or it is not the default inventory account")
frappe.msgprint(msg, title=_("Expense Head Changed")) frappe.msgprint(msg, title=_("Expense Head Changed"))
item.expense_account = warehouse_account[item.warehouse]["account"] item.expense_account = warehouse_account[item.warehouse]["account"]
else: else:
# check if 'Stock Received But Not Billed' account is credited in Purchase receipt or not # check if 'Stock Received But Not Billed' account is credited in Purchase receipt or not
@ -266,8 +264,8 @@ class PurchaseInvoice(BuyingController):
if negative_expense_booked_in_pr: if negative_expense_booked_in_pr:
if for_validate and item.expense_account and item.expense_account != stock_not_billed_account: if for_validate and item.expense_account and item.expense_account != stock_not_billed_account:
msg = _("Row {}: Expense Head changed to {} ").format(item.idx, frappe.bold(stock_not_billed_account)) msg = _("Row {0}: Expense Head changed to {1} because expense is booked against this account in Purchase Receipt {2}").format(
msg += _("because expense is booked against this account in Purchase Receipt {}").format(frappe.bold(item.purchase_receipt)) item.idx, frappe.bold(stock_not_billed_account), frappe.bold(item.purchase_receipt))
frappe.msgprint(msg, title=_("Expense Head Changed")) frappe.msgprint(msg, title=_("Expense Head Changed"))
item.expense_account = stock_not_billed_account item.expense_account = stock_not_billed_account
@ -275,8 +273,9 @@ class PurchaseInvoice(BuyingController):
# If no purchase receipt present then book expense in 'Stock Received But Not Billed' # If no purchase receipt present then book expense in 'Stock Received But Not Billed'
# This is done in cases when Purchase Invoice is created before Purchase Receipt # This is done in cases when Purchase Invoice is created before Purchase Receipt
if for_validate and item.expense_account and item.expense_account != stock_not_billed_account: if for_validate and item.expense_account and item.expense_account != stock_not_billed_account:
msg = _("Row {}: Expense Head changed to {} ").format(item.idx, frappe.bold(stock_not_billed_account)) msg = _("Row {0}: Expense Head changed to {1} as no Purchase Receipt is created against Item {2}.").format(
msg += _("as no Purchase Receipt is created against Item {}. ").format(frappe.bold(item.item_code)) item.idx, frappe.bold(stock_not_billed_account), frappe.bold(item.item_code))
msg += "<br>"
msg += _("This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice") msg += _("This is done to handle accounting for cases when Purchase Receipt is created after Purchase Invoice")
frappe.msgprint(msg, title=_("Expense Head Changed")) frappe.msgprint(msg, title=_("Expense Head Changed"))
@ -308,8 +307,8 @@ class PurchaseInvoice(BuyingController):
if not d.purchase_order: if not d.purchase_order:
msg = _("Purchase Order Required for item {}").format(frappe.bold(d.item_code)) msg = _("Purchase Order Required for item {}").format(frappe.bold(d.item_code))
msg += "<br><br>" msg += "<br><br>"
msg += _("To submit the invoice without purchase order please set {} ").format(frappe.bold(_('Purchase Order Required'))) msg += _("To submit the invoice without purchase order please set {0} as {1} in {2}").format(
msg += _("as {} in {}").format(frappe.bold('No'), get_link_to_form('Buying Settings', 'Buying Settings', 'Buying Settings')) frappe.bold(_('Purchase Order Required')), frappe.bold('No'), get_link_to_form('Buying Settings', 'Buying Settings', 'Buying Settings'))
throw(msg, title=_("Mandatory Purchase Order")) throw(msg, title=_("Mandatory Purchase Order"))
def pr_required(self): def pr_required(self):
@ -323,8 +322,8 @@ class PurchaseInvoice(BuyingController):
if not d.purchase_receipt and d.item_code in stock_items: if not d.purchase_receipt and d.item_code in stock_items:
msg = _("Purchase Receipt Required for item {}").format(frappe.bold(d.item_code)) msg = _("Purchase Receipt Required for item {}").format(frappe.bold(d.item_code))
msg += "<br><br>" msg += "<br><br>"
msg += _("To submit the invoice without purchase receipt please set {} ").format(frappe.bold(_('Purchase Receipt Required'))) msg += _("To submit the invoice without purchase receipt please set {0} as {1} in {2}").format(
msg += _("as {} in {}").format(frappe.bold('No'), get_link_to_form('Buying Settings', 'Buying Settings', 'Buying Settings')) frappe.bold(_('Purchase Receipt Required')), frappe.bold('No'), get_link_to_form('Buying Settings', 'Buying Settings', 'Buying Settings'))
throw(msg, title=_("Mandatory Purchase Receipt")) throw(msg, title=_("Mandatory Purchase Receipt"))
def validate_write_off_account(self): def validate_write_off_account(self):
@ -922,8 +921,8 @@ class PurchaseInvoice(BuyingController):
"against": self.supplier, "against": self.supplier,
dr_or_cr: unallocated_amount, dr_or_cr: unallocated_amount,
dr_or_cr + "_in_account_currency": unallocated_amount dr_or_cr + "_in_account_currency": unallocated_amount
if account_currency==self.company_currency if account_currency==self.company_currency
else unallocated_amount, else unallocated_amount,
'cost_center': tax.cost_center 'cost_center': tax.cost_center
}, account_currency, item=tax)) }, account_currency, item=tax))
@ -933,8 +932,8 @@ class PurchaseInvoice(BuyingController):
"against": self.supplier, "against": self.supplier,
rev_dr_cr: unallocated_amount, rev_dr_cr: unallocated_amount,
rev_dr_cr + "_in_account_currency": unallocated_amount rev_dr_cr + "_in_account_currency": unallocated_amount
if account_currency==self.company_currency if account_currency==self.company_currency
else unallocated_amount, else unallocated_amount,
'cost_center': tax.cost_center or self.cost_center 'cost_center': tax.cost_center or self.cost_center
}, account_currency, item=tax)) }, account_currency, item=tax))

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

@ -934,8 +934,8 @@ class SalesInvoice(SellingController):
"against": self.customer, "against": self.customer,
dr_or_cr: unallocated_amount, dr_or_cr: unallocated_amount,
dr_or_cr + "_in_account_currency": unallocated_amount dr_or_cr + "_in_account_currency": unallocated_amount
if account_currency==self.company_currency if account_currency==self.company_currency
else unallocated_amount, else unallocated_amount,
'cost_center': tax.cost_center 'cost_center': tax.cost_center
}, account_currency, item=tax)) }, account_currency, item=tax))
@ -945,8 +945,8 @@ class SalesInvoice(SellingController):
"against": self.customer, "against": self.customer,
rev_dr_cr: unallocated_amount, rev_dr_cr: unallocated_amount,
rev_dr_cr + "_in_account_currency": unallocated_amount rev_dr_cr + "_in_account_currency": unallocated_amount
if account_currency==self.company_currency if account_currency==self.company_currency
else unallocated_amount, else unallocated_amount,
'cost_center': tax.cost_center 'cost_center': tax.cost_center
}, account_currency, item=tax)) }, account_currency, item=tax))

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

@ -321,7 +321,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
if(me.values) { if(me.values) {
me.values.sub_con_rm_items.map((row,i) => { me.values.sub_con_rm_items.map((row,i) => {
if (!row.item_code || !row.rm_item_code || !row.warehouse || !row.qty || row.qty === 0) { if (!row.item_code || !row.rm_item_code || !row.warehouse || !row.qty || row.qty === 0) {
frappe.throw(__("Item Code, warehouse, quantity are required on row {0}", [i+1])); frappe.throw(__("Item Code and warehouse and quantity are required on row {0}", [i+1]));
} }
}) })
me._make_rm_stock_entry(me.dialog.fields_dict.sub_con_rm_items.grid.get_selected_children()) me._make_rm_stock_entry(me.dialog.fields_dict.sub_con_rm_items.grid.get_selected_children())
@ -517,7 +517,7 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend(
args: { args: {
reference_doctype: me.frm.doctype, reference_doctype: me.frm.doctype,
reference_name: me.frm.docname, reference_name: me.frm.docname,
content: __('Reason for hold: ')+data.reason_for_hold, content: __('Reason for hold:') + " " +data.reason_for_hold,
comment_email: frappe.session.user, comment_email: frappe.session.user,
comment_by: frappe.session.user_fullname comment_by: frappe.session.user_fullname
}, },

62
erpnext/public/js/payment/payments.js
View File

@ -13,7 +13,7 @@ erpnext.payments = erpnext.stock.StockController.extend({
this.$body = this.dialog.body; this.$body = this.dialog.body;
this.set_payment_primary_action(); this.set_payment_primary_action();
this.make_keyboard(); this.make_keyboard();
this.select_text() this.select_text();
}, },
select_text: function() { select_text: function() {
@ -43,15 +43,15 @@ erpnext.payments = erpnext.stock.StockController.extend({
$(this.$body).empty(); $(this.$body).empty();
$(this.$body).html(frappe.render_template('pos_payment', this.frm.doc)) $(this.$body).html(frappe.render_template('pos_payment', this.frm.doc))
this.show_payment_details(); this.show_payment_details();
this.bind_keyboard_event() this.bind_keyboard_event();
this.clear_amount() this.clear_amount();
}, },
make_multimode_payment: function() { make_multimode_payment: function() {
var me = this; var me = this;
if(this.frm.doc.change_amount > 0) { if (this.frm.doc.change_amount > 0) {
me.payment_val = me.doc.outstanding_amount me.payment_val = me.doc.outstanding_amount;
} }
this.payments = frappe.model.add_child(this.frm.doc, 'Multi Mode Payment', "payments"); this.payments = frappe.model.add_child(this.frm.doc, 'Multi Mode Payment', "payments");
@ -112,7 +112,7 @@ erpnext.payments = erpnext.stock.StockController.extend({
var me = this; var me = this;
$(this.$body).find('.pos-payment-row').click(function() { $(this.$body).find('.pos-payment-row').click(function() {
me.idx = $(this).attr("idx"); me.idx = $(this).attr("idx");
me.set_outstanding_amount() me.set_outstanding_amount();
}); });
$(this.$body).find('.form-control').click(function() { $(this.$body).find('.form-control').click(function() {
@ -133,8 +133,8 @@ erpnext.payments = erpnext.stock.StockController.extend({
highlight_selected_row: function() { highlight_selected_row: function() {
var me = this; var me = this;
var selected_row = $(this.$body).find(repl(".pos-payment-row[idx='%(idx)s']", {'idx': this.idx})); var selected_row = $(this.$body).find(repl(".pos-payment-row[idx='%(idx)s']", {'idx': this.idx}));
$(this.$body).find('.pos-payment-row').removeClass('selected-payment-mode') $(this.$body).find('.pos-payment-row').removeClass('selected-payment-mode');
selected_row.addClass('selected-payment-mode') selected_row.addClass('selected-payment-mode');
$(this.$body).find('.amount').attr('disabled', true); $(this.$body).find('.amount').attr('disabled', true);
this.selected_mode.attr('disabled', false); this.selected_mode.attr('disabled', false);
}, },
@ -143,15 +143,15 @@ erpnext.payments = erpnext.stock.StockController.extend({
var me = this; var me = this;
$(this.$body).find('.pos-keyboard-key').click(function(){ $(this.$body).find('.pos-keyboard-key').click(function(){
me.payment_val += $(this).text(); me.payment_val += $(this).text();
me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency)) me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency));
me.idx = me.selected_mode.attr("idx") me.idx = me.selected_mode.attr("idx");
me.update_paid_amount() me.update_paid_amount();
}) });
$(this.$body).find('.delete-btn').click(function() { $(this.$body).find('.delete-btn').click(function() {
me.payment_val = cstr(flt(me.selected_mode.val())).slice(0, -1); me.payment_val = cstr(flt(me.selected_mode.val())).slice(0, -1);
me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency)); me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency));
me.idx = me.selected_mode.attr("idx") me.idx = me.selected_mode.attr("idx");
me.update_paid_amount(); me.update_paid_amount();
}) })
@ -161,10 +161,10 @@ erpnext.payments = erpnext.stock.StockController.extend({
var me = this; var me = this;
this.selected_mode.change(function() { this.selected_mode.change(function() {
me.payment_val = flt($(this).val()) || 0.0; me.payment_val = flt($(this).val()) || 0.0;
me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency)) me.selected_mode.val(format_currency(me.payment_val, me.frm.doc.currency));
me.idx = me.selected_mode.attr("idx") me.idx = me.selected_mode.attr("idx");
me.update_payment_amount() me.update_payment_amount();
}) });
}, },
clear_amount: function() { clear_amount: function() {
@ -177,7 +177,7 @@ erpnext.payments = erpnext.stock.StockController.extend({
me.selected_mode.val(0.0); me.selected_mode.val(0.0);
me.highlight_selected_row(); me.highlight_selected_row();
me.update_payment_amount(); me.update_payment_amount();
}) });
}, },
write_off_amount: function(write_off_amount) { write_off_amount: function(write_off_amount) {
@ -186,32 +186,32 @@ erpnext.payments = erpnext.stock.StockController.extend({
this.frm.doc.write_off_amount = flt(write_off_amount, precision("write_off_amount")); this.frm.doc.write_off_amount = flt(write_off_amount, precision("write_off_amount"));
this.frm.doc.base_write_off_amount = flt(this.frm.doc.write_off_amount * this.frm.doc.conversion_rate, this.frm.doc.base_write_off_amount = flt(this.frm.doc.write_off_amount * this.frm.doc.conversion_rate,
precision("base_write_off_amount")); precision("base_write_off_amount"));
this.calculate_outstanding_amount(false) this.calculate_outstanding_amount(false);
this.show_amounts() this.show_amounts();
}, },
change_amount: function(change_amount) { change_amount: function(change_amount) {
var me = this; var me = this;
this.frm.doc.change_amount = flt(change_amount, precision("change_amount")); this.frm.doc.change_amount = flt(change_amount, precision("change_amount"));
this.calculate_write_off_amount() this.calculate_write_off_amount();
this.show_amounts() this.show_amounts();
}, },
update_paid_amount: function(update_write_off) { update_paid_amount: function(update_write_off) {
var me = this; var me = this;
if(in_list(['change_amount', 'write_off_amount'], this.idx)){ if (in_list(['change_amount', 'write_off_amount'], this.idx)) {
var value = me.selected_mode.val(); var value = me.selected_mode.val();
if(me.idx == 'change_amount'){ if (me.idx == 'change_amount') {
me.change_amount(value) me.change_amount(value);
} else{ } else{
if(flt(value) == 0 && update_write_off && me.frm.doc.outstanding_amount > 0) { if(flt(value) == 0 && update_write_off && me.frm.doc.outstanding_amount > 0) {
value = flt(me.frm.doc.outstanding_amount / me.frm.doc.conversion_rate, precision(me.idx)); value = flt(me.frm.doc.outstanding_amount / me.frm.doc.conversion_rate, precision(me.idx));
} }
me.write_off_amount(value) me.write_off_amount(value);
} }
}else{ } else {
this.update_payment_amount() this.update_payment_amount();
} }
}, },
@ -220,7 +220,7 @@ erpnext.payments = erpnext.stock.StockController.extend({
$.each(this.frm.doc.payments, function(index, data) { $.each(this.frm.doc.payments, function(index, data) {
if(cint(me.idx) == cint(data.idx)){ if(cint(me.idx) == cint(data.idx)){
data.amount = flt(me.selected_mode.val(), 2) data.amount = flt(me.selected_mode.val(), 2);
} }
}) })
@ -232,8 +232,8 @@ erpnext.payments = erpnext.stock.StockController.extend({
var me = this; var me = this;
$(this.$body).find(".write_off_amount").val(format_currency(this.frm.doc.write_off_amount, this.frm.doc.currency)); $(this.$body).find(".write_off_amount").val(format_currency(this.frm.doc.write_off_amount, this.frm.doc.currency));
$(this.$body).find('.paid_amount').text(format_currency(this.frm.doc.paid_amount, this.frm.doc.currency)); $(this.$body).find('.paid_amount').text(format_currency(this.frm.doc.paid_amount, this.frm.doc.currency));
$(this.$body).find('.change_amount').val(format_currency(this.frm.doc.change_amount, this.frm.doc.currency)) $(this.$body).find('.change_amount').val(format_currency(this.frm.doc.change_amount, this.frm.doc.currency));
$(this.$body).find('.outstanding_amount').text(format_currency(this.frm.doc.outstanding_amount, frappe.get_doc(":Company", this.frm.doc.company).default_currency)) $(this.$body).find('.outstanding_amount').text(format_currency(this.frm.doc.outstanding_amount, frappe.get_doc(":Company", this.frm.doc.company).default_currency));
this.update_invoice(); this.update_invoice();
} }
}) })