nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 01:25:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,879 Commits 404 Branches 1,700 Tags
20033eef9b53b96abefcaaeb5d967cc56d8aae1b
Commit Graph

49879 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
ruthra kumar
df25d33735 chore: remove duplicate test class 
(cherry picked from commit e2891a60d5)
 2024-11-01 08:35:05 +00:00
ruthra kumar
a6c26874c7 refactor: remove advance payment ledgers on document deletion 
(cherry picked from commit 3c53b92f05)
 2024-11-01 08:35:05 +00:00
ruthra kumar
54f758c327 refactor: calculate advance from advance ledger 
(cherry picked from commit 2b2360bf7b)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-11-01 08:35:05 +00:00
ruthra kumar
bf0b74bcbd refactor: create advance ledger entries on submit and cancel 
(cherry picked from commit 575ca5b900)
 2024-11-01 08:35:04 +00:00
ruthra kumar
0d02f8b5d1 refactor: make all fields readonly 
(cherry picked from commit f176a82198)
 2024-11-01 08:35:04 +00:00
ruthra kumar
b343334f69 feat: advance payment ledger doctype 
(cherry picked from commit 2d6efd7cc8)
 2024-11-01 08:35:04 +00:00
mergify[bot]
4a749cec72 feat: remove Payroll Entry from Bank Account dashboard (backport #43931) (#43933) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
 2024-10-30 15:49:26 +01:00
Shariq Ansari
5ea498062c Merge pull request #43927 from frappe/mergify/bp/version-15-hotfix/pr-43921 
fix: cannot create opp from lead without prospect (backport #43921)
 2024-10-30 14:40:00 +05:30
Shariq Ansari
4dcaf42bc5 fix: cannot create opp from lead without prospect 
(cherry picked from commit 603383bca7)
 2024-10-30 08:18:53 +00:00
mergify[bot]
db3be4195c fix: purchase return validation issue (backport #43871) (backport #43874) (#43879) 
fix: purchase return validation issue (backport #43871) (#43874)

fix: purchase return validation issue (#43871)

(cherry picked from commit a7cc7b28c0)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
(cherry picked from commit b4d4c4a736)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2024-10-30 12:17:46 +05:30
mergify[bot]
9a526611e0 fix: calculate tds with net amount when invoice exceeds single threshold amount (backport #43869) (#43920) 
* fix: calculate tds with net amount when invoice exceeds single threshold amount

(cherry picked from commit ef694a40a1)

* test: add unit test to validate purchase invoice exceeding single threshold value

(cherry picked from commit 94badb464d)

---------

Co-authored-by: venkat102 <venkatesharunachalam659@gmail.com>
 2024-10-30 11:25:56 +05:30