Deepesh Garg
e1d6bf364e
Merge branch 'develop' of https://github.com/frappe/erpnext into customer-details-in-tax-withholding-category-report
2023-07-25 14:45:36 +05:30
Deepesh Garg
61be373800
Merge pull request #36107 from GursheenK/accounting_dimension_in_based_on_filter
...
feat: filtering based on accounting dimensions in profitability analysis
2023-07-25 14:28:46 +05:30
Deepesh Garg
30554301c9
Merge pull request #36235 from resilient-tech/fix-tax-breakup-for-diff-tax-rates
...
fix: Correct Tax Breakup for different tax rates for same hsn code
2023-07-24 20:57:26 +05:30
Deepesh Garg
3f81e15672
Merge pull request #36147 from deepeshgarg007/eslint
...
refactor(ci): add eslint and update linting confs
2023-07-24 20:55:07 +05:30
Smit Vora
1b8490dc98
Merge branch 'develop' into fix-tax-breakup-for-diff-tax-rates
2023-07-24 20:20:19 +05:30
Deepesh Garg
4867a767a2
Merge pull request #36278 from resilient-tech/set-company-flag
...
fix(regional): set `frappe.flags.company` temporarily, where required
2023-07-24 19:34:29 +05:30
Sagar Vora
4205f564a0
fix(regional): set frappe.flags.company temporarily, where required
2023-07-24 18:37:58 +05:30
Deepesh Garg
164df33419
Merge pull request #36274 from GursheenK/process-soa-customer-filter
...
fix: customer filter in process soa
2023-07-24 17:32:17 +05:30
Gursheen Anand
5224f13db2
fix: add patch for renaming tds payable report
2023-07-24 17:11:05 +05:30
Gursheen Anand
34d7fb388d
fix: customer filter in process soa
2023-07-24 16:47:06 +05:30
ruthra kumar
3dd119eeea
refactor: apply terms based validation only on sales/purchase doctyp
2023-07-24 14:50:11 +05:30
ruthra kumar
a785a6054e
Merge pull request #36251 from ruthra-kumar/performance_tune_timsheet_adding_logic
...
fix: unresponsive sales invoice page
2023-07-24 14:01:07 +05:30
ruthra kumar
740f283ec1
Merge pull request #36241 from ruthra-kumar/fix_allocation_logic_in_get_outstanding_invoices
...
fix: multiple fixes on payment terms based issues in payment entry
2023-07-24 12:35:25 +05:30
Gursheen Anand
2f6d0bdcee
fix: col names for party types
2023-07-24 12:20:58 +05:30
Gursheen Anand
38b501e004
fix: make party type filter mandatory
2023-07-24 12:13:47 +05:30
Deepesh Garg
cdc9b62688
chore: Remove cur_frm from sales_invoice.js
2023-07-23 22:44:18 +05:30
ruthra kumar
d048365da3
refactor: refresh table once after loop ends
2023-07-23 19:56:30 +05:30
Deepesh Garg
0d70ae2a21
chore: Ingnore issues
2023-07-23 19:34:08 +05:30
Deepesh Garg
8ccb8e3c5b
chore: Move buying controller to utils
2023-07-23 18:50:44 +05:30
Deepesh Garg
7205fb9b97
chore: convert sales common to utils
2023-07-23 12:07:21 +05:30
ruthra kumar
ec7558b9e0
refactor: handle references without any template and payment_term
2023-07-23 11:55:16 +05:30
ruthra kumar
662ccd467c
fix: allocation logic on 'Get Outstanding Invoices' btn in PE
...
1. fixed broken `payment_term` filter in Payment References section
2. Throw error if user fails to select 'Payment Term' for an invoice
with 'Payment Term based allocation' enabled.
2023-07-23 11:37:27 +05:30
Deepesh Garg
4077254b01
chore: resolve undefined variables issue
2023-07-22 23:07:18 +05:30
ruthra kumar
e6abe1b77f
Merge pull request #36206 from ruthra-kumar/test_cases_for_payment_term_overallocation
...
test: overallocation validation in payment entry
2023-07-22 10:41:01 +05:30
ruthra kumar
93246043ec
chore(test): enable multi-currency party for testing
2023-07-22 10:01:59 +05:30
ruthra kumar
8f9ef4ef5b
chore: validation on multi-currency tran on company curtency account
2023-07-22 09:20:55 +05:30
ruthra kumar
5b37919574
chore: use flt for currency
2023-07-22 09:20:55 +05:30
ruthra kumar
6b4a81ee48
chore: test more scenarios
2023-07-22 09:20:44 +05:30
DaizyModi
653117c2a9
test: fix test case for itemised tax breakup
2023-07-21 17:56:33 +05:30
Deepesh Garg
cc36af57bd
Merge pull request #36229 from deepeshgarg007/naming_in_order
...
fix: FY in naming series variable for orders
2023-07-21 16:05:31 +05:30
Deepesh Garg
7a7d32db81
fix: FY in naming series variable for orders
2023-07-21 16:03:17 +05:30
Gursheen Anand
ec80dc6f09
fix: make column names more general
2023-07-21 15:55:31 +05:30
Gursheen Anand
1c5c310f5a
fix: fetch acc dimension fieldname
2023-07-21 13:37:48 +05:30
Deepesh Garg
76db0b63ba
Merge pull request #36214 from deepeshgarg007/tb_cancelled_entries
...
fix: Trial Balance report considering cancelled entries
2023-07-20 18:48:03 +05:30
Deepesh Garg
fd58bbff6b
fix: Trial Balance report considering cancelled entries
2023-07-20 17:51:54 +05:30
Deepesh Garg
3bc79eebe3
Merge pull request #35689 from marination/payments-based-dunning
...
feat: Payments based dunning
2023-07-20 12:06:36 +05:30
ruthra kumar
e7e3853f81
test: overallocation validation in payment entry
2023-07-20 09:08:55 +05:30
Deepesh Garg
3759a41b83
fix: Default fiscal year in accounting, buying and sellingcharts
2023-07-19 13:17:12 +05:30
Gursheen Anand
dd37f6cbd6
fix: show tax withholding category details for customers
2023-07-19 11:51:45 +05:30
ruthra kumar
bccfd22fc0
Merge pull request #36181 from ruthra-kumar/fix_broken_overallocation_validation_on_multi_term_payment_against_invoice
...
fix: broken overallocation validation in payment entry
2023-07-19 10:46:41 +05:30
ruthra kumar
ee83f94bb0
refactor: payment term outstanding in party account currency
2023-07-19 10:06:49 +05:30
ruthra kumar
f8d4b19cb9
fix: broken overallocation validation in payment entry
...
In a multi term payment schedule, overallocation logic broke. Fixing
it using individual term outstanding amount in references. this should
work for the simple, one term payment schedule as well
2023-07-18 21:04:13 +05:30
mergify[bot]
b4db5e9561
fix: validate docs in closed accounting period on save ( #36157 )
...
fix: validate docs in closed accounting period on save (#36157 )
(cherry picked from commit 5985e02574e387ef92a2bf0a9d2d1b49ad57cdd3)
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-07-18 17:40:49 +05:30
Deepesh Garg
fbea61bbc6
fix: Trailing opening entries in Accounts closing balance ( #36175 )
2023-07-18 15:16:52 +05:30
Deepesh Garg
cfae52a40a
fix: Opening balance in TB report ( #36171 )
2023-07-18 12:26:19 +05:30
Deepesh Garg
9e791efc82
refactor: client side accounts controller
2023-07-17 21:44:43 +05:30
Marica
1c1e7380e3
Merge branch 'develop' into payments-based-dunning
2023-07-17 12:33:19 +05:30
Anand Baburajan
305c37917f
chore: add validation for account type of party type and account ( #36141 )
...
chore: add validation to check if account type of party type and account match
2023-07-17 11:00:19 +05:30
Deepesh Garg
6270607c6d
fix: Remove current fiscal year from Global Defaults ( #35960 )
...
* fix: Remove current fiscal year from Global Defaults
* fix: Remove button to set default
* fix: Add utils to get fiscal year
* fix: Incorrect import
* feat: Add hook for naming series parser
2023-07-16 12:58:42 +05:30
Deepesh Garg
f0d4c4c180
Merge branch 'develop' of https://github.com/frappe/erpnext into eslint
2023-07-15 20:29:14 +05:30
