nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-18 00:55:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
49,077 Commits 400 Branches 1,700 Tags
71f5470dfdee39322d007e24c2f9b5c60bb6db0b
Commit Graph

49077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nabin Hait
71f5470dfd fix: convert percentage from str to float (#41766) 2024-06-04 15:19:42 +05:30
Nabin Hait
12e48f0b63 fix: link opportunity in prospect after creating opportunity from prospect (#41769) 2024-06-04 15:19:24 +05:30
rohitwaghchaure
cb6d8afa26 fix: incorrect batch selection while sales return (#41768) 2024-06-04 14:34:10 +05:30
rohitwaghchaure
cf508ce1ed fix: TypeError: 'float' object is not iterable (#41758) 2024-06-04 11:58:32 +05:30
Khushi Rawat
a8fc32dc32 fix: incorrect accumulated depr amount in asset depr ledger (#41654) 
* fix: incorrect accumulated depr amount in asset depr ledger

* refactor: depreciation amount retrieval with query builder

* style: apply formatting changes from pre-commit
 2024-06-04 11:44:39 +05:30
Khushi Rawat
60eb03a6c6 fix(minor): corrected wrong filter condition (#41755) 2024-06-04 11:43:15 +05:30
Nabin Hait
80f6228d45 fix: Ignore disabling default currency field while creating new company (#41699) 2024-06-04 11:42:20 +05:30
mergify[bot]
c3ae5bc6a5 fix: get assets received but not billed account only if any asset item is received (backport #41734) (#41750) 
fix: get assets received but not billed account only if any asset item is received (#41734)

fix: get assets received but not billed account only if any asset item received
(cherry picked from commit 39885b2b01)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-06-04 11:22:13 +05:30
mergify[bot]
a2039bae10 fix: set expense account as Assets RBNB only if it is booked in linked PR (backport #41368) (#41733) 
fix: set expense account as Assets RBNB only if it is booked in linked PR (#41368)

* fix: set expense account as Assets RBNB only if it is booked in linked PR

* fix: broken translations

(cherry picked from commit 014486de39)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-06-03 18:36:37 +05:30
Nabin Hait
740c495014 fix(stock settings): Allowed any number in stock frozen upto days field (#41736) 2024-06-03 18:34:57 +05:30
Nabin Hait
9a3569ff15 fix: Use full name instead of abbreviation (#41738) 2024-06-03 18:34:27 +05:30
Nabin Hait
d30c797d24 fix(Company): Allow Equity type account in unrealised exchange gain/loss account (#41740) 2024-06-03 18:33:48 +05:30
ruthra kumar
2be8e0dce0 Merge pull request #41742 from ruthra-kumar/allow_submit_for_repost 
chore: System Manager shluld have  submit permission for repost doctypes
 2024-06-03 17:49:31 +05:30
Nihantra C. Patel
441596f795 fix: payment term when creating PO from SO (#41376) 
* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO

* fix: payment term when creating PO from SO
 2024-06-03 17:45:31 +05:30
ruthra kumar
4558f64c0f chore: Sys Manager shluld have submit permission for repost doctypes 2024-06-03 17:31:27 +05:30
Nihantra C. Patel
4f0214d00e fix: completed DC will not appear in a delivery trip (#41655) 
* fix: completed DC will not appear in a delivery trip

* fix: completed DC will not appear in a delivery trip
 2024-06-03 17:26:14 +05:30
Nihantra C. Patel
3c3313594d fix: correcting balance sheet calculation for zero liabilities and equity (#41497) 
* fix: correcting balance sheet calculation for zero liabilities and equity

* fix: correcting balance sheet calculation for zero liabilities and equity
 2024-06-03 16:05:49 +05:30
Nihantra C. Patel
5a75c847fe fix: Select both account number and company in the account form (#41731) 
* fix: Both the account number and the company should be selected in the account form

* fix: select both account number and company in the account form
 2024-06-03 15:40:07 +05:30
rohitwaghchaure
9e9296e444 feat: track Semi-finished goods (including subcontracted items) against Job Cards (#38341) 
* feat: Track Semi-finished goods (including subcontracted items) against Job Cards

* feat: option to add raw materials manually against operation
 2024-06-02 01:28:58 +05:30
Deepesh Garg
24926ab665 Merge pull request #41717 from deepeshgarg007/jv_transaction_currency_new 
fix: Transaction currency value in Journal Entry
 2024-06-01 20:46:43 +05:30
Deepesh Garg
169d77da54 fix: Transaction currency value in Journal Entry 2024-06-01 19:31:28 +05:30
ruthra kumar
666232fd1c Merge pull request #41658 from rtdany10/pr-transaction-condition 
fix: condition-wise filter for transaction based pricing rule
 2024-06-01 16:18:50 +05:30
rohitwaghchaure
ee846f5950 feat: optional to reconcile all serial nos / batches in stock reconciliation (#41696) 
feat: optional to reconcile all serial/batch
 2024-06-01 15:25:51 +05:30
rohitwaghchaure
4e37ed9033 fix: key error for stock ledger report (#41700) 2024-05-31 11:55:51 +05:30
ruthra kumar
07c421228b Merge pull request #41232 from FHenry/dev_fix_french_chart_of_account 
fix: French chart of account the 4191 code must be of type Income Account
 2024-05-31 10:17:21 +05:30
ruthra kumar
c6c696247a Merge pull request #41629 from blaggacao/payments/pr-1 
test: add payment channel tests
 2024-05-30 20:43:09 +05:30
rohitwaghchaure
968120d0eb fix: batch selection issue (#41692) 2024-05-30 18:06:29 +05:30
rohitwaghchaure
be9f960705 fix: show material to supplier button (#41686) 2024-05-30 14:05:20 +05:30
Dany Robert
3f2343614b fix: test for pricing rule transaction with cond 2024-05-30 05:21:22 +00:00
Nijith anil
388ba7f945 fix: work order created message pops up if no items are selected (#41677) 2024-05-29 23:32:07 +05:30
Deepesh Garg
289d216552 Merge pull request #41676 from deepeshgarg007/account_balace_report 
fix: Filters in account balance report
 2024-05-29 12:48:02 +05:30
Deepesh Garg
1c9fe691ea fix: Filters in account balance report 2024-05-29 12:25:56 +05:30
Deepesh Garg
c41b239881 Merge pull request #41548 from Nihantra-Patel/feat_trends_report 
fix: add include closed orders option in so/po trends report
 2024-05-29 10:31:51 +05:30
Deepesh Garg
9f85483199 Merge pull request #41374 from Nihantra-Patel/no_add_variant_item_dev 
fix: not allow template item in product bundle item
 2024-05-29 10:30:21 +05:30
Deepesh Garg
006b1f553c Merge pull request #40873 from Nihantra-Patel/upd_timesheet_task 
fix: update the task status from timesheet
 2024-05-29 10:00:53 +05:30
Khushi Rawat
6b0ce33030 refactor: renamed number of depreciations booked to opening booked de… (#41515) 
* refactor: renamed number of depreciations booked to opening booked depreciations

* feat: introduced new field for showing total number of booked depreciations
 2024-05-28 20:37:52 +05:30
rohitwaghchaure
ce834f5dba fix: multiple issues related to serial and batch bundle (#41662) 2024-05-28 18:48:09 +05:30
Marica
e3cf53a8b7 feat: Add Party details to Serial No Ledger Report (#41656) 
- Since no party details are present in Serial No anymore, it is hard to get a view of which SN was sold to/purchased from which party
- Add Party fields to report
 2024-05-28 15:28:02 +05:30
Raffael Meyer
d3bdd41358 Merge pull request #41659 from barredterra/auditor-perms 2024-05-27 18:48:50 +02:00
barredterra
eaa4efbc45 fix: allow Auditor to read a Fiscal Year 2024-05-27 17:40:08 +02:00
barredterra
06401cc84f fix: allow Auditor to select a company 2024-05-27 17:39:46 +02:00
Dany Robert
e3fd82766f fix: condition filter for transaction pricing rule 2024-05-27 14:50:28 +00:00
ruthra kumar
537e0e32b2 Merge pull request #40775 from casesolved-co-uk/sa_report 
feat: significant enhancements to sales analytics report to support charts
 2024-05-27 14:31:02 +05:30
ruthra kumar
47bc5691a1 refactor: remove use of can_create for Payment Request (#41647) 2024-05-27 09:57:11 +02:00
ruthra kumar
c5c4d5c61f Merge pull request #41401 from Nihantra-Patel/fix_project_cost_center_filter 
fix: cost center filter according to the company in project
 2024-05-27 10:09:37 +05:30
David
25931c4db2 test: add payment channel tests 2024-05-24 11:08:23 +02:00
rohitwaghchaure
683c1f04c8 fix: Unable to 'Get Suppliers' using tags in Request for Quotation (#41626) 2024-05-24 13:03:57 +05:30
Akhil Narang
b6350c86d1 Merge pull request #41601 from akhilnarang/add-indices 
fix: add in some indices to speed up Purchase Order deletion
 2024-05-24 10:57:04 +05:30
ruthra kumar
fac0fcb9d5 Merge pull request #41443 from cogk/fix-use-get-all-for-advance-status-update 
fix(AccountsController): Use get_all to get payment requests when updating advance payment status
 2024-05-24 10:40:15 +05:30
Akhil Narang
3f06f1905f refactor: use json directly instead of using frappe.json (#41609) 2024-05-23 16:00:42 +02:00