35520 Commits

Author	SHA1	Message	Date
s-aga-r	eca77134ae	feat: add field pi_detail in Packing Slip	2023-04-27 15:48:02 +05:30
Nihantra Patel	6dfca79af3	fix: Report link, option, and added a link for Sales Person in GP	2023-04-27 15:04:50 +05:30
Vishnu VS	06e458c745	Merge branch 'develop' into develop	2023-04-27 12:24:29 +05:30
rohitwaghchaure	01bfd2ab67	Merge pull request #35066 from rohitwaghchaure/fixed-delivered-qty-issue-while-making-mr ... fix: don't create material request from sales order against delivered items	2023-04-27 09:05:36 +05:30
Rohit Waghchaure	1e2deee579	fix: don't create material request from sales order against the delivered items	2023-04-26 20:30:53 +05:30
Vishnu VS	f68eef833c	Update erpnext/manufacturing/doctype/job_card/job_card.py ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2023-04-26 20:25:43 +05:30
Vishnu VS	5c94f2cc52	Update erpnext/manufacturing/doctype/job_card/job_card.py ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2023-04-26 20:25:15 +05:30
Vishnu VS	25d0119b7e	Merge branch 'develop' into develop	2023-04-26 18:56:09 +05:30
HarryPaulo	3be1ab9b8d	fix: allow submit delivery note when the sales order was billed... (#34910)	2023-04-25 21:54:41 +05:30
Kitti U. @ Ecosoft	c36dc3dc57	fix: v14, Bank Reconcile Tools not cover case JV debit bank (#35000)	2023-04-25 21:34:28 +05:30
rohitwaghchaure	5e37308b5e	Merge pull request #35050 from Nandhinidevi123/workstation_filter ... add if condition for workstation filter	2023-04-25 21:28:41 +05:30
rohitwaghchaure	b24704740b	Merge pull request #34918 from s-aga-r/FIX-ISS-22-23-06298 ... perf: Journal Entries	2023-04-25 21:27:52 +05:30
mergify[bot]	ab0f7794b7	fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order" (#34726) ... fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order" (#34726) * fix: convert asynchronous field update to synchronous * fix: wrong qty of remaining work orders to be created when using "Create" > "Work Order" (cherry picked from commit 189b020d228bdb1c0c589697162cf91718b2fa27) Co-authored-by: danjeremynavarro <46537526+danjeremynavarro@users.noreply.github.com>	2023-04-25 21:08:50 +05:30
tundebabzy	3d90b970d1	fix: click handler should not attempt indexed access of empty array (#35013) ... fix: click handler should not attempt indexed access of empty array	2023-04-25 20:57:59 +05:30
Ernesto Ruiz	c4512d552e	chore: Add translate function to Depreciation Journal Entry Remark (#35022) ... chore: Add translate function to Depreciation Journal Entry Remark	2023-04-25 20:56:53 +05:30
Deepesh Garg	f88431a79a	fix: Common party JV cost center (#35008)	2023-04-25 20:54:22 +05:30
Raffael Meyer	d6bc8bba8b	fix: per_billed condition for Payment Entry (#34969)	2023-04-25 20:51:11 +05:30
Nandhinidevi123	74fb2bec3a	add if condition for workstation filter	2023-04-25 20:08:35 +05:30
Deepesh Garg	f7b50f2ade	fix: Unable to allocate advance against invoice (#35007)	2023-04-25 19:18:45 +05:30
Nabin Hait	72b5c1f70a	fix: Use set instead of db_set as it is called from validate (#34967)	2023-04-25 19:18:08 +05:30
Deepesh Garg	ecea9b44a3	fix: Payment entry with TDS in bank reco statement (#34961)	2023-04-25 19:17:13 +05:30
Solufy Solution	f1acc5fabb	fix: Bulk Payment Entry from PO/SO (#34942) ... Co-authored-by: Nihantra Patel <n.patel.serpentcs@gmail.com>	2023-04-25 19:16:30 +05:30
HarryPaulo	22290c2694	fix: respect title_field from doctype to bulk transactions (#34928)	2023-04-25 19:13:53 +05:30
Deepesh Garg	b545e3def0	fix: Add company field to lower deduction certificate (#34914)	2023-04-25 19:07:45 +05:30
Ankush Menat	6de71eb158	fix: pass reference_doctype in link queries (#35038)	2023-04-25 18:33:31 +05:30
Anand Baburajan	e08d636bf7	fix: use filter_by_finance_book instead of only_depreciable_assets in fixed asset register (#35031) ... fix: use filter_by_finance_book instead of only_depreciable_assets	2023-04-25 15:16:50 +05:30
Sagar Sharma	31cdfa395a	Merge branch 'develop' into FIX-ISS-22-23-06298	2023-04-25 13:57:34 +05:30
s-aga-r	e782a054c8	refactor: get_stock_value_on() to get stock value of multiple warehouses at once	2023-04-25 13:54:36 +05:30
Anand Baburajan	ca388ed9cd	fix: value of depreciable assets not updating after manual depr entry [develop] (#35020) ... * fix: value of depreciable assets not updating after manual depr entry * chore: add asset depr schedule to jv's ignore_doctypes_on_cancel_all	2023-04-25 12:45:05 +05:30
rohitwaghchaure	7a63fbef4f	Revert "fix: Incorrect difference value in Stock and Account Value Comparison…"	2023-04-25 12:01:26 +05:30
ruthra kumar	20226d0a47	Merge branch 'develop' into revert-33699-tds_report_percentage	2023-04-25 10:43:18 +05:30
ruthra kumar	cb7a99cbaa	Revert "fix: Rate from LDC in TDS reports (#33699)" ... This reverts commit db9beb3cdd.	2023-04-25 10:13:07 +05:30
Vishnu VS	cdb05cd310	Merge branch 'develop' into develop	2023-04-25 09:29:47 +05:30
Sagar Sharma	58dbf7fc24	Merge branch 'develop' into stock-reservation	2023-04-24 22:58:16 +05:30
s-aga-r	bf4a57a37c	fix: miscellaneous ... fix: don't reserve stock in group warehouse fix: partial reservation in multiple warehouses feat: add prompt to select warehouse and qty for reservation in SO	2023-04-24 22:19:09 +05:30
rohitwaghchaure	291845e461	Merge pull request #35015 from rohitwaghchaure/incorrect-or-cond-delivery-note-issue ... fix: incorrect OR condition causing timeout error (For more than 50 line items)	2023-04-24 18:06:59 +05:30
rohitwaghchaure	5d8bf56cb9	Merge pull request #35012 from rohitwaghchaure/fixed-incorrect-bom-end-of-life ... fix: item not showing in the BOM	2023-04-24 18:06:37 +05:30
Rohit Waghchaure	379b215aea	fix: incorrect OR condition causing timeout error	2023-04-24 17:32:32 +05:30
Rohit Waghchaure	02c3b41dc2	fix: item not showing in the BOM	2023-04-24 14:50:27 +05:30
Marica	88647c63ba	Merge branch 'develop' into bank-trans-party-automatch	2023-04-24 12:13:12 +05:30
s-aga-r	388f85b109	refactor: Stock Reservation code in sales_order.js	2023-04-24 12:04:22 +05:30
s-aga-r	e517c06847	chore: add warehouse info in SRE msg	2023-04-23 15:45:58 +05:30
s-aga-r	0b5f03e88c	Revert "fix: Reserve and Unreserve buttons visibility in SO" ... This reverts commit cdb3181691.	2023-04-23 15:41:48 +05:30
Vishnu VS	dc0e64a72d	Merge branch 'frappe:develop' into develop	2023-04-22 23:15:42 +05:30
ruthra kumar	ed14d1ce44	feat: Reconcile Payments in background (#34596) ... * feat: auto reconcile in background * chore: Option to enable auto reconciliation in settings * refactor: validate if feature is enabled in settings * refactor: check for running job while using reconciliation tool * chore: using doc to get filter values * chore: use frappe.db.get_value in validations * chore: cleanup commented out code * chore: replace get_list with get_all * chore: use block scope variable * chore: type information for functions * refactor: flag to ignore job validation check * refactor: update parent doc status if all reconciled * chore: create test_records file * test: create a bunch of vouchers for testing auto reconcile * chore: renamed auto_reconcile to process_payment_reconciliation * chore: another child doctype to hold payments * chore: remove duplicate field * chore: add fetched payments to log * chore: Popup comment message update * chore: replace get_all with get_value * chore: replace label in settings page * chore: remove unit test and records * refactor: status in reconciliation log * refactor: set status in log as well * chore: fix field name * chore: change triggered job name * chore: use status field in list view of log * chore: status while there are no allocations * refactor: split trigger function into two * chore: adding cancelled status * refactor: function trigger queued docs * chore: cron job scheduled * chore: fixing accouts settings json file * chore: typos and variable scope * chore: use 'pluck' in db call * chore: remove redundant whitelist decorator * chore: use single DB call to fetch values * chore: replace get_all with get_value * refactor: use raw db calls to fetch reconciliation log records Using get_doc on `Process Payment Reconciliation Log` is costly when handling large volumes of invoices. Use raw frappe.db.get_all to selectively pull status and reconciled count * chore: update status on successful batch operation * chore: make payment table readonly * chore: ability to pause the background job * chore: remove isolate_each_allocation * chore: more description in progress bar * refactor: partially working state * refactor: update reconcile flag and setting hard limits for fetching * chore: make allocation editable -- NEED TO REVERT * chore: pause button * refactor: skip setter function in Payment Entry for better performan * refactor: split reconcile function and skip a setter function 1. Split reconcile function into 2 2. While reconciling against payment entry, skip a set_missing_ref_details setter method * chore: increase payment limit * refactor: replace frappe.db.get_all with frappe.db.get_value * chore: remove unwanted doctypes * refactor: make allocation table readonly * perf: update ref_details only for newly linked invoices * chore: rename skip flag * refactor(UI): receivable_payable field should auto populate * refactor: no control statements in finally block * chore: cleanup section and rename checkbox * chore: update new fieldname in code * chore: update error msg * refactor: start and pause integrated into status pause checkbox has been removed * refactor: added cancelled status to the log doctype 1. Moved the status section to the bottom in parent doc 2. Using alerts to indicate Job trigger status	2023-04-22 17:24:35 +05:30
Rohit Waghchaure	f2253dd645	fix: duplicate reposting entries of same voucher	2023-04-22 11:16:12 +05:30
s-aga-r	0cd10a50d2	Merge branch 'develop' into stock-reservation	2023-04-22 10:04:46 +05:30
s-aga-r	28d0629df1	chore: add depends_on condition for Reserve Stock field in SO	2023-04-22 10:01:00 +05:30
s-aga-r	cdb3181691	fix: Reserve and Unreserve buttons visibility in SO	2023-04-22 09:49:47 +05:30
s-aga-r	b70273b988	chore: remove Enable Stock Reservation field description	2023-04-22 08:49:31 +05:30
rohitwaghchaure	9fa72cb9d8	Merge pull request #34982 from rohitwaghchaure/fixed-added-validation-for-extra-job-card ... fix: added validation for extra job cards	2023-04-21 18:50:39 +05:30
Ankush Menat	ac871797b2	fix: SLA permissions (#34981)	2023-04-21 18:05:29 +05:30
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
Marica	fd38e8e0af	Merge branch 'develop' into bank-trans-party-automatch	2023-04-17 16:34:46 +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
marination	430b247dfc	fix: Remove bank details fields from Shareholder	2023-04-11 01:33:08 +05:30
marination	7ed8f59dc8	test: Match by Account No, IBAN, Party Name, Desc and match correction	2023-04-10 22:11:00 +05:30
Marica	36de35c6d9	Merge branch 'develop' into bank-trans-party-automatch	2023-04-10 20:04:16 +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
Marica	fcc8f9f164	Merge branch 'develop' into bank-trans-party-automatch	2023-04-05 17:04:07 +05:30
marination	d7bc192804	fix: Match by both Account No and IBAN & other cleanups ... - A BT could have both account and iban, and a Supplier could have only IBAN set - In this case, matching by either (only account) gives no match - Match by Account OR IBAN, use `or_filters` - If matched, set both account no. and IBAN in Bank Party Mapper - Explain AutoMatchParty - Add type hints to return values - Use `set_value` to set values in BT after matching since its an after submit event	2023-04-05 15:28:47 +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
marination	aea4315435	chore: Make auto matching party configurable ... - Checkbox in Accounts settings "Enable Automatic Party Matching" - Check before invoking automatching methods - misc: Remove TODO comments	2023-04-04 20:16:14 +05:30
marination	33604550ce	chore: Perform automatch on submit ... - misc: Clearer naming	2023-04-04 19:42:25 +05:30
marination	27ce789023	feat: Manually Update/Correct Party in Bank Transaction ... - On updating bank trans.n party after submit, the corresponding mapper doc will be updated too - The mapper doc in turn will update all linked bank transactions that do not have this updated value - Added Bank Party Mapper hidden link in Bank Transaction - Rename field in BPM to `Party Name` as it does not hold description data - If a BT matches with a BPM record, link that record in the BT	2023-04-04 19:27:01 +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
marination	37c1331aba	fix: Don't set description as key in Mapper doc if matched by description ... - Description is volatile and will keep changing - It will lead to multiple Bank Party Mapper docs for the same party that will never be referenced again - Parts of the descripton keep changing which is why it will never match a mapper record - If matched by desc, dont create mapper record.	2023-04-04 14:03:35 +05: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
marination	3a898289b0	chore: Single query with or filter to search Party Mapper by name/desc	2023-04-03 16:11:00 +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
marination	e7745033df	feat: Party auto-matcher from Bank Transaction data ... - Created Bank Party Mapper - Created class to auto match by account/iban or party name/description(fuzzy) - Automatch and set in transaction or create mapper - `rapidfuzz` introduced	2023-03-31 16:11:00 +05:30
marination	ad31e02616	feat: Store Party bank details in party records (Customer/Supplier/Employee/Shareholder)	2023-04-04 11:45:37 +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
Sagar Sharma	6c88fb7a8d	Merge branch 'develop' into fix-22-23-05686	2023-03-14 11:44:39 +05:30
Sagar Sharma	48a88b7064	Merge branch 'develop' into FIX-ISS-22-23-05720	2023-03-14 11:44:33 +05:30
Anand Baburajan	72e9c05f46	Merge branch 'develop' into patch_assdeprsch_gpa_ndb	2023-03-13 21:31:57 +05:30
Deepesh Garg	c6999fc687	fix: Total row in trail balance report (#34395) ... * fix: Total row in trail balance report * fix: Calculate total after preparing opening and closing	2023-03-13 21:18:30 +05:30
Deepesh Garg	91f7b0bbd6	Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry	2023-03-13 20:52:48 +05:30
Deepesh Garg	76775a3e49	fix: Update patch	2023-03-13 20:51:35 +05:30
Deepesh Garg	492e994c22	Merge branch 'develop' into patch_assdeprsch_gpa_ndb	2023-03-13 19:37:55 +05:30
Deepesh Garg	fa776d2987	fix: Use customer name instead of name(id) in PSOA (#34412)	2023-03-13 19:37:09 +05:30
Deepesh Garg	d8e54a21fb	test: Update values in Sales Invoice tests (#34419)	2023-03-13 19:34:15 +05:30
Sagar Vora	5c06620f97	fix: set tax category from address before executing get_regional_address_details (#34372)	2023-03-13 19:32:50 +05:30
HENRY Florian	d267111e13	chore: fix french translation (#34381) ... chore: update french translation	2023-03-13 19:03:16 +05:30
Ernesto Ruiz	796ad01b87	fix: Add translate function to Delayed Tasks Summary Report (#34411) ... fix: Add translate function to Delayed Tasks Summary Report	2023-03-13 19:02:34 +05:30
Deepesh Garg	c8cc3fc65f	chore: Move source and campaign to additional info section (#34414)	2023-03-13 18:37:19 +05:30
Deepesh Garg	4416ddc4af	fix: Linked invoice cancellation issue via timesheet (#34337)	2023-03-13 18:36:43 +05:30
Sagar Sharma	4a05f3736f	Merge branch 'develop' into FIX-ISS-22-23-05720	2023-03-13 17:50:09 +05:30
s-aga-r	66f650061d	test: add test cases for Over Order Allowance against Blanket Order	2023-03-13 17:21:07 +05:30
Sagar Sharma	9d49afebde	Merge branch 'develop' into fix-22-23-05686	2023-03-13 17:05:27 +05:30
Marica	e1d28063b0	Merge branch 'develop' into early-payment-loss	2023-03-13 16:23:24 +05:30
Anand Baburajan	b8703b0b9b	Merge branch 'develop' into patch_assdeprsch_gpa_ndb	2023-03-13 15:35:08 +05:30
Ankush Menat	b8a61be080	test: fix hypothesis tests (#34416)	2023-03-13 15:16:30 +05:30
Anand Baburajan	097be8bdea	Merge branch 'develop' into patch_assdeprsch_gpa_ndb	2023-03-13 15:08:08 +05:30
Sagar Sharma	f2e9a67f37	Merge branch 'develop' into FIX-ISS-22-23-05720	2023-03-13 14:32:26 +05:30
s-aga-r	442ee3adba	fix: operation time for multi-level BOM in WO	2023-03-13 14:31:38 +05:30
Ankush Menat	5bf6fb43a9	chore: fix broken TR translations	2023-03-13 14:12:12 +05:30
Deepesh Garg	7101e7acc4	fix: Filtering issue in payment entry (#34332)	2023-03-13 14:05:13 +05:30
marination	caa1a3dccf	fix: Handle rounding more gracefully ... - Round off pending discount loss to avoid miniscule losses rounded to 0.0 that are added in deductions - Use base amounts to calculate base losses instead of using conversion factor which increases rounding error - Round of total base loss instead of individual income and tax losses to reduce rounding error - Use default round off account for pending rounding loss in deductions	2023-03-13 14:01:31 +05:30
ruthra kumar	9f26e3c27a	Merge pull request #34408 from ruthra-kumar/delete_remarks_migration_patch ... chore: delete remarks migration patch	2023-03-13 09:14:21 +05:30
ruthra kumar	da37573b73	chore: delete remarks migration patch ... Versions higher than V14.18.2, 'remarks' will be moved in 'migrate_gl_to_payment_ledger'	2023-03-12 13:41:50 +05:30
ruthra kumar	e371bb6672	Merge pull request #34387 from ruthra-kumar/refactor_gl_migration_patch ... refactor(patch): remove inner join to improve SQL performance	2023-03-11 21:00:19 +05:30
Mehmet Demirel	fa6d37542b	chore: Improve Turkish language translation ... chore: Improve Turkish language translation	2023-03-11 19:18:44 +05:30
Deepesh Garg	aae53bb910	fix: Error in consolidated financial statement (#34330)	2023-03-11 19:06:56 +05:30
ruthra kumar	9d0a1149d8	chore: remove remarks migrations patch from patches.txt ... 'Remarks' field is moved in migrate_gl_to_payment_ledger patch itself from versions highers than v14.18.2. Removing it from patches.txt	2023-03-11 13:17:52 +05:30
ruthra kumar	a43304b01b	Merge branch 'develop' into fix_flaky_test_in_payment_terms_report	2023-03-11 13:05:38 +05:30
ruthra kumar	7fcd74ed03	fix(test): flaky test case in Payment terms report	2023-03-10 21:23:12 +05:30
ruthra kumar	1744f1d4e4	refactor: add remarks to column as well	2023-03-10 15:57:11 +05:30
Anand Baburajan	6308b509fc	Merge branch 'develop' into patch_assdeprsch_gpa_ndb	2023-03-10 15:25:39 +05:30
Deepesh Garg	0157fa15eb	chore: Use account closing balance in set gl entries	2023-03-10 13:02:01 +05:30
s-aga-r	9c1e566394	fix: filters not getting applied on Web Form	2023-03-09 22:12:35 +05:30
ruthra kumar	f9cfabf78e	refactor(patch): remove inner join to improve SQL performance	2023-03-09 19:42:28 +05:30
Marica	ae0a8a6529	Merge branch 'develop' into early-payment-loss	2023-03-09 18:36:36 +05:30
anandbaburajan	ebb6953274	fix: add missing patch for new fields added in #34214	2023-03-09 17:55:27 +05:30
marination	9abf0ef615	test: Multi currency SI with multi-currency accounting and single currency accounting + Early payment discount	2023-03-09 16:32:36 +05:30
marination	b09c2381ca	fix: Multi-currency SI with base currency PE ... - Return total discount loss in base currency - Allocate payment based on terms: Set allocated amount in references table in base currency if accounting is in that currency - Allocate payment based on terms: While back updating set paid amount (payment schedule) in transaction currency always - minor: discount msgprint in correct currency	2023-03-09 16:25:45 +05:30
Deepesh Garg	9a8f8e8b7d	Revert "fix: Default sales team not getting set" (#34376) ... Revert "fix: Default sales team not getting set (#34284)" This reverts commit 7d0199d743.	2023-03-09 15:36:52 +05:30
Sagar Sharma	87b5734f5b	Merge branch 'develop' into FIX-ITEM-ALTERNATIVE-ERR-MSG	2023-03-09 10:07:24 +05:30
s-aga-r	046834a97a	fix: required_qty get reset to 1 for Alternative Item in WO	2023-03-08 20:40:03 +05:30
s-aga-r	baef5ae1ef	chore: Alternative Item Code error msg	2023-03-08 20:07:30 +05:30
Deepesh Garg	719ac5c8f3	Merge branch 'develop' of https://github.com/frappe/erpnext into opening_entry	2023-03-08 18:35:26 +05:30
Deepesh Garg	f0267feca8	test: Add test case for closing balance	2023-03-08 18:34:07 +05:30
marination	761f68d7bf	fix: Paid amount must be discounted considering accounting currency ... - Accounting is in the same currency if party currency and company currency is the same - If accounting is in the same currency, paid and recvd amount is in the base currency - Then, discount amount must also be in the base currency as it is deducted from paid amount - Received amount must be in base currency if not multi currency - cleanup: Deductions setting broken into smaller functions	2023-03-08 17:20:48 +05:30
Deepesh Garg	3249a79f07	chore: rename Closing Balance to Account Closing Balance	2023-03-08 15:15:33 +05:30
s-aga-r	b53dcb04ed	test: add test cases for BOM Stock Report	2023-03-08 14:00:06 +05:30
s-aga-r	a65b80911b	fix: BOM Stock Report	2023-03-08 12:59:50 +05:30
Sagar Sharma	336e0b9666	Merge branch 'develop' into fix-22-23-05690	2023-03-07 18:02:52 +05:30
Solufyin	71de72bdd0	fix: Set contact filter link in Opportunity (#34325) ... Co-authored-by: Nihantra C. Patel <n.patel.serpentcs@gmail.com>	2023-03-07 17:44:31 +05:30
Devin Slauenwhite	6de826b8c4	fix: exchange rate revaluation errors (#33947) ... * fix: set new balance for non-positive balances * fix: don't add debit: 0, credit: 0 entries to journal entry. * fix: add journal entry difference to unbooked gain/loss of exchange. * chore: linter * chore: remove invlaid TODO. [skip-ci]	2023-03-07 17:16:15 +05:30
Sagar Sharma	4d1f620d75	Merge branch 'develop' into fix-22-23-05690	2023-03-07 16:35:17 +05:30
Marica	2feb27e399	fix(minor): Dirty the form after clicking on Get advances button in Invoices (#34323) ... fix(minor): Dirty form after clicking on Get advances button	2023-03-07 15:45:18 +05:30
Sagar Sharma	4cd16a839b	Merge branch 'develop' into fix-22-23-05690	2023-03-07 14:55:46 +05:30
marination	f02fc8acf0	fix: Don't add to deductions if amount is 0 ... - misc: better docstring	2023-03-07 12:12:45 +05:30
Deepesh Garg	10632d75b0	fix: Do not calculate commission post submit (#34267) ... * fix: Do not calculate commision post submit * chore: Update condition to match server side logic Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> --------- Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2023-03-07 11:44:09 +05:30
Deepesh Garg	7d0199d743	fix: Default sales team not getting set (#34284)	2023-03-07 11:41:26 +05:30
Deepesh Garg	ea8e23384d	fix: Payment Request against sales order with disabled rounded total (#34281) ... * fix: Payment Request against sales order with disabled rounded total * chore: Do not consider advance amount	2023-03-07 11:40:29 +05:30
Sagar Sharma	3952b3373d	Merge branch 'develop' into fix-22-23-05690	2023-03-07 10:50:39 +05:30
s-aga-r	8ad9e99cea	perf: update_completed_qty() in material_request.py	2023-03-07 10:50:11 +05:30
Raffael Meyer	ee12313dbb	Merge branch 'develop' into early-payment-loss	2023-03-06 21:41:54 +01:00
s-aga-r	de18f98c5c	perf: Stock Entry (Material Transfer)	2023-03-06 23:41:04 +05:30
rohitwaghchaure	53efc8ff77	Merge pull request #34305 from rohitwaghchaure/fixed-not-able-to-complete-bom-update-log ... fix: BOM Update log not completed	2023-03-06 23:23:58 +05:30
marination	7f2e7badff	fix: Set deduction amount in company currency on Doctype ... - Even via JS, deductions amount is always in company currency - Since there is nothing dynamic about this field, set it in the doctype spec itself - fixed: Inconsistency between label currency and field currency formatted value	2023-03-06 17:45:26 +05:30
Deepesh Garg	5dabc98ba5	chore: Add index to period closing voucher column	2023-03-06 16:56:33 +05:30
Marica	b5f80815a1	Merge branch 'develop' into early-payment-loss	2023-03-06 15:50:50 +05:30
marination	c217bb2018	test: PE from SI with early payment discount amount & PE assertions in discount % test	2023-03-06 15:02:32 +05:30
marination	2ae5834290	fix: Back update discounted amount in Invoice based on discount type ... - Discount value was always trated as a percentage on back updation	2023-03-06 14:54:46 +05:30
Rohit Waghchaure	2f157fa5d3	fix: BOM Update log not completed	2023-03-06 12:09:50 +05:30
Deepesh Garg	310f71c313	test: Add static posting dates to tests	2023-03-05 18:43:26 +05:30
Deepesh Garg	4a2046dfb6	fix: Aggregation with previous closing balance	2023-03-05 18:18:33 +05:30
barredterra	502a37a864	refactor: use renamed timezone utils ... https://github.com/frappe/frappe/pull/20253	2023-03-04 19:31:40 +01:00
s-aga-r	70de444b7b	fix: Stock Reconciliation actual_qty	2023-03-04 17:06:07 +05:30
s-aga-r	e6a02719f7	fix: update inventory dimensions before returning sle	2023-03-04 16:02:50 +05:30
s-aga-r	0e1b7760a8	fix: Inventory Dimension for Stock Reconciliation	2023-03-04 01:05:55 +05:30
s-aga-r	53701c37b1	feat: consider over_order_allowance while validating sales order qty	2023-03-03 22:03:54 +05:30
Devin Slauenwhite	6190b4cf63	chore: revert unrelated changes.	2023-03-03 09:42:29 -05:00
marination	dc2998f544	fix: Set deductions in base currency ... - Use field precision to get more accurate values	2023-03-03 17:24:43 +05:30
marination	75ec0a0a85	fix: Recalculate difference amount after setting deductions	2023-03-03 14:13:27 +05:30
Marica	619824855a	Merge branch 'develop' into early-payment-loss	2023-03-03 13:53:57 +05:30
marination	768c3a4927	fix: Taxes aren't discounted on early payment discount ... - Deductions in payment entry must be split into income loss and tax loss - Compute total discount in percentage, makes discounting different amounts proportionately easier	2023-03-03 13:21:38 +05:30
s-aga-r	d7da8928ac	feat: add field Over Order Allowance (%) in Selling Settings	2023-03-03 11:19:28 +05:30
s-aga-r	8bcbc45add	feat: consider over_order_allowance while validating order qty	2023-03-03 11:11:33 +05:30
s-aga-r	fc1088d9c4	fix: don't map item row having 0 qty	2023-03-03 10:50:17 +05:30
s-aga-r	f3993783a3	refactor: rewrite blanket_order.py queries in QB	2023-03-02 17:18:46 +05:30
s-aga-r	f5937f46cb	feat: add field Over Order Allowance (%) in Buying Settings	2023-03-02 17:04:09 +05:30
Deepesh Garg	c3d455653e	Merge pull request #34258 from deepeshgarg007/finance_book_read_only ... chore: Make finance book read only	2023-03-02 16:47:47 +05:30
Deepesh Garg	c089c4156c	chore: Minor fixes	2023-03-02 16:46:56 +05:30
s-aga-r	abf9a28d6a	fix: hide + button based on Blanket Order Type	2023-03-02 16:40:37 +05:30
Sagar Sharma	90e1a6bc16	Merge branch 'develop' into github-issue-33344	2023-03-02 14:24:14 +05:30
Sagar Sharma	6e9d001819	Merge branch 'develop' into github-issue-33344	2023-03-02 12:09:21 +05:30
Sagar Sharma	50dc0c18eb	Merge branch 'develop' into fix-return-pr-serial-no	2023-03-02 12:06:59 +05:30
Ankush Menat	330ae419be	fix!: Parse float as per number format in quality inspection (#34259) ... fix: Parse float as per number format in quality inspection	2023-03-02 11:59:18 +05:30
s-aga-r	cb0b6de4b9	fix: Serial No is mandatory even if the qty is 0	2023-03-02 11:27:46 +05:30
s-aga-r	a9f0a11ce6	fix: rejected_serial_no not getting copied from PR to PR(Return)	2023-03-02 11:15:46 +05:30
Deepesh Garg	790f0aac12	Merge branch 'develop' into finance_book_read_only	2023-03-02 10:01:12 +05:30
Deepesh Garg	6a89cb98ce	Merge pull request #33874 from frappe/alternative-items-quotation ... feat: Support for Alternative Items in Quotation	2023-03-01 17:41:24 +05:30
Suraj Shetty	6cd2ba5c66	fix: Resolve conflicts ... (cherry picked from commit f6469d83981386a7bb57b41178055eae5cda30bf)	2023-03-01 10:59:21 +00:00
Suraj Shetty	46a722d51c	fix: Wrap unexpectedly long text in remark ... (cherry picked from commit ba66a6714c495f9d70dad79344342779c8011c6e) # Conflicts: # erpnext/accounts/report/general_ledger/general_ledger.html (cherry picked from commit b13bf1ebc517ccd9c5b6b079208ca3883e7418fd)	2023-03-01 10:59:20 +00:00
Deepesh Garg	28dd1a25cb	chore: Make finance book read only	2023-03-01 15:00:24 +05:30
Deepesh Garg	e5f603c9d9	perf: Apply closing balance in Trial Balance report	2023-03-01 14:48:06 +05:30
Deepesh Garg	95c9aafda9	fix: Update patch to generate closing balance entries	2023-03-01 14:45:22 +05:30
Deepesh Garg	436fc03eda	fix: Closing balance entries for period closing voucher	2023-03-01 14:43:49 +05:30
Rohit Waghchaure	b38fe24090	fix: consumed qty validation for subcontracting receipt	2023-03-01 11:42:59 +05:30
rohitwaghchaure	d88fe27be6	Merge pull request #34195 from HarryPaulo/fix-performance-on-insert-item ... fix: Performance improvement when adding a new item	2023-03-01 10:10:14 +05:30
ruthra kumar	f9c75055bb	Merge pull request #34241 from ruthra-kumar/bug_on_credit_note_creation ... fix: pos return throwing amount greater than grand total	2023-02-28 18:22:30 +05:30
rohitwaghchaure	9bb8e351a2	Merge pull request #34243 from rohitwaghchaure/fixed-date-filters-in-subcontracting-reports ... fix: default date in Subcontracting reports	2023-02-28 18:01:14 +05:30
Rohit Waghchaure	dfddc4efc3	fix: default date in Subcontracting reports	2023-02-28 17:53:51 +05:30
rohitwaghchaure	2942cee31e	Merge pull request #34235 from rohitwaghchaure/feat-adjust-valuation-rate ... feat: adjust purchase receipt valuation rate as per purchase invoice rate	2023-02-28 17:34:53 +05:30
ruthra kumar	35c70f39fa	fix: pos return throwing amount greater than grand total	2023-02-28 16:21:32 +05:30
Rohit Waghchaure	a8445da02a	fix: labels name	2023-02-28 15:47:45 +05:30
s-aga-r	58c027d4cc	chore: Linters	2023-02-28 15:14:34 +05:30
Sagar Sharma	26ced47ddc	Merge branch 'develop' into github-issue-33344	2023-02-28 15:01:40 +05:30
Rohit Waghchaure	8e86553717	test: added test cases	2023-02-28 14:57:04 +05:30
Rohit Waghchaure	eab775ef32	feat: adjust purchase receipt valuation rate as per purchase invoice rate	2023-02-28 14:11:55 +05:30
Vishal	f18ae5856f	chore: minor changes in pos_controller	2023-02-28 11:03:26 +05:30
Vishal	a51bec0269	chore: minor change	2023-02-28 11:03:26 +05:30
Vishal	3ebe7d861d	chore: minor changes added to code	2023-02-28 11:03:26 +05:30
Vishal	1de531e56e	fix: multiple pos conversion issue resolved	2023-02-28 11:03:25 +05:30
Sagar Sharma	ecd15d2a65	Merge branch 'develop' into github-issue-33344	2023-02-27 16:57:29 +05:30
s-aga-r	c09a61f360	fix: set from_warehouse and to_warehouse while mapping SE	2023-02-27 12:26:21 +05:30
Sagar Sharma	bda1340760	Merge branch 'develop' into patch-2	2023-02-27 11:52:31 +05:30
Patrick Eissler	bbb6a62a7d	chore: add german translations (#34167) ... * chore: add german translations * Apply suggestions from code review Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> --------- Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com>	2023-02-27 11:49:22 +05:30
Deepesh Garg	81651beaef	Merge pull request #34174 from Vishnu7025/coa-import-currency ... fix: currency in coa import	2023-02-27 11:48:44 +05:30
Sagar Sharma	5dcb723fc7	Merge branch 'develop' into patch-2	2023-02-27 11:14:14 +05:30
Brian Pond	83f3e317e1	fix: Remove missing DocField in fetch_from	2023-02-27 11:10:51 +05:30
ruthra kumar	d8b9b83b11	Merge pull request #34207 from ruthra-kumar/fix_permisssion_error_on_work_order_creation ... fix: permission error while calling get_work_order_items	2023-02-27 09:55:18 +05:30
Anand Baburajan	feeebb1262	Merge branch 'develop' into manual_asset_schedule_develop	2023-02-26 17:40:26 +05:30
anandbaburajan	dd74839eba	fix: manual depr schedule	2023-02-26 17:36:36 +05:30
Deepesh Garg	a663df376c	fix: Add patch to update closing balances	2023-02-26 16:06:04 +05:30
Deepesh Garg	6607c8bd82	fix: Order by issue in aggregation query	2023-02-26 16:05:26 +05:30
Deepesh Garg	f92c63fb10	feat: Add validations against period closing voucher	2023-02-26 15:53:33 +05:30
Deepesh Garg	7fa7d6b5e4	chore: Rewrite query using query builder	2023-02-26 15:52:30 +05:30
Deepesh Garg	e18336ebe7	feat: Add views in standard filter	2023-02-26 15:47:29 +05:30
rohitwaghchaure	6d6e3cb015	Merge pull request #34206 from rohitwaghchaure/fixed-trivial-error-for-stock-reposting ... fix: not able to repost gl entries	2023-02-24 21:10:27 +05:30
ruthra kumar	a11d3327df	fix(test): use standalone method to fetch work orders from SO	2023-02-24 21:07:49 +05:30
ruthra kumar	b6bad728cd	fix: permission error while calling get_work_order_items	2023-02-24 21:07:46 +05:30
Rohit Waghchaure	7d10dd9ea8	fix: not able to repost gl entries	2023-02-24 17:50:00 +05:30
Deepesh Garg	e26c6dc76b	Revert "fix: Concurrency issues in Sales and Purchase returns" (#34202) ... Revert "fix: Concurrency issues in Sales and Purchase returns (#34019)" This reverts commit a67284e96d.	2023-02-24 15:28:14 +05:30
rohitwaghchaure	04f00fd141	Merge pull request #34199 from rohitwaghchaure/fixed-converison-factor-issue ... fix: conversion factor not set	2023-02-24 14:56:36 +05:30
Rohit Waghchaure	8e46aebc50	fix: conversion factor not set	2023-02-24 14:49:05 +05:30
HarryPaulo	49af5ba434	fix: Performance improvement when adding a new item	2023-02-23 18:11:09 -03:00
rohitwaghchaure	670304fe8e	Merge pull request #34189 from rohitwaghchaure/prevent-to-make-item-price-for-template ... fix: user shouldn't able to make item price for item template	2023-02-23 20:47:48 +05:30
Rohit Waghchaure	6417ae0ee8	fix: user shouldn't able to make item price for item template	2023-02-23 20:21:50 +05:30
Deepesh Garg	c3f39c3f32	feat: Cascade closing balances on PCV submit	2023-02-23 16:48:54 +05:30
Deepesh Garg	36c08d0835	fix: Add patches to create accounting dimension in Closing Balance	2023-02-23 16:46:37 +05:30
Marica	47ab26dedf	Merge branch 'develop' into alternative-items-quotation	2023-02-23 13:20:28 +05:30
ruthra kumar	a9920715ab	Merge pull request #34022 from ruthra-kumar/gross_profit_memory_and_performance_issue ... perf: Gross Profit report will fetch SLE's on demand and memoize	2023-02-23 11:55:08 +05:30
ruthra kumar	88d888d9d0	refactor: use docstatus from Delivery Note Item	2023-02-23 11:15:56 +05:30
rohitwaghchaure	3692f960d0	Merge pull request #34172 from rohitwaghchaure/zero-rate-adjust-issue-using-lcv ... fix: zero division error while making LCV	2023-02-23 10:54:01 +05:30
ruthra kumar	60d3b86cdb	Merge pull request #34176 from ruthra-kumar/fix_ui_freeze_on_sales_invoice ... fix: ui freeze on item selection in sales invoice	2023-02-23 10:35:50 +05:30
rohitwaghchaure	e3de216e06	Merge pull request #34173 from rohitwaghchaure/incorrect-color-showing-in-report ... fix: incorrect color in the BOM Stock Report	2023-02-23 09:54:45 +05:30
ruthra kumar	6412583e98	fix: ui freeze on item selection in sales invoice	2023-02-23 09:36:21 +05:30
vishnu	e3c000d0be	chore: change column label	2023-02-22 10:53:11 +00:00
vishnu	19c0b7a523	fix: currency in coa import	2023-02-22 10:24:45 +00:00
Rohit Waghchaure	a8f03ebf7f	fix: incorrect color in the BOM Stock Report	2023-02-22 14:24:18 +05:30
Rohit Waghchaure	80e94a08cf	fix: zero division error while making LCV	2023-02-22 13:29:06 +05:30
Deepesh Garg	b44a19bd1a	feat: Introduce opening entry for reporting	2023-02-21 23:20:28 +05:30
Sankara Subramanian V	a06d24037b	refactor(region): Splitting of KSA(Saudi Arabia) Regional logic from ERPNext (#33895) ... * feat: remove KSA regional code	2023-02-21 22:52:20 +05:30
ruthra kumar	dde5bbc9a7	Merge pull request #34102 from ruthra-kumar/pos_validate_for_duplicate_pos_invoices ... fix: check for duplicate pos invoices in closing entry	2023-02-21 18:45:39 +05:30
ruthra kumar	47add0b751	fix: check for duplicate in pos closing and pos merge log entry	2023-02-21 17:50:57 +05:30
Deepesh Garg	9739d8b52a	feat: Introduce opening entry for reporting	2023-02-21 15:23:29 +05:30
ruthra kumar	4a7b1de2d8	refactor: clear records in batches in 'Transaction Deletion Record' (#34109) ... refactor: clear records in batches	2023-02-21 14:27:00 +05:30
Deepesh Garg	c88444a6c4	fix: Filters in item-wise sales history report (#34145)	2023-02-21 14:26:33 +05:30
anandbaburajan	76861eb332	fix: fiscal year error for existing assets in fixed asset register	2023-02-21 13:04:01 +05:30
Deepesh Garg	35cdd996a9	fix: Use normal rounding for Tax Withholding Category (#34114)	2023-02-21 12:57:49 +05:30
Sagar Sharma	77b88961f6	Merge branch 'develop' into dn-create-button	2023-02-21 10:19:09 +05:30
marination	6b789e2f04	fix: Map only non alternative items from Quotation in Sales Invoice ... - Since there's no item selection, only Quotation selection :/	2023-02-20 21:17:43 +05:30
marination	19456127cf	fix: Handle Get Items From in Sales Order ... - Map all non alternatives from Quotation to SO if no selected items - Show disclaimer mentioning that Qtns with alternatives must be mapped to SO from the Qtn form	2023-02-20 20:52:14 +05:30
Ankush Menat	3f2a2c96f6	fix: Add company perm check unconditionally (#34142) ... fix: Add employee perm check unconditionally	2023-02-20 16:07:27 +05:30
rohitwaghchaure	5e9620b98b	Merge pull request #34139 from rohitwaghchaure/fixed-stock-ledger-report-filter-issue ... fix: inventory dimension filter not overriding with existing filter for stock ledger report	2023-02-20 13:04:23 +05:30
rohitwaghchaure	3871cf7110	Merge pull request #33722 from rohitwaghchaure/purchase-invoice-performance-issue ... fix: purchase invoice performance issue	2023-02-20 12:47:07 +05:30
Rohit Waghchaure	0e388ba872	fix: inventory dimension filter not overriding with existing filter for stock ledger report	2023-02-20 12:28:43 +05:30
Marica	3c96791d52	fix: Use block variable ... Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-02-20 12:04:14 +05:30
s-aga-r	44ee9f0f19	chore: Linters	2023-02-20 11:43:32 +05:30
s-aga-r	1b010add26	fix(ux): ReferenceError: me is not defined Delivery Note	2023-02-20 11:17:49 +05:30
Sagar Sharma	c8fda8a8b5	Merge branch 'develop' into github-issue-33344	2023-02-19 22:17:20 +05:30
Alirio Castro	183e42af1a	fix: differency entry journal debit/credit missing (#34104) ... * fix: difference entry journal is wrong * fix: difference entry journal is wrong	2023-02-19 19:40:13 +05:30
Johannes Obermeier	2a90fad710	feat(stock): Support more barcodes in an item by validate the barcode with the barcodenumber module (#33863) ... feat(stock): Support more barcodes in an article by validate the barcode with the barcodenumber module	2023-02-19 19:36:05 +05:30
Sagar Sharma	2959285c82	Merge branch 'develop' into fix-reserve-qty	2023-02-19 12:45:39 +05:30
Sagar Sharma	f342e6e765	Merge branch 'develop' into github-issue-33344	2023-02-19 12:17:33 +05:30
ruthra kumar	c722f2819c	fix: ignore repost payment ledger on basic documents cancellation (#34054) ... fix: ignore repost payment ledger on cancel/delete of Inv/Pay/JE's Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-02-19 12:09:10 +05:30
Sagar Sharma	2c3973156f	Merge branch 'develop' into github-issue-33344	2023-02-19 12:07:27 +05:30
Richard Case	5b7d23de15	feat: bank reconciliation and plaid changes (#33986) ... fix: plaid link refresh: update account ids fix: plaid transactions for credit cards & add accounts on link refresh if they don't exist fix: bank reconciliation amount matching fix: bank reconciliation dialog usability feat: rewrite bank transaction reconciliation to allow multiple transactions to reconcile against vouchers before clearance fix: matching transaction amounts and race condition bug fix: ensure there is a reference number in plaid transactions and other tweaks feat: add references to Payroll Entry Bank Journal Entry feat: only clear Voucher once all Bank GLEs are allocated to Bank Transactions fix: strange type error feat: add payment method field to bank and plaid transactions and prepopulate relevant bank reconciliation new voucher fields feat: bank reconciliation - allow bank transactions to reconcile against themselves for when there are banking amendments fix: bank transaction self-reconcile bug and tidy fix: bank reconciliation datatable index update	2023-02-19 11:50:17 +05:30
Shadrak Gurupnor	5e48e61c66	fix: forced delete linked desktop_icons (#34107) ... * fix: forced delete linked desktop_icons * fix: black	2023-02-19 11:42:35 +05:30
ruthra kumar	9c6466f15b	fix: consider rounded total amount while making payment request (#34110)	2023-02-19 11:41:41 +05:30
Devin Slauenwhite	c76352340d	fix(ux): customer/supplier docfield layout (#34125)	2023-02-19 11:37:32 +05:30
Sagar Sharma	07c6ad6fa7	Merge branch 'develop' into github-issue-33344	2023-02-18 22:24:06 +05:30
s-aga-r	35489fbbf9	refactor: remove method get_serial_no_batchwise from get_item_details.py	2023-02-18 22:23:53 +05:30
s-aga-r	6b144baa69	refactor: rewrite get_item_details.py queries in QB	2023-02-18 22:23:51 +05:30
rohitwaghchaure	dff9655d46	Merge pull request #34115 from rohitwaghchaure/fixed-convert-to-item-warehouse-reposting ... feat: provision to convert transaction based reposting to item wareho…	2023-02-18 21:31:20 +05:30
Rohit Waghchaure	f1383b5ef9	feat: provision to convert transaction based reposting to item warehouse based reposting	2023-02-18 19:31:48 +05:30
Sagar Sharma	91983fb4c6	Merge branch 'develop' into purchase-order-portal	2023-02-17 23:17:00 +05:30
Prateek	b93c18bd4a	fix: use max function to get default company address	2023-02-17 20:25:13 +05:30
rohitwaghchaure	47264481ad	Merge branch 'develop' into purchase-invoice-performance-issue	2023-02-17 16:41:30 +05:30
anandbaburajan	e50bd52162	fix: asset repair status after deletion and asset status after manual depr entry	2023-02-17 15:32:24 +05:30
Sagar Sharma	ee21850ab8	Merge branch 'develop' into purchase-order-portal	2023-02-17 11:08:30 +05:30
ruthra kumar	067f8c1d70	Merge pull request #34071 from ruthra-kumar/rearrange_patch_order ... patch: reorder migration patches	2023-02-17 11:04:36 +05:30
ruthra kumar	68202639f5	chore: reorder migration patches. ... 'migrate_gl_to_payment_ledger', 'migrate_remarks_from_gl_to_payment_ledger' should always run last.	2023-02-17 10:03:55 +05:30
rohitwaghchaure	4399a93843	Merge pull request #34091 from rohitwaghchaure/fixed-incorrect-consumed-qty-in-scr ... fix: incorrect consumed qty in subcontracting receipt	2023-02-16 15:10:14 +05:30
Sagar Sharma	758f47bba6	Merge branch 'develop' into purchase-order-portal	2023-02-16 14:28:05 +05:30
Rohit Waghchaure	156e45970a	fix: incorrect consumed qty in subcontracting receipt	2023-02-16 14:17:27 +05:30
HENRY Florian	4d79ffe3c6	fix: rename duplicate field name with same type into a DocType to avoid import Error (#34053) ... * fix: Delivery Note field label set * fix: Item field label de-duplicate name * fix: Payment Entry field label de-duplicate name * fix: Pruicing Rule field label de-duplicate name * fix: Project field label de-duplicate name * fix: Timesheet field label de-duplicate name * Update erpnext/accounts/doctype/pricing_rule/pricing_rule.json Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com> * Update erpnext/stock/doctype/item/item.json Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com> --------- Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>	2023-02-16 13:46:19 +05:30
Sagar Sharma	fb5796f18f	Merge branch 'develop' into purchase-order-portal	2023-02-16 11:22:19 +05:30
Tej Pochiraju	3f44ef8790	Allow bulk import of party specific item (#34083) ... Co-authored-by: Tej Pochiraju <tej@iotready.co>	2023-02-16 10:11:25 +05:30
Sagar Sharma	471e77b931	Merge branch 'develop' into purchase-order-portal	2023-02-15 22:46:07 +05:30
Sagar Sharma	c7a540b7e2	Merge branch 'develop' into github-issue-33930	2023-02-15 22:37:52 +05:30
s-aga-r	6c6195bae6	fix: create Delivery Trip from Delivery Note list	2023-02-15 22:37:26 +05:30
Sagar Sharma	421e34a181	Merge branch 'develop' into purchase-order-portal	2023-02-15 21:49:09 +05:30
Sagar Sharma	46afbb594a	Merge branch 'develop' into fix-reserve-qty	2023-02-15 21:37:30 +05:30
s-aga-r	ffa9c6e4d9	chore: copy item_code to Batch while creating new batch from SCR	2023-02-15 20:16:42 +05:30
s-aga-r	20bdc63b03	fix: show Purchase Order Portal Pay button based on configuration	2023-02-15 20:14:39 +05:30
marination	74fab53e28	test: Alternative items in Quotation ... - Taxes and totals, mapping, back updation	2023-02-15 15:04:00 +05:30
s-aga-r	d7ef5ad955	chore: add field show_pay_button in Buying Settings	2023-02-15 14:43:10 +05:30
Marica	22010b745c	Merge branch 'develop' into alternative-items-quotation	2023-02-15 13:05:33 +05:30
Anand Baburajan	ef56060166	Merge branch 'develop' into more_asset_bug_fixes	2023-02-15 11:55:55 +05:30
rohitwaghchaure	2e43123048	Merge pull request #34065 from barredterra/print-rfq-letterhead ... fix: change parameter name for letter head	2023-02-15 09:31:06 +05:30
rohitwaghchaure	9235918d65	Merge pull request #34061 from rohitwaghchaure/feat-allow-to-make-in-transit-entry ... feat: allow to make in transit transfer entry from material request	2023-02-15 09:08:22 +05:30
barredterra	d5b7f2e49e	test: download RFQ PDF	2023-02-14 19:53:39 +01:00
barredterra	8e40c04494	refactor: download RFQ PDF	2023-02-14 19:53:03 +01:00
barredterra	f7fd30fecf	fix: change parameter name for letter head ... To match changes from https://github.com/frappe/frappe/pull/19627	2023-02-14 19:34:36 +01:00
Devin Slauenwhite	4c5147f270	Merge: upstream/develop into pps190/fix-reserve-qty	2023-02-14 10:22:54 -05:00
Rohit Waghchaure	5b6128848f	feat: allow to make in transit transfer entry from material request	2023-02-14 19:03:07 +05:30
Anand Baburajan	b0cfb0b9ef	Merge branch 'develop' into more_asset_bug_fixes	2023-02-14 18:09:55 +05:30
anandbaburajan	a58f2e6c03	fix: asset_depreciation_and_balances report doesn't reflect manual depr entries	2023-02-14 17:59:16 +05:30
Sagar Sharma	447310702e	Merge branch 'develop' into fix-so-on-hold	2023-02-14 16:01:43 +05:30
ruthra kumar	960085853a	Merge pull request #34048 from ruthra-kumar/typeerror_on_sales_order_analysis ... fix: typeerror on Sales Order analysis report	2023-02-14 15:27:36 +05:30
Sagar Sharma	5faa62c49a	Merge branch 'develop' into fix-so-on-hold	2023-02-14 11:06:10 +05:30
rohitwaghchaure	3014bac293	Merge pull request #34046 from FHenry/dev_fix_BOM_import ... fix: BOM import failed as use same label field for Raw Materials Item table and Scrap Item table	2023-02-14 10:29:26 +05:30
ruthra kumar	00a4191966	fix: typeerror on Sales Order analysis report	2023-02-14 09:56:35 +05:30