Anand Baburajan
f37484c6fe
chore: better err msg on cancelling JE for asset scrap [dev] ( #35850 )
...
chore: better err msg on cancelling JE for asset scrap
2023-06-22 22:32:06 +05:30
rohitwaghchaure
f4f8df6cfe
Merge pull request #35842 from rohitwaghchaure/fixed-multiple-work-orders-against-sigle-production-order
...
fix: multiple Work Orders against same production plan
2023-06-22 22:11:09 +05:30
Deepesh Garg
904f835d4a
Merge pull request #35602 from deepeshgarg007/pl_account_balance
...
fix: Remove special treatment for P&L Accounts
2023-06-22 21:11:23 +05:30
Deepesh Garg
05c2198569
test: Update order
2023-06-22 21:08:58 +05:30
Deepesh Garg
13c0c129df
Merge pull request #35828 from phot0n/pr-fieldname-item-wise-purchase-register
...
fix: use correct fieldname for purchase receipt column in item_wise_purchase_register report
2023-06-22 20:40:14 +05:30
Deepesh Garg
e8dff30973
Merge pull request #35846 from deepeshgarg007/patch_workflow_update
...
ci: use multiple python version in patch test
2023-06-22 20:38:05 +05:30
Deepesh Garg
11a9bd523d
test: Add posting date parameter
2023-06-22 20:26:12 +05:30
Deepesh Garg
56e81ada56
ci: use multiple python version in patch test
2023-06-22 19:57:23 +05:30
Deepesh Garg
b101dceb2a
test: GL Entry order
2023-06-22 19:38:33 +05:30
mergify[bot]
e745312a10
fix: asset capitalization (backport #35832 ) ( #35843 )
...
* fix: asset capitalization (#35832 )
* fix: misc asset capitalisation fixes
* chore: add location in tests and remove unnecessary code
* chore: more fixes and removals
* chore: show company and fix tests
* chore: make target qty read only on capitalization
(cherry picked from commit fb823b53d1d9a631035016fa3b33003bf8ce297a)
# Conflicts:
# erpnext/assets/doctype/asset_capitalization/asset_capitalization.json
# erpnext/assets/doctype/asset_capitalization/asset_capitalization.py
* chore: fixing conflicts
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-06-22 19:21:52 +05:30
Deepesh Garg
754eb6bdb6
Merge pull request #35650 from deepeshgarg007/ledger_preview
...
feat: Ledger Preview
2023-06-22 18:30:03 +05:30
Deepesh Garg
d81d6069fb
fix: JV query
2023-06-22 18:28:16 +05:30
Deepesh Garg
d9e7bc545e
fix: Do full rollback
2023-06-22 16:07:32 +05:30
Deepesh Garg
5c6e3269fb
fix: Use GET request
2023-06-22 15:58:41 +05:30
Rohit Waghchaure
80fffbd64b
fix: multiple Work Orders agaist same production plan
2023-06-22 15:57:28 +05:30
Deepesh Garg
b523c779f5
Merge branch 'develop' of https://github.com/frappe/erpnext into ledger_preview
2023-06-22 15:43:43 +05:30
Deepesh Garg
0e68da5a2a
feat: Show stock ledger preview
2023-06-22 15:43:32 +05:30
ruthra kumar
dde09cb959
Merge pull request #35837 from ruthra-kumar/increase_precision_on_exchange_rate_revaluation
...
refactor: increase precision for current exc rate in Exchange Rate Revaluation
2023-06-22 13:39:51 +05:30
Deepesh Garg
6d121ae6e4
chore: fix typo
2023-06-22 13:03:09 +05:30
ruthra kumar
b4db25dd18
refactor: increase precision for current exc rate in ERR
2023-06-22 12:40:02 +05:30
rohitwaghchaure
d1bccc8c65
Merge pull request #35829 from rohitwaghchaure/refactor-returned-from-rejected-warehouse
...
fix: return against rejected warehouse (UX Issue)
2023-06-22 12:03:38 +05:30
Deepesh Garg
3aead05f42
fix: Test related errors
2023-06-22 11:41:43 +05:30
ruthra kumar
4e7deba2ad
Merge pull request #35825 from ruthra-kumar/convert_db_call_to_whitelisted_method
...
fix: multiple fixes in reconciliation tools
2023-06-22 11:27:04 +05:30
ruthra kumar
41b9e92868
fix: incorrect cost center error in bank reconciliation
2023-06-22 10:43:13 +05:30
Deepesh Garg
b64ebc6fcc
test: fix payment reco tests
2023-06-21 17:49:45 +05:30
Rohit Waghchaure
756dbe7ce8
refactor: return against rejected warehouse
2023-06-21 17:40:48 +05:30
Deepesh Garg
e7d2bcf108
Merge branch 'develop' of https://github.com/frappe/erpnext into ledger_preview
2023-06-21 17:16:46 +05:30
Deepesh Garg
ed76ee3e16
fix: Move ledger display to dialog
2023-06-21 17:15:46 +05:30
phot0n
dcfc86e3af
fix: use correct fieldname for purchase receipt column in item_wise_purcchase_register report
2023-06-21 16:49:54 +05:30
mergify[bot]
39a1f4a4c1
fix: issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry (backport #35821 ) ( #35826 )
...
* Fixes issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry (#35821 )
* Fixes issue of asset value_after_depreciation field getting updated twice if workflow is enabled in Journal Entry
* chore: remove unnecessary line break
* chore: formatting
---------
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
(cherry picked from commit 000ebe447991185e4d5a4050b066fa0781575e65)
# Conflicts:
# erpnext/assets/doctype/asset/depreciation.py
* chore: resolve conflicts
---------
Co-authored-by: saeedkola <mohammedsaeedk@gmail.com>
Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>
2023-06-21 15:38:06 +05:30
ruthra kumar
ad758b8d85
fix: no permission for accounts settings on payment reconciliation
2023-06-21 14:19:02 +05:30
rohitwaghchaure
edc38edabf
Merge pull request #35611 from rohitwaghchaure/fix-dont-allow-to-create-reposting-entry-for-closing-stock-balance
...
fix: don't allow to make reposting entry for closing stock balance period
2023-06-21 14:15:40 +05:30
Deepesh Garg
92f845c0e1
chore: Advance fetching order
2023-06-21 12:21:19 +05:30
Rohit Waghchaure
96c5c7b1df
fix: don't allow to make reposting entry for closing stock balance period
2023-06-21 11:55:51 +05:30
Deepesh Garg
ddbd7d8bbc
Merge pull request #35591 from resilient-tech/remove-whitelisting
...
chore: remove whitelisting for methods not accessed from UI
2023-06-20 20:29:49 +05:30
rohitwaghchaure
8816039bd9
Merge pull request #35810 from rohitwaghchaure/stock-error-for-service-item
...
fix: stock error for service item
2023-06-20 17:20:26 +05:30
rohitwaghchaure
79e41e329e
Merge pull request #35809 from rohitwaghchaure/fixed-key-error-in-stock-balance-report
...
fix: key error while checking the stock balance report
2023-06-20 17:00:44 +05:30
Rohit Waghchaure
32965f1af9
fix: stock error for service item
2023-06-20 16:27:23 +05:30
Rohit Waghchaure
a627d2a38c
fix: keyerror while checking the stock balance report
2023-06-20 15:55:18 +05:30
ruthra kumar
8aa47a13e3
Merge pull request #35794 from ruthra-kumar/exchange_revaluation_only_post_on_account_currency_based_on_scenario
...
fix: Exchange Rate Revaluation should only post on the currency that has balance in a 'zero' balance account
2023-06-20 13:58:54 +05:30
Deepesh Garg
98cfea6f63
Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability
2023-06-20 13:26:14 +05:30
Deepesh Garg
32c35b87f9
Merge pull request #34675 from frappe/bank-trans-party-automatch
...
feat: Auto set Party in Bank Transaction
2023-06-20 13:24:44 +05:30
Deepesh Garg
016ed951da
test: Update tests
2023-06-20 13:22:32 +05:30
Anand Baburajan
df090cbe87
chore: minor typo in fixed asset register ( #35801 )
...
chore: renaming entries to assets
2023-06-20 13:03:15 +05:30
ruthra kumar
6694175a51
refactor: higher precision for rounding loss and allow '0'
2023-06-20 12:44:08 +05:30
ruthra kumar
4567474418
refactor: allow '0' rounding allowance
2023-06-20 12:44:08 +05:30
ruthra kumar
9d04af9ecc
refactor: allow higher precision for new exchange rate
2023-06-20 12:44:08 +05:30
ruthra kumar
1b33afd699
fix: for zero bal accounts, dr/cr only on currency that has balance
2023-06-20 12:44:04 +05:30
Anand Baburajan
0d12588583
fix: date and finance book fixes in fixed asset register ( #35751 )
...
* fix: handle finance books properly and show all assets by default in fixed asset register
* chore: rename value to depr amount
* chore: get asset value for correct fb properly
* chore: rename include_default_book_entries to include_default_book_assets
2023-06-20 12:06:27 +05:30
marination
8f2e5288ff
test: Dunning and PE against partially due invoice
...
- Check if the right payment portion is picked
- Check if the SI and Dunning are updated on submission and cancellation of PE
2023-06-20 11:47:04 +05:30