6793 Commits

Author SHA1 Message Date
mergify[bot]
4b76cc46a1
fix: split_invoices_based_on_payment_terms (backport #37859) (#38488)
* refactor: `split_invoices_based_on_payment_terms`

- Invoices were in the wrong order due to the logic. The invoices with payment terms were added first and the rest after.
- Overly long function with unnecessary loops (reduced to one main loop) and complexity
- The split row as per payment terms was not ordered. So the second installment was allocated first

(cherry picked from commit 6bd56d2d5f62814eb2f777934ed894bc5709e947)

* test: `get_outstanding_reference_documents` (triggered via UI)

(cherry picked from commit 162c0497d1db69e3af5f142459e3a875f03962af)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/test_payment_entry.py

* fix: Alert message and make sure invoice due dates are different for effective test

- Make invoice due dates are different so that the invoice with the earliest due date is allocated first in the test
- Translate voucher type, simplify alert message. The invoice could be "split" into 1 row, no. of rows in the message seems unnecessary.

(cherry picked from commit 56ac3424d22b68bbc551913133803686431d1694)

* style: Remove spaces introduced via merge conflict

(cherry picked from commit 4b4b176fcf99241bf17067989ebc850b2de24bcb)

# Conflicts:
#	erpnext/accounts/doctype/payment_entry/test_payment_entry.py

* fix: Re-add no.of rows split in alert message

(cherry picked from commit 1fc5844025d97de150195b94070b0c4061378992)

* fix: Merge conflicts in tests

---------

Co-authored-by: marination <maricadsouza221197@gmail.com>
2023-12-06 18:01:42 +05:30
ruthra kumar
ee87c2a211 refactor: ingore on JE cancel as well
(cherry picked from commit 1a5d56977e158d27210a2bfeeaa9075cb7094875)
2023-12-05 06:34:14 +00:00
ruthra kumar
c83c97f466 refactor: ignore unreconcile doc on PI cancel/delete
(cherry picked from commit 4ca84eadb607263f8432698ff61c4acfd2f0363b)
2023-12-05 06:34:14 +00:00
ruthra kumar
b8b8c02bf9 chore: resolve conflict 2023-12-04 12:16:41 +05:30
ruthra kumar
bcbf5da905 refactor: virtual doctype methods
(cherry picked from commit 9c7b19e0b7732189c9db12e2c67b12a67fe562b3)
2023-12-04 06:31:08 +00:00
ruthra kumar
f6d481de89 refactor: convert payment reconciliation tool to virtual doctype
(cherry picked from commit 3a51a3f37ecd70c13cee558a0b882d06e812a21c)

# Conflicts:
#	erpnext/accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
2023-12-04 06:31:07 +00:00
ruthra kumar
246dd74ba4 fix: incorrectly treating normal payment as advance (#38437)
fix: treating normal payment as advance
(cherry picked from commit dd39da0b77f73dc9006c036b960b63404cc2c2f5)
2023-12-04 04:39:16 +00:00
mergify[bot]
4a558b7efb
fix: use predefined onload property load_after_mapping (#38209)
fix: use predefined onload property `load_after_mapping` (#38209)

(cherry picked from commit b6a7549407bc04225f0bb7c144284078a314f430)

Co-authored-by: Sagar Vora <sagar@resilient.tech>
2023-12-04 09:36:52 +05:30
ruthra kumar
4baf7960dd fix: remove hardcoded, implicit rounding loss allowance
(cherry picked from commit 64266c4d3826e19b293f522bfb4cbbb305f817b7)
2023-12-03 11:14:26 +00:00
mergify[bot]
0a29dbe09e
fix: don't consider cancelled entries (#38401)
* fix: don't consider cancelled entries

(cherry picked from commit adfcdb3b652aa98db96b466371788f28ab8d26b7)

* refactor: get outstanding journal entry using query builder

(cherry picked from commit ff27cccff42f9f4cd54aa6071a71687d5183091a)

---------

Co-authored-by: Devin Slauenwhite <devin.slauenwhite@gmail.com>
2023-12-02 20:07:26 +05:30
mergify[bot]
c797c533ed
fix: validation error has not throw for the batch (backport #38494) (#38502)
fix: validation error has not throw for the batch (#38494)

* fix: validation error has not throw for the batch

* chore: fix test cases

(cherry picked from commit 5e9016ffab34df9609a75a7cbbaabbb37e7159d6)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-01 21:46:35 +05:30
ruthra kumar
4a4f4ad323 refactor: handle forex payment advance entries
(cherry picked from commit 961bdf0d247fc58f7d091459bb4d0059bd6ea791)
2023-12-01 07:07:56 +00:00
ruthra kumar
5d9f71af95 refactor(test): filter on document names
(cherry picked from commit 080aa304077548a39678aabc3a33bcf3fb243a02)
2023-12-01 07:07:56 +00:00
ruthra kumar
8b6eb3599c fix(test): use correct account type for testing
(cherry picked from commit eecf9cd1d88987cfe6903c678216ba5af1e5d231)
2023-12-01 07:07:56 +00:00
ruthra kumar
25b49ef0de test: ledger pre and post reconciliation on advance as liability
(cherry picked from commit 0255e09285d62eb9bfe80f56970e0dcaef4df17f)
2023-12-01 07:07:56 +00:00
ruthra kumar
c67d0eb718 refactor(test): advance allocation on purchase invoice
(cherry picked from commit 2add802d0dbe61c536b5753f1d0f84b0896306cb)
2023-12-01 07:07:56 +00:00
ruthra kumar
86b2de4013 refactor: redefine dr_or_cr for unallocated amount
(cherry picked from commit 3e6306348ac564976fc8b0d3ef7ec12a8d9961cc)
2023-12-01 07:07:55 +00:00
ruthra kumar
a1bdd69ffd refactor: 'make_advance_gl_entries' method
make_advance_gl_entries -> add_advance_gl_entries -> add_advance_gl_for_reference

'make_advance_gl_entries' - main method thats builds and post GL
entries for all or one specific reference based on parameters

'add_advance_gl_entries' - build GL map for all or one specific
reference. Return an array of dict.

'add_advance_gl_for_reference' - utility function to build gl
entries. returns dict.

(cherry picked from commit 5fc19dab54a2672ec131dbf97974b2bde277aa76)
2023-12-01 07:07:55 +00:00
ruthra kumar
58d04e1f42 refactor: use different GL build logic for advance as liability
(cherry picked from commit 58114e7b24788f0244b89401235a6a20721b9603)
2023-12-01 07:07:55 +00:00
ruthra kumar
bb8ac94adc test: assert ledger entries on partial reconciliation
with `Advance as Liability`, partial reconciliation should not post
duplicate ledger entries for same reference

(cherry picked from commit 3263f2023c0a6ceabfbdd1eeb5202843d4532b76)
2023-12-01 07:07:54 +00:00
mergify[bot]
8819d6c173
add supplier group filter in purchase register (backport #38421) (#38483)
add supplier group filter in purchase register (#38421)

* add supplier group field in purchase register

* Update purchase_register.js

(cherry picked from commit e2a519464b3214b0a6594498dc86bc3af15197c3)

Co-authored-by: NandhiniDevi <95607404+Nandhinidevi123@users.noreply.github.com>
2023-12-01 11:51:09 +05:30
mergify[bot]
2d9ba88870
fix(ux): make valuation field read only when it can't be modified (backport #38450) (#38464)
* fix(ux): make `basic_rate` field read-only based on purpose

(cherry picked from commit abc7d3002467946984be5b41d79024da92047dd3)

* fix(ux): make PR `rate` field read-only having PO ref

(cherry picked from commit ae294ee4702fa8e0367c07c881d632811beb67ae)

* fix(ux): make PI `rate` field read-only having PR ref

(cherry picked from commit 3d4156cc7d90522f37f4c91e4ccf4145412109a9)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-11-30 17:30:35 +05:30
mergify[bot]
5e6a4d257e
feat: enable automatic type annotations (backport #38452) (#38454)
feat: enable automatic type annotations (#38452)

(cherry picked from commit 63313eef6f6618f52c7e6194f7abd345cf920b15)

Co-authored-by: Ankush Menat <ankush@frappe.io>
2023-11-30 14:43:16 +05:30
Sagar Vora
721b429d93 fix: make parameters of create_subscription_process optional (and other minor fixes) (#38360)
(cherry picked from commit 5a53a4b044be7e889080329056c7911970d92da8)
2023-11-27 14:53:39 +00:00
mergify[bot]
4699887f1c
fix: Payment Reco Issue and chart of account importer
fix: Payment Reco Issue and chart of account importer
2023-11-27 10:31:12 +05:30
ruthra kumar
378dc50aa4 chore: resolve conflict 2023-11-27 09:09:04 +05:30
Gursheen Anand
25bf475d5a fix: check reposting settings before allowing editable si
(cherry picked from commit 894ae1fe0f8da1931f705d433c15b19410486186)
2023-11-27 03:35:39 +00:00
Gursheen Anand
ac7615ac01 fix: allow on submit for child table fields
(cherry picked from commit 5fae2f6d57bac332263d8c73e3d090f485b5844d)

# Conflicts:
#	erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
2023-11-27 03:35:39 +00:00
Gursheen Anand
6a3c3b4cac fix: do not set repost flag without validating voucher
(cherry picked from commit ad5edbb1de95befa1b6f312dcb7df6d8c5a8ce6c)
2023-11-27 03:35:38 +00:00
Gursheen Anand
85bd649c64 refactor: validate reposting settings for editables inv
(cherry picked from commit 780b827adcba571b46ee73404f9a038c36dd0eb9)
2023-11-27 03:35:38 +00:00
mergify[bot]
cda5ff40f1
refactor: bank transaction (#38182)
refactor: bank transaction (#38182)

(cherry picked from commit 5426b93387c8a4599b11d5e064d4d8b37078aca1)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2023-11-26 18:57:01 +05:30
Deepesh Garg
64d9c5d61c
Merge pull request #38316 from frappe/mergify/bp/version-15-hotfix/pr-38269
fix: skip fixed assets in product bundle (backport #38269)
2023-11-24 16:30:29 +05:30
ruthra kumar
7fc4e211bc refactor: update project costing based on frequency
(cherry picked from commit dd016e6ced432b6f8754042fbad808b1cba56cec)
2023-11-24 06:20:11 +00:00
ruthra kumar
deed9f5840 perf: optimize total_purchase_cost update
(cherry picked from commit aa17110bde44603574d4532afaa6cf1181423ac5)
2023-11-24 06:20:10 +00:00
Gursheen Anand
e4d9ef1293 fix: condition in other bundle utils
(cherry picked from commit 8bdb61cb87802723a0db1aaa29c30c15c740ec6b)
2023-11-24 04:30:38 +00:00
ruthra kumar
7282dd1a85 chore: speed up Purchase Invoice cancellation
(cherry picked from commit 1efff268b036dd27f7472bc7ec494aafac9edbc8)
2023-11-24 04:16:22 +00:00
ruthra kumar
3720b7171b chore: index to speed up queries on JE child table reference
(cherry picked from commit 24fcd67f8bcf8cc8b387856983b97d8778eac084)
2023-11-24 04:16:22 +00:00
mergify[bot]
30c349b010
add flt() for None type error (backport #38299) (#38306)
add flt() for None type error (#38299)

(cherry picked from commit 64b44a360af8c2d3a6a9cb99e03358b97cdf9fa5)

Co-authored-by: NandhiniDevi <95607404+Nandhinidevi123@users.noreply.github.com>
2023-11-23 22:42:37 +05:30
mergify[bot]
72647b8624
feat: add Bank Transaction to connections in Journal and Payment Entry (backport #38297) (#38301)
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2023-11-23 15:09:23 +01:00
ruthra kumar
100ce27a60 chore: update new unreconcile doctype name in JS and PY files
(cherry picked from commit 74f9e34182563b5dd3ef71d93b66596a12be5e91)
2023-11-23 05:09:24 +00:00
ruthra kumar
df70e048cf chore: rename 'unreconcile payments' to 'unreconcile payment'
(cherry picked from commit 9006c9b7478ceee5f7662d62e8eb02a08a309906)
2023-11-23 05:09:23 +00:00
ruthra kumar
d01a480149 refactor: optimize outstanding vouchers query
(cherry picked from commit 8b04c1d4f6356bc332c5dd8f6f8711d778e030cd)
2023-11-23 10:14:25 +05:30
ruthra kumar
c84c97577f
Merge branch 'version-15-hotfix' into mergify/bp/version-15-hotfix/pr-38234 2023-11-21 13:43:58 +05:30
ruthra kumar
034375b4f5 refactor(test): make use of utility methods
(cherry picked from commit 547993f80103fa192563a82447c39fe122918767)
2023-11-21 07:03:06 +00:00
ruthra kumar
9600a2cdb7 test: overalloction on reconciliation when PO is involved
(cherry picked from commit 946228d783cb58cd2809f4b0bc0a854c49cc4060)
2023-11-21 07:03:06 +00:00
ruthra kumar
15f40a7af6 test: prevent rounding loss based validation error
(cherry picked from commit 56e991b7f49e4677605f74b1de7d00ab40bf09cc)
2023-11-21 12:16:36 +05:30
ruthra kumar
1ed65524e5 refactor: add flag to POS Invoice
(cherry picked from commit 83a13e22b7f4aa8ba2c406389af4e7fa8aad55d0)
2023-11-20 08:36:51 +00:00
ruthra kumar
5da9a22e4c refactor: set default for 'update_billed_amount_in_delivery_note'
(cherry picked from commit ee0c64215d160f0bd493bcefc9e94a5a90d318d2)
2023-11-20 08:36:50 +00:00
ruthra kumar
9ee8a78083 refactor: provision to set remarks length in accounts settings
(cherry picked from commit 97090ff3679104d77a031f29d4acafb8b7ac1580)
2023-11-20 04:38:26 +00:00
Dany Robert
eab18e6f71 fix: test case for rounded total with cash disc
(cherry picked from commit cc60c328fe349f7d53c77799e8e91973c2790746)
2023-11-19 13:49:19 +00:00