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
Deepesh Garg
175a7baa60
Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability
2023-06-19 21:39:01 +05:30
Smit Vora
4fbff20954
fix: make credit note and debit note exclusive ( #35781 )
2023-06-19 21:14:42 +05:30
Gursheen Anand
b3d565c91f
feat: Provision to send Accounts Receivable Reports using Process Statement of Accounts
...
Issue #35707
2023-06-19 19:59:24 +05:30
Anand Baburajan
c1da3ddbbf
fix: fix get outstanding invoices btn and add get outstanding orders btn ( #35776 )
...
* fix: fix get outstanding invoices btn and add get outstanding orders btn
* chore: remove unnecessary arg
2023-06-19 19:53:05 +05:30
Marica
8ab8230adf
Merge branch 'develop' into bank-trans-party-automatch
2023-06-19 19:19:15 +05:30
Sagar Sharma
b26d70b527
Merge pull request #35782 from s-aga-r/SE-PURPOSE-INDEX
...
perf: index `purpose` in `Stock Entry`
2023-06-19 18:43:02 +05:30
s-aga-r
4f941ac5c0
perf: index purpose
in Stock Entry
2023-06-19 18:42:25 +05:30
Raffael Meyer
11126521c9
Merge branch 'develop' into bank-trans-party-automatch
2023-06-19 15:04:37 +02:00
Deepesh Garg
9d27a25e5f
fix: Allocated amount validation for other party types ( #35741 )
...
* fix: Allocated amount validation for other party types
* chore: Validation for return allocations
* chore: minor typo
---------
Co-authored-by: anandbaburajan <anandbaburajan@gmail.com>
2023-06-19 11:04:50 +05:30
Deepesh Garg
7ec9d76545
Merge branch 'develop' of https://github.com/frappe/erpnext into #34282-Record-advance-payment-as-a-liability
2023-06-19 09:48:01 +05:30
Deepesh Garg
5e9014be8c
Merge branch 'develop' into make-accounting-dimension-filter-values-optional
2023-06-19 09:21:04 +05:30
mergify[bot]
78fbd6452b
fix: unsupported operand type(s) for //: 'float' and 'NoneType' for POS Barcode search ( #35710 )
...
* fix: unsupported operand type(s) for //: 'float' and 'NoneType' for POS Barcode search (#35710 )
(cherry picked from commit 58a6bbcf6d95f59821484ff29b585c10529a0fe4)
# Conflicts:
# erpnext/selling/page/point_of_sale/point_of_sale.py
* chore: resolve conflicts
---------
Co-authored-by: Vishal Dhayagude <vishdha@users.noreply.github.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-06-19 09:14:43 +05:30
Abhinav Raut
2a24423ad2
fix: loan interest accrual date ( #35695 )
...
fix: loan interest accrual date
---------
Co-authored-by: Abhinav Raut <abhinav.raut@zerodha.com>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-06-18 23:11:52 +05:30
HENRY Florian
d12c9b434e
chore: fr translation lead vs prospect ( #35697 )
...
chore: fr translation lead vs prospect
2023-06-18 22:30:15 +05:30
Türker Tunalı
507c966aa7
chore: Make material request title translatable ( #35764 )
...
chore: Make material request title translatable
2023-06-18 22:29:42 +05:30
Lakshit Jain
93c0c26843
fix: modify filters for account in journal entry ( #35626 )
2023-06-18 22:25:28 +05:30