34623 Commits

Author	SHA1	Message	Date
Sagar Sharma	421e34a181	Merge branch 'develop' into purchase-order-portal	2023-02-15 21:49:09 +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
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
Raffael Meyer	770369e5c1	feat: translate fixtures during runtime, not installation (#33996) ... feat: install untranslated fixtures from files Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-02-14 09:29:27 +05:30
Florian HENRY	86be259341	fix: BOM import failed as importer use same label field for Raw MaterialsItem table and Scrap Item table	2023-02-13 23:34:20 +01:00
Deepesh Garg	ce748cec3a	fix: Amount validation in Payment Request against Purchase Order (#34042)	2023-02-13 20:56:24 +05:30
HENRY Florian	231fe4156f	fix: should never get cutomer price on purchase document (#34002) ... * fix: never get cutomer price on purchase document chores: syntax chore: typo in stock_entry get_uom_details (#33998) fix: typo in stock_entry get_uom_details chores: syntax * feat: add test for get_item_detail price list oriented * feat: add test for get_item_detail price price oriented * feat: add test for get_item_detail price price oriented * chore: clean test code	2023-02-13 20:56:05 +05:30
anandbaburajan	c533213225	fix: opening_accumulated_depreciation and precision in charts	2023-02-13 17:22:31 +05:30
Deepesh Garg	ff4ae69408	Merge branch 'develop' into gross_profit_memory_and_performance_issue	2023-02-13 15:38:26 +05:30
Deepesh Garg	a67284e96d	fix: Concurrency issues in Sales and Purchase returns (#34019)	2023-02-13 15:31:19 +05:30
ruthra kumar	4f2553e7b6	Merge pull request #34021 from ruthra-kumar/handle_rare_cases_of_null_in_outstanding_calculation ... fix: rare instances of IntegrityError while cancelling journals against cr note	2023-02-13 14:14:27 +05:30
ruthra kumar	192a3395a5	refactor: filter only immediate upcoming payment term for each SO (#33923) ... * fix: ignore closed or 'on hold' orders * refactor: filter immediate upcoming term --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-02-13 12:36:40 +05:30
ruthra kumar	e5a2b15fba	fix: unwanted difference amount calculation on cr note and invoice with same currency (#34020) ... * fix: incorrect difference amount while reconiling cr/dr notes * fix(test): catch incorrect difference amount calculation Fixed issues where difference amount was calculated for Cr Notes and Invoices of the same currency. --------- Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-02-13 12:08:42 +05:30
Deepesh Garg	148703bfc2	feat: Setting to allow Sales Order creation against expired quotation (#33952) ... * feat: Setting to allow Sales Order creation against expired quotation * chore: linting issues	2023-02-13 10:27:55 +05:30
Deepesh Garg	ce3f9622cb	Merge branch 'develop' into handle_rare_cases_of_null_in_outstanding_calculation	2023-02-13 09:42:41 +05:30
Deepesh Garg	48bb2c942b	fix: Ignore Payment Ledger Entry on dunning cancel (#34025) ... * fix: Ignore Payment Ledger Entry on dunning cancel * chore: fix translation issue	2023-02-13 09:42:01 +05:30
Deepesh Garg	77f6789706	Revert "Update tr.csv" (#34026) ... Revert "chore: Update Turkish translations (#33985)" This reverts commit 6ea0a69d3a.	2023-02-13 08:27:00 +05:30
ruthra kumar	3e5691072a	perf: fetch SLE's on demand and memoize	2023-02-12 14:49:17 +05:30
ruthra kumar	b9a7ff7c3d	fix: IntegrityError while cancelling journals against cr note	2023-02-12 14:06:40 +05:30
Sagar Sharma	b0e8dfc1d0	Merge branch 'develop' into fix-so-on-hold	2023-02-12 13:37:21 +05:30
s-aga-r	d76759e066	fix: update reserved_qty when Sales Order marked as Hold	2023-02-12 13:36:26 +05:30
Richard Case	a0eb5e5535	fix: add payment hook to point of sale JS (#33988)	2023-02-11 20:40:15 +05:30
Raffael Meyer	e4953df4a3	fix: set per_billed based on hours when amounts are zero (#33984) ... * fix: set per_billed based on hours when amounts are zero * test: calculate_percentage_billed	2023-02-11 12:36:37 +05:30
Sabu Siyad	0df28c7174	fix(ecommerce): throw invalid doctype error in shop by category (#33901) ... Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-02-11 12:28:42 +05:30
Raffael Meyer	201573ab9a	refactor: install fixtures (#33964) ... * refactor: install fixtures * style: disable semgrep for install_defaults signature	2023-02-11 12:15:42 +05:30
Deepesh Garg	0efdc6c13a	fix: Ignore mandatory fields while creating tax templates for new companies (#34005)	2023-02-11 12:03:48 +05:30
Raffael Meyer	ab7293bcd3	fix: list view for Terms and Conditions (#33925) ... Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-02-11 11:09:26 +05:30
Mehmet Demirel	6ea0a69d3a	chore: Update Turkish translations (#33985) ... We are the ERPNext Turkey Team. We request confirmation of the translation we sent.	2023-02-11 09:27:18 +05:30
Deepesh Garg	e478a5d0ce	feat: Add filters in Loan Interest Report (#33907)	2023-02-11 09:17:24 +05:30
Deepesh Garg	47c91324b1	fix: Amount for debit and credit notes with 0 qty line items (#33902)	2023-02-11 09:04:00 +05:30
Akshay	185c543b73	chore: typo in stock_entry get_uom_details (#33998) ... fix: typo in stock_entry get_uom_details	2023-02-10 20:42:35 +05:30
Marica	bd7e6e264e	Merge branch 'develop' into alternative-items-quotation	2023-02-06 16:30:10 +05:30
marination	db2076db69	refactor: Order based alternative items mapping ... - Alternatives must be followed by a non-alternative item row - On submit, store non-alternative rows in hidden checkbox to avoid recomputation - Check for valid/mappable rows by row name - UI: Select from table rows.Add single row for original/alternative item in dialog - UI: Indicator for alternative items in dialog grid - UI: Indicator legend and description of table - DB: Added check field 'Has Alternative Item' not to be confused with 'Has Alternative' in Mfg	2023-02-06 16:25:38 +05:30
Anand Baburajan	4686217d3c	Merge branch 'develop' into cancel_pi_cancelled_asset	2023-02-05 14:14:39 +05:30
Anand Baburajan	396f455258	Merge branch 'develop' into cancel_pi_cancelled_asset	2023-02-05 12:19:21 +05:30
Anand Baburajan	f8270f093d	Merge branch 'develop' into manual_depr_entries_develop	2023-02-05 12:19:17 +05:30
Sagar Sharma	2fedd595a9	Merge branch 'develop' into github-issue-33533	2023-02-05 09:36:17 +05:30
rohitwaghchaure	7d794bc70a	Merge branch 'develop' into fixed-negative-stock-error	2023-02-04 22:35:58 +05:30
rohitwaghchaure	67b5471d09	Merge pull request #33941 from developsessions/fix_wrong_due_date_calculation ... fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month)	2023-02-04 22:34:47 +05:30
Anand Baburajan	82490d9f55	Merge branch 'develop' into cancel_pi_cancelled_asset	2023-02-04 18:37:34 +05:30
Anand Baburajan	07a0e2b7a8	Merge branch 'develop' into manual_depr_entries_develop	2023-02-04 18:37:34 +05:30
developsessions	c8cd351b39	style: apply results of lint run	2023-02-04 09:12:29 +01:00
anandbaburajan	3380dc5dea	chore: use continue, not break	2023-02-04 11:20:26 +05:30
developsessions	9d0096ad9e	fix: failed test, convert date time to string	2023-02-03 21:21:43 +01:00
Anand Baburajan	bb424965ee	Merge branch 'develop' into cancel_pi_cancelled_asset	2023-02-03 23:00:40 +05:30
anandbaburajan	b961321de5	fix: allow PI cancel if linked asset is cancelled	2023-02-03 22:58:22 +05:30
Anand Baburajan	2d54bf7199	Merge branch 'develop' into manual_depr_entries_develop	2023-02-03 22:25:27 +05:30
anandbaburajan	e5da0d7a63	chore: refactor AssetDepreciationSchedule	2023-02-03 22:23:17 +05:30
anandbaburajan	8ea9e4576f	fix: asset value for manual depr entries	2023-02-03 21:43:18 +05:30
developsessions	be1f941996	fix: Add missing 1 required positional argument: 'bill_date'	2023-02-03 14:50:44 +01:00
developsessions	c80aaad437	style: lint wrong from position	2023-02-03 13:55:36 +01:00
s-aga-r	dc0ddf8d7e	fix: stock entry from item dashboard (stock levels)	2023-02-03 18:08:34 +05:30
developsessions	ce8a1086a7	fix: default due_date was wrong calculated on template "_Test Payment Term Template 1" (last day of next month)	2023-02-03 11:30:29 +01:00
s-aga-r	56356ffbb9	chore: add Item Name column in Warehouse wise Item Balance Age and Value report	2023-02-03 12:28:23 +05:30
s-aga-r	d7a665cb84	chore: column width in Warehouse wise Item Balance Age and Value report	2023-02-03 12:27:41 +05:30
Rohit Waghchaure	9ae7578b07	test: test case	2023-02-02 18:54:42 +05:30
Rohit Waghchaure	6d513e2519	fix: negative stock error	2023-02-02 18:40:15 +05:30
marination	03321f5f13	chore: Code simplification ... - Map is not required, avoid filter multiple times, use single loop instead - Better variable name - Reduce LOC	2023-02-02 17:28:03 +05:30
ruthra kumar	2afed7de03	Merge pull request #33777 from ruthra-kumar/performance_tuning_remarks_migration ... fix(patch): reduce memory usage while migrating remarks	2023-02-02 16:47:15 +05:30
ruthra kumar	ae2de3cf65	Merge pull request #33776 from ruthra-kumar/performance_tuning_ple_migration ... patch: reduce memory usage by paging through records	2023-02-02 16:46:51 +05:30
ruthra kumar	cb1d33880c	Merge pull request #33502 from ruthra-kumar/toggle_account_balances_in_coa ... feat: Toggle display of Account Balance in Chart of Accounts	2023-02-02 09:20:53 +05:30
marination	b3fe7c6dad	fix: Consider only ordered alternative/original item for Quotation status ... - The original and its alternatives make a set of items where one is chosen - While setting order status of Quotation, check if the chosen item from the set is fully ordered or not - Filter out unselected items from the set - Create a map containing the set of items and if they were ordered or not for ease of grouping - The simple items will work as it used to	2023-02-01 19:10:32 +05:30
Gokulnath	2884738864	feat: adding warehouse filter for gross profit report (#33397) ... Co-authored-by: ruthra kumar <ruthra@erpnext.com>	2023-02-01 18:44:15 +05:30
rohitwaghchaure	fbf2d7e9de	Merge pull request #33918 from rohitwaghchaure/fixed-incorrect-bin-qty ... fix: incorrect actual qty in Bin	2023-02-01 18:22:56 +05:30
Rohit Waghchaure	f8c852c54c	fix: incorrect actual qty in Bin	2023-02-01 17:49:11 +05:30
Suraj Shetty	ffeda0cee9	Merge pull request #33916 from gavindsouza/permlevel-apis	2023-02-01 16:24:18 +05:30
Dany Robert	2cc7239dd5	fix: currency formatting in item-wise sales history (#33903) ... * fix(item-sales-history): currency formatting * chore: linting issues * fix: convert raw sql to qb	2023-02-01 14:27:38 +05:30
Gavin D'souza	940ad6e3f2	fix: Fetch all fields via get_returned_qty_map_for_row	2023-02-01 13:53:37 +05:30
Gavin D'souza	3518d4be1d	fix(update_billing_percentage): Remove permlevel checks on aggregated ... value	2023-02-01 12:58:08 +05:30
Raffael Meyer	3c7b460fd8	fix: german chart of accounts "SKR03" (#33909) ... * fix: german chart of accounts "SKR03" - Added some missing account types and tax rates - Added some missing accounts * style: convert indentation to tabs * fix: space before percentage sign * feat: add some expense accounts * refactor: replace unicode characters with utf-8 for better readability * revert: add back groups for Bank and Cash accounts Removed in 7d0d9c690068481a9730e0132c7aff34c1f56100	2023-02-01 12:16:58 +05:30
Deepesh Garg	103a91ed40	Merge pull request #33808 from dj12djdjs/fix-lead-rename ... fix: make title field readonly	2023-02-01 12:02:33 +05:30
ruthra kumar	9bb64107c5	perf: reduce memory usage while migrating remarks ... Page through records using primary key	2023-02-01 10:44:44 +05:30
barredterra	7156184933	feat: add incoterm named place to RFQ	2023-01-31 23:23:54 +01:00
marination	ece6358e60	fix: Iterate over list instead of map's output and formatting	2023-01-31 17:13:05 +05:30
rohitwaghchaure	c5834c1db4	Merge pull request #33896 from rohitwaghchaure/inventory-dimension-mandatory ... feat: mandatory and mandatory depends on in inventory dimension	2023-01-31 15:18:14 +05:30
rohitwaghchaure	ddb4396117	Merge pull request #33715 from s-aga-r/fix-pick-list ... fix: consider existing pick-list	2023-01-31 15:10:19 +05:30
s-aga-r	6ffdeb1af8	fix: consider stock_qty if picked_qty is zero	2023-01-31 14:39:57 +05:30
Rohit Waghchaure	22d0e1373b	test: added test case	2023-01-31 14:36:26 +05:30
Rohit Waghchaure	423f2b5627	feat: mandatory and mandatory depends on in inventory dimension	2023-01-31 14:19:14 +05:30
Sagar Sharma	6e015fd6be	Merge branch 'develop' into fix-mr-rate-and-amount	2023-01-31 12:39:38 +05:30
Sagar Sharma	57c8871de0	Merge branch 'develop' into fix-pick-list	2023-01-31 12:38:58 +05:30
s-aga-r	0b76a26c8a	refactor: test_consider_existing_pick_list()	2023-01-31 12:38:30 +05:30
s-aga-r	bb7fe795fe	test: add test cases	2023-01-31 12:38:30 +05:30
s-aga-r	207eeefc85	fix(test): test_pick_list_for_items_with_multiple_UOM()	2023-01-31 12:38:30 +05:30
s-aga-r	5138ef0160	fix: pymysql.err.ProgrammingError	2023-01-31 12:38:30 +05:30
s-aga-r	7b3d496ce0	fix: get_picked_items_details	2023-01-31 12:38:30 +05:30
s-aga-r	be41052dc8	chore: add status field in Pick List	2023-01-31 12:38:30 +05:30
s-aga-r	b642718f08	fix: consider existing pick list	2023-01-31 12:38:27 +05:30
Deepesh Garg	b3dc22de29	fix: Fetch commission rate from sales partner (#33851)	2023-01-31 09:33:33 +05:30
barredterra	11d165c274	fix(Fixed Asset Register): error when selecting more than one fiscal year	2023-01-30 19:33:58 +01:00
Anand Baburajan	5d8a2d3d3b	Merge branch 'develop' into fix_disposal_was_made_on_original_schedule_date_develop	2023-01-30 21:36:51 +05:30
anandbaburajan	f487660a7c	fix: disposal_was_made_on_original_schedule_date	2023-01-30 21:33:43 +05:30
ruthra kumar	5f38859a04	Merge pull request #33736 from rtdany10/gp-report-fix ... fix(gp): fetch buying amount from dn related to so	2023-01-30 19:04:36 +05:30
marination	fa9b327501	chore: Validate 'alternative_to' field values, must be a valid non-alterntaive item from table	2023-01-30 16:27:01 +05:30
Dany Robert	d69c839369	chore: linting issues	2023-01-30 10:45:08 +00:00
Dany Robert	1f6ab86a65	feat(gp): test for inv and dn related via so	2023-01-30 10:35:43 +00:00
marination	94cacb60de	feat: Filter rows to be mapped on server side mapping function ... - Pass dialog selections to `make_sales_order` - Map either original item or its alternative depending on mapping - Only qty check for simple rows (without alternatives and not an alternative itself)	2023-01-30 13:54:30 +05:30
s-aga-r	6b781d78e0	fix: amount in Material Request	2023-01-30 12:51:59 +05:30
Deepesh Garg	a34a1f8fd2	fix: Amount validation in Payment Request against Purchase Order (#33855) ... fix: Amount validation in Payment Request againt Purchase Order	2023-01-29 21:34:28 +05:30
Deepesh Garg	faecf3ee40	fix: Lead to customer creation (#33859)	2023-01-29 21:25:49 +05:30
Deepesh Garg	6674edface	chore: Resize numeric and date columns (#33858)	2023-01-29 21:25:26 +05:30
Deepesh Garg	428b099f63	fix: Ignore linked JE on JE cancellation (#33852)	2023-01-29 17:27:17 +05:30
Deepesh Garg	8abe0ce0ec	fix: Currency symbol for tax withholding net total field (#33850) ... * fix: Currency symbol for tax withholding net total field * chore: Update display depends on property	2023-01-29 17:08:11 +05:30
ruthra kumar	fee0ca8cd9	perf: reduce memory usage by paging through records ... While migrating GL entries to Payment Ledger, page through records using primary key to reduce memory usage.	2023-01-29 15:27:01 +05:30
ruthra kumar	f270880735	fix: double salutation on quotation print (#33834) ... 'lead_name' always has salutation.	2023-01-28 18:17:25 +05:30
rohitwaghchaure	1b967f37af	Merge pull request #33845 from rohitwaghchaure/fixed-item-not-fetching-issue ... fix: item rate not fetching	2023-01-28 15:10:02 +05:30
Rohit Waghchaure	0d7f98b496	fix: item rate not fetching	2023-01-28 13:51:33 +05:30
Sabu Siyad	9e50aa4833	feat(pos): multiple item prices (#33005) ... * fix(pos): multiple item prices feat: show uom with product price feat: multiple item (variant) depending on uom Signed-off-by: Sabu Siyad <hello@ssiyad.com> * feat(pos): consider uom for new item Signed-off-by: Sabu Siyad <hello@ssiyad.com> * feat(pos): uom based stock display Signed-off-by: Sabu Siyad <hello@ssiyad.com> * use `//` instead of `math.floor()` Signed-off-by: Sabu Siyad <hello@ssiyad.com> * feat(pos): uom by barcode Signed-off-by: Sabu Siyad <hello@ssiyad.com> * fix: replace `is not` with `!=` Signed-off-by: Sabu Siyad <hello@ssiyad.com> * fix(pos): barcode_info `next()`: fallback Signed-off-by: Sabu Siyad <hello@ssiyad.com> * chore: format Signed-off-by: Sabu Siyad <hello@ssiyad.com> * Update erpnext/selling/page/point_of_sale/point_of_sale.py Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> * chore: un-ignore unused local variable Signed-off-by: Sabu Siyad <hello@ssiyad.com> --------- Signed-off-by: Sabu Siyad <hello@ssiyad.com> Co-authored-by: Raffael Meyer <14891507+barredterra@users.noreply.github.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-01-28 10:28:31 +05:30
Deepesh Garg	3598bcc9a8	chore: ERPNext setup wizard cleanup (#33675) ... * chore: ERPNext setup wizard cleanup * chore: Remove default website * chore: Remove flaky tests * chore: remove unwanted tests	2023-01-27 14:40:39 +05:30
ruthra kumar	9dd6b3c950	Merge pull request #33835 from ruthra-kumar/skip_validation_on_migration ... fix(patch): validation error on cost center allocation migration	2023-01-27 13:40:57 +05:30
ruthra kumar	de10f2dc00	fix(patch): validation error on cost center allocation migration ... If Distributed cost centers have GL postings on patch run date, patch failes with valiation error.	2023-01-27 12:08:18 +05:30
Devin Slauenwhite	a835c1a418	perf: show update items dialog	2023-01-26 16:53:05 -05:00
ruthra kumar	b31b850db8	fix: disfuctional cost center filter on Journal Entries (#33815) ... * fix: missing cost_center filter for journal entries * test: cost center filter on invoices, journals and payments	2023-01-26 20:26:21 +05:30
Vishal Dhayagude	c5ca8d74c4	fix: GST Category validation broken for pos unregistered customer who dont have address. (#33800) ... * fix: GST Category validation is given for pos customer	2023-01-26 15:45:51 +05:30
marination	cef7dfd0b4	feat: Dialog to select alternative item before creating Sales order ... - Users can leave the row blank in the dialog if original item is to be used - Else users can select an alternative item against an original item - In the document, users must check `Is Alternative Item` if needed and also specify which item it is an altenrative to since there are no documented mappings	2023-01-26 14:36:25 +05:30
anandbaburajan	21f425660d	chore: remove broken translation	2023-01-26 13:15:01 +05:30
Ankush Menat	33b68552f1	chore: remove broken translation ... [skip ci]	2023-01-25 17:35:23 +05:30
Daizy Modi	da323cbb40	fix: use correct filter name in item_query (#33814)	2023-01-25 17:32:21 +05:30
Sagar Vora	1f4fa90072	Revert "fix: use correct filter name in reports"	2023-01-25 16:19:44 +05:30
Daizy Modi	def759d2e8	fix: use correct filter name in reports	2023-01-25 15:57:39 +05:30
marination	f19eadab9a	feat: Consider filtered items table in JS for totals computation ... - Set `_items` as filtered rows if quotation else the entire table. Set at entry point of JS API - Use `_items` instead of `items` to compute taxes and charges. Exclude alternative item rows	2023-01-25 13:10:03 +05:30
Devin Slauenwhite	a504b6eac0	fix: make title field readonly	2023-01-24 18:21:08 -05:00
Rohit Waghchaure	92d857d49c	fix: purchase invoice performance issue	2023-01-24 22:32:07 +05:30
marination	91982d1e4f	feat: Filter out alternative item rows in taxes and totals for Quotation ... - Added a Quotation Item field `is_alternative_item` - Use filtered rows for taxes and totals computation	2023-01-24 18:03:53 +05:30
Sagar Sharma	302f5e27be	Merge branch 'develop' into fix-sco-status	2023-01-24 17:33:29 +05:30
s-aga-r	840f9d8987	chore: add Cancelled status in SCO get_indicator	2023-01-24 17:30:37 +05:30
rohitwaghchaure	a5478c61af	Merge pull request #33790 from rohitwaghchaure/fix-web-supplier-quotation-from-rfq ... fix: web supplier quotation	2023-01-24 15:59:04 +05:30
anandbaburajan	4e6066f929	chore: fix translations	2023-01-23 18:07:32 +05:30
Rohit Waghchaure	7800db7c0d	fix: web supplier quotation	2023-01-23 14:21:10 +05:30
Anand Baburajan	7d5df407c4	Merge branch 'develop' into update_translations_for_naming_series_error	2023-01-23 14:19:39 +05:30
anandbaburajan	bbde1f611f	chore: update translations for naming series error	2023-01-23 14:16:31 +05:30
s-aga-r	9ae3a54ce9	chore: add method get_picked_items_details()	2023-01-23 13:48:26 +05:30
rohitwaghchaure	b3a216c8f8	Merge pull request #33785 from rohitwaghchaure/get-items-from-transit-entry ... feat: get items from Transit Stock Entry	2023-01-23 13:03:53 +05:30
Rohit Waghchaure	62141b0b63	feat: get items from Transit Stock Entry	2023-01-23 12:01:57 +05:30
Deepesh Garg	a3c89dbc10	fix: TDS deduction in payment entry (#33747) ... * fix: TDS deduction in payment entry	2023-01-22 23:31:19 +05:30
Xeanth	ad437fd5ba	fix: use stock qty to calculate POS reserved stock (#33735)	2023-01-22 18:06:01 +05:30
Sagar Sharma	7a8e89e2fe	fix: incorrect rate and amount in MR Item (#33547) ... * fix: incorrect `rate` and `amount` in MR Item	2023-01-22 18:04:13 +05:30
barredterra	547d37b1db	fix: missing constant definition	2023-01-21 17:29:43 +01:00
Deepesh Garg	2f03dcb5b6	fix: Better budget exceeding validation messages (#33713) ... * fix: Better budget exceeding validation messages * chore: remove unwanted changes	2023-01-21 19:33:14 +05:30
s-aga-r	57c3216683	refactor: rewrite get_available_item_locations_for_serial_and_batched_item query in QB	2023-01-21 14:05:51 +05:30
s-aga-r	5b76e8b193	refactor: rewrite get_available_item_locations_for_serialized_item query in QB	2023-01-21 12:45:39 +05:30
s-aga-r	58dd40a2d7	refactor: rewrite get_available_item_locations_for_other_item query in QB	2023-01-21 12:15:45 +05:30
rohitwaghchaure	f6f64083d2	Merge pull request #33760 from rohitwaghchaure/allow-to-change-bom-in-sco ... fix: not able to change default BOM in the Subcontracting Order	2023-01-21 12:04:50 +05:30
s-aga-r	29bf787313	refactor: rewrite get_picked_items_qty query in QB	2023-01-21 11:28:23 +05:30
ruthra kumar	4cbd63edbf	Merge pull request #33710 from openrefactory/patch-2 ... Removed an unnecessary check in code which always evaluates to true	2023-01-21 09:41:04 +05:30
OpenRefactory, Inc	49aed7ff69	fix: removed an unnecessary check which always evaluates to true	2023-01-21 06:15:51 +05:30
Kevin Shenk	e4bceaaf66	feat: Copy project_name, from_time, to_time from timesheet details to sales invoice (#33726) ... feat: Copy project_name, from_time, to_time from timesheet details to sales invoice	2023-01-20 23:39:37 +05:30
rohitwaghchaure	b5d2eedfa6	Merge pull request #33759 from rohitwaghchaure/fix-incorrect-actual-qty-for-packed-item ... fix: incorrect actual qty for the packed item	2023-01-20 23:38:55 +05:30
Rohit Waghchaure	11b2994fe8	fix: not able to change default BOM in the Subcontracting Order	2023-01-20 23:27:49 +05:30
Rohit Waghchaure	02566a02a8	fix: incorrect actual qty for the packed item	2023-01-20 22:38:56 +05:30
rohitwaghchaure	d462d6de06	Merge pull request #33595 from vishdha/fg_based_operating_cost ... feat: Add operating cost based on bom quanity without creating job card	2023-01-20 22:36:42 +05:30
Dany Robert	1e607cd4c7	fix(pricing rule): free item duplication (#33746) ... * fix(pricing rule): free item duplication * chore: linting issues	2023-01-20 20:07:37 +05:30
Deepesh Garg	597ef0a498	fix: Short closed order, receipt and delivery note status on cancellation (#33743) ... * fix: Short closed order, receipt and delivery note status on cancellation * test: Cancelled status check	2023-01-20 19:44:06 +05:30
Raffael Meyer	327b6fdb32	fix: calculate correct amount for qty == 0 (#33739)	2023-01-20 19:35:27 +05:30
Sabu Siyad	a94aa7a79f	fix(ecommerce): breadcrumb: fallback to /all-products (#33718) ... * fix(ecommerce): breadcrumb: fallback to `/all-products` * fix(item_group): use `==` instead of `is` * test(ecommerce): breadcrumb	2023-01-20 18:54:54 +05:30
Ritwik Puri	17045f88a1	fix: use hash based naming for tax withheld vouchers child table (#33643)	2023-01-20 18:53:39 +05:30
Dany Robert	ef90e24931	chore: linting issue	2023-01-19 10:25:05 +00:00
Dany Robert	e8e20da78e	fix(gp): fetch buying amount from dn related to so	2023-01-19 09:39:43 +00:00
Sagar Sharma	333b2ae721	Merge branch 'develop' into item-attr-abbr-lowercase	2023-01-19 12:55:49 +05:30
rohitwaghchaure	ecfebfec57	Merge pull request #33723 from rohitwaghchaure/fixed-issue-of-item-variant ... fix: don't add template item in sales/purchase transaction	2023-01-19 12:42:04 +05:30
Rohit Waghchaure	2c83fff1a1	fix: don't add template item in sales/purchase transaction	2023-01-18 23:29:06 +05:30
mergify[bot]	cc569c955f	fix: the frappe throw message is corrected in the group task validation (#33698) ... fix: the frappe throw message is corrected in the group task validation (#33698)	2023-01-18 21:47:22 +05:30
Sagar Sharma	f89600aee8	Merge branch 'develop' into refactor/qb/pick-list	2023-01-18 17:52:23 +05:30
Rohit Waghchaure	1de4742ffb	fix: local variable 'stock_rbnb' referenced before assignment	2023-01-18 15:29:39 +05:30
Sagar Sharma	eee3bd2554	Merge branch 'develop' into refactor/qb/pick-list	2023-01-18 13:01:59 +05:30
Deepesh Garg	6b31c27ed6	fix: Missing constructor args in Bank Reco Tool (#33705)	2023-01-17 21:03:39 +05:30
Vishal Dhayagude	c4e1f81ccb	Merge branch 'develop' into fg_based_operating_cost	2023-01-17 19:20:37 +05:30
Anand Baburajan	c6cfacc108	Merge branch 'develop' into misc_asset_fixes	2023-01-17 15:09:37 +05:30
Deepesh Garg	db9beb3cdd	fix: Rate from LDC in TDS reports (#33699)	2023-01-17 14:53:24 +05:30
Vishal Dhayagude	f19212b5c8	Merge branch 'develop' into fg_based_operating_cost	2023-01-17 13:02:25 +05:30
Anand Baburajan	d97127bff2	Merge branch 'develop' into misc_asset_fixes	2023-01-17 12:57:22 +05:30
Sagar Sharma	eeed3356ac	Merge branch 'develop' into refactor/qb/pick-list	2023-01-17 12:25:16 +05:30
rohitwaghchaure	e68c4e2aa8	Merge pull request #33695 from rohitwaghchaure/fixed-patch-item_reposting_for_incorrect_sl_and_gl ... fix: patch item_reposting_for_incorrect_sl_and_gl	2023-01-17 12:18:34 +05:30
Rohit Waghchaure	dbde3a3421	fix: patch item_reposting_for_incorrect_sl_and_gl	2023-01-17 11:47:53 +05:30
Anand Baburajan	c4d3a8a600	Merge branch 'develop' into misc_asset_fixes	2023-01-17 11:21:37 +05:30
Sagar Sharma	1cadef97bf	Merge branch 'develop' into refactor/qb/pick-list	2023-01-17 10:08:36 +05:30
Sagar Sharma	fb950417bf	Merge branch 'develop' into dev_fix_bug_from_78b438f6	2023-01-17 10:04:36 +05:30
Deepesh Garg	0639d9e32a	chore: Typo in payment reconciliation (#33686)	2023-01-17 08:06:30 +05:30
Florian HENRY	e19161a8ee	fix: Sales ORder Connections on Material Request	2023-01-16 21:03:18 +01:00
anandbaburajan	86cf5c89ab	chore: add depr_entry_posting_status in create_asset	2023-01-17 00:31:21 +05:30
anandbaburajan	cebb5a42f4	chore: add missing /n in options	2023-01-17 00:26:50 +05:30
Anand Baburajan	011a4c3faa	Merge branch 'develop' into misc_asset_fixes	2023-01-17 00:00:09 +05:30
rohitwaghchaure	66ae807a26	Merge pull request #33684 from rohitwaghchaure/fixed-work-order-summary ... feat: [minor] date type based on filter in Work Order Summary report	2023-01-16 23:57:43 +05:30
rohitwaghchaure	d6915df81d	Merge pull request #33680 from rohitwaghchaure/refactor-picked-qty ... refactor: picked qty in sales order item	2023-01-16 23:31:56 +05:30
Rohit Waghchaure	20c8873208	feat: provision to select date type based on filter	2023-01-16 23:29:13 +05:30
anandbaburajan	a144bb01fe	chore: stying	2023-01-16 23:26:39 +05:30
Anand Baburajan	070bc8badd	Merge branch 'develop' into misc_asset_fixes	2023-01-16 23:23:12 +05:30
anandbaburajan	cf7b43f7f0	fix: handle_post_depr_entries_fail, show error alert and send email	2023-01-16 23:10:02 +05:30
Rohit Waghchaure	1bcff80074	refactor: picked qty in sales order item	2023-01-16 22:50:16 +05:30
Devin Slauenwhite	179a31ed5e	feat: disable currency exchange api. (#33593)	2023-01-16 21:00:10 +05:30
anandbaburajan	61cd0f98fd	fix: asset repair link and improve notes	2023-01-16 18:35:40 +05:30
Vishal Dhayagude	352dcddd6d	Merge branch 'develop' into fg_based_operating_cost	2023-01-16 17:02:31 +05:30
Sagar Sharma	1769b45d4b	Merge branch 'develop' into refactor/qb/pick-list	2023-01-16 16:04:20 +05:30
s-aga-r	0ed6552655	refactor: rewrite pick_list.py queries in QB	2023-01-16 16:01:40 +05:30
Deepesh Garg	adaeba1554	fix(minor): Label updates in Statement of Accounts (#33639) ... fix(minor): Label updates in Satement of Accounts	2023-01-16 14:03:54 +05:30
Deepesh Garg	312625fdc5	fix: Patch to update reference_due_date in Journal Entry (#33616)	2023-01-16 13:43:54 +05:30
ruthra kumar	9627b46ee7	Merge pull request #33661 from ruthra-kumar/performance_tuning_payment_reconciliation ... perf: improve reconciliation performance for JE with 100s of accounts	2023-01-16 09:41:17 +05:30
ruthra kumar	56aa1866da	Merge pull request #33663 from ruthra-kumar/attribute_error_on_repost_ple_tool ... fix: attribute error while submitting Repost PLE	2023-01-16 09:36:22 +05:30
Raffael Meyer	dceef0397a	fix: allow to create sales order from expired quotation (#33582)	2023-01-16 08:53:37 +05:30
ruthra kumar	be382054e5	revert: Reverting changes done on 33495 (#33662) ... 'ordered_qty' will not be fetched from `tabBin`	2023-01-16 08:50:39 +05:30
ruthra kumar	333907b7a5	Revert "fix: Updating SO throws ordered_qty not allowed to change after submission" (#33646)	2023-01-16 08:49:35 +05:30
Poruri Sai Rahul	8119442c94	FIX: Remove usage of "six.string_types" (#33603) ... FIX: Remove usage of six.string_types six is no longer a dependency	2023-01-16 08:47:28 +05:30
s-aga-r	b3759890d7	chore: Sales Order link in Pick List	2023-01-15 21:09:16 +05:30
ruthra kumar	2c50f43cdd	fix: attribute error while submitting Repost PLE	2023-01-15 20:51:54 +05:30
ruthra kumar	828eaf0930	fix: minor filter issue while reconciliation tool from bench console	2023-01-15 18:09:51 +05:30
ruthra kumar	11cf694d9a	perf: improve reconciliation speed on JE's with 1000's of rows ... 1. No need to keep old PLE's on reconciliation. 2. Added Validation to catch debit-credit mismatch on JE's 3. Only update outstanding amount for newly reconciled invoices	2023-01-15 17:51:46 +05:30
Raffael Meyer	67cf7e1728	refactor: use DocStatus (#33594)	2023-01-15 17:34:16 +05:30
Deepesh Garg	906ad10d16	fix: Return against internal purchase invoice (#33635)	2023-01-15 17:32:57 +05:30
Sagar Sharma	bfbc9ea8f7	Merge branch 'develop' into item-attr-abbr-lowercase	2023-01-15 12:55:01 +05:30
s-aga-r	f70d757b82	fix: zero rm-cost in SCR	2023-01-14 22:24:18 +05:30
Vishal Dhayagude	736afdf85a	Merge branch 'develop' into fg_based_operating_cost	2023-01-13 10:03:50 +05:30
Sagar Sharma	c2b3843d80	Merge branch 'develop' into item-attr-abbr-lowercase	2023-01-13 00:49:21 +05:30
Ritwik Puri	e22d56484d	chore: reuse doc object in test_pick_list_grouping_before_print (#33636)	2023-01-13 00:47:26 +05:30
Vishal Dhayagude	d63258ee9b	Merge branch 'develop' into fg_based_operating_cost	2023-01-12 21:50:09 +05:30
unknown	2ca4d3fb71	fix: linting	2023-01-12 20:53:12 +05:30
Anand Baburajan	29088e1777	Merge branch 'develop' into fixed_asset_report_asset_value	2023-01-12 20:30:39 +05:30
Deepesh Garg	afb33f2049	Merge pull request #33271 from sonali8848/filters-on-bank-reconciliation ... feat: Date filters on bank reconciliation tool	2023-01-12 18:25:05 +05:30
Deepesh Garg	232726288a	chore: fix fieldnames and order	2023-01-12 17:44:07 +05:30
Ritwik Puri	cfb0bb1eaa	fix: only group similar items in print format if group_same_items is checked in pick list (#33627) ... * fix: only group similar items if group same items is checked in pick list * test: non grouping of locations if group_same_items is false Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>	2023-01-12 17:25:50 +05:30
ruthra kumar	e0db2670f9	Merge pull request #33622 from ruthra-kumar/fix_change_after_submission_on_error ... fix: Updating SO throws ordered_qty not allowed to change after submission	2023-01-12 16:59:08 +05:30
s-aga-r	b26e96cdf4	chore: linter	2023-01-12 13:41:53 +05:30
ruthra kumar	391f42db04	fix: Updating SO throws ordered_qty not allowed to change after submission	2023-01-12 13:18:03 +05:30
s-aga-r	f028bd6e69	fix: validate accepted and rejected qty in SCR Item	2023-01-12 12:23:40 +05:30
s-aga-r	a0e2a93f3f	chore: update error msgs for Subcontracted PO	2023-01-12 12:09:28 +05:30
s-aga-r	6878f40d1d	chore: add row-index in error msgs	2023-01-12 12:02:00 +05:30
s-aga-r	434aa594d5	fix: ZeroDivisionError: float division by zero in SCR	2023-01-12 11:49:41 +05:30
unknown	974e12c837	fix: rewrite logic for duplicate check in Item Attribute ... Previously, Item Attribute values were not checked for case-insensitive duplicates, and Item tttribute abbreviations were forced to be uppercase. This commit fixes both problems.	2023-01-12 07:44:57 +05:30
Vishal Dhayagude	467a2b5cb4	Merge branch 'develop' into fg_based_operating_cost	2023-01-11 22:30:36 +05:30
Vishal	694fc3e20c	fix: hide with_operation on selection on fg_based and vice versa	2023-01-11 18:52:30 +05:30
Sagar Sharma	887ae1c434	Merge branch 'develop' into fix-diff-value	2023-01-11 14:01:51 +05:30
Smit Vora	be05aea101	fix: better comparision of difference value between stock and account	2023-01-11 05:21:13 +00:00
anandbaburajan	aa1f2a7297	fix: asset value in fixed asset register	2023-01-10 23:05:09 +05:30
Smit Vora	e0f5ecdad6	fix: RFQ emails not sent with pdf attachment (#33604)	2023-01-10 20:40:12 +05:30
vr-greycube	0f0bc9a462	fix: customer selection not mandatory in purchase invoice to fetch item details (#33572)	2023-01-10 20:26:33 +05:30
Deepesh Garg	0ed938a490	fix: Incorrect exchange rate in payment entries (#33481) ... * fix: Incorrect exchange rate in payment entries * test: Update failing tests	2023-01-10 20:12:43 +05:30
rohitwaghchaure	58ad79d3e8	Merge pull request #33597 from rohitwaghchaure/do-not-check-other-warehouse ... fix: don't check other warehouse ledgers to calculate valuation rate	2023-01-10 13:56:10 +05:30
Vishal	a5cbdea8e4	fix: minor change in bom.js added	2023-01-10 13:40:12 +05:30
Rohit Waghchaure	ef2bf3c223	fix: don't check other warehouse ledgers to calculate valuation rate	2023-01-10 10:59:50 +05:30
Ankush Menat	8a56df695d	perf: Drop name part from posting sort index (#33551)	2023-01-10 09:54:15 +05:30
Vishal	c51f9e0a97	fix: bom.json updated	2023-01-10 07:48:26 +05:30
Vishal	f0c0a64984	fix: test case added for FG_BASED OPERTING COST	2023-01-10 07:43:28 +05:30
Vishal	ddc0127e05	fix: minor changes added	2023-01-10 07:43:20 +05:30
Vishal	b559245f2a	feat: Add operating cost based on bom quanity without creating job card	2023-01-10 07:43:05 +05:30
rohitwaghchaure	59628f1934	Merge pull request #33579 from rtdany10/repack-fg-valuation ... fix(stock entry): wrong valuation rate in repack	2023-01-10 00:05:56 +05:30
rohitwaghchaure	a424acbfcb	Merge pull request #33577 from rohitwaghchaure/timeout-error-in-purchase-invoice ... fix: Timeout error while saving the purchase invoice	2023-01-10 00:01:15 +05:30
rohitwaghchaure	d749c4aac2	Revert "feat: Add operating cost based on bom quanity without creating job card"	2023-01-09 23:35:11 +05:30
rohitwaghchaure	20fe1875e7	Merge pull request #33347 from vishdha/fb_based_operating_cost ... feat: Add operating cost based on bom quanity without creating job card	2023-01-09 23:31:41 +05:30
Gughan Ravikumar	4d5067d6d4	fix(accounts): currency fields no longer read as strings by validation function in Payment Entry (#33535) ... explicitly cast paid_amount and received_amount to float in the Payment Entry set_unallocated_amount validation function	2023-01-09 23:26:51 +05:30
ruthra kumar	bbe5e5d9d6	fix: incorrect warehouse and selling amount on bundled products (#33549)	2023-01-09 22:45:43 +05:30
Sagar Sharma	dd3b79b511	Merge pull request #33562 from ruthra-kumar/better_handling_of_duplicate_bundle_items ... fix: better handling of duplicate bundle items	2023-01-09 22:22:57 +05:30
Devin Slauenwhite	6bc8bb26b6	fix: customer/supplier quick entry dialog (#33496) ... * fix: readonly primary contact fields. * refactor: supplier and customer quick entry form into common class.	2023-01-09 22:22:19 +05:30
Rohit Waghchaure	ec171fc7c1	test: test case to check disable last purchase rate	2023-01-09 22:02:35 +05:30
Sagar Sharma	b56c1ed050	Merge branch 'develop' into better_handling_of_duplicate_bundle_items	2023-01-09 21:48:48 +05:30
Deepesh Garg	f056e9e7c5	Merge pull request #33569 from ruthra-kumar/patch_to_update_new_je_type_in_property_setters ... chore: patch property setters for JE with new entry type	2023-01-09 21:01:52 +05:30
Deepesh Garg	57a6c37833	Merge pull request #32933 from AnandBaburajan/asset_depreciation_schedule ... feat: separating depreciation schedule from assets into a new doc	2023-01-09 20:47:21 +05:30
sonali	917b2190aa	fix: remove comments	2023-01-09 20:07:24 +05:30
Ankush Menat	fa4af2acce	refactor: convert heatmap queries to QB (#33581) ... Uses new `UnixTimestamp` function, don't backport.	2023-01-09 20:00:22 +05:30
safvanhuzain	99f5e869e0	fix(stock entry): wrong valuation rate in repack	2023-01-09 13:11:37 +00:00
Rohit Waghchaure	05df8579cd	fix: linters issue	2023-01-09 18:23:22 +05:30
Rohit Waghchaure	d1d4671320	feat: provision to disable get last purchase rate ... fix: set_incoming_rate condition	2023-01-09 18:10:52 +05:30
Rohit Waghchaure	7249657d15	fix: timeout error in the Purchase Invoice	2023-01-09 14:53:54 +05:30
ruthra kumar	789e448f0e	chore: patch property setters for JE with new entry type	2023-01-08 11:45:28 +05:30
Devin Slauenwhite	e35ac4f8c2	fix: move include in manufacturing to manufacturing tab.	2023-01-07 22:47:16 -05:00
ruthra kumar	c717e87c9e	fix: better handling of duplicate bundle items	2023-01-06 16:21:20 +05:30
rohitwaghchaure	525f054c45	Merge pull request #33548 from rohitwaghchaure/fixed-incorrect-wo-status ... fix: incorrect status in the work order	2023-01-06 16:01:24 +05:30
Rohit Waghchaure	b0baba84a0	fix: incorrect status in the work order	2023-01-06 14:16:18 +05:30
ruthra kumar	51b082b43c	Merge pull request #33537 from ruthra-kumar/sales_partner_in_ar_report ... refactor: Sales Partner column in AR and AR Summary Report	2023-01-06 12:07:50 +05:30
Vishal	9fd1c3efb4	fix: test case added for FG_BASED OPERTING COST	2023-01-06 11:18:09 +05:30
Vishal	6b0b49ee3f	fix: minor changes added	2023-01-06 11:18:09 +05:30
Vishal	bc1bdd58a7	feat: Add operating cost based on bom quanity without creating job card	2023-01-06 11:18:09 +05:30
s-aga-r	348dc32514	chore: enable No Copy attribute for route in Item Group	2023-01-05 12:25:50 +05:30
rohitwaghchaure	f6da6ece0a	Merge pull request #33524 from rohitwaghchaure/revamp-process-loss-feature ... refactor: revamp process loss feature & added tab breaks	2023-01-04 18:37:32 +05:30
ruthra kumar	ee94127974	refactor: Sales Partner column in AR and AR Summary Report	2023-01-04 12:41:02 +05:30
Anand Baburajan	3ae47ab32c	Merge branch 'develop' into asset_depreciation_schedule	2023-01-04 01:34:08 +05:30
Rohit Waghchaure	524c0994e0	test: test cases for process loss	2023-01-03 22:47:52 +05:30
Deepesh Garg	c78399c618	fix: Missing opening entry in general ledger (#33519)	2023-01-03 21:35:03 +05:30
Deepesh Garg	1a83a67d41	fix: Get payment entry button not visible in Bank Clearance doc (#33518)	2023-01-03 21:34:49 +05:30
Rohit Waghchaure	ae039777f9	refactor: revamp process loss feature & added tab breaks	2023-01-03 19:05:41 +05:30
Sagar Sharma	9f59330fa9	Merge branch 'develop' into fix/github-issue/33417	2023-01-03 18:51:27 +05:30
Deepesh Garg	a3ab8f973a	fix: Deferred revenue date comparison (#33515)	2023-01-03 17:51:41 +05:30
s-aga-r	751bdc98ed	fix: set supplier details while mapping SE(Send to Subcontractor)	2023-01-03 17:17:23 +05:30
Deepesh Garg	9a3d947e89	fix: Exchange gain and loss booking on multi-currency invoice reconciliation (#32900) ... * fix: Exchange gain and loss booking on multi-curreny invoice reconciliation * test: Update test cases * chore: Ignore SQL linting rule * chore: Joural Entry for exchange gainand loss booking * chore: Journal entry for exchange gain loss booking * test: Update test case * chore: Default exchange gain and loss account	2023-01-03 16:55:15 +05:30
Anand Baburajan	d9c91fa072	Merge branch 'develop' into asset_depreciation_schedule	2023-01-03 15:10:07 +05:30