rohitwaghchaure
b6ff79f34c
Merge pull request #45281 from frappe/mergify/bp/version-15-hotfix/pr-45278
...
fix: status of the serial no for the raw materials (backport #45278 )
2025-01-16 11:54:50 +05:30
rohitwaghchaure
e2d711540f
chore: fix conflicts
2025-01-15 18:17:04 +05:30
Rohit Waghchaure
d956051e69
fix: status of the serial no for the raw materials
...
(cherry picked from commit 9607b16dcf
2025-01-15 12:45:05 +00:00
Smit Vora
2c46be4cfb
fix: use currency defined in plan for subscription invoice (backport #45104 ) ( #45273 )
...
Co-authored-by: ljain112 <ljain112@gmail.com >
fix: use currency defined in plan for subscription invoice (#45104 )
2025-01-15 18:09:01 +05:30
Smit Vora
3abca03fc1
fix: check if tds deducted based on Purchase Taxes and Charges (backport #45161 ) ( #45277 )
...
fix: check if tds deducted based on Purchase Taxes and Charges (#45161 )
2025-01-15 18:08:18 +05:30
rohitwaghchaure
80b80e77d8
Merge pull request #45274 from frappe/mergify/bp/version-15-hotfix/pr-45270
...
fix: Skip WIP Warehouse transfer (backport #45270 )
2025-01-15 17:37:33 +05:30
Rohit Waghchaure
f5667f56e4
fix: test case
2025-01-15 16:20:17 +05:30
ljain112
bdaf3761c0
fix: conflict
2025-01-15 15:39:48 +05:30
Lakshit Jain
ade8799358
fix: check if tds deducted based on Purchase Taxes and Charges ( #45161 )
...
(cherry picked from commit 37a5767be5
2025-01-15 10:03:19 +00:00
Mihir Kandoi
4e1d4005d9
test: Added new test to check wip skip
...
(cherry picked from commit 6edb454eea
2025-01-15 09:37:03 +00:00
Mihir Kandoi
8ba42cfbf0
fix: tests
...
(cherry picked from commit 09d26a835f
2025-01-15 09:37:03 +00:00
Mihir Kandoi
bb0695a883
fix: Skip WIP Warehouse transfer
...
(cherry picked from commit bbb5f8056b
2025-01-15 09:37:03 +00:00
Lakshit Jain
a27eac1ef6
fix: use currency defined in plan for subscription invoice ( #45104 )
...
(cherry picked from commit a4453fb77b
2025-01-15 09:23:51 +00:00
rohitwaghchaure
88c10fa7b6
Merge pull request #45268 from frappe/mergify/bp/version-15-hotfix/pr-45259
...
fix: incorrect valuation for sales return with different warhouse (backport #45259 )
2025-01-14 20:35:44 +05:30
rohitwaghchaure
1c6fe9da3b
chore: fix conflicts
2025-01-14 18:36:27 +05:30
Rohit Waghchaure
9ee5651848
fix: incorrect valuation for sales return with different warhouse
...
(cherry picked from commit 3a2e816759
2025-01-14 13:04:36 +00:00
rohitwaghchaure
1be8051f7a
Merge pull request #45258 from frappe/mergify/bp/version-15-hotfix/pr-45241
...
fix: auto fetch batch and serial no for draft stock transactions (backport #45241 )
2025-01-14 18:33:08 +05:30
Rohit Waghchaure
af21bca231
fix: linter issue
2025-01-14 18:15:32 +05:30
ruthra kumar
d508ea2420
Merge pull request #45267 from frappe/mergify/bp/version-15-hotfix/pr-45211
...
refactor: allow users to configure interval for Semi-Auto payment reconciliation (backport #45211 )
2025-01-14 17:35:56 +05:30
ruthra kumar
e1405a5c4f
refactor: allow users to configure interval for Semi-Auto payment reconciliation ( #45211 )
...
* refactor: configurable interval for reconciliation trigger
* refactor: set default value for interval
* refactor: configurable queue size
* refactor: use patch to setup default cron job
* refactor: use 'after_migrate' to setup cron for reconciliation
User specified interval will be used
* chore: type casting
* refactor: use scheduler_event to persist cron
* chore: rename field
* chore: use configured queue size
* chore: remove unwanted field
(cherry picked from commit ce9c606f71
2025-01-14 11:46:48 +00:00
ruthra kumar
f91eb3ef9f
Merge pull request #45265 from frappe/mergify/bp/version-15-hotfix/pr-45182
...
refactor: configurable reconciliation dates for Advance Payments (backport #45182 )
2025-01-14 16:57:56 +05:30
ruthra kumar
14d1f67ba9
chore: resolve conflicts
2025-01-14 15:24:24 +05:30
ruthra kumar
18946f8495
refactor: only update reconcile_effect_on advance in separate acc
...
(cherry picked from commit 9ee5fcc602
2025-01-14 09:50:26 +00:00
ruthra kumar
8f431041f8
refactor: backwards compatibility
...
(cherry picked from commit 9fa1865cb7
2025-01-14 09:50:25 +00:00
ruthra kumar
e7571c1a32
refactor: save reconcile effect on reference table
...
(cherry picked from commit a4271aa5d1
2025-01-14 09:50:25 +00:00
ruthra kumar
a438520549
refactor: store reconciliation date in reference
...
Helps with reposting
(cherry picked from commit 7e7775aa44
2025-01-14 09:50:25 +00:00
ruthra kumar
2cdfa91725
test: ensure reconciliation date config takes effect
...
(cherry picked from commit e0517852bc
2025-01-14 09:50:24 +00:00
ruthra kumar
be8e1c0520
refactor: hide old checkbox
...
(cherry picked from commit c8e93e7a61
2025-01-14 09:50:24 +00:00
ruthra kumar
74f00bb51b
refactor: payment entry to handle posting date on configuation
...
(cherry picked from commit bb8d2c994c
2025-01-14 09:50:24 +00:00
ruthra kumar
34b336ca80
refactor: test cases updated
...
(cherry picked from commit fb6c72a247
2025-01-14 09:50:23 +00:00
ruthra kumar
55d699ee01
refactor: patch to migrate checkbox to select
...
(cherry picked from commit a8a8ac71b6
2025-01-14 09:50:23 +00:00
ruthra kumar
ad9e5d41b2
refactor: introduce select fields in company and payment entry
...
(cherry picked from commit 8b2c981fc3
2025-01-14 09:50:22 +00:00
ruthra kumar
8ab39f5160
Merge pull request #45261 from frappe/mergify/bp/version-15-hotfix/pr-45260
...
fix: incorrect label in Item-wise sales register (backport #45260 )
2025-01-14 14:05:58 +05:30
ruthra kumar
36d1fbd6a3
fix: incorrect label in Item-wise sales register
...
(cherry picked from commit d9013e1054
2025-01-14 08:26:06 +00:00
ruthra kumar
b4bcb7f9ac
Merge pull request #45257 from frappe/mergify/bp/version-15-hotfix/pr-45090
...
fix: change string to be able to translate (backport #45090 )
2025-01-14 13:35:13 +05:30
rohitwaghchaure
2676e0ea1f
chore: fix conflicts
2025-01-14 12:49:17 +05:30
Rohit Waghchaure
2f2554e9e5
fix: auto fetch batch and serial no for draft stock transactions
...
(cherry picked from commit 88ab9be79c
2025-01-14 07:06:32 +00:00
mahsem
7a3687ca8e
fix: change string to be able to translate ( #45090 )
...
* fix: change_string_to_translate
* fix: debit note translation
* chore: update 'modified' field
---------
Co-authored-by: ruthra kumar <ruthra@erpnext.com >
(cherry picked from commit a3165c5719
2025-01-14 06:26:50 +00:00
ruthra kumar
f954b241a8
Merge pull request #45234 from frappe/mergify/bp/version-15-hotfix/pr-45209
...
fix: batch number search on pos (backport #45209 )
2025-01-14 11:42:04 +05:30
ruthra kumar
13c3483669
Merge pull request #45256 from frappe/mergify/bp/version-15-hotfix/pr-45078
...
fix: don't create invoice if `current_invoice_start ` is in future (backport #45078 )
2025-01-14 10:43:19 +05:30
ruthra kumar
74a256ad57
Merge pull request #45255 from frappe/mergify/bp/version-15-hotfix/pr-45074
...
fix: set billing and shipping address on change of company (backport #45074 )
2025-01-14 10:22:42 +05:30
ruthra kumar
f897999d79
Merge pull request #45254 from frappe/mergify/bp/version-15-hotfix/pr-45001
...
fix: deduct tds on excess amount if checked (backport #45001 )
2025-01-14 10:21:57 +05:30
Sanket322
abfcfdfe7e
fix: minor update for readability
...
(cherry picked from commit 61d4593236
2025-01-14 04:43:28 +00:00
Sanket322
3f6d7741d9
fix: don't create invoice if invoice start date is in future
...
(cherry picked from commit 058fdca981
2025-01-14 04:43:28 +00:00
ruthra kumar
9757c92635
Merge pull request #45252 from frappe/mergify/bp/version-15-hotfix/pr-44798
...
fix: update discounting on mixed conditions (backport #44798 )
2025-01-14 10:09:52 +05:30
Sanket322
80e6112549
fix: pass right existing address
...
(cherry picked from commit ce99764772
2025-01-14 04:35:20 +00:00
Sanket322
42eb88f5f6
fix: set billing and shipping address on change of company
...
(cherry picked from commit f46f1bead4
2025-01-14 04:35:20 +00:00
ljain112
07c3605905
fix: deduct tds on excess amount if checked
...
(cherry picked from commit a203e3ffaf
2025-01-14 04:33:18 +00:00
DHINESH00
1d5a73a325
fix: Semgrep rules
...
(cherry picked from commit 547c8004eb
2025-01-14 04:29:07 +00:00
DHINESH00
38cb5a98bf
fix: update discounting on mixed conditions
...
(cherry picked from commit d541259da9
2025-01-14 04:29:06 +00:00
