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

fix: indentations

Browse Source
This commit is contained in:
Ahmad 2021-09-17 01:14:41 +05:00
parent 8a42570c96
commit 940db71a82
5 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/regional/doctype/ksa_vat_setting/ksa_vat_setting.js
View File

@ -2,7 +2,7 @@
// For license information, please see license.txt // For license information, please see license.txt
frappe.ui.form.on('KSA VAT Setting', { frappe.ui.form.on('KSA VAT Setting', {
onload: function(frm) { onload: function () {
frappe.breadcrumbs.add('Accounts', 'KSA VAT Setting'); frappe.breadcrumbs.add('Accounts', 'KSA VAT Setting');
} }
}); });

2
erpnext/regional/doctype/ksa_vat_setting/ksa_vat_setting_list.js
View File

@ -1,5 +1,5 @@
frappe.listview_settings['KSA VAT Setting'] = { frappe.listview_settings['KSA VAT Setting'] = {
onload(list) { onload () {
frappe.breadcrumbs.add('Accounts'); frappe.breadcrumbs.add('Accounts');
} }
} }

17
erpnext/regional/report/ksa_vat/ksa_vat.py
View File

@ -2,11 +2,13 @@
# For license information, please see license.txt # For license information, please see license.txt
from __future__ import unicode_literals from __future__ import unicode_literals
import json
import frappe import frappe
from frappe import _ from frappe import _
from frappe.utils import get_url_to_list from frappe.utils import get_url_to_list
from erpnext.controllers.taxes_and_totals import get_itemised_tax_breakup_data, get_rounded_tax_amount
import json
def execute(filters=None): def execute(filters=None):
columns = columns = get_columns() columns = columns = get_columns()
@ -74,7 +76,7 @@ def get_data(filters):
# Sales Grand Total # Sales Grand Total
append_data(data, 'Grand Total', grand_total_taxable_amount, append_data(data, 'Grand Total', grand_total_taxable_amount,
grand_total_taxable_adjustment_amount, grand_total_tax ) grand_total_taxable_adjustment_amount, grand_total_tax)
# Blank Line # Blank Line
append_data(data, '', '', '', '') append_data(data, '', '', '', '')
@ -100,7 +102,7 @@ def get_data(filters):
# Purchase Grand Total # Purchase Grand Total
append_data(data, 'Grand Total', grand_total_taxable_amount, append_data(data, 'Grand Total', grand_total_taxable_amount,
grand_total_taxable_adjustment_amount, grand_total_tax ) grand_total_taxable_adjustment_amount, grand_total_tax)
return data return data
@ -121,8 +123,7 @@ def get_tax_data_for_each_vat_setting(vat_setting, filters, doctype):
filters ={ filters ={
'docstatus': 1, 'docstatus': 1,
'posting_date': ['between', [from_date, to_date]] 'posting_date': ['between', [from_date, to_date]]
}, }, fields =['name', 'is_return'])
fields =['name', 'is_return'])
for invoice in invoices: for invoice in invoices:
invoice_items = frappe.get_list(f'{doctype} Item', invoice_items = frappe.get_list(f'{doctype} Item',
@ -130,9 +131,7 @@ def get_tax_data_for_each_vat_setting(vat_setting, filters, doctype):
'docstatus': 1, 'docstatus': 1,
'parent': invoice.name, 'parent': invoice.name,
'item_tax_template': vat_setting.item_tax_template 'item_tax_template': vat_setting.item_tax_template
}, }, fields =['item_code', 'net_amount'])
fields =['item_code', 'net_amount'])
for item in invoice_items: for item in invoice_items:
# Summing up total taxable amount # Summing up total taxable amount

9
erpnext/regional/saudi_arabia/utils.py
View File

@ -1,10 +1,11 @@
import frappe
from frappe import _
from erpnext import get_region
from pyqrcode import create as qr_create
import io import io
import os import os
import frappe
from pyqrcode import create as qr_create
from erpnext import get_region
def create_qr_code(doc, method): def create_qr_code(doc, method):
"""Create QR Code after inserting Sales Inv """Create QR Code after inserting Sales Inv