CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-03-17 09:17:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,820 Commits 421 Branches 1,718 Tags
aa7c00135fb2198b6d021eb0a2cfae3b57879c2a
Commit Graph

46820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
aa7c00135f Merge pull request #40443 from frappe/version-14-hotfix 
chore: release v14
 2024-03-14 11:30:17 +05:30
ruthra kumar
8500f9dad1 Merge pull request #40446 from frappe/mergify/copy/version-14-hotfix/pr-40445 
fix: flaky Accounts Receivable test case (copy #40445)
 2024-03-14 09:16:33 +05:30
ruthra kumar
5fe200bc4d fix(test): manually filter rows and assert 2024-03-14 08:54:41 +05:30
ruthra kumar
41bda583e8 fix: flaky Accounts Receivable test case 
(cherry picked from commit 40bce240bde508801d07b9c38ededea5b4f297c8)
 2024-03-13 16:33:46 +00:00
mergify[bot]
fe54590af7 fix: incorrect gross profit on the quotation (backport #40438) (#40441) 
fix: incorrect gross profit on the quotation (#40438)

(cherry picked from commit f4a945aee4)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-13 21:55:26 +05:30
Nabin Hait
fa55cc68f8 Merge pull request #40263 from nabinhait/pi-optimization 
perf: Performance optmization for Purchase Invoice submission
 2024-03-13 18:17:41 +05:30
ruthra kumar
fa0a60c5d9 Merge pull request #40426 from frappe/mergify/bp/version-14-hotfix/pr-40372 
refactor: checkbox to toggle standalone Credit/Debit note behaviour (backport #40372)
 2024-03-13 16:28:38 +05:30
Nabin Hait
c1428a5655 Merge pull request #40246 from nabinhait/depreciation-asset-sale 
fix: Book depreciation until the asset disposal date and removed unwanted commits
 2024-03-13 13:17:18 +05:30
Nabin Hait
43a6a00912 Merge pull request #40125 from nabinhait/document-modified-error 
fix: Reload document on cancel to avoid document modified error
 2024-03-13 13:17:05 +05:30
ruthra kumar
5d178d2e24 refactor: pass 'name' to get_link_to_form 2024-03-13 13:16:56 +05:30
Nabin Hait
b5f0576a1b Merge pull request #40122 from nabinhait/remove-capitalized-in 
fix: Patch to remove cancelled asset capitalization from asset
 2024-03-13 13:16:29 +05:30
Nabin Hait
b07769d8d7 perf: Caching in gl entry 2024-03-13 13:02:51 +05:30
Nabin Hait
8d682fa884 perf: Caching in checking allowance for qty and amount 2024-03-13 13:00:10 +05:30
Nabin Hait
d279e23623 fix: added index for price_list column in Item Price 2024-03-13 12:58:13 +05:30
Nabin Hait
6ff9e6ee84 perf: Get bin details only for stock items 2024-03-13 12:57:33 +05:30
Nabin Hait
c15b2d5490 perf: validate expense against budget only if budget exists 2024-03-13 12:56:28 +05:30
Nabin Hait
49c74369a5 perf: refactored handling provisional gl entries for non-stock items 2024-03-13 12:54:13 +05:30
ruthra kumar
92ccef0ebc chore: resolve conflicts 2024-03-13 12:14:33 +05:30
ruthra kumar
ae6d1c14cb chore: better popup message 
(cherry picked from commit 445d2acf50)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-03-13 06:12:45 +00:00
ruthra kumar
b746493830 test: cr note flag to update self 
(cherry picked from commit ce3b1f09f5)
 2024-03-13 06:12:44 +00:00
ruthra kumar
34053ec590 refactor: make AR/AP report aware of always standalone cr/dr notes 
(cherry picked from commit 4d0c2d8e82)
 2024-03-13 06:12:44 +00:00
ruthra kumar
adbc20736e chore: patch for updating flag in Cr/Dr notes 
(cherry picked from commit 849f478894)
 2024-03-13 06:12:44 +00:00
ruthra kumar
d1e3b2ab6e refactor: post ledger entries based on toggle 
(cherry picked from commit 77aac6f571)
 2024-03-13 06:12:44 +00:00
ruthra kumar
6d5e595440 refactor: checkbox in purchase invoice 
(cherry picked from commit 767f2157e6)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
#	erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py
 2024-03-13 06:12:43 +00:00
ruthra kumar
1ddb162ef1 chore: update popup message 
(cherry picked from commit adf13a19c4)

# Conflicts:
#	erpnext/controllers/accounts_controller.py
 2024-03-13 06:12:43 +00:00
ruthra kumar
4d6b56e55b refactor: checkbox to toggle always standalone credit note 
(cherry picked from commit 2cefe2a20e)

# Conflicts:
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.json
#	erpnext/accounts/doctype/sales_invoice/sales_invoice.py
 2024-03-13 06:12:43 +00:00
Frappe PR Bot
fa5a19b548 chore(release): Bumped to Version 14.65.1 
## [14.65.1](https://github.com/frappe/erpnext/compare/v14.65.0...v14.65.1) (2024-03-12)

### Bug Fixes

* barcode field on line item not working (backport [#40381](https://github.com/frappe/erpnext/issues/40381)) ([#40383](https://github.com/frappe/erpnext/issues/40383)) ([80df609](80df6094e3))
* conditionally apply `is_group` filter in accounting dimension query (backport [#40414](https://github.com/frappe/erpnext/issues/40414)) ([#40415](https://github.com/frappe/erpnext/issues/40415)) ([cd40038](cd40038b18))
* error message wording ([#40403](https://github.com/frappe/erpnext/issues/40403)) ([7402303](74023035af))
* Filter for projects in Sales Cycle ([8d63d19](8d63d19d45))
* get_user_default_as_list args order ([e0d1b4b](e0d1b4b15f))
* incorrect work order status (backport [#40407](https://github.com/frappe/erpnext/issues/40407)) ([#40410](https://github.com/frappe/erpnext/issues/40410)) ([c413b04](c413b04539))
* load ignored doctype and include Mode of Payment Account ([#40334](https://github.com/frappe/erpnext/issues/40334)) ([411157c](411157c258))
* message for subscription when no current inv ([e9c2f6d](e9c2f6d6f1))
* MR Default Supplier search query (backport [#40273](https://github.com/frappe/erpnext/issues/40273)) ([#40350](https://github.com/frappe/erpnext/issues/40350)) ([c6fe409](c6fe409b56))
* qc created for raw materials during manufacture entry (backport [#40408](https://github.com/frappe/erpnext/issues/40408)) ([#40412](https://github.com/frappe/erpnext/issues/40412)) ([21b57d9](21b57d9aef))
* recursion issue while submitting work order (backport [#40400](https://github.com/frappe/erpnext/issues/40400)) ([#40401](https://github.com/frappe/erpnext/issues/40401)) ([06e3874](06e38749bc))
* Sender email in process statements of accounts ([ea605e7](ea605e76a3))
* **Shipment Parcel:** make length, width and height non-mandatory ([911a582](911a582941))
* subcontracting receipt -> alllow to change Batch / Serial Nos (v14) ([#40371](https://github.com/frappe/erpnext/issues/40371)) ([ffd04b3](ffd04b3960))
* UAE tax computation fix ([02cd8c4](02cd8c4b98))
v14.65.1 		2024-03-12 16:42:45 +00:00
Deepesh Garg
c24af0eb40 Merge pull request #40396 from frappe/version-14-hotfix 
chore: release v14
 2024-03-12 22:11:31 +05:30
mergify[bot]
cd40038b18 fix: conditionally apply is_group filter in accounting dimension query (backport #40414) (#40415) 
fix: conditionally apply `is_group` filter in accounting dimension query (#40414)

(cherry picked from commit daf4ae2a6b)

Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>
 2024-03-12 20:45:43 +05:30
Raffael Meyer
3dd4514478 Merge pull request #40405 from frappe/mergify/bp/version-14-hotfix/pr-40403 
fix: error message wording (backport #40403)
 2024-03-12 14:33:59 +01:00
mergify[bot]
c413b04539 fix: incorrect work order status (backport #40407) (#40410) 
fix: incorrect work order status (#40407)

(cherry picked from commit 948297692e)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 18:34:35 +05:30
mergify[bot]
21b57d9aef fix: qc created for raw materials during manufacture entry (backport #40408) (#40412) 
fix: qc created for raw materials during manufacture entry (#40408)

(cherry picked from commit f8a1a7f515)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 18:29:21 +05:30
Raffael Meyer
05e4517094 chore: resolve conflicts 2024-03-12 12:35:17 +01:00
Raffael Meyer
74023035af fix: error message wording (#40403) 
(cherry picked from commit 79a0473705)

# Conflicts:
#	erpnext/accounts/doctype/subscription/subscription.py
 2024-03-12 11:26:23 +00:00
mergify[bot]
06e38749bc fix: recursion issue while submitting work order (backport #40400) (#40401) 
* fix: recursion issue while submitting work order (#40400)

(cherry picked from commit 72614bb8ff)

# Conflicts:
#	erpnext/manufacturing/doctype/job_card/job_card.py

* chore: fix conflicts

---------

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 16:53:48 +05:30
mergify[bot]
80df6094e3 fix: barcode field on line item not working (backport #40381) (#40383) 
fix: barcode field on line item not working (#40381)

(cherry picked from commit 0da19a40a7)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-03-12 13:49:08 +05:30
Nabin Hait
34c3e75d5c fix: convert str to date 2024-03-12 12:16:41 +05:30
Nabin Hait
ac0dd5083f fix: linter issues 2024-03-12 12:10:55 +05:30
Nabin Hait
668a93128b fix: linter issues 2024-03-12 12:02:23 +05:30
Nabin Hait
5fcf8c588a fix: Book depreciation until the asset disposal date and removed unwanted commits 2024-03-12 11:56:47 +05:30
rohitwaghchaure
ffd04b3960 fix: subcontracting receipt -> alllow to change Batch / Serial Nos (v14) (#40371) 
fix: subcontracting receipt -> alllow to change Batch / Serial Nos
 2024-03-11 16:42:13 +05:30
mergify[bot]
c6fe409b56 fix: MR Default Supplier search query (backport #40273) (#40350) 
fix: MR Default Supplier search query

(cherry picked from commit c0a1f298a1)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-03-11 11:07:48 +05:30
Ankush Menat
6b88cca9ad Merge pull request #40367 from ankush/mergify/bp/version-14-hotfix/pr-40206 
style: format js code
 2024-03-11 11:07:06 +05:30
Ankush Menat
4c629d31c6 style: format js files 2024-03-11 11:03:58 +05:30
barredterra
c46be27e9e ci: add prettier to pre-commit 
(cherry picked from commit 2c16036ef3)
 2024-03-11 11:03:56 +05:30
Deepesh Garg
2e45a3f491 Merge pull request #40363 from frappe/mergify/bp/version-14-hotfix/pr-40344 
fix: get_user_default_as_list args order (#40344)
 2024-03-10 22:32:29 +05:30
Deepesh Garg
3bea2d4d1d Merge pull request #40357 from frappe/mergify/bp/version-14-hotfix/pr-40323 
fix: Filter for projects in Sales Cycle (#40323)
 2024-03-10 22:32:11 +05:30
Devin Slauenwhite
e0d1b4b15f fix: get_user_default_as_list args order 
(cherry picked from commit ac1961b687)
 2024-03-10 15:45:31 +00:00
Deepesh Garg
306e76874d Merge pull request #40359 from frappe/mergify/bp/version-14-hotfix/pr-40325 
fix: Sender email in process statements of accounts (#40325)
 2024-03-10 19:57:28 +05:30
Deepesh Garg
407f0b929e Merge pull request #40009 from govindsmenokee/patch-12 
fix: UAE tax computation fix
 2024-03-10 19:55:39 +05:30