CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-15 16:28:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,924 Commits 416 Branches 1,718 Tags
384d6b516c152bb7e2f72d28a30752b6bd82eb71
Commit Graph

46924 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Devin Slauenwhite
384d6b516c fix: payment entry rounding error 
(cherry picked from commit 3d1e3a9cde)
 2023-11-19 13:17:51 +00:00
Deepesh Garg
13d965276f Merge pull request #38180 from frappe/mergify/bp/version-15-hotfix/pr-38161 
fix: valuation rate in report Item Prices (#38161)
 2023-11-19 18:44:50 +05:30
Deepesh Garg
7be7c6a479 Merge pull request #38173 from frappe/mergify/bp/version-15-hotfix/pr-38142 
feat: Add accounting dimensions to Supplier Quotation (#38142)
 2023-11-19 17:08:04 +05:30
Patrick Eissler
f71234e3af fix: valuation rate in report Item Prices (#38161) 
Co-authored-by: PatrickDenis-stack <77415730+PatrickDenis-stack@users.noreply.github.com>
(cherry picked from commit 32f622ef80)
 2023-11-18 14:55:16 +00:00
Deepesh Garg
3172448c31 chore: Resolve conflicts 2023-11-18 19:58:10 +05:30
Deepesh Garg
7d4ac7e7ff feat: Add accounting dimensions to Supplier Quotation 
(cherry picked from commit 089da459f7)

# Conflicts:
#	erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
 2023-11-18 14:11:38 +00:00
Sagar Vora
d89a9a5bfd Merge pull request #38169 from frappe/mergify/bp/version-15-hotfix/pr-38167 
fix: pass check permission in `render_address` (backport #38167)
 2023-11-18 17:39:49 +05:30
Vishakh Desai
a420e13765 fix: pass check permission in render_address 
(cherry picked from commit 45299fe4b3)
 2023-11-18 12:08:58 +00:00
mergify[bot]
b89a4a7218 feat: add Supplier Delivery Note field in SCR (backport #38127) (#38156) 
feat: add `Supplier Delivery Note` field in SCR

(cherry picked from commit da80e4dbce)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-11-17 22:07:53 +05:30
mergify[bot]
5b7b431dc9 fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (backport #38134) (#38153) 
fix(Timesheet): reset billing hours equal to hours if they exceed actual hours (#38134)

(cherry picked from commit 20c6e9fca2)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2023-11-17 18:25:37 +05:30
mergify[bot]
20e15ebd22 fix: allow regional gl in payment entry for gl preview (#38136) 
fix: allow regional gl in payment entry for gl preview (#38136)

(cherry picked from commit 7e43d7b131)

Co-authored-by: Smit Vora <smitvora203@gmail.com>
 2023-11-17 12:40:18 +05:30
ruthra kumar
a699f8b9de Merge pull request #38139 from frappe/mergify/bp/version-15-hotfix/pr-38119 
fix: add revaluation journal filter in Payable report (backport #38119)
 2023-11-17 10:04:23 +05:30
ruthra kumar
c9674683d1 fix: add revaluation journal filter in Payable report 
(cherry picked from commit 134201794a)
 2023-11-17 10:01:35 +05:30
mergify[bot]
8276614c14 fix: remove ESS role when not mapped to employee (backport #37867) (#38133) 
fix: remove ESS role when not mapped to employee (#37867)

* fix: remove ESS role when not mapped to employee

* fix: emp role removal on unlinking

* fix: test case for user employee role mapping

* fix: mapped employee and user on creation

(cherry picked from commit 56b8d1b927)

Co-authored-by: Dany Robert <danyrt@wahni.com>
 2023-11-16 20:27:35 +05:30
mergify[bot]
ed9cd7c92b fix: bom creator not able to amend / duplicate (backport #38128) (#38129) 
fix: bom creator not able to amend / duplicate  (#38128)

fix: bom creator not able to amend
(cherry picked from commit 2df767f596)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-16 18:53:08 +05:30
Deepesh Garg
d51237195a fix: GL Entries for receiving non CWIP assets using Purchase Receipt (#38123) 
* fix: GL Entries for receiving non CWIP assets using Purchase Receipt

* test: Update tests
 2023-11-16 13:38:10 +05:30
Deepesh Garg
32039d4de1 Merge pull request #38126 from frappe/mergify/bp/version-15-hotfix/pr-38090 
fix(dn): regression from bulk transaction fix (#38090)
 2023-11-16 13:00:44 +05:30
David Arnold
ea43862fcd fix(dn): regression from bulk transaction fix 
(cherry picked from commit 426c245032)
 2023-11-16 07:13:47 +00:00
Ankush Menat
d0a74419b3 ci: change release branch 2023-11-16 12:18:47 +05:30
Deepesh Garg
57dea69185 Merge pull request #38120 from frappe/mergify/bp/version-15-hotfix/pr-38071 
fix: handle partial return against invoices in payment entries (#38071)
 2023-11-16 10:53:56 +05:30
Gursheen Anand
cb4bb5b4ee fix: test total unallocated amount in payment 
(cherry picked from commit 2499675ad1)
 2023-11-16 05:07:00 +00:00
Gursheen Anand
376e09680c test: payment against partial return invoices 
(cherry picked from commit 09f9764bbd)
 2023-11-16 05:07:00 +00:00
Gursheen Anand
22b39ac4b4 fix: reset dr_or_cr for every reference 
(cherry picked from commit a59c942cd4)
 2023-11-16 05:06:59 +00:00
Gursheen Anand
ac61abb2e4 fix: handle partial return against invoices 
(cherry picked from commit 5b446d4575)
 2023-11-16 05:06:59 +00:00
ruthra kumar
d18fd87650 Merge pull request #38118 from frappe/mergify/bp/version-15-hotfix/pr-38038 
refactor: supercharge Bulk actions (backport #38038)
 2023-11-16 10:22:20 +05:30
ruthra kumar
00a62692dc Merge pull request #38117 from frappe/mergify/bp/version-15-hotfix/pr-38082 
refactor: use 'boolean' parameter while fetching FY year (backport #38082)
 2023-11-16 10:07:33 +05:30
ruthra kumar
0134be4915 refactor: raise exception on invalid date 
(cherry picked from commit a393a6b76c)
 2023-11-16 04:22:47 +00:00
ruthra kumar
f28d718732 refactor: update traceback on retry 
(cherry picked from commit a52a1b49af)
 2023-11-16 04:22:47 +00:00
ruthra kumar
df5fcbee71 refactor: support list view filters 
(cherry picked from commit 93295bf25b)
 2023-11-16 04:22:47 +00:00
ruthra kumar
76f3d4a31c chore: resolve linting issue 
(cherry picked from commit 73639db910)
 2023-11-16 04:22:47 +00:00
ruthra kumar
0ec2978ea0 refactor: rollback for retries and UI alerts 
(cherry picked from commit c320288690)
 2023-11-16 04:22:47 +00:00
ruthra kumar
db60e147e0 refactor: barebones retry functionality 
(cherry picked from commit 0aa1636d04)
 2023-11-16 04:22:47 +00:00
ruthra kumar
33f1e709f1 chore: show retried in list view 
(cherry picked from commit 194d70f8a0)
 2023-11-16 04:22:46 +00:00
ruthra kumar
696f8b0ae0 refactor: add basic functionalities 
(cherry picked from commit af35590549)
 2023-11-16 04:22:46 +00:00
ruthra kumar
e68d2e138a feat: virtual parent doctype 
(cherry picked from commit a248b13cc3)
 2023-11-16 04:22:46 +00:00
ruthra kumar
461f7a1a1c chore: make from_doctype readonly 
(cherry picked from commit b0dfc936a1)
 2023-11-16 04:22:46 +00:00
ruthra kumar
6eaf67e700 chore: add indexes 
(cherry picked from commit 73090fa130)
 2023-11-16 04:22:46 +00:00
ruthra kumar
f0a8c83fa8 chore: add list view filters 
(cherry picked from commit ade09bc709)
 2023-11-16 04:22:46 +00:00
ruthra kumar
feb49f23ed refactor: simplify logging logic bulk_transaction 
(cherry picked from commit ebd74a4e5b)
 2023-11-16 04:22:45 +00:00
ruthra kumar
3be8bfe9d8 chore: rearrange fields 
(cherry picked from commit c4f8f3613f)
 2023-11-16 04:22:45 +00:00
ruthra kumar
bf0d8c16ac chore: convert child to normal table 
(cherry picked from commit e5a8ad54e2)
 2023-11-16 04:22:45 +00:00
ruthra kumar
9a9d5775e8 chore: remove 'Bulk Transaction Log' doctype 
(cherry picked from commit 815c616f18)
 2023-11-16 04:22:45 +00:00
ruthra kumar
e2dd414793 refactor: use 'boolean' parameter while fetching FY year 
(cherry picked from commit c31ee8ea33)
 2023-11-16 04:18:34 +00:00
mergify[bot]
8bc871a842 chore: change read only condition of asset quantity field (backport #38111) (#38113) 
chore: change read only condition of asset quantity field (#38111)

chore: change read only condition of asset quantity
(cherry picked from commit 6e0362dee8)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-15 18:01:33 +05:30
mergify[bot]
28e6e5d910 fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (backport #38094) (#38097) 
fix: valuation rate for the subcontracting receipt supplied items with Serial and Batch Bundle (#38094)

fix: valuation rate for the subcontracting receipt supplied items with batch
(cherry picked from commit 3e77c0b564)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-14 21:15:44 +05:30
mergify[bot]
77b1eedcf4 chore: refetch item images on transaction save (backport #38095) (#38099) 
chore: refetch item images on transaction save (#38095)

chore: re fetch item images on transaction save
(cherry picked from commit e93a19ffb5)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-11-14 20:11:19 +05:30
mergify[bot]
a8749977e1 fix: Not able to save subcontracting receipt (#38085) 
fix: Not able to save subcontracting receipt (#38085)

(cherry picked from commit e769e750ec)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-14 15:57:36 +05:30
mergify[bot]
4fdd1ec498 chore: delete comments and unlink attachments on company transactions deletion (backport #38077) (#38079) 
* chore: delete comments and unlink attachments on company transactions deletion

(cherry picked from commit 2f9e96e324)

* fix: unrelated transation date typo

(cherry picked from commit b097bb20d9)

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
 2023-11-13 19:17:00 +05:30
mergify[bot]
6d325a40a1 fix: indentation issue in the Production Plan Summary report (backport #38019) (#38069) 
fix: indentation issue in the Production Plan Summary report (#38019)

fix: Production Plan Summary report
(cherry picked from commit 4a111f7362)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-11-13 14:03:29 +05:30
bVisible
011cf3d73e fix: Identical items are added line by line instead of grouped together in POS (#37986) 
fix: Identical items are added line by line instead of grouped together in POS (#37986)
 2023-11-13 14:01:42 +05:30