ruthra kumar
|
0a6af795c4
|
refactor: cr notes will post for itself
(cherry picked from commit db76e8a277)
|
2024-01-23 06:36:08 +00:00 |
|
Rohit Waghchaure
|
55c9cc3f26
|
fix: UOM needs to be whole number not being checked in quotations
(cherry picked from commit aaf83da3e9)
|
2024-01-22 11:55:27 +00:00 |
|
Gursheen Anand
|
a19b41d8c8
|
fix: party field in pdf html
(cherry picked from commit b2d9380596)
|
2024-01-22 09:51:30 +00:00 |
|
David Arnold
|
3bdff18467
|
fix: use most reliable section reference per report line
(cherry picked from commit b5be17c6df)
|
2024-01-21 08:14:13 +00:00 |
|
Gursheen Kaur Anand
|
837fff4533
|
Revert "fix(minor): financial statements period end date"
(cherry picked from commit 73625a2622)
|
2024-01-20 12:29:22 +00:00 |
|
Gursheen Anand
|
6895b74ecc
|
fix: linting issue
(cherry picked from commit 99b94af49f)
|
2024-01-18 10:45:49 +00:00 |
|
Gursheen Anand
|
f7ba7361ca
|
fix: set unallocated amount after base tax
(cherry picked from commit e9bc63aacf)
|
2024-01-18 10:45:49 +00:00 |
|
Nabin Hait
|
ac6020a940
|
fix: composite asset capitalization using asset components
(cherry picked from commit 5df40661d2)
|
2024-01-17 15:35:56 +00:00 |
|
Nabin Hait
|
4edb73d398
|
fix: resolved merge conflict
|
2024-01-17 17:36:42 +05:30 |
|
Nabin Hait
|
1dff96057c
|
fix: Cancel asset capitalisation record on cancellation of asset and vice-versa
(cherry picked from commit efe9f6656f)
# Conflicts:
# erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
|
2024-01-17 06:44:52 +00:00 |
|
Deepesh Garg
|
bee90e56f5
|
Merge pull request #39410 from ljain112/fix-pr
fix(Purchase Register): show bill_date and bill_no (#38742)
|
2024-01-17 11:00:24 +05:30 |
|
ruthra kumar
|
42c1de640c
|
chore: resolve conflict
|
2024-01-17 10:36:29 +05:30 |
|
ruthra kumar
|
b35a83ee47
|
refactor: better ordering of query result
(cherry picked from commit bfe42fdccb)
# Conflicts:
# erpnext/controllers/queries.py
|
2024-01-16 10:55:31 +00:00 |
|
ruthra kumar
|
98967ed584
|
fix(test): test case for project query
(cherry picked from commit 3349dde5e2)
|
2024-01-16 10:55:30 +00:00 |
|
ruthra kumar
|
f2e577bec7
|
fix: project query controller logic
(cherry picked from commit 4eefb445a7)
# Conflicts:
# erpnext/controllers/queries.py
|
2024-01-16 10:55:30 +00:00 |
|
ljain112
|
4b197920c1
|
fix: show bill_date and bill_no in Purchase Register
|
2024-01-16 15:53:53 +05:30 |
|
ruthra kumar
|
4ea72f4b69
|
fix: possible typerror in utils.js
and remove unwanted debugging statements
(cherry picked from commit 60b26ad8b2)
|
2024-01-15 15:16:44 +00:00 |
|
ruthra kumar
|
46d846bf1a
|
Merge pull request #39136 from frappe/mergify/bp/version-14-hotfix/pr-39125
fix: ignore cancelled payments in Sales/Purchase Register (backport #39125)
|
2024-01-15 14:49:22 +05:30 |
|
ruthra kumar
|
a6bc5cae90
|
fix: pass accounts as list to query
|
2024-01-15 14:10:55 +05:30 |
|
ruthra kumar
|
1ca8dd4349
|
Merge pull request #39374 from frappe/mergify/bp/version-14-hotfix/pr-39371
fix: incorrect sql error if account name has '%' (backport #39371)
|
2024-01-15 10:41:04 +05:30 |
|
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 |
|
ruthra kumar
|
d0e3458c8c
|
fix: incorrect sql error if account name has '%'
(cherry picked from commit 641c3de0ca)
|
2024-01-15 04:10:30 +00:00 |
|
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
|
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
|
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
|
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 |
|
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 |
|