brotherton-erpnext

Author	SHA1	Message	Date
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
Devin Slauenwhite	5685492995	Merge remote-tracking branch 'frappe/develop' into fix-reserve-qty # Conflicts: # erpnext/stock/doctype/delivery_note/test_delivery_note.py	2023-02-09 13:48:18 -05:00
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
anandbaburajan	312e51e8b2	chore: more refactoring and adding test for duplicate asset_depr_schedule	2023-01-03 15:09:04 +05:30
anandbaburajan	adb5249257	chore: fix patch	2023-01-03 13:03:12 +05:30
anandbaburajan	7b6b5ae581	chore: refactoring patch	2023-01-03 09:21:08 +05:30
anandbaburajan	e501c2db51	chore: just testing patch	2023-01-02 21:11:53 +05:30
anandbaburajan	357c17214d	chore: fix patch	2023-01-02 20:32:29 +05:30
rohitwaghchaure	6a4e25c1f9	Merge pull request #33504 from rohitwaghchaure/fixed-incorrect-picked-qty-in-so fix: [concurrency issue] incorrect picked qty in sales order	2023-01-02 20:12:05 +05:30
Rohit Waghchaure	aba83849a6	fix: [concurrency issue] incorrect picked qty in sales order	2023-01-02 18:46:22 +05:30
Anand Baburajan	72c2e77a5d	Merge branch 'develop' into asset_depreciation_schedule	2023-01-02 17:07:58 +05:30
anandbaburajan	7c5168eeac	chore: allow manually submitting and cancelling asset depr schedule	2023-01-02 17:07:28 +05:30
ruthra kumar	914b23038c	refactor: Exchange rate revaluation to handle accounts with zero account balance (#33165 ) * refactor: new type for JE - Exchange Gain or Loss * refactor: skip few validations for Exchanage Gain Or Loss type Jour * refactor: ERR create 2 journals for handling zero and non-zero compa 1. Additional check box accounts table to identify accounts with zero balance 2. Accounts with zero balance only in either of the 2 currencies will be handled on separate Journal * refactor: skips few validation for allowing 0 debit/credit * fix: General Ledger presentaion currency * test: fix test case in general ledger * test: fix failing test case in AR report	2023-01-02 14:33:14 +05:30
ruthra kumar	23fbe86d51	refactor: Show Balance in COA based on Accounts Settings	2023-01-02 13:32:01 +05:30
ruthra kumar	1b78fae6fc	refactor: show balance checkbox in Accounts Settings	2023-01-02 13:31:56 +05:30
s-aga-r	b425c2d7ec	Merge branch 'develop' into fix/github-issue/28766	2023-01-02 11:25:13 +05:30
Sagar Sharma	e18b0ebe92	Merge branch 'develop' into fix-get-bin-details	2023-01-02 10:49:29 +05:30
Sagar Sharma	49025db33c	Merge branch 'develop' into fix/github-issue/28766	2023-01-02 10:27:42 +05:30
Marc de Lima Lucio	3c393bfdc5	fix: javascript: execution blocked by undefined route options (#33405 ) Some implementations of DocField.get_route_options_for_new_doc() returned no value instead of an empty object in some cases, which caused a JavaScript error.	2023-01-02 09:18:25 +05:30
MOHAMMED NIYAS	d054f37602	feat: calculate hours (#33464 ) * feat: calculate hours * chore: Linting Issues Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2023-01-02 09:17:14 +05:30
Sabu Siyad	010718ffed	fix(ecommerce/cart): explicitly set `frappe.boot` (#33431 ) related: https://github.com/frappe/frappe/pull/18323 Signed-off-by: Sabu Siyad <hello@ssiyad.com> Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2023-01-02 08:58:01 +05:30
Devin Slauenwhite	98c39c4f5f	fix: update payment entry references (#33274 ) * fix: set_amounts after deductions and losses are set * test: difference_amount changes after update_references_in_payment_entry * chore: linter * fix: use kwargs instad of destructing a dict [skip ci] * fix(test): test payment entry difference_amount after payment reconciliation.	2023-01-02 08:55:12 +05:30
Sagar Sharma	7126d71627	Merge branch 'develop' into fix/github-issue/28766	2023-01-01 22:24:47 +05:30
Devin Slauenwhite	239a5f8bf4	test: get_item_details contains bin details	2022-12-31 15:41:07 -05:00
Devin Slauenwhite	8d62cdfd5f	fix: add missing 'ordered_qty' to get_bin_details	2022-12-31 14:14:25 -05:00
Deepesh Garg	bb4725e9b5	Merge pull request #33488 from deepeshgarg007/multi_currency_bank_reco fix: Multi-currency issues in Bank Reconciliation Tool	2022-12-31 13:05:25 +05:30
sonali	12822f7c36	fix: data format	2022-12-30 14:06:19 +05:30
Deepesh Garg	ad53ecf2b4	fix: Multi-currency issues in Bank Recociliation Tool	2022-12-30 13:37:41 +05:30
Gughan Ravikumar	48a9cd5ef3	fix: allow arbitary items in Quotation ans Sales Order (#33430 ) fix: allow arbitary items in Quotation ans Sales Order	2022-12-30 13:16:40 +05:30
rohitwaghchaure	728dc1acf4	Revert "fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation"	2022-12-30 11:08:31 +05:30
Sagar Sharma	d072169340	Merge branch 'develop' into fix/github-issue/28766	2022-12-29 16:38:53 +05:30
s-aga-r	c3911a592a	chore: use `frappe.qb` instead of `frappe.db.get_value`	2022-12-29 16:38:08 +05:30
sonali	d65243eb65	feat: consolidated auto bank reconciliation Added a button of Auto Reconcile, to reconcile the bank entries as per the matching reference number with the bank transaction and count of transactions reconciled message will be pop up on clicking the auto reconcile button.	2022-12-29 16:12:25 +05:30
s-aga-r	c716dcc01e	fix: consider child nodes while getting bin details	2022-12-29 14:01:42 +05:30
sonali	c764f14f53	fix: pre-commit	2022-12-29 13:58:06 +05:30
sonali	35c29e0226	fix: pre-commit	2022-12-29 13:45:15 +05:30
sonali	f1810803e1	fix: passing from_date and to_date filters in test cases passing from_date and to_date filters in test_linked_payments and test_debit_credit_output for unit testing	2022-12-29 13:07:06 +05:30
sonali	e2614b8a21	fix: pre-commit	2022-12-29 12:21:45 +05:30
sonali	3aaa2f5326	fix: filtered as per reference date On bank reconciliation, transactions will be filtered as per date selected in 'from_date' and 'to_date' fields , In dialog, all the bank entries will be fetched as per the posting date selected and if filtered by reference date checkbox is tick then then there will be two fields 'from_reference_date' and 'to_reference_date' then all bank entries in dialog box came as per reference date, selected. And by default journal entry checkbox is tick. Also sorted the bank transactions and bank entries as per ascending order date wise.	2022-12-29 12:05:22 +05:30
Deepesh Garg	617518389a	fix: Conversion factor error for invoices without item code (petty expenses) (#32714 ) * fix: Set default uom conversion factor to 1 for invoices * chore: set default conversion_factor as 1 * chore: remove print statements	2022-12-29 10:41:36 +05:30
Devin Slauenwhite	123920d0bc	feat: add after_refresh hook to item dashboard (#33372 ) * fix: return promise * fix: use after_refresh hook instead of promise # Because there is already a before_refresh hook. I think it makes sense to do the same for after.	2022-12-29 10:31:26 +05:30
ruthra kumar	e3a0ce5d63	fix: use base_net_amount in case of missing stock qty (#33457 )	2022-12-29 09:34:51 +05:30
Dany Robert	cabaed9ed2	fix(pricing rule): consider child tables in condition (#33469 )	2022-12-28 18:05:55 +05:30
s-aga-r	6f5824cb21	fix: `fg_item_qty` in non-subcontracted PO	2022-12-28 14:54:24 +05:30
Sabu Siyad	8e271fd719	feat(exotel): make use of `CustomField` in API (#33338 ) * feat(exotel): pass kwargs for `make_a_call` https://developer.exotel.com/api/make-a-call-api#call-agent Signed-off-by: Sabu Siyad <hello@ssiyad.com> * feat(exotel): map custom field to doctype Signed-off-by: Sabu Siyad <hello@ssiyad.com> Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-12-28 08:11:28 +05:30
Deepesh Garg	0b75aa5390	fix: Default dimensions on fetching items from BOM (#33439 )	2022-12-27 17:53:43 +05:30
Deepesh Garg	d2686ce75b	fix: Multiple rows for same warehouse and batches in pick list (#33456 )	2022-12-27 17:42:03 +05:30
anandbaburajan	21a09e7431	chore: fix patch	2022-12-27 15:01:42 +05:30
anandbaburajan	97f8588202	chore: fix patch name	2022-12-27 15:01:42 +05:30
anandbaburajan	c916fb0513	chore: fix module name in patch	2022-12-27 15:01:42 +05:30
anandbaburajan	57adcc0b03	chore: move patch to pre_model_sync	2022-12-27 15:01:42 +05:30
Anand Baburajan	4ff70db668	Merge branch 'develop' into asset_depreciation_schedule	2022-12-27 14:59:53 +05:30
Deepesh Garg	8263bf9a9a	fix: Random behaviour while picking items using picklist (#33449 )	2022-12-27 14:59:35 +05:30
anandbaburajan	482116db9f	chore: improve tests	2022-12-27 10:03:32 +05:30
Anand Baburajan	6f4e6fafa9	Merge branch 'develop' into asset_depreciation_schedule	2022-12-27 07:36:32 +05:30
anandbaburajan	6d791cabd1	chore: more refactoring	2022-12-26 22:13:11 +05:30
Sagar Sharma	88edc412e3	Merge branch 'develop' into fix/purchase-order/shipping_address	2022-12-26 12:00:39 +05:30
s-aga-r	67a7ccf3ce	fix: `shipping_address` for non-drop shipping item	2022-12-26 11:57:50 +05:30
Deepesh Garg	8a79efab4b	feat: Accounting Dimension updation in Payment Request and Entry (#33411 )	2022-12-26 10:17:55 +05:30
Solufyin	7d9f3f23dd	fix: Customer Primary Contact (#33424 ) Co-authored-by: Nihantra C. Patel <n.patel.serpentcs@gmail.com>	2022-12-26 10:15:10 +05:30
Sagar Sharma	32f3b64a89	Merge branch 'develop' into fix/github-issue/32258	2022-12-25 18:12:08 +05:30
s-aga-r	7e1b6b3c2a	fix: `shipping_address` in PO	2022-12-25 18:11:05 +05:30
anandbaburajan	03662be150	chore: have different functions for draft. active and cancelled depr schedules	2022-12-25 18:05:19 +05:30
ruthra kumar	a0484793c3	refactor: remove unrelated filters from Supplier Ledger Summary Territory, Sales Partner and Sales Person doesn't belong in Supplier Ledger	2022-12-24 11:20:39 +05:30
ruthra kumar	89229d9b58	refactor: additional doctype access for 'Accounts User' role	2022-12-24 11:20:16 +05:30
ruthra kumar	bfa511cb65	refactor: hidden columns to help framework handle user permissions 'territory', 'supplier_group', 'customer_group' have been added as hidden columns to handle 'user permission' based access control.	2022-12-24 10:30:30 +05:30
rohitwaghchaure	40769998c6	Merge pull request #33422 from rohitwaghchaure/fix-stock-entry-submit-performance fix: timeout error while submitting stock entry	2022-12-23 13:57:25 +05:30
Rohit Waghchaure	a05c47e499	fix: timeout error while submitting stock entry Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-12-23 13:27:32 +05:30
Anand Baburajan	b17ef34042	Merge branch 'develop' into asset_depreciation_schedule	2022-12-23 11:02:17 +05:30
anandbaburajan	3e91a56c19	chore: only consider draft and active assets in patch, and allow asset depr schedule to be manually createed	2022-12-23 11:01:18 +05:30
ruthra kumar	8f5d8e0474	Merge pull request #33418 from ruthra-kumar/filter_issue_in_ar_ap_report fix: payment terms and sales partner filter issue in Accounts Receivable report	2022-12-22 11:38:38 +05:30
ruthra kumar	13c4420f42	fix: payment terms and sales partner filter issue in AR/AP report	2022-12-22 10:55:22 +05:30
ruthra kumar	a26698b88e	Merge pull request #33410 from ruthra-kumar/typeerror_on_gp_due_to_incorrect_warehouse_on_bundle_item fix: TypeError on GP Report due to multiple warehouse on bundled items	2022-12-21 18:26:40 +05:30
ruthra kumar	5918bb03f7	test: type error on bundled products with different warehouses	2022-12-21 17:47:57 +05:30
ruthra kumar	e684eb32d0	fix: typerror on multi warehouse in Packed Items DN(with bundled item with varying warehouses)-> Sales Invoice.	2022-12-21 15:09:55 +05:30
sonali	81e5f71172	fix: json issue	2022-12-21 14:02:54 +05:30
sonali	6b5276398e	fix: linters	2022-12-21 13:32:16 +05:30
sonali	645869e6ff	feat: added arguments of posting date and reference date	2022-12-21 12:58:30 +05:30
Deepesh Garg	ade83cbab3	fix: Consolidated financial report	2022-12-20 16:45:46 +05:30
Deepesh Garg	1da14b7ec3	Merge pull request #33393 from deepeshgarg007/cc_filter_cashflow_report fix: Cost center filter not working in cash flow report	2022-12-20 13:46:18 +05:30
Deepesh Garg	925387550e	Merge pull request #33350 from deepeshgarg007/payment_request_flow fix: Payment Request flow fixes from Order to Payment Entry	2022-12-20 13:45:15 +05:30
Deepesh Garg	9dc1509cf5	Merge pull request #33358 from resilient-tech/fix-appointment-booking fix: remove unnecessary permissions from Appointment and Appointment Booking Settings	2022-12-20 11:53:01 +05:30
Deepesh Garg	31c95deb88	chore: More fixes	2022-12-20 11:45:51 +05:30
Deepesh Garg	ff48634cbb	Merge branch 'develop' of https://github.com/frappe/erpnext into payment_request_flow	2022-12-20 11:42:15 +05:30
Deepesh Garg	e25b98b620	chore: Update test case	2022-12-20 11:42:05 +05:30
Deepesh Garg	068df9f815	chore: remove print statement	2022-12-20 10:00:53 +05:30
Deepesh Garg	d0dbfec052	fix: Cost center filter not working in cash flow report	2022-12-20 09:59:27 +05:30
rohitwaghchaure	1ed2230e4c	Merge pull request #33382 from rohitwaghchaure/fixed-pick-list-issue fix: unsupported operand type(s) for +=: 'int' and 'NoneType'	2022-12-20 09:47:29 +05:30
rohitwaghchaure	eaa04abe29	Merge pull request #33387 from rohitwaghchaure/audit-to-fix-incorrect-valuation-entry fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation	2022-12-20 09:46:57 +05:30
Rohit Waghchaure	f31612376a	test: added test case to validate audit for incorrect entries	2022-12-20 00:14:41 +05:30
Rohit Waghchaure	b1721b79ce	fix: daily scheduler to identify and fix stock transfer entries having incorrect valuation	2022-12-19 23:33:44 +05:30
rohitwaghchaure	7851adb49a	Merge branch 'develop' into fixed-pick-list-issue	2022-12-19 23:32:06 +05:30
Ankush Menat	88ce11f03d	fix: incorrect type hints (#33381 ) [skip ci]	2022-12-19 16:44:19 +05:30
Rohit Waghchaure	2b4eae5f84	fix: unsupported operand type(s) for +=: 'int' and 'NoneType'	2022-12-19 16:24:55 +05:30
ruthra kumar	65db9cea25	Merge pull request #33380 from ruthra-kumar/err_for_invoices_should_reflect_in_ar_ap_report fix: ERR journals should reported in AR/AP	2022-12-18 16:56:19 +05:30
ruthra kumar	2ed86760d7	test: err for party should be in AR/AP report	2022-12-18 12:40:07 +05:30
ruthra kumar	b09eade3e4	fix: ERR journals reported in AR/AP Exchange Rate Revaluation on Receivable/Payable will included in AR/AP report	2022-12-18 06:38:23 +05:30
Gokulnath	4ecce242a8	feat: adding warehouse filter for sales order ananlysis report feat: adding warehouse filter for sales order ananlysis report	2022-12-17 20:06:01 +05:30
Deepesh Garg	67c5cec505	Merge pull request #33339 from barredterra/print-rfq feat: more control when printing RFQ	2022-12-17 19:24:57 +05:30
Deepesh Garg	6238fd9d9e	Merge pull request #33341 from deepeshgarg007/tds_tcs_cost_center fix: Cost Center for tax withholding invoices	2022-12-17 19:24:34 +05:30
sonali	05b6fce03d	feat:filters on bank reconciliation Added date filters on bank transactions, payment entries and journal entries and sorted list as per date in ascending order.	2022-12-17 17:15:28 +05:30
Deepesh Garg	2a4eec245a	Merge pull request #33371 from deepeshgarg007/coa_import_srbnb fix: Unable to import COA through importer	2022-12-17 16:42:37 +05:30
Deepesh Garg	3b66920342	fix: Unable to import COA through importer	2022-12-16 19:22:29 +05:30
Deepesh Garg	0e86cde64b	Merge branch 'develop' into print-rfq	2022-12-16 16:24:02 +05:30
Sagar Vora	9989ccbb02	Merge branch 'develop' into fix-appointment-booking	2022-12-16 10:36:48 +00:00
Daizy Modi	4802d719ed	fix: removed unused data and minor changes	2022-12-16 15:55:58 +05:30
Deepesh Garg	6bb22c703a	Merge pull request #33275 from pps190/fix-pe-exchange-rate-precision fix: use highest precision for exchange rate.	2022-12-16 15:43:36 +05:30
Deepesh Garg	50421b3d7d	Merge pull request #33315 from kunhimohamed/develop fix: at create_customer_or_supplier on session creation	2022-12-16 15:04:10 +05:30
Deepesh Garg	b76129c1dd	Merge pull request #33286 from artykbasar/develop Subscription Cost center value is fixed to Default value(Bug fix)	2022-12-16 14:44:51 +05:30
Deepesh Garg	5c50a46822	Merge pull request #33362 from deepeshgarg007/exclude_gst_credential_doctype feat: Ignore company related doctype for other apps via hooks	2022-12-16 11:07:47 +05:30
Daizy Modi	5d0b5c8d2a	fix: pass necessary params instead of args	2022-12-16 10:10:29 +05:30
Deepesh Garg	1a40c04b72	feat: Ignore company related doctype for other apps via hooks	2022-12-15 18:51:58 +05:30
sonali	408c89df03	Feat:Filter on Payment Entries and Journal Entries Applying filters on Payement entries and Journal Entries as per reference date and posting date	2022-12-15 18:09:57 +05:30
rohitwaghchaure	da1d8da355	Merge pull request #33355 from rohitwaghchaure/fixed-do-not-show-disabled-items fix: disabled items showing in the report Itemwise Recommended Reorder Level	2022-12-15 18:08:05 +05:30
Daizy Modi	56f3ac15d8	fix: removed unncessary changes	2022-12-15 18:02:14 +05:30
Daizy Modi	4bfe2ea572	fix: agent assignment and permissions for appointment	2022-12-15 17:19:28 +05:30
rohitwaghchaure	5cbbb5d59e	Merge pull request #33354 from rohitwaghchaure/fixed-trivial-discount-amount fix: unsupported operand type(s) for +: 'int' and 'NoneType'	2022-12-15 17:13:46 +05:30
Rohit Waghchaure	ae31ff1c48	fix: disabled items showing in the report 'Itemwise Recommended Reorder Level '	2022-12-15 17:05:53 +05:30
Daizy Modi	ac51c27500	fix: fetch required details from appointment booking settings	2022-12-15 16:53:51 +05:30
Daizy Modi	9a00b3bdbd	fix: format html of verify email for book appointment	2022-12-15 16:51:00 +05:30
Daizy Modi	25f0b26a17	fix: remove unused page `book-appointment`	2022-12-15 16:49:23 +05:30
Daizy Modi	ae8dd2b2bc	fix: remove guest role from doctype	2022-12-15 16:47:27 +05:30
Rohit Waghchaure	0f28074e5a	fix: unsupported operand type(s) for +: 'int' and 'NoneType'	2022-12-15 16:36:47 +05:30
ruthra kumar	d126c8030f	Merge pull request #33335 from ruthra-kumar/cost_center_issue_on_reconciliation_tool fix: paid invoices shows up as outstanding when 'cost_center' filter is applied	2022-12-15 15:02:18 +05:30
Anand Baburajan	246d3b4075	Merge branch 'develop' into asset_depreciation_schedule	2022-12-15 14:51:16 +05:30
anandbaburajan	a358f77774	chore: move patch to post_model_sync and cancel asset depr schedule properly	2022-12-15 14:50:53 +05:30
ruthra kumar	a998a8a2da	test: cost center should not affect outstanding calculation	2022-12-15 14:28:33 +05:30
Deepesh Garg	dc178984ae	fix: Payment Request flow fixes from Order to Payment Entry	2022-12-15 14:15:20 +05:30
anandbaburajan	7f5e761c04	chore: add patch	2022-12-15 13:13:04 +05:30
Deepesh Garg	3a8a467edb	Merge pull request #33329 from Gokulnath17/Gokulnath_dev fix: in gross profit report	2022-12-15 12:01:39 +05:30
Deepesh Garg	076527bb88	Merge pull request #33305 from barredterra/incoterm-named-place feat: incoterm named place	2022-12-15 11:59:54 +05:30
Gokulnath	f73976946e	Merge branch 'develop' into Gokulnath_dev	2022-12-15 10:22:49 +05:30
Deepesh Garg	b7e9942681	Merge pull request #33309 from barredterra/refactor-validate_payment_against_negative_invoice refactor: translatable strings and guard clause	2022-12-15 09:21:16 +05:30
rohitwaghchaure	9bf2682218	Merge pull request #33323 from barredterra/translate-overbilling-overdelivery fix: translatability of warning on overbilling/-receipt/-delivery	2022-12-14 23:24:11 +05:30
Deepesh Garg	26277cfcf3	chore: resolve errors in test	2022-12-14 21:22:48 +05:30
Deepesh Garg	973ef33eb5	fix: Cost Center for tax withholding invoices	2022-12-14 20:41:00 +05:30
barredterra	8717148d9b	feat: improve visibility of default values	2022-12-14 14:14:29 +01:00
barredterra	ce9626fead	feat: more control when printing RFQ	2022-12-14 14:03:36 +01:00
Gokulnath	d404a03947	Merge branch 'develop' into Gokulnath_dev	2022-12-14 17:38:16 +05:30
ruthra kumar	8eb93004f7	fix: cost_center filter fix for 'Get Outstanding Invoice' in PE	2022-12-14 16:16:22 +05:30
rohitwaghchaure	21c86bd649	Merge pull request #33332 from rohitwaghchaure/fixed--missing-required-argument fix: get_serial_nos_for_fg() missing 1 required positional argument: …	2022-12-14 16:06:58 +05:30
ruthra kumar	6d9d730759	fix: cost_center filter gives incorrect output filtering on cost center gives invoices that are reconciled as having outstanding	2022-12-14 16:05:15 +05:30
Rohit Waghchaure	410a58b3de	fix: get_serial_nos_for_fg() missing 1 required positional argument: 'args'	2022-12-14 15:33:36 +05:30
anandbaburajan	c99cd74a15	chore: handle some error cases and add empty patch file	2022-12-14 13:20:37 +05:30
Gokulnath17	41fc3be339	fixes in gross profit report	2022-12-14 10:46:11 +05:30
barredterra	36997d9788	fix: translation for warning on Overbilling/-receipt/-delivery	2022-12-13 18:59:20 +01:00
Anand Baburajan	8534390627	Merge branch 'develop' into asset_depreciation_schedule	2022-12-13 20:49:06 +05:30
anandbaburajan	22ef342ac7	chore: fixing all tests	2022-12-13 20:48:34 +05:30
anandbaburajan	df134c7c5b	chore: fixing some tests	2022-12-13 16:26:33 +05:30
Nabin Hait	5ea6080a6e	Merge pull request #33300 from ssiyad/fix/pos/var_typo fix(pos): variable typo: `s_pos` -> `is_pos`	2022-12-13 15:21:10 +05:30
Nabin Hait	c5d21b2461	Merge pull request #33314 from s-aga-r/fix/github-issue/33145 fix: `Enough Parts to Build` in `BOM Stock Report`	2022-12-13 15:19:40 +05:30
ruthra kumar	3db446e35a	Merge pull request #33313 from nabinhait/tax_detail_report_perm_issue fix: Permission issue in Tax Detail report	2022-12-13 14:27:08 +05:30
kunhi	15e3b7f218	fix: at create_customer_or_supplier on session creation	2022-12-13 12:41:56 +04:00
Sagar Sharma	f9be137cf5	Merge branch 'develop' into fix/github-issue/33145	2022-12-13 14:00:51 +05:30
s-aga-r	723c64ba73	fix: `Enough Parts to Build` in `BOM Stock Report`	2022-12-13 14:00:30 +05:30
Nabin Hait	aa787e4030	fix: Permission issue in Tax Detail report	2022-12-13 13:16:24 +05:30
ruthra kumar	2175784142	Merge pull request #33303 from ruthra-kumar/incorrect_balance_on_consolidate_balance_sheet fix: incorrect balance on parent company on consolidate Balance sheet due to key mismatch	2022-12-13 09:04:13 +05:30
barredterra	f20370c5ef	refactor: translatable strings and guard clause	2022-12-13 02:36:12 +01:00
barredterra	e057e1dfe7	feat: incoterm named place	2022-12-12 18:49:47 +01:00
s-aga-r	78b438f6cf	fix: `Material Request` reference in internal `Sales Order`	2022-12-12 22:41:44 +05:30
ruthra kumar	7b3316dc31	fix: incorrect balance on parent company due to key mismatch	2022-12-12 20:15:59 +05:30
rohitwaghchaure	5c0f8ee44f	Merge pull request #33281 from tundebabzy/29976 fix: maintain same rate throughout sales cycle doesn't work with quotation	2022-12-12 19:30:50 +05:30
Sabu Siyad	7d64bf78cf	fix(pos): variable typo: `s_pos` -> `is_pos` Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-12-12 19:09:00 +05:30
anandbaburajan	28d4942d6c	chore: fix validation and add make_schedules_editable	2022-12-12 18:19:34 +05:30
anandbaburajan	1ea2ba0dea	chore: handle some cases where asset_depr_schedule doesn't exist	2022-12-12 17:31:57 +05:30
anandbaburajan	b997d1eb87	chore: add some validation, shorten some function names	2022-12-12 17:25:38 +05:30
Anand Baburajan	f8cd424559	Merge branch 'develop' into asset_depreciation_schedule	2022-12-12 16:36:59 +05:30
anandbaburajan	ec6505d747	chore: fix some bugs, refactor some functions, add proper notes	2022-12-12 16:35:30 +05:30
Ankush Menat	915e0347b0	chore!: remove activity log feeds (#33294 ) - This contains little to no information and practically no one uses this. - Also causes a lot of problem by adding way too many feeds in activity log to the point where activity page doesn't even load.	2022-12-12 15:14:30 +05:30
Ankush Menat	593626f502	perf: add indexes on payment entry reference (#33288 ) Adds index on: 1. reference doctype 2. reference name Why not composite index? There are three type of queries on this doctype - filtering ref_doctype - doctype index helps here - filtering ref_name - name index helps here - filtering both - name index helps here too. Since it has sufficiently high cardinality. Composite index wont help in case where ref_doctype isn't specfied. [skip ci]	2022-12-12 12:58:11 +05:30
artykbasar	d512919f5c	Subscription Cost center value is fixed to Default value(Bug fix) self.cost_center field value keeps changing to erpnext.get_default_cost_center(self.get("company")) after validation of this doctype. This overrides the user input. simple fix, it will first check if the field is empty, if empty then puts the company's default cost center value if not then user input will be saved.	2022-12-11 08:51:34 +00:00
Tunde Akinyanmi	71aa8c5e1c	test: refactor test case	2022-12-09 14:33:54 +01:00
Tunde Akinyanmi	d193a14b8f	test: ensure test case sets Selling Settings	2022-12-09 14:09:54 +01:00
anandbaburajan	90e1b9cb3d	chore: fix asset depr schedule notes	2022-12-09 16:18:40 +05:30
Tunde Akinyanmi	97ddfcfc7c	fix: Maintain Same Rate Throughout Sales Cycle doesn't work Issue #29976 was partly fixed by #32923 but the problem still persists. The reason is because an incorrect fieldname was passed to the `validate_rate_with_reference_doc` method. This commit fixes it	2022-12-09 10:29:28 +01:00
anandbaburajan	16365bfca3	chore: more refactoring	2022-12-09 14:04:00 +05:30
Devin Slauenwhite	2010b1b6e8	fix: use highest precision for exchange rate.	2022-12-08 16:26:07 -05:00
anandbaburajan	77dc8e7966	fix: bug in posting depr entries	2022-12-09 00:58:19 +05:30
anandbaburajan	187e1a324a	chore: refactor get_depreciable_assets	2022-12-09 00:46:56 +05:30
anandbaburajan	1fd73af744	chore: refactor some reports	2022-12-09 00:28:34 +05:30
Deepesh Garg	6db52930d8	Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule	2022-12-08 18:05:05 +05:30
Deepesh Garg	6192af5cf0	chore: Update tests	2022-12-08 18:04:40 +05:30
sonali	8e7c8a6482	Update bank_reconciliation_tool.json Adding fields in bank reconciliation tool	2022-12-08 17:23:08 +05:30
Deepesh Garg	b179514273	Merge pull request #33269 from ssiyad/fix/ecommerce/breadcrumb_base fix(ecommerce): remove query parameters from referrer	2022-12-08 17:11:34 +05:30
Sabu Siyad	b6bd408f19	fix(ecommerce): remove query parameters from referer inclusion of query parameters results in logic failure example: - logic check if referrer is `all-products` - `http://shop.example/all-products` -> `all-products`, valid outcome - `http://shop.example/all-products?start=1` -> `all-products?start=1`, invalid outcome Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-12-08 16:47:50 +05:30
Ankush Menat	0b86b1baca	refactor: make payments app a soft dependency (#33245 ) refactor: make payment app a soft dependency	2022-12-08 16:40:13 +05:30
sonali	447272aa4d	Filters on Bank Reconciliation Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.	2022-12-08 16:11:53 +05:30
Deepesh Garg	07c815f35f	Merge pull request #33253 from niyazrazak/patch-9 feat: get lead with WhatsApp number	2022-12-08 15:19:13 +05:30
Deepesh Garg	81397ba3ee	Merge pull request #33227 from barredterra/add-translation-variable-order fix: add translation variable index	2022-12-08 15:17:07 +05:30
Deepesh Garg	f0487451f7	Merge pull request #33248 from QwQuan/develop fix: bugs in zh.csv	2022-12-08 15:16:16 +05:30
sonali	e5a1189bec	Update bank_reconciliation_tool.py Applying date filter on transactions and all the bank entries and also gives the filter the bank entries as per reference date. Sorted all transactions and entries as per date in ascending order. Also added posting date columns in all bank entries and default checkbox tick of journal entry, hide the sales invoice and purchase invoice checkbox.	2022-12-08 13:29:28 +05:30
ruthra kumar	1d37c0143f	Merge pull request #33254 from ruthra-kumar/index_error_on_customer_master fix: index error on customer master	2022-12-08 12:52:20 +05:30
Rohit Waghchaure	f598da7c81	fix: total value in Warehouse Wise Stock Balance	2022-12-08 00:55:45 +05:30
s-aga-r	632c08f7e0	fix: order status in `Production Planning Report`	2022-12-07 22:47:06 +05:30
ruthra kumar	cf1e3dc8ea	fix: index error on customer master	2022-12-07 20:48:40 +05:30
MOHAMMED NIYAS	922375c3ba	feat: get lead with WhatsApp number	2022-12-07 17:50:35 +05:30
wuzhouquan	a6fe79f29d	fix: bugs in zh.csv	2022-12-07 15:04:56 +08:00
anandbaburajan	18fc2b5695	chore: fix bug in unlink_asset_reference	2022-12-06 23:34:56 +05:30
anandbaburajan	2cd42dbb10	chore: refactor get_finance_book_value_map	2022-12-06 23:16:02 +05:30
anandbaburajan	e7d404a30a	chore: remove finance_book and finance_book_id from depreciation_schedule and refactor some functions	2022-12-06 21:33:20 +05:30
anandbaburajan	8365d6bdb7	fix: refactor reverse_depreciation_entry_made_after_disposal and fix fb bug	2022-12-06 17:58:38 +05:30
rohitwaghchaure	7cbb6c4de9	Merge pull request #33236 from rohitwaghchaure/feat-warehouse-wise-stock-balance feat: warehouse wise stock balance	2022-12-06 17:58:31 +05:30
Deepesh Garg	b602a0dcb0	Merge pull request #33146 from barredterra/reload-currency-exchange-settings fix: reload Currency Exchange Settings in patch	2022-12-06 17:38:13 +05:30
Deepesh Garg	26adbc6282	Merge pull request #33192 from deepeshgarg007/bundle_item_rates fix: Bundle item rates	2022-12-06 17:37:22 +05:30
Rohit Waghchaure	861aa9e08a	feat: warehouse wise stock balance	2022-12-06 17:33:33 +05:30
Deepesh Garg	c1a82dc9e5	Merge pull request #33191 from ruthra-kumar/key_error_in_profit_loss_report fix: key error while filtering on date range and reporting on foreign currency	2022-12-06 15:42:53 +05:30
Deepesh Garg	b1242bc56c	chore: Update tests	2022-12-06 15:14:48 +05:30
Deepesh Garg	af1f98e188	Merge branch 'develop' of https://github.com/frappe/erpnext into bundle_item_rates	2022-12-06 13:59:51 +05:30
Deepesh Garg	e5566b31d5	chore: Consider bundle qty as well	2022-12-06 13:59:45 +05:30
ruthra kumar	a6794c3606	fix: key error on p/l and balance sheet reports on foreign currency	2022-12-06 13:48:46 +05:30
ruthra kumar	19db7e2989	fix: replace sql code with fields list in get_cached_value	2022-12-06 13:48:46 +05:30
Deepesh Garg	01b84a9751	Merge pull request #33194 from barredterra/validate-employee-dates refactor: validate dates in Employee	2022-12-06 12:34:15 +05:30
Deepesh Garg	3aa6f97420	Merge pull request #33216 from barredterra/validate-accounts-dates refactor: validate dates in accounts module	2022-12-06 12:33:01 +05:30
Deepesh Garg	63393fa503	Merge pull request #33217 from barredterra/validate-project-dates refactor: validate dates in project and task	2022-12-06 12:32:27 +05:30
Deepesh Garg	921f8edde8	Merge pull request #33219 from deepeshgarg007/internal_transfer_editable_rate fix: Allow item rate updates for non-stock invoices	2022-12-06 09:12:24 +05:30
Raffael Meyer	5853b80d25	Merge branch 'develop' into reload-currency-exchange-settings	2022-12-06 02:30:55 +01:00
Raffael Meyer	8301d3b13f	Merge branch 'develop' into key_error_in_profit_loss_report	2022-12-06 02:08:47 +01:00
barredterra	a26a29f33b	fix: incorrect dates in test records	2022-12-05 19:49:05 +01:00
Raffael Meyer	a074ffa880	Merge branch 'develop' into validate-employee-dates	2022-12-05 19:38:01 +01:00
Raffael Meyer	e526a0e282	Merge branch 'develop' into validate-accounts-dates	2022-12-05 19:37:54 +01:00
Raffael Meyer	a2abc879c9	Merge branch 'develop' into validate-project-dates	2022-12-05 19:37:46 +01:00
barredterra	748c74ba52	fix: add translation variable order	2022-12-05 18:24:22 +01:00
rohitwaghchaure	d0478ec3b8	Merge pull request #33224 from rohitwaghchaure/fixed-partial-work-order-incorrect-batch-picked fix: non empty FG batch picked while completing work order	2022-12-05 20:29:19 +05:30
Rohit Waghchaure	713330cbf6	fix: non empty FG batch picked while completing work order	2022-12-05 18:15:13 +05:30
Deepesh Garg	0581000990	fix: Remove free items	2022-12-05 17:59:02 +05:30
ruthra kumar	7bd0e977bf	Merge pull request #33222 from ruthra-kumar/data_import_errors_for_sales_invoice fix: data import mandatory account_head, charge_type	2022-12-05 16:56:43 +05:30
ruthra kumar	3814db02eb	fix: data import mandatory account_head, charge_type	2022-12-05 16:24:05 +05:30
Deepesh Garg	55c0770280	Merge branch 'develop' of https://github.com/frappe/erpnext into buying_selling_pricing_rule	2022-12-05 15:43:29 +05:30
Deepesh Garg	5f821b93a5	chore: Add POS Invoices	2022-12-05 15:43:03 +05:30
Deepesh Garg	ef9d126254	fix: Allow item rate udpates for non-stock invoices	2022-12-05 10:17:19 +05:30
anandbaburajan	83ed93fbb6	chore: refactor chart and manual set_accumulated_depreciation logic	2022-12-04 22:45:48 +05:30
barredterra	31db0e7c79	refactor: validate parent_expected_end_date in Task	2022-12-04 15:28:38 +01:00
barredterra	2c4eb371a6	refactor: validate dates in project and task	2022-12-04 15:15:07 +01:00
anandbaburajan	ca8c827492	chore: refactor schedules in split_asset functions	2022-12-04 19:22:58 +05:30
barredterra	eb66b749b2	refactor: validate dates in accounts module	2022-12-04 14:41:21 +01:00
Raffael Meyer	083a954b5d	Merge branch 'develop' into validate-employee-dates	2022-12-04 14:30:51 +01:00
Deepesh Garg	b741ae143c	fix: Reapply pricing rule on qty change	2022-12-02 17:14:06 +05:30
rohitwaghchaure	66dbf94151	Merge pull request #33199 from s-aga-r/refactor/warehouse-tree refactor: remove `balance` from `Warehouse Tree`	2022-12-02 14:24:07 +05:30
rohitwaghchaure	295ce0e8e9	Merge pull request #33193 from rohitwaghchaure/clear-repost-logs fix: clear repost logs using Log Settings	2022-12-02 13:55:59 +05:30
Rohit Waghchaure	2cce6f2a34	fix: test case	2022-12-02 12:43:31 +05:30
Sagar Sharma	b3ae6cc4b9	Merge branch 'develop' into refactor/warehouse-tree	2022-12-02 10:58:33 +05:30
Deepesh Garg	2058fac177	Merge pull request #33195 from ruthra-kumar/type_error_on_sales_pipeline_report fix: type error on Sales Pipeline Analytics	2022-12-02 10:10:36 +05:30
Rohit Waghchaure	5949a7ecff	fix: default clear repost logs	2022-12-01 23:35:21 +05:30
Deepesh Garg	f54838ab56	fix: Buying and selling check in pricing rule	2022-12-01 21:23:17 +05:30
s-aga-r	3ce8386ca3	refactor: remove `balance` from `Warehouse Tree`	2022-12-01 19:44:49 +05:30
Deepesh Garg	2106de0fa5	Merge pull request #33170 from deepeshgarg007/se_alert_develop fix(UX): Alert on change of item rate in Stock Entry	2022-12-01 18:16:55 +05:30
Deepesh Garg	9ddd838f2d	Merge pull request #33183 from deepeshgarg007/month_end_due_date fix: Due date for month end payment term	2022-12-01 18:16:13 +05:30
ruthra kumar	4856e750f9	fix: type error on Sales Pipeline Analytics	2022-12-01 18:08:32 +05:30
barredterra	03f7bfbbde	refactor: validate dates	2022-12-01 12:42:03 +01:00
Deepesh Garg	826f45ad60	fix: Bundle item rates	2022-12-01 16:11:10 +05:30
anandbaburajan	f20238fa3e	chore: use make_new_active_asset_depr_schedules_and_cancel_current_ones instead of prepare_depreciation_data	2022-12-01 15:15:32 +05:30
ruthra kumar	9b8d6fe411	fix: key error while filtering on date range and different currency	2022-12-01 13:38:41 +05:30
Anand Baburajan	5b1743330d	Merge branch 'develop' into invalid_message_fix	2022-12-01 12:35:04 +05:30
Anand Baburajan	2886d8ab5a	Merge branch 'develop' into month_end_due_date	2022-12-01 12:34:51 +05:30
Deepesh Garg	5b1798363c	Merge pull request #33091 from ssiyad/fix/pos/partial_return_amount fix(pos): partial return amount update	2022-12-01 11:41:53 +05:30
Sagar Sharma	d892e27289	Merge branch 'develop' into se_alert_develop	2022-12-01 10:37:52 +05:30
Sagar Sharma	93f29d8f08	Merge branch 'develop' into invalid_message_fix	2022-12-01 09:24:40 +05:30
anandbaburajan	827ad01d4f	chore: style	2022-11-30 23:57:26 +05:30
Anand Baburajan	ba38001116	Merge branch 'develop' into asset_last_day_test_bug	2022-11-30 23:53:21 +05:30
anandbaburajan	25522444b8	fix: use is_last_day_of_the_month in test_scrap_asset	2022-11-30 23:25:40 +05:30
Sagar Sharma	0e8edd1ee9	Merge branch 'develop' into se_alert_develop	2022-11-30 22:03:31 +05:30
Deepesh Garg	bfb81ef56f	fix: Due date for month end payment term	2022-11-30 20:53:41 +05:30
Deepesh Garg	64e5a79a91	fix: Error on making stock entry from material request	2022-11-30 19:35:30 +05:30
Sabu Siyad	c5edbe2e2f	fix(lint): trailing whitespace Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-11-30 17:12:06 +05:30
Sagar Sharma	43d08b4c74	Merge branch 'develop' into se_alert_develop	2022-11-30 10:15:31 +05:30
s-aga-r	ca0485a503	fix: add company filter in RFQ Items	2022-11-30 10:03:36 +05:30
anandbaburajan	96ede2fcf9	fix: bug in new depr schedule	2022-11-29 21:30:23 +05:30
Deepesh Garg	4bd9289d7d	fix(UX): Alert on change of item rate in Stock Entry	2022-11-29 19:21:48 +05:30
Deepesh Garg	3eb1ed19a1	fix: Tax withholding net total for PI in reports	2022-11-29 13:10:31 +05:30
Sagar Sharma	ce7720b14c	Merge branch 'develop' into repost-item-valuation	2022-11-29 11:03:22 +05:30
rohitwaghchaure	6dd84cb977	Merge pull request #33013 from rtdany10/riv-validation fix: validate repost item valuation against accounts freeze date	2022-11-29 10:40:48 +05:30
Deepesh Garg	a7b7d0d99d	Merge pull request #33116 from shariquerik/show-batch-selector-only-once fix: only show serial no batch selector only once	2022-11-29 10:20:30 +05:30
Deepesh Garg	8253f4379f	Merge pull request #33098 from ssiyad/fix/pos/warehouse_selection fix(pos): warehouse selection	2022-11-29 10:15:31 +05:30
Deepesh Garg	56b96f0a9c	Merge branch 'develop' into fix/pos/partial_return_amount	2022-11-29 10:12:29 +05:30
Deepesh Garg	bdb15c3331	Merge pull request #33112 from ssiyad/fix/pos/customer_group_filter fix(pos): filter on customer groups	2022-11-29 09:55:56 +05:30
Deepesh Garg	8287fb5104	Merge pull request #33143 from deepeshgarg007/auto_repeat_dates fix: Auto repeat date validations	2022-11-29 09:28:19 +05:30
Deepesh Garg	8112493c3c	Merge pull request #33138 from deepeshgarg007/bank_reco_button_fix fix(ux): Action buttons in Bank Reconciliation	2022-11-29 09:23:21 +05:30
rohitwaghchaure	a222b0a6ae	Merge pull request #33144 from rohitwaghchaure/fixed-incorrect-stock-balance-qty fix: incorrect balance qty	2022-11-29 08:48:03 +05:30
barredterra	06e094b5fc	fix: reload currency exchange settings	2022-11-28 22:58:31 +01:00
Rohit Waghchaure	b606a9684b	test: test case for serialized batched item	2022-11-29 00:08:07 +05:30
Rohit Waghchaure	b2105a8be7	fix: incorrect balance qty	2022-11-28 23:13:30 +05:30
Deepesh Garg	6a47fb6c9e	chore: Update condition	2022-11-28 22:47:44 +05:30
Sagar Sharma	4750bfaeab	Merge branch 'develop' into repost-item-valuation	2022-11-28 22:06:49 +05:30
Deepesh Garg	a9cf9e5a88	Merge pull request #33107 from barredterra/german-tax-templates feat: german tax templates	2022-11-28 21:54:08 +05:30
Sagar Sharma	ec95a9b760	Merge branch 'develop' into repost-item-valuation	2022-11-28 21:33:58 +05:30
Sagar Sharma	8948e42a6d	Merge branch 'develop' into repost-item-valuation	2022-11-28 21:29:35 +05:30
s-aga-r	4e10352b48	chore: make `posting_date` and `posting_time` read-only if `based_on` is set to `Transaction`	2022-11-28 21:22:22 +05:30
s-aga-r	eeec008547	fix: reset `voucher_type` and `voucher_no` if `based_on` is set to `Item and Warehouse`	2022-11-28 21:22:20 +05:30
Sagar Sharma	6868b4d7c3	Merge branch 'develop' into fix/repost-item-valuation	2022-11-28 21:00:46 +05:30
s-aga-r	eeda264eb6	fix: reposting error `AttributeError: 'datetime.timedelta' object has no attribute 'replace'`	2022-11-28 20:59:14 +05:30
Deepesh Garg	fa15221455	fix: Auto repeat date validations	2022-11-28 19:22:35 +05:30
s-aga-r	ba77da0874	fix: validation msg in stock entry	2022-11-28 18:01:30 +05:30
Deepesh Garg	6ebe8ad60d	fix(ux): Action buttons in Bank Reconciliation	2022-11-28 17:37:41 +05:30
rohitwaghchaure	b8b9d1b0a8	Merge pull request #33135 from rohitwaghchaure/feat-provision-to-make-mr-for-sub-assembly-items feat: make Material Request for sub-assembly items	2022-11-28 16:53:38 +05:30
Rohit Waghchaure	e02f35c8ff	feat: make Material Request for sub-assembly items	2022-11-28 16:20:46 +05:30
ruthra kumar	9fd70a6827	Merge pull request #33115 from ruthra-kumar/duplicate_schema_block fix: remove product schema block from additional info section on item template	2022-11-28 15:28:50 +05:30
Deepesh Garg	f6126069ee	Merge pull request #33129 from deepeshgarg007/accounts_settings_fix chore: Supplier invoice no field description	2022-11-28 13:05:12 +05:30
Ankush Menat	63b9795d41	fix: opportunity list doesn't show assigned user (#33110 ) Because `db_update` is performed `_assign` property is not updated and hence lead -> opportunity conversion makes it disappear from list view. Steps to reproduce: 1. Create lead 2. Assign anyone 3. Create opportunity from lead. 4. Form view shows assigned user, list view wont.	2022-11-28 10:58:35 +05:30
Deepesh Garg	4f2ece34df	chore: Supplier invoice no field description	2022-11-27 21:50:26 +05:30
Deepesh Garg	dedd722aef	Merge pull request #33022 from barredterra/incoterms feat: Incoterms in buying and selling	2022-11-27 20:52:25 +05:30
rohitwaghchaure	397a0e2a3a	Merge pull request #33118 from rohitwaghchaure/production-plan-ux-issues fix: production plan UX	2022-11-27 08:46:39 +05:30
s-aga-r	ef7fd670fc	fix: `production_item` filter in `Job Card Summary Report`	2022-11-26 16:57:38 +05:30
s-aga-r	481149814e	fix: company name with `,` in `Job Card Summary Report`	2022-11-26 16:55:45 +05:30
s-aga-r	2e4f3e9317	fix: `Work Order` filter typo in `Job Card Summary Report`	2022-11-26 16:54:53 +05:30
s-aga-r	87b39f045c	fix: company name with `,` in `Work Order Summary Report`	2022-11-26 16:39:32 +05:30
Rohit Waghchaure	8cb7112e72	fix: production plan UX	2022-11-26 15:02:27 +05:30
Sagar Sharma	10a2121361	Merge branch 'develop' into show-batch-selector-only-once	2022-11-26 10:09:10 +05:30
Raffael Meyer	905a50cbb2	Merge branch 'develop' into incoterms	2022-11-25 16:50:55 +01:00
Shariq Ansari	0f87d329d6	fix: only show serial no batch selector only once	2022-11-25 17:03:00 +05:30
anandbaburajan	7d09440579	chore: more refactoring	2022-11-25 16:49:44 +05:30
ruthra kumar	2c18a95115	fix: remove duplicate schema	2022-11-25 16:23:45 +05:30
Sabu Siyad	cc63415887	fix(pos): filter on customer groups Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-11-25 15:10:01 +05:30
Abhinav Raut	fe87c27acd	fix: disbursable amount on currrent security price	2022-11-25 13:20:01 +05:30
barredterra	7fd2639e68	feat: german tax templates	2022-11-25 00:21:33 +01:00
Sagar Sharma	4e7613d4ce	Merge branch 'develop' into fix/github-issue/20496	2022-11-24 20:43:52 +05:30
s-aga-r	df0fee2312	fix: MR Item `description` and `item_name` gets reset on `qty` change	2022-11-24 20:42:57 +05:30
rohitwaghchaure	b0c8643517	Merge pull request #33103 from rohitwaghchaure/fixed-job-card-for-qty-ux fix: job card "Qty to Manufacture" UX	2022-11-24 19:24:05 +05:30
Deepesh Garg	541eb7e43b	Merge pull request #33100 from deepeshgarg007/dispatch_address_display fix: Dispatch address display	2022-11-24 18:00:26 +05:30
anandbaburajan	4e63ba3ac6	chore: refactor schedules in journal_entry	2022-11-24 17:39:11 +05:30
Rohit Waghchaure	87d37e90a2	fix: job card for quantity UX	2022-11-24 17:29:50 +05:30
Deepesh Garg	104fdcb9f9	fix: Dispatch address display	2022-11-24 16:41:40 +05:30
Sabu Siyad	80813c66e3	Merge branch 'develop' into fix/pos/warehouse_selection	2022-11-24 16:21:54 +05:30
anandbaburajan	de17367a36	chore: finish refactoring asset_value_adjustment	2022-11-24 16:16:36 +05:30
Sabu Siyad	4ad0e2ed7e	feat(pos): invoice: fitler warehouse by company Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-11-24 16:11:26 +05:30
Sabu Siyad	95a620a30d	fix(pos): warehouse should be in company Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-11-24 15:40:05 +05:30
anandbaburajan	0e726609f1	fix: precision in asset test_scrap_asset	2022-11-24 15:38:05 +05:30
anandbaburajan	f35b19eac3	chore: renaming functions and variables again, and continuing refactoring AssetValueAdjustment	2022-11-24 15:33:21 +05:30
Deepesh Garg	3724f2287c	Merge pull request #33092 from deepeshgarg007/debit_credit_issue fix: Debit and Credit not equal while submitting PI containing asset item	2022-11-24 14:42:56 +05:30
anandbaburajan	7db66b0916	chore: renaming some functions and variables, and partially refactoring AssetValueAdjustment	2022-11-24 13:02:48 +05:30
Deepesh Garg	dc8d635120	fix: Debit and Credit not equal while submitting PI containing asset item	2022-11-23 20:29:12 +05:30
Dany Robert	88a0aa4077	chore: pre-commit	2022-11-23 19:04:11 +05:30
Dany Robert	b482e3876d	fix: check for session user rather than owner	2022-11-23 18:59:15 +05:30
Deepesh Garg	60740baf3b	Merge pull request #33066 from deepeshgarg007/move_taxjar_integration_new refactor!: Move TaxJar integration from ERPNext	2022-11-23 18:21:55 +05:30
Deepesh Garg	7a7b8c2284	Merge pull request #32836 from resilient-tech/perf-fix-get-cached-value-for-accounts perf: use `get_cached_value` instead of `db.get_value` in accounts module	2022-11-23 18:20:48 +05:30
Saurabh	5e4a287624	Merge pull request #33065 from saurabh6790/task-view-fix fix: project website view	2022-11-23 18:17:55 +05:30
anandbaburajan	76f28de7eb	chore: refactor more functions to use new depr schedule	2022-11-23 18:04:54 +05:30
Sabu Siyad	a378619c9a	fix(pos): partial return amount update Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-11-23 17:52:12 +05:30
Deepesh Garg	0e3438db10	Merge branch 'develop' of https://github.com/frappe/erpnext into move_taxjar_integration_new	2022-11-23 17:47:22 +05:30
Deepesh Garg	f448a077b8	chore: Cleanup patches	2022-11-23 17:47:05 +05:30
Rohit Waghchaure	be19e4f621	fix: Valuation Rate column UX in stock ledger report	2022-11-23 16:44:18 +05:30
Deepesh Garg	a3c81da890	Merge pull request #33062 from nabinhait/pcv-rounding-issue fix: create rounding gl entry for PCV during gle post processing	2022-11-23 10:36:04 +05:30
rohitwaghchaure	68424887e4	Merge pull request #33077 from rohitwaghchaure/ux-for-inventory-dimension fix: UX for inventory dimension	2022-11-23 09:53:49 +05:30
Deepesh Garg	06c9c679e6	Merge pull request #33063 from niralisatapara/tds_purchase_order feat: item wise tds in purchase order	2022-11-23 09:52:00 +05:30
Deepesh Garg	34e775136d	Merge pull request #33069 from deepeshgarg007/jv_filter fix: Remove unnecessary filters from Journal Entry	2022-11-22 20:15:12 +05:30
Deepesh Garg	eb74362263	Merge pull request #33068 from deepeshgarg007/payment_button_visibility fix: Don't show payment button for invoices on hold	2022-11-22 20:14:41 +05:30
Deepesh Garg	0fffe61e3c	Merge pull request #33072 from deepeshgarg007/move_section chore: Rearrange supplier invoice section in Purchase Invoice	2022-11-22 20:14:14 +05:30
niralisatapara	0fdde2e5c0	feat: item wise tds calculation for purchase order	2022-11-22 14:36:30 +05:30
niralisatapara	46e8cdf31a	feat: item wise tds calculation for purchase order.	2022-11-22 14:15:36 +05:30
ruthra kumar	31f463dd83	Merge pull request #33071 from ruthra-kumar/advance_paid_in_account_currency fix: advance paid updated in account currency for SO/PO	2022-11-22 13:45:04 +05:30
Deepesh Garg	e96be712b8	chore: Rearrange supplier invoice section in Purchase Invoice	2022-11-22 12:50:00 +05:30
ruthra kumar	541cf153f7	test: fix test case for SO/PO advance amount	2022-11-22 12:33:29 +05:30
ruthra kumar	bf76b85dfd	fix: update advace paid in SO/PO in account currency	2022-11-22 12:33:18 +05:30
Deepesh Garg	cd88a53533	fix: Remove unnecessary filters from Journal Entry	2022-11-21 22:21:03 +05:30
Deepesh Garg	1b9e83251f	fix: Don't show payment button for invoices on hold	2022-11-21 21:50:55 +05:30
Deepesh Garg	81c856ccb8	chore: Remove unwanted patch	2022-11-21 21:00:31 +05:30
Deepesh Garg	1100816d7a	refactor!: Move TaxJar integration from ERPNext	2022-11-21 20:18:06 +05:30
Saurabh	5d9960ae5b	feat: handle empty state	2022-11-21 19:37:57 +05:30
Saurabh	80e45828ae	fix: ux for project view on web	2022-11-21 18:16:57 +05:30
Saurabh	7cc99ab63b	fix: update tasks route under website route rules	2022-11-21 18:13:54 +05:30
niralisatapara	b9d0b4e2d3	feat: item wise tds in purchase order	2022-11-21 15:43:03 +05:30
Nabin Hait	022d8d5d79	fix: create rounding gl entry for PCV during gle post processing	2022-11-21 15:16:53 +05:30
Deepesh Garg	e25d0ead1a	Merge pull request #33051 from deepeshgarg007/timesheet_timer_button fix: Timesheet timer button	2022-11-21 11:15:02 +05:30
Deepesh Garg	15e74c5d7b	fix: Viewing account ledger from party master	2022-11-20 20:30:24 +05:30
Deepesh Garg	64802d1220	fix: Timesheet timer button	2022-11-20 19:45:51 +05:30
Deepesh Garg	89631fa744	Merge pull request #32958 from pps190/fix-item-price-brand fix: link `Item Price` brand to `Brand` doctype.	2022-11-19 19:14:39 +05:30
Deepesh Garg	26dcde2931	Merge pull request #32999 from ruthra-kumar/exchange_rate_reval_company_currency fix: incorrect currency in Exchange rate revaluation	2022-11-19 18:30:03 +05:30
Deepesh Garg	f96c66bbc0	Merge pull request #33032 from deepeshgarg007/dimension_report_filtering fix: Accounting Dimension filtering for Sales and Purchase Report	2022-11-19 18:19:37 +05:30
gavin	dd2493a541	fix(realtime): Restrict updates to only last modified or current user (#33034 )	2022-11-18 17:17:54 +05:30
ruthra kumar	5caaccc94b	fix: always send account currency in response	2022-11-18 17:10:39 +05:30
ruthra kumar	68b04e2577	fix: incorrect currency in Exchange rate revaluation	2022-11-18 17:10:39 +05:30
Raffael Meyer	491857b3c8	fix: remove obsolete comment	2022-11-18 10:57:52 +01:00
Deepesh Garg	df096688f7	Merge pull request #33014 from deepeshgarg007/multi_invoice_payment fix: Bulk payment generation against invoices	2022-11-18 15:10:35 +05:30
Deepesh Garg	8b394afaa9	fix: Accounting Dimension filtering for Sales and Purchase Report	2022-11-18 15:07:12 +05:30
Sagar Sharma	985ce0dc42	Merge pull request #32986 from s-aga-r/fix/scr-return-rejected-qty fix: hide rejected-fields in return SCR	2022-11-18 15:00:22 +05:30
Daizy Modi	62c0210463	Merge branch 'develop' into perf-fix-get-cached-value-for-accounts	2022-11-18 12:07:52 +05:30
Sagar Sharma	29132609ff	Merge branch 'develop' into fix/scr-return-rejected-qty	2022-11-18 12:06:59 +05:30
s-aga-r	12d7b7e9c2	chore: linters	2022-11-18 11:42:44 +05:30
Sagar Sharma	cbfd8da848	Merge branch 'develop' into internal_transfer	2022-11-18 10:38:37 +05:30
barredterra	a5966b6f84	feat: add connections to Incoterm doctype	2022-11-17 22:37:04 +01:00
barredterra	ffd287d5a6	feat: add german translations for incoterm titles	2022-11-17 22:18:53 +01:00
barredterra	77105306f2	feat: add incoterm to purchasing transactions	2022-11-17 22:18:26 +01:00
barredterra	029f22c549	feat: add incoterm to sales transactions	2022-11-17 22:17:59 +01:00
barredterra	ce83f02f24	feat: create Incoterm records after install	2022-11-17 22:17:19 +01:00
barredterra	d2563ee973	feat: create incoterms and migrate shipments	2022-11-17 22:16:43 +01:00
barredterra	1a1bfc8db9	feat: add doctype Incoterm	2022-11-17 22:14:30 +01:00
Sagar Vora	48413b0778	fix: reduce function call	2022-11-18 02:22:43 +05:30
Sagar Vora	66ac65482d	fix: add missing comma	2022-11-18 02:16:56 +05:30
Sagar Vora	8ae58ed427	fix: use `doc_before_save` and other changes	2022-11-18 02:13:16 +05:30
Anand Baburajan	a66d9f8e8e	Merge branch 'develop' into asset_depreciation_schedule	2022-11-17 20:17:21 +05:30
Daizy Modi	fdfe5cbf93	fix: use `get_cached_value` to avoid db call with `db.exists`	2022-11-17 19:14:10 +05:30
Daizy Modi	678a4c33da	fix: resolved merge conflicts	2022-11-17 19:13:10 +05:30
Sabu Siyad	0b5584a54a	Merge branch 'develop' into fix/mutate_iter_list	2022-11-17 17:58:49 +05:30
Sabu Siyad	546c809cbe	fix: use `list()` on self mutating iteration https://github.com/frappe/erpnext/issues/30325 Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-11-17 17:46:49 +05:30
Deepesh Garg	cbe8fa7fd2	Merge pull request #33009 from ssiyad/fix/pos/item_img_border fix(pos): item selector image border radius	2022-11-17 17:31:29 +05:30
Sagar Sharma	29a8d9a9b4	Merge branch 'develop' into internal_transfer	2022-11-17 16:42:18 +05:30
Deepesh Garg	2dfe849c7d	fix: Bulk payment generation against invoices	2022-11-17 15:53:56 +05:30
Dany Robert	be15419bd5	chore: pre-commit	2022-11-17 11:00:34 +01:00
Dany Robert	61f05132db	feat: validate repost item valuation against accounts freeze date	2022-11-17 11:00:01 +01:00
Ankush Menat	fd3c7903ba	chore: typo	2022-11-17 14:18:05 +05:30
Sagar Sharma	da4c20f7be	Merge branch 'develop' into fix/scr-return-rejected-qty	2022-11-17 14:15:16 +05:30
Sagar Sharma	1349d24514	Merge branch 'develop' into purchase-order/internal-supplier	2022-11-17 14:08:07 +05:30
Sabu Siyad	2f4940cc26	fix(pos): item selector image border radius Signed-off-by: Sabu Siyad <hello@ssiyad.com>	2022-11-17 13:21:47 +05:30
Ankush Menat	34e4903ed7	refactor: search queries (#33004 ) - guard clauses for readability - use values or format	2022-11-17 13:04:42 +05:30
Sagar Sharma	f71f27462d	Merge branch 'develop' into fix/scr-return-rejected-qty	2022-11-17 13:04:15 +05:30
Sagar Sharma	e13b9e839d	Merge branch 'develop' into purchase-order/internal-supplier	2022-11-17 13:04:07 +05:30
s-aga-r	5efbc2cbf8	fix: make `is_internal_supplier` read-only	2022-11-17 12:36:44 +05:30
anandbaburajan	218da1217a	fix: add missing commas and brackets	2022-11-17 12:23:38 +05:30
Anand Baburajan	538da9a58e	Merge branch 'develop' into fix_precision_in_asset_tests	2022-11-17 12:17:27 +05:30
anandbaburajan	b5e5d3b3af	fix: precision in asset tests	2022-11-17 12:13:06 +05:30
Ritwik Puri	b03b568e6c	chore(patch): remove reload_doc from post model sync update_exchange_rate_settings patch (#32994 ) [skip ci]	2022-11-17 11:59:42 +05:30
Ankush Menat	1bd886387b	chore: hardcode doctype	2022-11-17 11:58:35 +05:30
Sagar Sharma	5083c22490	Merge branch 'develop' into fix/scr-return-rejected-qty	2022-11-17 10:15:23 +05:30
rohitwaghchaure	31afae3e75	Merge branch 'develop' into workstation-type-feat-for-bom	2022-11-16 23:26:08 +05:30
Rohit Waghchaure	ffa30127e7	fix: linters failing	2022-11-16 23:23:06 +05:30
Rohit Waghchaure	7bd06e6fbc	test: test case to check workstation type	2022-11-16 23:19:04 +05:30
Deepesh Garg	9154d08b89	Merge pull request #32882 from ernestoruiz89/patch-9 fix: add translation function to doctype name on message	2022-11-16 20:41:34 +05:30
Deepesh Garg	3a523b56bf	Merge pull request #32983 from deepeshgarg007/journal_entry_template_fix fix: Opening journal entry templates	2022-11-16 20:41:07 +05:30
Sagar Sharma	399ee80d80	Merge branch 'develop' into fix/scr-return-rejected-qty	2022-11-16 15:02:55 +05:30
s-aga-r	7dd7617ec7	fix: hide reject-fields in return SCR	2022-11-16 14:28:54 +05:30
s-aga-r	8a73e963ce	fix: don't set `rejected-qty` in return SCR	2022-11-16 14:28:32 +05:30
Vishal	e5dfd53e6f	chore: minor fix	2022-11-16 14:25:35 +05:30
Vishal	ba6189d054	fix: minor change	2022-11-16 13:58:29 +05:30
Vishal	343b414b40	fix: test case updated for mr	2022-11-16 13:53:21 +05:30
Vishal	89aabdaaaa	fix: test case added for MR internal Transfer	2022-11-16 13:53:21 +05:30
Vishal	d86afddb60	fix: minor issue fixed	2022-11-16 13:53:21 +05:30
Vishal	71412f6877	fix: Internal Transfer Material Request cycle and tracking fixed till purchase receipt	2022-11-16 13:53:21 +05:30
Nabin Hait	b89b07d0ff	fix: Validate for deferred revenue only if sales invoice needs repost	2022-11-16 12:16:23 +05:30
Deepesh Garg	33b61aef5a	fix: Opening journal entry templates	2022-11-16 11:57:17 +05:30
Devin Slauenwhite	3a35651441	fix: naming	2022-11-15 08:26:16 -05:00
Ankush Menat	c013db6ea1	fix: cast POS query inputs to integers (#32975 ) fix: cast POS query inputs to integers	2022-11-15 18:10:45 +05:30
Deepesh Garg	b3bc1c66a3	Merge pull request #32968 from frappe/mergify/bp/develop/pr-32953 chore(payment_entry): Remove dead validations (backport #32953)	2022-11-15 16:32:40 +05:30
Rohit Waghchaure	0a69523940	fix: UX for inventory dimension	2022-11-15 15:57:30 +05:30
s-aga-r	369db4eacc	test: fix test cases for supplied-items `consumed_qty`	2022-11-15 14:39:43 +05:30
s-aga-r	01f56c621c	Revert "fix: get `consumed_qty` based on `received_qty` in SCR" This reverts commit `70c9b8dc50`.	2022-11-15 14:32:16 +05:30
s-aga-r	3706a9b4dc	Revert "fix: set `received_qty` before_validate SCR" This reverts commit `c447dfaa9c`.	2022-11-15 14:30:13 +05:30
Gavin D'souza	35088bb4c4	chore(payment_entry): Remove dead validations (cherry picked from commit e1ecc9a81973d20084f5a053d8d0155354079b2e)	2022-11-15 08:34:08 +00:00
Deepesh Garg	a0d9e1bd57	Merge pull request #32962 from deepeshgarg007/return_write_off fix: Write Off section visibility for non POS Invoices	2022-11-15 13:01:06 +05:30
rohitwaghchaure	91fad1935e	Merge pull request #32947 from rohitwaghchaure/incorrect-fix-of-conversion-factor-in-pp fix: incorrect fix of conversion factor in PP	2022-11-15 10:30:23 +05:30
Deepesh Garg	9f5d613c78	fix: Write Off section visibility for non POS Invoices	2022-11-15 09:45:39 +05:30
Deepesh Garg	a1a992b0dd	Merge pull request #32956 from deepeshgarg007/acc_dimension_filter_label fix: Label for applicable dimension table	2022-11-15 09:24:30 +05:30
Devin Slauenwhite	cee069d426	fix: link to brand doctype.	2022-11-14 17:38:46 -05:00
Deepesh Garg	8c13f70fc5	fix: Label for applicable dimension table	2022-11-14 20:39:40 +05:30
Ernesto Ruiz	01cc58db83	Merge branch 'develop' into patch-9	2022-11-14 07:44:01 -06:00
anandbaburajan	417180e6ba	chore: refactor some functions to use new depr schedule	2022-11-14 17:51:11 +05:30
anandbaburajan	ffd41703de	chore: add expected_value_after_useful_life in depr schedule	2022-11-14 14:36:10 +05:30
Rohit Waghchaure	105c272816	feat: Workstation Type for BOM	2022-11-14 13:03:03 +05:30
anandbaburajan	ca3581d055	chore: rename modify_draft_asset_depreciation_schedules	2022-11-14 12:47:48 +05:30
anandbaburajan	ed495dc846	chore: add convert_draft_asset_depreciation_schedules_into_active and fix some bugs	2022-11-14 12:45:49 +05:30
Rohit Waghchaure	490b0e3cdf	fix: incorrect fix of conversion factor in PP	2022-11-14 10:10:49 +05:30
Sagar Sharma	a191ce6200	Merge branch 'develop' into refactor/qb/job-card	2022-11-13 22:31:35 +05:30
Deepesh Garg	7ba8350089	Merge branch 'develop' into patch-9	2022-11-13 20:42:48 +05:30
Sagar Vora	b06345af46	fix: check type for reference name	2022-11-13 19:58:49 +05:30
Deepesh Garg	a2260a3dc2	Merge branch 'develop' into bg_query	2022-11-13 19:47:43 +05:30
Deepesh Garg	6b93b3f12a	Merge pull request #32866 from ruthra-kumar/gross_profit_fix_buying_amount fix: incorrect buying amount on Gross Profit	2022-11-13 19:15:03 +05:30
Deepesh Garg	4b9921782b	chore: Remove qb doc reference	2022-11-13 18:48:32 +05:30
s-aga-r	7df2921d38	refactor: rewrite `job_card.py` queries in QB	2022-11-12 22:03:56 +05:30
Deepesh Garg	42a59d5c17	chore: Remove raw SQL query	2022-11-12 17:32:04 +05:30
Sagar Sharma	4e9a63423f	Merge pull request #32913 from resilient-tech/fix-item-price-fetch fix: set stock UOM in args to ensure item price is fetched	2022-11-12 10:08:44 +05:30
anandbaburajan	97ab7bd36b	chore: remove some unwanted functions in asset	2022-11-11 16:27:29 +05:30
anandbaburajan	710d2452b7	feat: moving, refactoring and adding functions to asset_depreciation_schedule	2022-11-11 16:20:17 +05:30
Deepesh Garg	d03979eef9	Merge pull request #32878 from abhinavxd/fix-repayment-schedule fix: repayment schedule regeneration	2022-11-11 14:22:40 +05:30
ruthra kumar	2c8b0b17a7	test: buying amount of invoices 1. Invoice with unset `update_stock`, with and without Delivery Notes	2022-11-11 08:33:54 +05:30
ruthra kumar	e4d16c31da	fix: GP incorrect buying amount if no upd on SI and Delivery Note	2022-11-11 08:33:48 +05:30
rohitwaghchaure	8ae9c1d192	Merge pull request #32895 from rohitwaghchaure/fixed-performance-issue-for-purchase-receipt fix: Purchase Receipt timeout error	2022-11-10 22:41:54 +05:30
Deepesh Garg	902e1ab74b	Merge branch 'develop' into patch-9	2022-11-10 20:08:27 +05:30
Deepesh Garg	f4920d6475	Merge pull request #32880 from ernestoruiz89/patch-7 fix: add translate function to valitate company msg in chart of accounts importer	2022-11-10 20:07:52 +05:30
Deepesh Garg	9d5c8d9d6b	Merge branch 'develop' into fix-repayment-schedule	2022-11-10 19:52:59 +05:30
Deepesh Garg	06a42caa5b	Merge pull request #32923 from deepeshgarg007/rate_quotation fix: Maintain same rate between Quotation and Sales Order	2022-11-10 19:52:27 +05:30
Deepesh Garg	e559fea8ff	Merge pull request #32921 from deepeshgarg007/netvalues_psoa feat: Add net value filter on PSOA	2022-11-10 19:51:56 +05:30
Deepesh Garg	8f65677cb4	Merge pull request #32912 from nabinhait/customer-supplier-tab-break fix(ux): Tab break in Customer and Supplier form	2022-11-10 18:30:14 +05:30
Deepesh Garg	362ec7b673	fix: Maintain same rate between Quotation and Sales Order	2022-11-10 18:28:08 +05:30
Deepesh Garg	51521fc19f	feat: Add net value filter on PSOA	2022-11-10 17:48:25 +05:30
Sagar Sharma	e7fa2e08ad	fix: set `WIP Warehouse` in Job Card	2022-11-10 16:40:53 +05:30
Sagar Sharma	9730cd0aec	fix: don't set WIP Warehouse if is checked in WO	2022-11-10 16:18:10 +05:30
Deepesh Garg	1283c5b7a5	Merge branch 'develop' into fix-repayment-schedule	2022-11-10 09:39:39 +05:30
Ernesto Ruiz	a007f1da9d	Merge branch 'develop' into patch-7	2022-11-09 15:53:36 -06:00
Ernesto Ruiz	499dfee2d4	Merge branch 'develop' into patch-9	2022-11-09 15:52:35 -06:00
Ankush Menat	7e1742956c	refactor: Remove usage of deprecated methods (#32914 ) Warn: Just used regex to replace all usage. ```regex s/frappe.db.set(\(.\),\(.\),\(.*\))/\1.db_set(\2, \3)/g ``` Required after: https://github.com/frappe/frappe/pull/18815	2022-11-09 20:09:06 +05:30
Sagar Vora	57038c3969	fix: set stock UOM in args to ensure item price is fetched	2022-11-09 18:56:09 +05:30
Nabin Hait	fb7ee301b5	fix(ux): Tab break in Customer and Supplier form	2022-11-09 18:03:23 +05:30
Deepesh Garg	ff51f3b95e	Merge branch 'develop' into patch-7	2022-11-09 14:34:39 +05:30
Deepesh Garg	5f1b226362	Merge pull request #32742 from ruthra-kumar/ple_repost feat: Tool to repost PLE manually	2022-11-09 14:26:37 +05:30
Deepesh Garg	077f3c515f	Merge branch 'develop' into patch-9	2022-11-09 09:19:28 +05:30
Rohit Waghchaure	7278387879	fix: test cases	2022-11-09 01:28:40 +05:30
Sagar Sharma	030ef6da25	Merge branch 'develop' into fix/scr/return-scr-ref	2022-11-08 21:36:00 +05:30
Rohit Waghchaure	4082149f0e	fix: Purchase Receipt timeout error	2022-11-08 20:59:20 +05:30
Deepesh Garg	c8619284bc	Merge pull request #32883 from deepeshgarg007/timesheet_project_filter fix: Project filter in timesheet	2022-11-08 14:54:49 +05:30
Sagar Sharma	47248251e2	chore: link SCR Return in SCR Dashboard	2022-11-08 12:29:41 +05:30
Sagar Sharma	84ab100d86	chore: remove `debugger` from `stock_entry_list.js`	2022-11-08 12:05:15 +05:30
Deepesh Garg	55d6773be6	Merge branch 'develop' of https://github.com/frappe/erpnext into timesheet_project_filter	2022-11-08 11:02:01 +05:30
Deepesh Garg	7b5cf6978e	chore: Linting Issues	2022-11-08 11:00:48 +05:30
ruthra kumar	0448c0fa36	feat: Repost Payment Ledger entries for vouchers primarily intended to manually correct PLE entries for vouchers affected by Item Value repost-https://github.com/frappe/erpnext/pull/32567	2022-11-08 07:47:47 +05:30
Deepesh Garg	2b65b22aa2	fix: Project filter in timesheet	2022-11-07 22:48:52 +05:30
Sagar Sharma	1d52084b05	Merge branch 'develop' into fix/ux/scr/supplied-items/consumed-qty	2022-11-07 21:58:11 +05:30
Sagar Sharma	5e8a22be24	fix: linter	2022-11-07 21:54:12 +05:30
Ernesto Ruiz	1f13bc906b	fix: add translation functuinon to doctype name on message in bulk_transaction_processing	2022-11-07 09:43:28 -06:00
Ernesto Ruiz	637c08d189	fix: add translate function to valitate company msg in chart of accounts importer	2022-11-07 09:22:38 -06:00
Deepesh Garg	404662e794	Merge pull request #32625 from deepeshgarg007/editable_inovice feat: Editable Sales Invoice	2022-11-07 18:29:21 +05:30
Abhinav Raut	d6ab2b3b87	fix: repayment schedule regeneration	2022-11-07 17:43:08 +05:30
Sagar Sharma	734db5b722	Merge branch 'develop' into fix/ux/scr/supplied-items/consumed-qty	2022-11-07 17:36:42 +05:30
Sagar Sharma	bf4b012cec	fix: make `consumed_qty` editable when backflush based on Material Transfer	2022-11-07 17:23:33 +05:30
Sagar Sharma	f8d2e276a5	fix: make `consumed_qty` read-only in SCR Supplied Items	2022-11-07 17:19:03 +05:30
Deepesh Garg	e29f756146	chore: Validate for deferred revenue invoices	2022-11-07 16:42:45 +05:30
Deepesh Garg	5fe55176ec	chore: Enable no-copy for repost required field	2022-11-07 16:42:12 +05:30
Ankush Menat	30daeb90a8	fix: incorrect single valeu fetch refer https://github.com/frappe/frappe/pull/18787 [skip ci]	2022-11-07 15:38:38 +05:30
Nihantra C. Patel	8355c1092c	fix: Increase columns width in Warehouse wise Item Balance Age and Value	2022-11-07 11:45:47 +05:30
rohitwaghchaure	5e7a69e649	Merge pull request #32802 from s-aga-r/fix/github-issue/29006 fix: `Material Consumption` option in case of `Skip Transfer to WIP` in WO	2022-11-07 09:35:39 +05:30
Daizy Modi	4efc947f14	perf: use `get_cached_value` instead of `db.get_value` in controllers (#32776 )	2022-11-07 09:21:03 +05:30
Sagar Sharma	4d8da4420e	test: add test case for consumed-qty	2022-11-06 14:55:33 +05:30
Sagar Sharma	70c9b8dc50	fix: get `consumed_qty` based on `received_qty` in SCR	2022-11-06 13:33:47 +05:30
Sagar Sharma	c447dfaa9c	fix: set `received_qty` before_validate SCR	2022-11-06 13:32:15 +05:30
ruthra kumar	9209ec59c2	refactor: split delete gl utility function into two	2022-11-06 11:39:44 +05:30
Raffael Meyer	d2b6490bca	chore: add german translations (#32846 ) Mostly for balance sheet	2022-11-06 10:22:33 +05:30
Deepesh Garg	8d30ebb12b	fix: Disable tax included prices for internal transfers (#32794 ) * fix: Disable tax-included prices for internal transfers	2022-11-05 20:51:15 +05:30
Sagar Sharma	0394080898	Merge branch 'develop' into fix/github-issue/29006	2022-11-05 20:11:55 +05:30
Ankush Menat	75983ce809	fix: remove global _("translation") calls (#32828 ) This is not how it works. Translations are dynamic based on language sets during request (using header, user's preferences etc) Calling them on global variables makes no sense. Ref: https://github.com/frappe/frappe/pull/18733	2022-11-05 18:49:15 +05:30
Sagar Sharma	cc8d540943	Merge branch 'develop' into fix/scr/return	2022-11-05 16:48:59 +05:30
Deepesh Garg	90fbab4b1e	Merge pull request #32847 from maharshivpatel/fix-pos-opening-entry-profile-filter fix: Create POS Opening Entry POS Profile filter.	2022-11-05 16:44:39 +05:30
Sagar Sharma	5665d1afa0	Merge branch 'develop' into fix/scr/return	2022-11-05 16:36:07 +05:30
Deepesh Garg	be0f6b3e6e	Merge branch 'develop' of https://github.com/frappe/erpnext into editable_inovice	2022-11-05 16:35:55 +05:30
Deepesh Garg	0966867c08	chore: Reset repost_required_flag on cancel	2022-11-05 16:35:43 +05:30
Deepesh Garg	4ff06a9d79	Merge pull request #32844 from deepeshgarg007/auto_allocate_advances fix: Auto advance allocation against partial invoices	2022-11-05 16:27:59 +05:30
Sagar Sharma	324bfa9fde	test: fix test case	2022-11-05 16:18:31 +05:30
Sagar Sharma	760c26e9c0	fix: make `BOM` required in SCR Item	2022-11-05 15:52:14 +05:30
Sagar Sharma	761e9df1bf	test: add test case	2022-11-05 15:52:14 +05:30
Sagar Sharma	611d827e0b	fix: rename test method	2022-11-05 15:51:29 +05:30
Sagar Sharma	54072ec9cd	fix: map `BOM` while mapping the return SCR	2022-11-05 15:51:29 +05:30
Sagar Sharma	3ca9d53d1b	refactor: rewrite query in `QB` (cherry picked from commit 2f145f99129503359b9a79c247fe69e30ac1bf8e)	2022-11-05 06:12:40 +00:00
Bhavesh Maheshwari	f4779df9b3	fix: mysql syntax issue (cherry picked from commit 4d9bbd4c9c06811086e0ae4e2c16763fe7d171a3)	2022-11-05 06:12:40 +00:00
Deepesh Garg	428971f127	test: Check parital payment allocation	2022-11-04 15:50:39 +05:30
Deepesh Garg	181df2fe63	fix: Auto advance allocation against partial invoices	2022-11-04 15:49:37 +05:30
Maharshi Patel	1328a45f2a	fix: Create POS Opening Entry POS Profile filter. pos_profile_query was variable instead of function.	2022-11-04 15:29:17 +05:30
Deepesh Garg	cbf82872fb	Merge pull request #32646 from niralisatapara/tds_purchase_invoice feat: Item Wise TDS Calculation	2022-11-04 13:08:10 +05:30
Deepesh Garg	159b511d16	Merge pull request #32809 from monolithon/develop feat: Optional Hungarian COA for microenterprises	2022-11-04 13:00:13 +05:30
rohitwaghchaure	441f082fcb	Merge pull request #32799 from rohitwaghchaure/fix-scan-qrcode-functionality fix: Scan Barcode UX	2022-11-04 11:04:40 +05:30
Deepesh Garg	f6a61b999f	chore: fix patch	2022-11-04 08:11:38 +05:30
Ernesto Ruiz	ad0dd693ac	chore: add translation function to Bank Reconciliation Tool related files chore: add translation function to Bank Reconciliation Tool related files	2022-11-04 01:06:01 +05:30
Deepesh Garg	153675e52a	chore: Update patch	2022-11-04 01:03:45 +05:30
Deepesh Garg	e2ad785422	chore: Hide tax withholding net total field	2022-11-04 01:03:20 +05:30
rohitwaghchaure	0caa35a251	Merge branch 'develop' into fix/github-issue/29006	2022-11-03 16:12:53 +05:30
Rohit Waghchaure	e5b19e3f70	fix: auto increment qty if item table has no items	2022-11-03 14:57:36 +05:30
Daizy Modi	010bd9c558	fix: remove cache param	2022-11-03 14:36:48 +05:30
Daizy Modi	27df455b98	perf: use `get_cached_value` instead of `db.get_value` in accounts module	2022-11-03 13:38:48 +05:30
Rohit Waghchaure	b0fc568c80	fix: not able to select customer / supplier	2022-11-03 11:24:58 +05:30
niralisatapara	12456f9850	feat: item wise tds calculation	2022-11-03 10:46:30 +05:30
Deepesh Garg	f5478c871c	Merge pull request #32773 from AnandBaburajan/asset_bill_date_new fix: for asset's purchase_date, if bill_date is set, use that instead of posting_date	2022-11-03 09:51:44 +05:30
Deepesh Garg	8581b7820d	Merge pull request #32713 from ernestoruiz89/patch-9 fix: add missing translation function on report related documents	2022-11-03 09:46:43 +05:30
Anand Baburajan	c95f05a3dc	Merge branch 'develop' into asset_bill_date_new	2022-11-02 21:30:40 +05:30
Sagar Sharma	cd5836243d	Merge branch 'develop' into fix/github-issue/29006	2022-11-02 19:07:47 +05:30
ruthra kumar	c3dc1c272b	Merge pull request #32816 from ruthra-kumar/advance_paid_in_so_and_po fix: update advance paid in SO/PO from Payment Ledger	2022-11-02 16:27:56 +05:30
ruthra kumar	721ac6b847	test: SO advance paid on Payment submission and cancellation	2022-11-02 15:54:23 +05:30
ruthra kumar	1a0a8ac7e2	test: PO advance paid on payment submission and cancellation	2022-11-02 15:53:52 +05:30
ruthra kumar	81d791eea0	test: refactor use @change_settings decorator when possible	2022-11-02 15:40:56 +05:30
Rohit Waghchaure	e1f9ba78e5	fix: Scan Barcode UX	2022-11-02 15:37:46 +05:30
niralisatapara	ea387937d0	feat: item wise tds calculation	2022-11-02 12:30:58 +05:30
niralisatapara	2ca0cf6fc4	feat: item wise tds calculation	2022-11-02 12:19:51 +05:30
Sagar Sharma	be4593c1d9	Merge branch 'develop' into fix/github-issue/30339	2022-11-02 11:50:51 +05:30
Sagar Sharma	aa6e8c9ec0	Merge branch 'develop' into fix/github-issue/29006	2022-11-02 11:50:44 +05:30
niralisatapara	4aff2a32ad	Merge branch 'develop' of https://github.com/niralisatapara/erpnext into develop	2022-11-02 11:21:02 +05:30
Muvuk	579afed460	feat: Optional Hungarian COA for microenterprises #32688	2022-11-01 19:36:42 +01:00
rohitwaghchaure	a6a280669c	Merge pull request #32800 from rohitwaghchaure/test-cases-failing fix: test cases	2022-11-01 22:51:31 +05:30
Rohit Waghchaure	3f2728e3f7	test: run tmate	2022-11-01 22:20:13 +05:30
Deepesh Garg	e0a705afe7	Merge pull request #32779 from deepeshgarg007/sales_invoice_default_mop fix: Mode of payment for returns in POS Sales Invoice	2022-11-01 21:28:54 +05:30
Deepesh Garg	62ae329be3	Merge pull request #32801 from deepeshgarg007/purchase_invoice_cancel_amend fix: Issues while cancel/amending Purchase Invoice with TDS enabled	2022-11-01 20:47:55 +05:30
Sagar Sharma	31f95da947	Merge branch 'develop' into fix/github-issue/30339	2022-11-01 20:30:55 +05:30
Deepesh Garg	a4f7079270	Merge branch 'develop' of https://github.com/frappe/erpnext into sales_invoice_default_mop	2022-11-01 20:17:43 +05:30
Deepesh Garg	5b74161195	chore: Update tests	2022-11-01 20:17:34 +05:30
Deepesh Garg	f7c9258770	fix: Issues while cancel/amending Purchase Invoice with TDS enabled	2022-11-01 19:54:41 +05:30
Sagar Sharma	8ea6983734	fix: `Material Consumption` option in case of `Skip Transfer to WIP` in WO	2022-11-01 19:43:06 +05:30
Rohit Waghchaure	ddd1b4be3f	fix: test cases	2022-11-01 19:30:37 +05:30
Anand Baburajan	05d2c7f9ae	Merge branch 'develop' into asset_bill_date_new	2022-11-01 17:45:23 +05:30
Dany Robert	1d83fb20d6	feat(pricing rule): free qty rounding and recursion qty (#32577 ) Option to specify recursion start qty and repeating qty Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2022-11-01 16:39:32 +05:30
Maharshi Patel	6b0178e9fb	Merge branch 'develop' into fix-pricing-rule-item-group-uom	2022-11-01 15:21:41 +05:30
Maharshi Patel	cc6dfd91cf	Merge branch 'develop' into fix-pricing-rule-item-group-uom	2022-11-01 15:06:22 +05:30
Maharshi Patel	935f31eff9	fix: test cases added for item group	2022-11-01 12:55:46 +05:30
anandbaburajan	65e855bfff	fix: pro_rata_amount calculation in assets tests	2022-11-01 12:45:28 +05:30
anandbaburajan	5a274176d3	feat: add asset_depreciation_schedule	2022-11-01 11:45:17 +05:30
Sagar Sharma	9fb3fb4c83	fix: use `flt` instead of `cint` in `get_batch_no`	2022-11-01 10:45:13 +05:30
ruthra kumar	4487065b67	fix: update advance paid in SO/PO from Payment Ledger	2022-11-01 10:29:31 +05:30
rohitwaghchaure	1033d34964	Merge pull request #32730 from rohitwaghchaure/duplicate-custom-fields-inventory-dimension fix: duplicate custom fields for inventory dimension	2022-10-31 22:25:29 +05:30
Deepesh Garg	5b150abdcb	Merge pull request #32768 from deepeshgarg007/cc_main_allocation fix: Budget validation for main cost center	2022-10-31 22:18:50 +05:30
Deepesh Garg	b98d25dafb	Merge pull request #32777 from deepeshgarg007/sales_order_advance_paid_amount fix: Reset advance paid amount on Order cancel and amend	2022-10-31 21:38:43 +05:30
Deepesh Garg	06e8e28531	fix: Mode of payment for returns in POS Sales Invoice	2022-10-31 19:58:46 +05:30
Deepesh Garg	92f37ca111	fix: Reset advance paid amount on Oreder cancel and amend	2022-10-31 19:01:54 +05:30
Rohit Waghchaure	45ededbed5	fix: duplicate custom fields for inventory dimension	2022-10-31 15:33:23 +05:30
anandbaburajan	f322c608cf	fix: for asset's purchase_date, if bill_date is set, use that instead of posting_date	2022-10-31 12:41:37 +05:30
gn306029	a612a666f3	chore: Update zh-TW translations (#31775 )	2022-10-31 12:32:57 +08:00

... 15 16 17 18 19 ...

35155 Commits