nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-17 08:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
47,385 Commits 401 Branches 1,698 Tags
cd870ee30ca0004e66b094dbc51aa2943cd40a0e
Commit Graph

47385 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rohitwaghchaure
cd870ee30c fix: modified date 
(cherry picked from commit 6827edb2c5)
 2024-01-14 05:57:45 +00:00
rohitwaghchaure
2dc8686a81 fix: modified date was not set 
(cherry picked from commit 566876ae7a)
 2024-01-14 05:57:44 +00:00
mahsem
6bdf944ecf Update purchase_taxes_and_charges.json label Rate to Tax Rate 
Change Rate label to existing Tax Rate label so it can be correctly translated in other languages

(cherry picked from commit bd464197c4)
 2024-01-14 05:57:44 +00:00
rohitwaghchaure
9842fb5b64 Merge pull request #39361 from frappe/mergify/bp/version-15-hotfix/pr-39225 
Update sales_taxes_and_charges.json (backport #39225)
 2024-01-14 11:24:20 +05:30
rohitwaghchaure
c548c57207 Merge pull request #39365 from frappe/mergify/bp/version-15-hotfix/pr-39359 
fix: added item group in stock reco (backport #39359)
 2024-01-14 11:24:00 +05:30
rohitwaghchaure
cb326ac0db Merge pull request #39362 from rohitwaghchaure/fixed-closing-stock-balance-field-issue 
chore: removed extra field
 2024-01-14 10:44:47 +05:30
rohitwaghchaure
f0480173fb fix: modified date 2024-01-14 10:43:34 +05:30
Rohit Waghchaure
eec6c25f9e fix: added item group in stock reco 
(cherry picked from commit 116ff8241c)
 2024-01-14 04:58:42 +00:00
Rohit Waghchaure
bf4e514cde chore: removed extra field 2024-01-14 10:21:38 +05:30
rohitwaghchaure
61595c7ede fix: modified date was not updated 
(cherry picked from commit f567af49a6)
 2024-01-14 04:46:29 +00:00
mahsem
d510b46f13 Update sales_taxes_and_charges.json 
Change Rate label to existing Tax Rate label so it can be correctly translated in other languages

(cherry picked from commit 2b93be1139)
 2024-01-14 04:46:29 +00:00
rohitwaghchaure
15e116375b Merge pull request #39325 from frappe/mergify/bp/version-15-hotfix/pr-39305 
fix: naming series variable parsing for FY (backport #39305)
 2024-01-14 09:39:06 +05:30
rohitwaghchaure
832aa5f5ab Merge pull request #39348 from frappe/mergify/bp/version-15-hotfix/pr-39335 
fix: SBB Total Qty validation for SE (backport #39335)
 2024-01-12 21:19:26 +05:30
s-aga-r
ca18853785 fix: SBB Total Qty validation for SE 
(cherry picked from commit c20241fcb5)
 2024-01-12 15:30:36 +00:00
rohitwaghchaure
049864e7a2 Merge pull request #39342 from frappe/mergify/bp/version-15-hotfix/pr-38970 
fix: use local attribute range in multiple item variant dialog (backport #38970)
 2024-01-12 20:57:14 +05:30
rohitwaghchaure
62db0d77ca Merge pull request #39345 from frappe/mergify/bp/version-15-hotfix/pr-39333 
fix: added indexing to improve performance (backport #39333)
 2024-01-12 20:55:57 +05:30
Rohit Waghchaure
50fe4191d3 fix: added indexing to improve performance 
(cherry picked from commit ac81323fec)
 2024-01-12 13:10:47 +00:00
Gursheen Anand
04c96ddc6c fix: use child table values instead of global min max 
(cherry picked from commit 43fed29514)
 2024-01-12 13:08:31 +00:00
mergify[bot]
d7840559a0 chore: remove share, print and email permissions from Buying Settings (backport #39337) (#39339) 
chore: remove share, print and email permissions from Buying Settings

(cherry picked from commit 3c46abca6c)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2024-01-12 16:49:00 +05:30
Raffael Meyer
6f06313023 Merge pull request #39327 from frappe/mergify/bp/version-15-hotfix/pr-39117 
fix: consider all years in holiday list (backport #39117)
 2024-01-11 15:04:29 +01:00
barredterra
8a84f8a465 test: improve test for local holidays 
(cherry picked from commit 60329ade9e)
 2024-01-11 13:29:01 +00:00
barredterra
21eed78fa1 fix: consider all years in holiday list 
(cherry picked from commit 300aaa39fe)
 2024-01-11 13:29:00 +00:00
Gursheen Anand
e6f3a14289 fix: reset default after test 
(cherry picked from commit 813b7a96fb)
 2024-01-11 13:27:13 +00:00
Gursheen Anand
2beb3f8718 test: naming series variable parsing 
(cherry picked from commit bbdf98a8f0)
 2024-01-11 13:27:06 +00:00
Gursheen Anand
9aae439b1f fix: date in master document for dictionary condition 
(cherry picked from commit d96a777edd)
 2024-01-11 13:27:02 +00:00
Nabin Hait
b748095589 Merge pull request #39220 from frappe/mergify/bp/version-15-hotfix/pr-39202 
fix: parse naming series with FY name (backport #39202)
 2024-01-11 18:24:34 +05:30
ruthra kumar
7bd2acdef1 Merge pull request #39323 from frappe/mergify/bp/version-15-hotfix/pr-39212 
fix: project filters on Delivery Note and Sales Order (backport #39212)
 2024-01-11 18:07:12 +05:30
ruthra kumar
a51f956f3e fix: project filters on Delivery Note and Sales Order 
(cherry picked from commit 9ba6ff67d5)
 2024-01-11 12:34:43 +00:00
ruthra kumar
494c26e48a Merge pull request #39319 from frappe/mergify/bp/version-15-hotfix/pr-39317 
fix: broken dimension filters in Sales/Purchase register (backport #39317)
 2024-01-11 17:12:35 +05:30
Deepesh Garg
da7b2febe0 Merge pull request #39295 from frappe/mergify/bp/version-15-hotfix/pr-39256 
fix: Ignore default payment terms template for opening invoices (#39256)
 2024-01-11 17:06:53 +05:30
ruthra kumar
04037b7e38 fix: broken dimension filters in Sales/Purchase register 
(cherry picked from commit 7b3f9386d7)
 2024-01-11 11:20:43 +00:00
rohitwaghchaure
484db65797 Merge pull request #39315 from frappe/mergify/bp/version-15-hotfix/pr-39215 
fix: incorrect percentage received in purchase invoice (backport #39215)
 2024-01-11 15:14:44 +05:30
rohitwaghchaure
3f4cf15def Merge pull request #39312 from frappe/mergify/bp/version-15-hotfix/pr-39299 
fix: circular dependency error on deletion of QC and Stock Entry (backport #39299)
 2024-01-11 15:14:34 +05:30
Rohit Waghchaure
758b9b8a81 fix: incorrect percentage received in purchase invoice 
(cherry picked from commit 8d2c78867e)
 2024-01-11 09:21:41 +00:00
Rohit Waghchaure
7ca8e49b38 fix: circular dependency error while deleting QC 
(cherry picked from commit 7cc324e31e)
 2024-01-11 09:20:42 +00:00
mergify[bot]
d882305c72 fix: performance issue related to stock entry (backport #39301) (#39303) 
fix: performance issue related to stock entry (#39301)

(cherry picked from commit c67b0a3a64)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-10 22:18:16 +05:30
Deepesh Garg
5dc2e80987 fix: Ignore default payment terms template for opening invoices 
(cherry picked from commit 53bf44d2b8)
 2024-01-10 10:37:45 +00:00
mergify[bot]
2598f8e7ec fix: Show timesheet table after fetching data from timesheet (backport #39275) (#39281) 
fix: Show timesheet table after fetching data from timesheet

(cherry picked from commit e1ba5878a3)

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2024-01-10 12:33:24 +05:30
mergify[bot]
fe973a4b53 fix: set parent doctype on chart (backport #39286) (#39288) 
fix: set parent doctype on chart (#39286)

(cherry picked from commit 38c5ecf007)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-01-10 12:27:16 +05:30
Nabin Hait
f82125144a Merge pull request #39190 from frappe/mergify/bp/version-15-hotfix/pr-39163 
fix: Purchase information is not required for creating a composite asset (backport #39163)
 2024-01-10 12:15:02 +05:30
Nabin Hait
38c1350018 Merge pull request #39279 from frappe/mergify/bp/version-15-hotfix/pr-39191 
fix: Ignore asset qty and status validation while cancelling LCV (backport #39191)
 2024-01-10 12:14:45 +05:30
Nabin Hait
24cfcf36e4 Merge pull request #39276 from frappe/mergify/bp/version-15-hotfix/pr-39238 
fix: Set asset purchase amount based on qty and valuation_rate (backport #39238)
 2024-01-10 12:14:10 +05:30
Nabin Hait
0c0be03e90 Merge pull request #39218 from frappe/mergify/bp/version-15-hotfix/pr-39214 
fix: Show maintain-stock and is-fixed-asset checkbox in item quick entry dialog (backport #39214)
 2024-01-10 12:12:32 +05:30
ruthra kumar
cd57bbc3d0 Merge pull request #39284 from frappe/mergify/bp/version-15-hotfix/pr-39282 
fix: possible typeerror on transaction.js (backport #39282)
 2024-01-10 12:00:43 +05:30
Nabin Hait
afefae08af fix: Resolved conflict 2024-01-10 11:59:54 +05:30
ruthra kumar
fec892c211 fix: possible typeerror on transaction.js 
(cherry picked from commit 9f27ac142b)
 2024-01-10 06:24:46 +00:00
Nabin Hait
87d1b0f476 fix: Ignore asset qty and status validation while cancelling LCV 
(cherry picked from commit e9d36242ce)
 2024-01-10 06:04:19 +00:00
Nabin Hait
f0070b4046 fix: Set asset purchase amount based on qty and valuation_rate 
(cherry picked from commit 135e19d0aa)
 2024-01-10 06:03:01 +00:00
mergify[bot]
5d6bc96375 fix: projects website list visible for guests and all logged in customers (backport #39164) (#39273) 
fix: projects website list visible for guests and all logged in customers (#39164)

* fix: projects website list visible for guests

fix: projects website list visible for guests and all logged in customers

see the issue for details

fixes issue #39009

* fix: remove user = frappe.session.user

(cherry picked from commit eabf706f37)

Co-authored-by: 0xD0M1M0 <76812428+0xD0M1M0@users.noreply.github.com>
 2024-01-10 10:45:45 +05:30
Raffael Meyer
4fa978ef1f test: fix wrong fieldname (#39270) 2024-01-10 10:32:01 +05:30