Diptanil Saha
4e537cdb74
refactor: sales invoice integration with pos ( #47713 )
...
* fix: invoice doctype selection in accounts settings
* test: change in accounts settings on sales invoice
* test: refactored pos_invoice_merge_log tests
* test: pos closing entry and pos invoice
* fix: closing voucher details style
* refactor: renamed fields and removed repeated methods
* fix: patch to rename pos closing entry fields
* refactor: replaced get_doc with sql query
* fix: restrict cancelling sales invoice on cancellation of pos closing entry
* fix: removed payment reconciliation summary field and rearranged total section fields
* refactor: set_posting_date_and_time
* test: create_sales_invoice added args for is_created_using_pos
* test: added test for sales invoice creation during pos invoice mode
* test: added test for pos invoice creation during sales invoice mode
* fix: moved invoice type selection in pos settings
* fix: pos additional fields label
* refactor: pos closing entry
rearranged fields, removed rate field from taxes field, fetching payments and taxes details
* test: moved invoice creation in functions
* refactor: using as_dict=1
* fix: wrong table chosen in query
* fix: variable rename
* test: fixed failing tests
* test: fixed pos_closing_entry tests
2025-06-10 17:51:11 +05:30
Rohit Waghchaure
2b9ca79291
fix: incorrect warehouse in MR
2025-06-10 17:36:54 +05:30
Debin Robert
6529b288c2
feat: confirm with user before resetting posting date ( #47667 )
...
* feat: confirm with user before resetting posting date
* chore: pre-commit
* changes made as per review
---------
Co-authored-by: ruthra kumar <ruthra@erpnext.com >
2025-06-10 15:20:18 +05:30
Debin Robert
751815745f
fix: filter to ignore system generated cr / dr reconciliation journals on customer ledger summary
2025-06-10 15:15:50 +05:30
rohitwaghchaure
d38f3f4fae
Merge pull request #47981 from barredterra/wo-query_sales_order
...
refactor(Work Order): query_sales_order
2025-06-10 14:31:12 +05:30
rohitwaghchaure
97923c3b2b
Merge pull request #47969 from rohitwaghchaure/fixed-support-40445
...
fix: do not create repeat work orders
2025-06-10 14:29:29 +05:30
ruthra kumar
224c525b86
Merge pull request #47923 from aerele/currency_in_trends
...
fix: update currency based on transaction
2025-06-10 14:25:44 +05:30
Rohit Waghchaure
384f4e120a
fix: do not create repeat work orders
2025-06-10 13:59:37 +05:30
Ankush Menat
a123de4884
Merge pull request #47984 from frappe/drop_empty_unit_tests
...
chore: Drop empty UnitTestCase
2025-06-10 12:59:02 +05:30
Ankush Menat
e8c8f6fb63
test: Use name instead of doc
...
Previous filters implicitly returned last document.
2025-06-10 12:44:05 +05:30
Sagar Vora
b3bfce56a8
Merge pull request #47989 from priyanshshah2442/fix_calculated_discount_mismatch_report
2025-06-10 07:10:21 +00:00
Ankush Menat
9f0df5ecf3
fix: Correct filter types
2025-06-10 12:40:07 +05:30
priyanshshah2442
4e1abc1814
fix: add draft transactions also in calculated mismatch report
2025-06-10 12:38:07 +05:30
rohitwaghchaure
c62fe1a8db
Merge pull request #47942 from rohitwaghchaure/fixed-support-40499
...
fix: available qty in BOM Stock Report
2025-06-10 12:19:52 +05:30
Sagar Vora
964712301b
Merge pull request #47946 from priyanshshah2442/fix_discount_mismatch
2025-06-10 06:00:38 +00:00
Ankush Menat
c222d5fa55
chore: Drop empty UnitTestCase
2025-06-10 10:55:43 +05:30
MochaMind
465ec357aa
fix: sync translations from crowdin ( #47953 )
2025-06-10 05:13:55 +00:00
ruthra kumar
bf9d3eac6a
Merge pull request #47983 from frappe/mergify/copy/develop/pr-47934
...
fix(sales order): error message on creation of work order from sales order (copy #47934 )
2025-06-10 10:22:08 +05:30
thomasantony12
2a2af8d986
fix(sales order): error message on creation of work order from sales order
...
(cherry picked from commit 129cd7ae8a
2025-06-10 04:51:00 +00:00
Ankush Menat
4861e6a1b8
Merge pull request #47972 from frappe/balance
...
perf: skip fetching balances in payment entry
2025-06-10 09:04:31 +05:30
Ankush Menat
1343d147bd
perf: Skip fetching account balances unless required
...
This is very expensive operation and not requried when just finding
default account and account info.
2025-06-10 08:50:00 +05:30
Ankush Menat
0a043a4e0b
perf: Avoid fetching account balance
...
This isn't shown anywhere in UI anymore since https://github.com/frappe/erpnext/pull/45630
2025-06-10 08:50:00 +05:30
l0gesh29
c8cec8cedf
fix: add .length in list validation ( #47974 )
...
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
2025-06-10 01:15:31 +02:00
barredterra
2dbdacf905
refactor(Work Order): query_sales_order
...
- Use `get_list` instead of `db.sql_list`
The method is used for setting link options in the frontend and the Link field doesn't ignore permissions, so get_list should be fine here.
- Added type hints to enable argument validation
2025-06-09 22:15:41 +02:00
Khushi Rawat
ffa014ecdc
Merge pull request #47979 from khushi8112/attribute-error-fix-in-asset-capitalization
...
fix: AttributeError due to incorrect object
2025-06-10 00:15:18 +05:30
Khushi Rawat
351796bce6
fix: AttributeError due to incorrect object
2025-06-09 23:58:40 +05:30
Aayush Dalal
8b6a8d0c4f
fix: throw permission error ( #47976 )
...
Co-authored-by: Sagar Vora <16315650+sagarvora@users.noreply.github.com >
2025-06-09 17:28:46 +00:00
Sagar Vora
e91b4f759c
Merge branch 'develop' into fix_discount_mismatch
2025-06-09 17:15:41 +00:00
Sagar Vora
54ca0dd004
Merge pull request #47975 from sagarvora/fix-test
...
test: improve logic for `test_employee_query_with_user_permissions`
2025-06-09 17:12:33 +00:00
Sagar Vora
5e4554d14e
test: ensure employees are created before using
2025-06-09 22:27:21 +05:30
Sagar Vora
2a85c401b4
test: improve logic for test_employee_query_with_user_permissions
2025-06-09 22:12:36 +05:30
priyanshshah2442
f781a39dbe
fix: fieldtype to Currency for discount amounts
2025-06-09 19:20:40 +05:30
Sagar Vora
9bf9b34ac4
fix: remove currency col
2025-06-09 19:13:53 +05:30
Sagar Vora
33e793354c
fix: changes in report
2025-06-09 19:13:03 +05:30
Sagar Vora
e3356ebfb6
Merge branch 'develop' into fix_discount_mismatch
2025-06-09 13:16:02 +00:00
priyanshshah2442
3f0c5be5d9
fix: test case to verify correct setting of discount amount and percentage
2025-06-09 18:43:58 +05:30
priyanshshah2442
9120927a65
fix: add change log for bug fix in Additional Discount functionality
2025-06-09 18:06:16 +05:30
priyanshshah2442
3dcb801a37
fix: ensure proper float conversion for discount values
2025-06-09 17:49:40 +05:30
ruthra kumar
ea68e94665
Merge pull request #47865 from aerele/accounts-receivable/payable-user-permission
...
fix: consider user permission while populating the data
2025-06-09 15:22:15 +05:30
Sagar Vora
daad6137f8
fix: changes to report and patch
2025-06-09 14:11:19 +05:30
ruthra kumar
1e9c34d4f8
Merge pull request #47626 from debinnn/word-order-date
...
fix: no validation to compare 'actual start date' and 'actual end date' when creating work order.
2025-06-09 12:12:56 +05:30
ruthra kumar
d83bc7be41
Merge pull request #47963 from frappe/mergify/copy/develop/pr-47590
...
fix(report): include descendants when filtering by parent item group (copy #47590 )
2025-06-09 12:10:49 +05:30
Debin Robert
e1ae650d45
refactor: ensure end date is after start date on work order
2025-06-09 11:57:12 +05:30
FATHIH MOHAMMED
d25021d488
fix(report): include descendants when filtering by parent item group
...
(cherry picked from commit d21bfa219d
2025-06-09 06:25:30 +00:00
priyanshshah2442
62dd6df24f
feat: report to verify discount amount mismatch
2025-06-09 11:13:59 +05:30
ruthra kumar
8adb5e7e66
Merge pull request #47863 from khushi8112/closing-balance-in-dr-cr
...
feat: show Dr/Cr in Supplier ledger summary & Customer ledger summary
2025-06-09 10:15:30 +05:30
Ankush Menat
765c7c2bcc
refactor: rename get_settings -> get_single_value ( #47961 )
2025-06-09 04:40:02 +00:00
MochaMind
26abf9f13a
chore: update POT file ( #47956 )
2025-06-08 14:56:06 +02:00
MochaMind
75872925a2
fix: sync translations from crowdin ( #47881 )
...
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
2025-06-06 20:30:30 +00:00
Ankush Menat
bb693c0a4f
perf: Batch GLE/SLE rename commits ( #47950 )
2025-06-06 14:51:59 +00:00
