DaizyModi
653117c2a9
test: fix test case for itemised tax breakup
2023-07-21 17:56:33 +05:30
Ritvik Sardana
7069e2a5a0
fix: removed validate_item_code function in sales_invoice
2023-07-21 17:18:35 +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
Deepesh Garg
3fa2a8c2d8
chore: fix linting issues
2023-07-15 18:03:16 +05:30
Deepesh Garg
924cdef6d9
ci: add eslint and update linting confs
2023-07-14 18:53:02 +05:30
Deepesh Garg
297c7e833c
fix: Opening entries showing up incorrectly in TB report ( #36135 )
...
* fix: Opening entries showing up incorrectly in TB report
* chore: Linting Issue
2023-07-14 18:39:37 +05:30
Kitti U. @ Ecosoft
3b884efca9
fix: get_dimension with_cost_center_and_project=false is not working. ( #35974 )
...
* fix: get_dimension with_cost_center_and_project=false is not working.
with_cost_center_and_project is no python str, and it always evaluated as True, despite JS call it with false
* chore: Linting Issues
---------
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-07-14 13:03:00 +05:30
Deepesh Garg
b4bd978791
fix: Account balance patch and query fixes ( #36117 )
2023-07-14 10:28:36 +05:30
Gursheen Anand
21c993a7b3
fix: clear accounting dimension value when based on field changes
2023-07-12 20:32:08 +05:30
Gursheen Kaur Anand
596a14e34f
feat: add project filter in reports importing financial statements js file ( #36097 )
...
feat: add project filter in financial statements js file
2023-07-12 15:49:17 +05:30
Gursheen Anand
dd8c3d5462
feat: filter based on accounting dimension in profitability analysis
2023-07-12 10:00:18 +05:30
ruthra kumar
e44615f52b
Merge pull request #36076 from ruthra-kumar/possible_type_error_on_err_creation
...
fix: possible type error on ERR creation
2023-07-11 10:37:37 +05:30
ruthra kumar
176966daab
fix: possible type error on ERR creation
2023-07-11 10:04:17 +05:30
Raffael Meyer
bf84e0d441
refactor: remove frappe.dynamic_link ( #35096 )
2023-07-10 21:22:06 +05:30
mergify[bot]
872a23c77d
fix: also check on_hold ( #35910 )
...
fix: also check on_hold (#35910 )
(cherry picked from commit 5aa02b8571efdc1710a9b3069a18a80ed17856a2)
Co-authored-by: RJPvT <48353029+RJPvT@users.noreply.github.com>
2023-07-10 20:34:54 +05:30
Dany Robert
361a357088
fix: payment entry voucher_type
error ( #35779 )
...
* fix: payment entry `voucher_type` error
* chore: linters
2023-07-10 19:32:59 +05:30
Wolfram Schmidt
49c61e7ebb
fix: Add company filter in list view ( #36047 )
...
fix: Add company filter in list view
2023-07-10 18:03:50 +05:30
Dany Robert
5c820ecc20
fix: precision causing outstanding issue on partly paid invoices ( #36030 )
...
* fix: precision causing outstanding issue on partly paid invoices
* chore: linters
2023-07-10 16:20:45 +05:30
rohitwaghchaure
22eee472dd
Merge pull request #36001 from rohitwaghchaure/fixed-added-validation-for-rejected-warerhouse
...
fix: accepted warehouse and rejected warehouse can't be same
2023-07-10 13:55:20 +05:30
Rohit Waghchaure
d618aaef32
fix: accepted warehouse and rejected warehouse can't be same
2023-07-10 13:19:17 +05:30
ruthra kumar
3ef034dda8
Merge pull request #36051 from ruthra-kumar/auto_exchange_rate_revaluation_creation
...
feat: Provision to auto create Exchange Rate Revaluation
2023-07-10 12:59:23 +05:30
Gursheen Kaur Anand
674af15696
fix: deferred accounting entries on accounts frozen ( #35978 )
...
* fix: accounts frozen entries in deferred accounting
* test: accounts frozen date in deferred accounting
* fix: reset account settings after running test
* fix: resolve conflicts
* fix: modify expected gle when deferred accounting is disabled through JE
* fix: change posting date when accounts not frozen
2023-07-09 20:41:12 +05:30
Raffael Meyer
af28f95c60
refactor(Payment Entry): translatable strings ( #36017 )
...
* refactor(Payment Entry): translatable strings
* fix: German translations
2023-07-09 20:19:53 +05:30
Deepesh Garg
4d07e20b05
fix: Opening balance in presentation currency in Trial Balance report ( #36036 )
2023-07-09 20:16:12 +05:30
Navin Balaji
828e647019
fix: bank reconciliation tool variable issue ( #36022 )
...
fix: bank reconciliation tool variable issue (#36022 )
2023-07-09 14:13:48 +05:30
ruthra kumar
4f51c5a433
refactor: submit and make JV through background job
2023-07-07 05:49:53 +05:30
Raffael Meyer
4badac8e9e
fix(Payment Entry): compare rounded amount ( #36011 )
2023-07-05 21:35:41 +05:30
mergify[bot]
98281341b9
fix: handle loan_repayment's posting_date datetime in bank_clearance_summary report (backport #36004 ) ( #36005 )
...
* fix: handle loan_repayment's posting_date datetime in bank_clearance_summary report (#36004 )
(cherry picked from commit 937e1fb0245af291789ccd88f168d0402d9a00d8)
# Conflicts:
# erpnext/accounts/report/bank_clearance_summary/bank_clearance_summary.py
* chore: resolving conflicts
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-07-04 22:46:00 +05:30
Deepesh Garg
0a17c78a36
fix: Share ledger showing cancelled docs ( #35993 )
2023-07-04 17:49:07 +05:30
Sagar Vora
30e4052a76
feat(accounts): standardize additional columns implementation for sales/purchase reports ( #36000 )
2023-07-04 17:41:30 +05:30
Deepesh Garg
2f169575e9
fix: Netherlands - Grootboekschema COA structure ( #35991 )
...
fix: Netherlands - Grootboekschema coa structure
2023-07-04 15:30:27 +05:30
Ankush Menat
a449a4be29
chore: Add frappe school links ( #35995 )
...
Frappe School provides plenty of free tutorial for learning ERPNext.
2023-07-04 14:58:45 +05:30
barredterra
e686bb0739
Merge remote-tracking branch 'upstream/develop' into payments-based-dunning
2023-07-03 19:56:42 +02:00
rohitwaghchaure
8179d6a30d
Merge pull request #35977 from rohitwaghchaure/reserve-pos-invoice-batches
...
fix: reserve the pos invoice batches
2023-07-03 22:33:45 +05:30
Rohit Waghchaure
1e8f6c0840
fix: reserve the pos invoice batches
2023-07-03 17:38:48 +05:30
Deepesh Garg
5448859254
fix: Update no copy for received_qty field ( #35965 )
2023-07-03 13:03:52 +05:30
Deepesh Garg
3df0c5e32f
Merge pull request #35609 from GursheenK/#34282-Record-advance-payment-as-a-liability
...
feat: Record Advance Payment as a liability
2023-07-01 17:49:49 +05:30
Deepesh Garg
d54f52474a
fix: Expense Account filter in Sales Invoice ( #35944 )
2023-06-30 20:02:46 +05:30
Deepesh Garg
be5cb1aa17
Merge pull request #35943 from GursheenK/company-specific-proj-filtering
...
fix: project filtering based on company in P&L Report
2023-06-30 20:01:24 +05:30
Deepesh Garg
fda2d2bd59
Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability
2023-06-30 19:35:34 +05:30
Deepesh Garg
80e6c90740
chore: precision in test
2023-06-30 19:35:22 +05:30
Deepesh Garg
7e7737d692
test: Update test account
2023-06-30 18:37:52 +05:30
Deepesh Garg
0a49213338
test: Update test records
2023-06-30 17:32:42 +05:30
Marica
0a67a3a9c4
Merge branch 'develop' into payments-based-dunning
2023-06-30 13:32:50 +05:30
Deepesh Garg
bbb6ebb84e
fix: Outstanding amount validation
2023-06-30 13:25:22 +05:30
Gursheen Anand
84d4888f5f
fix: make company field mandatory in project doctype
2023-06-30 12:54:45 +05:30
Gursheen Anand
ce252a0d45
fix: show projects with no company value set
2023-06-30 12:42:19 +05:30
Gursheen Anand
904ca746a6
fix: project filtering in P&L Report
2023-06-30 12:11:23 +05:30
Anand Baburajan
988d755906
refactor!: removing loan management module ( #35522 )
...
* chore: resolving conflicts
* refactor: bank_clearance and add hook for get_payment_entries_for_bank_clearance
* refactor: bank_reconciliation_tool and add hook for get_matching_vouchers_for_bank_reconciliation
* fix: remove sales invoice from bank_reconciliation_doctypes and use hook for voucher clearance
* refactor: remove loan tests from test_bank_transaction
* refactor: bank_clearance_summary and add hook for get_entries_for_bank_clearance_summary
* refactor: removed test_bank_reconciliation_statement
* refactor: bank_reconciliation_statement and add hook for get_amounts_not_reflected_in_system_for_bank_reconciliation_statement
* refactor: add missing hook and patches for module removal and deprecation warning
* refactor: remove loan management translations
* chore: add erpnext tests dependent on lending
2023-06-30 11:02:49 +05:30
Deepesh Garg
0408b6d655
Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability
2023-06-29 12:19:42 +05:30
Deepesh Garg
1e078d03bb
fix: Partial PLE cancellation
2023-06-29 12:18:25 +05:30
Deepesh Garg
06821f9781
Merge pull request #35904 from GursheenK/voucher-wise-balance-report
...
feat: add voucher-wise balance report for unequal dr/cr GL entries
2023-06-29 09:07:45 +05:30
marination
5a952987a3
fix: Use this.frm
(Linter)
2023-06-28 17:13:34 +05:30
Marica
0498a31c42
Merge branch 'develop' into payments-based-dunning
2023-06-28 16:48:22 +05:30
mergify[bot]
e832455790
perf: improve item wise register reports (backport #35908 ) ( #35911 )
...
perf: improve item wise register reports (#35908 )
(cherry picked from commit 33ee01174bb909ee46bb3d714d6f94fa0aefe48f)
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-06-28 10:25:03 +05:30
Gursheen Anand
6b9f9f9b0e
fix: remove debug flag from sql
2023-06-27 21:59:35 +05:30
Deepesh Garg
7312827d4d
fix: On cancel flow
2023-06-27 18:25:10 +05:30
Deepesh Garg
f2edc91dc6
fix: Multi invoice reconciliation
2023-06-27 18:11:47 +05:30
Gursheen Anand
5d726ef037
feat: add voucher-wise balance report logic
2023-06-27 16:49:28 +05:30
Deepesh Garg
2d2f0f02d6
Merge pull request #35886 from deepeshgarg007/ldc_breach_fix
...
fix: TDS amount calculation post LDC breach
2023-06-27 09:39:06 +05:30
Deepesh Garg
62c3ca8286
fix: Paid invoice in AR report
2023-06-26 23:53:55 +05:30
Deepesh Garg
1f9ef6c48f
fix: TDS amount calculation post LDC breach
2023-06-26 22:01:12 +05:30
ruthra kumar
84ea0a828c
Merge pull request #35882 from ruthra-kumar/refactor_cr_note_reconciliation_with_exchange_gain_loss
...
refactor: simplify exchange logic on cr/dr note reconciliation
2023-06-26 17:32:12 +05:30
ruthra kumar
af75f6cea7
refactor: simplify exchange logic on cr/dr note reconciliation
2023-06-26 16:09:54 +05:30
ruthra kumar
a90fe25cc4
Merge pull request #35868 from ruthra-kumar/get_base_grand_total_while_pulling_reference_details
...
fix: incorrect outstanding and total amount in reference table of payment entry
2023-06-25 18:29:54 +05:30
Deepesh Garg
ebeb5e0cb7
Merge pull request #35594 from nikkothari22/make-accounting-dimension-filter-values-optional
...
feat: added support for mandatory dimensions per account without applying restrictions on dimension values
2023-06-25 17:55:26 +05:30
Deepesh Garg
63b126967e
chore: Linting Issues
2023-06-25 16:24:22 +05:30
Deepesh Garg
bcff4b0e5a
chore: linting issues
2023-06-25 16:03:58 +05:30
Deepesh Garg
c7186ff95c
Merge pull request #35789 from GursheenK/Provision-to-send-Accounts-Receivable-Reports
...
feat: Provision to send Accounts Receivable Reports using Process SOA
2023-06-24 17:10:50 +05:30
HarryPaulo
1e20016059
fix: POS Closing Entry load all invoices with one request on save ( #35819 )
...
fix: load all invoices with one request
2023-06-24 16:34:24 +05:30
Deepesh Garg
1894dc8197
fix: Test case and code cleanup
2023-06-23 21:53:34 +05:30
Deepesh Garg
da6bc1a13e
refactor: Redo workflows
2023-06-23 20:57:51 +05:30
ruthra kumar
2f638ae32a
Merge pull request #35604 from pps190/fix-reconcile-invoice-return
...
fix: reconcile invoice against credit note.
2023-06-23 17:44:25 +05:30
ruthra kumar
9655d78642
test: test reference details response
2023-06-23 17:24:19 +05:30
Marica
2868baebab
fix: Payment Term must be mandatory if Allocate Payment based on ..
is checked ( #35798 )
...
- Front and Back end validation of condition
- Fix test to accomodate fix
2023-06-23 16:00:20 +05:30
Deepesh Garg
df035f6b19
Merge branch 'develop' into Provision-to-send-Accounts-Receivable-Reports
2023-06-23 15:58:38 +05:30
ruthra kumar
9e73af891d
fix: get base grand total while pulling reference details in PE
2023-06-23 14:50:14 +05:30
Gursheen Anand
555c126eb9
fix: add patch for setting default value of report field
2023-06-23 10:52:25 +05:30
Anand Baburajan
f37484c6fe
chore: better err msg on cancelling JE for asset scrap [dev] ( #35850 )
...
chore: better err msg on cancelling JE for asset scrap
2023-06-22 22:32:06 +05:30
Deepesh Garg
904f835d4a
Merge pull request #35602 from deepeshgarg007/pl_account_balance
...
fix: Remove special treatment for P&L Accounts
2023-06-22 21:11:23 +05:30