nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-15 23:54:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
46,371 Commits 397 Branches 1,698 Tags
9550ed84c01b434f437db28efdfd14ef21e56a26
Commit Graph

46371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ruthra kumar
9550ed84c0 Merge pull request #39105 from frappe/mergify/bp/version-14-hotfix/pr-39097 
refactor: flag to control loyalty point creation at invoice level (backport #39097)
 2024-01-15 09:59:30 +05:30
rohitwaghchaure
55e790cd2f Merge pull request #39368 from frappe/mergify/bp/version-14-hotfix/pr-39224 
Update purchase_taxes_and_charges.json label Rate to Tax Rate (backport #39224)
 2024-01-14 11:59:59 +05:30
rohitwaghchaure
e9d2437c7a fix: modified date 
(cherry picked from commit 6827edb2c5)
 2024-01-14 05:57:43 +00:00
rohitwaghchaure
724c934fbb fix: modified date was not set 
(cherry picked from commit 566876ae7a)
 2024-01-14 05:57:43 +00:00
mahsem
e9af0c6e67 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:42 +00:00
rohitwaghchaure
e0d12a9b98 Merge pull request #39360 from frappe/mergify/bp/version-14-hotfix/pr-39225 
Update sales_taxes_and_charges.json (backport #39225)
 2024-01-14 11:24:33 +05:30
rohitwaghchaure
2cc756be57 Merge pull request #39364 from frappe/mergify/bp/version-14-hotfix/pr-39359 
fix: added item group in stock reco (backport #39359)
 2024-01-14 11:24:08 +05:30
rohitwaghchaure
28434d101b fix: modified date 2024-01-14 10:44:18 +05:30
rohitwaghchaure
4d11a9c884 chore: fix conflicts 2024-01-14 10:32:10 +05:30
Rohit Waghchaure
c69a59c3c6 fix: added item group in stock reco 
(cherry picked from commit 116ff8241c)

# Conflicts:
#	erpnext/stock/doctype/stock_reconciliation_item/stock_reconciliation_item.json
 2024-01-14 04:58:27 +00:00
rohitwaghchaure
cb6757437e fix: modified date was not updated 
(cherry picked from commit f567af49a6)
 2024-01-14 04:46:29 +00:00
mahsem
664abc6287 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
Deepesh Garg
cc6b6e1653 Merge pull request #39328 from frappe/mergify/bp/version-14-hotfix/pr-38974 
fix: unreconcile Bank Transaction on cancel of payment voucher (#38974)
 2024-01-14 10:14:46 +05:30
rohitwaghchaure
4815655a6b Merge pull request #39324 from frappe/mergify/bp/version-14-hotfix/pr-39305 
fix: naming series variable parsing for FY (backport #39305)
 2024-01-14 10:12:00 +05:30
rohitwaghchaure
5981b0e4c4 Merge pull request #39098 from RJPvT/patch-5 
fix: wrong file name
 2024-01-14 10:07:54 +05:30
rohitwaghchaure
bbee70aea5 Merge pull request #39357 from RJPvT/patch-7 
fix: empty category in Plaid
 2024-01-14 09:42:55 +05:30
rohitwaghchaure
5336cd49c9 chore: fix conflicts 2024-01-14 09:41:48 +05:30
RJPvT
1acaa20ee1 fix: empty category in Plaid 2024-01-13 16:09:11 +01:00
rohitwaghchaure
a7922e1ef1 Merge pull request #39341 from rohitwaghchaure/fixed-recalculate-current-qty-for-serial-nos 
fix: incorrect active serial nos due to backdated transactions
 2024-01-13 12:25:07 +05:30
Rohit Waghchaure
1a26c70df2 fix: incorrect active serial nos due to backdated transactions 2024-01-13 10:10:02 +05:30
rohitwaghchaure
519bed9b0f Merge pull request #39344 from frappe/mergify/bp/version-14-hotfix/pr-39333 
fix: added indexing to improve performance (backport #39333)
 2024-01-12 21:19:37 +05:30
rohitwaghchaure
f1e4beb55a Merge pull request #39343 from frappe/mergify/bp/version-14-hotfix/pr-38970 
fix: use local attribute range in multiple item variant dialog (backport #38970)
 2024-01-12 20:57:06 +05:30
rohitwaghchaure
c2fee6c25d chore: fix conflicts 2024-01-12 20:56:40 +05:30
Rohit Waghchaure
d9f7070f92 fix: added indexing to improve performance 
(cherry picked from commit ac81323fec)

# Conflicts:
#	erpnext/stock/doctype/stock_entry_detail/stock_entry_detail.py
 2024-01-12 13:10:33 +00:00
Gursheen Anand
d21fc6055c fix: use child table values instead of global min max 
(cherry picked from commit 43fed29514)
 2024-01-12 13:08:33 +00:00
mergify[bot]
7ae1df60be chore: remove share, print and email permissions from Buying Settings (backport #39337) (#39338) 
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:48:50 +05:30
rohitwaghchaure
9b85d425fa Merge pull request #39311 from frappe/mergify/bp/version-14-hotfix/pr-39299 
fix: circular dependency error on deletion of QC and Stock Entry (backport #39299)
 2024-01-11 20:34:34 +05:30
Raffael Meyer
385ed8aa80 Merge pull request #39326 from frappe/mergify/bp/version-14-hotfix/pr-39117 
fix: consider all years in holiday list (backport #39117)
 2024-01-11 15:04:24 +01:00
barredterra
4998d68564 chore: resolve merge confilcts 2024-01-11 15:04:01 +01:00
barredterra
4a1a4b06dd test: cancel voucher linked to Bank Transaction 
(cherry picked from commit 517bedeb7e)
 2024-01-11 13:37:32 +00:00
barredterra
755576bd78 fix: unreconcile Bank Transaction on cancel of payment voucher 
(cherry picked from commit 0a95b38166)

# Conflicts:
#	erpnext/accounts/doctype/bank_transaction/bank_transaction.py
#	erpnext/accounts/doctype/journal_entry/journal_entry.js
 2024-01-11 13:37:32 +00:00
barredterra
f3d8d273f4 test: improve test for local holidays 
(cherry picked from commit 60329ade9e)
 2024-01-11 13:28:41 +00:00
barredterra
3180266150 fix: consider all years in holiday list 
(cherry picked from commit 300aaa39fe)
 2024-01-11 13:28:40 +00:00
Gursheen Anand
6bd01f227e fix: reset default after test 
(cherry picked from commit 813b7a96fb)
 2024-01-11 13:26:02 +00:00
Gursheen Anand
d95b14d5b8 test: naming series variable parsing 
(cherry picked from commit bbdf98a8f0)
 2024-01-11 13:26:02 +00:00
Gursheen Anand
670d61547f fix: date in master document for dictionary condition 
(cherry picked from commit d96a777edd)

# Conflicts:
#	erpnext/accounts/utils.py
 2024-01-11 13:26:01 +00:00
ruthra kumar
db3cb5c994 Merge pull request #39322 from frappe/mergify/bp/version-14-hotfix/pr-39212 
fix: project filters on Delivery Note and Sales Order (backport #39212)
 2024-01-11 18:06:55 +05:30
ruthra kumar
520cdb6f32 fix: project filters on Delivery Note and Sales Order 
(cherry picked from commit 9ba6ff67d5)
 2024-01-11 12:34:44 +00:00
ruthra kumar
e5b90c8ec5 Merge pull request #39321 from frappe/mergify/bp/version-14-hotfix/pr-39320 
fix: possible typeerror in consolidated report (backport #39320)
 2024-01-11 17:13:00 +05:30
ruthra kumar
faa312e680 Merge pull request #39318 from frappe/mergify/bp/version-14-hotfix/pr-39317 
fix: broken dimension filters in Sales/Purchase register (backport #39317)
 2024-01-11 17:12:48 +05:30
ruthra kumar
9395f7535b fix: possible typeerror in consolidated report 
(cherry picked from commit 268731aec4)
 2024-01-11 16:59:32 +05:30
ruthra kumar
298cdf5f0e fix: broken dimension filters in Sales/Purchase register 
(cherry picked from commit 7b3f9386d7)
 2024-01-11 11:20:42 +00:00
rohitwaghchaure
531f15b5d8 Merge pull request #39314 from frappe/mergify/bp/version-14-hotfix/pr-39215 
fix: incorrect percentage received in purchase invoice (backport #39215)
 2024-01-11 15:14:52 +05:30
rohitwaghchaure
daf0e435e2 chore: fix conflicts 2024-01-11 14:53:21 +05:30
Rohit Waghchaure
453700d0ab fix: incorrect percentage received in purchase invoice 
(cherry picked from commit 8d2c78867e)
 2024-01-11 09:21:23 +00:00
Rohit Waghchaure
dfcb746774 fix: circular dependency error while deleting QC 
(cherry picked from commit 7cc324e31e)

# Conflicts:
#	erpnext/stock/doctype/quality_inspection/test_quality_inspection.py
 2024-01-11 09:20:08 +00:00
mergify[bot]
dc7c9e7aff fix: performance issue related to stock entry (backport #39301) (#39302) 
fix: performance issue related to stock entry (#39301)

(cherry picked from commit c67b0a3a64)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2024-01-10 22:22:16 +05:30
s-aga-r
d42db1174d feat: provision to select the qty field for Product Page (#39292) 
feat: provision to select the qty field to be shown as `In Stock` in product page
 2024-01-10 21:31:03 +05:30
mergify[bot]
1cc887a997 fix: Show timesheet table after fetching data from timesheet (backport #39275) (#39280) 
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:28 +05:30
mergify[bot]
ee7474ba20 fix: remove global _("translation") calls (backport #32828) (#39231) 
fix: remove global _("translation") calls (#32828)

This is not how it works. Translations are dynamic based on language
sets during request (using header, user's preferences etc)

Calling them on global variables makes no sense.

Ref: https://github.com/frappe/frappe/pull/18733
(cherry picked from commit 75983ce809)

Co-authored-by: Ankush Menat <ankush@frappe.io>
 2024-01-10 12:31:59 +05:30