Commit Graph

45271 Commits

Author SHA1 Message Date
Deepesh Garg
1e3eb4deed
Merge pull request #34287 from frappe/early-payment-loss
fix: Allocate tax loss to tax account head on early payment discount
2023-04-01 18:49:02 +05:30
Sagar Sharma
7c7cfc4373
Merge pull request #34656 from s-aga-r/FIX-33830
fix: BOM Update Cost, when no actual qty
2023-04-01 16:24:01 +05:30
s-aga-r
8f3d5d24e1 chore: notify user on Reservation and Unreservation of Stock 2023-04-01 16:21:50 +05:30
s-aga-r
ee322c4904 fix(ux): Allow Partial Reservation depends on Enable Stock Reservation 2023-04-01 15:55:10 +05:30
ruthra kumar
32a4ca6b6c fix: recalculate difference amount on allocation change 2023-04-01 09:17:33 +05:30
s-aga-r
ef34f703d4 fix(ux): don't show Stock Reservation btn if Stock Reservation is disabled 2023-03-31 22:08:12 +05:30
s-aga-r
632f27b10d fix(ux): Reserve Stock and Reserved Stock Qty in SO Item 2023-03-31 21:58:21 +05:30
s-aga-r
de1492759d feat: add option to reserve stock in SO 2023-03-31 21:42:13 +05:30
s-aga-r
0ae400c986 feat: add option to unreserve stock in SO 2023-03-31 15:38:16 +05:30
Sagar Sharma
2c2b5a5b6e
Merge branch 'develop' into FIX-33830 2023-03-31 14:14:17 +05:30
ruthra kumar
770640f4e1
Merge pull request #34679 from ruthra-kumar/fix_credit_note_with_positive_total
fix: enclose ternary operator in parentheses
2023-03-31 13:31:16 +05:30
s-aga-r
26569b2162 fix: Stock Reservation validation for SO 2023-03-31 13:12:19 +05:30
s-aga-r
81fe5cfd72 chore: update Reserve Stock label to Reserve Stock on Submit in SO 2023-03-31 13:06:30 +05:30
s-aga-r
4d8ae41553 chore: make Reserve Stock on Sales Order Submission disabled by default 2023-03-31 12:50:13 +05:30
Sagar Sharma
b4ace345f9
Merge branch 'develop' into FIX-33830 2023-03-31 12:35:45 +05:30
Sagar Sharma
e56d40f48a
Merge pull request #34677 from s-aga-r/FIX-34240
chore: make `Production Plan Item Reference` table hidden in Production Plan
2023-03-31 12:34:59 +05:30
Sagar Sharma
d0d3961a1e
Merge branch 'develop' into FIX-34240 2023-03-31 12:34:27 +05:30
s-aga-r
06d1bc4d12 Revert "chore: add SRE ref in DN dashboard"
This reverts commit 15cb99290c.
2023-03-31 12:20:52 +05:30
s-aga-r
2d3997b2d7 refactor: remove Against Stock Reservation Entry field from DN Item 2023-03-31 12:16:59 +05:30
ruthra kumar
986daa6578 fix: enclose ternary operator in parentheses 2023-03-31 12:09:57 +05:30
Deepesh Garg
576575c227
fix: Column value mismatch in COA blank template (#34658) 2023-03-31 11:10:50 +05:30
s-aga-r
706be2a415 chore: make Production Plan Item Reference table hidden in Production Plan 2023-03-31 10:32:49 +05:30
Deepesh Garg
7c42b72ee7
fix: Total debit and credit while importing via Data Import (#34659) 2023-03-30 17:28:19 +05:30
rohitwaghchaure
edb0666b2c
Merge branch 'develop' into fix-reserve-qty 2023-03-30 17:26:32 +05:30
rohitwaghchaure
c4a0842a4f
Merge pull request #34636 from rohitwaghchaure/posting-time-issue
fix: posting time issue
2023-03-30 17:25:47 +05:30
rohitwaghchaure
06eac67796
Merge pull request #34664 from rohitwaghchaure/fixed-incorrect-balance-qty-stock-ledger
fix: incorrect balance qty in the stock ledger report
2023-03-30 17:25:35 +05:30
Richard Case
ddb17a8880
fix: plaid log_error syntax issue (#34642) 2023-03-30 16:45:56 +05:30
s-aga-r
1a84a0c411 fix: DN Item group warehouse validation against SRE 2023-03-30 16:42:27 +05:30
Anand Baburajan
d999dea3e4
chore: improve asset depr posting failure msg (#34661)
* chore: improve asset depr posting error msg

* chore: add period

* chore: improve msg
2023-03-30 16:38:37 +05:30
Rohit Waghchaure
345e6facbe fix: posting time issue 2023-03-30 16:34:34 +05:30
s-aga-r
e286d05904 fix: SRE Available Qty to Reserve for Group Warehouse 2023-03-30 16:26:42 +05:30
Rohit Waghchaure
cbdaab940d fix: incorrect balance qty in the stock ledger report 2023-03-30 16:20:42 +05:30
Anand Baburajan
a7a45fbe59
Merge pull request #34660 from AnandBaburajan/asset_improvements_30_mar_develop
chore: auto fill asset name and available for use date
2023-03-30 16:07:59 +05:30
anandbaburajan
af3e807607 chore: auto fill asset name and available for use date 2023-03-30 15:28:59 +05:30
Sagar Sharma
b6c0a675f9
Merge branch 'develop' into FIX-33830 2023-03-30 13:49:41 +05:30
s-aga-r
a4112c75c5 fix: BOM Update Cost, when no actual qty 2023-03-30 13:46:50 +05:30
rohitwaghchaure
448afa2b7c
Merge pull request #34648 from rohitwaghchaure/fixed-serial-no-qty-issue-in-stock-reco
fix: serial no with zero quantity issue in stock reco
2023-03-30 13:04:48 +05:30
Anand Baburajan
0ac81e3793
Merge pull request #34649 from AnandBaburajan/asset_value_adjustment_asset_name
fix: incorrect arg name in asset value adjustment
2023-03-30 13:03:18 +05:30
Anand Baburajan
33ff1b5a72
Merge branch 'develop' into asset_value_adjustment_asset_name 2023-03-30 12:53:06 +05:30
anandbaburajan
2b0470d1f5 fix: incorrect arg name in asset value adjustment 2023-03-30 12:50:33 +05:30
Rohit Waghchaure
17131e5a02 fix: serial no with zero quantity issue in stock reco 2023-03-30 11:47:32 +05:30
Komal-Saraf0609
ad11934d39
fix: enabling lead even after "Opportunity" created against it (#34627)
* fix: enabling lead even after "Opportunity" created against it

* chore: Linting Issues

---------

Co-authored-by: Komal Saraf <komal@frappe.io>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-03-30 08:03:55 +05:30
s-aga-r
72e32f1ae4 refactor: remove Posting Date and Posting Time columns from SRE 2023-03-29 18:42:44 +05:30
s-aga-r
2522198129 Revert "chore: add fields Serial No and Batch No in SRE"
This reverts commit 48108b5b41.
2023-03-29 18:33:03 +05:30
s-aga-r
6b24551672 Revert "chore: add Stock Reservation Qty column in Stock Projected Qty Report"
This reverts commit 3d75e3f434.
2023-03-29 18:33:03 +05:30
s-aga-r
3fcaa21110 refactor(minor): stock_reservation_entry.py 2023-03-29 18:33:01 +05:30
Anand Baburajan
7c5720ddb3
Merge pull request #34641 from frappe/mergify/bp/develop/pr-34607
Asset maintenance task add dropdown "3 Yearly" (backport #34607)
2023-03-29 18:15:17 +05:30
Bevan Tony Medrano
ddc3050e99 Asset maintenance task add dropdown "3 Yearly" (#34607)
* feat(asset_maintenance.json):Add 3 yearly in periodicity dropdown

* add server side implications for 3 yearly

(cherry picked from commit 625b8e800537cceabffda50a0bbed1effc2e2aa5)
2023-03-29 12:16:03 +00:00
Raffael Meyer
f5453adf4d
fix: switch to supported update_linked_doctypes (#34625) 2023-03-29 16:59:10 +05:30
Komal-Saraf0609
d0660ad222
fix: lost opportunity report issue (#34626)
* fix: lost opportunity report issue

* chore: Linting Issues

---------

Co-authored-by: Komal Saraf <komal@frappe.io>
Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>
2023-03-29 16:51:18 +05:30