35155 Commits

Author	SHA1	Message	Date
rohitwaghchaure	56d62cae7a	Merge pull request #34980 from rohitwaghchaure/fix-inter-transfer-validation ... fix: validation for internal transfer entry	2023-04-21 17:45:54 +05:30
s-aga-r	7e8fd8f324	chore: update reserved stock SLE validation	2023-04-21 17:44:44 +05:30
Rohit Waghchaure	6a0b7c9e8c	fix: added validation for extra job card	2023-04-21 17:34:22 +05:30
Rohit Waghchaure	19911b48fd	fix: validation for internal transfer entry	2023-04-21 16:56:09 +05:30
s-aga-r	9a37ac6c25	refactor: sum up SLE value in query	2023-04-21 13:28:14 +05:30
HENRY Florian	af8da53cf4	fix: FEC report for France accountancy (#34781) ... * fix: FEC report for France Accountancy legal requirement * fix: FEC report for France Accountancy legal requirement * fix: change to query standard * fix: change to query standard * fix: columns to standard dict * fix: columns to standard dict * fix: columns to data * refactor: french report FEC * refactor: french report FEC (2) --------- Co-authored-by: barredterra <14891507+barredterra@users.noreply.github.com>	2023-04-21 13:26:32 +05:30
Deepesh Garg	a02705ded7	chore: Move source and campaign to more info section (#34946)	2023-04-21 13:25:32 +05:30
ruthra kumar	3ec1597860	Merge pull request #34940 from ruthra-kumar/broken_set_exchange_gain_loss_btn_in_payment_entry ... fix: broken 'set exchange gain/loss' btn in payment entry	2023-04-21 09:47:53 +05:30
Hossein Yousefian	984eb2a0dd	Merge branch 'develop' into get_incoming_rate_v14_fix	2023-04-20 16:50:34 +03:30
rohitwaghchaure	f218df460f	Merge pull request #34958 from rohitwaghchaure/removed-depends-on-for-employee-detail ... fix: removed depends on for the Employee Detail section	2023-04-20 18:03:46 +05:30
rohitwaghchaure	6259c81adc	Merge pull request #34960 from rohitwaghchaure/fixed-stock-entry-type ... fix: stock entry type issue	2023-04-20 18:03:23 +05:30
Sagar Vora	776b56ccd1	fix: use functools.wraps to preserve doc signature	2023-04-20 05:17:30 -07:00
Sagar Vora	2fa641f86d	fix: simplify erpnext.get_region	2023-04-20 05:17:30 -07:00
Sagar Vora	17ef3c964f	fix: set frappe.flags.company to call regional code accurately	2023-04-20 05:17:30 -07:00
Rohit Waghchaure	c3b5dcb767	fix: stock entry type issue	2023-04-20 16:39:26 +05:30
Rohit Waghchaure	a90a5b4aa4	fix: removed depends on for the Employee Detail section	2023-04-20 16:01:05 +05:30
Sagar Sharma	81653e4762	Merge branch 'develop' into FIX-ISS-23-24-00209	2023-04-20 15:46:01 +05:30
s-aga-r	8108b2de0a	fix: PermissionError in Work Order	2023-04-20 15:41:37 +05:30
Nihantra Patel	b572bef71d	fix: process_loss_percentage in BOM	2023-04-20 14:32:32 +05:30
Deepesh Garg	ea6eeace80	fix: filtering via batch no(#34950) ... * fix: filtering via batch no	2023-04-20 12:48:44 +05:30
Sagar Sharma	e1f5a5adea	Merge branch 'develop' into FIX-INTERNAL-PR-GL-ENTRIES	2023-04-20 11:00:22 +05:30
ruthra kumar	fc6486d87d	Merge pull request #34922 from ruthra-kumar/refactor_payment_entry_ref_details ... refactor: refactor set_missing_values and set_missing_ref_details in Payment Entry	2023-04-20 10:59:50 +05:30
ruthra kumar	df0682fa8c	fix: broken set exchagne gain/loss btn broken in payment entry	2023-04-20 10:39:15 +05:30
Sagar Sharma	66723dc5db	Merge branch 'develop' into FIX-INTERNAL-PR-GL-ENTRIES	2023-04-20 10:31:29 +05:30
s-aga-r	11c8503180	fix(test): test_backdated_stock_reco_cancellation_future_negative_stock	2023-04-20 09:59:11 +05:30
Rohit Waghchaure	fcfa8842a7	fix: limit stock reco issue	2023-04-20 09:48:15 +05:30
rohitwaghchaure	3df4edc5c5	Merge branch 'develop' into get_incoming_rate_v14_fix	2023-04-19 21:07:54 +05:30
rohitwaghchaure	dd238aa5b4	Merge pull request #34929 from rohitwaghchaure/fixed-stock-and-account-value-report ... fix: Incorrect difference value in Stock and Account Value Comparison…	2023-04-19 21:07:25 +05:30
Rohit Waghchaure	a77182645f	fix: Incorrect difference value in Stock and Account Value Comparison report	2023-04-19 20:35:14 +05:30
Sagar Sharma	45c27e4e3d	Merge branch 'develop' into FIX-ISS-23-24-00145	2023-04-19 19:22:42 +05:30
Sagar Sharma	6519514db4	Merge branch 'develop' into use-UnixTimestamp	2023-04-19 18:23:29 +05:30
Vishal Dhayagude	59f3fedbf7	fix: batch qty conversion factor issue fixed in pos transaction (#34917)	2023-04-19 15:57:28 +05:30
ruthra kumar	b7d6e30f63	refactor: update ref details for selected references ... set_missing_ref_details can update only for selected references	2023-04-19 15:13:10 +05:30
s-aga-r	c86c543fbf	test: add test case for internal PR GL Entries	2023-04-19 13:30:37 +05:30
Sagar Sharma	2c0e22c01d	Merge branch 'develop' into use-UnixTimestamp	2023-04-19 12:57:20 +05:30
s-aga-r	e43bc38e05	refactor: rewrite get_stock_value_on() queries in QB	2023-04-19 12:05:17 +05:30
ruthra kumar	11cb2db3fe	refactor: move set_missing_ref_detials out of set_missing_values	2023-04-19 11:54:08 +05:30
ruthra kumar	eaa5f1fd9d	Merge pull request #34838 from ruthra-kumar/making_similar_ledger_entries_merging_optional ... refactor: toggle merging similar ledger entries in JE	2023-04-19 09:48:44 +05:30
barredterra	98d51b6c7b	fix: remove empty translations	2023-04-18 18:27:21 +02:00
barredterra	f0a3e61ee9	fix: remove excessive fourth column	2023-04-18 17:27:46 +02:00
s-aga-r	6fca9adcd4	fix: internal Purchase Receipt GL Entries	2023-04-18 18:38:28 +05:30
Hossein Yousefian	13d4f85923	get_incoming_rate_voucher_no_fix	2023-04-18 14:50:09 +03:30
Hossein Yousefian	bbd44e6e7e	Merge branch 'frappe:develop' into get_incoming_rate_zero_in_rate_fix	2023-04-18 14:47:19 +03:30
barredterra	debc013728	fix: remove excessive fourth column	2023-04-18 12:23:54 +02:00
s-aga-r	e91abbfbe3	fix: add item-code filter for SCR supplied-items batch-no	2023-04-18 13:03:47 +05:30
Sagar Sharma	d07d67a968	Merge branch 'develop' into use-UnixTimestamp	2023-04-18 12:56:25 +05:30
s-aga-r	91a398a191	fix: use CombineDatetime instead of Timestamp in QB queries	2023-04-18 12:55:16 +05:30
Sagar Sharma	a78b4bef0e	Merge branch 'develop' into FIX-ISS-23-24-00171	2023-04-18 11:44:03 +05:30
ruthra kumar	3f537d30bd	chore(patch): by default ledger entries of JE's will not be merged	2023-04-18 10:55:49 +05:30
ruthra kumar	a3e3fe149d	refactor: checkbox to toggle merging of JE account heads	2023-04-18 08:59:33 +05:30
Ankush Menat	e4f152a416	fix: whitelist doc method ... This should've been whitelisted, looks like it was missed out closes https://github.com/frappe/erpnext/issues/34898	2023-04-18 08:24:22 +05:30
barredterra	aba87db6be	fix: translation files ... - remove leading "DocType: XXX" - remove leading path and line number - add trailing comma (three columns total)	2023-04-17 22:28:53 +02:00
MohsinAli	dd93ea067e	fix: change discuss forum url (#34891) ... [skip ci]	2023-04-17 17:00:52 +05:30
Deepesh Garg	534ea5ad21	fix: Add offers info to website item (#34873) ... * fix: Add offers info to website item * Revert "fix: Add offers info to website item" This reverts commit 88b598edb61f0ab97b751581cc2719964e169055. * fix: Add offer properties to website item	2023-04-17 16:35:22 +05:30
s-aga-r	a527221709	test: add test case for consumption of reserved stock	2023-04-17 15:33:55 +05:30
s-aga-r	2ed7d8a1fb	fix: don't allow Stock Reconciliation for items having reserved stock	2023-04-17 15:33:55 +05:30
s-aga-r	dc9bb772cb	refactor(test): use change_settings instead of update_stock_settings	2023-04-17 15:33:55 +05:30
s-aga-r	a87bb78d72	fix: don't allow to enable Stock Reservation and Negative Stock simultaneously	2023-04-17 15:33:55 +05:30
s-aga-r	73f16752a6	chore: conflicts	2023-04-17 15:33:55 +05:30
s-aga-r	866f98ac15	test: Stock Reservation for Serial and Batch Items	2023-04-17 15:33:46 +05:30
Rohit Waghchaure	6bccd8644e	fix: stock reco test case	2023-04-17 14:22:35 +05:30
rohitwaghchaure	9fd8b8e53a	Merge pull request #34851 from rohitwaghchaure/fixed-too-many-writes-error-in-stock-reco ... fix: too many writes error while making backdated stock reconciliation	2023-04-17 12:01:36 +05:30
rohitwaghchaure	9f399f8741	Merge pull request #34882 from rohitwaghchaure/filter-to-hide-disabled-warehouses ... fix: don't show disabled warehouses in the Warehouse Wise Stock Balance report	2023-04-17 12:00:57 +05:30
Rohit Waghchaure	9ceb1f6bda	fix: don't show disabled warehouses in the Warehouse Wise Stock Balance report	2023-04-17 11:05:32 +05:30
Rohit Waghchaure	d9dd64b4d2	fix: linters issues	2023-04-16 23:25:51 +05:30
Sagar Sharma	db7b78328b	Merge branch 'develop' into FIX-ISS-23-24-00171	2023-04-16 20:13:42 +05:30
Deepesh Garg	5c75894065	fix: Advance payment against payment terms (#34872)	2023-04-16 17:11:24 +05:30
Shariq Ansari	f27c921783	Merge pull request #34876 from shariquerik/selling-workspace-fix	2023-04-16 14:26:24 +05:30
rohitwaghchaure	634d526d15	Merge pull request #34852 from wojosc/patch-36 ... fix allowing rename of Lead	2023-04-16 14:18:49 +05:30
Shariq Ansari	5a4dd354c1	fix: selling workspace is not migrating properly	2023-04-16 13:10:42 +05:30
Hossein Yousefian	1d162ffb87	get_incoming_rate_zero_in_rate_fix	2023-04-16 11:03:16 +03:30
s-aga-r	c9418aab45	chore: add items field label	2023-04-14 16:57:14 +05:30
s-aga-r	fb3271c624	fix: unable to change company for manual Serial No entry	2023-04-14 15:59:35 +05:30
Devin Slauenwhite	51c4338661	fix(ux): don't throw error when company defaults aren't set (#34825) ... * fix(ux): don't throw error when company defaults aren't set; instead prompt account input. * fix: translate label and title	2023-04-14 15:20:51 +05:30
Rohit Waghchaure	7bfc8f1236	fix: too many writes error while making backdated stock reconciliation	2023-04-14 15:12:58 +05:30
Raffael Meyer	59f6b773cd	feat: add german sales tax template (#34823) ... Nullsteuersatz nach § 12 Abs. 3 UStG	2023-04-14 13:14:00 +05:30
Wolfram Schmidt	9d1cae01bd	fix allowing rename of Lead ... This is needed to consolidate data like merging leads together when duplicated appear.	2023-04-14 09:05:09 +02:00
Deepesh Garg	a7051cb9b5	fix: Don't use stale item details (#34847)	2023-04-14 09:59:42 +05:30
Deepesh Garg	66130493eb	fix: Remove unnecessary checkbox from Accounts doctype (#34821)	2023-04-14 09:47:15 +05:30
Vishnu VS	194ed1842f	fix: update workstation hour rate	2023-04-13 19:02:03 +05:30
s-aga-r	6c9e419fec	fix: validation for Non-Stock item in Sales Order Reservation	2023-04-12 16:18:13 +05:30
s-aga-r	e65b6d47e4	fix: disable Stock Reservation by default	2023-04-12 15:12:56 +05:30
s-aga-r	f0acb2049b	fix: don't allow to deliver/transfer reserved stock	2023-04-12 14:13:54 +05:30
s-aga-r	56097807b4	fix: Stock Reservation validation in Stock Settings	2023-04-12 13:58:11 +05:30
s-aga-r	e7491d117d	test: add test case for Stock Reservation against SO	2023-04-11 17:25:13 +05:30
Rohit Waghchaure	6851b5ba97	fix: reposting record not created for backdated stock reco	2023-04-11 14:35:33 +05:30
s-aga-r	51946c5528	chore: linter	2023-04-11 12:46:59 +05:30
Anand Baburajan	c957a5cd2e	fix: provide filter by depreciable assets in fixed asset register (#34803)	2023-04-11 12:16:07 +05:30
s-aga-r	a14a6002e7	Merge branch 'develop' into stock-reservation	2023-04-11 10:00:39 +05:30
s-aga-r	efcb84cedf	test: add test cases for SO	2023-04-11 09:11:51 +05:30
s-aga-r	bc3cb6bff6	fix: cancel SRE on SO cancel	2023-04-11 08:32:37 +05:30
s-aga-r	a918adaa33	test: add test cases for SRE	2023-04-11 08:29:59 +05:30
Raffael Meyer	934e1b4e6a	fix: add german translation of "Partly Paid" (#34776)	2023-04-09 19:04:57 +05:30
Deepesh Garg	6f6928fa7b	fix: Item tax validity comparison fixes (#34784) ... fix: Item tax validity comparsion fixes	2023-04-09 09:38:13 +05:30
Sagar Sharma	299fb2619f	Merge branch 'develop' into refactor-batch	2023-04-08 11:15:08 +05:30
s-aga-r	4a9a5f03fc	Merge branch 'develop' into refactor-batch	2023-04-08 11:06:27 +05:30
Sagar Sharma	ba553dba62	Merge pull request #34739 from resilient-tech/item-tax-override-remove ... chore!: remove override to set item tax based on HSN code	2023-04-07 21:39:08 +05:30
Anand Baburajan	29e025c012	Merge pull request #34778 from AnandBaburajan/asset_value_adjust_get_depr_amt ... fix: improper usage of get_depreciation_amount in asset_value_adjustment	2023-04-07 16:48:06 +05:30
Anand Baburajan	90dee8b663	Merge pull request #34735 from ihosseinu/asset_movement_translation_fix ... 'Make Asset Movement' button translation fix in asset_list.js	2023-04-07 15:30:26 +05:30
Anand Baburajan	edaa0bc3f7	Merge branch 'develop' into asset_value_adjust_get_depr_amt	2023-04-07 15:24:37 +05:30
anandbaburajan	984905109d	fix: improper usage of get_depreciation_amount in asset_value_adjustment	2023-04-07 15:23:02 +05:30
Sagar Sharma	f7fb001126	Merge branch 'develop' into FIX-ISS-22-23-06306	2023-04-06 15:59:32 +05:30
s-aga-r	a575bd50ef	test: add test cases for internal PR received qty	2023-04-06 15:26:19 +05:30
rohitwaghchaure	7d2d2dd0af	Merge pull request #34768 from rohitwaghchaure/fixed-ux-issue ... fix: UX for stock entry, bom and work order	2023-04-06 14:16:20 +05:30
Sagar Sharma	cfd4da3e8a	Merge branch 'develop' into FIX-ISS-22-23-06397	2023-04-06 13:23:39 +05:30
s-aga-r	a55b818119	fix: Subcontracting Receipt incorrect status	2023-04-06 13:20:33 +05:30
Rohit Waghchaure	82a136f991	fix: UX for stock entry, bom and work order	2023-04-06 12:51:32 +05:30
Deepesh Garg	91a26608ee	fix: Unable to create payment request against purchase invoice (#34762)	2023-04-06 12:40:58 +05:30
s-aga-r	0d1df26b88	chore: add Delivery Note Item in Purchase Receipt Status Updater	2023-04-06 09:31:46 +05:30
s-aga-r	bc39dfab5d	feat: add Received Qty field in Delivery Note Item	2023-04-06 09:29:44 +05:30
rohitwaghchaure	8503d581a5	Merge pull request #34743 from rohitwaghchaure/fix-incorrect-balance-qty ... fix: incorrect stock balance quantity for batch item	2023-04-05 23:21:44 +05:30
s-aga-r	ac24d778e8	refactor: add Docstrings for functions	2023-04-05 19:48:15 +05:30
Lucky-Tsuma	9bf87d708e	fix: payment entry is already created on posawesome. (#34712)	2023-04-05 13:52:00 +05:30
Deepesh Garg	56f5078357	fix: Shop by category fixes (#34688) ... * fix: Shop by category fixes * chore: Update tests	2023-04-05 12:43:32 +05:30
Ritwik Puri	f193393f57	fix!: require sender and message for contact us page (#34707) ... * fix: require sender and message for contact us page * refactor: dont override frappe.send_message from client side used override_whitelisted_method hook for the same	2023-04-05 12:04:36 +05:30
Deepesh Garg	fd3fb64aa3	feat: Auto allocate advance payments only against orders (#34727) ... feat: Auto allocate advance payments only againt orders	2023-04-05 12:02:44 +05:30
Anand Baburajan	869289a6e4	Merge pull request #34745 from frappe/mergify/bp/develop/pr-34737 ... fix: don't include cancelled JVs in assdeprledger report (backport #34737)	2023-04-05 11:59:52 +05:30
Raffael Meyer	e6a9b6ee95	feat: remove deprecated get_customer_list (#34624) ... feat: remove deprecated method get_customer_list	2023-04-05 11:56:15 +05:30
Anand Baburajan	5cc3c08059	fix: asset monthly WDV and DD schedule and refactor [develop] (#34646) ... * fix: monthly wdv and dd schedule * chore: minor rename * chore: fix tests	2023-04-05 11:46:31 +05:30
anandbaburajan	1101b7bfdf	fix: don't include cancelled JVs in assdeprledger report ... (cherry picked from commit 3896d41e95a2054b4ec76c5f5b2819b3f28ef98e)	2023-04-05 06:04:43 +00:00
Rohit Waghchaure	ef4bd77196	fix: incorrect stock balance quantity for batch item	2023-04-05 00:02:45 +05:30
Sagar Vora	9c66ebb108	chore!: remove override to set item tax based on HSN code	2023-04-04 18:02:55 +05:30
Hossein Yousefian	b70615ef18	'Make Asset Movement' button translation fix	2023-04-04 14:49:43 +03:30
rohitwaghchaure	12325cb685	Merge pull request #31271 from dj12djdjs/fix-reserve-qty ... fix(stock): don't reserve qty on sales return.	2023-04-04 06:21:30 +05:30
rohitwaghchaure	682730a498	Merge pull request #34715 from rohitwaghchaure/fixed-bom-update-log ... fix: bom update log not working for large batch size	2023-04-03 15:49:25 +05:30
Rohit Waghchaure	d56070301c	fix: bom update log not working for large batch size	2023-04-03 14:47:58 +05:30
Sagar Sharma	4571bd58d2	Merge branch 'develop' into FIX-ISS-22-23-06369	2023-04-03 14:26:09 +05:30
s-aga-r	6ec7590c21	fix: consider qty field precision	2023-04-03 14:08:11 +05:30
ruthra kumar	1eefd517d1	Merge pull request #34694 from ruthra-kumar/recalculate_difference_on_allocation_change ... fix(ui): recalculate difference amount on allocation change	2023-04-03 10:03:01 +05:30
s-aga-r	38e9367184	fix: re-reserve stock on SO Update Items	2023-04-02 21:24:59 +05:30
s-aga-r	d5f0a7fcbb	refactor(minor): stock reservation entry	2023-04-02 19:23:22 +05:30
Deepesh Garg	4c61ee30bb	fix: Multiple issues in purchase invoice submission (#34600) ... * fix: Multiple issues in purchase invoice submission * fix: Base grand total calculation * chore: Calculate base grand total separately only in multi currency docs * fix: Add gl entry for round off	2023-04-02 09:35:27 +05:30
Kitti U. @ Ecosoft	74b29eb5e2	fix: Bank clearance for case loan (disburstment/repayment) (#34586)	2023-04-01 18:50:30 +05:30
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
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	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
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	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
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
s-aga-r	517b5f8567	refactor: rewrite batch.py queries in QB	2023-03-29 14:02:09 +05:30
Sagar Sharma	867d898304	fix: zero rm-cost for batch rm item in SCR (#34616) ... fix: `0` rm-cost for batch rm item in SCR	2023-03-28 18:45:16 +05:30
rohitwaghchaure	738dd57904	Merge pull request #34461 from s-aga-r/FIX-ISS-22-23-05936 ... fix: incorrect `Opening Value` in `Stock Balance` report	2023-03-28 17:40:25 +05:30
akiratfli	07c9b99072	fix: bad strings format for update-translations (#34592) ... Co-authored-by: justin.li <justin.li@lungteh.com>	2023-03-28 17:20:54 +05:30
ruthra kumar	7c13533f30	Merge pull request #34608 from ruthra-kumar/reconciliation_debit_credit_mismatch ... chore: removing redundant validation	2023-03-28 16:54:37 +05:30
Vishal Dhayagude	7aafc90d58	fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set (#34525) ... * fix: Tax Category not able to set hence it calculating zero tax for item whoes tax template set * fix: minor change added	2023-03-28 16:48:03 +05:30
Devin Slauenwhite	393bc25e2d	fix: don't get zero value entries for exchange rate calculation (#34475) ... * fix: multiply None by float * chore: remove debug	2023-03-28 16:34:24 +05:30
Deepesh Garg	50c1172f29	fix: Party Name in SOA print when viewed from Customer/Supplier master (#34597) ... fix: Party Name in SOA print when viewd from Customer/Supplier master	2023-03-28 15:36:16 +05:30
Deepesh Garg	12ad2aa2e5	fix: Percentage billing in Sales Order (#34606)	2023-03-28 15:33:59 +05:30
Marica	dae40dfbb4	Merge branch 'develop' into early-payment-loss	2023-03-28 15:01:28 +05:30
ruthra kumar	d52f7e2820	fix: removing redundant validation	2023-03-28 13:44:23 +05:30
s-aga-r	7d0bc0914d	Merge branch 'develop' into stock-reservation	2023-03-28 12:25:17 +05:30
s-aga-r	beb425e1ff	chore: add Stock Reservation Qty column in Stock Balance Report	2023-03-27 21:03:35 +05:30
Devin Slauenwhite	3c553b0938	feat: don't reserve qty on sales return	2023-03-27 10:37:54 -04:00
Devin Slauenwhite	17f8080168	chore: revert get_reserve_qty method	2023-03-27 10:37:04 -04:00
s-aga-r	3d75e3f434	chore: add Stock Reservation Qty column in Stock Projected Qty Report	2023-03-27 19:12:08 +05:30
marination	216a46bd66	feat: Make Tax loss booking optional ... - Checkbox in Accounts Settings - Apply checkbox in PE deductions setting logic - Adjust tests	2023-03-27 16:11:00 +05:30
s-aga-r	00ac49f81b	refactor(minor): SRE functions	2023-03-27 12:18:40 +05:30
s-aga-r	22a9c8ad55	fix(ux): SRE filters in DN Items	2023-03-27 11:07:24 +05:30
s-aga-r	b95a49e4c2	fix: validate DN against SRE	2023-03-27 10:46:07 +05:30
s-aga-r	3602d1909e	fix: map DN items based on SRE	2023-03-26 17:33:01 +05:30
s-aga-r	15cb99290c	chore: add SRE ref in DN dashboard	2023-03-26 16:53:31 +05:30
s-aga-r	cdc625806d	chore: add field Against Stock Reservation Entry in DN Item	2023-03-26 16:53:28 +05:30
s-aga-r	744166da73	fix(ux): unable to uncheck Reserve Stock button in SO	2023-03-26 12:14:00 +05:30
s-aga-r	9652cb8de5	chore: create SRE on SO submission	2023-03-25 15:50:00 +05:30
=	1142e69d1a	Merge branch 'develop' into fix-reserve-qty ... # Conflicts: # erpnext/selling/doctype/selling_settings/selling_settings.json	2023-03-24 23:50:50 -04:00
s-aga-r	be9fa8c047	fix: don't allow to disable Stock Reservation if SRE exists	2023-03-24 21:39:36 +05:30
s-aga-r	48108b5b41	chore: add fields Serial No and Batch No in SRE	2023-03-24 16:23:38 +05:30
s-aga-r	7b6e4d44b7	chore: remove Valuation Rate field from SRE	2023-03-24 16:09:38 +05:30
ruthra kumar	f7780cdb58	refactor: additional filters and columns in Payment Ledger report (#34577) ... 1. 'Party type' and 'Party' filters have been added 2. checkbox to include Amount in Acccount Currency 3. Grouping vouchers on Party 4. Replaced Company with Posting Date	2023-03-24 12:25:03 +05:30
Raffael Meyer	8c7fa5712b	feat: deprecate get_customer_list (#34563)	2023-03-24 12:13:53 +05:30
Shram Kadia	0cd870fc29	fix: get batch_no. for item automatically (#34473) ... * fix: default pos conversion factor set to 1 * fix:get-batch-no-of-item-automatically	2023-03-24 12:05:26 +05:30
Nabin Hait	282a0ee2ce	Merge pull request #34257 from deepeshgarg007/opening_entry ... feat: Closing balance for period closing and reporting	2023-03-24 11:59:00 +05:30
rohitwaghchaure	980cca1772	Merge pull request #34573 from rohitwaghchaure/timer-buttons-not-working ... fix: Time buttons not working in the job card	2023-03-23 22:35:43 +05:30
Rohit Waghchaure	34c190b7d6	fix: Time button not working in the job card	2023-03-23 22:32:11 +05:30
Anand Baburajan	e6b0196493	fix: recalculate wdv rate after asset repair [develop] (#34570) ... fix: recalculate wdv rate after asset repair	2023-03-23 21:10:22 +05:30
s-aga-r	c80ce99972	feat: configuration to allow partial reservation	2023-03-23 19:53:17 +05:30
s-aga-r	ee074883bb	chore: add Partially Reserved status in SRE	2023-03-23 19:50:34 +05:30
s-aga-r	4ad55382cf	chore: add field Voucher Qty in SRE	2023-03-23 19:37:57 +05:30
Deepesh Garg	87108be11a	fix: Sales person variance report without item group (#34552) ... fix: Sales person variance report witout item group	2023-03-23 19:19:46 +05:30
Deepesh Garg	8ce1da111e	chore: Improve validation message	2023-03-23 19:14:12 +05:30
Deepesh Garg	f8cff09129	fix: CS financial statement param	2023-03-23 19:12:42 +05:30
Deepesh Garg	b7dcf27b01	fix: Partial trial balance view	2023-03-23 19:06:07 +05:30
Deepesh Garg	30eb6c8512	fix: Validation for cancelation	2023-03-23 19:05:25 +05:30
Deepesh Garg	3fd95200da	chore: Fix Typo	2023-03-23 19:04:48 +05:30
Deepesh Garg	528ab503f2	fix: Don't validate if no GL Entry exists	2023-03-23 15:32:24 +05:30
s-aga-r	1ccdf588e2	fix(ux): Reserve Stock button behaviour in SO	2023-03-23 13:34:40 +05:30
s-aga-r	f8c477ca5c	chore: rename status from Submitted to Reserved	2023-03-23 13:05:43 +05:30
s-aga-r	fd746288f8	chore: add field Available Qty to Reserve in SRE	2023-03-23 13:05:41 +05:30
Raffael Meyer	f7bf1b8a0c	fix: unset address and contact on trash (#34495) ... * fix(Customer): unset address and contact on trash * fix(Supplier): unset address and contact on trash --------- Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>	2023-03-23 11:52:32 +05:30
Shariq Ansari	24a0833980	Merge branch 'develop' into crm-comments-overlap-fix	2023-03-22 11:40:58 +05:30
Shariq Ansari	76cea7dd6a	fix: Note username overlapping with note content(CRM)	2023-03-22 11:28:58 +05:30
s-aga-r	30d566a787	fix: update Reserved Qty in SO Item on SRE cancel	2023-03-21 23:49:01 +05:30
s-aga-r	c2ba8b1b54	chore: make SRE a submittable DocType	2023-03-21 20:16:07 +05:30
Anand Baburajan	6d6a7bcb50	fix: incorrect depr schedules after asset repair [develop] (#34544) ... * fix: backport missing changes from #30838 * fix: incorrect schedule after repair	2023-03-21 20:07:27 +05:30
Deepesh Garg	fa991b2dcf	Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry	2023-03-21 17:00:08 +05:30
Deepesh Garg	f9397a87ac	fix: Ignore opening entries if PCV posted	2023-03-21 16:59:22 +05:30
Richard Case	d8e73b63f3	fix: remove non-maintained Tax Detail report and missing workspace links (#34192) ... * fix: remove non-maintained Tax Detail report and missing workspace links * patch: delete report "Tax Detail" --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2023-03-21 16:23:27 +05:30
Raffael Meyer	79911734e9	fix: translations and UX in alternative item mapping (#34433) ... * fix: disable deletion in alternative item mapping * feat: german translations * fix: make string translatable --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-03-21 16:20:11 +05:30
Raffael Meyer	0df3a1a3af	fix: remove unused translation (#34519)	2023-03-21 16:18:45 +05:30
Shram Kadia	08fc686513	fix: default pos conversion factor set to 1 (#34437)	2023-03-21 15:51:18 +05:30
Raffael Meyer	59c2e7ec3e	fix: german translations (#34312) ... fix: some german translations	2023-03-21 15:48:27 +05:30
Vishal Dhayagude	6966fa4d88	fix: POS not picking up pos profile company address instead fetch any random company address (#34521)	2023-03-21 15:43:57 +05:30
Deepesh Garg	ee6c107d58	fix(client): Amount calculation for 0 qty debit notes (#34455) ... fix(client): Amount calculaton for 0 qty debit notes Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>	2023-03-21 15:38:39 +05:30
ruthra kumar	2d19cee713	Merge pull request #34501 from ruthra-kumar/incorrect_currency_symbol_for_bank_accounts_in_reconciliation_tool ... refactor(bank reconciliation tool): currency symbol fix and concurrent usage	2023-03-21 15:30:50 +05:30
Rohit Waghchaure	aaa4d1eb55	fix: E-commerce issue with Item Variants	2023-03-21 14:44:12 +05:30
s-aga-r	f858f657a0	feat: add Stock Reservation Entry ref in SO connections	2023-03-21 13:28:31 +05:30
s-aga-r	50de868285	chore: add Stock Reserved Qty field in SO Item	2023-03-21 13:17:58 +05:30
Marica	c5da7f5fb1	Merge branch 'develop' into early-payment-loss	2023-03-21 11:40:30 +05:30
s-aga-r	0700063379	chore: add Reserve Stock check field in Sales Order	2023-03-20 23:55:33 +05:30
s-aga-r	1b7fb6d7e7	chore: make Stock UOM required in SRE	2023-03-20 22:41:22 +05:30
s-aga-r	4848a054a8	chore: make Submitted default status for Stock Reservation Entry	2023-03-20 22:40:06 +05:30
s-aga-r	2946de40d8	fix: make Project and Is Cancelled field read-only in SRE	2023-03-20 21:18:37 +05:30
s-aga-r	0d1332942c	feat: add Status and Delivered Qty fields in Stock Reservation Entry	2023-03-20 19:01:37 +05:30
Ankush Menat	109a9f1390	perf: index against_sales_invoice field on DN items (#34509) ... This is used on Sales invoice dashboard and takes a lot of time to load as db size increases. Results: Before: ~10-20 seconds to load dashboard After: few milliseconds because of index [skip ci]	2023-03-20 14:46:26 +05:30
s-aga-r	da1455198e	chore: field validation for Stock Reservation Entry	2023-03-20 13:42:11 +05:30
s-aga-r	7eb2075265	feat: add settings for Stock Reservation in Stock Settings	2023-03-20 11:45:35 +05:30
s-aga-r	085d9ce004	feat: add DocType Stock Reservation Entry	2023-03-20 11:20:30 +05:30
Sagar Sharma	4c35a37eaa	Merge branch 'develop' into FIX-ISS-22-23-05936	2023-03-20 10:28:10 +05:30
Deepesh Garg	44053db010	chore: Remove unnecessary list comprehension	2023-03-19 19:46:01 +05:30
Deepesh Garg	fc86a8568f	fix: Supplier RFQ email link (#34338)	2023-03-19 18:09:18 +05:30
Raffael Meyer	d791dc11a3	fix: patch depends on Currency Exchange Settings (#34494)	2023-03-19 18:05:12 +05:30
ruthra kumar	1eea585d29	refactor: allow for concurrent use of reconciliation tool ... 1. set default filter dates a period of one month from current date	2023-03-19 14:20:03 +05:30
ruthra kumar	2d14d92b32	fix: incorrect currency symbol in Bank Reconciliation tool	2023-03-19 12:47:29 +05:30
Deepesh Garg	0aadb680eb	chore: Add missing validations	2023-03-19 12:46:42 +05:30
Deepesh Garg	00fe3042b2	chore: Simplify query	2023-03-18 20:05:43 +05:30
Deepesh Garg	7f11373b58	fix: Account sub query	2023-03-17 16:59:23 +05:30
Deepesh Garg	d11a64ddcb	Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry	2023-03-17 16:50:49 +05:30
Sagar Sharma	a07a5572ea	Merge branch 'develop' into FIX-ISS-22-23-05936	2023-03-17 16:18:54 +05:30
Danny	ca10e2bb9f	fix: bad strings format for command get-untraslated (#34361) ... * fix: bad string foramt * fix: bad string format * fix: pre-commit format --------- Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>	2023-03-17 16:13:32 +05:30
Sagar Sharma	f2c78163bf	Merge branch 'develop' into FIX-34354	2023-03-17 15:58:46 +05:30
Deepesh Garg	d8ece86463	fix: Update account number from parent company (#34474)	2023-03-17 15:55:11 +05:30
Deepesh Garg	7b630217bd	fix: Multiple accounting dimension filtering in AR/AP reports (#34464) ... Co-authored-by: Anand Baburajan <anandbaburajan@gmail.com>	2023-03-17 15:51:33 +05:30
Deepesh Garg	be723bb9d4	chore: Update user manual link (#34478)	2023-03-17 15:39:33 +05:30
ruthra kumar	6b0dc62681	Merge pull request #34456 from ruthra-kumar/gp_return_invoice_issue ... fix: Gross Profit reports Invoices with -ve qty for Invoices with Cr Notes	2023-03-17 15:26:41 +05:30
Sagar Sharma	0753aa5ab7	Merge branch 'develop' into FIX-34354	2023-03-17 15:16:41 +05:30
Sagar Sharma	3fb64cacfc	Merge branch 'develop' into FIX-ISS-22-23-05936	2023-03-17 15:03:44 +05:30
ruthra kumar	cc61daeec4	test: Gross Profit report output for Cr notes ... 2 New test cases added. 1. Standalone Cr notes will be reported as normal Invoices 2. Cr notes against an Invoice will not overallocate qty if there are multiple instances of same item	2023-03-17 14:48:57 +05:30
ruthra kumar	d0715a82eb	refactor: Ignore linked Cr Notes in Report output	2023-03-17 14:48:57 +05:30
ruthra kumar	e2f19c6a14	fix: Overallocation of 'qty' from Cr Notes to Parent Invoice ... Cr Notes 'qty' are overallocated to parent invoice, when there are mulitple instances of same item in Invoice.	2023-03-17 14:48:57 +05:30
ruthra kumar	ec075122b6	refactor: difference amt validation for same currency accounts	2023-03-17 14:14:17 +05:30
ruthra kumar	861387f164	test: difference amount should not be calculated for base currency	2023-03-17 14:14:17 +05:30
ruthra kumar	48fae0c1ce	fix: difference amount calculation for company currency accounts	2023-03-17 14:14:17 +05:30
Sagar Sharma	db1f2d6279	Merge branch 'develop' into FIX-ISS-22-23-05936	2023-03-17 13:54:13 +05:30
s-aga-r	b04a101c11	fix: incorrect Opening Value in Stock Balance report	2023-03-17 13:53:49 +05:30
rohitwaghchaure	558db13040	Merge branch 'develop' into fix-22-23-05686	2023-03-17 08:57:37 +05:30
Anand Baburajan	563ee92043	Merge branch 'develop' into FIX-34354	2023-03-16 18:22:13 +05:30
Anand Baburajan	b6b8392413	fix: refactor asset depr schedule and remove unnecessary depr method (#34434) ... * fix: remove depr method from depr schedule and refactor assetdeprsch * chore: use assetdeprsch's depr method, not deprschedule's * fix: use default 0 value for NDB and OAD * chore: fix rounded numbers * chore: correct rounding in test_website_item_price_for_logged_in_user	2023-03-16 18:18:47 +05:30
Sagar Sharma	357d4994e4	Merge branch 'develop' into fix-22-23-05686	2023-03-14 20:59:38 +05:30
Sagar Sharma	ea269c6a1c	Merge branch 'develop' into FIX-34354	2023-03-14 20:59:27 +05:30
Ankush Menat	f1752fcd7a	Merge pull request #34116 from prateekkaramchandani/develop ... fix: use max function to get default company address	2023-03-14 19:38:26 +05:30
Ankush Menat	e0042972c8	test: add test for primary address sorting	2023-03-14 18:50:19 +05:30
Ankush Menat	55489d0056	Merge branch 'develop' into prateekkaramchandani/develop	2023-03-14 18:39:06 +05:30
Sagar Sharma	e0b288fbf0	Merge branch 'develop' into FIX-34354	2023-03-14 18:19:38 +05:30
Sagar Sharma	258242f8d7	Merge branch 'develop' into FIX-ISS-22-23-05720	2023-03-14 18:17:48 +05:30
Ankush Menat	f95ad039e4	test: add timeout to all BOM related tests (#34446) ... * Revert "chore: remove failing test (#34444)" This reverts commit b89ecd482d. * test: add timeout to bom tests	2023-03-14 18:10:17 +05:30
Deepesh Garg	b89ecd482d	chore: remove failing test (#34444)	2023-03-14 15:53:03 +05:30
Johannes Obermeier	70c78d0d67	fix: incorrect EAN validation, EAN can be an EAN8, EAN12 or EAN13 code (#34250) ... Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-03-14 15:27:05 +05:30
s-aga-r	22ad9a1903	chore: Allow Zero Valuation Rate msg in SE	2023-03-14 14:33:03 +05:30
marination	d6d0163514	fix: Provision to apply early payment discount if payment is recorded late ... - Party could have paid on time but payment is recorded late - Prompt for reference date so that discount is applied while mapping - Prompt only if discount in payment schedule of valid doctypes - test: Reference date and impact on PE - `make_payment_entry` (JS) must be able to access `this`	2023-03-14 14:22:39 +05:30
Sagar Sharma	0dbf4557db	Merge branch 'develop' into FIX-ISS-22-23-05720	2023-03-14 13:19:58 +05:30
Sagar Sharma	185a8910d2	Merge branch 'develop' into fix-22-23-05686	2023-03-14 13:19:46 +05:30