barredterra
2a77b50191
chore: migrate translations from frappe
2023-09-10 00:17:02 +02:00
ruthra kumar
d398775715
test: multi currency invoice unreconciliation
...
exchange gain/loss associated with the unreconcile invoice should be
cancelled as well
2023-09-09 07:30:58 +05:30
ruthra kumar
5c09fdf941
refactor(test): more modularization
2023-09-09 06:54:50 +05:30
ruthra kumar
1d93d66c30
refactor: cancel gain/loss JE on multi currency transactions
2023-09-08 21:29:13 +05:30
Florian HENRY
bb8153173a
Merge branch 'develop' of https://github.com/frappe/erpnext into dev_remove_regional_france
2023-09-07 13:14:45 +02:00
Anand Baburajan
034322c53f
fix: correct asset daily depr schedule calculation [dev] ( #36993 )
...
fix: correct asset daily depr schedule calculation
2023-09-06 22:20:38 +05:30
Florian HENRY
f447177f8d
refactor: Remove Regionalisation From France as now there is an App ERPNext France to manage it
2023-09-06 17:41:27 +02:00
Florian HENRY
662e9547da
refactor: Remove Regionalisation From France as now there is an App ERPNext France to manage it
2023-09-06 17:40:19 +02:00
Deepesh Garg
c2f8f1d028
Merge pull request #36983 from deepeshgarg007/employee_utils
...
chore: Update employee for tests
2023-09-06 16:31:29 +05:30
Ankush Menat
0f065fe280
Merge pull request #36984 from resilient-tech/remove-unused-var
...
chore: remove unused variable `job`
2023-09-06 14:49:17 +05:30
Sagar Vora
1b853857aa
chore: remove unused variable job
2023-09-06 14:14:22 +05:30
Deepesh Garg
ae01d70b33
chore: Update employee for tests
2023-09-06 13:19:00 +05:30
Anand Baburajan
0077659e93
chore: asset finance books validation ( #36979 )
2023-09-06 12:44:07 +05:30
Devin Slauenwhite
8ce6b8179e
fix: use primary key for link lookup ( #36919 )
2023-09-06 11:44:45 +05:30
anandbaburajan
e1a94a9ba1
fix: move SI and DI connected links to internal_and_external_links
2023-09-05 21:38:06 +05:30
Gursheen Anand
175870ce8d
test: tax withholding details report
2023-09-05 18:51:41 +05:30
Gursheen Anand
8eea4eb56e
fix: remove tax category from common fields
2023-09-05 18:50:53 +05:30
Anand Baburajan
174f95d699
fix: ask for asset related accounts only when needed ( #36960 )
...
* fix: only ask for asset_received_but_not_billed account when needed
* chore: remove unnecessary if condition
* fix: only ask for expenses_included_in_asset_valuation account when needed
2023-09-05 17:45:23 +05:30
s-aga-r
f809e12747
fix: ignore mandatory fields while saving WO ( #36954 )
2023-09-05 16:27:17 +05:30
ruthra kumar
ccd2e2b086
Merge pull request #36963 from ruthra-kumar/index_error_on_receivable_report
...
fix: index error on Receivable report based on payment terms
2023-09-05 16:12:38 +05:30
ruthra kumar
b9c556c4a9
fix: index error on Receivable report based on payment terms
...
cr note's don't have payment terms. So, skip for them.
2023-09-05 15:07:07 +05:30
RitvikSardana
d2f03c8a65
fix: payment recon not showing payment entry when party_type is Student ( #36920 )
...
* fix: payment recon not showing payment entry when party_type is Student
* chore: code cleanup
* fix: payment recon based on account_type which is fetched from Party Type master
2023-09-05 12:00:54 +05:30
ruthra kumar
5dbcf7d2b9
refactor: only cancel specific gain/loss je
2023-09-05 09:52:36 +05:30
ruthra kumar
6fd1c1bca2
refactor: display allocated amount in account currency with symbol
2023-09-05 09:34:01 +05:30
ruthra kumar
9a1588f1cc
fix: typo in doctype name and qb
2023-09-05 08:34:26 +05:30
ruthra kumar
67980188a7
test: more granular unreconciliation
2023-09-05 08:34:26 +05:30
ruthra kumar
9b6eac23b6
refactor: unlink individual vouchers from payments
2023-09-05 08:34:26 +05:30
ruthra kumar
b4dc2bdf28
chore: type info
2023-09-05 08:34:26 +05:30
ruthra kumar
0130aea2aa
refactor: convert raw sql to query_builder
2023-09-05 08:34:26 +05:30
ruthra kumar
de910ab152
refactor: single fetch and unlinking logic for JE and PE
2023-09-05 08:34:26 +05:30
ruthra kumar
285963acdb
feat: unreconcile support for journal entry
2023-09-05 08:34:26 +05:30
ruthra kumar
cce96669f0
refactor: modularisation and group by voucher_no
2023-09-05 08:34:26 +05:30
ruthra kumar
0ccb6d8242
chore: rename and add trigger in journal entry
2023-09-05 08:34:26 +05:30
ruthra kumar
69683776a5
chore: code cleanup
2023-09-05 08:34:26 +05:30
ruthra kumar
1981f3837a
chore: fetch logic for payment entry
2023-09-05 08:34:26 +05:30
ruthra kumar
25fe752185
chore: move functions to a separate file in utils
2023-09-05 08:34:26 +05:30
ruthra kumar
5981c7e0ad
chore: move dialog building function to utils.js file
2023-09-05 08:34:26 +05:30
ruthra kumar
58dc0e52e1
refactor: add UI elements
2023-09-05 08:34:26 +05:30
ruthra kumar
6bbe47c671
chore: delete unreoncile doc upon parent doc deletion
2023-09-05 08:34:26 +05:30
ruthra kumar
489a545bbb
chore: track changes
2023-09-05 08:34:26 +05:30
ruthra kumar
42df0d3d67
refactor: remove references using framework
2023-09-05 08:34:26 +05:30
ruthra kumar
fbdfb8151c
chore: delete references upon parent deletion
2023-09-05 08:34:26 +05:30
ruthra kumar
41eb2c9f5a
feat: filter on voucher no
2023-09-05 08:34:26 +05:30
ruthra kumar
fc6be5bfb9
feat: UI for unreconcile
2023-09-05 08:34:26 +05:30
ruthra kumar
0faffaa8db
test: basic unreconcile function
2023-09-05 08:34:26 +05:30
ruthra kumar
5114a9580d
refactor: adding 'Get Allocations' button
2023-09-05 08:34:26 +05:30
ruthra kumar
e48a90efe6
chore: working state on barebones functions
2023-09-05 08:34:26 +05:30
ruthra kumar
dc71623295
feat: introduce unreconcile doctype
2023-09-05 08:34:26 +05:30
ruthra kumar
13ca474a46
Merge pull request #36950 from ruthra-kumar/use_reference_posting_date_on_je
...
refactor: gain/loss je should use same posting date as payment
2023-09-05 08:26:58 +05:30
ruthra kumar
f7865da4d2
refactor: gain/loss should use same posting date as payment
2023-09-04 21:40:40 +05:30
