Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
47,104 Commits 3 Branches 0 Tags
Commit Graph

47104 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mergify[bot]
deef6ea66a
chore: minor code cleanup (backport #38615) (#38616) 
chore: minor code cleanup (#38615)

(cherry picked from commit f45dd740c58f34fad6e981d689c587815fba6625)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-07 15:36:21 +05:30
mergify[bot]
aa66ee64ec
fix: only highest eligible coupon applied (#38416) 
fix: only highest eligible coupon applied (#38416)

* fix: application of pricing rule when coupon is used

(cherry picked from commit d34787cf6d37c479f00ac1c9bc529b544d95dab1)

Co-authored-by: sandratridz <102575830+sandratridz@users.noreply.github.com>
 2023-12-07 10:34:11 +05:30
Ankush Menat
eeb0567a73 chore: remove unused cache=True 
(cherry picked from commit 6a47a2ceaf20572e143ab12ff76cfd9c54f509d6)
 2023-12-06 20:54:43 +05:30
mergify[bot]
c7dbcbcd17
feat: add employee number to client user bootinfo (backport #38477) (#38603) 
feat: add employee number to client user bootinfo (#38477)

(cherry picked from commit 525f656cc111f6225b44e1211dc5726d311a120b)

Co-authored-by: Richard Case <110036763+casesolved-co-uk@users.noreply.github.com>
 2023-12-06 20:52:50 +05:30
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
Gursheen Kaur Anand
bfe2b923e1
Merge pull request #38572 from frappe/mergify/bp/version-15-hotfix/pr-38556 
fix(minor): financial statements period end date (backport #38556)
 2023-12-05 22:02:27 +05:30
mergify[bot]
9d45bbd051
fix: consider the Valuation Method while picking incorrect SLE (backport #38592) (#38595) 
* fix: incorrect SLE for `Moving Average` valuation method

(cherry picked from commit 8beec586709dcd716de4fb46476218baed2ec972)

* feat: add `Valuation Method` column in `Stock Ledger Variance` report

(cherry picked from commit 16c297c2ecbc9a174e90597756cf46170bbd7c4a)

---------

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-05 18:13:43 +05:30
ruthra kumar
acf94dd4ad
Merge pull request #38586 from frappe/mergify/bp/version-15-hotfix/pr-38580 
fix: sql error while filtering on finance book in GL (backport #38580)
 2023-12-05 15:06:42 +05:30
ruthra kumar
3779943221 fix: sql error while filtering on finance book in GL 
(cherry picked from commit b1d9f3132d69df010e4f8f6e5d24b187823c2d8b)
 2023-12-05 09:11:40 +00:00
mergify[bot]
145ed3a3b1
fix: incorrect material request quantity in Production Plan (backport #38566) (#38579) 
fix: incorrect material request quantity in Production Plan (#38566)

(cherry picked from commit aaa9036eca4c5d50fb82a346e08d841e1735fc72)

Co-authored-by: rohitwaghchaure <rohitw1991@gmail.com>
 2023-12-05 14:24:26 +05:30
ruthra kumar
7076f3d778
Merge pull request #38577 from frappe/mergify/bp/version-15-hotfix/pr-38570 
refactor: ignore unreconcile doc on PI cancel/delete (backport #38570)
 2023-12-05 13:13:29 +05:30
mergify[bot]
02d7dd8b15
feat: Company filter in Stock Ledger Variance report (backport #38553) (#38574) 
feat: `Company` filter in `Stock Ledger Variance` report

(cherry picked from commit fb3421fccee518799a36a27d79bf4f6632736f81)

Co-authored-by: s-aga-r <sagarsharma.s312@gmail.com>
 2023-12-05 12:33:06 +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
Gursheen Anand
dbdb971e10 fix: limit end date to current date 
(cherry picked from commit ab6e92aae129653f13e54728d8d3a8c88dcda6cb)
 2023-12-05 05:54:49 +00:00
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