CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-23 05:04:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
47,113 Commits 424 Branches 1,724 Tags
6826a1e97643155bac97a0d4fbd977528bb34798
Commit Graph

47113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe PR Bot
6826a1e976 chore(release): Bumped to Version 15.5.0 
# [15.5.0](https://github.com/frappe/erpnext/compare/v15.4.0...v15.5.0) (2023-12-05)

### Bug Fixes

* `AttributeError` while saving Purchase Invoice (backport [#38482](https://github.com/frappe/erpnext/issues/38482)) ([#38490](https://github.com/frappe/erpnext/issues/38490)) ([f6c48e8](f6c48e8ecf))
* `OperationalError` while selecting Serial No in `Warranty Claim` (backport [#38394](https://github.com/frappe/erpnext/issues/38394)) ([#38414](https://github.com/frappe/erpnext/issues/38414)) ([80afeca](80afeca229))
* Add missing french translations ([#38368](https://github.com/frappe/erpnext/issues/38368)) ([b5c89ec](b5c89ec3b4))
* better overlap logic for job card (backport [#38432](https://github.com/frappe/erpnext/issues/38432)) ([#38522](https://github.com/frappe/erpnext/issues/38522)) ([2a9e843](2a9e843610))
* consider the `Valuation Method` while picking incorrect SLE (backport [#38592](https://github.com/frappe/erpnext/issues/38592)) ([#38595](https://github.com/frappe/erpnext/issues/38595)) ([9d45bbd](9d45bbd051))
* debit credit mismatch in multi-currecy asset purchase receipt ([#38342](https://github.com/frappe/erpnext/issues/38342)) ([b9f26ae](b9f26ae849))
* don't consider cancelled entries ([#38401](https://github.com/frappe/erpnext/issues/38401)) ([0a29dbe](0a29dbe09e))
* don't show non-stock items in Stock Analytics report (backport [#38543](https://github.com/frappe/erpnext/issues/38543)) ([#38545](https://github.com/frappe/erpnext/issues/38545)) ([282a5b2](282a5b27ad))
* don't update previous doc on rate change (backport [#38493](https://github.com/frappe/erpnext/issues/38493)) ([#38524](https://github.com/frappe/erpnext/issues/38524)) ([0aa96f7](0aa96f783d))
* exclude `invoice_doctypes` from party advance ([927538f](927538f776))
* exploded items in Subcontracting Receipt (backport [#38441](https://github.com/frappe/erpnext/issues/38441)) ([#38445](https://github.com/frappe/erpnext/issues/38445)) ([e066698](e06669847d))
* german translations for Lost Quotations (backport [#38435](https://github.com/frappe/erpnext/issues/38435)) ([#38516](https://github.com/frappe/erpnext/issues/38516)) ([33c59a2](33c59a2bb1))
* get dynamic link with parenttype contact ([cb9589b](cb9589b8ef))
* incorrect customer outstanding amount ([#38475](https://github.com/frappe/erpnext/issues/38475)) ([98fe89a](98fe89a24d))
* incorrect material request quantity in Production Plan (backport [#38566](https://github.com/frappe/erpnext/issues/38566)) ([#38579](https://github.com/frappe/erpnext/issues/38579)) ([145ed3a](145ed3a3b1))
* incorrect ordered qty for Subcontracting Order ([#38415](https://github.com/frappe/erpnext/issues/38415)) ([71fe2bc](71fe2bcc28))
* incorrect requested quantity for the subcontracting order ([abe3e41](abe3e41a17))
* incorrectly treating normal payment as advance ([#38437](https://github.com/frappe/erpnext/issues/38437)) ([246dd74](246dd74ba4))
* item group filter in sales person wise report ([602f6ca](602f6ca545))
* make create button translatable ([#38165](https://github.com/frappe/erpnext/issues/38165)) ([95f9cc9](95f9cc99b9))
* **regional:** use net figures for sales calc ([#38260](https://github.com/frappe/erpnext/issues/38260)) ([4a243ce](4a243ce5b7))
* remove hardcoded, implicit rounding loss allowance ([4baf796](4baf7960dd))
* scan for serial or batch in bundle (backport [#38534](https://github.com/frappe/erpnext/issues/38534)) ([#38552](https://github.com/frappe/erpnext/issues/38552)) ([88d2a8d](88d2a8d668))
* set cwip account before asset tests ([de7e1ab](de7e1ab237))
* show item name as title instead of item group in BOM (backport [#38478](https://github.com/frappe/erpnext/issues/38478)) ([#38481](https://github.com/frappe/erpnext/issues/38481)) ([8e57862](8e57862a1c))
* show party instead of party name where naming series not set ([f120dc5](f120dc56c2))
* sql error while filtering on finance book in GL ([3779943](3779943221))
* **test:** use correct account type for testing ([8b6eb35](8b6eb3599c))
* unset discount amount based on coupon code ([0e50e77](0e50e77d8e))
* use `docstatus` instead of `status` (backport [#38439](https://github.com/frappe/erpnext/issues/38439)) ([#38443](https://github.com/frappe/erpnext/issues/38443)) ([a50e872](a50e872820))
* use predefined onload property `load_after_mapping` ([#38209](https://github.com/frappe/erpnext/issues/38209)) ([4a558b7](4a558b7efb))
* **ux:** make valuation field read only when it can't be modified (backport [#38450](https://github.com/frappe/erpnext/issues/38450)) ([#38464](https://github.com/frappe/erpnext/issues/38464)) ([2d9ba88](2d9ba88870))
* validation error has not throw for the batch (backport [#38494](https://github.com/frappe/erpnext/issues/38494)) ([#38502](https://github.com/frappe/erpnext/issues/38502)) ([c797c53](c797c533ed))

### Features

* `Company` filter in `Stock Ledger Variance` report (backport [#38553](https://github.com/frappe/erpnext/issues/38553)) ([#38574](https://github.com/frappe/erpnext/issues/38574)) ([02d7dd8](02d7dd8b15))
* add customer group filter in sales register ([#38365](https://github.com/frappe/erpnext/issues/38365)) ([185b715](185b715d43))
* auto create PR on SCR submission (backport [#38290](https://github.com/frappe/erpnext/issues/38290)) ([#38428](https://github.com/frappe/erpnext/issues/38428)) ([7005d51](7005d51af3))
* enable automatic type annotations (backport [#38452](https://github.com/frappe/erpnext/issues/38452)) ([#38454](https://github.com/frappe/erpnext/issues/38454)) ([5e6a4d2](5e6a4d257e))
* shift depreciation for assets (backport [#38327](https://github.com/frappe/erpnext/issues/38327)) ([#38417](https://github.com/frappe/erpnext/issues/38417)) ([12ad1ec](12ad1ec71a))
v15.5.0 		2023-12-05 13:51:15 +00:00
Deepesh Garg
8a9ed0d04f Merge pull request #38590 from frappe/version-15-hotfix 
chore: release v15
 2023-12-05 19:19:52 +05:30
mergify[bot]
9d45bbd051 fix: consider the Valuation Method while picking incorrect SLE (backport #38592) (#38595) 
* fix: incorrect SLE for `Moving Average` valuation method

(cherry picked from commit 8beec58670)

* feat: add `Valuation Method` column in `Stock Ledger Variance` report

(cherry picked from commit 16c297c2ec)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-05 18:13:43 +05:30
ruthra kumar
acf94dd4ad Merge pull request #38586 from frappe/mergify/bp/version-15-hotfix/pr-38580 
fix: sql error while filtering on finance book in GL (backport #38580)
 2023-12-05 15:06:42 +05:30
ruthra kumar
3779943221 fix: sql error while filtering on finance book in GL 
(cherry picked from commit b1d9f3132d)
 2023-12-05 09:11:40 +00:00
mergify[bot]
145ed3a3b1 fix: incorrect material request quantity in Production Plan (backport #38566) (#38579) 
fix: incorrect material request quantity in Production Plan (#38566)

(cherry picked from commit aaa9036eca)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-05 14:24:26 +05:30
ruthra kumar
7076f3d778 Merge pull request #38577 from frappe/mergify/bp/version-15-hotfix/pr-38570 
refactor: ignore unreconcile doc on PI cancel/delete (backport #38570)
 2023-12-05 13:13:29 +05:30
mergify[bot]
02d7dd8b15 feat: Company filter in Stock Ledger Variance report (backport #38553) (#38574) 
feat: `Company` filter in `Stock Ledger Variance` report

(cherry picked from commit fb3421fcce)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-05 12:33:06 +05:30
ruthra kumar
ee87c2a211 refactor: ingore on JE cancel as well 
(cherry picked from commit 1a5d56977e)
 2023-12-05 06:34:14 +00:00
ruthra kumar
c83c97f466 refactor: ignore unreconcile doc on PI cancel/delete 
(cherry picked from commit 4ca84eadb6)
 2023-12-05 06:34:14 +00:00
Shariq Ansari
39e04b119a Merge pull request #38564 from frappe/mergify/bp/version-15-hotfix/pr-38562 
fix: get dynamic link with parenttype contact (backport #38562)
 2023-12-04 19:22:37 +05:30
Shariq Ansari
cb9589b8ef fix: get dynamic link with parenttype contact 
(cherry picked from commit 3d7ad71b22)
 2023-12-04 13:51:36 +00:00
mergify[bot]
88d2a8d668 fix: scan for serial or batch in bundle (backport #38534) (#38552) 
fix: scan for serial or batch in bundle (#38534)

(cherry picked from commit c8693cdf37)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-04 15:24:28 +05:30
ruthra kumar
92c8eb17ca Merge pull request #38550 from frappe/mergify/bp/version-15-hotfix/pr-38475 
fix: incorrect customer outstanding amount (backport #38475)
 2023-12-04 13:57:00 +05:30
NIYAZ RAZAK
98fe89a24d fix: incorrect customer outstanding amount (#38475) 
* fix: incorrect customer outstanding amount

* chore: resolve linting error

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 3df1d75bdd)
 2023-12-04 08:11:06 +00:00
ruthra kumar
66e3dc7358 Merge pull request #38547 from frappe/mergify/bp/version-15-hotfix/pr-38283 
chore: move reconciliation cleanup patch to pre-model sync (backport #38283)
 2023-12-04 13:40:48 +05:30
ruthra kumar
e405695838 chore: move reconciliation cleanup patch to pre-model 
(cherry picked from commit f258ab5e98)
 2023-12-04 07:34:09 +00:00
ruthra kumar
d8f9e3a8b1 Merge pull request #38542 from frappe/mergify/bp/version-15-hotfix/pr-38148 
refactor: convert Payment Reconciliation to virtual doctype (backport #38148)
 2023-12-04 12:37:06 +05:30
mergify[bot]
282a5b27ad fix: don't show non-stock items in Stock Analytics report (backport #38543) (#38545) 
* fix(ux): stock-item filter for Item Code field

(cherry picked from commit ccdcb7dfcc)

* fix: don't show non-stock items in Stock Analytics report

(cherry picked from commit 01aadbef85)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-04 12:18:58 +05:30
ruthra kumar
b8b8c02bf9 chore: resolve conflict 2023-12-04 12:16:41 +05:30
ruthra kumar
192343dec2 chore: clear singles table and reconciliation related tables 
(cherry picked from commit f31002636b)
 2023-12-04 06:31:08 +00:00
ruthra kumar
4123f4b0bd chore: remove reconciliation defaults from patch 
(cherry picked from commit b5dd0c8630)
 2023-12-04 06:31:08 +00:00
ruthra kumar
bcbf5da905 refactor: virtual doctype methods 
(cherry picked from commit 9c7b19e0b7)
 2023-12-04 06:31:08 +00:00
ruthra kumar
f6d481de89 refactor: convert payment reconciliation tool to virtual doctype 
(cherry picked from commit 3a51a3f37e)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
 2023-12-04 06:31:07 +00:00
ruthra kumar
0b64daf497 Merge pull request #38540 from frappe/mergify/bp/version-15-hotfix/pr-38220 
fix: exclude `invoice_doctypes` from party advance (backport #38220)
 2023-12-04 11:19:03 +05:30
ruthra kumar
0a05154698 Merge pull request #38538 from frappe/mergify/bp/version-15-hotfix/pr-38437 
fix: incorrectly treating normal payment as advance (backport #38437)
 2023-12-04 11:08:46 +05:30
Dany Robert
927538f776 fix: exclude invoice_doctypes from party advance 
(cherry picked from commit f34ffc2062)
 2023-12-04 05:31:50 +00:00
ruthra kumar
246dd74ba4 fix: incorrectly treating normal payment as advance (#38437) 
fix: treating normal payment as advance
(cherry picked from commit dd39da0b77)
 2023-12-04 04:39:16 +00:00
mergify[bot]
b5c89ec3b4 fix: Add missing french translations (#38368) 
fix: Add missing french translations (#38368)

fix: Add missing french translation

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit a1e0197a8b)

Co-authored-by: noec764 <58433943+noec764@users.noreply.github.com>
 2023-12-04 09:37:46 +05:30
mergify[bot]
4a558b7efb fix: use predefined onload property load_after_mapping (#38209) 
fix: use predefined onload property `load_after_mapping` (#38209)

(cherry picked from commit b6a7549407)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
 2023-12-04 09:36:52 +05:30
mergify[bot]
0aa96f783d fix: don't update previous doc on rate change (backport #38493) (#38524) 
* fix: don't update previous doc on rate change

(cherry picked from commit 68f5dd3e7b)

* fix: `linter`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-03 23:20:53 +05:30
mergify[bot]
33c59a2bb1 fix: german translations for Lost Quotations (backport #38435) (#38516) 
fix: german translations for Lost Quotations (#38435)

(cherry picked from commit 5952cfa673)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2023-12-03 23:19:32 +05:30
ruthra kumar
5b1e7666c2 Merge pull request #38528 from frappe/mergify/bp/version-15-hotfix/pr-38525 
fix: multiple minor fixes in report and Exchange Rate Revaluation (backport #38525)
 2023-12-03 17:04:29 +05:30
ruthra kumar
4baf7960dd fix: remove hardcoded, implicit rounding loss allowance 
(cherry picked from commit 64266c4d38)
 2023-12-03 11:14:26 +00:00
ruthra kumar
602f6ca545 fix: item group filter in sales person wise report 
(cherry picked from commit f4d418ea6d)
 2023-12-03 11:14:26 +00:00
mergify[bot]
2a9e843610 fix: better overlap logic for job card (backport #38432) (#38522) 
fix: better overlap logic for job card (#38432)

(cherry picked from commit 74eab91042)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-03 09:49:48 +05:30
mergify[bot]
0a29dbe09e fix: don't consider cancelled entries (#38401) 
* fix: don't consider cancelled entries

(cherry picked from commit adfcdb3b65)

* refactor: get outstanding journal entry using query builder

(cherry picked from commit ff27cccff4)

---------

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
 2023-12-02 20:07:26 +05:30
mergify[bot]
185b715d43 feat: add customer group filter in sales register (#38365) 
feat: add customer group filter in sales register

(cherry picked from commit 5a97fa6336)

Co-authored-by: Nandhinidevi123 <nandhini.devi@thirvusoft.in>
 2023-12-02 19:50:35 +05:30
mergify[bot]
c797c533ed fix: validation error has not throw for the batch (backport #38494) (#38502) 
fix: validation error has not throw for the batch (#38494)

* fix: validation error has not throw for the batch

* chore: fix test cases

(cherry picked from commit 5e9016ffab)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-01 21:46:35 +05:30
mergify[bot]
7b363db582 chore: changed sort_order to DESC for customer (backport #38498) (#38501) 
chore: changed sort_order to DESC for customer (#38498)

(cherry picked from commit 6bc40373f2)

Co-authored-by: Sherin KR <sherinkrply@gmail.com>
 2023-12-01 19:09:31 +05:30
Gursheen Kaur Anand
afa6255eee Merge pull request #38497 from frappe/mergify/bp/version-15-hotfix/pr-38144 
fix(minor): show party instead of party name where naming series not set (backport #38144)
 2023-12-01 18:20:11 +05:30
Gursheen Anand
f120dc56c2 fix: show party instead of party name where naming series not set 
(cherry picked from commit b27af6b5c8)
 2023-12-01 12:35:00 +00:00
mergify[bot]
f6c48e8ecf fix: AttributeError while saving Purchase Invoice (backport #38482) (#38490) 
fix: `AttributeError` while saving Purchase Invoice

(cherry picked from commit 60a81a563e)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-01 14:10:31 +05:30
ruthra kumar
bf44e9ed64 Merge pull request #38484 from frappe/mergify/bp/version-15-hotfix/pr-38393 
refactor: GL entries build logic for `Advance in Separate Party Account` option. (backport #38393)
 2023-12-01 13:26:11 +05:30
mergify[bot]
9cdbd33e40 chore: add translate function to email subject in digest frecuency (backport #38474) (#38487) 
chore: add translate function to email subject in digest frecuency (#38474)

chore: add translate function to email subject in digest frecuency
(cherry picked from commit b24e28953b)

Co-authored-by: Ernesto Ruiz <eruiz@wbapps.com>
 2023-12-01 12:43:37 +05:30
ruthra kumar
4a4f4ad323 refactor: handle forex payment advance entries 
(cherry picked from commit 961bdf0d24)
 2023-12-01 07:07:56 +00:00
ruthra kumar
5d9f71af95 refactor(test): filter on document names 
(cherry picked from commit 080aa30407)
 2023-12-01 07:07:56 +00:00
ruthra kumar
8b6eb3599c fix(test): use correct account type for testing 
(cherry picked from commit eecf9cd1d8)
 2023-12-01 07:07:56 +00:00
ruthra kumar
25b49ef0de test: ledger pre and post reconciliation on advance as liability 
(cherry picked from commit 0255e09285)
 2023-12-01 07:07:56 +00:00
ruthra kumar
c67d0eb718 refactor(test): advance allocation on purchase invoice 
(cherry picked from commit 2add802d0d)
 2023-12-01 07:07:56 +00:00