schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,892 Commits 322 Branches 1,581 Tags
7d8d9cfdfe6399e22b823bde86beb378bd56d968
Commit Graph

49892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sagar Vora
7d8d9cfdfe Merge pull request #44008 from frappe/version-15-hotfix 2024-11-07 18:13:13 +05:30
mergify[bot]
47a8fc28df fix: task showing limit in customer portal (backport #44003) (#44005) 
fix: task showing limit in customer portal (#44003)

(cherry picked from commit 44832c3b5c)

Co-authored-by: Nihantra C. Patel <141945075+Nihantra-Patel@users.noreply.github.com>
 2024-11-07 12:49:27 +05:30
Smit Vora
5dca98a1cf Merge pull request #43997 from Abdeali099/update-dimension-filter-query 2024-11-06 19:36:46 +05:30
Abdeali Chharchhoda
318830c57d fix: Update dimension_filter_map query 2024-11-06 19:16:01 +05:30
Sagar Vora
f4d2ba5bbd Merge pull request #43995 from frappe/mergify/bp/version-15-hotfix/pr-43993 
fix: ensure list has items (backport #43993)
 2024-11-06 14:08:33 +05:30
Sagar Vora
633997b1b0 fix: ensure list has items 
(cherry picked from commit e13e688987)
 2024-11-06 08:38:09 +00:00
Sagar Vora
36b22e290a Merge pull request #43991 from frappe/mergify/bp/version-15-hotfix/pr-43989 
fix: error when saving POS merge log (backport #43989)
 2024-11-06 13:26:02 +05:30
Sagar Vora
c3e61aebd2 fix: error when saving POS merge log (#43989) 
(cherry picked from commit c62596b323)
 2024-11-06 07:52:15 +00:00
Sagar Vora
de0c6f2ca9 Merge pull request #43987 from frappe/mergify/bp/version-15-hotfix/pr-43985 
fix: removed single quotes from deferred revenue (backport #43985)
 2024-11-06 12:05:17 +05:30
Nihantra C. Patel
20033eef9b fix: removed single quotes from deferred revenue (#43985) 
(cherry picked from commit 834d18840c)
 2024-11-06 06:33:34 +00:00
Frappe PR Bot
9ccdb987d9 chore(release): Bumped to Version 15.41.0 
# [15.41.0](https://github.com/frappe/erpnext/compare/v15.40.0...v15.41.0) (2024-11-06)

### Bug Fixes

* add precision validation ([b665e4e](b665e4e24a))
* deleting SO/PO will remove its advance payment ledger entry ([d84a3c4](d84a3c4f29))
* map reference number while reversing journal ([10d8cc9](10d8cc9d66))
* **return:** set default return warehouse ([e730b8c](e730b8c6e4))
* SO link on PO and add in missing dashboard references on both ([9f7afda](9f7afda4db))
* validation trigger (backport [#43926](https://github.com/frappe/erpnext/issues/43926)) ([#43943](https://github.com/frappe/erpnext/issues/43943)) ([a689830](a689830bff))
* valuation rate for sales / purchase return for serial / batch nos (backport [#43925](https://github.com/frappe/erpnext/issues/43925)) ([#43942](https://github.com/frappe/erpnext/issues/43942)) ([ce42d84](ce42d847b3))

### Features

* advance payment ledger doctype ([b343334](b343334f69))
* remove Payroll Entry from Bank Account dashboard (backport [#43931](https://github.com/frappe/erpnext/issues/43931)) ([#43933](https://github.com/frappe/erpnext/issues/43933)) ([4a749ce](4a749cec72))

### Performance Improvements

* avoid reposting of entries created after stock reco (backport [#43950](https://github.com/frappe/erpnext/issues/43950)) ([#43961](https://github.com/frappe/erpnext/issues/43961)) ([7ad664d](7ad664d89a))
* too many writes error during reposting (backport [#43978](https://github.com/frappe/erpnext/issues/43978)) ([#43983](https://github.com/frappe/erpnext/issues/43983)) ([a38819c](a38819cbd5))
v15.41.0 		2024-11-06 05:21:49 +00:00
ruthra kumar
a6c58a3542 Merge pull request #43975 from frappe/version-15-hotfix 
chore: release v15
 2024-11-06 10:50:24 +05:30
mergify[bot]
ceccd8c2dc chore: update serial_batch_bundle.py (backport #43981) (#43984) 
chore: update serial_batch_bundle.py (#43981)

Avaliable -> Available

(cherry picked from commit 30954ed645)

Co-authored-by: Ikko Eltociear Ashimine <eltociear@gmail.com>
 2024-11-06 10:30:06 +05:30
mergify[bot]
a38819cbd5 perf: too many writes error during reposting (backport #43978) (#43983) 
perf: too many writes error during reposting (#43978)

perf: too many writes error
(cherry picked from commit 134c24b9c5)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-06 10:05:44 +05:30
Khushi Rawat
801940912a Merge pull request #43980 from frappe/mergify/bp/version-15-hotfix/pr-43979 
fix: added precision validation (backport #43979)
 2024-11-06 01:45:53 +05:30
Khushi Rawat
b665e4e24a fix: add precision validation 
(cherry picked from commit 7daadcf420)
 2024-11-05 19:03:26 +00:00
ruthra kumar
e4d94af019 Merge pull request #43973 from frappe/mergify/bp/version-15-hotfix/pr-43971 
refactor: update permission requirement for advance ledger (backport #43971)
 2024-11-05 11:20:10 +05:30
ruthra kumar
eaf6d0d7d8 refactor: update advance ledger role requirement 
(cherry picked from commit e41560d30b)
 2024-11-05 05:30:13 +00:00
ruthra kumar
1b8bd0e1f3 refactor: avoid permission issue for non-admin 
(cherry picked from commit c832d9fb9a)
 2024-11-05 05:30:13 +00:00
ruthra kumar
ce817cbc12 Merge pull request #43965 from frappe/mergify/bp/version-15-hotfix/pr-43388 
fix: SO link on PO and add in missing dashboard references on both (backport #43388)
 2024-11-04 14:27:34 +05:30
CaseSolved
84a40c282b chore: linting 
(cherry picked from commit be6970c850)
 2024-11-04 08:32:21 +00:00
CaseSolved
9f7afda4db fix: SO link on PO and add in missing dashboard references on both 
(cherry picked from commit 2017fd80d1)
 2024-11-04 08:32:21 +00:00
ruthra kumar
ddd50167a5 Merge pull request #43447 from frappe/mergify/bp/version-15-hotfix/pr-43446 
fix(return): set default return warehouse (backport #43446)
 2024-11-04 13:26:01 +05:30
mergify[bot]
7ad664d89a perf: avoid reposting of entries created after stock reco (backport #43950) (#43961) 
perf: avoid reposting of entries created after stock reco (#43950)

(cherry picked from commit 7cfe1c8d59)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-04 13:23:44 +05:30
ruthra kumar
5eb252215c Merge pull request #43959 from frappe/mergify/bp/version-15-hotfix/pr-43929 
fix: Map reference number while reversing Journal Entry (backport #43929)
 2024-11-04 13:15:31 +05:30
ramyasusee
10d8cc9d66 fix: map reference number while reversing journal 
(cherry picked from commit 77de783cd4)
 2024-11-04 06:58:58 +00:00
ruthra kumar
64f616b8a7 Merge pull request #43956 from frappe/mergify/bp/version-15-hotfix/pr-43835 
Update fiscal_year.js (backport #43835)
 2024-11-04 11:26:03 +05:30
hyaray
9a2b0a965d refactor: use year current year start date as default 
(cherry picked from commit d54283ded5)
 2024-11-04 05:48:42 +00:00
ruthra kumar
ec465571d8 Merge pull request #43946 from frappe/mergify/bp/version-15-hotfix/pr-43709 
feat: Ledger for advance payment (backport #43709)
 2024-11-04 10:53:21 +05:30
mergify[bot]
ce42d847b3 fix: valuation rate for sales / purchase return for serial / batch nos (backport #43925) (#43942) 
fix: valuation rate for sales / purchase return for serial / batch nos (#43925)

(cherry picked from commit 01bb1612da)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-03 04:20:20 +05:30
mergify[bot]
a689830bff fix: validation trigger (backport #43926) (#43943) 
fix: validation trigger (#43926)

(cherry picked from commit ba9fb4effc)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-11-03 04:20:01 +05:30
ruthra kumar
9bfcad31fd refactor: replace non-existant IntegrationTestCase 2024-11-01 20:08:07 +05:30
ruthra kumar
426010e21a refactor: fetch correct hook variable 2024-11-01 14:14:03 +05:30
ruthra kumar
ba09ddcc3a chore: resolve conflict 2024-11-01 14:10:45 +05:30
ruthra kumar
d0a655d5ae test: PO advance and currency from journal 
(cherry picked from commit cf7b8f1b41)
 2024-11-01 08:35:08 +00:00
ruthra kumar
91a276d4ed test: PO 'Advance Paid' and curreny when using payment 
(cherry picked from commit ca85c75e39)
 2024-11-01 08:35:08 +00:00
ruthra kumar
16c1fc75b5 chore: move tests to advance payment ledger doctype 
(cherry picked from commit 14cef3d4c4)
 2024-11-01 08:35:08 +00:00
ruthra kumar
7f9ae4e044 test: advance and currency from Journal 
(cherry picked from commit 1825082512)
 2024-11-01 08:35:07 +00:00
ruthra kumar
c8be4f3f78 refactor: use dr / cr account currency field for journals 
(cherry picked from commit 9c1a4e284c)
 2024-11-01 08:35:07 +00:00
ruthra kumar
d830ce1d88 test: USD Sales Order with advance payment 
(cherry picked from commit 6c731561f3)
 2024-11-01 08:35:07 +00:00
ruthra kumar
07a394a1c5 refactor: handle currency on advance payment ledger 
(cherry picked from commit ae6a81cd07)
 2024-11-01 08:35:07 +00:00
ruthra kumar
68a95c7dbc refactor: move creation logic to controller 
(cherry picked from commit ad88bde448)
 2024-11-01 08:35:07 +00:00
ruthra kumar
164d7cc896 refactor: handle 'no data' situation in patch 
(cherry picked from commit 8e3bf7dc09)
 2024-11-01 08:35:07 +00:00
ruthra kumar
063cef576c chore: update ignore_linked_doctypes for Journal Entry 
(cherry picked from commit 767ae6a372)
 2024-11-01 08:35:06 +00:00
ruthra kumar
c6bfdcf503 chore: update patchex.txt 
(cherry picked from commit 8ab7194b1d)
 2024-11-01 08:35:06 +00:00
ruthra kumar
085e0455d8 refactor: patch to migrating old SO / PO to advance ledger 
(cherry picked from commit b927f2f4a0)
 2024-11-01 08:35:06 +00:00
ruthra kumar
cb36dcb382 refactor(test): reconciliation shouldn't affect advance paid 
(cherry picked from commit 35a8a18728)
 2024-11-01 08:35:06 +00:00
ruthra kumar
ffd426d43d refactor: link journal entry to advance payment ledger 
(cherry picked from commit fca5e95248)
 2024-11-01 08:35:06 +00:00
ruthra kumar
d84a3c4f29 fix: deleting SO/PO will remove its advance payment ledger entry 
(cherry picked from commit 14357bccba)
 2024-11-01 08:35:06 +00:00
ruthra kumar
a12df122a9 refactor(test): advance_paid stays after reconciliation 
(cherry picked from commit c4197c3f31)
 2024-11-01 08:35:05 +00:00