nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-31 07:28:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
43,059 Commits 622 Branches 1,804 Tags
5fe2079dcc2251345a7e9f36c30dc113c16fb735
Commit Graph

33145 Commits

Author SHA1 Message Date
Deepesh Garg
5fe2079dcc Merge pull request #32434 from frappe/mergify/bp/version-14-hotfix/pr-32412 
fix: Incorrect TCS amount deducted in Sales Invoice (backport #32412)
 2022-10-01 11:01:28 +05:30
Sagar Sharma
793fa18225 fix: add validation for non-stock item in SCR 
(cherry picked from commit fa2290657a)
 2022-09-30 11:23:50 +00:00
Deepesh Garg
f7ec00ef49 chore: Remove print statements 
(cherry picked from commit bff3cd9068)
 2022-09-30 10:35:58 +00:00
Deepesh Garg
4d51d73797 fix: Incorrect TCS amount deducted in Sales Invoice 
(cherry picked from commit 08443c6421)
 2022-09-30 10:35:57 +00:00
Sagar Sharma
7243089027 Merge pull request #32418 from frappe/mergify/bp/version-14-hotfix/pr-32404 
fix(ux): show `Make Purchase Invoice` button based on permission (backport #32404)
 2022-09-29 17:16:25 +05:30
Sagar Sharma
fd86876a0e fix: show Make Purchase Invoice button based on permission 
(cherry picked from commit 80080a3d7b)
 2022-09-29 09:26:36 +00:00
Rohit Waghchaure
3f0a3b702d test: added test case 
(cherry picked from commit 3656f7d06f)
 2022-09-29 09:22:44 +00:00
Rohit Waghchaure
f167abbbfd fix: searchfields as per customize form not working for Item 
(cherry picked from commit fd889fd29a)
 2022-09-29 09:22:44 +00:00
anandbaburajan
381231257b chore: fix merge conflicts 2022-09-29 11:59:53 +05:30
Anand Baburajan
f4648ed610 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32226 2022-09-28 22:24:03 +05:30
Sagar Sharma
7b11da2373 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32406 2022-09-28 21:44:50 +05:30
Deepesh Garg
097398914e fix: Disbursement Account in patch to update old loans 
(cherry picked from commit be623ce8e8)
 2022-09-28 14:07:00 +00:00
Sagar Sharma
d91ac5e549 fix: supplied items added twice in Stock Entry 
(cherry picked from commit ac7409bbf3)
 2022-09-28 12:20:55 +00:00
anandbaburajan
b3b7650ac8 chore: add blank lines 
(cherry picked from commit c6a7de0e54)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py
 2022-09-28 08:59:43 +00:00
anandbaburajan
86052450a5 fix: fix restore asset value after depreciation 
(cherry picked from commit 43a3400221)
 2022-09-28 08:59:42 +00:00
anandbaburajan
bad3b330f4 fix: refactor asset capitilization 
(cherry picked from commit 5a8b28c194)
 2022-09-28 08:59:42 +00:00
anandbaburajan
671033755f fix: asset tests 
(cherry picked from commit 11ac20e5ee)
 2022-09-28 08:59:41 +00:00
anandbaburajan
f5f13c4611 fix: calculate depreciation properly on asset sale entry and scrap entry 
(cherry picked from commit ff5cad1cd6)

# Conflicts:
#	erpnext/assets/doctype/asset/depreciation.py
 2022-09-28 08:59:41 +00:00
Maharshi Patel
6b55a01834 fix: POS properly validate stock for bundle products 
Stock availability was not calculated properly for Product Bundle with non stock item so i have added logic to properly calculate that as well.

(cherry picked from commit e392ea1104)
 2022-09-28 08:16:23 +00:00
Maharshi Patel
29c4a32c33 fix: POS only validate QTY if is_stock_item 
POS invoice raised " Item not available " validation error even though item is non_stock.

(cherry picked from commit e39e088f18)
 2022-09-28 08:16:22 +00:00
Deepesh Garg
c9c203a5eb Merge pull request #32383 from frappe/mergify/bp/version-14-hotfix/pr-32378 
fix: Add return against indexes for POS Invoice (backport #32378)
 2022-09-28 10:54:44 +05:30
Deepesh Garg
b2f280dee6 fix: Move subscription process to hourly long quque 
(cherry picked from commit 82a2f31ada)
 2022-09-27 18:09:50 +00:00
Deepesh Garg
3abe4a16af fix: Add return against indexes for POS Invoice 
(cherry picked from commit cbfe28286a)
 2022-09-27 16:52:39 +00:00
Deepesh Garg
32ad36ad0f fix: Add return against indexes for POS Invoice 
(cherry picked from commit 1f6205e1ea)
 2022-09-27 16:52:38 +00:00
Sagar Sharma
4a29c7fafb fix: consider overproduction percentage for WO finish button 
(cherry picked from commit 05392e0918)
 2022-09-27 12:15:20 +00:00
Sagar Sharma
4b6e1f4892 fix: For Quantity error msg in Stock Entry 
(cherry picked from commit 9049db41ae)
 2022-09-27 12:15:19 +00:00
mergify[bot]
a28ae4d653 fix: Scrap Asset Accounting Dimensions (backport #31949) (#32376) 
fix: Scrap Asset Accounting Dimensions (#31949)

* fix: Scrap Asset Accounting Dimensions

(cherry picked from commit c760ca2323)

Co-authored-by: Maharshi Patel <39730881+maharshivpatel@users.noreply.github.com>
 2022-09-27 17:07:38 +05:30
Rohit Waghchaure
305eb02bfc fix: allow to return expired batches using purchase return 
(cherry picked from commit a4a86ee23f)
 2022-09-27 08:51:01 +00:00
rohitwaghchaure
1184fa3313 Merge pull request #32365 from frappe/mergify/bp/version-14-hotfix/pr-32339 
fix: opening entry causing discrepancy between stock and trial balance (backport #32339)
 2022-09-27 10:56:04 +05:30
Rohit Waghchaure
2fd0291afb fix: opening entry causing discepancy between stock and trial balance 
(cherry picked from commit bc3ab45af2)
 2022-09-26 15:03:25 +00:00
Dhananjay Palshikar
a83e36b801 Allow Item Templates in Work Order Items 
Item Variants can be a part of the items tables, however, when BOM items are fetched to be a part of the Work Order items, item variants were being filtered out.
The filtering out does not serve a purpose. Having Item variants in BOMs allows for template like behaviour.

(cherry picked from commit 75396c02d2)
 2022-09-26 14:58:05 +00:00
rohitwaghchaure
37d0721f36 Merge pull request #32359 from frappe/mergify/bp/version-14-hotfix/pr-32347 
refactor: rewrite `Incorrect Stock Value Report` queries in `QB` (backport #32347)
 2022-09-26 20:24:58 +05:30
Deepesh Garg
408f2bda82 Merge pull request #32361 from frappe/mergify/bp/version-14-hotfix/pr-32146 
fix: report chart fieldtype (backport #32146)
 2022-09-26 18:36:33 +05:30
Deepesh Garg
ddf4d02c7d Merge pull request #32356 from frappe/mergify/bp/version-14-hotfix/pr-32276 
fix: add some strings to translate function (backport #32276)
 2022-09-26 18:33:32 +05:30
Sagar Sharma
2f5276b794 Merge branch 'version-14-hotfix' into mergify/bp/version-14-hotfix/pr-32347 2022-09-26 18:18:29 +05:30
hendrik
931aa62072 fix: report chart field type 
* fix: report chart field type

Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
(cherry picked from commit f41d1500b0)
 2022-09-26 12:18:17 +00:00
Sagar Sharma
8c6ddb6721 refactor: rewrite Incorrect Stock Value Report queries in QB 
(cherry picked from commit b93331e844)
 2022-09-26 11:40:00 +00:00
Sagar Sharma
f1d774034c refactor: rewrite Item Price Stock Report queries in QB 
(cherry picked from commit 22299d2382)
 2022-09-26 11:39:04 +00:00
Ernesto Ruiz
f5a3f8b486 fix: add translate function to strings 
(cherry picked from commit 94199b7867)
 2022-09-26 11:09:49 +00:00
Ernesto Ruiz
e464de3c5d fix: add translate function to strings 
(cherry picked from commit aa49ec815a)
 2022-09-26 11:09:48 +00:00
Ernesto Ruiz
2eeff8a00b fix: Add strings to translate function 
(cherry picked from commit 9decebe6e1)
 2022-09-26 11:09:48 +00:00
Ernesto Ruiz
a403e729d6 fix: typo on opportunity summary by sales stage report 
(cherry picked from commit c4919cf5ec)
 2022-09-26 11:08:18 +00:00
nishibakabeer
24234d584d fix: total value in all keys 
Gross and net profit report showing wrong values in monthly quarterly and half yearly filters which is the total value
@ruthra-kumar added in develop branch as suggested ( https://github.com/frappe/erpnext/pull/32020)

(cherry picked from commit 6919f389aa)
 2022-09-26 06:03:33 +00:00
ruthra kumar
b3897406b0 fix: difference amount calculation on payment reconciliation 
(cherry picked from commit 122d5f2729)
 2022-09-26 04:57:57 +00:00
Deepesh Garg
0136d58d59 Merge pull request #32334 from frappe/mergify/bp/version-14-hotfix/pr-32117 
fix: Reduce font size for Process Statement of accounts print/pdf (backport #32117)
 2022-09-25 17:21:10 +05:30
Sagar Sharma
21a4556f99 refactor: rewrite Production Planning Report queries in QB 
(cherry picked from commit 8417b9b99c)
 2022-09-23 04:20:22 +00:00
Deepesh Garg
bcfa9b8593 fix: Reduce font size for Process Statement of accounts print/pdf 
(cherry picked from commit 6bfd193b0d)
 2022-09-22 19:39:17 +00:00
Rohit Waghchaure
4e31448e3d fix: item_code key error in production plan 2022-09-22 18:07:20 +05:30
Sagar Sharma
f5c517d08d refactor: rewrite Exponential Smoothing Forecasting queries in QB 2022-09-21 21:31:37 +05:30
Deepesh Garg
8d5131ef8f Merge pull request #32300 from frappe/mergify/bp/version-14-hotfix/pr-32296 
fix: get amount in words for debit note (backport #32296)
 2022-09-21 13:07:25 +05:30