Commit Graph

49842 Commits

Author SHA1 Message Date
Kitti U
d4dd01d8d1 feat: provide hook point for bulk transaction tasks 2024-09-07 17:46:19 +07:00
ruthra kumar
75cf3e245f Merge pull request #42588 from ruthra-kumar/round_off_account_for_opening
refactor: separate round off account for opening
2024-09-06 10:10:23 +05:30
David Arnold
6652806e7a Merge pull request #43084 from blaggacao/payments/pr-6
fix: unhide payment url in pr
2024-09-06 00:52:53 +02:00
David
19c6bf2f92 fix: unhide payment url in pr 2024-09-06 00:35:17 +02:00
David Arnold
aa54516444 Merge pull request #41718 from blaggacao/fix/lp-on-si
fix: loyalty points application on si
2024-09-06 00:10:31 +02:00
David
74fb070959 test: loyalty points redemption from shopping cart 2024-09-05 23:53:30 +02:00
David Arnold
7ca9ec14a4 Merge pull request #42071 from blaggacao/fix/coupon-code-limits
fix: coupon code limits and add external plaftorm code
2024-09-05 23:42:30 +02:00
David (aider)
3413bad51d test: add test case for coupon without maximum use 2024-09-05 23:25:08 +02:00
David
70ed75a397 fix: coupon code limits and add external plaftorm code 2024-09-05 22:52:49 +02:00
David Arnold
873571272d Merge pull request #41719 from blaggacao/fix/lp-during-refdoc-save
fix: lp during ref_doc save event
2024-09-05 16:50:45 +02:00
David
48b5567af4 fix: loyalty points application on si 2024-09-05 16:39:52 +02:00
David
340e35f209 fix: lp during ref_doc save event 2024-09-05 16:32:56 +02:00
David Arnold
2ae1704d11 Merge pull request #41871 from blaggacao/perf/reduce-critical-path
perf: hot path in page load
2024-09-05 15:50:23 +02:00
David Arnold
e93ff9b267 Merge pull request #41564 from blaggacao/fix/loyalty
fix: tiered loyalty program
2024-09-05 15:02:04 +02:00
David (aider)
efd8f1e978 feat: Add validation to ensure lowest tier has min_spent of 0 in LoyaltyProgram 2024-09-05 14:30:40 +02:00
David
4bd26b845e fix: test ensures min spent respected 2024-09-05 14:29:10 +02:00
David
ad02e4112f fix: loyalty test case -> validate against actual database state 2024-09-05 14:08:29 +02:00
David
c914ea4adc test: add tests for loyalty tier selection 2024-09-05 14:08:22 +02:00
David
81dc5872c4 fix: tiered loyalty program 2024-09-05 14:08:22 +02:00
David
618e737b0b fix: add lp collection min to list 2024-09-05 14:08:21 +02:00
David Arnold
b38b8ded7b Merge pull request #43017 from blaggacao/fix/status-updater-notifications
fix: updater tigger notifications on status updates & perf
2024-09-05 13:54:35 +02:00
ruthra kumar
613830bfba Merge pull request #43070 from ruthra-kumar/handle_emp_advance_as_separate_unit
fix: AP filter to simulate employee advance as a ledger impacting voucher
2024-09-05 17:12:30 +05:30
David
d72d858efa fix: Update status field in parent transaction 2024-09-05 13:00:18 +02:00
David
00b70d7654 chore: calculate in python code 2024-09-05 13:00:17 +02:00
David
5b3e0c5543 chore: refactor set status into a getter & setter (future perf) 2024-09-05 12:58:51 +02:00
ruthra kumar
257e13c299 refactor: filter to toggle employee advance scenario in AP 2024-09-05 16:12:52 +05:30
ruthra kumar
eedf22b07a refactor: Handle Emp Advance as separate row in AP report 2024-09-05 16:01:26 +05:30
rohitwaghchaure
c13a147df1 fix: disabled batches showing in the list (#43024) 2024-09-05 15:39:15 +05:30
rohitwaghchaure
a8055a6da9 fix: auto reorder material request mail issue (#43066)
fix: auto reorder matreial request mail issue
2024-09-05 15:39:03 +05:30
David Arnold
5f25cde788 Merge pull request #41721 from blaggacao/fix/distributed-discounts
fix: distributed discounts on si
2024-09-05 12:07:18 +02:00
David (aider)
a464bd861b feat: add unit tests for distributed_discount_amount 2024-09-05 11:50:24 +02:00
David
0bab6f34c1 fix: distributed discounts on si 2024-09-05 11:49:24 +02:00
David Arnold
146ce59b87 Merge pull request #43036 from blaggacao/chore/ignore-aider-files
chore: ignore aider files
2024-09-05 11:43:32 +02:00
David
6fdb8659cc chore: ignore aider files 2024-09-05 11:26:26 +02:00
ruthra kumar
ef0682a216 Merge pull request #43065 from Ninad1306/merge_taxes_fix
fix: Reset Value Conditionally Based on Merge Taxes
2024-09-05 14:32:41 +05:30
Ninad1306
9d899f3c4a fix: reset value conditionally based on merge taxes 2024-09-05 13:29:22 +05:30
Smit Vora
5442487b6c Merge pull request #42925 from Ninad1306/mapping_docs_fix
fix: Replace `add_if_empty` with `reset_value` flag
2024-09-04 13:13:57 +05:30
Lakshit Jain
38f925b376 fix: adjust price insertion logic for internal suppliers/customers (#42988)
* fix: adjust price insertion logic for internal suppliers/customers

* refactor: correct indentation, specify conditions within function

* fix: typo

---------

Co-authored-by: Smit Vora <smitvora203@gmail.com>
2024-09-04 12:56:04 +05:30
Khushi Rawat
4da289ec61 Merge pull request #42926 from khushi8112/asset-value-through-landed-cost-voucher
fix: link Purchase Invoice and Receipt Items to Asset
2024-09-04 00:49:46 +05:30
ruthra kumar
b7525ca4e5 Merge pull request #43030 from ruthra-kumar/default_currency_typeerror_on_payment_entry
fix: typerror on default_currency
2024-09-03 16:40:08 +05:30
Nihantra C. Patel
890016695f Merge pull request #43029 from Nihantra-Patel/fix_company_filter
fix: move setup_queries to refresh event for company
2024-09-03 16:05:09 +05:30
Nihantra C. Patel
80ace72541 fix: company accounts setup_queries 2024-09-03 15:54:42 +05:30
ruthra kumar
4a7cc4da87 fix: typerror on default_currency 2024-09-03 15:54:39 +05:30
ruthra kumar
fb6b960806 Merge pull request #42974 from Vishnu7025/report_fix
fix: retain date filter when redirecting in Profit and Loss report
2024-09-03 15:43:01 +05:30
ruthra kumar
cf11ac87fb refactor(test): filter for active ledger entries 2024-09-03 15:05:15 +05:30
ruthra kumar
b7edc6dea9 test: opening purchase invoice with rounding adjustment 2024-09-03 15:05:15 +05:30
ruthra kumar
a5d6a25a96 refactor: handle opening round off on purchase invoice 2024-09-03 15:05:15 +05:30
ruthra kumar
193ea9ad8f refactor: filter on account_type 2024-09-03 15:05:14 +05:30
ruthra kumar
79267358d0 test: opening round off with inclusive tax 2024-09-03 15:05:14 +05:30
ruthra kumar
5021c7ca2c test: rounding adjustment validation and posting 2024-09-03 15:05:14 +05:30