nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 09:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,766 Commits 399 Branches 1,700 Tags
c2eb771c4d228458a95db99dbbb2f96c4a00db02
Commit Graph

49766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
c2eb771c4d fix: Patch for reposting account closing balance (backport #43905) (#43909) 
fix: Patch for reposting account closing balance (#43905)

(cherry picked from commit 3a0d27b393)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-10-29 23:07:58 +05:30
Frappe PR Bot
50db0aca61 chore(release): Bumped to Version 15.39.5 
## [15.39.5](https://github.com/frappe/erpnext/compare/v15.39.4...v15.39.5) (2024-10-29)

### Bug Fixes

* post account closing balance against pcv closing account ([#43887](https://github.com/frappe/erpnext/issues/43887)) ([becfd98](becfd980b2))
v15.39.5 		2024-10-29 15:39:40 +00:00
ruthra kumar
b5d2708f69 Merge pull request #43902 from frappe/mergify/bp/version-15/pr-43887 
fix: post account closing balance against pcv closing account (backport #43887)
 2024-10-29 21:08:20 +05:30
Nabin Hait
becfd980b2 fix: post account closing balance against pcv closing account (#43887) 
(cherry picked from commit 34295d0344)
 2024-10-29 15:37:05 +00:00
Frappe PR Bot
be6cd6adc3 chore(release): Bumped to Version 15.39.4 
## [15.39.4](https://github.com/frappe/erpnext/compare/v15.39.3...v15.39.4) (2024-10-29)

### Bug Fixes

* use period closing voucher object to call get_account_closing_ba… ([#43880](https://github.com/frappe/erpnext/issues/43880)) ([94a03c6](94a03c6e17))
v15.39.4 		2024-10-29 15:34:46 +00:00
ruthra kumar
48939f25c8 Merge pull request #43901 from frappe/mergify/bp/version-15/pr-43880 
fix: use period closing voucher object to call get_account_closing_ba… (backport #43880)
 2024-10-29 21:03:20 +05:30
Venkatesh
94a03c6e17 fix: use period closing voucher object to call get_account_closing_ba… (#43880) 
fix: use period closing voucher object to call get_account_closing_balances method
(cherry picked from commit 99d1c5f342)
 2024-10-29 15:15:11 +00:00
Frappe PR Bot
f48ce90658 chore(release): Bumped to Version 15.39.3 
## [15.39.3](https://github.com/frappe/erpnext/compare/v15.39.2...v15.39.3) (2024-10-24)

### Bug Fixes

* Unnecessary validation for non deferred sales invoices ([#43816](https://github.com/frappe/erpnext/issues/43816)) ([a79bc4d](a79bc4d35a))
v15.39.3 		2024-10-24 08:22:31 +00:00
Deepesh Garg
3df68e462f Merge pull request #43818 from frappe/mergify/bp/version-15/pr-43817 
fix: Unnecessary validation for non-deferred sales invoices (#43816)
 2024-10-24 13:51:15 +05:30
mergify[bot]
a79bc4d35a fix: Unnecessary validation for non deferred sales invoices (#43816) 
fix: Unnecessary validation for non deferred sales invoices (#43816)

(cherry picked from commit af472054f6)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit bf4fb53575)
 2024-10-24 08:14:16 +00:00
Frappe PR Bot
188645bfd6 chore(release): Bumped to Version 15.39.2 
## [15.39.2](https://github.com/frappe/erpnext/compare/v15.39.1...v15.39.2) (2024-10-23)

### Bug Fixes

* consider gle based on balances in company currency (copy [#43805](https://github.com/frappe/erpnext/issues/43805)) ([#43809](https://github.com/frappe/erpnext/issues/43809)) ([1c4eef2](1c4eef2ef6))
v15.39.2 		2024-10-23 12:12:56 +00:00
mergify[bot]
1c4eef2ef6 fix: consider gle based on balances in company currency (copy #43805) (#43809) 
fix: consider gle based on balances in company currency (#43805)

(cherry picked from commit 2fb441763a)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-10-23 17:41:41 +05:30
Nabin Hait
d392660d45 chore: release version 15.39.1 (#43800) 
* fix: map doc from purchase order

(cherry picked from commit 60ceb91ace)

* test: auto create purchase receipt

(cherry picked from commit 59887bbc13)

* fix: better implementation, handle missing purchase order

(cherry picked from commit 66211dafd6)

* perf: performance optimizations for accounting reports by refactoring account closing balance and period closing voucher (#43798)

* fix: Gl Entry form cleanup

* fix: Added indexes in gl entry table

* perf: Refactored period closing voucher to handle large volume of gle

* fix: fixes as per new period start and end date fields in PCV

* perf: performance optimization for  accounting reports

* perf: performance optimizations for account closing balance patch

* fix: test cases

* fix: lenter issues - direct use of sql query

* fix: test cases

* fix: test cases

* fix: test cases

* fix: wrong fieldname

* fix: test cases

---------

Co-authored-by: Ninad1306 <ninad_1063@yahoo.com>
Co-authored-by: Smit Vora <smitvora203@gmail.com>
v15.39.1 		2024-10-23 14:27:10 +05:30
Frappe PR Bot
e0a45a5a54 chore(release): Bumped to Version 15.39.0 
# [15.39.0](https://github.com/frappe/erpnext/compare/v15.38.4...v15.39.0) (2024-10-23)

### Bug Fixes

* "show_remarks" checkbox in Process statement of accounts ([f7717c9](f7717c91bc))
* added validation for UOM must be whole number (backport [#43710](https://github.com/frappe/erpnext/issues/43710)) ([#43712](https://github.com/frappe/erpnext/issues/43712)) ([60ffcd0](60ffcd0574))
* Call super onload_post_render inside pos_invoice.js ([1281d9d](1281d9d21d))
* coupon code validation logic ([aeaadb1](aeaadb1e30))
* **deferred_revenue:** Escape account in query ([fac27d9](fac27d9dff))
* do not make new depreciation for fully depreciated asset ([ddb38db](ddb38db5c4))
* Freeze Screen on load invoices on POS Closing Entry ([f343d5a](f343d5a24d))
* get party advance amount based on account ([b673377](b673377b70))
* get period estimate till service end date ([148d7e7](148d7e798b))
* get stock accounts from the doc instead of db in validate_stock_accounts ([39387e9](39387e9f54))
* incorrect amount in bank clearance ([52be45c](52be45c5df))
* lead create opp from connection not working ([9e56f21](9e56f213a3))
* list view and form status not same for purchase order (backport [#43690](https://github.com/frappe/erpnext/issues/43690)) ([#43692](https://github.com/frappe/erpnext/issues/43692)) ([a33d553](a33d5535a7))
* only show pay button for specific doctype in portal ([d2e5b2a](d2e5b2aa1d))
* party_balance based on company in payment entry ([04fbcc6](04fbcc64ff))
* remove extra space ([50dd8d9](50dd8d9df7))
* removed unmerged patches ([2e0cf36](2e0cf36901))
* Required Changes to Support e-Waybill Generation for Material Transfer Return ([#43061](https://github.com/frappe/erpnext/issues/43061)) ([2205ae8](2205ae8e54))
* show total amount on report summary ([ab20344](ab20344141))
* use correct variable in error message (backport [#43790](https://github.com/frappe/erpnext/issues/43790)) ([#43792](https://github.com/frappe/erpnext/issues/43792)) ([879b2b7](879b2b778a))
* Workspace link for Work Order Consumed Materials report (backport [#43753](https://github.com/frappe/erpnext/issues/43753)) ([#43754](https://github.com/frappe/erpnext/issues/43754)) ([1fa9030](1fa9030aee))

### Features

* added assignee email field in asset maintenance log ([a3b8f97](a3b8f9759d))
v15.39.0 		2024-10-23 04:48:23 +00:00
ruthra kumar
692de892ae Merge pull request #43774 from frappe/version-15-hotfix 
chore: release v15
 2024-10-23 10:17:07 +05:30
mergify[bot]
879b2b778a fix: use correct variable in error message (backport #43790) (#43792) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: use correct variable in error message (#43790)
 2024-10-22 19:43:16 +02:00
Smit Vora
12530616a7 Merge pull request #43786 from ljain112/fix-manual-backport 2024-10-22 20:12:53 +05:30
Smit Vora
9ddf1ccedd Merge pull request #43785 from frappe/mergify/bp/version-15-hotfix/pr-43462 
fix: get stock accounts from the doc in `validate_stock_accounts` in Journal Entry (backport #43462)
 2024-10-22 19:59:31 +05:30
Smit Vora
0495160f81 Merge pull request #43783 from frappe/mergify/bp/version-15-hotfix/pr-43061 
fix: Required Changes to Support e-Waybill Generation for Material Transfer Return (backport #43061)
 2024-10-22 19:59:19 +05:30
ljain112
d2e5b2aa1d fix: only show pay button for specific doctype in portal 2024-10-22 19:49:37 +05:30
Vishakh Desai
39387e9f54 fix: get stock accounts from the doc instead of db in validate_stock_accounts 
(cherry picked from commit 30954586d8)
 2024-10-22 14:07:43 +00:00
Ninad Parikh
2205ae8e54 fix: Required Changes to Support e-Waybill Generation for Material Transfer Return (#43061) 
(cherry picked from commit 004c4e21d4)
 2024-10-22 13:59:31 +00:00
ruthra kumar
29fe23bc0a Merge pull request #43780 from frappe/mergify/bp/version-15-hotfix/pr-43778 
refactor: validate_return_against_account (backport #43778)
 2024-10-22 17:40:39 +05:30
Raffael Meyer
8d97966662 refactor: validate_return_against_account (#43778) 
(cherry picked from commit c4faa0e101)
 2024-10-22 11:51:35 +00:00
ruthra kumar
c99d0535f8 Merge pull request #43777 from frappe/mergify/bp/version-15-hotfix/pr-43775 
fix(deferred_revenue): Escape account in query (backport #43775)
 2024-10-22 16:40:11 +05:30
Corentin Forler
fac27d9dff fix(deferred_revenue): Escape account in query 
(cherry picked from commit c7b3ae41d4)
 2024-10-22 10:42:25 +00:00
Khushi Rawat
0519263882 Merge pull request #43763 from frappe/mergify/bp/version-15-hotfix/pr-43378 
feat: added task assignee email field in asset maintenance log (backport #43378)
 2024-10-22 12:22:39 +05:30
ruthra kumar
71479ad47b Merge pull request #43768 from frappe/mergify/bp/version-15-hotfix/pr-43766 
refactor: allow unreconcile on bank and cash entry type journals (backport #43766)
 2024-10-22 12:13:04 +05:30
ruthra kumar
88f5e3f160 refactor: allow unreconcile on bank and cash entry type journals 
(cherry picked from commit 2c4f37f488)
 2024-10-22 06:36:08 +00:00
ruthra kumar
71837ab400 Merge pull request #43765 from frappe/mergify/bp/version-15-hotfix/pr-43761 
fix: coupon code validation logic (backport #43761)
 2024-10-22 10:33:41 +05:30
ruthra kumar
853ca1fcee chore: resolve conflict 2024-10-22 10:15:28 +05:30
bhaveshkumar.j
50dd8d9df7 fix: remove extra space 
(cherry picked from commit 1561a9e1bf)
 2024-10-22 04:37:49 +00:00
bhaveshkumar.j
aeaadb1e30 fix: coupon code validation logic 
(cherry picked from commit d04257a32d)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/utils.py
 2024-10-22 04:37:49 +00:00
Khushi Rawat
2e0cf36901 fix: removed unmerged patches 2024-10-22 02:06:41 +05:30
Khushi Rawat
1d5345abc1 chore: resolved conflicts 2024-10-22 01:23:49 +05:30
Khushi Rawat
0a03076148 chore: resolved conflicts 2024-10-22 01:17:33 +05:30
Khushi Rawat
a3b8f9759d feat: added assignee email field in asset maintenance log 
(cherry picked from commit 5911934dc7)

# Conflicts:
#	erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#	erpnext/patches.txt
 2024-10-21 19:44:34 +00:00
Shariq Ansari
f51c511bcc Merge pull request #43760 from frappe/mergify/bp/version-15-hotfix/pr-43759 
fix: lead create opp from connection not working (backport #43759)
 2024-10-21 20:41:29 +05:30
Shariq Ansari
9e56f213a3 fix: lead create opp from connection not working 
(cherry picked from commit 0dc518b1c3)
 2024-10-21 14:57:43 +00:00
mergify[bot]
1fa9030aee fix: Workspace link for Work Order Consumed Materials report (backport #43753) (#43754) 
fix: Workspace link for Work Order Consumed Materials report (#43753)

(cherry picked from commit e94ffb87cd)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-10-21 17:15:34 +05:30
ruthra kumar
62226696aa Merge pull request #43742 from frappe/mergify/bp/version-15-hotfix/pr-43726 
fix: "show_remarks" checkbox in Process statement of accounts (backport #43726)
 2024-10-21 13:08:53 +05:30
ruthra kumar
605a30a7e7 Merge pull request #43744 from frappe/mergify/bp/version-15-hotfix/pr-43727 
fix: get period estimate till service end date (backport #43727)
 2024-10-21 13:08:33 +05:30
ruthra kumar
0996aff79d Merge pull request #43746 from frappe/mergify/bp/version-15-hotfix/pr-43720 
fix: party_balance based on company in payment entry (backport #43720)
 2024-10-21 13:08:12 +05:30
ruthra kumar
501c53db05 Merge pull request #43748 from frappe/mergify/bp/version-15-hotfix/pr-42461 
fix: Freeze Screen on load invoices on POS Closing Entry (backport #42461)
 2024-10-21 13:07:54 +05:30
HarryPaulo
f343d5a24d fix: Freeze Screen on load invoices on POS Closing Entry 
(cherry picked from commit 486d396174)
 2024-10-21 06:58:05 +00:00
ljain112
04fbcc64ff fix: party_balance based on company in payment entry 
(cherry picked from commit 97c9adf06b)
 2024-10-21 06:53:44 +00:00
venkat102
148d7e798b fix: get period estimate till service end date 
(cherry picked from commit a7ba7e9c28)
 2024-10-21 06:51:05 +00:00
ljain112
f7717c91bc fix: "show_remarks" checkbox in Process statement of accounts 
(cherry picked from commit f4600df1f7)
 2024-10-21 06:44:29 +00:00
ruthra kumar
c05382fa48 Merge pull request #43740 from frappe/mergify/bp/version-15-hotfix/pr-43728 
fix: get party advance amount based on account (backport #43728)
 2024-10-21 11:53:00 +05:30
venkat102
b673377b70 fix: get party advance amount based on account 
(cherry picked from commit d7fa95dd2f)
 2024-10-21 05:47:54 +00:00