chore: whitespace cleanup from codebase (#27023)

* chore: mass trailing whitespace and EOF fixes

* chore: update git-blame-ignore-revs
This commit is contained in:
Ankush Menat 2021-08-19 14:09:54 +05:30 committed by GitHub
commit 0ef5247e2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1191 changed files with 1355 additions and 1604 deletions

View File

@ -13,3 +13,6 @@
# This commit just changes spaces to tabs for indentation in some files # This commit just changes spaces to tabs for indentation in some files
5f473611bd6ed57703716244a054d3fb5ba9cd23 5f473611bd6ed57703716244a054d3fb5ba9cd23
# Whitespace fix throughout codebase
4551d7d6029b6f587f6c99d4f8df5519241c6a86

View File

@ -6,4 +6,4 @@
"scss/at-rule-no-unknown": true, "scss/at-rule-no-unknown": true,
"no-descending-specificity": null "no-descending-specificity": null
} }
} }

View File

@ -19,4 +19,4 @@ frappe.dashboards.chart_sources["Account Balance Timeline"] = {
reqd: 1 reqd: 1
}, },
] ]
}; };

View File

@ -450,5 +450,3 @@ def get_deferred_booking_accounts(doctype, voucher_detail_no, dr_or_cr):
return debit_account return debit_account
else: else:
return credit_account return credit_account

View File

@ -60,4 +60,4 @@ frappe.ui.form.on('Accounting Dimension Detail', {
let row = locals[cdt][cdn]; let row = locals[cdt][cdn];
row.reference_document = frm.doc.document_type; row.reference_document = frm.doc.document_type;
} }
}); });

View File

@ -113,5 +113,3 @@ def disable_dimension():
dimension2 = frappe.get_doc("Accounting Dimension", "Location") dimension2 = frappe.get_doc("Accounting Dimension", "Location")
dimension2.disabled = 1 dimension2.disabled = 1
dimension2.save() dimension2.save()

View File

@ -79,4 +79,4 @@ frappe.ui.form.on('Allowed Dimension', {
row.accounting_dimension = frm.doc.accounting_dimension; row.accounting_dimension = frm.doc.accounting_dimension;
frm.refresh_field("dimensions"); frm.refresh_field("dimensions");
} }
}); });

View File

@ -56,4 +56,4 @@ class AccountingPeriod(Document):
self.append('closed_documents', { self.append('closed_documents', {
"document_type": doctype_for_closing.document_type, "document_type": doctype_for_closing.document_type,
"closed": doctype_for_closing.closed "closed": doctype_for_closing.closed
}) })

View File

@ -48,4 +48,4 @@ frappe.tour['Accounts Settings'] = [
title: "Unlink Advance Payment on Cancellation of Order", title: "Unlink Advance Payment on Cancellation of Order",
description: __("Similar to the previous option, this unlinks any advance payments made against Purchase/Sales Orders.") description: __("Similar to the previous option, this unlinks any advance payments made against Purchase/Sales Orders.")
} }
]; ];

View File

@ -37,7 +37,7 @@ class AccountsSettings(Document):
def toggle_discount_accounting_fields(self): def toggle_discount_accounting_fields(self):
enable_discount_accounting = cint(self.enable_discount_accounting) enable_discount_accounting = cint(self.enable_discount_accounting)
for doctype in ["Sales Invoice Item", "Purchase Invoice Item"]: for doctype in ["Sales Invoice Item", "Purchase Invoice Item"]:
make_property_setter(doctype, "discount_account", "hidden", not(enable_discount_accounting), "Check", validate_fields_for_doctype=False) make_property_setter(doctype, "discount_account", "hidden", not(enable_discount_accounting), "Check", validate_fields_for_doctype=False)
if enable_discount_accounting: if enable_discount_accounting:
@ -52,4 +52,4 @@ class AccountsSettings(Document):
else: else:
make_property_setter(doctype, "additional_discount_account", "mandatory_depends_on", "", "Code", validate_fields_for_doctype=False) make_property_setter(doctype, "additional_discount_account", "mandatory_depends_on", "", "Code", validate_fields_for_doctype=False)
make_property_setter("Item", "default_discount_account", "hidden", not(enable_discount_accounting), "Check", validate_fields_for_doctype=False) make_property_setter("Item", "default_discount_account", "hidden", not(enable_discount_accounting), "Check", validate_fields_for_doctype=False)

View File

@ -5,4 +5,4 @@ frappe.ui.form.on('Accounts Settings', {
frm.set_df_property("frozen_accounts_modifier", "label", "Role Allowed to Close Books & Make Changes to Closed Periods"); frm.set_df_property("frozen_accounts_modifier", "label", "Role Allowed to Close Books & Make Changes to Closed Periods");
frm.set_df_property("credit_controller", "label", "Credit Manager"); frm.set_df_property("credit_controller", "label", "Credit Manager");
} }
}); });

View File

@ -120,4 +120,4 @@ erpnext.integrations.refreshPlaidLink = class refreshPlaidLink {
plaid_success(token, response) { plaid_success(token, response) {
frappe.show_alert({ message: __('Plaid Link Updated'), indicator: 'green' }); frappe.show_alert({ message: __('Plaid Link Updated'), indicator: 'green' });
} }
}; };

View File

@ -13,4 +13,4 @@ class Bank(Document):
load_address_and_contact(self) load_address_and_contact(self)
def on_trash(self): def on_trash(self):
delete_contact_and_address('Bank', self.name) delete_contact_and_address('Bank', self.name)

View File

@ -26,4 +26,4 @@ def get_data():
'items': ['Journal Entry'] 'items': ['Journal Entry']
} }
] ]
} }

View File

@ -8,7 +8,7 @@ frappe.ui.form.on("Bank Clearance", {
onload: function(frm) { onload: function(frm) {
let default_bank_account = frappe.defaults.get_user_default("Company")? let default_bank_account = frappe.defaults.get_user_default("Company")?
locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: ""; locals[":Company"][frappe.defaults.get_user_default("Company")]["default_bank_account"]: "";
frm.set_value("account", default_bank_account); frm.set_value("account", default_bank_account);

View File

@ -6,4 +6,4 @@ import frappe
from frappe.model.document import Document from frappe.model.document import Document
class BankClearanceDetail(Document): class BankClearanceDetail(Document):
pass pass

View File

@ -25,6 +25,6 @@ class BankGuarantee(Document):
def get_vouchar_detials(column_list, doctype, docname): def get_vouchar_detials(column_list, doctype, docname):
column_list = json.loads(column_list) column_list = json.loads(column_list)
for col in column_list: for col in column_list:
sanitize_searchfield(col) sanitize_searchfield(col)
return frappe.db.sql(''' select {columns} from `tab{doctype}` where name=%s''' return frappe.db.sql(''' select {columns} from `tab{doctype}` where name=%s'''
.format(columns=", ".join(column_list), doctype=doctype), docname, as_dict=1)[0] .format(columns=", ".join(column_list), doctype=doctype), docname, as_dict=1)[0]

View File

@ -105,4 +105,3 @@ def unclear_reference_payment(doctype, docname):
frappe.db.set_value(doc.payment_document, doc.payment_entry, "clearance_date", None) frappe.db.set_value(doc.payment_document, doc.payment_entry, "clearance_date", None)
return doc.payment_entry return doc.payment_entry

View File

@ -10,4 +10,4 @@ frappe.listview_settings['Bank Transaction'] = {
return [__("Reconciled"), "green", "unallocated_amount,=,0"]; return [__("Reconciled"), "green", "unallocated_amount,=,0"];
} }
} }
}; };

View File

@ -77,4 +77,4 @@ def get_bank_mapping(bank_account):
mapping = {row.file_field:row.bank_transaction_field for row in bank.bank_transaction_mapping} mapping = {row.file_field:row.bank_transaction_field for row in bank.bank_transaction_mapping}
return mapping return mapping

View File

@ -6,4 +6,4 @@ import frappe
from frappe.model.document import Document from frappe.model.document import Document
class CFormInvoiceDetail(Document): class CFormInvoiceDetail(Document):
pass pass

View File

@ -18,5 +18,3 @@ class CashFlowMapping(Document):
frappe._('You can only select a maximum of one option from the list of check boxes.'), frappe._('You can only select a maximum of one option from the list of check boxes.'),
title='Error' title='Error'
) )

View File

@ -33,4 +33,4 @@ class CashierClosing(Document):
def validate_time(self): def validate_time(self):
if self.from_time >= self.time: if self.from_time >= self.time:
frappe.throw(_("From Time Should Be Less Than To Time")) frappe.throw(_("From Time Should Be Less Than To Time"))

View File

@ -10,10 +10,10 @@ frappe.ui.form.on('Cheque Print Template', {
function() { function() {
erpnext.cheque_print.view_cheque_print(frm); erpnext.cheque_print.view_cheque_print(frm);
}).addClass("btn-primary"); }).addClass("btn-primary");
$(frm.fields_dict.cheque_print_preview.wrapper).empty() $(frm.fields_dict.cheque_print_preview.wrapper).empty()
var template = '<div style="position: relative; overflow-x: scroll;">\ var template = '<div style="position: relative; overflow-x: scroll;">\
<div id="cheque_preview" style="width: {{ cheque_width }}cm; \ <div id="cheque_preview" style="width: {{ cheque_width }}cm; \
height: {{ cheque_height }}cm;\ height: {{ cheque_height }}cm;\
@ -47,9 +47,9 @@ frappe.ui.form.on('Cheque Print Template', {
position: absolute;"> Signatory Name </span>\ position: absolute;"> Signatory Name </span>\
</div>\ </div>\
</div>'; </div>';
$(frappe.render(template, frm.doc)).appendTo(frm.fields_dict.cheque_print_preview.wrapper) $(frappe.render(template, frm.doc)).appendTo(frm.fields_dict.cheque_print_preview.wrapper)
if (frm.doc.scanned_cheque) { if (frm.doc.scanned_cheque) {
$(frm.fields_dict.cheque_print_preview.wrapper).find("#cheque_preview").css('background-image', 'url(' + frm.doc.scanned_cheque + ')'); $(frm.fields_dict.cheque_print_preview.wrapper).find("#cheque_preview").css('background-image', 'url(' + frm.doc.scanned_cheque + ')');
} }

View File

@ -129,4 +129,4 @@ def get_name_with_number(new_account, account_number):
def check_if_distributed_cost_center_enabled(cost_center_list): def check_if_distributed_cost_center_enabled(cost_center_list):
value_list = frappe.get_list("Cost Center", {"name": ["in", cost_center_list]}, "enable_distributed_cost_center", as_list=1) value_list = frappe.get_list("Cost Center", {"name": ["in", cost_center_list]}, "enable_distributed_cost_center", as_list=1)
return next((True for x in value_list if x[0]), False) return next((True for x in value_list if x[0]), False)

View File

@ -12,4 +12,4 @@ def get_data():
'items': ['Budget Variance Report', 'General Ledger'] 'items': ['Budget Variance Report', 'General Ledger']
} }
] ]
} }

View File

@ -51,4 +51,4 @@ frappe.treeview_settings["Cost Center"] = {
} }
} }

View File

@ -62,6 +62,3 @@ def create_cost_center(**args):
cc.is_group = args.is_group or 0 cc.is_group = args.is_group or 0
cc.parent_cost_center = args.parent_cost_center or "_Test Company - _TC" cc.parent_cost_center = args.parent_cost_center or "_Test Company - _TC"
cc.insert() cc.insert()

View File

@ -17,7 +17,7 @@ class CouponCode(Document):
self.coupon_code =''.join(i for i in self.coupon_name if not i.isdigit())[0:8].upper() self.coupon_code =''.join(i for i in self.coupon_name if not i.isdigit())[0:8].upper()
elif self.coupon_type == "Gift Card": elif self.coupon_type == "Gift Card":
self.coupon_code = frappe.generate_hash()[:10].upper() self.coupon_code = frappe.generate_hash()[:10].upper()
def validate(self): def validate(self):
if self.coupon_type == "Gift Card": if self.coupon_type == "Gift Card":
self.maximum_use = 1 self.maximum_use = 1

View File

@ -124,6 +124,3 @@ class TestCouponCode(unittest.TestCase):
so.submit() so.submit()
self.assertEqual(frappe.db.get_value("Coupon Code", "SAVE30", "used"), 1) self.assertEqual(frappe.db.get_value("Coupon Code", "SAVE30", "used"), 1)

View File

@ -7,4 +7,4 @@ from __future__ import unicode_literals
from frappe.model.document import Document from frappe.model.document import Document
class DiscountedInvoice(Document): class DiscountedInvoice(Document):
pass pass

View File

@ -14,4 +14,4 @@ def get_data():
'items': ['Payment Entry', 'Journal Entry'] 'items': ['Payment Entry', 'Journal Entry']
} }
] ]
} }

View File

@ -143,4 +143,4 @@ def create_dunning_type_with_zero_interest_rate():
'closing_text': 'We kindly request that you pay the outstanding amount immediately, and late fees.' 'closing_text': 'We kindly request that you pay the outstanding amount immediately, and late fees.'
} }
) )
dunning_type.save() dunning_type.save()

View File

@ -31,7 +31,7 @@ frappe.ui.form.on('Exchange Rate Revaluation', {
}, __('Create')); }, __('Create'));
} }
} }
}); });
} }
}, },
@ -128,4 +128,4 @@ var get_account_details = function(frm, cdt, cdn) {
frm.events.get_total_gain_loss(frm); frm.events.get_total_gain_loss(frm);
} }
}); });
}; };

View File

@ -44,7 +44,7 @@ class ExchangeRateRevaluation(Document):
if total_amt != total_debit: if total_amt != total_debit:
return True return True
return False return False
@frappe.whitelist() @frappe.whitelist()
@ -205,4 +205,4 @@ def get_account_details(account, company, posting_date, party_type=None, party=N
"new_balance_in_base_currency": new_balance_in_base_currency "new_balance_in_base_currency": new_balance_in_base_currency
} }
return account_details return account_details

View File

@ -19,7 +19,7 @@ class TestFinanceBook(unittest.TestCase):
finance_book = frappe.get_doc("Finance Book", "_Test Finance Book") finance_book = frappe.get_doc("Finance Book", "_Test Finance Book")
return finance_book return finance_book
def test_finance_book(self): def test_finance_book(self):
finance_book = self.create_finance_book() finance_book = self.create_finance_book()

View File

@ -17,4 +17,4 @@ def get_data():
'items': ['Payment Entry', 'Journal Entry'] 'items': ['Payment Entry', 'Journal Entry']
} }
] ]
} }

View File

@ -18,4 +18,4 @@ frappe.listview_settings['Invoice Discounting'] = {
return [__("Canceled"), "red", "status,=,Canceled"]; return [__("Canceled"), "red", "status,=,Canceled"];
} }
} }
}; };

View File

@ -14,4 +14,4 @@ frappe.ui.form.on("Journal Entry", {
}; };
}); });
} }
}); });

View File

@ -100,7 +100,7 @@ class TestJournalEntry(unittest.TestCase):
"debit_in_account_currency": 0 if diff > 0 else abs(diff), "debit_in_account_currency": 0 if diff > 0 else abs(diff),
"credit_in_account_currency": diff if diff > 0 else 0 "credit_in_account_currency": diff if diff > 0 else 0
}) })
jv.append("accounts", { jv.append("accounts", {
"account": "Stock Adjustment - TCP1", "account": "Stock Adjustment - TCP1",
"cost_center": "Main - TCP1", "cost_center": "Main - TCP1",

View File

@ -88,4 +88,4 @@ frappe.ui.form.on("Journal Entry Template", {
frappe.model.clear_table(frm.doc, "accounts"); frappe.model.clear_table(frm.doc, "accounts");
frm.refresh_field("accounts"); frm.refresh_field("accounts");
} }
}); });

View File

@ -14,4 +14,4 @@ frappe.ui.form.on('Mode of Payment', {
}; };
}); });
}, },
}); });

View File

@ -39,4 +39,3 @@ class ModeofPayment(Document):
message = "POS Profile " + frappe.bold(", ".join(pos_profiles)) + " contains \ message = "POS Profile " + frappe.bold(", ".join(pos_profiles)) + " contains \
Mode of Payment " + frappe.bold(str(self.name)) + ". Please remove them to disable this mode." Mode of Payment " + frappe.bold(str(self.name)) + ". Please remove them to disable this mode."
frappe.throw(_(message), title="Not Allowed") frappe.throw(_(message), title="Not Allowed")

View File

@ -55,4 +55,4 @@ def get_percentage(doc, start_date, period):
if d.month in months: if d.month in months:
percentage += d.percentage_allocation percentage += d.percentage_allocation
return percentage return percentage

View File

@ -20,4 +20,4 @@ def get_data():
'items': ['Budget'] 'items': ['Budget']
} }
] ]
} }

View File

@ -162,4 +162,4 @@ frappe.ui.form.on('Opening Invoice Creation Tool Item', {
invoices_add: (frm) => { invoices_add: (frm) => {
frm.trigger('update_invoice_table'); frm.trigger('update_invoice_table');
} }
}); });

View File

@ -241,4 +241,3 @@ def get_temporary_opening_account(company=None):
frappe.throw(_("Please add a Temporary Opening account in Chart of Accounts")) frappe.throw(_("Please add a Temporary Opening account in Chart of Accounts"))
return accounts[0].name return accounts[0].name

View File

@ -185,7 +185,7 @@ class PaymentEntry(AccountsController):
for field, value in iteritems(ref_details): for field, value in iteritems(ref_details):
if d.exchange_gain_loss: if d.exchange_gain_loss:
# for cases where gain/loss is booked into invoice # for cases where gain/loss is booked into invoice
# exchange_gain_loss is calculated from invoice & populated # exchange_gain_loss is calculated from invoice & populated
# and row.exchange_rate is already set to payment entry's exchange rate # and row.exchange_rate is already set to payment entry's exchange rate
# refer -> `update_reference_in_payment_entry()` in utils.py # refer -> `update_reference_in_payment_entry()` in utils.py
continue continue
@ -417,7 +417,7 @@ class PaymentEntry(AccountsController):
net_total_for_tds = 0 net_total_for_tds = 0
if reference.reference_doctype == 'Purchase Order': if reference.reference_doctype == 'Purchase Order':
net_total_for_tds += flt(frappe.db.get_value('Purchase Order', reference.reference_name, 'net_total')) net_total_for_tds += flt(frappe.db.get_value('Purchase Order', reference.reference_name, 'net_total'))
if net_total_for_tds: if net_total_for_tds:
net_total = net_total_for_tds net_total = net_total_for_tds
@ -841,7 +841,7 @@ class PaymentEntry(AccountsController):
if account_details: if account_details:
row.update(account_details) row.update(account_details)
if not row.get('amount'): if not row.get('amount'):
# if no difference amount # if no difference amount
return return

View File

@ -11,4 +11,4 @@ frappe.listview_settings['Payment Entry'] = {
}; };
} }
} }
}; };

View File

@ -57,4 +57,4 @@ QUnit.test("test payment entry", function(assert) {
() => frappe.timeout(3), () => frappe.timeout(3),
() => done() () => done()
]); ]);
}); });

View File

@ -25,4 +25,4 @@ QUnit.test("test payment entry", function(assert) {
() => frappe.timeout(0.3), () => frappe.timeout(0.3),
() => done() () => done()
]); ]);
}); });

View File

@ -64,4 +64,4 @@ QUnit.test("test payment entry", function(assert) {
}, },
() => done() () => done()
]); ]);
}); });

View File

@ -9,19 +9,19 @@ from frappe.model.document import Document
class PaymentGatewayAccount(Document): class PaymentGatewayAccount(Document):
def autoname(self): def autoname(self):
self.name = self.payment_gateway + " - " + self.currency self.name = self.payment_gateway + " - " + self.currency
def validate(self): def validate(self):
self.currency = frappe.db.get_value("Account", self.payment_account, "account_currency") self.currency = frappe.db.get_value("Account", self.payment_account, "account_currency")
self.update_default_payment_gateway() self.update_default_payment_gateway()
self.set_as_default_if_not_set() self.set_as_default_if_not_set()
def update_default_payment_gateway(self): def update_default_payment_gateway(self):
if self.is_default: if self.is_default:
frappe.db.sql("""update `tabPayment Gateway Account` set is_default = 0 frappe.db.sql("""update `tabPayment Gateway Account` set is_default = 0
where is_default = 1 """) where is_default = 1 """)
def set_as_default_if_not_set(self): def set_as_default_if_not_set(self):
if not frappe.db.get_value("Payment Gateway Account", if not frappe.db.get_value("Payment Gateway Account",
{"is_default": 1, "name": ("!=", self.name)}, "name"): {"is_default": 1, "name": ("!=", self.name)}, "name"):
self.is_default = 1 self.is_default = 1

View File

@ -136,4 +136,4 @@ frappe.ui.form.on('Payment Order', {
dialog.show(); dialog.show();
}, },
}); });

View File

@ -9,4 +9,4 @@ def get_data():
'items': ['Payment Entry', 'Journal Entry'] 'items': ['Payment Entry', 'Journal Entry']
} }
] ]
} }

View File

@ -46,4 +46,4 @@ def create_payment_order_against_payment_entry(ref_doc, order_type):
doc = make_payment_order(ref_doc.name, payment_order) doc = make_payment_order(ref_doc.name, payment_order)
doc.save() doc.save()
doc.submit() doc.submit()
return doc return doc

View File

@ -307,4 +307,4 @@ def reconcile_dr_cr_note(dr_cr_notes, company):
] ]
}) })
jv.flags.ignore_mandatory = True jv.flags.ignore_mandatory = True
jv.submit() jv.submit()

View File

@ -541,4 +541,4 @@ def make_payment_order(source_name, target_doc=None):
} }
}, target_doc, set_missing_values) }, target_doc, set_missing_values)
return doclist return doclist

View File

@ -138,4 +138,4 @@ class TestPaymentRequest(unittest.TestCase):
# Try to make Payment Request more than SO amount, should give validation # Try to make Payment Request more than SO amount, should give validation
pr2.grand_total = 900 pr2.grand_total = 900
self.assertRaises(frappe.ValidationError, pr2.save) self.assertRaises(frappe.ValidationError, pr2.save)

View File

@ -19,4 +19,4 @@ frappe.ui.form.on('Payment Term', {
frm.set_df_property("discount", "description", description); frm.set_df_property("discount", "description", description);
} }
} }
}); });

View File

@ -3,6 +3,6 @@
frappe.ui.form.on('Payment Terms Template', { frappe.ui.form.on('Payment Terms Template', {
setup: function(frm) { setup: function(frm) {
} }
}); });

View File

@ -30,4 +30,4 @@ def get_data():
'items': ['Customer Group', 'Supplier Group'] 'items': ['Customer Group', 'Supplier Group']
} }
] ]
} }

View File

@ -51,7 +51,7 @@ class PeriodClosingVoucher(AccountsController):
def make_gl_entries(self): def make_gl_entries(self):
gl_entries = [] gl_entries = []
net_pl_balance = 0 net_pl_balance = 0
pl_accounts = self.get_pl_balances() pl_accounts = self.get_pl_balances()
@ -79,7 +79,7 @@ class PeriodClosingVoucher(AccountsController):
from erpnext.accounts.general_ledger import make_gl_entries from erpnext.accounts.general_ledger import make_gl_entries
make_gl_entries(gl_entries) make_gl_entries(gl_entries)
def get_pnl_gl_entry(self, net_pl_balance): def get_pnl_gl_entry(self, net_pl_balance):
cost_center = frappe.db.get_value("Company", self.company, "cost_center") cost_center = frappe.db.get_value("Company", self.company, "cost_center")
gl_entry = self.get_gl_dict({ gl_entry = self.get_gl_dict({

View File

@ -139,7 +139,7 @@ def create_company():
'company_name': "Test PCV Company", 'company_name': "Test PCV Company",
'country': 'United States', 'country': 'United States',
'default_currency': 'USD' 'default_currency': 'USD'
}) })
company.insert(ignore_if_duplicate = True) company.insert(ignore_if_duplicate = True)
return company.name return company.name

View File

@ -20,9 +20,9 @@ frappe.ui.form.on('POS Closing Entry', {
frm.set_query("pos_opening_entry", function(doc) { frm.set_query("pos_opening_entry", function(doc) {
return { filters: { 'status': 'Open', 'docstatus': 1 } }; return { filters: { 'status': 'Open', 'docstatus': 1 } };
}); });
if (frm.doc.docstatus === 0 && !frm.doc.amended_from) frm.set_value("period_end_date", frappe.datetime.now_datetime()); if (frm.doc.docstatus === 0 && !frm.doc.amended_from) frm.set_value("period_end_date", frappe.datetime.now_datetime());
frappe.realtime.on('closing_process_complete', async function(data) { frappe.realtime.on('closing_process_complete', async function(data) {
await frm.reload_doc(); await frm.reload_doc();
if (frm.doc.status == 'Failed' && frm.doc.error_message && data.user == frappe.session.user) { if (frm.doc.status == 'Failed' && frm.doc.error_message && data.user == frappe.session.user) {
@ -43,7 +43,7 @@ frappe.ui.form.on('POS Closing Entry', {
const issue = '<a id="jump_to_error" style="text-decoration: underline;">issue</a>'; const issue = '<a id="jump_to_error" style="text-decoration: underline;">issue</a>';
frm.dashboard.set_headline( frm.dashboard.set_headline(
__('POS Closing failed while running in a background process. You can resolve the {0} and retry the process again.', [issue])); __('POS Closing failed while running in a background process. You can resolve the {0} and retry the process again.', [issue]));
$('#jump_to_error').on('click', (e) => { $('#jump_to_error').on('click', (e) => {
e.preventDefault(); e.preventDefault();
frappe.utils.scroll_to( frappe.utils.scroll_to(

View File

@ -5,10 +5,10 @@ frappe.ui.form.on('POS Invoice Merge Log', {
setup: function(frm) { setup: function(frm) {
frm.set_query("pos_invoice", "pos_invoices", doc => { frm.set_query("pos_invoice", "pos_invoices", doc => {
return{ return{
filters: { filters: {
'docstatus': 1, 'docstatus': 1,
'customer': doc.customer, 'customer': doc.customer,
'consolidated_invoice': '' 'consolidated_invoice': ''
} }
} }
}); });

View File

@ -354,4 +354,4 @@ def safe_load_json(message):
except Exception: except Exception:
json_message = message json_message = message
return json_message return json_message

View File

@ -147,4 +147,3 @@ class TestPOSInvoiceMergeLog(unittest.TestCase):
frappe.set_user("Administrator") frappe.set_user("Administrator")
frappe.db.sql("delete from `tabPOS Profile`") frappe.db.sql("delete from `tabPOS Profile`")
frappe.db.sql("delete from `tabPOS Invoice`") frappe.db.sql("delete from `tabPOS Invoice`")

View File

@ -53,4 +53,4 @@ frappe.ui.form.on('POS Opening Entry', {
}); });
} }
} }
}); });

View File

@ -38,4 +38,4 @@ class POSOpeningEntry(StatusUpdater):
frappe.throw(msg.format(", ".join(invalid_modes)), title=_("Missing Account")) frappe.throw(msg.format(", ".join(invalid_modes)), title=_("Missing Account"))
def on_submit(self): def on_submit(self):
self.set_status(update=True) self.set_status(update=True)

View File

@ -21,8 +21,8 @@ def create_opening_entry(pos_profile, user):
balance_details.append(frappe._dict({ balance_details.append(frappe._dict({
'mode_of_payment': d.mode_of_payment 'mode_of_payment': d.mode_of_payment
})) }))
entry.set("balance_details", balance_details) entry.set("balance_details", balance_details)
entry.submit() entry.submit()
return entry.as_dict() return entry.as_dict()

View File

@ -8,4 +8,4 @@ from frappe.model.document import Document
class POSSettings(Document): class POSSettings(Document):
def validate(self): def validate(self):
pass pass

View File

@ -615,4 +615,4 @@ def delete_existing_pricing_rules():
for doctype in ["Pricing Rule", "Pricing Rule Item Code", for doctype in ["Pricing Rule", "Pricing Rule Item Code",
"Pricing Rule Item Group", "Pricing Rule Brand"]: "Pricing Rule Item Group", "Pricing Rule Brand"]:
frappe.db.sql("delete from `tab{0}`".format(doctype)) frappe.db.sql("delete from `tab{0}`".format(doctype))

View File

@ -26,4 +26,3 @@ QUnit.test("test pricing rule", function(assert) {
() => done() () => done()
]); ]);
}); });

View File

@ -31,4 +31,4 @@ class ProcessDeferredAccounting(Document):
'against_voucher': self.name 'against_voucher': self.name
}) })
make_reverse_gl_entries(gl_entries=gl_entries) make_reverse_gl_entries(gl_entries=gl_entries)

View File

@ -45,4 +45,4 @@ class TestProcessDeferredAccounting(unittest.TestCase):
["Sales - _TC", 0.0, 33.85, "2019-01-31"] ["Sales - _TC", 0.0, 33.85, "2019-01-31"]
] ]
check_gl_entries(self, si.name, expected_gle, "2019-01-10") check_gl_entries(self, si.name, expected_gle, "2019-01-10")

View File

@ -284,4 +284,4 @@ def send_auto_email():
selected = frappe.get_list('Process Statement Of Accounts', filters={'to_date': format_date(today()), 'enable_auto_email': 1}) selected = frappe.get_list('Process Statement Of Accounts', filters={'to_date': format_date(today()), 'enable_auto_email': 1})
for entry in selected: for entry in selected:
send_emails(entry.name, from_scheduler=True) send_emails(entry.name, from_scheduler=True)
return True return True

View File

@ -48,4 +48,4 @@ frappe.ui.form.on('Promotional Scheme', {
frm.doc.apply_on === key ? 1 : 0); frm.doc.apply_on === key ? 1 : 0);
} }
} }
}); });

View File

@ -9,4 +9,4 @@ def get_data():
'items': ['Pricing Rule'] 'items': ['Pricing Rule']
} }
] ]
} }

View File

@ -11,25 +11,25 @@ class TestPromotionalScheme(unittest.TestCase):
ps = make_promotional_scheme() ps = make_promotional_scheme()
price_rules = frappe.get_all('Pricing Rule', fields = ["promotional_scheme_id", "name", "creation"], price_rules = frappe.get_all('Pricing Rule', fields = ["promotional_scheme_id", "name", "creation"],
filters = {'promotional_scheme': ps.name}) filters = {'promotional_scheme': ps.name})
self.assertTrue(len(price_rules),1) self.assertTrue(len(price_rules),1)
price_doc_details = frappe.db.get_value('Pricing Rule', price_rules[0].name, ['customer', 'min_qty', 'discount_percentage'], as_dict = 1) price_doc_details = frappe.db.get_value('Pricing Rule', price_rules[0].name, ['customer', 'min_qty', 'discount_percentage'], as_dict = 1)
self.assertTrue(price_doc_details.customer, '_Test Customer') self.assertTrue(price_doc_details.customer, '_Test Customer')
self.assertTrue(price_doc_details.min_qty, 4) self.assertTrue(price_doc_details.min_qty, 4)
self.assertTrue(price_doc_details.discount_percentage, 20) self.assertTrue(price_doc_details.discount_percentage, 20)
ps.price_discount_slabs[0].min_qty = 6 ps.price_discount_slabs[0].min_qty = 6
ps.append('customer', { ps.append('customer', {
'customer': "_Test Customer 2"}) 'customer': "_Test Customer 2"})
ps.save() ps.save()
price_rules = frappe.get_all('Pricing Rule', fields = ["promotional_scheme_id", "name"], price_rules = frappe.get_all('Pricing Rule', fields = ["promotional_scheme_id", "name"],
filters = {'promotional_scheme': ps.name}) filters = {'promotional_scheme': ps.name})
self.assertTrue(len(price_rules), 2) self.assertTrue(len(price_rules), 2)
price_doc_details = frappe.db.get_value('Pricing Rule', price_rules[1].name, ['customer', 'min_qty', 'discount_percentage'], as_dict = 1) price_doc_details = frappe.db.get_value('Pricing Rule', price_rules[1].name, ['customer', 'min_qty', 'discount_percentage'], as_dict = 1)
self.assertTrue(price_doc_details.customer, '_Test Customer 2') self.assertTrue(price_doc_details.customer, '_Test Customer 2')
self.assertTrue(price_doc_details.min_qty, 6) self.assertTrue(price_doc_details.min_qty, 6)
self.assertTrue(price_doc_details.discount_percentage, 20) self.assertTrue(price_doc_details.discount_percentage, 20)
price_doc_details = frappe.db.get_value('Pricing Rule', price_rules[0].name, ['customer', 'min_qty', 'discount_percentage'], as_dict = 1) price_doc_details = frappe.db.get_value('Pricing Rule', price_rules[0].name, ['customer', 'min_qty', 'discount_percentage'], as_dict = 1)
self.assertTrue(price_doc_details.customer, '_Test Customer') self.assertTrue(price_doc_details.customer, '_Test Customer')
self.assertTrue(price_doc_details.min_qty, 6) self.assertTrue(price_doc_details.min_qty, 6)
@ -38,7 +38,7 @@ class TestPromotionalScheme(unittest.TestCase):
price_rules = frappe.get_all('Pricing Rule', fields = ["promotional_scheme_id", "name"], price_rules = frappe.get_all('Pricing Rule', fields = ["promotional_scheme_id", "name"],
filters = {'promotional_scheme': ps.name}) filters = {'promotional_scheme': ps.name})
self.assertEqual(price_rules, []) self.assertEqual(price_rules, [])
def make_promotional_scheme(): def make_promotional_scheme():
ps = frappe.new_doc('Promotional Scheme') ps = frappe.new_doc('Promotional Scheme')
ps.name = '_Test Scheme' ps.name = '_Test Scheme'
@ -57,4 +57,4 @@ def make_promotional_scheme():
}) })
ps.save() ps.save()
return ps return ps

View File

@ -591,4 +591,4 @@ frappe.ui.form.on("Purchase Invoice", {
company: function(frm) { company: function(frm) {
erpnext.accounts.dimensions.update_dimension(frm, frm.doctype); erpnext.accounts.dimensions.update_dimension(frm, frm.doctype);
}, },
}) })

View File

@ -34,4 +34,4 @@ def get_data():
'items': ['Auto Repeat'] 'items': ['Auto Repeat']
}, },
] ]
} }

View File

@ -26,4 +26,4 @@ frappe.listview_settings['Purchase Invoice'] = {
return [__("Paid"), "green", "outstanding_amount,=,0"]; return [__("Paid"), "green", "outstanding_amount,=,0"];
} }
} }
}; };

View File

@ -72,4 +72,3 @@ QUnit.test("test purchase invoice", function(assert) {
() => done() () => done()
]); ]);
}); });

View File

@ -7,4 +7,4 @@ import frappe
from frappe.model.document import Document from frappe.model.document import Document
class PurchaseInvoiceAdvance(Document): class PurchaseInvoiceAdvance(Document):
pass pass

View File

@ -7,4 +7,4 @@ import frappe
from frappe.model.document import Document from frappe.model.document import Document
class PurchaseTaxesandCharges(Document): class PurchaseTaxesandCharges(Document):
pass pass

View File

@ -19,4 +19,4 @@ def get_data():
'items': ['Supplier Quotation', 'Tax Rule'] 'items': ['Supplier Quotation', 'Tax Rule']
} }
] ]
} }

View File

@ -26,4 +26,3 @@ QUnit.test("test sales taxes and charges template", function(assert) {
() => done() () => done()
]); ]);
}); });

View File

@ -67,7 +67,7 @@ frappe.listview_settings['Sales Invoice'].onload = function (list_view) {
"default": "1-Duplicate", "default": "1-Duplicate",
"options": ["1-Duplicate", "2-Data Entry Error", "3-Order Cancelled", "4-Other"] "options": ["1-Duplicate", "2-Data Entry Error", "3-Order Cancelled", "4-Other"]
}, },
{ {
"label": "Remark", "label": "Remark",
"fieldname": "remark", "fieldname": "remark",
"fieldtype": "Data", "fieldtype": "Data",
@ -82,7 +82,7 @@ frappe.listview_settings['Sales Invoice'].onload = function (list_view) {
const data = d.get_values(); const data = d.get_values();
frappe.call({ frappe.call({
method: 'erpnext.regional.india.e_invoice.utils.cancel_irns', method: 'erpnext.regional.india.e_invoice.utils.cancel_irns',
args: { args: {
doctype: list_view.doctype, doctype: list_view.doctype,
docnames, docnames,
reason: data.reason.split('-')[0], reason: data.reason.split('-')[0],
@ -122,7 +122,7 @@ frappe.listview_settings['Sales Invoice'].onload = function (list_view) {
frappe.realtime.on("bulk_einvoice_generation_complete", (data) => { frappe.realtime.on("bulk_einvoice_generation_complete", (data) => {
const { failures, user, invoices } = data; const { failures, user, invoices } = data;
if (invoices.length != failures.length) { if (invoices.length != failures.length) {
frappe.msgprint({ frappe.msgprint({
message: __('{0} e-invoices generated successfully', [invoices.length]), message: __('{0} e-invoices generated successfully', [invoices.length]),
@ -171,4 +171,4 @@ frappe.listview_settings['Sales Invoice'].onload = function (list_view) {
}); });
} }
}); });
}; };

View File

@ -1,3 +1,3 @@
{% include "erpnext/regional/italy/sales_invoice.js" %} {% include "erpnext/regional/italy/sales_invoice.js" %}
erpnext.setup_e_invoice_button('Sales Invoice') erpnext.setup_e_invoice_button('Sales Invoice')

View File

@ -33,4 +33,4 @@ def get_data():
'items': ['Auto Repeat'] 'items': ['Auto Repeat']
}, },
] ]
} }

View File

@ -40,4 +40,3 @@ QUnit.test("test sales Invoice", function(assert) {
() => done() () => done()
]); ]);
}); });

View File

@ -33,4 +33,3 @@ QUnit.test("test sales invoice with margin", function(assert) {
() => done() () => done()
]); ]);
}); });

View File

@ -54,4 +54,3 @@ QUnit.test("test sales Invoice with payment", function(assert) {
() => done() () => done()
]); ]);
}); });

View File

@ -49,4 +49,3 @@ QUnit.test("test sales Invoice with payment request", function(assert) {
() => done() () => done()
]); ]);
}); });

View File

@ -42,4 +42,3 @@ QUnit.test("test sales Invoice with serialize item", function(assert) {
() => done() () => done()
]); ]);
}); });

View File

@ -7,4 +7,4 @@ import frappe
from frappe.model.document import Document from frappe.model.document import Document
class SalesInvoiceAdvance(Document): class SalesInvoiceAdvance(Document):
pass pass

View File

@ -7,4 +7,4 @@ import frappe
from frappe.model.document import Document from frappe.model.document import Document
class SalesTaxesandCharges(Document): class SalesTaxesandCharges(Document):
pass pass

View File

@ -21,4 +21,4 @@ def get_data():
'items': ['POS Profile', 'Subscription', 'Restaurant', 'Tax Rule'] 'items': ['POS Profile', 'Subscription', 'Restaurant', 'Tax Rule']
} }
] ]
} }

View File

@ -26,4 +26,3 @@ QUnit.test("test sales taxes and charges template", function(assert) {
() => done() () => done()
]); ]);
}); });

Some files were not shown because too many files have changed in this diff Show More