nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-12 19:35:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,449 Commits 432 Branches 1,737 Tags
c50988b1bc8b6dbfbec80763e4ecb8a5bb45c38d
Commit Graph

46449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gursheen Anand
c50988b1bc fix: qtn tests using delivery date 
(cherry picked from commit 079cd30b9c)
 2024-01-29 10:22:04 +00:00
Gursheen Anand
1e341f0ff6 fix: do not auto-populate item delivery date 
(cherry picked from commit 49cb11c1f3)
 2024-01-29 10:22:02 +00:00
mergify[bot]
2389b41f51 fix amount not updated when change rate in material request (backport #39606) (#39614) 
fix amount not updated when change rate in material request (#39606)

* fix amount not updated when change rate in material request

* make code consistent

(cherry picked from commit efade9b9ae)

Co-authored-by: Jeffry Suryadharma <41689493+jeffrysurya@users.noreply.github.com>
 2024-01-29 13:36:10 +05:30
Gursheen Kaur Anand
896bba4e4d Merge pull request #39611 from frappe/mergify/bp/version-14-hotfix/pr-39562 
fix: enqueue JV submission when > 100 accounts (backport #39562)
 2024-01-29 12:38:37 +05:30
Gursheen Anand
04728792f5 fix: return doc obj after submit 
(cherry picked from commit fc677811b7)
 2024-01-29 06:10:04 +00:00
Gursheen Anand
66be3c551f fix: enqueue JV submission when more than 100 accounts 
(cherry picked from commit 53b44ccf29)
 2024-01-29 06:10:04 +00:00
Nabin Hait
fbf34439c1 Merge pull request #39565 from frappe/mergify/bp/version-14-hotfix/pr-39489 
fix: fetch correct quantity and amount for grouped asset (backport #39489)
 2024-01-29 11:38:27 +05:30
mergify[bot]
bf61030dab fix: prevent extra transfer against inter transfer transaction (backport #39213) (#39595) 
* fix: prevent extra transfer against inter transfer transaction (#39213)

* fix: prevent extra transfer against inter transfer transaction

* fix: internal transfer dashboard

(cherry picked from commit 8fdc244e16)

# Conflicts:
#	erpnext/controllers/stock_controller.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-27 23:25:04 +05:30
ruthra kumar
bdf5c02d33 Merge pull request #39593 from frappe/mergify/bp/version-14-hotfix/pr-39591 
refactor: Do proper currency conversion on Future Payments column in AR/AP report (backport #39591)
 2024-01-27 13:19:37 +05:30
ruthra kumar
12ac371b22 test: future payment with foreign currency 
(cherry picked from commit 7b37389115)
 2024-01-27 07:23:08 +00:00
ruthra kumar
4626ea79ef refactor: do currency conversion on future amount columns 
(cherry picked from commit 0de4197c88)
 2024-01-27 07:23:08 +00:00
Saqib Ansari
47c591ccf1 fix(ecom): do not create a new contact if a contact already exists (#39290) 2024-01-26 14:25:05 +05:30
Deepesh Garg
169c7f3e05 Merge pull request #39576 from frappe/mergify/bp/version-14-hotfix/pr-39511 
refactor(Sales Invoice): set account and sum for payments (#39511)
 2024-01-26 10:04:37 +05:30
barredterra
a072cfbf3f refactor(Sales Invoice): set account for mode of payment 
(cherry picked from commit 3815f07c33)
 2024-01-26 04:15:10 +00:00
s-aga-r
9fd1692db2 fix: RM valuation rate in SCR (#39541) 2024-01-25 19:08:39 +05:30
mergify[bot]
c26f7bbed0 fix: incorrect amount in the material request item (backport #39567) (#39568) 
fix: incorrect amount in the material request item (#39567)

fix: incoorect amount in the material request
(cherry picked from commit 2bdfdeeb9a)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-25 17:22:15 +05:30
Nabin Hait
1dacb79441 fix: fetch correct quantity and amount for grouped asset 
(cherry picked from commit 06f48c678b)
 2024-01-25 10:51:48 +00:00
Nabin Hait
0d41631ae4 Merge pull request #39453 from nabinhait/asset-depr-income-tax-act 
fix: Asset Depreciation WDV as per Income Tax Act
 2024-01-25 16:06:22 +05:30
ruthra kumar
560af95931 Merge pull request #39497 from frappe/mergify/bp/version-14-hotfix/pr-35330 
refactor: cr/dr note should be standalone even when created from another invoice (backport #35330)
 2024-01-25 13:25:35 +05:30
mergify[bot]
1e32c6207e fix: default enable closing stock balance (backport #39551) (#39553) 
fix: default enable closing stock balance (#39551)

(cherry picked from commit d1fb90edff)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-25 12:51:48 +05:30
rohitwaghchaure
822a5a842b Merge pull request #39548 from rohitwaghchaure/fix-do-not-delete-batch-implicitly 
fix: do not delete batches implicitly
 2024-01-25 12:33:28 +05:30
Rohit Waghchaure
9a5995a3e5 fix: do not delete batches implicitly 2024-01-25 11:58:07 +05:30
Nabin Hait
941f8824e5 fix: linter issue 2024-01-25 11:40:44 +05:30
ruthra kumar
22c13b1b83 Merge pull request #39537 from frappe/mergify/bp/version-14-hotfix/pr-39331 
fix: Payment Terms Status for Sales Order report show all payment terms from orders (not only when there is a payment terms template) (backport #39331)
 2024-01-24 16:33:50 +05:30
Florian HENRY
295395918c fix: Payment Terms Status for Sales Order report should show all payment terms from order not only this comming from template 
(cherry picked from commit 6c8f52b26f)
 2024-01-24 10:42:57 +00:00
rohitwaghchaure
924fc8f0a8 Merge pull request #39530 from frappe/mergify/bp/version-14-hotfix/pr-39525 
fix: email list for auto reorder material request (backport #39525)
 2024-01-24 14:49:18 +05:30
Rohit Waghchaure
780c069268 fix: email list for auto reorder material request 
(cherry picked from commit 764f3422a0)
 2024-01-24 07:07:05 +00:00
rohitwaghchaure
f4123e1863 Merge pull request #39528 from rohitwaghchaure/fixed-not-able-to-edit-change-address 
fix: not able to edit / change address from portal
 2024-01-24 12:19:45 +05:30
rohitwaghchaure
a1559ed0c2 Merge pull request #39526 from frappe/mergify/bp/version-14-hotfix/pr-39521 
fix: not able to edit address through portal (backport #39521)
 2024-01-24 12:16:57 +05:30
Rohit Waghchaure
e3fdb6f55c fix: not able to edit / change address from portal 2024-01-24 12:15:55 +05:30
Rohit Waghchaure
b310a55727 fix: not able to edit address through portal 
(cherry picked from commit b046d980ad)
 2024-01-24 06:20:29 +00:00
Raffael Meyer
16dc8232f2 Merge pull request #39514 from barredterra/refactor-batch-v14 2024-01-23 19:01:53 +01:00
barredterra
dd3b77ae28 refactor(Batch): use const instead of var 2024-01-23 15:08:49 +01:00
barredterra
c759406ebb fix(Batch): reload doc after splitting 
to show updated qty
 2024-01-23 15:08:33 +01:00
ruthra kumar
956f05238a refactor: Payment btn criteria for Cr/Dr notes 
(cherry picked from commit 60eee564bf)
 2024-01-23 06:36:09 +00:00
ruthra kumar
1aeeac4d06 refactor: criteria for Credit Note Issued and Debit Note Issued 
(cherry picked from commit 8f695123cd)
 2024-01-23 06:36:09 +00:00
ruthra kumar
fecab1338e refactor(test): payments to invoice with -ve outstanding 
(cherry picked from commit f6e4ac2b62)
 2024-01-23 06:36:09 +00:00
ruthra kumar
03040c1c7f refactor(test): ledger entries will be against itself 
(cherry picked from commit 0e2fb1188a)
 2024-01-23 06:36:08 +00:00
ruthra kumar
43b40d92e5 refactor(test): return invoice will have -ve outstanding 
(cherry picked from commit b30c1e1abf)
 2024-01-23 06:36:08 +00:00
ruthra kumar
014fcfa611 refactor: remove return_against for cr/dr note filter 
(cherry picked from commit 00878707ae)
 2024-01-23 06:36:08 +00:00
ruthra kumar
0a6af795c4 refactor: cr notes will post for itself 
(cherry picked from commit db76e8a277)
 2024-01-23 06:36:08 +00:00
rohitwaghchaure
5be99295da Merge pull request #39491 from frappe/mergify/bp/version-14-hotfix/pr-39488 
fix: UOM needs to be whole number not being checked in quotations (backport #39488)
 2024-01-23 11:54:47 +05:30
Rohit Waghchaure
55c9cc3f26 fix: UOM needs to be whole number not being checked in quotations 
(cherry picked from commit aaf83da3e9)
 2024-01-22 11:55:27 +00:00
Gursheen Kaur Anand
be56c1838b Merge pull request #39482 from frappe/mergify/bp/version-14-hotfix/pr-39462 
fix: party field in PDF for AP / AR reports (backport #39462)
 2024-01-22 17:06:09 +05:30
Gursheen Anand
a19b41d8c8 fix: party field in pdf html 
(cherry picked from commit b2d9380596)
 2024-01-22 09:51:30 +00:00
Gursheen Kaur Anand
1a46f60633 Merge pull request #39473 from frappe/mergify/bp/version-14-hotfix/pr-39229 
fix: use most reliable section reference per report line (backport #39229)
 2024-01-21 14:23:34 +05:30
David Arnold
3bdff18467 fix: use most reliable section reference per report line 
(cherry picked from commit b5be17c6df)
 2024-01-21 08:14:13 +00:00
Gursheen Kaur Anand
5c1bf1f3fa Merge pull request #39470 from frappe/mergify/bp/version-14-hotfix/pr-39424 
Revert "fix(minor): financial statements period end date" (backport #39424)
 2024-01-20 18:51:59 +05:30
Gursheen Kaur Anand
837fff4533 Revert "fix(minor): financial statements period end date" 
(cherry picked from commit 73625a2622)
 2024-01-20 12:29:22 +00:00
Nabin Hait
f604798a45 fix: asset module test cases 2024-01-19 16:59:52 +05:30