47189 Commits

Author SHA1 Message Date
Shariq Ansari
39e04b119a
Merge pull request #38564 from frappe/mergify/bp/version-15-hotfix/pr-38562
fix: get dynamic link with parenttype contact (backport #38562)
2023-12-04 19:22:37 +05:30
Shariq Ansari
cb9589b8ef fix: get dynamic link with parenttype contact
(cherry picked from commit 3d7ad71b22578e46366639ef19de8d665a922c04)
2023-12-04 13:51:36 +00:00
mergify[bot]
88d2a8d668
fix: scan for serial or batch in bundle (backport #38534) (#38552)
fix: scan for serial or batch in bundle (#38534)

(cherry picked from commit c8693cdf37ba9e91bf47d89de69aafc2fde5e6ed)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-04 15:24:28 +05:30
ruthra kumar
92c8eb17ca
Merge pull request #38550 from frappe/mergify/bp/version-15-hotfix/pr-38475
fix: incorrect customer outstanding amount (backport #38475)
2023-12-04 13:57:00 +05:30
NIYAZ RAZAK
98fe89a24d fix: incorrect customer outstanding amount (#38475)
* fix: incorrect customer outstanding amount

* chore: resolve linting error

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>

---------

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit 3df1d75bdd7a34c9fef4c4fe9af9341bc2e6e094)
2023-12-04 08:11:06 +00:00
ruthra kumar
66e3dc7358
Merge pull request #38547 from frappe/mergify/bp/version-15-hotfix/pr-38283
chore: move reconciliation cleanup patch to pre-model sync (backport #38283)
2023-12-04 13:40:48 +05:30
ruthra kumar
e405695838 chore: move reconciliation cleanup patch to pre-model
(cherry picked from commit f258ab5e98f323303276aeca98dcc644f6611a70)
2023-12-04 07:34:09 +00:00
ruthra kumar
d8f9e3a8b1
Merge pull request #38542 from frappe/mergify/bp/version-15-hotfix/pr-38148
refactor: convert Payment Reconciliation to virtual doctype (backport #38148)
2023-12-04 12:37:06 +05:30
mergify[bot]
282a5b27ad
fix: don't show non-stock items in Stock Analytics report (backport #38543) (#38545)
* fix(ux): stock-item filter for Item Code field

(cherry picked from commit ccdcb7dfcc29eb68d1cad38f3426e6fb575528eb)

* fix: don't show non-stock items in Stock Analytics report

(cherry picked from commit 01aadbef85e2570399f054027e57d6bb01af9433)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-04 12:18:58 +05:30
ruthra kumar
b8b8c02bf9 chore: resolve conflict 2023-12-04 12:16:41 +05:30
ruthra kumar
192343dec2 chore: clear singles table and reconciliation related tables
(cherry picked from commit f31002636bf21a3599ee5a7372db4d0cb3dbfad9)
2023-12-04 06:31:08 +00:00
ruthra kumar
4123f4b0bd chore: remove reconciliation defaults from patch
(cherry picked from commit b5dd0c8630c59cc38011039e7c7a21976b53ebd8)
2023-12-04 06:31:08 +00:00
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
0b64daf497
Merge pull request #38540 from frappe/mergify/bp/version-15-hotfix/pr-38220
fix: exclude `invoice_doctypes` from party advance (backport #38220)
2023-12-04 11:19:03 +05:30
ruthra kumar
0a05154698
Merge pull request #38538 from frappe/mergify/bp/version-15-hotfix/pr-38437
fix: incorrectly treating normal payment as advance (backport #38437)
2023-12-04 11:08:46 +05:30
Dany Robert
927538f776 fix: exclude invoice_doctypes from party advance
(cherry picked from commit f34ffc20620de442b1a0c9f3d0eb4eb0ff689831)
2023-12-04 05:31:50 +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]
b5c89ec3b4
fix: Add missing french translations (#38368)
fix: Add missing french translations (#38368)

fix: Add missing french translation

Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>
(cherry picked from commit a1e0197a8bc569a334503b6c3ba024feb3572d0f)

Co-authored-by: noec764 <58433943+noec764@users.noreply.github.com>
2023-12-04 09:37:46 +05:30
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
mergify[bot]
0aa96f783d
fix: don't update previous doc on rate change (backport #38493) (#38524)
* fix: don't update previous doc on rate change

(cherry picked from commit 68f5dd3e7b836c71f73cef210fcb4d72dc58e557)

* fix: `linter`

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-03 23:20:53 +05:30
mergify[bot]
33c59a2bb1
fix: german translations for Lost Quotations (backport #38435) (#38516)
fix: german translations for Lost Quotations (#38435)

(cherry picked from commit 5952cfa673837e09167591e593e5691f1f121b6e)

Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
2023-12-03 23:19:32 +05:30
ruthra kumar
5b1e7666c2
Merge pull request #38528 from frappe/mergify/bp/version-15-hotfix/pr-38525
fix: multiple minor fixes in report and Exchange Rate Revaluation (backport #38525)
2023-12-03 17:04:29 +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
ruthra kumar
602f6ca545 fix: item group filter in sales person wise report
(cherry picked from commit f4d418ea6d28f64d6d1c15c5eea2a75722384c0c)
2023-12-03 11:14:26 +00:00
mergify[bot]
2a9e843610
fix: better overlap logic for job card (backport #38432) (#38522)
fix: better overlap logic for job card (#38432)

(cherry picked from commit 74eab910427ca4af94119b0c099e7743be770006)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
2023-12-03 09:49:48 +05:30
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]
185b715d43
feat: add customer group filter in sales register (#38365)
feat: add customer group filter in sales register

(cherry picked from commit 5a97fa633631a3cb7dd0f4f7305cde293fd80ce2)

Co-authored-by: Nandhinidevi123 <nandhini.devi@thirvusoft.in>
2023-12-02 19:50:35 +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
mergify[bot]
7b363db582
chore: changed sort_order to DESC for customer (backport #38498) (#38501)
chore: changed sort_order to DESC for customer (#38498)

(cherry picked from commit 6bc40373f234af10ce4490529e96c5348d27b7df)

Co-authored-by: Sherin KR <sherinkrply@gmail.com>
2023-12-01 19:09:31 +05:30
Gursheen Kaur Anand
afa6255eee
Merge pull request #38497 from frappe/mergify/bp/version-15-hotfix/pr-38144
fix(minor): show party instead of party name where naming series not set (backport #38144)
2023-12-01 18:20:11 +05:30
Gursheen Anand
f120dc56c2 fix: show party instead of party name where naming series not set
(cherry picked from commit b27af6b5c85a99d22060ac85b9ba37893317bfbb)
2023-12-01 12:35:00 +00:00
mergify[bot]
f6c48e8ecf
fix: AttributeError while saving Purchase Invoice (backport #38482) (#38490)
fix: `AttributeError` while saving Purchase Invoice

(cherry picked from commit 60a81a563ef99ae892a821d27ae298730a0e2563)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
2023-12-01 14:10:31 +05:30
ruthra kumar
bf44e9ed64
Merge pull request #38484 from frappe/mergify/bp/version-15-hotfix/pr-38393
refactor: GL entries build logic for `Advance in Separate Party Account` option. (backport #38393)
2023-12-01 13:26:11 +05:30
mergify[bot]
9cdbd33e40
chore: add translate function to email subject in digest frecuency (backport #38474) (#38487)
chore: add translate function to email subject in digest frecuency (#38474)

chore: add translate function to email subject in digest frecuency
(cherry picked from commit b24e28953b6e085705630e2d8474492777732a9e)

Co-authored-by: Ernesto Ruiz <eruiz@wbapps.com>
2023-12-01 12:43:37 +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
8ed2ea29ac refactor: 'partial' flag to only cancel unlinked ledger entries
(cherry picked from commit 2633d7dca33b50d7900f1b80fb5b6514a1cc9d81)
2023-12-01 07:07:55 +00:00
ruthra kumar
65b4dbab2a refactor: return the newly added reference upon reconciliation
(cherry picked from commit ecb533c4d1971d5963f9d8ff4b038fa4b62cf516)
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
aaef9d68c0 refactor: post to GL and Payment Ledger on advance as liability
(cherry picked from commit 78ab11f9914725266eb8cf8b98dd81a5f544d79d)
2023-12-01 07:07:54 +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]
8e57862a1c
fix: show item name as title instead of item group in BOM (backport #38478) (#38481)
fix: show item name as title instead of item group in BOM (#38478)

Item fields in BOM used to show Item Group when Items were set to show title as link fields. Now they show Item Name instead

(cherry picked from commit 3a66aefd2c6aedc1b7b6017c174261c1ed4c2907)

Co-authored-by: Gughan Ravikumar <gughanrk@gmail.com>
2023-12-01 11:32:28 +05:30
rohitwaghchaure
b9a42a3b1b
Merge pull request #38472 from frappe/mergify/bp/version-15-hotfix/pr-38455
fix: incorrect requested quantity for the subcontracting order (backport #38455)
2023-11-30 19:25:14 +05:30