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

fix: finalise query, fix bugs, put Add Columns back

Browse Source
This commit is contained in:
casesolved-co-uk 2021-03-27 04:02:59 +00:00
parent ece00287ea
commit 442a0de094
2 changed files with 18 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/report/tax_detail/tax_detail.js
View File

@ -116,10 +116,9 @@ erpnext.TaxDetail = class TaxDetail {
this.qr.menu_items = this.get_menu_items(); this.qr.menu_items = this.get_menu_items();
} }
get_menu_items() { get_menu_items() {
// Replace Save, remove Add Column // Replace Save action
let new_items = []; let new_items = [];
const save = __('Save'); const save = __('Save');
const addColumn = __('Add Column');
for (let item of this.qr.menu_items) { for (let item of this.qr.menu_items) {
if (item.label === save) { if (item.label === save) {
@ -128,8 +127,6 @@ erpnext.TaxDetail = class TaxDetail {
action: () => this.save_report(), action: () => this.save_report(),
standard: false standard: false
}); });
} else if (item.label === addColumn) {
// Don't add
} else { } else {
new_items.push(item); new_items.push(item);
} }
@ -424,8 +421,11 @@ function new_report() {
args: { args: {
reference_report: 'Tax Detail', reference_report: 'Tax Detail',
report_name: values.report_name, report_name: values.report_name,
columns: frappe.query_report.get_visible_columns(), data: {
sections: {} columns: [],
sections: {},
show_detail: 1
}
}, },
freeze: true freeze: true
}).then((r) => { }).then((r) => {

31
erpnext/accounts/report/tax_detail/tax_detail.py
View File

@ -6,17 +6,14 @@ from __future__ import unicode_literals
import frappe, json import frappe, json
from frappe import _ from frappe import _
# NOTE: Not compatible with the frappe custom report feature of adding arbitrary doctype columns to the report
# NOTE: Payroll is implemented using Journal Entries # NOTE: Payroll is implemented using Journal Entries
# field lists in multiple doctypes will be coalesced # field lists in multiple doctypes will be coalesced
required_sql_fields = { required_sql_fields = {
"GL Entry": ["posting_date", "voucher_type", "voucher_no", "account as tax_account", "account_currency", "debit", "credit"], "GL Entry": ["posting_date", "voucher_type", "voucher_no", "account as tax_account", "account_currency", "debit", "credit"],
# "Account": ["account_type"],
"Journal Entry Account": ["account_type", "account", "debit_in_account_currency", "credit_in_account_currency"], "Journal Entry Account": ["account_type", "account", "debit_in_account_currency", "credit_in_account_currency"],
("Purchase Invoice Item", "Sales Invoice Item"): ["base_net_amount", "item_tax_rate", "item_tax_template", "item_name"], ("Purchase Invoice Item", "Sales Invoice Item"): ["base_net_amount", "item_tax_rate", "item_tax_template", "item_name"],
("Purchase Invoice", "Sales Invoice"): ["taxes_and_charges", "tax_category"], ("Purchase Invoice", "Sales Invoice"): ["taxes_and_charges", "tax_category"],
# "Journal Entry": ["total_amount_currency"],
"Purchase Invoice Item": ["expense_account"], "Purchase Invoice Item": ["expense_account"],
"Sales Invoice Item": ["income_account"] "Sales Invoice Item": ["income_account"]
} }
@ -35,27 +32,20 @@ def execute(filters=None):
inner join `tabAccount` a on inner join `tabAccount` a on
ge.account=a.name and ge.company=a.company ge.account=a.name and ge.company=a.company
left join `tabSales Invoice` si on left join `tabSales Invoice` si on
a.account_type='Tax' and ge.company=si.company and ge.voucher_type='Sales Invoice' and ge.voucher_no=si.name ge.company=si.company and ge.voucher_type='Sales Invoice' and ge.voucher_no=si.name
left join `tabSales Invoice Item` sii on left join `tabSales Invoice Item` sii on
si.name=sii.parent si.name=sii.parent
left join `tabPurchase Invoice` pi on left join `tabPurchase Invoice` pi on
a.account_type='Tax' and ge.company=pi.company and ge.voucher_type='Purchase Invoice' and ge.voucher_no=pi.name ge.company=pi.company and ge.voucher_type='Purchase Invoice' and ge.voucher_no=pi.name
left join `tabPurchase Invoice Item` pii on left join `tabPurchase Invoice Item` pii on
pi.name=pii.parent pi.name=pii.parent
/* left outer join `tabJournal Entry` je on left join `tabJournal Entry Account` jea on
ge.voucher_no=je.name and ge.company=je.company */
left outer join `tabJournal Entry Account` jea on
ge.voucher_type=jea.parenttype and ge.voucher_no=jea.parent ge.voucher_type=jea.parenttype and ge.voucher_no=jea.parent
where (ge.voucher_type, ge.voucher_no) in ( where
select ge.voucher_type, ge.voucher_no a.account_type='Tax' and
from `tabGL Entry` ge ge.company=%(company)s and
join `tabAccount` a on ge.account=a.name and ge.company=a.company ge.posting_date>=%(from_date)s and
where ge.posting_date<=%(to_date)s
a.account_type='Tax' and
ge.company=%(company)s and
ge.posting_date>=%(from_date)s and
ge.posting_date<=%(to_date)s
)
order by ge.posting_date, ge.voucher_no order by ge.posting_date, ge.voucher_no
""".format(fieldstr=fieldstr), filters, as_dict=1) """.format(fieldstr=fieldstr), filters, as_dict=1)
@ -238,7 +228,7 @@ def modify_report_data(data):
if line.item_tax_rate: if line.item_tax_rate:
tax_rates = json.loads(line.item_tax_rate) tax_rates = json.loads(line.item_tax_rate)
for account, rate in tax_rates.items(): for account, rate in tax_rates.items():
if account == line.account: if account == line.tax_account:
if line.voucher_type == "Sales Invoice": if line.voucher_type == "Sales Invoice":
line.credit = line.base_net_amount * (rate / 100) line.credit = line.base_net_amount * (rate / 100)
line.credit_net_amount = line.base_net_amount line.credit_net_amount = line.base_net_amount
@ -247,6 +237,9 @@ def modify_report_data(data):
line.debit_net_amount = line.base_net_amount line.debit_net_amount = line.base_net_amount
# Transform Journal Entry lines # Transform Journal Entry lines
if "Journal" in line.voucher_type: if "Journal" in line.voucher_type:
if line.account_type != 'Tax':
line.debit = 0.0
line.credit = 0.0
if line.debit_in_account_currency: if line.debit_in_account_currency:
line.debit_net_amount = line.debit_in_account_currency line.debit_net_amount = line.debit_in_account_currency
if line.credit_in_account_currency: if line.credit_in_account_currency: