David Arnold
c88ce55242
fix: advance payment doctypes to keep input/output distinction
2024-01-23 10:30:07 +01:00
David Arnold
9fc5c0cc58
Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status
2024-01-21 15:16:13 +01:00
ruthra kumar
fcf4687c52
test: dimension inheritance on adv allocation
2024-01-19 16:50:54 +05:30
ruthra kumar
cbd443a78a
refactor: pass dimensions on advance allocation
2024-01-19 16:44:59 +05:30
ruthra kumar
6148fb024b
test: dimension inheritance in PE reconciliation
2024-01-19 15:57:13 +05:30
ruthra kumar
c44eb432a5
refactor: pass dimension values to Gain/Loss journal
2024-01-18 16:42:22 +05:30
ruthra kumar
ba5a7c8cd8
test: dimension inheritance for cr note reconciliation
2024-01-18 13:29:33 +05:30
rohitwaghchaure
45aea56198
Merge pull request #39436 from rohitwaghchaure/fixed-duplicate-name-error-for-variant-creation
...
fix: duplicate name error while making variant
2024-01-18 06:50:50 +05:30
Rohit Waghchaure
d7e6b83e64
fix: duplicate name error while making variant
2024-01-17 20:52:16 +05:30
ruthra kumar
e3c44231ab
chore: test dimension filter output
2024-01-17 12:51:44 +05:30
Deepesh Garg
120bfdf33d
Merge branch 'develop' of https://github.com/frappe/erpnext into revert_dynamic_splitting
2024-01-17 12:33:07 +05:30
ruthra kumar
bfe42fdccb
refactor: better ordering of query result
2024-01-16 15:58:19 +05:30
Deepesh Garg
96dcfba65a
Merge branch 'develop' of https://github.com/frappe/erpnext into revert_dynamic_splitting
2024-01-16 15:42:02 +05:30
ruthra kumar
3349dde5e2
fix(test): test case for project query
2024-01-16 14:28:09 +05:30
ruthra kumar
4eefb445a7
fix: project query controller logic
2024-01-16 13:38:53 +05:30
ruthra kumar
5dc22e1811
refactor: pass dimension details to query
2024-01-15 14:55:15 +05:30
ruthra kumar
ff60ec85b8
refactor: pass dimension filters to query
2024-01-15 14:55:15 +05:30
rohitwaghchaure
ad5906916d
Merge pull request #39372 from rohitwaghchaure/fixed-get-query-for-batch-no-field
...
fix: batches not coming correctly in the batch selector
2024-01-14 23:48:48 +05:30
Rohit Waghchaure
114f2b4326
fix: batches not coming correctly in the batch selector
2024-01-14 23:27:29 +05:30
Deepesh Garg
1a67d7d95f
Revert "refactor: use both fields to store against values"
...
This reverts commit 09439334cae6a7306dad8e54a9f81f9ffa483f8b.
2024-01-14 11:22:50 +05:30
Deepesh Garg
b40d3b0a05
Revert "fix: purchase receipt tests"
...
This reverts commit fcfdb9b5667755b2846e834d70d3f9b444743d2b.
2024-01-14 11:09:18 +05:30
Deepesh Garg
073f2fa302
Revert "fix: set against type in stock controller"
...
This reverts commit 4ea43ebc5dadc35e66cec30d36a9578118f01622.
2024-01-14 11:04:40 +05:30
Deepesh Garg
fbeaf2b398
Revert "fix: set against type in controllers"
...
This reverts commit 4c5a83d6cf7e4b39a403b1e99a2b1c443f854ac9.
2024-01-14 11:04:00 +05:30
Deepesh Garg
41d9225bd1
Revert "fix: GL values in transaction currency via JV"
2024-01-14 10:51:30 +05:30
rohitwaghchaure
402a1b91f9
Merge pull request #39335 from s-aga-r/FIX-8359
...
fix: SBB Total Qty validation for SE
2024-01-12 20:59:46 +05:30
s-aga-r
c20241fcb5
fix: SBB Total Qty validation for SE
2024-01-12 15:26:35 +05:30
barredterra
8039dc5194
Merge branch 'develop' into unreconcile-bank-transaction-on-cancel
2024-01-11 13:54:07 +01:00
Deepesh Garg
f057dc6867
Merge pull request #39256 from deepeshgarg007/opening_ignore_tempplate
...
fix: Ignore default payment terms template for opening invoices
2024-01-10 16:06:03 +05:30
Nabin Hait
01f507ebcb
Merge pull request #39238 from nabinhait/asset-purchase-amount
...
fix: Set asset purchase amount based on qty and valuation_rate
2024-01-10 11:31:30 +05:30
barredterra
5b4c5d59d8
Merge branch 'develop' into unreconcile-bank-transaction-on-cancel
2024-01-09 18:12:30 +01:00
s-aga-r
74ceb6da5e
Merge pull request #39242 from s-aga-r/FIX-8184
...
fix: skip rate validation for return `DN Items` with `Moving Average` valuation
2024-01-09 21:45:45 +05:30
s-aga-r
e0ad52b500
fix: skip rate validation for return DN Items with Moving Average valuation
2024-01-09 21:18:19 +05:30
Deepesh Garg
53bf44d2b8
fix: Ignore default payment terms template for opening invoices
2024-01-09 15:57:38 +05:30
Nabin Hait
ec07b42ea2
Merge pull request #38530 from bosue/duplicate_zero_quantity_check2
...
refactor: Consolidate duplicate zero-quantity Items checks for transactions.
2024-01-09 13:12:25 +05:30
Nabin Hait
135e19d0aa
fix: Set asset purchase amount based on qty and valuation_rate
2024-01-09 12:51:57 +05:30
ruthra kumar
cf988434e9
refactor: remove 'Bank Trasaction' logic from status_update
2024-01-08 17:32:22 +05:30
David Arnold
b73507abe0
Merge remote-tracking branch 'origin/develop' into feat/so-po-advance-payment-status
2024-01-05 21:36:14 +01:00
s-aga-r
54383cfb55
Merge pull request #39140 from s-aga-r/FIX-8018
...
fix: don't set rate for non-stock item in Internal Transfer
2024-01-05 22:51:47 +05:30
rohitwaghchaure
f09e2130a1
fix: serial / batch barcode scanner ( #39114 )
2024-01-04 14:58:02 +05:30
s-aga-r
e1b0fffd0c
fix: don't set rate for non-stock item in Internal Transfer
2024-01-04 11:43:02 +05:30
Deepesh Garg
5b1571879c
fix: flaky demo test case
2024-01-04 10:48:01 +05:30
Deepesh Garg
beee98da6d
feat: Against voucher filter in General Ledger ( #39100 )
2024-01-03 10:03:27 +05:30
Deepesh Garg
3f9693b31f
fix: GL values in transaction currency via JV ( #38914 )
2023-12-31 20:00:03 +05:30
Deepesh Garg
cd37fd790b
fix: Validate account in Sales/Purchase Taxes and Charges Template ( #39013 )
2023-12-29 12:52:22 +05:30
rohitwaghchaure
f983e09f92
fix: purchase return without item code not working ( #39014 )
2023-12-29 12:06:04 +05:30
Deepesh Garg
3b4b2275de
fix: Multiple subscription fixes ( #39005 )
2023-12-29 08:25:38 +05:30
barredterra
0a95b38166
fix: unreconcile Bank Transaction on cancel of payment voucher
2023-12-27 23:05:37 +01:00
Gursheen Kaur Anand
47f7b65058
feat: voucher subtype for general ledger ( #38822 )
...
* feat: add voucher subtype column to gle
* feat: add logic to set voucher subtypes
* feat: fetch voucher subtype in ledger report
* fix: order of conditions
2023-12-24 16:13:31 +05:30
s-aga-r
d0ed8ef83b
Merge pull request #38558 from s-aga-r/ADD-ITEMS-STOCK-RESERVATION-DIALOG
...
feat: provision to add items in Stock Reservation dialog
2023-12-22 12:15:07 +05:30
mergify[bot]
07175367d8
fix: reposting not fixing valuation rate for sales return using movin… (backport #38895 ) ( #38897 )
...
* fix: reposting not fixing valuation rate for sales return using movin… (#38895 )
fix: reposting not fixing valuation rate for sales return using moving average method
(cherry picked from commit 3a668bbe9694fdd6e8265869c6943e42f889ac41)
# Conflicts:
# erpnext/stock/stock_ledger.py
* chore: fix conflicts
---------
Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-21 14:40:52 +05:30
