Mihir Kandoi
d6e0c6c969
refactor: added condition which checks for corrective operation setting
...
(cherry picked from commit 063a205e5a
2025-01-27 12:03:39 +00:00
Mihir Kandoi
5c9ac27478
test: Added test for new feature
...
(cherry picked from commit 4fb48b7f22
2025-01-27 12:03:39 +00:00
Mihir Kandoi
efc7b9ac56
feat: Add corrective job card operating cost as additional costs in stock entry
...
(cherry picked from commit 2bf10f68a8
2025-01-27 12:03:38 +00:00
ruthra kumar
2c3e765896
Merge pull request #45534 from frappe/mergify/bp/version-15-hotfix/pr-45302
...
feat: add company level validation for accounting dimension (backport #45302 )
2025-01-27 16:09:32 +05:30
ruthra kumar
bcd3351999
refactor(test): update test data
2025-01-27 15:46:39 +05:30
Sugesh393
67e45cf002
chore: update variable names for improved readability
...
(cherry picked from commit 36bae55299
2025-01-27 15:18:24 +05:30
Sugesh393
149827562b
fix: set company related values
...
(cherry picked from commit 454067198e
2025-01-27 15:18:19 +05:30
Sugesh393
fac4e99b0e
test: add new unit test for company validation in accounting dimension
...
(cherry picked from commit c94091d68f
2025-01-27 09:25:02 +00:00
Sugesh393
8f0d270746
feat: add company level validation for accounting dimension
...
(cherry picked from commit 60efd3e219
2025-01-27 09:25:01 +00:00
ruthra kumar
a718737931
Merge pull request #45530 from frappe/mergify/bp/version-15-hotfix/pr-45284
...
fix: set party_account_currency for pos_invoice returns (backport #45284 )
2025-01-27 14:54:11 +05:30
Nabin Hait
b004855e7c
Revert "feat(Sales Invoice): allow linking to project without adding timesheets (backport #44295 )" ( #45531 )
...
Revert "feat(Sales Invoice): allow linking to project without adding timeshee…"
This reverts commit 2c2a25ab16
2025-01-27 14:31:44 +05:30
Sugesh393
6a382f1430
test: add new unit test to check payments amount of pos_invoice returns
...
(cherry picked from commit 484ecf2479
2025-01-27 08:58:58 +00:00
Sugesh393
172fdad244
fix: set party_account_currency for pos_invoice returns
...
(cherry picked from commit 2af6fca7fa
2025-01-27 08:58:58 +00:00
mergify[bot]
2c2a25ab16
feat(Sales Invoice): allow linking to project without adding timesheets (backport #44295 ) ( #45528 )
...
feat(Sales Invoice): allow linking to project without adding timesheets (#44295 )
* feat(Sales Invoice): allow linking to project without adding timesheets
* test: add timesheet data
(cherry picked from commit 11f65f20a014891507+barredterra@users.noreply.github.com >
2025-01-27 14:26:19 +05:30
mergify[bot]
ff46ae5bc1
fix: currency decimal on POS Past Order List (backport #45524 ) ( #45527 )
...
fix: currency decimal on POS Past Order List (#45524 )
* fix: currency decimal on POS
* fix: removed precision
(cherry picked from commit 2ac8c92e7fdiptanil@frappe.io >
2025-01-27 13:21:40 +05:30
mergify[bot]
692a44816f
feat(UX): scroll to required field (backport #44367 ) ( #45433 )
...
feat(UX): scroll to required field (#44367 )
(cherry picked from commit 4008ca5ddd14891507+barredterra@users.noreply.github.com >
2025-01-26 12:14:44 +05:30
rohitwaghchaure
f3b8d6867b
Merge pull request #45448 from frappe/mergify/bp/version-15-hotfix/pr-45443
...
fix: allow to fix negative stock for batch using stock reco (backport #45443 )
2025-01-25 15:21:16 +05:30
Rohit Waghchaure
69c5695f6e
fix: allow to fix negative stock for batch using stock reco
...
(cherry picked from commit 2e8cde3378
2025-01-25 09:34:11 +00:00
mergify[bot]
f9d96726f0
fix: secure bulk transaction (backport #45386 ) ( #45426 )
...
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
fix: secure bulk transaction (#45386 )
2025-01-24 17:18:50 +01:00
rohitwaghchaure
4aa92572ef
Merge pull request #45438 from frappe/mergify/bp/version-15-hotfix/pr-45432
...
fix: do not check budget during reposting (backport #45432 )
2025-01-24 20:09:22 +05:30
rohitwaghchaure
f2b946d325
fix: do not check budget during reposting ( #45432 )
...
(cherry picked from commit 53704b98b5
2025-01-24 12:02:13 +00:00
rohitwaghchaure
13c7fceb91
Merge pull request #45435 from frappe/mergify/bp/version-15-hotfix/pr-45423
...
fix: precision issue in stock entry (backport #45423 )
2025-01-24 17:25:43 +05:30
Rohit Waghchaure
fe5e42d2dc
fix: precision issue in stock entry
...
(cherry picked from commit 9f3b8520fe
2025-01-24 11:38:02 +00:00
mergify[bot]
7ff7ec7929
fix: validate items against selling settings (backport #45288 ) ( #45431 )
...
fix: validate items against selling settings (#45288 )
fix: validate_for_duplicate_items
Co-authored-by: Sanket322 <shahsanket322003.com>
(cherry picked from commit d862e9b771113279972+Sanket322@users.noreply.github.com >
2025-01-24 16:37:36 +05:30
mergify[bot]
ae5ce97fd0
fix: disable load_after_mapping when purchase order created from sales order (backport #45405 ) ( #45429 )
...
fix: disable load_after_mapping when purchase order created from sales order (#45405 )
(cherry picked from commit 97acbb313447534423+venkat102@users.noreply.github.com >
2025-01-24 15:23:27 +05:30
mergify[bot]
52fdc7cecd
fix(material request): mapping Sales Order Item Delivery Date to Mate… (backport #45227 ) ( #45424 )
...
fix(material request): mapping Sales Order Item Delivery Date to Mate… (#45227 )
* fix(material request): mapping Sales Order Item Delivery Date to Material Request Item Required By
as mentioned in https://discuss.frappe.io/t/item-delivery-date-on-sales-order-is-not-transferred-to-material-request-item-required-by-date/140479
fixing
When you create a Material Request directly on the Sales Order via → Create → Material Request, Delivery Date on Sales Order Item is not transferred to Material Request Item Required By date.
* fix(linters): meaningless linters formatting message applied
In order to pass the linters test which I find meaningless as it asks for the comma after the last item in a dictionary data type
* fix(linters): formatting code for linters pass
Linters formatting applied
(cherry picked from commit 42edb9f5b131142607+toofun666@users.noreply.github.com >
2025-01-24 14:46:47 +05:30
mergify[bot]
d9b342f257
fix: remove unnecessary auth from plaid connector (backport #44305 ) ( #45421 )
...
fix: remove unnecessary auth from plaid connector (#44305 )
(cherry picked from commit e82911041dmluessi@gmail.com >
2025-01-24 14:18:04 +05:30
mergify[bot]
dec0caeac5
fix: valuation for batch (backport #45335 ) ( #45420 )
...
* fix: valuation for batch
(cherry picked from commit 5088d8576f8028dd2683rohitw1991@gmail.com >
2025-01-24 13:13:57 +05:30
mergify[bot]
224a92587d
fix: resolved pos return setting to default mode of payment instead of user selection (backport #45377 ) ( #45419 )
...
fix: resolved pos return setting to default mode of payment instead of user selection (#45377 )
* fix: resolved pos return setting to default mode of payment instead of user selection
* refactor: removed console log statement
* refactor: moved get_payment_data to sales_and_purchase_return.py
(cherry picked from commit 54d234e05ddiptanil@frappe.io >
2025-01-24 13:13:15 +05:30
mergify[bot]
aca8d663dd
feat: full screen on pos (backport #45404 ) ( #45418 )
...
feat: full screen on pos (#45404 )
* feat: full screen on pos
* refactor: variables for label
* fix: refactor and handled button label change
* refactor: rename enable fullscreen label
(cherry picked from commit 78c7c1c631diptanil@frappe.io >
2025-01-24 12:40:25 +05:30
mergify[bot]
6c10393164
fix: use frappe.datetime.str_to_user (backport #45216 ) ( #45417 )
...
fix: use frappe.datetime.str_to_user (#45216 )
* fix: default_datetime_format
* fix: add_format_datetime
* fix: update to str_to_user in point_of_sale/pos_controller.js
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
* fix: convert_to_str_to_user
* fix: linters
* fix: whitespace
---------
Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com >
(cherry picked from commit cd3f03696e137205921+mahsem@users.noreply.github.com >
2025-01-24 12:19:02 +05:30
mergify[bot]
3eb28bb0e0
fix: set expense_account and cost_center based on company in stock entry (backport #45159 ) ( #45416 )
...
fix: set expense_account and cost_center based on company in stock entry (#45159 )
* fix: set expense_account and cost_center based on company in stock entry
* fix: remove is_perpetual_inventory_enabled validation for cost_center
(cherry picked from commit 6ec18fb40d73237300+Sugesh393@users.noreply.github.com >
2025-01-24 12:17:08 +05:30
ruthra kumar
835abfd88e
Merge pull request #45406 from frappe/auto-match-fix
...
fix: Wrong bank_ac_no filter + simplify logic in automatch
2025-01-24 10:43:13 +05:30
ruthra kumar
1522600eb5
Merge pull request #45411 from frappe/mergify/bp/version-15-hotfix/pr-45291
...
fix: don't update party-type on change of cost center in Journal Entry (backport #45291 )
2025-01-24 10:16:53 +05:30
Sanket Shah
fb75180a7d
fix: don't update party-type on change of cost center in Journal Entry ( #45291 )
...
fix: don't update party-type on change of cost center
Co-authored-by: Sanket322 <shahsanket322003.com>
(cherry picked from commit 19c8708e5e
2025-01-23 13:04:19 +00:00
mergify[bot]
5d7d3d8c19
fix: add condition to check if item is delivered by supplier in make_purchase_order_for_default_supplier() (backport #45370 ) ( #45410 )
...
fix: add condition to check if item is delivered by supplier in make_purchase_order_for_default_supplier() (#45370 )
(cherry picked from commit 69464ab7ff89955436+Shanuka-98@users.noreply.github.com >
2025-01-23 18:18:48 +05:30
mergify[bot]
73a21c294c
fix: fix creating documents from sales invoice (backport #45346 ) ( #45408 )
...
* fix: fix creating documents from sales invoice (#45346 )
Co-authored-by: Meike Nedwidek <nedwidek@kk-software.de >
(cherry picked from commit 1758e125e063092915+meike289@users.noreply.github.com >
Co-authored-by: Nabin Hait <nabinhait@gmail.com >
2025-01-23 18:18:17 +05:30
marination
60feb7cbd4
fix: Wrong bank_ac_no filter + simplify convoluted logic
2025-01-23 13:14:25 +01:00
marination
153e961df7
fix: Use process.extract to get the corresponding party doc name of the result
...
- rapidfuzz accepts an iterable or a dict. dict input gives the dict key and value in the result
2025-01-23 13:13:12 +01:00
marination
86f4bf6e01
fix: Set right party name in bank transaction
...
- If party name and docname are different, set the docname in Bank Transaction
2025-01-23 13:12:59 +01:00
ruthra kumar
7fdf2a7d45
Merge pull request #45399 from frappe/mergify/bp/version-15-hotfix/pr-44790
...
refactor: configurable posting date for Exc Gain / Loss journal (backport #44790 )
2025-01-23 17:30:38 +05:30
ruthra kumar
3906e5c33f
chore: use correct decorator
2025-01-23 17:05:36 +05:30
ruthra kumar
72581dd0bf
Merge pull request #45400 from ruthra-kumar/manual_addition_of_translation
...
refactor: more translation in bengali
2025-01-23 16:52:16 +05:30
ruthra kumar
10ee6f3e22
chore: resolve conflict
2025-01-23 16:36:55 +05:30
ruthra kumar
db4fe59bca
Merge pull request #45398 from frappe/mergify/bp/version-15-hotfix/pr-44950
...
fix: postal_code_move_and_fixes (backport #44950 )
2025-01-23 16:35:05 +05:30
samsul580
495273365b
feat(translations): add Bengali translations for signature and client details
2025-01-23 16:31:59 +05:30
ruthra kumar
3c3f092382
refactor: support JE posting date in semi-auto reconciilation tool
...
(cherry picked from commit a71718883e
2025-01-23 10:59:54 +00:00
ruthra kumar
693687d8a3
test: exc gain/loss posting date based on configuration
...
(cherry picked from commit 2f3281579a
2025-01-23 10:59:53 +00:00
ruthra kumar
c070a140f2
refactor: only apply configuration on normal payments
...
patch to update default value
(cherry picked from commit b2c3da135e
2025-01-23 10:59:53 +00:00
ruthra kumar
f411bcc8b5
refactor: allow reconciliation date for exchange gain / loss
...
(cherry picked from commit 95af63e305
2025-01-23 10:59:52 +00:00
