ruthra kumar
37895a361c
chore(test): fix broken test case
2023-07-26 22:33:58 +05:30
ruthra kumar
70dd9d0671
chore(test): fix broken unit test
2023-07-26 22:33:58 +05:30
ruthra kumar
6e18bb6456
refactor: cancel gain/loss JE on Journal as payment cancellation
2023-07-26 22:33:58 +05:30
ruthra kumar
f119a1e115
refactor: linkage between journal as payment and gain/loss journal
2023-07-26 22:33:58 +05:30
ruthra kumar
cd42b26839
chore: code cleanup
2023-07-26 22:33:58 +05:30
ruthra kumar
5b06bd1af4
refactor(test): exc gain/loss journal for advance in purchase invoice
2023-07-26 22:33:58 +05:30
ruthra kumar
ee2d1fa36e
refactor(test): payment will have same exch rate - no gain/loss
...
while making payment entry using reference to sales/purchase invoice,
it herits the parent docs exchange rate. so, there will be no exchange
gain/loss
2023-07-26 22:33:58 +05:30
ruthra kumar
389cadf157
refactor(test): assert Exc journal when reconciling Journa to invoic
2023-07-26 22:33:58 +05:30
ruthra kumar
00a2e42a47
refactor(test): exc gain/loss booked through journal
2023-07-26 22:33:58 +05:30
ruthra kumar
4ff53e1062
refactor: assert exchange gain/loss amount in reference table
2023-07-26 22:33:58 +05:30
ruthra kumar
92ae9c2201
refactor: remove unused variable, pe should pull in parent exc rate
...
1. 'reference_doc' variable is never set. Hence, removing.
2. set_exchange_rate() relies on ref_doc, which was never
set due to point [1]. Replacing it with 'doc'.
3. Sales/Purchase Invoice has 'conversion_rate' field for tracking
exchange rate. Added a get statement for them as well.
2023-07-26 22:33:58 +05:30
ruthra kumar
c1184585ed
refactor: helper method
2023-07-26 22:33:58 +05:30
ruthra kumar
34b5e849a2
chore: fix logic for purchase invoice and some typos
2023-07-26 22:33:58 +05:30
ruthra kumar
13febcac81
refactor: add new reference type in journal entry account
2023-07-26 22:33:58 +05:30
ruthra kumar
7e94a1c51b
refactor: replace with new method in purchase invoice
2023-07-26 22:33:58 +05:30
ruthra kumar
81cd7873d3
refactor: book exchange gain/loss through journal
2023-07-26 22:33:58 +05:30
ruthra kumar
e79f80331d
Merge pull request #36322 from frappe/mergify/bp/develop/pr-36298
...
fix: show invoices name instead of object address (backport #36298 )
2023-07-26 16:11:56 +05:30
Deepesh Garg
f368894d22
Merge pull request #36238 from RitvikSardana/develop-ritvik-pos-dark
...
fix: POS closing with item name
2023-07-26 15:33:44 +05:30
gouravengineer
a5b626420d
fix: show invoices name instead of object address
...
comma_and function in expecting a list but it gets a tuple so it is returning a object instead of a string
(cherry picked from commit cf93714a7cce465d241bf4e713ee7492c5c01bfa)
2023-07-26 15:30:03 +05:30
Deepesh Garg
30554301c9
Merge pull request #36235 from resilient-tech/fix-tax-breakup-for-diff-tax-rates
...
fix: Correct Tax Breakup for different tax rates for same hsn code
2023-07-24 20:57:26 +05:30
Deepesh Garg
3f81e15672
Merge pull request #36147 from deepeshgarg007/eslint
...
refactor(ci): add eslint and update linting confs
2023-07-24 20:55:07 +05:30
Smit Vora
1b8490dc98
Merge branch 'develop' into fix-tax-breakup-for-diff-tax-rates
2023-07-24 20:20:19 +05:30
Deepesh Garg
164df33419
Merge pull request #36274 from GursheenK/process-soa-customer-filter
...
fix: customer filter in process soa
2023-07-24 17:32:17 +05:30
Gursheen Anand
34d7fb388d
fix: customer filter in process soa
2023-07-24 16:47:06 +05:30
ruthra kumar
3dd119eeea
refactor: apply terms based validation only on sales/purchase doctyp
2023-07-24 14:50:11 +05:30
ruthra kumar
a785a6054e
Merge pull request #36251 from ruthra-kumar/performance_tune_timsheet_adding_logic
...
fix: unresponsive sales invoice page
2023-07-24 14:01:07 +05:30
Ritvik Sardana
8b4228d616
fix: removed duplicate code
2023-07-24 13:59:24 +05:30
Ritvik Sardana
5389dabe19
Merge branch 'develop' of https://github.com/frappe/erpnext into develop-ritvik-pos-dark
2023-07-24 12:48:58 +05:30
Ritvik Sardana
82b36e2ec8
fix: added test for pos closing without item code
2023-07-24 12:47:29 +05:30
ruthra kumar
740f283ec1
Merge pull request #36241 from ruthra-kumar/fix_allocation_logic_in_get_outstanding_invoices
...
fix: multiple fixes on payment terms based issues in payment entry
2023-07-24 12:35:25 +05:30
Deepesh Garg
cdc9b62688
chore: Remove cur_frm from sales_invoice.js
2023-07-23 22:44:18 +05:30
ruthra kumar
d048365da3
refactor: refresh table once after loop ends
2023-07-23 19:56:30 +05:30
Deepesh Garg
0d70ae2a21
chore: Ingnore issues
2023-07-23 19:34:08 +05:30
Deepesh Garg
8ccb8e3c5b
chore: Move buying controller to utils
2023-07-23 18:50:44 +05:30
Deepesh Garg
7205fb9b97
chore: convert sales common to utils
2023-07-23 12:07:21 +05:30
ruthra kumar
ec7558b9e0
refactor: handle references without any template and payment_term
2023-07-23 11:55:16 +05:30
ruthra kumar
662ccd467c
fix: allocation logic on 'Get Outstanding Invoices' btn in PE
...
1. fixed broken `payment_term` filter in Payment References section
2. Throw error if user fails to select 'Payment Term' for an invoice
with 'Payment Term based allocation' enabled.
2023-07-23 11:37:27 +05:30
Deepesh Garg
4077254b01
chore: resolve undefined variables issue
2023-07-22 23:07:18 +05:30
ruthra kumar
e6abe1b77f
Merge pull request #36206 from ruthra-kumar/test_cases_for_payment_term_overallocation
...
test: overallocation validation in payment entry
2023-07-22 10:41:01 +05:30
ruthra kumar
93246043ec
chore(test): enable multi-currency party for testing
2023-07-22 10:01:59 +05:30
ruthra kumar
8f9ef4ef5b
chore: validation on multi-currency tran on company curtency account
2023-07-22 09:20:55 +05:30
ruthra kumar
5b37919574
chore: use flt for currency
2023-07-22 09:20:55 +05:30
ruthra kumar
6b4a81ee48
chore: test more scenarios
2023-07-22 09:20:44 +05:30
DaizyModi
653117c2a9
test: fix test case for itemised tax breakup
2023-07-21 17:56:33 +05:30
Ritvik Sardana
7069e2a5a0
fix: removed validate_item_code function in sales_invoice
2023-07-21 17:18:35 +05:30
Deepesh Garg
76db0b63ba
Merge pull request #36214 from deepeshgarg007/tb_cancelled_entries
...
fix: Trial Balance report considering cancelled entries
2023-07-20 18:48:03 +05:30
Deepesh Garg
fd58bbff6b
fix: Trial Balance report considering cancelled entries
2023-07-20 17:51:54 +05:30
Deepesh Garg
3bc79eebe3
Merge pull request #35689 from marination/payments-based-dunning
...
feat: Payments based dunning
2023-07-20 12:06:36 +05:30
ruthra kumar
e7e3853f81
test: overallocation validation in payment entry
2023-07-20 09:08:55 +05:30
ruthra kumar
bccfd22fc0
Merge pull request #36181 from ruthra-kumar/fix_broken_overallocation_validation_on_multi_term_payment_against_invoice
...
fix: broken overallocation validation in payment entry
2023-07-19 10:46:41 +05:30
