diff --git a/erpnextaustria/__init__.py b/erpnextaustria/__init__.py index 95d1338..a5d4763 100644 --- a/erpnextaustria/__init__.py +++ b/erpnextaustria/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -__version__ = '0.0.1' +__version__ = '0.1.0' diff --git a/erpnextaustria/docs/sql/viewATVAT_065.sql b/erpnextaustria/docs/sql/viewATVAT_065.sql new file mode 100644 index 0000000..ec8e984 --- /dev/null +++ b/erpnextaustria/docs/sql/viewATVAT_065.sql @@ -0,0 +1,17 @@ +CREATE VIEW `viewATVAT_065` AS +SELECT + `tabPurchase Invoice`.`posting_date` AS `posting_date`, + `tabPurchase Invoice`.`name` AS `name`, + `tabPurchase Invoice`.`base_grand_total` AS `base_grand_total`, + `tabPurchase Invoice`.`taxes_and_charges` AS `taxes_and_charges`, + `tabPurchase Invoice`.`total_taxes_and_charges` AS `total_taxes_and_charges` +FROM `tabPurchase Invoice` +WHERE `docstatus` = 1 AND `taxes_and_charges` LIKE '%060%' +UNION SELECT + `tabExpense Claim`.`posting_date` AS `posting_date`, + `tabExpense Claim`.`name` AS `name`, + `tabExpense Claim`.`total_claimed_amount` AS `base_grand_total`, + `tabExpense Claim`.`taxes_and_charges` AS `taxes_and_charges`, + `tabExpense Claim`.`total_taxes_and_charges` AS `total_taxes_and_charges` +FROM `tabExpense Claim` +WHERE `docstatus` = 1 AND `taxes_and_charges` LIKE '%065%' \ No newline at end of file diff --git a/erpnextaustria/erpnextaustria/doctype/at_vat_declaration/at_vat_declaration.js b/erpnextaustria/erpnextaustria/doctype/at_vat_declaration/at_vat_declaration.js index 5072733..4adaaa3 100644 --- a/erpnextaustria/erpnextaustria/doctype/at_vat_declaration/at_vat_declaration.js +++ b/erpnextaustria/erpnextaustria/doctype/at_vat_declaration/at_vat_declaration.js @@ -56,7 +56,8 @@ function get_values(frm) { get_total(frm, "viewATVAT_072", 'amount_inter_normal'); // Pretax get_tax(frm, "viewATVAT_060", 'total_pretax'); - + get_tax(frm, "viewATVAT_065", 'intercommunal_pretax'); + // Recalculate update_total_revenue(frm); }