nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-08 23:52:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Hardcode fiscal year and posting date

Browse Source 
(cherry picked from commit 51d9572fe7)

# Conflicts:
#	erpnext/accounts/doctype/fiscal_year/fiscal_year_dashboard.py
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
This commit is contained in:
Deepesh Garg
2021-09-05 17:56:12 +05:30
committed by Mergify
parent 06e19afe00
commit 0303c62a8a
2 changed files with 29 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
erpnext/accounts/doctype/fiscal_year/fiscal_year_dashboard.py
View File

@@ -11,5 +11,17 @@ def get_data():
"label": _("Target Details"), "label": _("Target Details"),
"items": ["Sales Person", "Sales Partner", "Territory", "Monthly Distribution"], "items": ["Sales Person", "Sales Partner", "Territory", "Monthly Distribution"],
}, },
<<<<<<< HEAD
], ],
=======
{
'label': _('References'),
'items': ['Period Closing Voucher']
},
{
'label': _('Target Details'),
'items': ['Sales Person', 'Sales Partner', 'Territory', 'Monthly Distribution']
}
]
>>>>>>> 51d9572fe7 (fix: Hardcode fiscal year and posting date)
} }

17
erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
View File

@@ -1394,6 +1394,7 @@ class TestPurchaseInvoice(unittest.TestCase, StockTestMixin):
) )
# Update tax withholding category with current fiscal year and rate details # Update tax withholding category with current fiscal year and rate details
<<<<<<< HEAD
update_tax_witholding_category("_Test Company", "TDS Payable - _TC") update_tax_witholding_category("_Test Company", "TDS Payable - _TC")
# Create Purchase Order with TDS applied # Create Purchase Order with TDS applied
@@ -1404,6 +1405,15 @@ class TestPurchaseInvoice(unittest.TestCase, StockTestMixin):
item="_Test Non Stock Item", item="_Test Non Stock Item",
posting_date="2021-09-15", posting_date="2021-09-15",
) )
=======
update_tax_witholding_category('_Test Company', 'TDS Payable - _TC')
# Create Purchase Order with TDS applied
po = create_purchase_order(do_not_save=1, supplier=supplier.name, rate=3000, item='_Test Non Stock Item',
posting_date='2021-09-15')
po.apply_tds = 1
po.tax_withholding_category = 'TDS - 194 - Dividends - Individual'
>>>>>>> 51d9572fe7 (fix: Hardcode fiscal year and posting date)
po.save() po.save()
po.submit() po.submit()
@@ -1667,6 +1677,7 @@ def check_gl_entries(doc, voucher_no, expected_gle, posting_date):
doc.assertEqual(expected_gle[i][2], gle.credit) doc.assertEqual(expected_gle[i][2], gle.credit)
doc.assertEqual(getdate(expected_gle[i][3]), gle.posting_date) doc.assertEqual(getdate(expected_gle[i][3]), gle.posting_date)
<<<<<<< HEAD
def update_tax_witholding_category(company, account): def update_tax_witholding_category(company, account):
from erpnext.accounts.utils import get_fiscal_year from erpnext.accounts.utils import get_fiscal_year
@@ -1677,6 +1688,12 @@ def update_tax_witholding_category(company, account):
fiscal_year = get_fiscal_year(date=date, company=company) fiscal_year = get_fiscal_year(date=date, company=company)
print(fiscal_year[0], fiscal_year[1], fiscal_year[2], "$#$#$#") print(fiscal_year[0], fiscal_year[1], fiscal_year[2], "$#$#$#")
>>>>>>> 092d41ecda (fix: Debug CI) >>>>>>> 092d41ecda (fix: Debug CI)
=======
def update_tax_witholding_category(company, account):
from erpnext.accounts.utils import get_fiscal_year
fiscal_year = get_fiscal_year(fiscal_year='_Test Fiscal Year 2021')
>>>>>>> 51d9572fe7 (fix: Hardcode fiscal year and posting date)
<<<<<<< HEAD <<<<<<< HEAD
if not frappe.db.get_value( if not frappe.db.get_value(