nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-07 07:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,865 Commits 460 Branches 1,746 Tags
14f7aef4d0aba241b43df0f2fc43c787eeae1007
Commit Graph

46865 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nihantra C. Patel
411157c258 fix: load ignored doctype and include Mode of Payment Account (#40334) 
(cherry picked from commit 68baa3612a)
 2024-03-07 12:14:10 +00:00
Raffael Meyer
b29e70a126 Merge pull request #40320 from frappe/mergify/bp/version-14-hotfix/pr-40317 
fix(Shipment Parcel): make length, width and height non-mandatory (backport #40317)
 2024-03-06 19:49:47 +01:00
barredterra
911a582941 fix(Shipment Parcel): make length, width and height non-mandatory 
It's tedious to enter all these values and some shipping providers only need to know the weigth and quantity. Companies can alwas cutomize the values to be mandatory, but the reverse is not possible. I'll make sure that the erpnext-shipping app does not break because of this (or fix any problems).

(cherry picked from commit 898c6e30eb)
 2024-03-06 18:26:20 +00:00
Nabin Hait
05385e4acb perf: skip unnecessary validation while transaction cancellation 2024-03-06 22:33:36 +05:30
Nabin Hait
5cd9bf3bda fix: minor fixes 2024-03-06 21:04:07 +05:30
Nabin Hait
e4bd173875 perf: Cache accounting dimension filter map 2024-03-06 20:32:47 +05:30
Nabin Hait
acc0b2faf8 fix: linter issues 2024-03-06 17:43:27 +05:30
Frappe PR Bot
b424a184b9 chore(release): Bumped to Version 14.65.0 
# [14.65.0](https://github.com/frappe/erpnext/compare/v14.64.0...v14.65.0) (2024-03-06)

### Bug Fixes

* account validation error on bank account after editing existing bank account ([8b3c809](8b3c809cb6))
* allow gain/loss for Journals against Journals ([52e1c2f](52e1c2f48b))
* do not allow to cancel incomplete reposting (backport [#40224](https://github.com/frappe/erpnext/issues/40224)) ([#40229](https://github.com/frappe/erpnext/issues/40229)) ([091d6f3](091d6f330a))
* don't override reference exchange rate ([e25ec41](e25ec4156e))
* handle partial invoice against provisional entry ([5f23614](5f23614960))
* incorrect exchange rate if JE has multi parties ([1b5a237](1b5a23709a))
* incorrect TCS on customer and suppliers with same name ([af56846](af568464db))
* make use of 'flt' to prevent really low precision exc gain/loss ([c1a0ac6](c1a0ac655e))
* make warning for previously existing SO an alert ([c8b817c](c8b817c87a))
* over billing qty along with rate ([14d9d29](14d9d29913))
* **Project:** filter department by company ([646b55e](646b55eeea))
* provisional reverse entry amount ([e62c49d](e62c49d9a6))
* rate change on changing of the qty (backport [#40241](https://github.com/frappe/erpnext/issues/40241)) ([#40242](https://github.com/frappe/erpnext/issues/40242)) ([b937c4b](b937c4be4f))
* **setup:** avoid duplicate entry for Analytics role (backport [#40183](https://github.com/frappe/erpnext/issues/40183)) ([#40184](https://github.com/frappe/erpnext/issues/40184)) ([035c90c](035c90c3b8))

### Features

* add company filter to child table field ([38baf8d](38baf8d406))
v14.65.0 		2024-03-06 03:31:16 +00:00
Deepesh Garg
0b364f6e8e Merge pull request #40281 from frappe/version-14-hotfix 
chore: release v14
 2024-03-06 08:59:57 +05:30
ruthra kumar
83734c6be4 Merge pull request #40283 from frappe/mergify/bp/version-14-hotfix/pr-40278 
fix: incorrect TCS on customer and suppliers with same name (backport #40278)
 2024-03-05 15:48:27 +05:30
ruthra kumar
af568464db fix: incorrect TCS on customer and suppliers with same name 
(cherry picked from commit 9904a9868c)
 2024-03-05 09:54:47 +00:00
Nabin Hait
aa75a60142 perf: Optimzed code for merging similar gl entries 2024-03-04 16:04:39 +05:30
Nabin Hait
8cd8b8f885 perf: Cached accounting dimensions details 2024-03-04 16:04:39 +05:30
Nabin Hait
f204d810bb perf: Performance optimization for validating budget 2024-03-04 16:04:39 +05:30
Nabin Hait
d7b738ff61 perf: Optimization for providional gl entries 2024-03-04 16:04:35 +05:30
mergify[bot]
091d6f330a fix: do not allow to cancel incomplete reposting (backport #40224) (#40229) 
* fix: do not allow to cancel incomplete reposting (#40224)

(cherry picked from commit 72ac56b6c4)

# Conflicts:
#	erpnext/stock/doctype/repost_item_valuation/repost_item_valuation.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-04 13:14:32 +05:30
Gursheen Kaur Anand
cc923f50ef Merge pull request #40257 from GursheenK/remove-balance-fetching-in-JV 
perf: remove unnecessary fetching of balances in JV
 2024-03-04 11:16:01 +05:30
Gursheen Anand
2f8fe17b60 refactor: remove controller logic for setting balances 2024-03-04 00:37:29 +05:30
Gursheen Anand
e3d6f70eee refactor: exclude balances while setting currency 2024-03-04 00:37:26 +05:30
Gursheen Anand
a1c22811a2 refactor: exclude balance while setting acc details 2024-03-04 00:35:54 +05:30
Gursheen Anand
d715c29edc refactor: remove balance formatter 2024-03-04 00:35:54 +05:30
Gursheen Anand
85a7ce6d30 refactor: remove balance fields from jv account 2024-03-04 00:35:51 +05:30
Gursheen Kaur Anand
c42d7505bd Merge pull request #40204 from frappe/mergify/bp/version-14-hotfix/pr-39584 
fix: use receipt amount for reverse provisional entry (backport #39584)
 2024-03-03 18:24:57 +05:30
Gursheen Kaur Anand
29f4e68827 Merge pull request #40251 from frappe/mergify/bp/version-14-hotfix/pr-40250 
fix(minor): company filter in cost center allocation (backport #40250)
 2024-03-03 18:24:42 +05:30
Gursheen Anand
38baf8d406 feat: add company filter to child table field 
(cherry picked from commit 51909077bd)
 2024-03-03 12:45:33 +00:00
Gursheen Anand
89e7ad790f chore: linting issue 2024-03-03 18:00:10 +05:30
mergify[bot]
b937c4be4f fix: rate change on changing of the qty (backport #40241) (#40242) 
fix: rate change on changing of the qty (#40241)

(cherry picked from commit e7d707797a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-02 16:49:40 +05:30
ruthra kumar
793fdf9562 Merge pull request #40238 from frappe/mergify/bp/version-14-hotfix/pr-40220 
refactor: Gain/Loss Journal creation for Journals against Journals (backport #40220)
 2024-03-02 16:25:32 +05:30
ruthra kumar
753223da78 chore: resolve merge conflict 2024-03-02 16:00:29 +05:30
ruthra kumar
46063518d7 test: gain/loss on Journals against Journals 
(cherry picked from commit 8a5078b826)

# Conflicts:
#	erpnext/controllers/tests/test_accounts_controller.py
 2024-03-02 10:07:33 +00:00
ruthra kumar
52e1c2f48b fix: allow gain/loss for Journals against Journals 
(cherry picked from commit 5b67631d40)

# Conflicts:
#	erpnext/accounts/doctype/journal_entry/journal_entry.py
 2024-03-02 10:07:32 +00:00
ruthra kumar
c1a0ac655e fix: make use of 'flt' to prevent really low precision exc gain/loss 
(cherry picked from commit 0aa72f841d)
 2024-03-02 10:07:31 +00:00
ruthra kumar
21a10eee0d Merge pull request #40232 from frappe/mergify/bp/version-14-hotfix/pr-40149 
fix: incorrect exchange rate if JE has multi parties (backport #40149)
 2024-03-02 15:36:15 +05:30
ruthra kumar
64bf52899f chore: resolve linter 2024-03-02 14:57:48 +05:30
ruthra kumar
572def058f test: exchange rate fetch on JE with multiple forex parties 
(cherry picked from commit ed95d41a51)
 2024-03-02 14:39:37 +05:30
ruthra kumar
e25ec4156e fix: don't override reference exchange rate 
(cherry picked from commit eaac02655b)
 2024-03-02 08:22:41 +00:00
ruthra kumar
1b5a23709a fix: incorrect exchange rate if JE has multi parties 
(cherry picked from commit 694c17487d)
 2024-03-02 08:22:38 +00:00
Raffael Meyer
d7abb21f7b Merge pull request #40209 from frappe/mergify/bp/version-14-hotfix/pr-40203 
fix(Project): filter department by company (backport #40203)
 2024-02-29 23:34:17 +01:00
barredterra
646b55eeea fix(Project): filter department by company 
(cherry picked from commit 5e736f0d06)
 2024-02-29 17:30:05 +00:00
Gursheen Anand
c8b31833f5 test: partial billing for provisional accounting 
(cherry picked from commit c5770f2ecc)
 2024-02-29 15:48:37 +00:00
Gursheen Anand
aa52cd67bd test: overbilling for provisional accounting 
(cherry picked from commit ff3ca50a4b)
 2024-02-29 15:48:36 +00:00
Gursheen Anand
14d9d29913 fix: over billing qty along with rate 
(cherry picked from commit cc96d2b50c)
 2024-02-29 15:48:36 +00:00
Gursheen Anand
5f23614960 fix: handle partial invoice against provisional entry 
(cherry picked from commit 2a46799188)
 2024-02-29 15:48:36 +00:00
Gursheen Anand
e62c49d9a6 fix: provisional reverse entry amount 
(cherry picked from commit 3e59c66806)
 2024-02-29 15:48:36 +00:00
ruthra kumar
fca70e3d03 Merge pull request #40039 from SherinKR/bank_account_validation 
fix: account validation error on bank account after editing existing bank account
 2024-02-29 17:38:34 +05:30
Gursheen Kaur Anand
aeb555a426 Merge pull request #40188 from frappe/mergify/bp/version-14-hotfix/pr-40176 
fix(minor): make warning for previously existing SO an alert (backport #40176)
 2024-02-29 11:59:44 +05:30
mergify[bot]
035c90c3b8 fix(setup): avoid duplicate entry for Analytics role (backport #40183) (#40184) 
fix(setup): avoid duplicate entry for Analytics role (#40183)

(cherry picked from commit 29f91a7919)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-02-29 11:34:23 +05:30
Gursheen Anand
c8b817c87a fix: make warning for previously existing SO an alert 
(cherry picked from commit 24dcd64c16)
 2024-02-29 06:03:26 +00:00
Frappe PR Bot
de6957262d chore(release): Bumped to Version 14.64.0 
# [14.64.0](https://github.com/frappe/erpnext/compare/v14.63.3...v14.64.0) (2024-02-28)

### Bug Fixes

* add flags for repost to ensure correct accounting from India Compliance App ([8c772cf](8c772cfb9f))
* amount label according to party type ([bb3a7cd](bb3a7cdb3d))
* Cannot read properties of undefined (backport [#40081](https://github.com/frappe/erpnext/issues/40081)) ([#40082](https://github.com/frappe/erpnext/issues/40082)) ([579b27d](579b27d010))
* capacity planning issue in the job card (backport [#40092](https://github.com/frappe/erpnext/issues/40092)) ([#40100](https://github.com/frappe/erpnext/issues/40100)) ([8a573a1](8a573a1aff))
* check_credit_limit on_update_after_submit of Sales Order ([3112fca](3112fca087))
* communication_date in party dashboards (backport [#40005](https://github.com/frappe/erpnext/issues/40005)) ([#40020](https://github.com/frappe/erpnext/issues/40020)) ([b364fe7](b364fe7047))
* Completed Work Orders report not working ([c8e1409](c8e1409b80))
* Cr/Dr notes with POS Payments ([e5098c5](e5098c521b))
* default taxable value for item not found in item list ([30315ab](30315aba37))
* Delete linked asset movement record on cancellation of purchase receipt/invoice ([11bddc1](11bddc14bb))
* Delete orphaned asset movement item records ([46cd929](46cd929d00))
* delete PLE containing invoice in against ([08459ce](08459cef4a))
* do not make MR against raw materials of available sub assemblies (backport [#40085](https://github.com/frappe/erpnext/issues/40085)) ([#40086](https://github.com/frappe/erpnext/issues/40086)) ([e461185](e461185317))
* incorrect item name in MR (backport [#40018](https://github.com/frappe/erpnext/issues/40018)) ([#40023](https://github.com/frappe/erpnext/issues/40023)) ([079ba76](079ba7670c))
* linter issue ([ea1a0b3](ea1a0b3a28))
* linting issue ([65a2adf](65a2adfc55))
* linting issue ([e289aef](e289aef1b4))
* negative stock error while making stock reconciliation (backport [#40016](https://github.com/frappe/erpnext/issues/40016)) ([#40025](https://github.com/frappe/erpnext/issues/40025)) ([865cba4](865cba406f))
* on unreconciliation, update advance paid ([fe88a11](fe88a110b1))
* only check for delinked PLEs ([3d243a7](3d243a7fa5))
* only consider contributed qty towards achieved targets ([0484857](0484857402))
* parent warehouse checks in the production plan for sub-assemblies (backport [#40150](https://github.com/frappe/erpnext/issues/40150)) ([#40156](https://github.com/frappe/erpnext/issues/40156)) ([9a85ab4](9a85ab45e7))
* remove cancelled payment entry from Payment Period Based On Invoice Date ([2fc490a](2fc490a5d7))
* remove cancelled payment entry from PPBOID report ([a1c0c23](a1c0c2359f))
* remove config for default bank account in test ([ad60677](ad6067795f))
* sales funnel text color in light/dark theme ([#40132](https://github.com/frappe/erpnext/issues/40132)) ([193cd0d](193cd0db96))
* skip max discount validation for rate adjustment ([8c7d0d4](8c7d0d4b85))
* skip SO & DN validation for debit note ([882cf98](882cf98288))
* test for plaid bank account validation ([22db6f6](22db6f6b72))
* timesheet per billed state edge case (backport [#40010](https://github.com/frappe/erpnext/issues/40010)) ([#40028](https://github.com/frappe/erpnext/issues/40028)) ([2a2f314](2a2f314821))
* translatable columns in Sales Pipeline Analytics report ([3c170b9](3c170b9805))
* unique gl account for plaid bank accounts ([8638d14](8638d14bab))
* use correct variable name for hotfix branches ([812eebf](812eebf1ab))
* Webpages not working without login ([d6fad08](d6fad08d20))

### Features

* show contributed qty in transaction summary ([89d1942](89d19422d1))
* update billed amount in PO and PR ([019d8f9](019d8f92fe))
v14.64.0 		2024-02-28 05:13:29 +00:00
Deepesh Garg
e80bfd28ea Merge pull request #40147 from frappe/version-14-hotfix 
chore: release v14
 2024-02-28 10:42:13 +05:30