CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-16 08:47:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,696 Commits 416 Branches 1,718 Tags
93d0db29100735cca01228ccf943a5abeb772bf9
Commit Graph

49696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
93d0db2910 fix: Calculate gross margin on update of project costing from invoices (backport #43876) (#43900) 
* fix: Calculate gross margin on update of project costing from invoices (#43876)

* fix: Calculate gross margin on update of project costing from invoices

* chore: linter issues

(cherry picked from commit 0bba6442c0)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json

* fix: merge conflict

---------

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-10-29 22:36:39 +05:30
mergify[bot]
cd4746ad2a fix: incorrect value of available_qty_for_consumption in subcontracti… (backport #43836) (#43861) 
fix: incorrect value of available_qty_for_consumption in subcontracti… (#43836)

fix: incorrect value of available_qty_for_consumption in subcontracting receipt
(cherry picked from commit ad6ce09b86)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-29 17:58:40 +05:30
mergify[bot]
e22d0a3406 fix: post account closing balance against pcv closing account (backport #43887) (#43898) 
fix: post account closing balance against pcv closing account (#43887)

(cherry picked from commit 34295d0344)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-10-29 17:25:40 +05:30
ruthra kumar
1755006445 Merge pull request #43897 from frappe/mergify/bp/version-15-hotfix/pr-43856 
fix: add parenttype clause to invoice tax query in sales_register report (backport #43856)
 2024-10-29 16:13:02 +05:30
ruthra kumar
4c9e17fbd3 Merge pull request #43895 from frappe/mergify/bp/version-15-hotfix/pr-43698 
fix: Project name instead of ID in chart (backport #43698)
 2024-10-29 16:12:23 +05:30
mergify[bot]
d06831ea94 fix: do not copy serial numbers from DN to SI (backport #43885) (#43893) 
fix: do not copy serial numbers from DN to SI (#43885)

(cherry picked from commit 0c93bc31a5)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-10-29 15:48:40 +05:30
Imesha Sudasingha
603d2cf77d fix: add parenttype clause to invoice tax query in sales_register report 
(cherry picked from commit e30ab141f4)
 2024-10-29 10:10:41 +00:00
lukas.brandhoff
13557a2c10 refactor: include 'Project Name' in Project summary report 
Keep name field for backwards compatibility

(cherry picked from commit 736d1a1105)
 2024-10-29 09:54:25 +00:00
ruthra kumar
218c51cdcf Merge pull request #43812 from frappe/mergify/bp/version-15-hotfix/pr-43793 
chore(Timesheet): add type hints (backport #43793)
 2024-10-29 14:46:45 +05:30
ruthra kumar
61a11c8f1f Merge pull request #43888 from frappe/mergify/bp/version-15-hotfix/pr-43824 
fix: accounting dimension fieldname (backport #43824)
 2024-10-29 14:35:30 +05:30
ljain112
b21abf4d90 fix: validate fieldname 
(cherry picked from commit ca31a19eb7)
 2024-10-29 08:16:31 +00:00
ljain112
c70282663c fix: scrub "-" from fieldname in accounting dimension 
(cherry picked from commit 023b7b9a60)
 2024-10-29 08:16:31 +00:00
ruthra kumar
87e0d2f7f4 Merge pull request #43882 from frappe/mergify/bp/version-15-hotfix/pr-43803 
feat: add party name in payment request (backport #43803)
 2024-10-29 12:15:48 +05:30
mergify[bot]
8bfc212e26 fix: use period closing voucher object to call get_account_closing_ba… (backport #43880) (#43883) 
fix: use period closing voucher object to call get_account_closing_ba… (#43880)

fix: use period closing voucher object to call get_account_closing_balances method
(cherry picked from commit 99d1c5f342)

Co-authored-by: Venkatesh <47534423+venkat102@users.noreply.github.com>
 2024-10-29 12:08:24 +05:30
ruthra kumar
a937e32989 chore: resolve conflict 2024-10-29 11:55:50 +05:30
RAVIBHARATHI P C
935f2e11e8 feat: add party name in payment request 
(cherry picked from commit 0acb609d97)

# Conflicts:
#	erpnext/accounts/doctype/payment_request/payment_request.py
 2024-10-29 05:48:18 +00:00
ruthra kumar
7202939e0d Merge pull request #40813 from frappe/mergify/bp/version-15-hotfix/pr-40720 
Set default warehouse for pos invoice (backport #40720)
 2024-10-29 10:05:32 +05:30
ruthra kumar
73a8b6a7d7 Merge pull request #43864 from frappe/mergify/bp/version-15-hotfix/pr-43685 
fix: do not check for payment terms details for return invoices. (backport #43685)
 2024-10-28 15:52:45 +05:30
ruthra kumar
303ae8321b chore: resolve conflict 2024-10-28 13:33:24 +05:30
ruthra kumar
d5e1a46588 Merge pull request #43866 from ruthra-kumar/fix_whitespace 
chore: fix whitespace
 2024-10-28 12:10:52 +05:30
ruthra kumar
27108874ea chore: replace whitespace with tab 2024-10-28 11:50:55 +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
Raffael Meyer
cf25f4c579 chore(Timesheet): add type hints (#43793) 
(cherry picked from commit fe1e1b12c3)
 2024-10-23 22:54:04 +00:00
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