anandbaburajan
e4d7d8c42d
fix: use naming_series in budget
2022-10-10 23:04:34 +05:30
Anand Baburajan
c1e3498a2a
Merge branch 'develop' into fix_asset_scrap_and_sale_dep
2022-09-28 12:18:38 +05:30
Deepesh Garg
0c869251ce
Merge branch 'develop' into fix_asset_scrap_and_sale_dep
2022-09-28 08:38:52 +05:30
Maharshi Patel
d850b0adb1
Merge branch 'develop' into fix-pos-validate-qty-if-is_stock_item
2022-09-27 23:45:50 +05:30
Maharshi Patel
e392ea1104
fix: POS properly validate stock for bundle products
...
Stock availability was not calculated properly for Product Bundle with non stock item so i have added logic to properly calculate that as well.
2022-09-27 23:44:56 +05:30
Deepesh Garg
4c8617e1bb
Merge pull request #32378 from deepeshgarg007/add_index_return_against
...
fix: Add return against indexes for POS Invoice
2022-09-27 22:22:03 +05:30
Deepesh Garg
cbfe28286a
fix: Add return against indexes for POS Invoice
2022-09-27 16:22:59 +05:30
Nabin Hait
6145013f30
Merge branch 'develop' into fix_asset_scrap_and_sale_dep
2022-09-27 15:56:39 +05:30
Maharshi Patel
e39e088f18
fix: POS only validate QTY if is_stock_item
...
POS invoice raised " Item not available " validation error even though item is non_stock.
2022-09-27 15:44:38 +05:30
Deepesh Garg
1f6205e1ea
fix: Add return against indexes for POS Invoice
2022-09-27 15:37:41 +05:30
Maharshi Patel
c760ca2323
fix: Scrap Asset Accounting Dimensions ( #31949 )
...
* fix: Scrap Asset Accounting Dimensions
2022-09-27 15:31:36 +05:30
Rohit Waghchaure
a4a86ee23f
fix: allow to return expired batches using purchase return
2022-09-27 13:55:27 +05:30
ruthra kumar
122d5f2729
fix: difference amount calculation on payment reconciliation
2022-09-21 08:36:09 +05:30
Deepesh Garg
d4b01f6ffd
Merge branch 'develop' of https://github.com/frappe/erpnext into fix-remove-no-copy-for-ignore_pricing_rule
2022-09-20 14:58:48 +05:30
Deepesh Garg
ef7d7e7d71
Merge pull request #32204 from deepeshgarg007/pending_tds_vouchers
...
fix(UX): More predictable tax withholding application in invoices
2022-09-20 14:35:16 +05:30
Deepesh Garg
3d356763d0
Merge pull request #32217 from ruthra-kumar/bug_in_tax_on_multi_currency_payment_entry
...
fix: incorrect gl if tax on multi currency payment entry
2022-09-20 09:59:47 +05:30
Deepesh Garg
49538e81de
Merge pull request #32235 from maharshivpatel/fix-payment-schedule-description
...
fix: fetch description only if empty on the payment schedule
2022-09-20 09:13:43 +05:30
Deepesh Garg
1f4932966a
Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers
2022-09-20 09:06:35 +05:30
Deepesh Garg
9aa1f84d45
chore: fix tests
2022-09-20 09:06:18 +05:30
rohitwaghchaure
3c01bf3a12
Merge pull request #32238 from rohitwaghchaure/fix-pricing-rules-issues
...
fix: suggestion threshold label and rule was not working for other item with min and max amount
2022-09-17 12:11:24 +05:30
Maharshi Patel
8c5b420aea
fix: remove no_copy for ignore_pricing_rule
2022-09-16 18:26:00 +05:30
ruthra kumar
5bd5dd7262
test: gl entries of payments with advance tax
2022-09-16 16:22:21 +05:30
Rohit Waghchaure
f5bd3fa952
fix: suggestion threshold label and rule was not working for other items with min and max amount
2022-09-16 16:03:08 +05:30
Maharshi Patel
f4b64686ae
fix: fetch description only if empty on the payment schedule
...
added fetch_if_empty on description field of payment_schedule.
2022-09-16 14:14:14 +05:30
Deepesh Garg
36d0906ea2
fix: TDS deduction via journal entry
2022-09-16 13:50:37 +05:30
ruthra kumar
f0ae77b23b
fix: incorrect gl if tax on multi currency payment entry
2022-09-16 12:40:40 +05:30
Deepesh Garg
0a6462e627
Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers
2022-09-16 12:35:39 +05:30
Nabin Hait
0286f2da78
Merge branch 'develop' into dunning-fix
2022-09-16 09:40:18 +05:30
anandbaburajan
ff5cad1cd6
fix: calculate depreciation properly on asset sale entry and scrap entry
2022-09-15 13:15:34 +05:30
Nabin Hait
29db084dc3
fix: create dunning from sales invoice
2022-09-15 13:11:53 +05:30
Nabin Hait
af21a11e1e
fix: abbreviation issue on renaming cost center
2022-09-15 12:09:18 +05:30
Deepesh Garg
b6184ce471
test: Add tests
2022-09-14 09:13:02 +05:30
Deepesh Garg
b6d87ae25b
Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers
2022-09-13 22:31:21 +05:30
Deepesh Garg
3fb1595a4e
fix: Fetch vouchers to show in Invoice
2022-09-13 20:31:31 +05:30
Deepesh Garg
246c1a9380
fix: Add child table for tax withheld vouchers
2022-09-13 20:05:20 +05:30
Nabin Hait
e24a4b18c4
Merge branch 'SaiFi0102-asset-capitalization' into develop
2022-09-13 15:00:21 +05:30
rohitwaghchaure
b3b1df7184
Merge pull request #32181 from rohitwaghchaure/fix-min-max-amount-configuration
...
fix: promotional scheme min and max amount configuration
2022-09-12 18:30:01 +05:30
Rohit Waghchaure
a8fd92ddc1
fix: promotional scheme min and max amount configuration
2022-09-12 16:53:52 +05:30
Ankush Menat
12d99b3292
refactor: use util method for checking if job is queued
2022-09-12 13:14:48 +05:30
Nabin Hait
fefe95052d
fix: resolved merge conflict
2022-09-09 14:40:36 +05:30
Deepesh Garg
33d0e09497
Merge pull request #32117 from deepeshgarg007/psoa_fontsize
...
fix: Reduce font size for Process Statement of accounts print/pdf
2022-09-09 11:18:13 +05:30
Deepesh Garg
6bfd193b0d
fix: Reduce font size for Process Statement of accounts print/pdf
2022-09-07 16:34:10 +05:30
ruthra kumar
741b5b4978
Merge pull request #32110 from ruthra-kumar/bank_import_statement_bug
...
fix: error on bank statement import
2022-09-07 15:22:14 +05:30
Rohit Waghchaure
b4a102d119
fix: internal transfer flow
2022-09-07 12:48:18 +05:30
ruthra kumar
a6fbb80b94
fix: import error on bank statement import
...
Name collision between frameworks file importer's internal log and
doctype fieldname - import_log.
Frameworks internal log overrode, doctypes field which caused failure
in basic fieldtype validation.
2022-09-07 11:19:54 +05:30
Deepesh Garg
10d94ed539
Merge pull request #32045 from SolufyPrivateLimited/Solufy-JET
...
fix: Naming series in Journal Entry Template
2022-09-04 16:34:05 +05:30
Deepesh Garg
1a61d4e8a8
Merge branch 'develop' into fix-consolidation-precision-error
2022-09-04 13:18:10 +05:30
ruthra kumar
e424ad5ff2
Merge pull request #32054 from ruthra-kumar/bug_in_process_deferred_accounting
...
fix: type error on cancellation of Process Deferred Accounting
2022-09-02 16:20:31 +05:30
ruthra kumar
1c385541fa
test: pda document submission and cancellation
2022-09-02 12:34:02 +05:30
ruthra kumar
08f2e4edc3
fix: incorrect import parameter for cancel PDA
2022-09-02 10:51:51 +05:30
