Deepesh Garg
43c2bd1351
Merge pull request #32272 from deepeshgarg007/internal_transfer_precision_fixes
...
fix: Incoming rate precision fixes for intra company transfer
2022-10-12 16:23:16 +05:30
Rohit Waghchaure
98bf8e1304
fix: test case
2022-10-12 15:45:36 +05:30
Rohit Waghchaure
683a47f7a1
fix: consider sales rate as incoming rate for transit warehouse in purchase flow
2022-10-12 15:44:53 +05:30
ruthra kumar
65992304bc
fix: delete old ple's on item value repost
2022-10-12 15:34:50 +05:30
Deepesh Garg
c8d2181498
chore: Increase precision for other doc fields
2022-10-12 14:17:55 +05:30
Deepesh Garg
38b34f2a45
Merge pull request #32408 from nabinhait/sales-purchase-tab-break
...
feat: Tab Breaks in all Sales and Purchase cycle transactions
2022-10-11 16:02:45 +05:30
Deepesh Garg
dc20b21fb5
test: Internal tranfer precision loss test
2022-10-11 14:54:27 +05:30
Deepesh Garg
b31c3bd35d
chore: Increase incoming_rate field precision to 6
2022-10-11 14:53:26 +05:30
ruthra kumar
633c2a289e
Merge pull request #32557 from ruthra-kumar/value_error_on_pos_save
...
fix: Value error on validation of POS invoices with Serial Nos
2022-10-11 14:42:47 +05:30
Nabin Hait
e71c417f7e
fix: minor cleanup
2022-10-11 13:21:27 +05:30
Nabin Hait
5389a35798
fix: more fields reordering related to Tab Break
2022-10-11 13:21:07 +05:30
Nabin Hait
aaf3c2b329
feat: Tab Break in Purchase Invoice
2022-10-11 13:20:41 +05:30
Nabin Hait
f6613e1e4c
feat: Tab Break in Sales Order, Delivery Note, Sales Invoice and Purchase Order
2022-10-11 13:18:21 +05:30
ruthra kumar
9e2bd10d03
test: value error on serial no validation on pos
2022-10-11 12:54:50 +05:30
Deepesh Garg
b99b2b75ca
Merge pull request #32477 from rasos/patch-1
...
Austria chart of accounts update
2022-10-11 10:20:49 +05:30
Anand Baburajan
ba754825b9
Merge branch 'develop' into fix_budget_autoname
2022-10-10 23:17:18 +05:30
anandbaburajan
e4d7d8c42d
fix: use naming_series in budget
2022-10-10 23:04:34 +05:30
codezart
2d30b36cca
fix: number of months subscription plan
2022-10-10 11:24:42 -04:00
ruthra kumar
65194efa97
Merge pull request #32548 from ruthra-kumar/suppress_linked_doc_valdiation_on_delete
...
fix: allow deletion of cancelled Invoices once payments are unlinked
2022-10-10 16:41:07 +05:30
ruthra kumar
143f905838
test: update ple on payment unlink for SI's and SO's
2022-10-10 15:57:38 +05:30
ruthra kumar
537d953f4c
fix: unlink payment on invoice cancellation
2022-10-10 10:17:19 +05:30
Deepesh Garg
17201facf1
Merge pull request #32522 from deepeshgarg007/tax_withholding_related_fixes
...
fix: Tax withholding related fixes
2022-10-07 16:32:18 +05:30
Deepesh Garg
781d160c68
fix: Do not add tax withheld vouchers post tax withheding in one document
2022-10-07 14:22:40 +05:30
Deepesh Garg
abf5b6be3e
fix: Tax withholding related fixes
2022-10-07 14:04:36 +05:30
Ankush Menat
8d1db0ea3d
fix: single column indexes ( #32425 )
...
refactor: move single column indexes to doctypes
2022-10-06 11:28:26 +05:30
Dany Robert
c35adcf5a1
feat(JE): trigger account field when fetched from template
...
Closes #32409
2022-10-03 19:31:20 +05:30
Roland
7d84cca431
Austria chart of accounts update
...
improved mapping of VAT accounts
2022-10-03 14:13:27 +02:00
niralisatapara
e758a753f8
Item Wise TDS Calculation
...
For calculating Item wise TDS in Purchase Invoice.
2022-10-03 16:39:35 +05:30
rohitwaghchaure
1c5ae80029
Merge pull request #32466 from rohitwaghchaure/allow-to-return-expired-batches
...
fix: not able to return sold expired batches
2022-10-03 13:14:59 +05:30
Deepesh Garg
8c23b19da1
Merge pull request #32394 from maharshivpatel/fix-payment-request-fetch-swift-number
...
fix: fetch swift number in payment request from bank doctype
2022-10-03 12:55:02 +05:30
Rohit Waghchaure
0b1727cf79
fix: not able to return sold expired batches
2022-10-03 12:06:32 +05:30
Shridhar Patil
69efd2ee24
fix: fixes query builder order by issue in postgres ( #32441 )
...
* fix: fixes query builder order by issue in postgres
* fix: linter
2022-10-03 11:07:24 +05:30
Deepesh Garg
1c560a967c
Merge branch 'develop' into fix-payment-request-fetch-swift-number
2022-10-01 16:14:27 +05:30
Maharshi Patel
62c5b28690
fix: typo in sales_register's filter mode_of_payment ( #32371 )
...
* fix: typo in sales_register's filter mode_of_payment
2022-10-01 11:04:53 +05:30
Maharshi Patel
dc8d49260c
fix: payment request make bank field Link instead of Read Only
2022-09-30 16:22:57 +05:30
Deepesh Garg
cceb29c005
Merge pull request #32412 from deepeshgarg007/tcs_deduction_issue
...
fix: Incorrect TCS amount deducted in Sales Invoice
2022-09-30 16:05:30 +05:30
Maharshi Patel
9245d3b5cd
Revert "fix: fetch swift_number in payment_request"
...
This reverts commit f42a8e4e03
2022-09-30 15:35:12 +05:30
Sagar Sharma
b1edd911f9
Merge branch 'develop' into remove_code_for_buying_side_discount_accounting
2022-09-30 12:39:29 +05:30
Deepesh Garg
bff3cd9068
chore: Remove print statements
2022-09-28 20:13:24 +05:30
Deepesh Garg
08443c6421
fix: Incorrect TCS amount deducted in Sales Invoice
2022-09-28 20:11:00 +05:30
Maharshi Patel
f42a8e4e03
fix: fetch swift_number in payment_request
...
There isn't direct link between payment_request and bank so swift_number wasn't fetched using Fetch form. I fixed it by fetching swift_number on_change of bank_account.
2022-09-28 12:54:00 +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
21095502b9
chore: clean up purchase invoice and purchase invoice item
...
1. remove discount accounting related fields from purchase invoice and
purchase invoice item
2. clean buying settings doctype
2022-09-27 11:10:41 +05:30
rohitwaghchaure
106ee1bf4d
Merge pull request #32339 from rohitwaghchaure/fixed-opening-entry-trial-balance-issue
...
fix: opening entry causing discrepancy between stock and trial balance
2022-09-26 20:32:41 +05:30
ruthra kumar
8b21d27f04
Merge pull request #32310 from nishibakabeer/patch-4
...
fix: total value in all keys
2022-09-26 11:27:47 +05:30
nishibakabeer
6919f389aa
fix: total value in all keys
...
Gross and net profit report showing wrong values in monthly quarterly and half yearly filters which is the total value
@ruthra-kumar added in develop branch as suggested ( https://github.com/frappe/erpnext/pull/32020 )
2022-09-26 10:40:55 +05:30
Rohit Waghchaure
bc3ab45af2
fix: opening entry causing discepancy between stock and trial balance
2022-09-23 15:21:09 +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
Deepesh Garg
38d00f407e
Merge pull request #32225 from nabinhait/dunning-fix
...
fix: create dunning from sales invoice
2022-09-16 11:04:55 +05:30
Deepesh Garg
e4ef6c9645
Merge pull request #32219 from nabinhait/bank-clearnance-perm-issue
...
fix: No permission to read doctype
2022-09-16 11:04:42 +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
Nabin Hait
c0da948a4e
fix: No permission to read doctype
2022-09-15 11:27:35 +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
Maharshi Patel
62163ab3d3
fix: item wise sales register taxes and charges
...
i have added separate column for other charges. Instead of adding all values to tax_total, it checks if account_type is tax, and then only it adds to total_tax otherwise it adds to the total_other_charges.
2022-09-12 23:44:56 +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
Nihantra C. Patel
e2b4ae13fa
fix: Set filter condition and spell in AR
2022-09-12 14:09:42 +05:30
Ankush Menat
12d99b3292
refactor: use util method for checking if job is queued
2022-09-12 13:14:48 +05:30
ruthra kumar
0aeb7c6484
Merge pull request #32156 from ruthra-kumar/bug_multiple_call_to_ple_creation
...
fix: remove duplicate call to ple creation
2022-09-11 12:21:01 +05:30
ruthra kumar
4adc372f9a
fix: remove multiple call to ple creation
2022-09-11 11:52:17 +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
acb88e5c57
Merge pull request #31850 from HarryPaulo/add-two-new-filters-gross-profit
...
feat: two new filters for gross profit
2022-09-04 15:56:54 +05:30
Deepesh Garg
1a61d4e8a8
Merge branch 'develop' into fix-consolidation-precision-error
2022-09-04 13:18:10 +05:30
Deepesh Garg
ad8d0efa29
chore: Linting Issues
2022-09-04 13:15:59 +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
64f8010a25
Merge pull request #32052 from ruthra-kumar/key_error_on_consolidate_financial_report
...
fix: key error on consolidated financial report
2022-09-02 16:13:19 +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
ruthra kumar
6e8395cccd
fix: key error on consolidated financial report
...
accounts with same name but different account number will throw key
error on consolidated report
2022-09-02 09:55:24 +05:30
Solufyin
2085626390
fix: Naming series in Journal Entry Template
2022-09-01 11:49:13 +05:30
ruthra kumar
25072e5d32
Merge pull request #32009 from ruthra-kumar/add_remarks_to_payment_ledger
...
refactor: readd remarks field to payment ledger
2022-08-29 19:48:36 +05:30
ruthra kumar
5782c4469a
refactor: re-add remarks field to payment ledger and AR/AP report
2022-08-29 15:59:37 +05:30
Deepesh Garg
87ca23736d
Merge pull request #31988 from ruthra-kumar/remove_precision_discount_percentage
...
chore: remove precision on discount_percentage of Sales Invoice Item
2022-08-26 16:03:57 +05:30
ruthra kumar
c42fef541a
chore: remove precision on discount_percentage of Sales Invoice Item
2022-08-26 13:15:55 +05:30
ruthra kumar
6aa8fd0f7b
fix: restrict party types to Supplier/Customer for AR/AP report
2022-08-25 15:50:06 +05:30
Deepesh Garg
e9b0c7177f
Merge branch 'develop' into fix-consolidation-precision-error
2022-08-25 11:41:20 +05:30
Deepesh Garg
77906ea4ab
Merge pull request #31934 from ruthra-kumar/disable_discount_accounting_for_buying
...
refactor: disable discount accounting on Buying module(PI)
2022-08-25 10:34:30 +05:30
ruthra kumar
e5b04d54ff
fix: display amount in account currency if party is supplied
2022-08-25 10:05:25 +05:30
ruthra kumar
ee889afd4c
Merge pull request #31942 from ruthra-kumar/bug_ar_ap_report_include_payment_against_po
...
fix: include payment against PO in AR/AP report
2022-08-25 09:40:45 +05:30
ruthra kumar
36f5883dda
test: payments against so/po will show up as outstanding amount
...
1. Class will use FrappeTestCase fixture
2. setup and teardown methods are introduced
3. test for payments against SO
2022-08-24 13:59:42 +05:30
ruthra kumar
fdd167cac1
fix: include payment against PO in AR/AP report
2022-08-24 12:24:55 +05:30
ruthra kumar
277ef04b60
test: remove discount accounting tests
2022-08-23 15:17:27 +05:30
ruthra kumar
a956e20f29
refactor: disable discount accounting on Buying module(PI)
2022-08-23 11:36:00 +05:30
Deepesh Garg
9fd0c25c9f
Merge pull request #31910 from deepeshgarg007/cash_and_non_trade_discount_fix
...
fix: Cash and non trade discount calculation
2022-08-23 10:19:09 +05:30
Maharshi Patel
42de9ca49e
fix: TDS calculation for advance payment
...
"against_voucher": ["is", "not set"] was used in query due to which if TDS was added on "advance" payment vouchers and then reconciled against purchase invoice. it will not find those vouchers and consider this as first-time threshold due to which it will calculate Tax for all transactions.
(cherry picked from commit a4521437825a960e14556fa3963bd1bd1a55a2dc)
2022-08-22 03:29:46 +00:00
Deepesh Garg
3b15966cc9
fix: Cash and non trade discount calculation
2022-08-21 17:51:05 +05:30
Saqib Ansari
756fe4b375
fix(pos): edge case while closing pos ( #31748 )
...
* fix(pos): edge case while closing pos
* fix: linter
* fix: setting posting_time in pos invoice merge log
2022-08-19 10:22:00 +05:30
ruthra kumar
72a7ed5b58
Merge pull request #31871 from ruthra-kumar/fix_gross_profit_valuation_rate
...
fix: incorrect buying amount in Gross Profit rpt
2022-08-18 16:08:19 +05:30
ruthra kumar
967dd398e7
fix: incorrect buying amount in Gross Profit rpt
2022-08-17 16:21:03 +05:30
ruthra kumar
ea84c157e0
Merge pull request #31856 from ruthra-kumar/incorrect_tax_due_to_exchange_rate
...
fix: incorrect tax amt due to different exchange rate in PR and PI
2022-08-17 15:05:57 +05:30
ruthra kumar
5fd0770372
fix: incorrect tax amt due to different exchange rate in PR and PI
2022-08-16 16:41:33 +05:30
hrzzz
3ef551872a
fix: remove spaces and order import
2022-08-15 09:23:56 -03:00
hrzzz
27891ecb77
feat: two new filters for gross profit
2022-08-15 09:14:23 -03:00
Deepesh Garg
79ac50d0f7
fix: Unable to make payment entry against Fees using education app
2022-08-11 19:31:31 +05:30
Saqib Ansari
33762dbbac
fix(pos): error while consolidating pos invoices
2022-08-10 14:17:28 +05:30
Akash Krishna
32b30bc5de
Tds report ( #31801 )
...
* fix: TDS Computation Summary Report not loading, too many values to unpack
2022-08-09 17:41:02 +05:30
Raffael Meyer
6b510546ae
fix: german translations ( #31732 )
2022-08-09 15:11:52 +05:30
Deepesh Garg
b85dbdc3c1
Merge pull request #31777 from ruthra-kumar/intercompany_po_bug
...
fix: intercompany SO created from Purchase Order throws exception
2022-08-08 16:06:09 +05:30
Sagar Vora
a3625b3817
fix: set billing_address for purchases in get_party_details
2022-08-08 06:04:10 +00:00
ruthra kumar
af0a353b79
fix: intercompany SO throws exception
2022-08-04 14:01:23 +05:30
ruthra kumar
ef312b8fc4
test: posting_date should not affect outstanding amount calculation
2022-08-04 09:38:01 +05:30
ruthra kumar
5f1562c5b2
fix: posting_date of linked vouchers should not affect outstanding
...
posting_date filter should not be applied for linked vouchers.
2022-08-04 09:38:01 +05:30
HarryPaulo
ea88451875
fix: getting error to show sales invoice group or print rep… ( #31756 )
...
fix: formatter getting error to show sales invoice group or print report.
1 - When I view the Gross Profit report in Sales Invoice mode, the table is all broken.
Error on browser console:
TypeError: Cannot read properties of undefined (reading 'indent')
2 - When I try to print, no matter the Group (Sales Invoice, Item Code, Item Group...) nothing happens. in browser log console I have the following error:
TypeError: Cannot read properties of undefined (reading 'content')
i fixed both errors and all working perfectly.
2022-08-03 11:21:30 +05:30
Devin Slauenwhite
9c580dde39
fix: linter ( #31763 )
2022-08-03 11:16:59 +05:30
Suraj Shetty
273c6ff598
Merge pull request #31690 from phot0n/fix-payments-stuff
2022-07-27 14:37:15 +05:30
phot0n
0048bcb067
chore: fix linter
2022-07-27 12:34:52 +05:30
Deepesh Garg
1e3918d637
Merge pull request #31286 from SolufyPrivateLimited/solufy_rec_pay_report
...
fix: Added total of future amount, Remaining Balance in Payable and Receivable reports
2022-07-27 08:26:16 +05:30
Deepesh Garg
98b42ce786
Merge pull request #31676 from ruthra-kumar/fix_tax_withholding_checkbox_on_PI
...
fix: enable tax withholding checkbox in PI with supplier_tds
2022-07-25 12:56:29 +05:30
Gavin D'souza
cb73528c9c
test: Use assertSequenceEqual for comparision between Tuple / Lists
...
Use AssertSequence for type agnostic checks
2022-07-25 11:54:49 +05:30
phot0n
ef14da21bc
fix: payment utils import paths
...
Since we're splitting payments app from frappe, updating
ERPnext paths as well
2022-07-25 10:38:09 +05:30
ruthra kumar
b461724416
fix: enable tax withholding checkbox in PI with supplier_tds
2022-07-22 14:32:14 +05:30
ruthra kumar
04c1019242
fix: update SO's percentage billed on credit note
...
Credit Note created from Sales Return will update precentage billed in
Sales Order accordingly
2022-07-21 13:05:34 +05:30
ruthra kumar
739d328412
Merge pull request #31537 from ruthra-kumar/add_index_to_payment_ledger
...
refactor: create index for payment ledger
2022-07-21 12:50:39 +05:30
Saqib Ansari
d578afab55
fix: rounding errors while closing pos ( #31654 )
2022-07-21 12:18:28 +05:30
Saqib Ansari
2eaa8b17bd
fix(pos): validate product bundles while submitting pos invoice ( #31615 )
2022-07-21 12:17:58 +05:30
Rucha Mahabal
f222284c33
Merge branch 'develop' into hr-separation
2022-07-20 15:47:40 +05:30
Rucha Mahabal
f2532a6aaa
Merge branch 'develop' into hr-separation
2022-07-20 14:22:27 +05:30
Nabin Hait
516be870df
fix: Renamed status field to gle_processing_status
2022-07-20 11:07:02 +05:30
Rucha Mahabal
b30f66c029
chore: use get_single_value in place of get_value
2022-07-19 17:51:03 +05:30
Nabin Hait
69b906438d
fix: set status on submit/cancel
2022-07-19 15:05:56 +05:30
Nabin Hait
914a388ee3
test: Added test for PCV cancellation
2022-07-19 14:34:01 +05:30
Nabin Hait
4caaab32d1
perf: Optimization of gl entry processing logic in period closing voucher
2022-07-19 14:33:49 +05:30
Deepesh Garg
a6ff4db2ec
fix: Supplier details in TDS monthly report ( #31599 )
2022-07-19 10:14:44 +05:30
Rucha Mahabal
db586afc7b
chore: Remove Salary Component Accounts doctype from Accounts module
2022-07-13 13:38:58 +05:30
Rucha Mahabal
d8aa1c59f1
Merge branch 'develop' into hr-separation
2022-07-12 19:27:19 +05:30
Deepesh Garg
9b40f70ac2
Merge branch 'develop' into add_index_to_payment_ledger
2022-07-11 21:18:10 +05:30
Deepesh Garg
0b822dade0
Merge pull request #31566 from deepeshgarg007/ignore_account_currency
...
fix: Allow multi currency invoice against single party account
2022-07-11 21:14:02 +05:30
Rucha Mahabal
5a51951224
test: Basic Payment Entry for Employee
2022-07-11 14:36:33 +05:30
Deepesh Garg
c83fbd5c50
fix: Allow multi currency invoice against single party account
2022-07-11 13:43:01 +05:30
Rucha Mahabal
cd9a01be5f
test: Loan entries in Bank Reco Statement report
2022-07-11 11:57:25 +05:30
ruthra kumar
74d9fc2155
refactor: create index for payment ledger
2022-07-11 11:17:27 +05:30
Rucha Mahabal
f6fb00b59d
test: Matching Loan Repayment query in Bank Reco
2022-07-08 19:28:38 +05:30
Rucha Mahabal
108cce2785
refactor: rewrite raw sql queries with frappe.qb and database API
2022-07-07 19:00:19 +05:30
Rucha Mahabal
ef02e58859
Merge branch 'develop' into hr-separation
2022-07-07 13:46:54 +05:30
Sagar Sharma
f9885746a8
Merge branch 'develop' into subcontracting
2022-07-07 09:56:23 +05:30
Nihantra C. Patel
3e670eda68
fix: Set the condition to create a purchase receipt
2022-07-05 21:19:50 +05:30
Deepesh Garg
37f7801cfb
Merge pull request #29884 from resilient-tech/remove-india
...
refactor: remove India specific code
2022-07-05 18:50:41 +05:30
Sagar Sharma
f75d35ed60
Merge branch 'develop' into subcontracting
2022-07-05 11:25:08 +05:30
ruthra kumar
104c45ecc4
fix: test pr output for amount and currency
2022-07-04 18:04:29 +05:30
Deepesh Garg
ac9d38aa1c
Merge pull request #31499 from ruthra-kumar/bug_use_account_currency_on_reconciliation_tool
...
fix: Use account currency on Payment Reconciliation tool
2022-07-03 19:20:29 +05:30
Sagar Vora
05351bee8b
Merge remote-tracking branch 'upstream/develop' into remove-india
2022-07-03 18:07:44 +05:30
Deepesh Garg
b168d2fc25
Merge branch 'develop' of https://github.com/frappe/erpnext into e_invoice_discounts
2022-07-03 11:02:32 +05:30
Deepesh Garg
38352b3e46
test: Add test for einvoice discounts
2022-07-02 22:27:20 +05:30
Deepesh Garg
b4f6429e32
Merge branch 'develop' of https://github.com/frappe/erpnext into e_invoice_discounts
2022-07-02 18:42:31 +05:30
Rucha Mahabal
466bf99835
fix: Remove Expense Claim from Bank Reconciliation
...
- add hooks `get_matching_queries` and `bank_reconciliation_doctypes` to extend the functionality in other apps
2022-07-01 19:01:17 +05:30
ruthra kumar
c9d67defd8
test: PR output should have account currency
2022-07-01 13:02:14 +05:30
ruthra kumar
219855311d
fix: wrong amount fetched in payment reconciliation tool
...
- fetch amount on account currency for outstanding invoices and
- unreconcilied dr/cr notes
- fix currency field name in payment ledger entry creation
2022-07-01 12:47:07 +05:30
Rucha Mahabal
3051f6e7f2
fix: Update triggers on Payment Reconciliation
2022-06-30 21:37:55 +05:30
Deepesh Garg
536e768ba9
fix: Internal PI link in Sales Invoice
2022-06-30 21:29:54 +05:30
Sagar Sharma
6589c5f5e9
Merge branch 'develop' into subcontracting
2022-06-29 17:29:24 +05:30
Rucha Mahabal
ef63c61ebd
Merge branch 'develop' into hr-separation
2022-06-29 12:35:51 +05:30
Deepesh Garg
3bbbf02ca8
Merge pull request #31460 from ruthra-kumar/bug_ar/ap_rpt_delivery_note
...
fix: 'attribute error' on AR/AP report with delivery note filter
2022-06-29 08:06:34 +05:30
Sagar Sharma
78ff1783b1
Merge branch 'develop' into subcontracting
2022-06-28 22:20:32 +05:30
Rucha Mahabal
6a65c8aff4
Merge branch 'develop' into hr-separation
2022-06-28 11:51:59 +05:30
Rucha Mahabal
2b255bdddb
fix: Bank Statement loan amount query
2022-06-27 19:18:13 +05:30
ruthra kumar
3cd34ebab6
fix: 'attribute error' on AR/AP report with delivery note filter
2022-06-27 17:29:25 +05:30
Sagar Vora
7f390fb755
Merge branch 'develop' into remove-india
2022-06-26 18:10:44 +05:30
Deepesh Garg
9c1eb770ba
Merge pull request #31442 from ruthra-kumar/incorrect_outstanding_on_multiple_cost_centers
...
fix: incorrect outstanding for invoice
2022-06-25 19:42:14 +05:30
Deepesh Garg
6acd0325be
fix: General Ledger and TB opening entries mismatch issues
2022-06-24 21:45:05 +05:30
ruthra kumar
321fea322c
test: invoice outstanding when gl's are split on cost center allocat
2022-06-24 17:47:11 +05:30
Sagar Vora
b6133c300e
test: create TDS payable account
2022-06-24 16:46:52 +05:30
Sagar Vora
4a2a02286a
test: create tax withholding category instead of updating
2022-06-24 15:49:19 +05:30
Sagar Vora
69ff61c838
fix: add Lower Deduction Certificate to the Accounting workspace for now
2022-06-24 15:12:43 +05:30
