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

fix: Patch and linting errors

Browse Source
This commit is contained in:
Deepesh Garg 2021-09-02 22:01:24 +05:30
parent e1fffdb262
commit 2b34028acd
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/patches/v13_0/create_gst_payment_entry_fields.py
View File

@ -4,6 +4,8 @@
from frappe.custom.doctype.custom_field.custom_field import create_custom_fields from frappe.custom.doctype.custom_field.custom_field import create_custom_fields
def execute(): def execute():
frappe.reload_doc('accounts', 'doctype', 'payment_entry')
custom_fields = { custom_fields = {
'Payment Entry': [ 'Payment Entry': [
dict(fieldname='gst_section', label='GST Details', fieldtype='Section Break', insert_after='deductions', dict(fieldname='gst_section', label='GST Details', fieldtype='Section Break', insert_after='deductions',

4
erpnext/regional/india/setup.py
View File

@ -123,8 +123,8 @@ def add_print_formats():
def make_property_setters(patch=False): def make_property_setters(patch=False):
# GST rules do not allow for an invoice no. bigger than 16 characters # GST rules do not allow for an invoice no. bigger than 16 characters
journal_entry_types = frappe.get_meta("Journal Entry").get_options("voucher_type").split("\n") + ['Reversal Of ITC'] journal_entry_types = frappe.get_meta("Journal Entry").get_options("voucher_type").split("\n") + ['Reversal Of ITC']
sales_invoice_series = frappe.get_meta("Sales Invoice").get_options("naming_series").split("\n") + ['SINV-.YY.-', 'SRET-.YY.-', ''] sales_invoice_series = ['SINV-.YY.-', 'SRET-.YY.-', ''] + frappe.get_meta("Sales Invoice").get_options("naming_series").split("\n")
purchase_invoice_series = frappe.get_meta("Purchase Invoice").get_options("naming_series").split("\n") + ['PINV-.YY.-', 'PRET-.YY.-', ''] purchase_invoice_series = ['PINV-.YY.-', 'PRET-.YY.-', ''] + frappe.get_meta("Purchase Invoice").get_options("naming_series").split("\n")
if not patch: if not patch:
make_property_setter('Sales Invoice', 'naming_series', 'options', '\n'.join(sales_invoice_series), '') make_property_setter('Sales Invoice', 'naming_series', 'options', '\n'.join(sales_invoice_series), '')

2
erpnext/regional/report/gstr_1/gstr_1.py
View File

@ -78,7 +78,7 @@ class Gstr1Report(object):
self.data.append(row) self.data.append(row)
def get_advance_data(self): def get_advance_data(self):
Advances_data = {} advances_data = {}
advances = self.get_advance_entries() advances = self.get_advance_entries()
for entry in advances: for entry in advances:
# only consider IGST and SGST so as to avoid duplication of taxable amount # only consider IGST and SGST so as to avoid duplication of taxable amount