CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-20 18:54:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,514 Commits 425 Branches 1,723 Tags
v14.61.4
Commit Graph

46514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Frappe PR Bot
99929e9434 chore(release): Bumped to Version 14.61.4 
## [14.61.4](https://github.com/frappe/erpnext/compare/v14.61.3...v14.61.4) (2024-02-05)

### Bug Fixes

* correctly calculate diff amount for included taxes ([#39655](https://github.com/frappe/erpnext/issues/39655)) ([33ae0fa](33ae0fa2f4))
v14.61.4 		2024-02-05 12:09:13 +00:00
mergify[bot]
33ae0fa2f4 fix: correctly calculate diff amount for included taxes (#39655) 
fix: correctly calculate diff amount for included taxes (#39655)

(cherry picked from commit 772f540bef)
(cherry picked from commit 350b2cdde3)

Co-authored-by: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
 2024-02-05 17:38:00 +05:30
rohitwaghchaure
c284d2ae07 Merge pull request #39690 from frappe/mergify/bp/version-14/pr-39689 
chore: flag for barcode scanner (backport #39689)
 2024-02-02 13:34:29 +05:30
Rohit Waghchaure
57cfce08ef chore: flag for barcode scanner 
(cherry picked from commit f8ca5c5c8b)
 2024-02-02 07:58:38 +00:00
Frappe PR Bot
b7d8bfc58c chore(release): Bumped to Version 14.61.3 
## [14.61.3](https://github.com/frappe/erpnext/compare/v14.61.2...v14.61.3) (2024-01-30)

### Bug Fixes

* Asset Depreciation WDV as per Income Tax Act ([b840eb9](b840eb90eb))
* asset module test cases ([f604798](f604798a45))
* **Batch:** reload doc after splitting ([c759406](c759406ebb))
* default enable closing stock balance (backport [#39551](https://github.com/frappe/erpnext/issues/39551)) ([#39553](https://github.com/frappe/erpnext/issues/39553)) ([1e32c62](1e32c6207e))
* do not auto-populate item delivery date ([1e341f0](1e341f0ff6))
* do not consider rejected warehouses in pick list ([#39539](https://github.com/frappe/erpnext/issues/39539)) ([f6725e4](f6725e4342))
* do not delete batches implicitly ([9a5995a](9a5995a3e5))
* **ecom:** do not create a new contact if a contact already exists ([#39290](https://github.com/frappe/erpnext/issues/39290)) ([47c591c](47c591ccf1))
* email list for auto reorder material request ([780c069](780c069268))
* enqueue JV submission when more than 100 accounts ([66be3c5](66be3c551f))
* fetch correct quantity and amount for grouped asset ([1dacb79](1dacb79441))
* incorrect amount in the material request item (backport [#39567](https://github.com/frappe/erpnext/issues/39567)) ([#39568](https://github.com/frappe/erpnext/issues/39568)) ([c26f7bb](c26f7bbed0))
* linter issue ([941f882](941f8824e5))
* not able to edit / change address from portal ([e3fdb6f](e3fdb6f55c))
* not able to edit address through portal ([b310a55](b310a55727))
* Payment Terms Status for Sales Order report should show all payment terms from order not only this comming from template ([2953959](295395918c))
* perf issue while submitting stock entry (backport [#39634](https://github.com/frappe/erpnext/issues/39634)) ([#39641](https://github.com/frappe/erpnext/issues/39641)) ([3ee0555](3ee0555115))
* prevent extra transfer against inter transfer transaction (backport [#39213](https://github.com/frappe/erpnext/issues/39213)) ([#39595](https://github.com/frappe/erpnext/issues/39595)) ([bf61030](bf61030dab))
* qtn tests using delivery date ([c50988b](c50988b1bc))
* return doc obj after submit ([0472879](04728792f5))
* RM valuation rate in SCR ([#39541](https://github.com/frappe/erpnext/issues/39541)) ([9fd1692](9fd1692db2))
* typo's and parameter changes ([41c074d](41c074d0bb))
v14.61.3 		2024-01-30 14:14:00 +00:00
rohitwaghchaure
378866f429 Merge pull request #39640 from frappe/version-14-hotfix 
chore: release v14
 2024-01-30 19:42:12 +05:30
mergify[bot]
3ee0555115 fix: perf issue while submitting stock entry (backport #39634) (#39641) 
fix: perf issue while submitting stock entry (#39634)

(cherry picked from commit b14886b227)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-30 15:44:03 +05:30
rohitwaghchaure
f6725e4342 fix: do not consider rejected warehouses in pick list (#39539) 
* fix: do not picked rejected materials

* test: test case for pick list without rejected materials
 2024-01-30 11:25:20 +05:30
ruthra kumar
d4bd508b62 Merge pull request #39632 from frappe/mergify/bp/version-14-hotfix/pr-39559 
fix: prevent Return Invoices(Credit/Debit Note) from using a different account  (backport #39559)
 2024-01-30 11:23:39 +05:30
ruthra kumar
0884c5ed83 chore: resolve conflicts 2024-01-30 11:05:24 +05:30
ruthra kumar
9212a74913 test: debit note account mismatch 
(cherry picked from commit bdca718103)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/test_purchase_invoice.py
 2024-01-30 05:31:44 +00:00
ruthra kumar
faeca79c68 test: account mismatch validation 
(cherry picked from commit 8bdc760733)
 2024-01-30 05:31:43 +00:00
ruthra kumar
c5ce4db315 refactor: prevent '{debit/credit}_to' account mismatch 
(cherry picked from commit 6f2fae1b61)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-01-30 05:31:43 +00:00
ruthra kumar
844db3b8d6 Merge pull request #39509 from frappe/mergify/bp/version-14-hotfix/pr-39054 
refactor: provision to filter on dimensions in reconciliation tool (backport #39054)
 2024-01-30 08:20:51 +05:30
ruthra kumar
d0c810accd refactor(test): disable dimensions post test 2024-01-30 06:29:59 +05:30
ruthra kumar
1966ea15ba refactor: pass orders name in a separate criterion 2024-01-30 05:58:26 +05:30
mergify[bot]
d794502681 fix amount not updated when change rate in material request (backport #39606) (backport #39614) (#39621) 
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>
(cherry picked from commit 2389b41f51)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2024-01-29 18:57:40 +05:30
ruthra kumar
c054316127 chore: fix typo and initialize a list 2024-01-29 17:41:56 +05:30
ruthra kumar
ff0daedd52 refactor: convert sql to query builder on Payments query 2024-01-29 17:09:59 +05:30
Gursheen Kaur Anand
50d2381781 Merge pull request #39617 from frappe/mergify/bp/version-14-hotfix/pr-39616 
fix(minor): do not auto-populate item delivery date from qtn (backport #39616)
 2024-01-29 16:56:10 +05:30
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
ruthra kumar
ea779fcad9 refactor: build payment entry query separately 2024-01-29 14:44:16 +05:30
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
Frappe PR Bot
33b21a54f7 chore(release): Bumped to Version 14.61.2 
## [14.61.2](https://github.com/frappe/erpnext/compare/v14.61.1...v14.61.2) (2024-01-27)

### Bug Fixes

* incorrect amount in the material request item (backport [#39567](https://github.com/frappe/erpnext/issues/39567)) (backport [#39568](https://github.com/frappe/erpnext/issues/39568)) ([#39586](https://github.com/frappe/erpnext/issues/39586)) ([e729972](e729972987))
v14.61.2 		2024-01-27 04:43:52 +00:00
mergify[bot]
e729972987 fix: incorrect amount in the material request item (backport #39567) (backport #39568) (#39586) 
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>
(cherry picked from commit c26f7bbed0)

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
 2024-01-27 10:12:37 +05:30
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
ruthra kumar
2c431f394e chore: resolve conflicts 2024-01-24 16:11:14 +05:30
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