nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-06 23:10:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
45,558 Commits 458 Branches 1,746 Tags
bc0db696c9cae33a2ea8ca105f3f2c32cb7c879c
Commit Graph

45558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
b0234489ca fix: Remove special treatment for P&L Accounts (#35602) 
fix: Remove special treatment for P&L Accounts

(cherry picked from commit 0bd4de4504)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-06-23 15:55:51 +05:30
mergify[bot]
21336f1a2c ci: use multiple python version in patch test (#35846) 
ci: use multiple python version in patch test

(cherry picked from commit 56e81ada56)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-06-23 12:39:47 +05:30
rohitwaghchaure
888118e3e1 Merge pull request #35852 from frappe/mergify/bp/version-14-hotfix/pr-35842 
fix: multiple Work Orders against same production plan (backport #35842)
 2023-06-23 10:34:50 +05:30
Frappe PR Bot
d9008779de chore(release): Bumped to Version 14.27.12 
## [14.27.12](https://github.com/frappe/erpnext/compare/v14.27.11...v14.27.12) (2023-06-23)

### Bug Fixes

* show non-depreciable assets in fixed asset register ([#35858](https://github.com/frappe/erpnext/issues/35858)) ([2240aeb](2240aeb307))
v14.27.12 		2023-06-23 02:55:10 +00:00
Anand Baburajan
c66c4e3aab Merge pull request #35859 from frappe/mergify/bp/version-14/pr-35858 
fix: show non-depreciable assets in fixed asset register (backport #35858)
 2023-06-23 08:22:43 +05:30
Anand Baburajan
2240aeb307 fix: show non-depreciable assets in fixed asset register (#35858) 
fix: show non-depr assets in fixed asset register
(cherry picked from commit 42d09448ee)
 2023-06-23 02:52:01 +00:00
Anand Baburajan
42d09448ee fix: show non-depreciable assets in fixed asset register (#35858) 
fix: show non-depr assets in fixed asset register
 2023-06-23 08:21:32 +05:30
Anand Baburajan
8049582652 Merge pull request #35853 from frappe/mergify/bp/version-14/pr-35851 
chore: asset scrap and restore fixes [v14] (backport #35851)
 2023-06-22 22:46:05 +05:30
Anand Baburajan
1d5415f39d chore: asset scrap and restore fixes [v14] (#35851) 
chore: better err msg on cancelling JE for asset scrap and allow restoring non-depr assets
(cherry picked from commit 69780da099)
 2023-06-22 16:53:00 +00:00
Anand Baburajan
69780da099 chore: asset scrap and restore fixes [v14] (#35851) 
chore: better err msg on cancelling JE for asset scrap and allow restoring non-depr assets
 2023-06-22 22:22:18 +05:30
Rohit Waghchaure
8ddfc34c30 fix: multiple Work Orders agaist same production plan 
(cherry picked from commit 80fffbd64b)
 2023-06-22 16:42:13 +00:00
Anand Baburajan
fb823b53d1 fix: asset capitalization (#35832) 
* fix: misc asset capitalisation fixes

* chore: add location in tests and remove unnecessary code

* chore: more fixes and removals

* chore: show company and fix tests

* chore: make target qty read only on capitalization
 2023-06-22 17:14:24 +05:30
ruthra kumar
23dacbe9b2 Merge pull request #35840 from frappe/mergify/bp/version-14/pr-35837 
refactor: increase precision for current exc rate in Exchange Rate Revaluation (backport #35837)
v14.27.11 		2023-06-22 14:34:52 +05:30
ruthra kumar
0138595000 Merge pull request #35838 from frappe/mergify/bp/version-14-hotfix/pr-35837 
refactor: increase precision for current exc rate in Exchange Rate Revaluation (backport #35837)
 2023-06-22 14:11:58 +05:30
ruthra kumar
f45e8b9c16 refactor: increase precision for current exc rate in ERR 
(cherry picked from commit b4db25dd18)
 2023-06-22 08:37:20 +00:00
ruthra kumar
e44783a3c5 refactor: increase precision for current exc rate in ERR 
(cherry picked from commit b4db25dd18)
 2023-06-22 08:10:41 +00:00
rohitwaghchaure
85ad34672c Merge pull request #35824 from frappe/mergify/bp/version-14-hotfix/pr-35611 
fix: don't allow to make reposting entry for closing stock balance period (backport #35611)
 2023-06-22 12:03:59 +05:30
Frappe PR Bot
71207a7dae chore(release): Bumped to Version 14.27.10 
## [14.27.10](https://github.com/frappe/erpnext/compare/v14.27.9...v14.27.10) (2023-06-22)

### Bug Fixes

* incorrect cost center error in bank reconciliation ([4be554d](4be554d8b4))
* no permission for accounts settings on payment reconciliation ([3194e3a](3194e3a020))
v14.27.10 		2023-06-22 06:26:14 +00:00
ruthra kumar
71e14b3dbb Merge pull request #35835 from frappe/mergify/bp/version-14/pr-35825 
fix: multiple fixes in reconciliation tools (backport #35825)
 2023-06-22 11:54:51 +05:30
ruthra kumar
41f1c11e85 Merge pull request #35834 from frappe/mergify/bp/version-14-hotfix/pr-35825 
fix: multiple fixes in reconciliation tools (backport #35825)
 2023-06-22 11:54:35 +05:30
ruthra kumar
4be554d8b4 fix: incorrect cost center error in bank reconciliation 
(cherry picked from commit 41b9e92868)
 2023-06-22 05:58:00 +00:00
ruthra kumar
3194e3a020 fix: no permission for accounts settings on payment reconciliation 
(cherry picked from commit ad758b8d85)
 2023-06-22 05:58:00 +00:00
ruthra kumar
cacb0f6fde fix: incorrect cost center error in bank reconciliation 
(cherry picked from commit 41b9e92868)
 2023-06-22 05:57:51 +00:00
ruthra kumar
200ddbf66c fix: no permission for accounts settings on payment reconciliation 
(cherry picked from commit ad758b8d85)
 2023-06-22 05:57:51 +00:00
mergify[bot]
20f2bef55f fix: issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry (backport #35821) (#35827) 
Fixes issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry (#35821)

* Fixes issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry

* chore: remove unnecessary line break

* chore: formatting

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit 000ebe4479)

Co-authored-by: saeedkola <mohammedsaeedk@gmail.com>
 2023-06-21 15:37:21 +05:30
Rohit Waghchaure
e68b08817e fix: don't allow to make reposting entry for closing stock balance period 
(cherry picked from commit 96c5c7b1df)
 2023-06-21 08:46:30 +00:00
Frappe PR Bot
2561cf2072 chore(release): Bumped to Version 14.27.9 
## [14.27.9](https://github.com/frappe/erpnext/compare/v14.27.8...v14.27.9) (2023-06-20)

### Bug Fixes

* `Process Loss Report` (backport [#35712](https://github.com/frappe/erpnext/issues/35712)) ([#35719](https://github.com/frappe/erpnext/issues/35719)) ([55a8be5](55a8be5cad))
* add validation for QI in PR (backport [#35677](https://github.com/frappe/erpnext/issues/35677)) ([#35757](https://github.com/frappe/erpnext/issues/35757)) ([59ab13c](59ab13c34f))
* Allocated amount validation for other party types ([#35741](https://github.com/frappe/erpnext/issues/35741)) ([5541d68](5541d68477))
* cannot start / stop jobs ([53ec2a9](53ec2a9268))
* conflicts ([697fcef](697fcef98b))
* consider field precision while setting sle actual_qty ([#35717](https://github.com/frappe/erpnext/issues/35717)) ([3f62e85](3f62e854e5))
* date and finance book fixes in fixed asset register (backport [#35751](https://github.com/frappe/erpnext/issues/35751)) ([#35799](https://github.com/frappe/erpnext/issues/35799)) ([8b57ecd](8b57ecd8ef))
* don't add GL Entry for Acc. Depr. while scrapping non-depreciable assets (backport [#35714](https://github.com/frappe/erpnext/issues/35714)) ([#35715](https://github.com/frappe/erpnext/issues/35715)) ([77b0c5f](77b0c5f722))
* Duplicate addresses are creating while using the E-commerce ([703e4f4](703e4f4f5d))
* fix get outstanding invoices btn and add get outstanding orders btn (backport [#35776](https://github.com/frappe/erpnext/issues/35776)) ([#35787](https://github.com/frappe/erpnext/issues/35787)) ([42e25d4](42e25d4cdf))
* for zero bal accounts, dr/cr only on currency that has balance ([7da461b](7da461b862))
* incorrect gl entries for standalone debit note with update stock ([3355dc2](3355dc2a41))
* incorrect stock value for purchase returned with rejected qty (backport [#35747](https://github.com/frappe/erpnext/issues/35747)) ([#35752](https://github.com/frappe/erpnext/issues/35752)) ([c11d950](c11d950fc5))
* keyerror while checking the stock balance report ([baf014f](baf014fc61))
* loan interest accrual date ([#35695](https://github.com/frappe/erpnext/issues/35695)) ([070df97](070df97663))
* **patch:** enable existing serial no in stock settings ([#35762](https://github.com/frappe/erpnext/issues/35762)) ([3c790c1](3c790c12f2))
* stock error for service item ([2bbea63](2bbea63de1))
* test case ([4af0a9b](4af0a9b192))
* unsupported operand type(s) for //: 'float' and 'NoneType' for POS Barcode search ([#35710](https://github.com/frappe/erpnext/issues/35710)) ([58a6bbc](58a6bbcf6d))
* update `Stock Reconciliation` diff qty while reposting ([bdb5cc8](bdb5cc8ad4))
* **ux:** set route options for new `Batch` ([b261242](b261242792))
* validation of job card in stock entry ([ce2bf5f](ce2bf5fb1c))
* work order serial no issue ([50a8907](50a8907e8c))

### Performance Improvements

* Duplicate queries for UOM (backport [#35744](https://github.com/frappe/erpnext/issues/35744)) ([#35745](https://github.com/frappe/erpnext/issues/35745)) ([632b67c](632b67cbc8))
* duplicate queries while checking prevdoc (backport [#35746](https://github.com/frappe/erpnext/issues/35746)) ([#35749](https://github.com/frappe/erpnext/issues/35749)) ([a0fc8e2](a0fc8e252c))
* Ignore cancelled pick lists while fetching picked items (backport [#35737](https://github.com/frappe/erpnext/issues/35737)) ([#35740](https://github.com/frappe/erpnext/issues/35740)) ([01ac54d](01ac54d65d))
* index `purpose` in `Stock Entry` (backport [#35782](https://github.com/frappe/erpnext/issues/35782)) ([#35783](https://github.com/frappe/erpnext/issues/35783)) ([3bac2a8](3bac2a88bd))
* Index pick list field in stock entry and DN (backport [#35738](https://github.com/frappe/erpnext/issues/35738)) ([#35742](https://github.com/frappe/erpnext/issues/35742)) ([b875de6](b875de6fb7))
* Index sales_order_item in Pick list item (backport [#35735](https://github.com/frappe/erpnext/issues/35735)) ([#35736](https://github.com/frappe/erpnext/issues/35736)) ([0e57f4d](0e57f4dd3c))
v14.27.9 		2023-06-20 16:06:29 +00:00
Deepesh Garg
abbbfe6240 Merge pull request #35807 from frappe/version-14-hotfix 
chore: release v14
 2023-06-20 21:34:30 +05:30
rohitwaghchaure
4e1b2c6f8d Merge branch 'version-14' into version-14-hotfix 2023-06-20 19:41:56 +05:30
rohitwaghchaure
c669dba691 Merge pull request #35813 from frappe/mergify/bp/version-14-hotfix/pr-35810 
fix: stock error for service item (backport #35810)
 2023-06-20 17:49:32 +05:30
rohitwaghchaure
8c183741bd Merge pull request #35812 from frappe/mergify/bp/version-14-hotfix/pr-35809 
fix: key error while checking the stock balance report (backport #35809)
 2023-06-20 17:30:51 +05:30
Rohit Waghchaure
2bbea63de1 fix: stock error for service item 
(cherry picked from commit 32965f1af9)
 2023-06-20 11:51:27 +00:00
Rohit Waghchaure
baf014fc61 fix: keyerror while checking the stock balance report 
(cherry picked from commit a627d2a38c)
 2023-06-20 11:32:06 +00:00
rohitwaghchaure
95e3dc9b81 Merge pull request #35805 from rohitwaghchaure/fixed-address-issue-from-e-cart 
fix: Duplicate addresses are creating while using the E-commerce
 2023-06-20 15:43:58 +05:30
Rohit Waghchaure
703e4f4f5d fix: Duplicate addresses are creating while using the E-commerce 2023-06-20 14:50:40 +05:30
ruthra kumar
bf2ebce6f4 Merge pull request #35803 from frappe/mergify/bp/version-14-hotfix/pr-35794 
fix: Exchange Rate Revaluation should only post on the currency that has balance in a 'zero' balance account (backport #35794)
 2023-06-20 14:49:06 +05:30
ruthra kumar
65d24ea9ea refactor: higher precision for rounding loss and allow '0' 
(cherry picked from commit 6694175a51)
 2023-06-20 14:02:45 +05:30
ruthra kumar
6c9c3426f8 refactor: allow '0' rounding allowance 
(cherry picked from commit 4567474418)
 2023-06-20 14:02:40 +05:30
ruthra kumar
146d41ee81 refactor: allow higher precision for new exchange rate 
(cherry picked from commit 9d04af9ecc)
 2023-06-20 08:29:53 +00:00
ruthra kumar
7da461b862 fix: for zero bal accounts, dr/cr only on currency that has balance 
(cherry picked from commit 1b33afd699)
 2023-06-20 08:29:53 +00:00
mergify[bot]
8b57ecd8ef fix: date and finance book fixes in fixed asset register (backport #35751) (#35799) 
* fix: date and finance book fixes in fixed asset register (#35751)

* fix: handle finance books properly and show all assets by default in fixed asset register

* chore: rename value to depr amount

* chore: get asset value for correct fb properly

* chore: rename include_default_book_entries to include_default_book_assets

(cherry picked from commit 0d12588583)

# Conflicts:
#	erpnext/assets/report/fixed_asset_register/fixed_asset_register.py

* chore: resolving conflicts and renaming entries to assets

---------

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-06-20 12:52:18 +05:30
rohitwaghchaure
7d010adcd4 Merge pull request #35786 from rohitwaghchaure/fixed-work-order-serial-no-issue 
fix: work order serial no issue
 2023-06-20 12:13:17 +05:30
Rohit Waghchaure
4af0a9b192 fix: test case 2023-06-20 11:42:02 +05:30
mergify[bot]
3bac2a88bd perf: index purpose in Stock Entry (backport #35782) (#35783) 
perf: index `purpose` in `Stock Entry`

(cherry picked from commit 4f941ac5c0)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-06-19 22:22:50 +05:30
Rohit Waghchaure
50a8907e8c fix: work order serial no issue 2023-06-19 21:29:34 +05:30
mergify[bot]
42e25d4cdf fix: fix get outstanding invoices btn and add get outstanding orders btn (backport #35776) (#35787) 
fix: fix get outstanding invoices btn and add get outstanding orders btn (#35776)

* fix: fix get outstanding invoices btn and add get outstanding orders btn

* chore: remove unnecessary arg

(cherry picked from commit c1da3ddbbf)

Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
 2023-06-19 20:17:56 +05:30
Frappe PR Bot
4c1befab8f chore(release): Bumped to Version 14.27.8 
## [14.27.8](https://github.com/frappe/erpnext/compare/v14.27.7...v14.27.8) (2023-06-19)

### Bug Fixes

* Allocated amount validation for other party types ([#35741](https://github.com/frappe/erpnext/issues/35741)) ([3bf7115](3bf7115cdc))
v14.27.8 		2023-06-19 11:38:53 +00:00
Deepesh Garg
d928a5c3aa Merge pull request #35774 from frappe/mergify/bp/version-14/pr-35770 
fix: Allocated amount validation for other party types (#35741)
 2023-06-19 17:07:06 +05:30
mergify[bot]
3bf7115cdc fix: Allocated amount validation for other party types (#35741) 
fix: Allocated amount validation for other party types (#35741)

* fix: Allocated amount validation for other party types

* chore: Validation for return allocations

* chore: minor typo

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
(cherry picked from commit 9d27a25e5f)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit 5541d68477)
 2023-06-19 07:22:55 +00:00
mergify[bot]
5541d68477 fix: Allocated amount validation for other party types (#35741) 
fix: Allocated amount validation for other party types (#35741)

* fix: Allocated amount validation for other party types

* chore: Validation for return allocations

* chore: minor typo

---------

Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
(cherry picked from commit 9d27a25e5f)

Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
 2023-06-19 12:52:06 +05:30