CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-16 16:56:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,674 Commits 416 Branches 1,718 Tags
303ae8321b271aef96f5de61d7bc0ff8b3ee6d80
Commit Graph

49674 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
303ae8321b chore: resolve conflict 2024-10-28 13:33:24 +05:30
ljain112
29aa5d6468 fix: hide payment terms for return and paid purchase invoices 
(cherry picked from commit 912e1e3f3d)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
 2024-10-28 05:55:07 +00:00
ljain112
a826a894f4 fix: do not set payment terms for return invoices 
(cherry picked from commit 8b700eadc7)
 2024-10-28 05:55:07 +00:00
ljain112
9a5604c5bb fix: do not check for payment terms details for return invoices. 
(cherry picked from commit 6703b7d1ae)
 2024-10-28 05:55:07 +00:00
ruthra kumar
b95dfcbce0 Merge pull request #42607 from Abhishek-Chougule/version-15-hotfix 
fix: correct garbage value on Razorpay Payments Page
 2024-10-28 10:07:25 +05:30
ruthra kumar
ed01b4c161 Merge pull request #43857 from frappe/mergify/bp/version-15-hotfix/pr-43833 
refactor: query for expense_account moved to setup hook in purchase invoice (backport #43833)
 2024-10-28 09:53:03 +05:30
ljain112
19db526fdd refactor: query for expense_account moved to setup hook in purchase invoice 
(cherry picked from commit a9ac0cc223)
 2024-10-28 04:14:13 +00:00
Raffael Meyer
11dd1968c7 fix: backport translations from develop (#43849) 2024-10-26 20:25:30 +02:00
mergify[bot]
07aaef2af2 fix(RFQ): make strings translatable (backport #43843) (#43848) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix(RFQ): make strings translatable (#43843)
 2024-10-26 19:43:23 +02:00
mergify[bot]
20478b632f fix: basic rate not editable in Stock Entry Detail (backport #43837) (#43838) 
fix: basic rate not editable in Stock Entry Detail (#43837)

(cherry picked from commit 5a967bc868)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-25 20:21:01 +05:30
ruthra kumar
18f32b8de6 Merge pull request #43831 from frappe/mergify/bp/version-15-hotfix/pr-43830 
fix: set bill_no before `against_voucher` gets concatenated (backport #43830)
 2024-10-25 14:28:36 +05:30
ruthra kumar
81297ce168 fix: set bill_no before against_voucher gets concatenated 
(cherry picked from commit 7bade7f1fe)
 2024-10-25 08:31:43 +00:00
mergify[bot]
bf4fb53575 fix: Unnecessary validation for non deferred sales invoices (#43816) 
fix: Unnecessary validation for non deferred sales invoices (#43816)

(cherry picked from commit af472054f6)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2024-10-24 13:37:57 +05:30
ruthra kumar
a3bf320add Merge pull request #42764 from frappe/mergify/bp/version-15-hotfix/pr-42458 
fix: use company default currency in report (backport #42458)
 2024-10-23 17:33:53 +05:30
ruthra kumar
d0db3b08d7 Merge pull request #43807 from frappe/mergify/bp/version-15-hotfix/pr-43755 
fix: Add Company Filter (backport #43755)
 2024-10-23 17:30:31 +05:30
Nabin Hait
2fb441763a fix: consider gle based on balances in company currency (#43805) 2024-10-23 17:08:52 +05:30
IamSaiyyamChhetri
33fa1e45ad fix: add company filter for project 
- In Project dt Sales Order field
- In Sales Order dt Project field

(cherry picked from commit 9909d760a5)
 2024-10-23 11:21:18 +00:00
Nabin Hait
ced76ca5c0 perf: performance optimizations for accounting reports by refactoring account closing balance and period closing voucher (#43798) 
* fix: Gl Entry form cleanup

* fix: Added indexes in gl entry table

* perf: Refactored period closing voucher to handle large volume of gle

* fix: fixes as per new period start and end date fields in PCV

* perf: performance optimization for  accounting reports

* perf: performance optimizations for account closing balance patch

* fix: test cases

* fix: lenter issues - direct use of sql query

* fix: test cases

* fix: test cases

* fix: test cases

* fix: wrong fieldname

* fix: test cases
 2024-10-23 13:07:16 +05:30
Smit Vora
9c0f17e13d Merge pull request #43788 from frappe/mergify/bp/version-15-hotfix/pr-43769 
fix: mapping purchase receipt from subcontracting receipt is not required (backport #43769)
 2024-10-23 10:36:48 +05:30
mergify[bot]
879b2b778a fix: use correct variable in error message (backport #43790) (#43792) 
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
fix: use correct variable in error message (#43790)
 2024-10-22 19:43:16 +02:00
Smit Vora
12530616a7 Merge pull request #43786 from ljain112/fix-manual-backport 2024-10-22 20:12:53 +05:30
Ninad1306
41db040a60 fix: better implementation, handle missing purchase order 
(cherry picked from commit 66211dafd6)
 2024-10-22 14:42:51 +00:00
Ninad1306
40927c7413 test: auto create purchase receipt 
(cherry picked from commit 59887bbc13)
 2024-10-22 14:42:51 +00:00
Ninad1306
58a3ef7aa6 fix: map doc from purchase order 
(cherry picked from commit 60ceb91ace)
 2024-10-22 14:42:51 +00:00
Smit Vora
9ddf1ccedd Merge pull request #43785 from frappe/mergify/bp/version-15-hotfix/pr-43462 
fix: get stock accounts from the doc in `validate_stock_accounts` in Journal Entry (backport #43462)
 2024-10-22 19:59:31 +05:30
Smit Vora
0495160f81 Merge pull request #43783 from frappe/mergify/bp/version-15-hotfix/pr-43061 
fix: Required Changes to Support e-Waybill Generation for Material Transfer Return (backport #43061)
 2024-10-22 19:59:19 +05:30
ljain112
d2e5b2aa1d fix: only show pay button for specific doctype in portal 2024-10-22 19:49:37 +05:30
Vishakh Desai
39387e9f54 fix: get stock accounts from the doc instead of db in validate_stock_accounts 
(cherry picked from commit 30954586d8)
 2024-10-22 14:07:43 +00:00
Ninad Parikh
2205ae8e54 fix: Required Changes to Support e-Waybill Generation for Material Transfer Return (#43061) 
(cherry picked from commit 004c4e21d4)
 2024-10-22 13:59:31 +00:00
ruthra kumar
29fe23bc0a Merge pull request #43780 from frappe/mergify/bp/version-15-hotfix/pr-43778 
refactor: validate_return_against_account (backport #43778)
 2024-10-22 17:40:39 +05:30
Raffael Meyer
8d97966662 refactor: validate_return_against_account (#43778) 
(cherry picked from commit c4faa0e101)
 2024-10-22 11:51:35 +00:00
ruthra kumar
c99d0535f8 Merge pull request #43777 from frappe/mergify/bp/version-15-hotfix/pr-43775 
fix(deferred_revenue): Escape account in query (backport #43775)
 2024-10-22 16:40:11 +05:30
Corentin Forler
fac27d9dff fix(deferred_revenue): Escape account in query 
(cherry picked from commit c7b3ae41d4)
 2024-10-22 10:42:25 +00:00
Khushi Rawat
0519263882 Merge pull request #43763 from frappe/mergify/bp/version-15-hotfix/pr-43378 
feat: added task assignee email field in asset maintenance log (backport #43378)
 2024-10-22 12:22:39 +05:30
ruthra kumar
71479ad47b Merge pull request #43768 from frappe/mergify/bp/version-15-hotfix/pr-43766 
refactor: allow unreconcile on bank and cash entry type journals (backport #43766)
 2024-10-22 12:13:04 +05:30
ruthra kumar
88f5e3f160 refactor: allow unreconcile on bank and cash entry type journals 
(cherry picked from commit 2c4f37f488)
 2024-10-22 06:36:08 +00:00
ruthra kumar
71837ab400 Merge pull request #43765 from frappe/mergify/bp/version-15-hotfix/pr-43761 
fix: coupon code validation logic (backport #43761)
 2024-10-22 10:33:41 +05:30
ruthra kumar
853ca1fcee chore: resolve conflict 2024-10-22 10:15:28 +05:30
bhaveshkumar.j
50dd8d9df7 fix: remove extra space 
(cherry picked from commit 1561a9e1bf)
 2024-10-22 04:37:49 +00:00
bhaveshkumar.j
aeaadb1e30 fix: coupon code validation logic 
(cherry picked from commit d04257a32d)

# Conflicts:
#	erpnext/accounts/doctype/pricing_rule/utils.py
 2024-10-22 04:37:49 +00:00
Khushi Rawat
2e0cf36901 fix: removed unmerged patches 2024-10-22 02:06:41 +05:30
Khushi Rawat
1d5345abc1 chore: resolved conflicts 2024-10-22 01:23:49 +05:30
Khushi Rawat
0a03076148 chore: resolved conflicts 2024-10-22 01:17:33 +05:30
Khushi Rawat
a3b8f9759d feat: added assignee email field in asset maintenance log 
(cherry picked from commit 5911934dc7)

# Conflicts:
#	erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
#	erpnext/patches.txt
 2024-10-21 19:44:34 +00:00
Shariq Ansari
f51c511bcc Merge pull request #43760 from frappe/mergify/bp/version-15-hotfix/pr-43759 
fix: lead create opp from connection not working (backport #43759)
 2024-10-21 20:41:29 +05:30
Shariq Ansari
9e56f213a3 fix: lead create opp from connection not working 
(cherry picked from commit 0dc518b1c3)
 2024-10-21 14:57:43 +00:00
mergify[bot]
1fa9030aee fix: Workspace link for Work Order Consumed Materials report (backport #43753) (#43754) 
fix: Workspace link for Work Order Consumed Materials report (#43753)

(cherry picked from commit e94ffb87cd)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-10-21 17:15:34 +05:30
ruthra kumar
62226696aa Merge pull request #43742 from frappe/mergify/bp/version-15-hotfix/pr-43726 
fix: "show_remarks" checkbox in Process statement of accounts (backport #43726)
 2024-10-21 13:08:53 +05:30
ruthra kumar
605a30a7e7 Merge pull request #43744 from frappe/mergify/bp/version-15-hotfix/pr-43727 
fix: get period estimate till service end date (backport #43727)
 2024-10-21 13:08:33 +05:30
ruthra kumar
0996aff79d Merge pull request #43746 from frappe/mergify/bp/version-15-hotfix/pr-43720 
fix: party_balance based on company in payment entry (backport #43720)
 2024-10-21 13:08:12 +05:30