nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-21 16:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
52,857 Commits 424 Branches 1,724 Tags
0cd45a0022440d404b7a6f9a94de804569782f13
Commit Graph

52857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Raffael Meyer
32ec73dd96 Merge pull request #38727 from frappe/mergify/bp/version-15-hotfix/pr-38725 2023-12-13 17:48:11 +01:00
barredterra
f30bede2e0 feat: RFQ print preview 
(cherry picked from commit 27f05145ae)
 2023-12-13 16:32:30 +00:00
mergify[bot]
1dcb065c64 fix: barcode scanning for the stock entry (backport #38716) (#38718) 
fix: barcode scanning for the stock entry (#38716)

(cherry picked from commit 13cba5068b)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-13 18:32:48 +05:30
mergify[bot]
feb452b740 fix: supplier removed on selection of item (backport #38712) (#38713) 
fix: supplier removed on selection of item (#38712)

(cherry picked from commit db24e24882)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-13 14:39:00 +05:30
Frappe PR Bot
86b276a3ec chore(release): Bumped to Version 15.6.0 
# [15.6.0](https://github.com/frappe/erpnext/compare/v15.5.0...v15.6.0) (2023-12-12)

### Bug Fixes

* `split_invoices_based_on_payment_terms` (backport [#37859](https://github.com/frappe/erpnext/issues/37859)) ([#38488](https://github.com/frappe/erpnext/issues/38488)) ([4b76cc4](4b76cc46a1))
* 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 (backport [#38696](https://github.com/frappe/erpnext/issues/38696)) ([#38703](https://github.com/frappe/erpnext/issues/38703)) ([2bd9671](2bd96713db))
* auto delete draft serial and batch bundle (backport [#38637](https://github.com/frappe/erpnext/issues/38637)) ([#38654](https://github.com/frappe/erpnext/issues/38654)) ([b0675f6](b0675f6490))
* close PO on SCO close (backport [#38667](https://github.com/frappe/erpnext/issues/38667)) ([#38681](https://github.com/frappe/erpnext/issues/38681)) ([4055543](4055543f5d))
* format only if searched text contain link value text ([d79e6e3](d79e6e353e))
* get customers for leaderboard ([9d5c79d](9d5c79d6b2))
* get items for leaderboard ([7cb38a8](7cb38a8f22))
* get sales partner for leaderboard ([3845d42](3845d4294c))
* get sales person for leaderboard ([2fcfebe](2fcfebe1d3))
* get suppliers for leaderboard ([e205772](e205772482))
* ignore non-existing regional customizations (backport [#38621](https://github.com/frappe/erpnext/issues/38621)) ([#38624](https://github.com/frappe/erpnext/issues/38624)) ([c70e6f2](c70e6f23df))
* limit end date to current date ([dbdb971](dbdb971e10))
* negative batch issue (backport [#38688](https://github.com/frappe/erpnext/issues/38688)) ([#38694](https://github.com/frappe/erpnext/issues/38694)) ([a75081b](a75081b8c0))
* not able to make serial and batch using csv import (backport [#38659](https://github.com/frappe/erpnext/issues/38659)) ([#38662](https://github.com/frappe/erpnext/issues/38662)) ([dd07eca](dd07ecad45))
* only highest eligible coupon applied ([#38416](https://github.com/frappe/erpnext/issues/38416)) ([aa66ee6](aa66ee64ec))
* serial and batch bundle permission (backport [#38618](https://github.com/frappe/erpnext/issues/38618)) ([#38619](https://github.com/frappe/erpnext/issues/38619)) ([ce2bd15](ce2bd15872))
* serial no filter in the Serial No Ledger report (backport [#38669](https://github.com/frappe/erpnext/issues/38669)) ([#38682](https://github.com/frappe/erpnext/issues/38682)) ([d188c8e](d188c8ec0e))
* Shipping Address Link Showing in Buying (backport [#38634](https://github.com/frappe/erpnext/issues/38634)) ([#38646](https://github.com/frappe/erpnext/issues/38646)) ([4150ed9](4150ed9b3b))
* show stock qty in popup (backport [#38698](https://github.com/frappe/erpnext/issues/38698)) ([#38699](https://github.com/frappe/erpnext/issues/38699)) ([6e2cde4](6e2cde4a21))
* typeerror on new sites ([#38692](https://github.com/frappe/erpnext/issues/38692)) ([9239e73](9239e735ad))
* typo in unittest ([#38673](https://github.com/frappe/erpnext/issues/38673)) ([14ee13c](14ee13c77e))
* **ux:** don't update qty blindly (backport [#38608](https://github.com/frappe/erpnext/issues/38608)) ([#38639](https://github.com/frappe/erpnext/issues/38639)) ([0b2e2a2](0b2e2a2ab5))

### Features

* add employee number to client user bootinfo (backport [#38477](https://github.com/frappe/erpnext/issues/38477)) ([#38603](https://github.com/frappe/erpnext/issues/38603)) ([c7dbcbc](c7dbcbcd17))
v15.6.0 		2023-12-12 16:11:51 +00:00
Deepesh Garg
0d8a52f63b Merge pull request #38690 from frappe/version-15-hotfix 
chore: release v15
 2023-12-12 21:40:42 +05:30
mergify[bot]
2bd96713db fix: 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 (backport #38696) (#38703) 
fix: 1st row depr. sch. value of asset put to less than 180 days acc. to I.T. S. 32 (#38696)

fix: 1st row value of asset put to less than 180 days acc. to IT S. 32
(cherry picked from commit e7984b3ef9)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-12-12 21:09:38 +05:30
Raffael Meyer
1d2edec550 Merge pull request #38675 from frappe/mergify/bp/version-15-hotfix/pr-38672 
fix: get data for leaderboard (backport #38672)
 2023-12-12 13:44:04 +01:00
ruthra kumar
965126df83 Merge pull request #38678 from frappe/mergify/bp/version-15-hotfix/pr-38673 
fix: typo in unittest (backport #38673)
 2023-12-12 17:35:22 +05:30
mergify[bot]
6e2cde4a21 fix: show stock qty in popup (backport #38698) (#38699) 
fix: show stock qty in popup (#38698)

(cherry picked from commit b562b4cf99)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-12 17:04:57 +05:30
mergify[bot]
a75081b8c0 fix: negative batch issue (backport #38688) (#38694) 
fix: negative batch issue (#38688)

(cherry picked from commit 69d7a640ee)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-12 16:41:26 +05:30
ruthra kumar
b68e1f6ea6 Merge pull request #38693 from frappe/mergify/bp/version-15-hotfix/pr-38692 
fix: typeerror on new sites (backport #38692)
 2023-12-12 16:03:08 +05:30
ruthra kumar
9239e735ad fix: typeerror on new sites (#38692) 
(cherry picked from commit fa2d33cb50)
 2023-12-12 10:14:39 +00:00
ruthra kumar
576ff49943 Merge pull request #38687 from frappe/mergify/bp/version-15-hotfix/pr-38685 
refactor: add `get_list` for virtual child doctypes (backport #38685)
 2023-12-12 15:24:37 +05:30
ruthra kumar
92b5c80a4a refactor: add get_list for virtual child doctypes 
(cherry picked from commit 15c90551b6)
 2023-12-12 09:12:39 +00:00
mergify[bot]
d188c8ec0e fix: serial no filter in the Serial No Ledger report (backport #38669) (#38682) 
fix: serial no filter in the Serial No Ledger report (#38669)

(cherry picked from commit 780c4278e6)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-12 14:33:11 +05:30
mergify[bot]
4055543f5d fix: close PO on SCO close (backport #38667) (#38681) 
fix: close PO on SCO close

(cherry picked from commit b023e5d6b3)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-12 13:40:30 +05:30
ruthra kumar
fc79c6bf54 Merge pull request #38684 from frappe/mergify/bp/version-15-hotfix/pr-38679 
refactor(test): repost utility deletion flag test (backport #38679)
 2023-12-12 13:33:24 +05:30
ruthra kumar
522113ba98 refactor(test): update repost settings before test case 
(cherry picked from commit acb6e8e120)
 2023-12-12 07:16:51 +00:00
ruthra kumar
6469526c26 refactor: increase limit and remove explicit call to start_repost 
(cherry picked from commit ccff588563)
 2023-12-12 07:16:50 +00:00
ruthra kumar
122e6902ed refactor: remove explicit commit on repost 
(cherry picked from commit a97b3db749)
 2023-12-12 07:16:50 +00:00
ruthra kumar
64d93cec66 refactor(test): repost utility deletion flag test 
(cherry picked from commit cc15f695b4)
 2023-12-12 07:16:50 +00:00
Raffael Meyer
14ee13c77e fix: typo in unittest (#38673) 
(cherry picked from commit 6ad298adfc)
 2023-12-12 04:26:54 +00:00
barredterra
b17178bba9 chore: deprecate unused method 
(cherry picked from commit 956c3c50a0)
 2023-12-12 04:24:39 +00:00
barredterra
3845d4294c fix: get sales partner for leaderboard 
(cherry picked from commit 40c1acc961)
 2023-12-12 04:24:39 +00:00
barredterra
2fcfebe1d3 fix: get sales person for leaderboard 
(cherry picked from commit 7babfd4ac4)
 2023-12-12 04:24:39 +00:00
barredterra
e205772482 fix: get suppliers for leaderboard 
(cherry picked from commit 65df4b6aa8)
 2023-12-12 04:24:39 +00:00
barredterra
7cb38a8f22 fix: get items for leaderboard 
(cherry picked from commit 2721ee3a8d)
 2023-12-12 04:24:38 +00:00
barredterra
9d5c79d6b2 fix: get customers for leaderboard 
(cherry picked from commit 137b5a6108)
 2023-12-12 04:24:38 +00:00
mergify[bot]
dd07ecad45 fix: not able to make serial and batch using csv import (backport #38659) (#38662) 
fix: not able to make serial and batch using csv import (#38659)

(cherry picked from commit 89a0e9c245)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-11 11:29:25 +05:30
mergify[bot]
b0675f6490 fix: auto delete draft serial and batch bundle (backport #38637) (#38654) 
fix: auto delete draft serial and batch bundle (#38637)

(cherry picked from commit 89326bd657)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-10 16:45:03 +05:30
mergify[bot]
4150ed9b3b fix: Shipping Address Link Showing in Buying (backport #38634) (#38646) 
fix(ux): `Shipping Address Link`

(cherry picked from commit ca0c3eb184)

Co-authored-by: creative-paramu <pparameshwari@thirvusoft.in>
 2023-12-08 19:04:24 +05:30
mergify[bot]
0b2e2a2ab5 fix(ux): don't update qty blindly (backport #38608) (#38639) 
fix(ux): don't update qty blindly

(cherry picked from commit 0156339f34)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-08 17:59:32 +05:30
mergify[bot]
c70e6f23df fix: ignore non-existing regional customizations (backport #38621) (#38624) 
fix: ignore non-existing regional customizations (#38621)

(cherry picked from commit 9611e9bd7f)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2023-12-07 21:43:46 +05:30
Shariq Ansari
5cf0c896bb Merge pull request #38627 from frappe/mergify/bp/version-15-hotfix/pr-38623 
fix: format only if searched text contain link value text (backport #38623)
 2023-12-07 20:51:03 +05:30
Shariq Ansari
d79e6e353e fix: format only if searched text contain link value text 
(cherry picked from commit 08ed3cd313)
 2023-12-07 15:18:52 +00:00
mergify[bot]
ce2bd15872 fix: serial and batch bundle permission (backport #38618) (#38619) 
fix: serial and batch bundle permission (#38618)

(cherry picked from commit 231ab83562)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-07 18:36:31 +05:30
mergify[bot]
deef6ea66a chore: minor code cleanup (backport #38615) (#38616) 
chore: minor code cleanup (#38615)

(cherry picked from commit f45dd740c5)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-07 15:36:21 +05:30
mergify[bot]
aa66ee64ec fix: only highest eligible coupon applied (#38416) 
fix: only highest eligible coupon applied (#38416)

* fix: application of pricing rule when coupon is used

(cherry picked from commit d34787cf6d)

Co-authored-by: sandratridz <102575830+sandratridz@users.noreply.github.com>
 2023-12-07 10:34:11 +05:30
Ankush Menat
eeb0567a73 chore: remove unused cache=True 
(cherry picked from commit 6a47a2ceaf)
 2023-12-06 20:54:43 +05:30
mergify[bot]
c7dbcbcd17 feat: add employee number to client user bootinfo (backport #38477) (#38603) 
feat: add employee number to client user bootinfo (#38477)

(cherry picked from commit 525f656cc1)

Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>
 2023-12-06 20:52:50 +05:30
mergify[bot]
4b76cc46a1 fix: split_invoices_based_on_payment_terms (backport #37859) (#38488) 
* refactor: `split_invoices_based_on_payment_terms`

- Invoices were in the wrong order due to the logic. The invoices with payment terms were added first and the rest after.
- Overly long function with unnecessary loops (reduced to one main loop) and complexity
- The split row as per payment terms was not ordered. So the second installment was allocated first

(cherry picked from commit 6bd56d2d5f)

* test: `get_outstanding_reference_documents` (triggered via UI)

(cherry picked from commit 162c0497d1)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/test_payment_entry.py

* fix: Alert message and make sure invoice due dates are different for effective test

- Make invoice due dates are different so that the invoice with the earliest due date is allocated first in the test
- Translate voucher type, simplify alert message. The invoice could be "split" into 1 row, no. of rows in the message seems unnecessary.

(cherry picked from commit 56ac3424d2)

* style: Remove spaces introduced via merge conflict

(cherry picked from commit 4b4b176fcf)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/test_payment_entry.py

* fix: Re-add no.of rows split in alert message

(cherry picked from commit 1fc5844025)

* fix: Merge conflicts in tests

---------

Co-authored-by: marination <maricadsouza221197@gmail.com>
 2023-12-06 18:01:42 +05:30
Gursheen Kaur Anand
bfe2b923e1 Merge pull request #38572 from frappe/mergify/bp/version-15-hotfix/pr-38556 
fix(minor): financial statements period end date (backport #38556)
 2023-12-05 22:02:27 +05:30
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