35155 Commits

Author	SHA1	Message	Date
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
Deepesh Garg	4e26d42d17	fix: Budget validation for main cost center	2022-10-30 19:33:27 +05:30
Hossein Yousefian	54c2ffc36b	fix: Pass project to stock entry items ... fix: Pass project to stock entry items	2022-10-29 22:24:59 +05:30
Sagar Sharma	15ebf4a0cf	fix: add Sales Order reference in Material Request Dashboard	2022-10-29 12:01:37 +05:30
Deepesh Garg	cca36cab70	Merge pull request #32744 from ruthra-kumar/so_terms_report_enhancement ... refactor: additional filters on Payment Terms status report	2022-10-29 11:09:43 +05:30
Deepesh Garg	49343e9f68	chore: column name	2022-10-28 22:03:09 +05:30
Deepesh Garg	b6ade62211	Merge pull request #32662 from s-aga-r/refactor/stock/remaining-reports ... refactor: rewrite stock reports queries in qb	2022-10-28 21:05:15 +05:30
Deepesh Garg	323e45374f	Merge pull request #32620 from rtdany10/psa_pdf_issue ... feat: page break in SoA pdf	2022-10-28 21:00:01 +05:30
Deepesh Garg	aee4fe9f7b	Merge pull request #32722 from deepeshgarg007/reference_due_date ... fix: Reference due date field type in Journal Entry Accounts table	2022-10-28 20:55:36 +05:30
Deepesh Garg	50652be6e3	Merge branch 'develop' of https://github.com/frappe/erpnext into editable_inovice	2022-10-28 20:48:26 +05:30
Deepesh Garg	92f2d9f99f	Merge pull request #32725 from ernestoruiz89/patch-10 ... fix: add translate function on remark text on asset_value_adjustment.py	2022-10-28 20:47:00 +05:30
Deepesh Garg	25eac80ae6	Merge pull request #32718 from deepeshgarg007/total_sales_amount_project ... fix: Total Sales amount update in project via Sales Order	2022-10-28 20:46:00 +05:30
Deepesh Garg	9ac1c4bc4f	Merge pull request #32699 from deepeshgarg007/general_ledeger_print ... fix: Curreny in SOA print for multi-currency party	2022-10-28 20:41:49 +05:30
Deepesh Garg	c3275c3f3c	Merge pull request #32692 from deepeshgarg007/opening_invoice_creation_tool_ux ... fix: Clear invoice table post importing invoices	2022-10-28 20:40:52 +05:30
Deepesh Garg	d9eda45b0b	chore: Minor updates	2022-10-28 20:19:13 +05:30
Deepesh Garg	b9d497c61c	chore: Update patch	2022-10-28 20:18:55 +05:30
ruthra kumar	fed39a53cb	test: due date filter on Payment Terms report	2022-10-28 18:15:58 +05:30
ruthra kumar	4765f937ea	fix: key error in filter access	2022-10-28 17:50:01 +05:30
ruthra kumar	aadb6b1772	feat: additional filters on Payment terms report ... Filter on Status and Due dates	2022-10-28 17:46:06 +05:30
Deepesh Garg	fb41bdd700	Merge branch 'develop' of https://github.com/frappe/erpnext into tds_purchase_invoice	2022-10-28 17:18:11 +05:30
Vishal Dhayagude	db0f2c0b10	Merge branch 'develop' into pr_dashboard	2022-10-28 13:36:43 +05:30
Deepesh Garg	09fa2298ba	Merge pull request #32716 from deepeshgarg007/bank_account_filter ... fix: Company bank account filter in Bank Clearance	2022-10-28 12:53:53 +05:30
Vishal	e8c0157017	chore: minor linting issue fixed	2022-10-28 11:59:10 +05:30
Vishal	a04c44fe34	chore: Added Material Request Reference in Purchase Recipt Dashboard for Tracking	2022-10-28 11:36:14 +05:30
Sagar Sharma	334b158f0b	Merge branch 'develop' into refactor/stock/remaining-reports	2022-10-28 11:27:42 +05:30
Deepesh Garg	16959c0a8c	Merge pull request #32717 from deepeshgarg007/discount_section_collapse ... fix: Add condition for discount section collapse	2022-10-28 11:24:25 +05:30
Deepesh Garg	591291caee	Merge pull request #32724 from deepeshgarg007/ap_report_filter_fixes ... fix: Filter fixes in Accounts Payable report	2022-10-28 11:23:52 +05:30
Dany Robert	de20dfe459	chore: remove commented line	2022-10-27 09:33:49 +05:30
Ernesto Ruiz	8f0e63cd27	fix: add translate function on remark text on make_depreciation_entry in asset_value_adjustment.py	2022-10-26 13:56:35 -06:00
Deepesh Garg	a5a73ba857	fix: Filter fixes in Accounts Payable report	2022-10-26 21:18:50 +05:30
Deepesh Garg	e7caa48e2f	fix: Reference due date field type in Journal Entry Accounts table	2022-10-26 20:21:36 +05:30
Deepesh Garg	6063c4e3c0	fix: Total Sales amount update in project via Sales Order	2022-10-26 18:01:39 +05:30
Deepesh Garg	4cd65027c4	fix: Add condition for discount section collapse	2022-10-26 16:48:24 +05:30
Deepesh Garg	f9f78c1086	fix: Company bank account filter in Bank Clearance	2022-10-26 11:02:14 +05:30
Ernesto Ruiz	4c7fa9482d	fix: correct linters	2022-10-25 22:39:05 -06:00
Ernesto Ruiz	9c529c61bb	fix: correct linters	2022-10-25 22:35:37 -06:00
Ernesto Ruiz	b7b53b5857	fix: correct linters	2022-10-25 22:34:21 -06:00
Ernesto Ruiz	2012bdf4bd	fix: add translate function to string on budget_variance_report.js to match the variance word translated	2022-10-25 22:24:33 -06:00
Ernesto Ruiz	48ed6381b3	fix: add translate function to name of chart labels in budget_variance_report.py	2022-10-25 22:18:47 -06:00
Ernesto Ruiz	083a78135c	fix: add translate function to period in sales_analytics.py	2022-10-25 22:17:06 -06:00
Ernesto Ruiz	c1e608d9ef	fix: add translate function to period in stock_analytics.py	2022-10-25 22:09:02 -06:00
Ernesto Ruiz	71a0ae2e59	fix: refactor code for better translatable string in stock_ageing.py	2022-10-25 22:05:25 -06:00
Ernesto Ruiz	a671652ab2	fix: refactor code for better translatable string	2022-10-25 22:00:46 -06:00
Ernesto Ruiz	a963618b08	fix: add translate function to name of chart labels in deferred_revenue_and_expense.py	2022-10-25 21:54:55 -06:00
niralisatapara	397e3b1ade	feat: item wise tds calculation ... item wise tds calculation	2022-10-25 15:09:59 +05:30
Deepesh Garg	a18a715bb4	chore: Use account currency as fallback	2022-10-24 19:13:02 +05:30
Deepesh Garg	49ee873655	fix: Curreny in SOA print for multi-currency party	2022-10-24 17:34:12 +05:30
Rohit Waghchaure	5f84993bae	test: added test case to validate seachfields for customer, supplier	2022-10-24 16:10:47 +05:30
Rohit Waghchaure	46d148defd	fix: searchfield not working for cuctsomer, supplier as per customize form	2022-10-24 15:48:34 +05:30
Deepesh Garg	267e7c3a90	fix: Clear invoice table post importing invoices	2022-10-24 11:45:24 +05:30
Deepesh Garg	1a980123a2	chore: Update tests	2022-10-24 10:08:55 +05:30
Deepesh Garg	ed98015a56	test: Add unit tests	2022-10-23 23:03:50 +05:30
Deepesh Garg	1105e52031	chore: Update allow on submit fields	2022-10-23 22:55:08 +05:30
Deepesh Garg	48808aeb8a	Merge pull request #32424 from deepeshgarg007/loan_schedule_types ... feat: Repayment schedule types for term loans	2022-10-23 19:37:40 +05:30
Deepesh Garg	e59b147a62	chore: Update tests	2022-10-23 18:51:51 +05:30
Deepesh Garg	77d509eb9a	Merge pull request #32650 from barredterra/unset-contact-details ... fix: unset contact details	2022-10-23 18:21:01 +05:30
Deepesh Garg	ef0cb17faf	chore: Add repayment date on option	2022-10-22 23:46:01 +05:30
Sagar Sharma	26c00f8dd3	Merge branch 'develop' into refactor/stock/remaining-reports	2022-10-21 15:19:23 +05:30
Sagar Sharma	40bd121593	refactor: rewrite Itemwise Recommended Reorder Level Report queries in QB	2022-10-21 14:49:12 +05:30
Sagar Sharma	cde785f1bb	refactor: rewrite Product Bundle Balance Report queries in QB	2022-10-21 14:49:09 +05:30
Sagar Sharma	feaa2dbba8	refactor: rewrite Stock Ledger Report queries in QB	2022-10-21 13:12:34 +05:30
ruthra kumar	eedf7e44a2	Merge pull request #32651 from ruthra-kumar/report_payment_ledger ... feat: Payment Ledger report	2022-10-21 11:25:24 +05:30
Deepesh Garg	51d8e9dc5e	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_schedule_types	2022-10-20 18:35:16 +05:30
Deepesh Garg	2a50a0ce69	Merge pull request #32551 from codezart/subscription-plan-fix-months ... fix: number of months subscription plan	2022-10-20 17:24:24 +05:30
Ankush Menat	11207c4e56	fix: dont update item info twice ... [skip ci]	2022-10-20 16:18:48 +05:30
Devin Slauenwhite	b88e850d55	perf: cache barcode scan result (#32629) ... * perf: cache barcode scan result * feat: BarcodeScanResult type * fix: use safe `get_value` `set_value` Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2022-10-20 15:56:07 +05:30
rohitwaghchaure	adeb1f92c8	Merge pull request #32667 from rohitwaghchaure/fixed-bom-cost-update-message ... fix: BOM cost update message	2022-10-20 14:36:43 +05:30
Rohit Waghchaure	9cfe527492	fix: BOM cost update message	2022-10-20 13:49:46 +05:30
Deepesh Garg	1ca472cc8a	chore: Linting issues	2022-10-20 12:09:42 +05:30
Deepesh Garg	b4d008b743	Merge branch 'develop' into subscription-plan-fix-months	2022-10-20 12:07:44 +05:30
Deepesh Garg	ae54610b2a	Merge pull request #32659 from deepeshgarg007/inter_company_purchase_doc_address ... fix: Billing Address for inter-company purchase docs	2022-10-20 11:58:53 +05:30
rohitwaghchaure	873502c95d	Merge pull request #32654 from rohitwaghchaure/fixed-conversion-issue-in-material-request ... fix: incorrect qty in material request created from PP	2022-10-20 09:59:19 +05:30
Deepesh Garg	796f2d3c09	fix: Billing Address for inter-company purchase docs	2022-10-19 23:50:39 +05:30
FinByz Tech Pvt. Ltd	c52b41d311	feat(report): added account wise redirection ... * feat(report):added account wise redirection Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2022-10-19 23:14:10 +05:30
Raffael Meyer	4ad3002861	fix: allow to create Sales Order from expired Quotation (#32641)	2022-10-19 22:07:02 +05:30
ruthra kumar	6e55b419a6	test: invoice outstandings and payments	2022-10-19 21:49:13 +05:30
ruthra kumar	8f60f0a0cf	feat: Basic Payment Ledger report	2022-10-19 21:49:08 +05:30
Rohit Waghchaure	4d5ef721f7	test: validate qty and purchase uom in material request which is created from PP	2022-10-19 19:08:27 +05:30
Rohit Waghchaure	ad278b2007	fix: incorrect qty in material request	2022-10-19 18:38:34 +05:30
rohitwaghchaure	de4c0528f9	Merge pull request #32645 from rohitwaghchaure/fixed-capacity-planning-error ... fix: overlap error not raised for job card in case of workstation with production capacity	2022-10-19 17:04:48 +05:30
barredterra	23f0bb45b0	fix: unset contact details	2022-10-19 12:26:56 +02:00
Deepesh Garg	430492152f	fix: Advance paid amount in orders (#32642)	2022-10-19 15:37:13 +05:30
niralisatapara	4a35a224e2	feat: Item Wise TDS Calculation	2022-10-19 15:34:41 +05:30
niralisatapara	21d09c5bf2	Item Wise TDS Calculation	2022-10-19 14:33:02 +05:30
Rohit Waghchaure	8b2165e0d1	fix: overlap error not raised for job card in case of workstation with production capacity	2022-10-19 14:19:50 +05:30
Maharshi Patel	d100e68fd0	Merge branch 'frappe:develop' into fix-pricing-rule-item-group-uom	2022-10-19 11:08:05 +05:30
ruthra kumar	f844097f8e	Merge pull request #32635 from ruthra-kumar/fix_tax_or_charges_acc_updating_voucher_outstanding ... fix: Integrity Error on PLE while submitting sales invoice	2022-10-19 09:43:24 +05:30
Maharshi Patel	96b4211ea1	fix: pricing rule for non stock UOM and conversions ... * fix: pricing rule for non stock UOM and conversions	2022-10-18 22:26:11 +05:30
ruthra kumar	8f42e7f703	test: use payable account in tax and to trigger party validation	2022-10-18 17:27:46 +05:30
Sagar Sharma	ae8a63827d	Merge branch 'develop' into refactor/stock/reports	2022-10-18 10:48:52 +05:30
Deepesh Garg	7184330acd	Merge pull request #32527 from s-aga-r/refactor/buying/reports ... refactor: rewrite buying reports queries in qb	2022-10-18 10:06:10 +05:30
ruthra kumar	43b80683eb	fix: party type and party mandatory on updating outstanding	2022-10-18 09:33:37 +05:30
Deepesh Garg	42e4c37f15	chore: Break into smaller functions	2022-10-17 20:09:07 +05:30
Deepesh Garg	32117c030a	Merge pull request #32622 from deepeshgarg007/ignore_pi_reference ... fix: Ignore linked purchase invoice on cancel	2022-10-17 19:38:26 +05:30
Dany Robert	9df9915600	fix: query condition change	2022-10-17 15:54:46 +02:00
Deepesh Garg	faadf78332	fix: Ignore linked purchase invoice on cancel	2022-10-17 18:50:54 +05:30
ruthra kumar	9b50221bf0	refactor: split ple creation function into two ... refactor create_payment_ledger_entry function into 2. one for generating ple map and one for DB entry creation	2022-10-17 18:02:52 +05:30
Dany Robert	2665d7d293	feat: page break in SoA pdf	2022-10-17 14:29:03 +02:00
Deepesh Garg	98b695984b	Merge branch 'develop' into refactor/buying/reports	2022-10-17 17:15:27 +05:30
Deepesh Garg	8b16ba7f3a	Merge branch 'develop' into refactor/stock/reports	2022-10-17 17:15:18 +05:30
Deepesh Garg	d794b834fd	Merge pull request #32618 from ruthra-kumar/fix_failing_github_unit_test_workflow ... test: lead creation and deletion restricted to dummy company	2022-10-17 17:11:51 +05:30
Deepesh Garg	e626107d3d	chore: Update allow on submit for Sales Invoice fields	2022-10-17 16:48:13 +05:30
Sagar Sharma	582e1bf10c	Merge branch 'develop' into refactor/stock/reports	2022-10-17 16:30:43 +05:30
ruthra kumar	ced8d2a537	test: lead creation and deletion restricted to dummy company	2022-10-17 16:26:07 +05:30
Sagar Sharma	cda0baa7fe	Merge branch 'develop' into refactor/buying/reports	2022-10-17 16:10:52 +05:30
rohitwaghchaure	0f358e3ca1	Merge pull request #32613 from rohitwaghchaure/group-warehouse-filter ... fix: group warehouse filter not working for Batch-wise Balance history report	2022-10-17 15:12:42 +05:30
Rohit Waghchaure	2481574a28	chore: seperate function to apply filter for warehouse in case of QB	2022-10-17 14:25:23 +05:30
Rohit Waghchaure	6381e75fa5	fix: group warehouse filter not working for Batchwise Balance history report	2022-10-17 12:17:05 +05:30
Sagar Sharma	484b115b09	Merge branch 'develop' into refactor/stock/reports	2022-10-17 12:08:44 +05:30
Sagar Sharma	309fc6db43	Merge branch 'develop' into refactor/buying/reports	2022-10-17 12:08:37 +05:30
Deepesh Garg	dc3fe85921	chore: Remove HRMS related code (#32607) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2022-10-17 11:37:50 +05:30
Deepesh Garg	30da6ab2c1	feat: Editable Sales Invoice	2022-10-17 11:10:38 +05:30
Sagar Sharma	682fb171cb	Merge branch 'develop' into refactor/buying/reports	2022-10-16 11:50:31 +05:30
Sagar Sharma	177c9c93e8	Merge branch 'develop' into refactor/stock/reports	2022-10-16 11:50:26 +05:30
Deepesh Garg	40b3d8ec1b	Merge pull request #32591 from nabinhait/crm-notes-to-comments ... fix: Renamed Notes section to Comments	2022-10-15 17:42:45 +05:30
Deepesh Garg	fc795275f2	Merge pull request #32594 from deepeshgarg007/order_account ... fix: Party account for multi-order invoices	2022-10-15 16:58:51 +05:30
Sagar Sharma	5f3796f6ea	Merge branch 'develop' into refactor/buying/reports	2022-10-14 11:57:11 +05:30
Sagar Sharma	3c1bd90d0d	Merge branch 'develop' into refactor/stock/reports	2022-10-14 11:57:04 +05:30
Anand Baburajan	9127b96033	fix: add project settings to projects workspace (#32568)	2022-10-13 18:27:11 +05:30
Ankush Menat	50e9698932	chore: drop dead code (#32595) ... [skip ci]	2022-10-13 15:25:22 +05:30
Deepesh Garg	fd49503ba2	fix: Party account for multi-order invoices	2022-10-13 15:08:34 +05:30
ruthra kumar	2d0217abd5	Merge pull request #32567 from ruthra-kumar/remove_duplicate_ple_on_item_value_repost ... fix: deduplicate Payment Ledger on Item value repost	2022-10-13 14:01:59 +05:30
Nabin Hait	f561d8f689	fix: Renamed Dashboard tab label to Connections	2022-10-13 12:43:08 +05:30
Nabin Hait	56a4a77398	fix: Renamed Notes section to Comments	2022-10-13 12:35:04 +05:30
Maharshi Patel	edc93ab6aa	fix: pricing rule item group uom ... Handle use case where pricing rule is applied on item group and user have selected UOM. pricing rule was applied on all UOM's even after specifying UOM. i have added condition in sql to fix this.	2022-10-13 12:00:30 +05:30
Raffael Meyer	e543dca6a0	fix: don't try to update youtube data if disabled in settings (#32588) ... fix: cast value from db [skip ci]	2022-10-13 11:53:52 +05:30
Sagar Sharma	bb7897caab	Merge branch 'develop' into refactor/stock/reports	2022-10-12 19:21:15 +05:30
Sagar Sharma	610d18cc25	Merge branch 'develop' into refactor/buying/reports	2022-10-12 19:21:10 +05:30
Sagar Sharma	7dfd741ced	Merge branch 'develop' into fix/github-issue/32559	2022-10-12 19:20:39 +05:30
Rohit Waghchaure	692462d7c8	fix: removed unnecessary imports	2022-10-12 16:30:48 +05:30
Deepesh Garg	43c2bd1351	Merge pull request #32272 from deepeshgarg007/internal_transfer_precision_fixes ... fix: Incoming rate precision fixes for intra company transfer	2022-10-12 16:23:16 +05:30
ruthra kumar	eb819368aa	test: dedeplication on payment ledger upon repost	2022-10-12 16:08:59 +05:30
Deepesh Garg	9aa5e20ef7	chore: check only for inter-company transfers	2022-10-12 15:53:28 +05:30
Rohit Waghchaure	98bf8e1304	fix: test case	2022-10-12 15:45:36 +05:30
Rohit Waghchaure	3266e54e33	fix: consider outgoingrate while valuation rate calculate	2022-10-12 15:44:53 +05:30
Rohit Waghchaure	683a47f7a1	fix: consider sales rate as incoming rate for transit warehouse in purchase flow	2022-10-12 15:44:53 +05:30
ruthra kumar	65992304bc	fix: delete old ple's on item value repost	2022-10-12 15:34:50 +05:30
Deepesh Garg	49601558c6	chore: fix precision condition	2022-10-12 14:57:16 +05:30
Deepesh Garg	1c05c004cd	chore: Use proper accounts	2022-10-12 14:19:09 +05:30
Deepesh Garg	c8d2181498	chore: Increase precision for other doc fields	2022-10-12 14:17:55 +05:30
Sagar Sharma	59edf64951	Merge branch 'develop' into refactor/stock/reports	2022-10-12 13:30:00 +05:30
Sagar Sharma	0af385d73f	Merge branch 'develop' into refactor/buying/reports	2022-10-12 13:29:50 +05:30
Sagar Sharma	d2755c0106	Merge branch 'develop' into fix/github-issue/32559	2022-10-12 13:28:35 +05:30
Rohan	43037d893d	fix: type-cast while saving an item (#32549)	2022-10-12 13:07:58 +05:30
Sagar Sharma	7da32c7db3	fix: Brand Defaults filters	2022-10-12 12:15:07 +05:30
Sagar Sharma	16aef53470	Merge branch 'develop' into refactor/stock/reports	2022-10-12 00:38:40 +05:30
Sagar Sharma	a161048a9d	Merge branch 'develop' into refactor/buying/reports	2022-10-12 00:38:37 +05:30
Deepesh Garg	38b34f2a45	Merge pull request #32408 from nabinhait/sales-purchase-tab-break ... feat: Tab Breaks in all Sales and Purchase cycle transactions	2022-10-11 16:02:45 +05:30
Deepesh Garg	df2a0e265b	chore: GL Entries for SLE diff	2022-10-11 14:55:09 +05:30
Deepesh Garg	dc20b21fb5	test: Internal tranfer precision loss test	2022-10-11 14:54:27 +05:30
Deepesh Garg	b31c3bd35d	chore: Increase incoming_rate field precision to 6	2022-10-11 14:53:26 +05:30
ruthra kumar	633c2a289e	Merge pull request #32557 from ruthra-kumar/value_error_on_pos_save ... fix: Value error on validation of POS invoices with Serial Nos	2022-10-11 14:42:47 +05:30
Nabin Hait	e71c417f7e	fix: minor cleanup	2022-10-11 13:21:27 +05:30
Nabin Hait	5389a35798	fix: more fields reordering related to Tab Break	2022-10-11 13:21:07 +05:30
Nabin Hait	aaf3c2b329	feat: Tab Break in Purchase Invoice	2022-10-11 13:20:41 +05:30
Nabin Hait	35f836c4b7	feat: Tab Break in Purchase Receipt	2022-10-11 13:18:21 +05:30
Nabin Hait	3d9263bf86	feat: Tab Break in Supplier Quotation	2022-10-11 13:18:21 +05:30
Nabin Hait	2172c5034a	feat: Tab Break in Material Request	2022-10-11 13:18:21 +05:30
Nabin Hait	10a25603ac	feat: Tab Break in Purchase Order	2022-10-11 13:18:21 +05:30
Nabin Hait	7546562139	feat: Tab Break in Quotation	2022-10-11 13:18:21 +05:30
Nabin Hait	f6613e1e4c	feat: Tab Break in Sales Order, Delivery Note, Sales Invoice and Purchase Order	2022-10-11 13:18:21 +05:30
ruthra kumar	9e2bd10d03	test: value error on serial no validation on pos	2022-10-11 12:54:50 +05:30
Deepesh Garg	dddbc130db	Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes	2022-10-11 12:54:11 +05:30
ruthra kumar	4b908ebcd6	fix: value error on pos submit	2022-10-11 11:21:11 +05:30
Deepesh Garg	b99b2b75ca	Merge pull request #32477 from rasos/patch-1 ... Austria chart of accounts update	2022-10-11 10:20:49 +05:30
Anand Baburajan	ba754825b9	Merge branch 'develop' into fix_budget_autoname	2022-10-10 23:17:18 +05:30
anandbaburajan	e4d7d8c42d	fix: use naming_series in budget	2022-10-10 23:04:34 +05:30
codezart	2d30b36cca	fix: number of months subscription plan	2022-10-10 11:24:42 -04:00
ruthra kumar	65194efa97	Merge pull request #32548 from ruthra-kumar/suppress_linked_doc_valdiation_on_delete ... fix: allow deletion of cancelled Invoices once payments are unlinked	2022-10-10 16:41:07 +05:30
ruthra kumar	143f905838	test: update ple on payment unlink for SI's and SO's	2022-10-10 15:57:38 +05:30
Deepesh Garg	a14c5dbcc4	Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes	2022-10-10 15:08:15 +05:30
rohitwaghchaure	be1ebd348b	Merge pull request #32497 from s-aga-r/fix/quality-inspection/status ... chore: set `Quality Inspection` status based on readings status	2022-10-10 10:49:56 +05:30
ruthra kumar	537d953f4c	fix: unlink payment on invoice cancellation	2022-10-10 10:17:19 +05:30
Deepesh Garg	d806e32030	fix: PO cancel post advance payment cancel against PO	2022-10-08 21:25:11 +05:30
Deepesh Garg	4b828dd276	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_schedule_types	2022-10-08 18:41:39 +05:30
Sagar Sharma	60befcd8a8	Merge branch 'develop' into fix/quality-inspection/status	2022-10-08 13:34:21 +05:30
Sagar Sharma	4992e4a2b8	fix(test): test_rejected_qi_validation	2022-10-08 13:33:36 +05:30
Sagar Sharma	fcc1272d42	test: add test cases for Quality Inspection status	2022-10-08 13:33:36 +05:30
Sagar Sharma	2657ece2cd	fix: set Quality Inspection status based on readings status	2022-10-08 13:33:22 +05:30
Sagar Sharma	ce20b05ed0	Merge branch 'develop' into refactor/buying/reports	2022-10-08 10:48:03 +05:30
Sagar Sharma	e78a706994	refactor: rewrite Procurement Tracker Report queries in QB	2022-10-08 10:47:10 +05:30
rohitwaghchaure	73a9791401	Merge branch 'develop' into provision-to-return-components	2022-10-07 23:50:05 +05:30
Rohit Waghchaure	d59ed24e6c	feat: provision to return non consumed components against the work order	2022-10-07 22:45:53 +05:30
Sagar Sharma	a14b9c7bac	refactor: rewrite Supplier Quotation Comparison Report queries in QB	2022-10-07 18:07:53 +05:30
Sagar Sharma	a5b3f8cae9	refactor: rewrite Purchase Order Analysis Report queries in QB	2022-10-07 17:30:01 +05:30
Deepesh Garg	17201facf1	Merge pull request #32522 from deepeshgarg007/tax_withholding_related_fixes ... fix: Tax withholding related fixes	2022-10-07 16:32:18 +05:30
Deepesh Garg	781d160c68	fix: Do not add tax withheld vouchers post tax withheding in one document	2022-10-07 14:22:40 +05:30
Deepesh Garg	abf5b6be3e	fix: Tax withholding related fixes	2022-10-07 14:04:36 +05:30
Sagar Sharma	f0f2413932	Merge branch 'develop' into refactor/stock/reports	2022-10-07 09:59:56 +05:30
Sagar Sharma	8103856a41	refactor: rewrite Warehouse wise Item Balance Age and Value Report queries in QB	2022-10-07 09:59:35 +05:30
Sagar Sharma	7c759b193c	refactor: rewrite Total Stock Summary Report queries in QB	2022-10-07 09:59:28 +05:30
Sagar Sharma	d7c3b7633a	fix: make readings status mandatory in Quality Inspection	2022-10-06 22:36:37 +05:30
Ankush Menat	8376fbc982	fix: Explicitly update modified (#32519) ... * fix: Explicitly update modified required after https://github.com/frappe/frappe/pull/18301 * chore: fix broken translations	2022-10-06 20:35:33 +05:30
Sagar Sharma	d3c073dc25	refactor: rewrite Supplier-Wise Sales Analytics Report queries in QB	2022-10-06 17:42:31 +05:30
Sagar Sharma	c18f13a45b	refactor: rewrite Stock Projected Qty Report queries in QB	2022-10-06 17:04:50 +05:30
Ankush Menat	07c4a74838	chore: drop stale demo page (#32515)	2022-10-06 13:01:53 +05:30
Ankush Menat	8d1db0ea3d	fix: single column indexes (#32425) ... refactor: move single column indexes to doctypes	2022-10-06 11:28:26 +05:30
HENRY Florian	0e4017cbe5	chore: update fr translation (#32385)	2022-10-05 18:19:44 +05:30
Deepesh Garg	0235901614	Merge pull request #32478 from rtdany10/patch-23 ... feat(JE): trigger account field when fetched from template	2022-10-05 16:07:59 +05:30
Deepesh Garg	fbdd1f39e7	Merge pull request #32499 from rohitwaghchaure/fixed-TooManyWritesError-for-reposting ... fix: TooManyWritesError during reposting of stock	2022-10-05 16:05:12 +05:30
Deepesh Garg	777ed10e21	Merge pull request #32491 from ruthra-kumar/performance_issue_on_migrate_remarks_patch ... refactor: remove duplicate entries on remarks migration patch	2022-10-05 16:04:23 +05:30
Rohit Waghchaure	aaabba9b1e	fix: TooManyWritesError during reposting of stock	2022-10-05 10:58:21 +05:30
Sagar Sharma	39707757a6	chore: add Manual Inspection field in Quality Inspection DocType	2022-10-04 23:16:16 +05:30
Dany Robert	74505a116f	Merge branch 'develop' into patch-23	2022-10-04 17:17:30 +05:30
ruthra kumar	518ab93e03	refactor: remove duplicate entries on remarks migration patch	2022-10-04 12:39:34 +05:30
Summayya Hashmani	da43a5e371	refactor(UI): clean up portal pages (#29018) ... * refactor: list view for portal pages * refactor: add align center class * refactor: change footer btn class(primary) * refactor: add order style page * refactor: import order page in website * refactor: remove table elements * fix: preview image height * fix: make string translatable * refactor: change font variables * refactor: order preview bg white * refactor: center align items * fix: breadcrumb padding * refactor: make preview image rounded * refactor: add condition for image container * refactor: change alignment for mobile view * fix: make footer button secondary * refactor: clean code * refactor: code indentantion * refactor: remove space * fix: Payment section cleanup Co-authored-by: Summayya <frappe@Summayyas-MacBook-Air.local> Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2022-10-04 09:57:07 +05:30
Dany Robert	c35adcf5a1	feat(JE): trigger account field when fetched from template ... Closes #32409	2022-10-03 19:31:20 +05:30
Roland	7d84cca431	Austria chart of accounts update ... improved mapping of VAT accounts	2022-10-03 14:13:27 +02:00
niralisatapara	e758a753f8	Item Wise TDS Calculation ... For calculating Item wise TDS in Purchase Invoice.	2022-10-03 16:39:35 +05:30
Sagar Sharma	e295d0c091	Merge branch 'develop' into fix/pick-list/picked-qty	2022-10-03 14:20:05 +05:30
Sagar Sharma	ba02209f1d	fix: pick list picked-qty for batch item	2022-10-03 14:12:42 +05:30
rohitwaghchaure	1c5ae80029	Merge pull request #32466 from rohitwaghchaure/allow-to-return-expired-batches ... fix: not able to return sold expired batches	2022-10-03 13:14:59 +05:30
Deepesh Garg	8c23b19da1	Merge pull request #32394 from maharshivpatel/fix-payment-request-fetch-swift-number ... fix: fetch swift number in payment request from bank doctype	2022-10-03 12:55:02 +05:30
Rohit Waghchaure	0b1727cf79	fix: not able to return sold expired batches	2022-10-03 12:06:32 +05:30
Shridhar Patil	69efd2ee24	fix: fixes query builder order by issue in postgres (#32441) ... * fix: fixes query builder order by issue in postgres * fix: linter	2022-10-03 11:07:24 +05:30
Dany Robert	91055151ce	fix: (bulk transaction) key error and better error logging (#32445) ... * fix: (bulk transaction) key error and better error logging * chore: pre-commit * chore: linter - missing comma	2022-10-03 10:59:53 +05:30
Muvuk	73e5a7d671	fix: update with new Frappe color. fix #32455 (#32456) ... * Update with new Frappe color. * refactor: use css variables Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2022-10-02 22:30:36 +05:30
Deepesh Garg	601880f1ce	Merge pull request #32454 from AnandBaburajan/fix_test_scrap_asset ... fix: test_scrap_asset not working on end of month	2022-10-02 17:44:46 +05:30
Deepesh Garg	28772bc9a4	Merge pull request #32405 from AnandBaburajan/fix_asset_sold_status ... fix: status of assets with maintenance_required changing back to 'Partially Depreciated' some time after being sold	2022-10-02 17:41:31 +05:30
Anand Baburajan	04f9e7fa73	Merge branch 'develop' into fix_test_scrap_asset	2022-10-01 17:12:24 +05:30
anandbaburajan	47bd4be71b	fix: test_scrap_asset	2022-10-01 17:04:22 +05:30
Deepesh Garg	1c560a967c	Merge branch 'develop' into fix-payment-request-fetch-swift-number	2022-10-01 16:14:27 +05:30
Maharshi Patel	62c5b28690	fix: typo in sales_register's filter mode_of_payment (#32371) ... * fix: typo in sales_register's filter mode_of_payment	2022-10-01 11:04:53 +05:30
Sagar Sharma	e71b25107d	Merge branch 'develop' into purchase-order/item/fg-item	2022-09-30 19:10:07 +05:30
Sagar Sharma	128c4bb7cb	Merge branch 'develop' into purchase-order/item/fg-item	2022-09-30 17:06:35 +05:30
Sagar Sharma	f95ed7dca2	fix: add non-stock item filter for fg_item in PO	2022-09-30 17:05:16 +05:30
Sagar Sharma	1f4e4db50d	Merge branch 'develop' into fix/item/update-stock	2022-09-30 16:55:26 +05:30
Sagar Sharma	ca2958a999	Merge branch 'develop' into fix/item/update-stock	2022-09-30 16:36:46 +05:30
Maharshi Patel	dc8d49260c	fix: payment request make bank field Link instead of Read Only	2022-09-30 16:22:57 +05:30
Sagar Sharma	eedaf9cd26	Merge branch 'develop' into fix/scr/non-stock-item	2022-09-30 16:19:23 +05:30
Sagar Sharma	fa2290657a	fix: add validation for non-stock item in SCR	2022-09-30 16:18:15 +05:30
Deepesh Garg	cceb29c005	Merge pull request #32412 from deepeshgarg007/tcs_deduction_issue ... fix: Incorrect TCS amount deducted in Sales Invoice	2022-09-30 16:05:30 +05:30
Deepesh Garg	a79d074436	Merge pull request #32368 from ruthra-kumar/remove_code_for_buying_side_discount_accounting ... chore: remove discount accounting logic from PI and PI Item	2022-09-30 15:58:35 +05:30
Deepesh Garg	429303bbb7	Merge pull request #32402 from deepeshgarg007/item_dashboard_create_new ... fix: Item details fetching on making transaction from item dashboard	2022-09-30 15:56:32 +05:30
Nabin Hait	fe891aa488	fix: Create accounting dimension fields in asset capitalization	2022-09-30 15:55:41 +05:30
Maharshi Patel	9245d3b5cd	Revert "fix: fetch swift_number in payment_request" ... This reverts commit f42a8e4e03.	2022-09-30 15:35:12 +05:30
Deepesh Garg	bf7a51791a	chore: label post save	2022-09-30 15:29:07 +05:30
Sagar Sharma	6d0842465b	fix: don't allow to update Maintain Stock if the item has a BOM	2022-09-30 15:18:10 +05:30
Deepesh Garg	679b5ed551	chore: Add patch to update repayment schedule type in loan documents	2022-09-30 14:06:06 +05:30
Sagar Sharma	b1edd911f9	Merge branch 'develop' into remove_code_for_buying_side_discount_accounting	2022-09-30 12:39:29 +05:30
Sagar Sharma	774097bd10	Merge branch 'develop' into item_dashboard_create_new	2022-09-30 12:37:58 +05:30
Deepesh Garg	2ddee50f27	chore: Update labels as per repayment type	2022-09-30 10:39:45 +05:30
Deepesh Garg	3466461eb3	chore: Remove print statements	2022-09-30 10:19:58 +05:30
Deepesh Garg	76c6ccab5d	feat: Repayment schedule types for term loans	2022-09-30 10:13:17 +05:30
anandbaburajan	eadcd8e614	Merge branch 'fix_asset_sold_status' of https://github.com/AnandBaburajan/erpnext into fix_asset_sold_status	2022-09-29 15:34:48 +05:30
anandbaburajan	28952eda87	chore: remove unused function	2022-09-29 15:33:45 +05:30
Anand Baburajan	990514ae6d	Merge branch 'develop' into fix_asset_sold_status	2022-09-29 15:32:37 +05:30
anandbaburajan	f1169fb213	chore: refactor by just using a filter	2022-09-29 15:32:01 +05:30
Sagar Sharma	ffef659782	Merge branch 'develop' into fix/supplier-portal/make-pi-btn	2022-09-29 14:54:29 +05:30
rohitwaghchaure	10b7592d14	Merge pull request #32414 from rohitwaghchaure/consider-searchfields-as-per-customize-form ... fix: searchfields as per customize form not working for Item	2022-09-29 14:51:55 +05:30
Rohit Waghchaure	3656f7d06f	test: added test case	2022-09-29 14:01:51 +05:30
anandbaburajan	0b3b4c99e6	Merge branch 'develop' of https://github.com/frappe/erpnext into fix_asset_sold_status	2022-09-29 08:55:00 +05:30
anandbaburajan	b734f9d237	chore: refactor by creating is_sold	2022-09-29 08:54:35 +05:30
Rohit Waghchaure	fd889fd29a	fix: searchfields as per customize form not working for Item	2022-09-28 23:00:45 +05:30
Deepesh Garg	369a343fb2	Merge pull request #32363 from ernestoruiz89/patch-7 ... fix: add translate function to strings in www/book appoinment	2022-09-28 20:15:05 +05:30
Deepesh Garg	bff3cd9068	chore: Remove print statements	2022-09-28 20:13:24 +05:30
Deepesh Garg	08443c6421	fix: Incorrect TCS amount deducted in Sales Invoice	2022-09-28 20:11:00 +05:30
Deepesh Garg	84ab5d45fd	Merge pull request #32403 from deepeshgarg007/loan_type_patch_fix ... fix: Disbursement Account in patch to update old loans	2022-09-28 19:35:42 +05:30
Anand Baburajan	d4242de699	Merge branch 'develop' into fix_asset_sold_status	2022-09-28 18:20:46 +05:30
anandbaburajan	f4bf9c672f	chore: rewrite query using frappe.qb	2022-09-28 18:20:20 +05:30
Sagar Sharma	a145d1065a	Merge branch 'develop' into fix/stock-entry/supplied-items	2022-09-28 16:55:57 +05:30
Sagar Sharma	ac7409bbf3	fix: supplied items added twice in Stock Entry	2022-09-28 16:46:48 +05:30
Anand Baburajan	0618f606b2	Merge branch 'develop' into fix_asset_sold_status	2022-09-28 16:42:21 +05:30
anandbaburajan	a8dd3c3a7c	chore: adding missing asset statuses	2022-09-28 16:39:14 +05:30
anandbaburajan	1725672168	chore: adding missing asset statuses	2022-09-28 16:22:35 +05:30
anandbaburajan	f9f68005a5	fix: asset requiring maintenance sold status	2022-09-28 16:21:31 +05:30
Sagar Sharma	e63e017d20	Merge branch 'develop' into fix/supplier-portal/make-pi-btn	2022-09-28 15:46:52 +05:30
Sagar Sharma	80080a3d7b	fix: show Make Purchase Invoice button based on permission	2022-09-28 15:40:07 +05:30
Deepesh Garg	be623ce8e8	fix: Disbursement Account in patch to update old loans	2022-09-28 15:36:59 +05:30
Deepesh Garg	0439e41a44	fix: Item details fetching on making transaction from item dashboard	2022-09-28 14:54:53 +05:30
Maharshi Patel	f42a8e4e03	fix: fetch swift_number in payment_request ... There isn't direct link between payment_request and bank so swift_number wasn't fetched using Fetch form. I fixed it by fetching swift_number on_change of bank_account.	2022-09-28 12:54:00 +05:30
Anand Baburajan	c1e3498a2a	Merge branch 'develop' into fix_asset_scrap_and_sale_dep	2022-09-28 12:18:38 +05:30
Deepesh Garg	0c869251ce	Merge branch 'develop' into fix_asset_scrap_and_sale_dep	2022-09-28 08:38:52 +05:30
Maharshi Patel	d850b0adb1	Merge branch 'develop' into fix-pos-validate-qty-if-is_stock_item	2022-09-27 23:45:50 +05:30
Maharshi Patel	e392ea1104	fix: POS properly validate stock for bundle products ... Stock availability was not calculated properly for Product Bundle with non stock item so i have added logic to properly calculate that as well.	2022-09-27 23:44:56 +05:30
Deepesh Garg	dbe4fdc73d	Merge pull request #32382 from deepeshgarg007/subscription_process ... fix: Move subscription process to hourly long queue	2022-09-27 23:39:12 +05:30
Deepesh Garg	4c8617e1bb	Merge pull request #32378 from deepeshgarg007/add_index_return_against ... fix: Add return against indexes for POS Invoice	2022-09-27 22:22:03 +05:30
Deepesh Garg	82a2f31ada	fix: Move subscription process to hourly long quque	2022-09-27 22:12:32 +05:30
Anand Baburajan	cf72931816	Merge branch 'develop' into fix_asset_scrap_and_sale_dep	2022-09-27 20:43:53 +05:30
anandbaburajan	c6a7de0e54	chore: add blank lines	2022-09-27 20:43:08 +05:30
anandbaburajan	14e2d31619	test: adding test_asset_with_maintenance_required_status_after_sale	2022-09-27 20:19:01 +05:30
Deepesh Garg	cbfe28286a	fix: Add return against indexes for POS Invoice	2022-09-27 16:22:59 +05:30
Nabin Hait	6145013f30	Merge branch 'develop' into fix_asset_scrap_and_sale_dep	2022-09-27 15:56:39 +05:30
Maharshi Patel	e39e088f18	fix: POS only validate QTY if is_stock_item ... POS invoice raised " Item not available " validation error even though item is non_stock.	2022-09-27 15:44:38 +05:30
Deepesh Garg	1f6205e1ea	fix: Add return against indexes for POS Invoice	2022-09-27 15:37:41 +05:30
Sagar Sharma	376febb9d1	Merge branch 'develop' into fix/work-order/finish-button	2022-09-27 15:36:15 +05:30
Maharshi Patel	c760ca2323	fix: Scrap Asset Accounting Dimensions (#31949) ... * fix: Scrap Asset Accounting Dimensions	2022-09-27 15:31:36 +05:30
Sagar Sharma	05392e0918	fix: consider overproduction percentage for WO finish button	2022-09-27 15:30:08 +05:30
Rohit Waghchaure	a4a86ee23f	fix: allow to return expired batches using purchase return	2022-09-27 13:55:27 +05:30
Sagar Sharma	9049db41ae	fix: For Quantity error msg in Stock Entry	2022-09-27 12:00:50 +05:30
ruthra kumar	21095502b9	chore: clean up purchase invoice and purchase invoice item ... 1. remove discount accounting related fields from purchase invoice and purchase invoice item 2. clean buying settings doctype	2022-09-27 11:10:41 +05:30
Deepesh Garg	ce80b9fa0e	Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_precision_fixes	2022-09-26 21:16:25 +05:30
Deepesh Garg	6e47fd54a0	fix: Hanlde rounding loss for internal transfer	2022-09-26 21:15:57 +05:30
rohitwaghchaure	106ee1bf4d	Merge pull request #32339 from rohitwaghchaure/fixed-opening-entry-trial-balance-issue ... fix: opening entry causing discrepancy between stock and trial balance	2022-09-26 20:32:41 +05:30
rohitwaghchaure	6a67cc96d0	Merge pull request #32049 from djpalshikar/patch-1 ... Allow Item Templates in Work Order Items	2022-09-26 20:27:33 +05:30
Ernesto Ruiz	499ce5139c	fix: add translate function to book appointment verify html	2022-09-26 08:04:14 -06:00
Ernesto Ruiz	728ef46048	fix: add translate function to book appointment index.js	2022-09-26 08:01:48 -06:00
Ernesto Ruiz	e683cccf35	fix: add translate function to book appointment html	2022-09-26 07:59:13 -06:00
Sagar Sharma	e312d17eae	refactor: rewrite Item Prices Report queries in QB	2022-09-26 17:50:17 +05:30
hendrik	f41d1500b0	fix: report chart field type ... * fix: report chart field type Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com>	2022-09-26 17:47:24 +05:30
Sagar Sharma	afb323b01c	Merge branch 'develop' into refactor/stock/report/incorrect-stock-value	2022-09-26 17:09:22 +05:30
Sagar Sharma	9a1fa53791	Merge branch 'develop' into refactor/stock/report/item-price-stock-report	2022-09-26 17:08:30 +05:30
Deepesh Garg	d84fd6c925	Merge pull request #32245 from pps190/feat_scan_sound ... feat(stock): Audible indication of barcode scan status.	2022-09-26 17:02:37 +05:30
Deepesh Garg	9b38a372fb	Merge pull request #32262 from shashankshirke/develop ... fix: broken link for item valuation updated	2022-09-26 16:59:36 +05:30
Deepesh Garg	389fa180c8	Merge pull request #32276 from ernestoruiz89/patch-4 ... fix: add some strings to translate function	2022-09-26 16:39:04 +05:30
Deepesh Garg	539f8550c7	Merge pull request #32336 from ernestoruiz89/patch-6 ... fix: typo on opportunity summary by sales stage report	2022-09-26 16:37:58 +05:30
ruthra kumar	8b21d27f04	Merge pull request #32310 from nishibakabeer/patch-4 ... fix: total value in all keys	2022-09-26 11:27:47 +05:30
nishibakabeer	6919f389aa	fix: total value in all keys ... Gross and net profit report showing wrong values in monthly quarterly and half yearly filters which is the total value @ruthra-kumar added in develop branch as suggested ( https://github.com/frappe/erpnext/pull/32020)	2022-09-26 10:40:55 +05:30
ruthra kumar	b33fb26b84	Merge pull request #32303 from ruthra-kumar/fix_difference_amount_calculation_on_payment_reconciliation ... fix: difference amount calculation and popup on payment reconciliation	2022-09-26 10:25:12 +05:30
Sagar Sharma	b93331e844	refactor: rewrite Incorrect Stock Value Report queries in QB	2022-09-26 09:44:29 +05:30
Sagar Sharma	22299d2382	refactor: rewrite Item Price Stock Report queries in QB	2022-09-26 09:40:49 +05:30
Sagar Sharma	bb59346651	refactor: rewrite Delayed Item Report queries in QB	2022-09-23 15:47:26 +05:30
Rohit Waghchaure	bc3ab45af2	fix: opening entry causing discepancy between stock and trial balance	2022-09-23 15:21:09 +05:30
Sagar Sharma	1c1f991d2f	refactor: rewrite Batch-Wise Balance History Report queries in QB	2022-09-23 14:57:44 +05:30
Sagar Sharma	2c9d9577e3	refactor: rewrite Batch Item Expiry Status Report queries in QB	2022-09-23 14:06:37 +05:30
Ernesto Ruiz	c4919cf5ec	fix: typo on opportunity summary by sales stage report	2022-09-22 15:42:46 -06:00
Sagar Sharma	729193aca8	Merge branch 'develop' into refactor/report/production-planning-report	2022-09-22 11:18:02 +05:30
Sagar Sharma	8417b9b99c	refactor: rewrite Production Planning Report queries in QB	2022-09-22 11:17:11 +05:30
rohitwaghchaure	d7e699ea1a	Merge pull request #32309 from rohitwaghchaure/fixed-item-code-key-error ... fix: item_code key error in production plan	2022-09-21 15:27:43 +05:30
Rohit Waghchaure	caf23e6b8e	fix: item_code key error in production plan	2022-09-21 13:11:51 +05:30
Sagar Sharma	86c9ce9c20	Merge branch 'develop' into refactor/report/exponential-smoothing-forecasting	2022-09-21 10:25:47 +05:30
Sagar Sharma	1c0f1a2831	Merge branch 'develop' into refactor/report/exponential-smoothing-forecasting	2022-09-21 09:55:28 +05:30
Sagar Sharma	56f9c1b6f7	refactor: rewrite Exponential Smoothing Forecasting queries in QB	2022-09-21 09:54:38 +05:30
ruthra kumar	122d5f2729	fix: difference amount calculation on payment reconciliation	2022-09-21 08:36:09 +05:30
Sagar Sharma	d3a6881737	Merge branch 'develop' into refactor/report/bom-variance-report	2022-09-20 23:11:08 +05:30
Sagar Sharma	0048f58500	Merge branch 'develop' into refactor/report/bom-variance-report	2022-09-20 20:21:49 +05:30
Sagar Sharma	92e03e2c22	Merge branch 'develop' into refactor/report/bom-stock-report	2022-09-20 20:21:38 +05:30
ruthra kumar	6e65f01ede	Merge pull request #32296 from ruthra-kumar/amount_in_words_for_debit_note ... fix: get amount in words for debit note	2022-09-20 18:09:33 +05:30
Sagar Sharma	19e64eb247	refactor: rewrite BOM Variance Report queries in QB	2022-09-20 17:56:47 +05:30
ruthra kumar	70f6484d9d	fix: get amount in words for debit note	2022-09-20 17:32:23 +05:30
Sagar Sharma	000c538d65	Merge branch 'develop' into refactor/report/bom-stock-report	2022-09-20 16:27:00 +05:30
Sagar Sharma	390ce5719d	fix: warehouse filter in BOM Stock Calculated Report	2022-09-20 16:25:20 +05:30
Sagar Sharma	8fd7c04920	refactor: rewrite BOM Stock Report queries in QB	2022-09-20 16:23:14 +05:30
Deepesh Garg	d4b01f6ffd	Merge branch 'develop' of https://github.com/frappe/erpnext into fix-remove-no-copy-for-ignore_pricing_rule	2022-09-20 14:58:48 +05:30
Nabin Hait	ecb5fff2ec	Merge pull request #32264 from deepeshgarg007/asset_depreciation_date ... fix: Depreciation posting date only when calculate depreciation is checked	2022-09-20 14:48:03 +05:30
Deepesh Garg	ef7d7e7d71	Merge pull request #32204 from deepeshgarg007/pending_tds_vouchers ... fix(UX): More predictable tax withholding application in invoices	2022-09-20 14:35:16 +05:30
Sagar Sharma	dad40b8d51	Merge branch 'develop' into refactor/report/item-shortage-report	2022-09-20 10:48:29 +05:30
Sagar Sharma	3dc754cac2	test: add test cases for Item Shortage Report	2022-09-20 10:48:05 +05:30
Sagar Sharma	f0a78aa559	refactor: rewrite Item Shortage Report queries in QB	2022-09-20 10:47:55 +05:30
Deepesh Garg	3d356763d0	Merge pull request #32217 from ruthra-kumar/bug_in_tax_on_multi_currency_payment_entry ... fix: incorrect gl if tax on multi currency payment entry	2022-09-20 09:59:47 +05:30
Deepesh Garg	49538e81de	Merge pull request #32235 from maharshivpatel/fix-payment-schedule-description ... fix: fetch description only if empty on the payment schedule	2022-09-20 09:13:43 +05:30
Deepesh Garg	1f4932966a	Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers	2022-09-20 09:06:35 +05:30
Deepesh Garg	9aa1f84d45	chore: fix tests	2022-09-20 09:06:18 +05:30
Ernesto Ruiz	94199b7867	fix: add translate function to strings	2022-09-19 11:56:42 -06:00
Ernesto Ruiz	aa49ec815a	fix: add translate function to strings	2022-09-19 11:55:13 -06:00
Ernesto Ruiz	9decebe6e1	fix: Add strings to translate function	2022-09-19 10:13:30 -06:00
Sagar Sharma	a4db9abcb4	Merge branch 'develop' into fix/stock-entry/subcontract-order-item-reference	2022-09-19 18:52:27 +05:30
Sagar Sharma	3a9c08e7c9	fix: po_detail or sco_rm_detail not getting set while while mapping SE	2022-09-19 18:47:46 +05:30
Deepesh Garg	083309c056	fix: Incoming rate precision fixes for intra company transfer	2022-09-19 15:06:06 +05:30
ruthra kumar	efc9553561	Merge pull request #32251 from ruthra-kumar/set_default_supplier_currency_for_po_created_from_so ... fix: use default supplier currency if default supplier is enabled	2022-09-19 12:44:51 +05:30
Deepesh Garg	fac82cf69b	fix: Depreciation posting date only when calculate depreciation is checked	2022-09-18 19:41:05 +05:30
Shashank Shirke	785eaf8e8f	fix: broken link for item valuation updated ... Old URL (404 Not Found): https://docs.erpnext.com/docs/v13/user/manual/en/stock/item/item-valuation-fifo-and-moving-average Updated URL: https://docs.erpnext.com/docs/v13/user/manual/en/stock/articles/calculation-of-valuation-rate-in-fifo-and-moving-average	2022-09-18 05:42:47 -07:00
Sagar Sharma	b747d9d05e	Merge branch 'develop' into fix/stock-entry/supplied-item-reference	2022-09-18 11:37:38 +05:30
Sagar Sharma	b90875575c	fix: make po_detail or sco_rm_detail mandatory for SE Send to Subcontractor	2022-09-18 11:37:07 +05:30
Deepesh Garg	110840aa98	Merge pull request #32244 from deepeshgarg007/project_po_linking ... fix: Parent Level project linkning on creating PO from project	2022-09-17 20:29:40 +05:30
ruthra kumar	77fdc37cb7	fix: use default supplier currency if default supplier is enabled	2022-09-17 16:34:33 +05:30
Sagar Sharma	2f97370b8e	fix: sco_rm_detail in Stock Entry	2022-09-17 14:29:42 +05:30
rohitwaghchaure	3c01bf3a12	Merge pull request #32238 from rohitwaghchaure/fix-pricing-rules-issues ... fix: suggestion threshold label and rule was not working for other item with min and max amount	2022-09-17 12:11:24 +05:30
Devin Slauenwhite	32e75ff808	feat: audible indication of scan status.	2022-09-16 17:58:01 -04:00
Devin Slauenwhite	613c8158a8	fix: actually reject process_scan when update_table fails.	2022-09-16 17:49:00 -04:00
Deepesh Garg	93e134aab0	fix: Parent Level project linkning on creating PO from project	2022-09-16 22:44:23 +05:30
Maharshi Patel	8c5b420aea	fix: remove no_copy for ignore_pricing_rule	2022-09-16 18:26:00 +05:30
Sagar Sharma	bd6af7c613	test: update test case for production plan pending-qty	2022-09-16 18:00:26 +05:30
ruthra kumar	5bd5dd7262	test: gl entries of payments with advance tax	2022-09-16 16:22:21 +05:30
Rohit Waghchaure	f5bd3fa952	fix: suggestion threshold label and rule was not working for other items with min and max amount	2022-09-16 16:03:08 +05:30
Sagar Sharma	5be7d42dfd	fix: production plan pending-qty	2022-09-16 14:39:39 +05:30
Maharshi Patel	f4b64686ae	fix: fetch description only if empty on the payment schedule ... added fetch_if_empty on description field of payment_schedule.	2022-09-16 14:14:14 +05:30
Deepesh Garg	36d0906ea2	fix: TDS deduction via journal entry	2022-09-16 13:50:37 +05:30
ruthra kumar	f0ae77b23b	fix: incorrect gl if tax on multi currency payment entry	2022-09-16 12:40:40 +05:30
Deepesh Garg	0a6462e627	Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers	2022-09-16 12:35:39 +05:30
Sagar Sharma	be0d9d8c13	Merge branch 'develop' into refactor/file/production_plan.py	2022-09-16 12:28:48 +05:30
Sagar Sharma	b8cf3b4c77	refactor: rewrite Production Plan queries in QB	2022-09-16 12:23:43 +05:30
Deepesh Garg	38d00f407e	Merge pull request #32225 from nabinhait/dunning-fix ... fix: create dunning from sales invoice	2022-09-16 11:04:55 +05:30
Deepesh Garg	e4ef6c9645	Merge pull request #32219 from nabinhait/bank-clearnance-perm-issue ... fix: No permission to read doctype	2022-09-16 11:04:42 +05:30
Nabin Hait	0286f2da78	Merge branch 'develop' into dunning-fix	2022-09-16 09:40:18 +05:30
Nabin Hait	a1fcabee0e	Merge pull request #32221 from rohitwaghchaure/consider-posting-time-for-internal-po ... fix: consider posting time for internal transfer PO	2022-09-16 09:37:45 +05:30
anandbaburajan	43a3400221	fix: fix restore asset value after depreciation	2022-09-15 23:25:04 +05:30
anandbaburajan	5a8b28c194	fix: refactor asset capitilization	2022-09-15 22:52:25 +05:30
anandbaburajan	11ac20e5ee	fix: asset tests	2022-09-15 22:43:18 +05:30
Nabin Hait	786891c600	Merge branch 'develop' into bank-clearnance-perm-issue	2022-09-15 17:42:37 +05:30
Nabin Hait	0d732609f0	Merge branch 'develop' into consider-posting-time-for-internal-po	2022-09-15 17:42:26 +05:30
Nabin Hait	c5c6a69269	Merge branch 'develop' into cost-center-renaming	2022-09-15 17:42:13 +05:30
Nabin Hait	73f6c5fe35	Merge branch 'develop' into dunning-fix	2022-09-15 17:42:00 +05:30
anandbaburajan	ff5cad1cd6	fix: calculate depreciation properly on asset sale entry and scrap entry	2022-09-15 13:15:34 +05:30
Nabin Hait	29db084dc3	fix: create dunning from sales invoice	2022-09-15 13:11:53 +05:30
Nabin Hait	af21a11e1e	fix: abbreviation issue on renaming cost center	2022-09-15 12:09:18 +05:30
Rohit Waghchaure	cb763938dc	fix: consider posting time for internal transfer PO	2022-09-15 11:48:43 +05:30
Nabin Hait	c0da948a4e	fix: No permission to read doctype	2022-09-15 11:27:35 +05:30
Nabin Hait	3457105504	fix: test cases	2022-09-15 11:19:33 +05:30
Nabin Hait	a5b5885933	fix: test cases	2022-09-15 11:19:14 +05:30
Nabin Hait	cbf973d90f	fix: always set default expense account in company	2022-09-15 11:19:06 +05:30
Ankush Menat	97977cdb4b	fix: correct sql output format in CRM patch (#32213)	2022-09-14 19:19:05 +05:30
Abhinav Raut	f2209045f8	fix: pending accrual entries	2022-09-14 11:55:03 +05:30
Deepesh Garg	b6184ce471	test: Add tests	2022-09-14 09:13:02 +05:30
Deepesh Garg	b6d87ae25b	Merge branch 'develop' of https://github.com/frappe/erpnext into pending_tds_vouchers	2022-09-13 22:31:21 +05:30
Sagar Sharma	bf1fa014f4	test: add test case for item master maintain-stock	2022-09-13 22:12:56 +05:30
Sagar Sharma	7b878ea3d8	fix: unknown column error while updating value of maintain-stock in item master	2022-09-13 21:52:58 +05:30
Deepesh Garg	3fb1595a4e	fix: Fetch vouchers to show in Invoice	2022-09-13 20:31:31 +05:30
Deepesh Garg	246c1a9380	fix: Add child table for tax withheld vouchers	2022-09-13 20:05:20 +05:30
Nabin Hait	e24a4b18c4	Merge branch 'SaiFi0102-asset-capitalization' into develop	2022-09-13 15:00:21 +05:30
Nabin Hait	58d430fe3e	feat: Asset Capitalization ... - manual selection of entry type - GLE cleanup with smaller functions - GLE considering periodical inventory - test cases	2022-09-13 14:56:21 +05:30
Deepesh Garg	dc985e0e83	Merge pull request #32190 from maharshivpatel/fix-item-wise-sales-register ... fix: item wise sales register taxes and charges	2022-09-13 13:53:51 +05:30
Shadrak Gurupnor	f2b7c9ee66	fix: validate for active sla (#32132)	2022-09-13 13:42:45 +05:30
Ankush Menat	fffc245922	fix(UX): make Item attachments public by default (#32196)	2022-09-13 13:41:00 +05:30
Deepesh Garg	f8bee0e75f	Merge pull request #32091 from nabinhait/lead-notes-patch ... fix: Migrate old lead notes as per the new format	2022-09-13 12:20:50 +05:30
Rucha Mahabal	eb01f9729d	fix(Employee): shorter tab titles (#32192)	2022-09-13 10:34:35 +05:30
Deepesh Garg	51c37aeee3	Merge branch 'develop' into lead-notes-patch	2022-09-13 09:42:07 +05:30
Raffael Meyer	e00ece7a78	fix: remove EmployeeBoardingController (#32139) ... fix: remove employee boarding controller Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2022-09-13 02:00:04 +05:30
Maharshi Patel	62163ab3d3	fix: item wise sales register taxes and charges ... i have added separate column for other charges. Instead of adding all values to tax_total, it checks if account_type is tax, and then only it adds to total_tax otherwise it adds to the total_other_charges.	2022-09-12 23:44:56 +05:30
Ahmad	4f1cc41b86	fix: pick_list - picked qty getting set to 1 ... (cherry picked from commit 3256e2b8b7cee0e7b95ca58a6f22f96090e2ffaa)	2022-09-12 16:49:45 +00:00
Sagar Sharma	2336bcfe20	Merge branch 'develop' into refactor/report/bom-stock-calculated	2022-09-12 19:20:58 +05:30
rohitwaghchaure	b3b1df7184	Merge pull request #32181 from rohitwaghchaure/fix-min-max-amount-configuration ... fix: promotional scheme min and max amount configuration	2022-09-12 18:30:01 +05:30
Sagar Sharma	d3cd3bc5ef	Merge branch 'develop' into refactor/report/bom-stock-calculated	2022-09-12 17:23:15 +05:30
Sagar Sharma	e1a98c1ff7	test: add test cases for BOM Stock Calculated report	2022-09-12 17:11:00 +05:30
Rohit Waghchaure	a8fd92ddc1	fix: promotional scheme min and max amount configuration	2022-09-12 16:53:52 +05:30
rohitwaghchaure	8f787c08a2	fix: customer code max characters limit issue (#32177)	2022-09-12 16:48:53 +05:30
Sagar Sharma	7a968a5f0d	fix: add missing warehouse filter in BOM Stock Calculated report	2022-09-12 16:12:51 +05:30
Sagar Sharma	56192daabf	fix: required_qty in BOM Stock Calculated report	2022-09-12 16:12:49 +05:30
Nihantra C. Patel	e2b4ae13fa	fix: Set filter condition and spell in AR	2022-09-12 14:09:42 +05:30
Ankush Menat	12d99b3292	refactor: use util method for checking if job is queued	2022-09-12 13:14:48 +05:30
Deepesh Garg	6b94b5334c	Merge pull request #32144 from deepeshgarg007/internal_purchase_invoice_rate ... fix: Rate for internal PI have non stock UOM items	2022-09-12 09:09:43 +05:30
Sagar Sharma	a86023eb09	Merge branch 'develop' into refactor/report/process-loss-report	2022-09-11 19:15:16 +05:30
Sagar Sharma	5245928648	refactor: rewrite Process Loss Report queries in QB	2022-09-11 19:03:59 +05:30
ruthra kumar	0aeb7c6484	Merge pull request #32156 from ruthra-kumar/bug_multiple_call_to_ple_creation ... fix: remove duplicate call to ple creation	2022-09-11 12:21:01 +05:30
ruthra kumar	4adc372f9a	fix: remove multiple call to ple creation	2022-09-11 11:52:17 +05:30
ruthra kumar	4576c1ebc3	Merge pull request #32137 from ruthra-kumar/delete_payment_ledger_entries_on_src_doc_delete ... refactor(minor): delete linked payment ledger entries on source doc deletion	2022-09-11 11:21:24 +05:30
Sagar Sharma	5558191a2a	Merge branch 'develop' into refactor/report/work-order-stock-report	2022-09-10 16:30:15 +05:30
Sagar Sharma	d4c4dddfc3	refactor: rewrite Work Order Stock Report queries in QB	2022-09-10 16:29:47 +05:30
ruthra kumar	70313df531	fix: delete linked payment ledger entries no source doc deletion	2022-09-10 09:30:45 +05:30
Sagar Sharma	723fa9eebc	refactor: BOM Stock Calculated report	2022-09-09 19:11:36 +05:30
Nabin Hait	fefe95052d	fix: resolved merge conflict	2022-09-09 14:40:36 +05:30
Sagar Sharma	2e314a20f1	Merge branch 'develop' into fix/stock-entry/sco	2022-09-09 13:48:14 +05:30
Sagar Sharma	9a3dcb9ad1	fix: validate Subcontracting Order in Stock Entry	2022-09-09 13:46:50 +05:30
Sagar Sharma	30909a9b79	fix: status filter for Subcontracting Order in Stock Entry	2022-09-09 13:45:31 +05:30
Deepesh Garg	0f655e4430	fix: Rate for internal PI have non stock UOM items	2022-09-09 12:40:57 +05:30
Sagar Sharma	b49caf170c	Merge branch 'develop' into fix/v14/stock-entry/send-to-subcontractor	2022-09-09 11:37:12 +05:30
Deepesh Garg	33d0e09497	Merge pull request #32117 from deepeshgarg007/psoa_fontsize ... fix: Reduce font size for Process Statement of accounts print/pdf	2022-09-09 11:18:13 +05:30
rohitwaghchaure	6da45144d0	Merge pull request #32135 from rohitwaghchaure/fixed-incorrect-gl-entries-for-internal-transfer ... fix: reposting not working for internal transferred purchase receipt	2022-09-09 09:30:21 +05:30
Rohit Waghchaure	a03b4ce213	fix: reposting not working for internal transferred purchase receipt	2022-09-08 19:16:00 +05:30
Sagar Sharma	61110dbfe4	Merge branch 'develop' into fix/subcontracting-order/returned-qty	2022-09-08 18:26:50 +05:30
Sagar Sharma	3585daab95	fix: hide "Return of Components" button in closed SCO (#32130)	2022-09-08 18:23:56 +05:30
Sagar Sharma	aea7188304	test: add test case for returned-qty	2022-09-08 18:15:48 +05:30
Sagar Sharma	ccb2889cac	fix: SCO Supplied Items returned-qty	2022-09-08 18:15:45 +05:30
rohitwaghchaure	72d5366e96	Merge pull request #31918 from s-aga-r/fix/subcontracting-receipt/gl-entries ... fix: Subcontracting Receipt GL Entries	2022-09-08 10:17:12 +05:30
rohitwaghchaure	448c5ff3dc	Merge pull request #32118 from rohitwaghchaure/provision-to-manual-reposting ... fix: option to start reposting from repost item valuation	2022-09-07 16:57:43 +05:30
rohitwaghchaure	7dc8ab4069	Merge pull request #32115 from rohitwaghchaure/fixed-label-not-showing-for-filter ... fix: inventory dimension filter's label not showing in the report	2022-09-07 16:38:59 +05:30
Rohit Waghchaure	f1c4aea7b5	fix: option to start reposting from repost item valuation	2022-09-07 16:38:17 +05:30
Deepesh Garg	6bfd193b0d	fix: Reduce font size for Process Statement of accounts print/pdf	2022-09-07 16:34:10 +05:30
ruthra kumar	741b5b4978	Merge pull request #32110 from ruthra-kumar/bank_import_statement_bug ... fix: error on bank statement import	2022-09-07 15:22:14 +05:30
Sagar Sharma	f19049e643	Merge branch 'develop' into fix/subcontracting-receipt/gl-entries	2022-09-07 14:55:56 +05:30
Sagar Sharma	01c2e4d2cf	Merge branch 'develop' into fix/v14/stock-entry/send-to-subcontractor	2022-09-07 14:52:16 +05:30
Rohit Waghchaure	ef7def8f1d	fix: inventory dimension filter's label not showing in the reort	2022-09-07 14:43:12 +05:30
rohitwaghchaure	5b02adbd33	Merge pull request #32113 from rohitwaghchaure/fixed-internal-transfer-flow ... fix: internal transfer flow	2022-09-07 14:26:14 +05:30
Rohit Waghchaure	9d1be48bd2	test: added test case for internal transfer	2022-09-07 13:51:52 +05:30
Devin Slauenwhite	aab2c9c682	fix: require barcode item barcode. (#31957) ... * fix: require barcode item barcode. * fix: make supplier mandatory in Item Supplier DocType Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>	2022-09-07 12:59:46 +05:30
Rohit Waghchaure	b4a102d119	fix: internal transfer flow	2022-09-07 12:48:18 +05:30
ruthra kumar	a6fbb80b94	fix: import error on bank statement import ... Name collision between frameworks file importer's internal log and doctype fieldname - import_log. Frameworks internal log overrode, doctypes field which caused failure in basic fieldtype validation.	2022-09-07 11:19:54 +05:30
Sagar Sharma	008542b715	fix: AD not getting copied from SCO while creating a Material Transfer (#32106)	2022-09-07 10:15:43 +05:30
Deepesh Garg	8efd305afd	Merge pull request #32089 from frappe/mergify/bp/develop/pr-32086 ... fix: QR Code multi currency issue (backport #32086)	2022-09-07 07:46:55 +05:30
Sagar Sharma	2f00413864	fix: consider Stock Entry purpose while getting total supplied qty	2022-09-06 16:42:15 +05:30
rohitwaghchaure	c6380a25d6	Merge pull request #32063 from rohitwaghchaure/fixed-fetch-from-parent ... fix: inventory dimension issues	2022-09-06 10:45:36 +05:30
Rucha Mahabal	5ab5811770	feat: tabbed view for Employee form (#31940)	2022-09-06 10:18:14 +05:30
Rohit Waghchaure	75fcab04b1	test: test cases for PI and DN	2022-09-06 01:42:57 +05:30
Nabin Hait	4b13452022	fix: drop old notes column from lead and prospect	2022-09-05 18:28:09 +05:30
Nabin Hait	2a100abef1	perf: lesser SQL queries and no validation ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2022-09-05 18:16:34 +05:30
Nabin Hait	3abd00f3bb	fix: Migrate old lead notes as per the new format	2022-09-05 18:10:53 +05:30
Sagar Sharma	74c2458bdb	Merge branch 'develop' into t3	2022-09-05 13:56:21 +05:30
Sagar Sharma	a349b58306	refactor(test): test_update_reserved_qty_for_subcontracting	2022-09-05 13:55:55 +05:30
Sagar Sharma	4a7add2169	fix: validate available qty for consumption in SCR	2022-09-05 13:27:03 +05:30
hamzaali15	987ac513c8	fix: QR Code multi currency issue ... When try to scan qr code on app it is showing correct values for multi currencies because it is not getting base amount (cherry picked from commit b10a2b87b65f3c29ed0aae7f30099e9c8ad75377)	2022-09-05 07:13:32 +00:00
Nabin Hait	57257a1795	Merge pull request #32061 from resilient-tech/fix-appointment-creation ... fix(Appointment): create lead notes as child table	2022-09-05 12:25:45 +05:30
Deepesh Garg	3c055f94e1	Merge pull request #31982 from FHenry/dev_enhance_upgrade_process ... fix: upgrade process to version-14 when currency opportunity was not set	2022-09-04 19:03:43 +05:30
Deepesh Garg	118b0c0f86	chore: fix message	2022-09-04 19:03:16 +05:30
Deepesh Garg	10d94ed539	Merge pull request #32045 from SolufyPrivateLimited/Solufy-JET ... fix: Naming series in Journal Entry Template	2022-09-04 16:34:05 +05:30
HENRY Florian	86395c6adb	feat: better Item Price list view (#31954) ... * feat: better Item Price list view	2022-09-04 16:25:03 +05:30
Deepesh Garg	acb88e5c57	Merge pull request #31850 from HarryPaulo/add-two-new-filters-gross-profit ... feat: two new filters for gross profit	2022-09-04 15:56:54 +05:30
Deepesh Garg	1a61d4e8a8	Merge branch 'develop' into fix-consolidation-precision-error	2022-09-04 13:18:10 +05:30
Deepesh Garg	ad8d0efa29	chore: Linting Issues	2022-09-04 13:15:59 +05:30
Rohit Waghchaure	237299948a	fix: fetch from parent not working for custom field	2022-09-03 17:27:00 +05:30
rohitwaghchaure	0efc6a9abe	Merge pull request #32065 from rohitwaghchaure/not-able-to-make-variant-item ... fix: not able to make variant item	2022-09-03 11:52:56 +05:30
Rohit Waghchaure	92b0f9cd7e	fix: not able to make variant item	2022-09-03 11:42:04 +05:30
Sagar Vora	875ff15109	test: dont create lead manually, add coverage for notes	2022-09-02 18:30:39 +05:30
Sagar Vora	58e553151e	fix(Appointment): create lead notes as child table	2022-09-02 12:42:37 +00:00
HENRY Florian	7919513c8a	Merge branch 'develop' into dev_enhance_upgrade_process	2022-09-02 13:01:06 +02:00
ruthra kumar	e424ad5ff2	Merge pull request #32054 from ruthra-kumar/bug_in_process_deferred_accounting ... fix: type error on cancellation of Process Deferred Accounting	2022-09-02 16:20:31 +05:30
ruthra kumar	64f8010a25	Merge pull request #32052 from ruthra-kumar/key_error_on_consolidate_financial_report ... fix: key error on consolidated financial report	2022-09-02 16:13:19 +05:30
ruthra kumar	1c385541fa	test: pda document submission and cancellation	2022-09-02 12:34:02 +05:30
ruthra kumar	08f2e4edc3	fix: incorrect import parameter for cancel PDA	2022-09-02 10:51:51 +05:30
ruthra kumar	6e8395cccd	fix: key error on consolidated financial report ... accounts with same name but different account number will throw key error on consolidated report	2022-09-02 09:55:24 +05:30
Sagar Sharma	68907ca783	chore: set BOM as default value for Backflush Raw Materials of Subcontract Based On (#32048) ... chore: set BOM as default value for Backflush Raw Materials of Subcontract Based On in Buying Settings	2022-09-01 19:31:55 +05:30
Dhananjay Palshikar	75396c02d2	Allow Item Templates in Work Order Items ... Item Variants can be a part of the items tables, however, when BOM items are fetched to be a part of the Work Order items, item variants were being filtered out. The filtering out does not serve a purpose. Having Item variants in BOMs allows for template like behaviour.	2022-09-01 19:07:13 +05:30
Solufyin	2085626390	fix: Naming series in Journal Entry Template	2022-09-01 11:49:13 +05:30
HENRY Florian	b05fdb28ff	Merge branch 'develop' into dev_enhance_upgrade_process	2022-08-31 13:52:28 +02:00
Ankush Menat	30039e8e62	fix: encode thumbnail URL ... If it contains space the URL won't load	2022-08-31 17:06:20 +05:30
Ankush Menat	4a38ce659d	refactor!: drop redisearch ... incr: replace text and tag fields incr: use rediswrapper's make key incr: indexDefinition from redis incr: replace index creation incr: replace AutoCompleter incr: replace product search ac incr: replace client querying fix: broken redisearch load test fix: pass actual query to get suggestion	2022-08-31 17:06:20 +05:30
Deepesh Garg	a76d3827ec	chore: Add check for principal amount	2022-08-30 19:24:57 +05:30
Deepesh Garg	eefc9b7172	fix: Loan Interest accruals for 0 rated loans	2022-08-30 19:16:36 +05:30
Ankush Menat	ffa3071d36	fix: force delete old report docs (#32026)	2022-08-30 15:43:57 +05:30
Deepesh Garg	9e0e308a44	Merge pull request #32005 from niyazrazak/patch-4 ... fix: lost quotation not to expired	2022-08-30 10:33:01 +05:30
Raffael Meyer	73f4d5931d	fix: permissions for Task Type (#32016)	2022-08-29 21:56:07 +05:30
Ankush Menat	2d41704424	fix(patch): update sla doctype directly (#32014) ... fix: update sla doctype directly	2022-08-29 20:50:27 +05:30
ruthra kumar	25072e5d32	Merge pull request #32009 from ruthra-kumar/add_remarks_to_payment_ledger ... refactor: readd remarks field to payment ledger	2022-08-29 19:48:36 +05:30
ruthra kumar	d522f13d55	chore: add remarks migration to patches.txt	2022-08-29 15:59:56 +05:30
ruthra kumar	3a6b095ed4	chore: patch for migrating remarks to payment ledger	2022-08-29 15:59:56 +05:30
ruthra kumar	5782c4469a	refactor: re-add remarks field to payment ledger and AR/AP report	2022-08-29 15:59:37 +05:30
Deepesh Garg	6881b68ed7	Merge pull request #32006 from deepeshgarg007/cash_and_non_trade_discount_rounded_total ... fix: Rounded total for cash and non trade discount invoices	2022-08-29 15:35:23 +05:30
Sagar Sharma	9dbaaa33f5	fix: AD not getting copied from SCO while creating a SE (#32004)	2022-08-29 15:07:20 +05:30
MOHAMMED NIYAS	69ffef8c0e	fix: lost quotation not to expired	2022-08-29 14:47:43 +05:30
HENRY Florian	61c143cb82	Merge branch 'develop' into dev_enhance_upgrade_process	2022-08-29 10:49:11 +02:00
Deepesh Garg	318da16b99	fix: Rounded total for cash and non trade discount invoices	2022-08-29 14:18:39 +05:30
Sagar Sharma	af5cbc881f	chore: allow return of components in SCO (#31994) ... chore: allow return of components in sco	2022-08-26 22:49:40 +05:30
Deepesh Garg	87ca23736d	Merge pull request #31988 from ruthra-kumar/remove_precision_discount_percentage ... chore: remove precision on discount_percentage of Sales Invoice Item	2022-08-26 16:03:57 +05:30
HENRY Florian	6cd7ef9cc3	Merge branch 'develop' into dev_enhance_upgrade_process	2022-08-26 11:33:22 +02:00
ruthra kumar	c42fef541a	chore: remove precision on discount_percentage of Sales Invoice Item	2022-08-26 13:15:55 +05:30
Solufyin	bd4b4ddd8b	fix: Purchase Order creation from Sales Order	2022-08-26 11:18:56 +05:30
Florian HENRY	d19b664ba9	chore: better text	2022-08-25 22:35:44 +02:00
Florian HENRY	ac66538651	chore: remove debug	2022-08-25 22:35:08 +02:00
Florian HENRY	9d02fbadb4	fix: upgrade process to version-14 when currency opportunity wass not set	2022-08-25 20:45:35 +02:00
ruthra kumar	6aa8fd0f7b	fix: restrict party types to Supplier/Customer for AR/AP report	2022-08-25 15:50:06 +05:30
Sagar Sharma	8566832dd5	fix: add validation for PO in Stock Entry (#31974)	2022-08-25 15:05:13 +05:30
Deepesh Garg	9e43c9cff3	Merge pull request #31943 from nabinhait/asset-repair ... fix: gl entries for asset repair	2022-08-25 13:24:26 +05:30
rohitwaghchaure	b27f3ab327	Merge pull request #31967 from rohitwaghchaure/connection-added-for-work-order ... fix: material request connection on work order	2022-08-25 12:29:10 +05:30
rohitwaghchaure	dae112eed2	Merge pull request #31966 from rohitwaghchaure/set-default-supplier-from-item ... fix: default supplier not set in the PP	2022-08-25 12:25:00 +05:30
Rohit Waghchaure	9ab10def49	fix: material request connection on work order	2022-08-25 12:13:17 +05:30
Deepesh Garg	c1f6dd46d1	chore: fix against account	2022-08-25 12:10:52 +05:30
Rohit Waghchaure	5fd468d9ec	fix: default supplier not set in the PP	2022-08-25 11:44:12 +05:30
Deepesh Garg	e9b0c7177f	Merge branch 'develop' into fix-consolidation-precision-error	2022-08-25 11:41:20 +05:30
Samuel Danieli	915102a400	chore: german translations (#31463)	2022-08-25 11:23:38 +05:30
Deepesh Garg	5187a9a5ad	Merge pull request #31776 from HarryPaulo/fix-net-amout-sales-analytics ... fix: for Tree Type item and item group show net amout	2022-08-25 11:05:18 +05:30
Deepesh Garg	9b626d06fc	Merge pull request #31909 from s-aga-r/filters/repost-item-valuation/voucher-no ... fix: Add docstatus filter for voucher_no in Repost Item Valuation	2022-08-25 10:49:29 +05:30
rohitwaghchaure	1af22e5312	Merge pull request #31951 from rohitwaghchaure/maintenance-visit-issue ... fix: Purposes not set in Maintenance Visit	2022-08-25 10:48:41 +05:30
Deepesh Garg	77906ea4ab	Merge pull request #31934 from ruthra-kumar/disable_discount_accounting_for_buying ... refactor: disable discount accounting on Buying module(PI)	2022-08-25 10:34:30 +05:30
Deepesh Garg	40bf1a50fd	Merge pull request #31950 from ruthra-kumar/party_currency_or_multi_currency ... fix: display amount in account currency if party is supplied	2022-08-25 10:33:49 +05:30
Deepesh Garg	91d6454f87	Merge pull request #31955 from FHenry/dev_fr_translation ... chore: update french translation	2022-08-25 10:26:17 +05:30
ruthra kumar	e5b04d54ff	fix: display amount in account currency if party is supplied	2022-08-25 10:05:25 +05:30
ruthra kumar	ee889afd4c	Merge pull request #31942 from ruthra-kumar/bug_ar_ap_report_include_payment_against_po ... fix: include payment against PO in AR/AP report	2022-08-25 09:40:45 +05:30
Florian HENRY	299da5d596	chore: update fr translation	2022-08-24 21:29:22 +02:00
Florian HENRY	1f6f2747d4	chore: update fr translation	2022-08-24 21:20:23 +02:00
Florian HENRY	264f98af14	chore: update french translation	2022-08-24 15:52:00 +02:00
Suraj Shetty	122f1c0ced	fix: Explicitly commit "log_error" since its getting called during GET request (#31952)	2022-08-24 18:24:39 +05:30
Rohit Waghchaure	f9a7b31b5b	fix: Purposes not set	2022-08-24 17:16:01 +05:30
ruthra kumar	36f5883dda	test: payments against so/po will show up as outstanding amount ... 1. Class will use FrappeTestCase fixture 2. setup and teardown methods are introduced 3. test for payments against SO	2022-08-24 13:59:42 +05:30
Solufyin	0e26df331c	fix: Route condition set for stock ledger (#31935)	2022-08-24 13:28:55 +05:30
Nabin Hait	b4a2eb2e65	fix: gl entries for asset repair	2022-08-24 12:29:15 +05:30
ruthra kumar	fdd167cac1	fix: include payment against PO in AR/AP report	2022-08-24 12:24:55 +05:30
HENRY Florian	fe73d55f70	chore: add Work Order test dependencies (#31936)	2022-08-23 16:07:10 +05:30
ruthra kumar	277ef04b60	test: remove discount accounting tests	2022-08-23 15:17:27 +05:30
ruthra kumar	a956e20f29	refactor: disable discount accounting on Buying module(PI)	2022-08-23 11:36:00 +05:30
Deepesh Garg	9fd0c25c9f	Merge pull request #31910 from deepeshgarg007/cash_and_non_trade_discount_fix ... fix: Cash and non trade discount calculation	2022-08-23 10:19:09 +05:30
Deepesh Garg	1cb7ae16ab	chore: Linting issues	2022-08-23 09:12:20 +05:30
Sagar Sharma	2effbb55ae	test: Add test case for Subcontracting Receipt GL Entries	2022-08-22 22:14:56 +05:30
Sagar Sharma	bf5c43322a	fix: don't allow to create SCR directly (#31924)	2022-08-22 18:36:42 +05:30
Sagar Sharma	e888639c7e	fix: Subcontracting Receipt GL Entries	2022-08-22 10:48:21 +05:30
Maharshi Patel	42de9ca49e	fix: TDS calculation for advance payment ... "against_voucher": ["is", "not set"] was used in query due to which if TDS was added on "advance" payment vouchers and then reconciled against purchase invoice. it will not find those vouchers and consider this as first-time threshold due to which it will calculate Tax for all transactions. (cherry picked from commit a4521437825a960e14556fa3963bd1bd1a55a2dc)	2022-08-22 03:29:46 +00:00
Deepesh Garg	ae3dce0cbd	fix: Test cases	2022-08-22 08:57:58 +05:30
Sagar Sharma	f4673941e0	chore: move function "add_gl_entry" from purchase_receipt.py to stock_controller.py	2022-08-21 21:26:06 +05:30
Deepesh Garg	3b15966cc9	fix: Cash and non trade discount calculation	2022-08-21 17:51:05 +05:30
Sagar Sharma	520306dc87	fix: Add docstatus filter for voucher_no in Repost Item Valuation	2022-08-21 12:09:08 +05:30
Sagar Sharma	588ca68171	fix: make rate field read-only in subcontracting receipt item (#31905)	2022-08-20 17:50:47 +05:30
Sagar Sharma	f92f3e0208	chore: add option for "Subcontracting Receipt" in "Voucher Type"	2022-08-19 20:52:26 +05:30
Sagar Sharma	f8c11847bb	chore: allow subcontracting receipt backdated entry	2022-08-19 20:44:13 +05:30
Sagar Sharma	dd719099bc	Merge branch 'develop' into fix/subcontracting/additional-cost	2022-08-19 11:47:23 +05:30
Sagar Sharma	c247cf728c	chore: add test for additional-cost	2022-08-19 11:46:36 +05:30
Sagar Sharma	addd7347d8	fix: test "test_pending_and_received_qty"	2022-08-19 11:46:27 +05:30
Saqib Ansari	756fe4b375	fix(pos): edge case while closing pos (#31748) ... * fix(pos): edge case while closing pos * fix: linter * fix: setting posting_time in pos invoice merge log	2022-08-19 10:22:00 +05:30
Sagar Vora	aafb735283	perf: use create_custom_fields (#31853) ... * perf: use `create_custom_fields` * fix: default must be a string	2022-08-18 21:01:20 +05:30
Sagar Sharma	256b4245d5	chore: add additional-cost table in SCR	2022-08-18 20:59:30 +05:30
Sagar Sharma	2fc6833684	fix: recalculate rate of items based on "Recalculate Rate" checkbox	2022-08-18 19:50:00 +05:30
Sagar Sharma	7e88eb549f	chore: remove unwanted field "provisional_expense_account" from SCR (#31847)	2022-08-18 17:39:00 +05:30
Sagar Sharma	ea82fe5bc2	chore: move "set_missing_values_in_additional_costs" from SCO to SC"	2022-08-18 17:20:22 +05:30
Sagar Sharma	eabd3135f0	fix: base_amount and exchange_rate in additional-cost table	2022-08-18 17:16:29 +05:30
Sagar Sharma	d7ed4093d8	fix: additional-cost in items table	2022-08-18 16:45:11 +05:30
ruthra kumar	72a7ed5b58	Merge pull request #31871 from ruthra-kumar/fix_gross_profit_valuation_rate ... fix: incorrect buying amount in Gross Profit rpt	2022-08-18 16:08:19 +05:30
Deepesh Garg	86bdddd1b8	Merge pull request #31875 from adityahase/fix-projects-typo ... fix(projects): Add missing comma	2022-08-18 11:18:51 +05:30
Deepesh Garg	1a6508972e	fix: Make expense account editable in Purchase Receipt Item (#31730) ... Co-authored-by: Sagar Sharma <sagarsharma.s312@gmail.com>	2022-08-18 10:59:39 +05:30
Sagar Sharma	8704ca783d	fix: Add dimension section in subcontracting doctypes (#31849)	2022-08-18 10:58:33 +05:30
Aditya Hase	d38778e400	fix(projects): Add missing comma ... Added with https://github.com/frappe/erpnext/pull/31360	2022-08-17 18:21:43 +05:30
Sagar Sharma	f1a612245c	fix: Transit filter for Default Target Warehouse in SE (#31839)	2022-08-17 16:44:12 +05:30
ruthra kumar	967dd398e7	fix: incorrect buying amount in Gross Profit rpt	2022-08-17 16:21:03 +05:30
Sagar Sharma	2d04e71412	fix: Make expense account editable in Subcontracting Receipt Item (#31848)	2022-08-17 15:57:41 +05:30
rohitwaghchaure	396667b702	Merge pull request #31860 from rohitwaghchaure/delete-custom-fields-on-dimension-delete ... fix: delete custom fields on deletion of inventory dimension	2022-08-17 15:43:54 +05:30
ruthra kumar	ea84c157e0	Merge pull request #31856 from ruthra-kumar/incorrect_tax_due_to_exchange_rate ... fix: incorrect tax amt due to different exchange rate in PR and PI	2022-08-17 15:05:57 +05:30
Rohit Waghchaure	0b39a0123e	fix: delete custom fields on deletion of inventory dimension	2022-08-17 14:55:02 +05:30
rohitwaghchaure	dd08045f28	Merge pull request #31863 from rohitwaghchaure/allow-to-make-material-issue ... fix: not able to issue expired batches	2022-08-17 14:45:14 +05:30
Rohit Waghchaure	795c94384a	fix: not able to issue expired batches	2022-08-17 14:03:55 +05:30
Sagar Sharma	313625c349	fix: incorrect rate in BOM exploded items (#31513)	2022-08-17 13:51:53 +05:30
Sagar Sharma	538cd6fdcf	fix: incorrect produced-qty in production-plan-item (#31706)	2022-08-17 13:01:56 +05:30
ruthra kumar	5fd0770372	fix: incorrect tax amt due to different exchange rate in PR and PI	2022-08-16 16:41:33 +05:30
ruthra kumar	3b4c0a3fc0	fix(minor): don't print tax rate if its '0' (#31838)	2022-08-16 16:35:46 +05:30
hrzzz	3ef551872a	fix: remove spaces and order import	2022-08-15 09:23:56 -03:00
hrzzz	27891ecb77	feat: two new filters for gross profit	2022-08-15 09:14:23 -03:00
Sagar Sharma	0047e18a9b	fix: check item_code in all rows of po_items (#31741) ... fix: check item-code in each row of po-items	2022-08-13 11:07:22 +05:30
Sagar Sharma	e5e88bb9f1	fix: contact search in request for quotation (#31828)	2022-08-13 11:05:48 +05:30
Deepesh Garg	79ac50d0f7	fix: Unable to make payment entry against Fees using education app	2022-08-11 19:31:31 +05:30
Deepesh Garg	72869ed197	Merge pull request #31799 from abhinavxd/fix-process-loan-interest-accrual ... fix: process loan interest accrual	2022-08-11 15:47:18 +05:30
ruthra kumar	5018472840	Merge pull request #31817 from ruthra-kumar/fix_pos_recent_order_crash_due_to_large_data ... fix: limit pos recent order page result	2022-08-10 15:48:28 +05:30
Saqib Ansari	33762dbbac	fix(pos): error while consolidating pos invoices	2022-08-10 14:17:28 +05:30
Nabin Hait	eb25eddc22	Merge pull request #31816 from nabinhait/crm-no-of-employees ... fix: limited options for no-of-employees in the crm documents	2022-08-09 20:47:52 +05:30
Nabin Hait	909945c0ac	fix: map old data as per new options of no-of-employees	2022-08-09 20:47:18 +05:30
ruthra kumar	bb40e38451	fix: limit pos recent order page result	2022-08-09 19:35:43 +05:30
Nabin Hait	7ecd67605f	fix: limited options for no-of-employees in crm	2022-08-09 19:06:57 +05:30
Ankush Menat	08d7c48dc7	refactor: use browser native lazy loading (#31814)	2022-08-09 18:49:14 +05:30
Akash Krishna	32b30bc5de	Tds report (#31801) ... * fix: TDS Computation Summary Report not loading, too many values to unpack	2022-08-09 17:41:02 +05:30
rohitwaghchaure	e93a1cc02e	Merge pull request #31804 from rohitwaghchaure/fixed-incorret-incoming-rate-for-internal-suppliier ... fix: incorrect incoming rate set for inter transfer purchase receipt	2022-08-09 16:00:31 +05:30
Raffael Meyer	6b510546ae	fix: german translations (#31732)	2022-08-09 15:11:52 +05:30
Rohit Waghchaure	ddd24ea8c8	fix: incorrect incoming rate set for inter transfer purchase receipt	2022-08-09 14:50:20 +05:30
Abhinav Raut	534d7ce64b	fix: term loan interest calculation	2022-08-08 17:35:31 +05:30
Deepesh Garg	5c4cc5ae5b	Merge pull request #31779 from ruthra-kumar/bug_add_accouting_dimension_in_asset_repair ... Bug add accouting dimension in asset repair	2022-08-08 16:39:21 +05:30
Abhinav Raut	9ef8d5c5c3	fix: process loan interest accrual	2022-08-08 16:29:13 +05:30
Deepesh Garg	b85dbdc3c1	Merge pull request #31777 from ruthra-kumar/intercompany_po_bug ... fix: intercompany SO created from Purchase Order throws exception	2022-08-08 16:06:09 +05:30
Sagar Vora	d05082987f	fix: set company_address for purchases in party.js	2022-08-08 06:04:10 +00:00
Sagar Vora	a3625b3817	fix: set billing_address for purchases in get_party_details	2022-08-08 06:04:10 +00:00
ruthra kumar	80f508c4b1	chore: patch for creating existing dimensions in asset repair	2022-08-05 15:22:38 +05:30
Abhinav Raut	a272d73dd9	fix: pending principal- amount	2022-08-04 19:04:34 +05:30
ruthra kumar	452584c4bd	fix: add asset repair to accounting dimension list	2022-08-04 14:09:26 +05:30
ruthra kumar	af0a353b79	fix: intercompany SO throws exception	2022-08-04 14:01:23 +05:30
ruthra kumar	ef312b8fc4	test: posting_date should not affect outstanding amount calculation	2022-08-04 09:38:01 +05:30
ruthra kumar	5f1562c5b2	fix: posting_date of linked vouchers should not affect outstanding ... posting_date filter should not be applied for linked vouchers.	2022-08-04 09:38:01 +05:30
hrzzz	91762097a5	fix: for Tree Type item and item group show net amout	2022-08-03 13:09:23 -03:00
Ankush Menat	17b9bfd249	fix(ecommerce): remove query to non-existing field (#31771)	2022-08-03 16:48:27 +05:30
HarryPaulo	ea88451875	fix: getting error to show sales invoice group or print rep… (#31756) ... fix: formatter getting error to show sales invoice group or print report. 1 - When I view the Gross Profit report in Sales Invoice mode, the table is all broken. Error on browser console: TypeError: Cannot read properties of undefined (reading 'indent') 2 - When I try to print, no matter the Group (Sales Invoice, Item Code, Item Group...) nothing happens. in browser log console I have the following error: TypeError: Cannot read properties of undefined (reading 'content') i fixed both errors and all working perfectly.	2022-08-03 11:21:30 +05:30
Devin Slauenwhite	9c580dde39	fix: linter (#31763)	2022-08-03 11:16:59 +05:30
Sagar Vora	9baa222976	fix: specify allowed doctype in queries (#31761)	2022-08-03 11:12:30 +05:30
Rohit Waghchaure	0e7c4314b4	fix: minor changed link	2022-08-01 14:03:12 +05:30
Marica	1a2ffc7c6e	Merge pull request #31601 from pps190/pref-wh-wise-stock-value ... perf: reduce db calls for warehouse wise stock value chart	2022-07-27 17:47:43 +05:30
HENRY Florian	cc1f837685	fix: update fr translations (#31687) ... * fix: update fr translations * fix: update fr translation * fix: update fr translation * chore: Replace apostrophe encoding by symbol Co-authored-by: marination <maricadsouza221197@gmail.com>	2022-07-27 17:21:01 +05:30
Nabin Hait	67fefa37ce	Merge pull request #31678 from nabinhait/crm-fixes-5 ... fix: mentions in notes, workspace links, no-of-employees field type and report fixes	2022-07-27 16:50:18 +05:30
Marica	4fa58d7931	Merge branch 'develop' into make-image-field-obsolete-in-web-item	2022-07-27 14:53:03 +05:30
Suraj Shetty	273c6ff598	Merge pull request #31690 from phot0n/fix-payments-stuff	2022-07-27 14:37:15 +05:30
Marica	56db91b322	Merge branch 'develop' into make-image-field-obsolete-in-web-item	2022-07-27 14:12:09 +05:30
marination	af38baeb3b	fix: Map Item image to Website Item website_image only if published via UI (v13) ... - For v12 Items, `website_image` should be mapped from `Item` to `Website Item`	2022-07-27 14:09:49 +05:30
phot0n	0048bcb067	chore: fix linter	2022-07-27 12:34:52 +05:30
Nabin Hait	02dd174bc7	Merge branch 'develop' into crm-fixes-5	2022-07-27 11:56:36 +05:30
Deepesh Garg	1e3918d637	Merge pull request #31286 from SolufyPrivateLimited/solufy_rec_pay_report ... fix: Added total of future amount, Remaining Balance in Payable and Receivable reports	2022-07-27 08:26:16 +05:30
rohitwaghchaure	cdec6f60de	Merge pull request #31681 from rohitwaghchaure/dont-show-zero-qty-data-in-report ... fix: dont show zero qty available items in stock ageing report	2022-07-27 00:44:11 +05:30
mergify[bot]	5b7b58322f	fix: hero image not loading in portal homepage (backport #31699) (#31700) ... fix: hero image not loading in portal homepage (#31699) (cherry picked from commit 8a6432ec3f4bf63c39d1f687f618cec2360ebccf) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2022-07-26 13:46:03 +05:30
Deepesh Garg	98b42ce786	Merge pull request #31676 from ruthra-kumar/fix_tax_withholding_checkbox_on_PI ... fix: enable tax withholding checkbox in PI with supplier_tds	2022-07-25 12:56:29 +05:30
Marica	d2d651a0c3	Merge branch 'develop' into make-image-field-obsolete-in-web-item	2022-07-25 12:43:08 +05:30
Gavin D'souza	3c26415b6f	fix(gd): Scan FY only if current_fiscal_year set	2022-07-25 11:54:49 +05:30
Gavin D'souza	cb73528c9c	test: Use assertSequenceEqual for comparision between Tuple / Lists ... Use AssertSequence for type agnostic checks	2022-07-25 11:54:49 +05:30
ruthra kumar	9439a7fd30	Merge pull request #31576 from ruthra-kumar/return_not_updating_so_billed_percentage ... fix: credite note for returned delivery note updates SO's billed percentage	2022-07-25 11:24:00 +05:30
phot0n	8004550444	fix: add payments as a required app for erpnext	2022-07-25 10:46:46 +05:30
phot0n	ef14da21bc	fix: payment utils import paths ... Since we're splitting payments app from frappe, updating ERPnext paths as well	2022-07-25 10:38:09 +05:30
Rohit Waghchaure	5da7e01db2	fix: dont show zero qty available items in stock ageing report	2022-07-22 17:54:46 +05:30
Nabin Hait	29b8715205	fix: mentions in notes, workspace links, no-of-employees field type and report fixes	2022-07-22 15:33:39 +05:30
ruthra kumar	b461724416	fix: enable tax withholding checkbox in PI with supplier_tds	2022-07-22 14:32:14 +05:30
Deepesh Garg	538f5a9964	Merge pull request #31497 from HarryPaulo/develop ... fix: translated message for credit limit blocking	2022-07-22 14:22:58 +05:30
Deepesh Garg	80b354f1c7	Merge pull request #31656 from ruthra-kumar/use_current_profile_in_pos_return ... fix: use current pos profile on sales return	2022-07-22 13:10:53 +05:30
Rucha Mahabal	7b0e5661c6	fix(patch): ignore links while deleting hr payroll doctypes (#31674)	2022-07-22 12:46:59 +05:30
Marica	6883fc95ae	Merge pull request #31579 from pps190/fix-pl-customer-name ... fix: display customer name on picking list	2022-07-21 18:38:08 +05:30
billy995	8629d01dd5	Update de.csv (#31596) ... IN,IM to IN,EIN Co-authored-by: Marica <maricadsouza221197@gmail.com>	2022-07-21 14:49:11 +05:30
HENRY Florian	3ba0d6cc5c	fix: update fr translations (#31526) ... * fix: update fr translations * fix: update fr translations * fix: update fr translations * fix: update fr translations * chore: Update french translation Co-authored-by: Marica <maricadsouza221197@gmail.com>	2022-07-21 14:48:42 +05:30
mergify[bot]	89f516c32b	fix: assign duplicate_items_msg outside conditional (backport #31639) (#31650) ... fix: assign duplicate_items_msg outside conditional (#31639) duplicate_items_msg was defined inside if the statement of stock_item so when duplicate was found in non_stock_item it raised referenced before assignment (cherry picked from commit 8e23c6ad69dee213f0252d2b231317490fab760f) Co-authored-by: Maharshi Patel <39730881+maharshivpatel@users.noreply.github.com>	2022-07-21 13:57:03 +05:30
Marc de Lima Lucio	048c037842	FIX: quality inspection quick creation from purchase receipt: pre-fill sample size if available (#31544) ... FIX: quality inspection quick creation from transaction documents: pre-fill sample size if available Co-authored-by: Marica <maricadsouza221197@gmail.com>	2022-07-21 13:46:59 +05:30
Sagar Vora	bf2833b8ee	fix: ensure defaults removed in bad frappe patch get set again (#31659)	2022-07-21 13:32:03 +05:30
ruthra kumar	243f66fcd3	test: SO percentage billed when cr_note made against delivery return	2022-07-21 13:05:34 +05:30
ruthra kumar	04c1019242	fix: update SO's percentage billed on credit note ... Credit Note created from Sales Return will update precentage billed in Sales Order accordingly	2022-07-21 13:05:34 +05:30
Marco Fonseca	d30f8387d9	fix: correct Brazilian portuguese translations (#31498) ... * fix brazilian portuguese translations * minor adjustments * fix minor adjustments * fix: remove legacy pt_br.csv * chore: Fix translation quotation marks Co-authored-by: Marica <maricadsouza221197@gmail.com>	2022-07-21 12:59:04 +05:30
ruthra kumar	739d328412	Merge pull request #31537 from ruthra-kumar/add_index_to_payment_ledger ... refactor: create index for payment ledger	2022-07-21 12:50:39 +05:30
Saqib Ansari	d578afab55	fix: rounding errors while closing pos (#31654)	2022-07-21 12:18:28 +05:30
Saqib Ansari	2eaa8b17bd	fix(pos): validate product bundles while submitting pos invoice (#31615)	2022-07-21 12:17:58 +05:30
ruthra kumar	5b85af5f1a	fix: use current pos profile on sales return	2022-07-21 12:16:16 +05:30
rohitwaghchaure	5a3999e236	Merge pull request #31424 from rohitwaghchaure/feat-inventory-dimension ... feat: Inventory Dimension	2022-07-20 19:47:14 +05:30
Deepesh Garg	6d61525ae4	Merge pull request #31648 from deepeshgarg007/dimension-patch-fix ... fix: Patch to make accounting dimension in orders	2022-07-20 19:02:00 +05:30
Deepesh Garg	cad2035e07	chore: do not re run patch	2022-07-20 19:01:14 +05:30
Deepesh Garg	d46e406db7	fix: Patch to make accounting dimension in orders	2022-07-20 18:59:36 +05:30
Rucha Mahabal	8b67d627d8	fix(patch): Remove missed records for HR & Payroll separation (#31646) ... * fix(patch): delete HR Payroll custom fields from core * fix: delete HR Payroll dashboard chart, number card, web forms	2022-07-20 18:56:37 +05:30
Rohit Waghchaure	289e6cd4ce	fix: change frappe.db.sql to frappe.qb	2022-07-20 16:02:13 +05:30
Rohit Waghchaure	e576f7f07e	test: test cases for inventory dimension	2022-07-20 16:02:13 +05:30
Rohit Waghchaure	dbec5cff00	feat: Inventory Dimension	2022-07-20 16:02:13 +05:30
Rucha Mahabal	f222284c33	Merge branch 'develop' into hr-separation	2022-07-20 15:47:40 +05:30
Nabin Hait	409c2e98a9	Merge pull request #31628 from nabinhait/pcv-perf-enhancements-dev ... perf: Optimization of gl entry processing logic in period closing voucher	2022-07-20 15:38:34 +05:30
Nabin Hait	e1fa723eef	fix: set args to empty list if None to avoid enumerate error	2022-07-20 15:19:09 +05:30
Nabin Hait	b26438ccf7	test: Fixed test for WDV method depreciation schedule	2022-07-20 14:27:06 +05:30
Nabin Hait	6c29146c91	fix: Removed 'Allow Monthly Depreciation' checkbox	2022-07-20 14:27:06 +05:30
Rucha Mahabal	f2532a6aaa	Merge branch 'develop' into hr-separation	2022-07-20 14:22:27 +05:30
Nabin Hait	516be870df	fix: Renamed status field to gle_processing_status	2022-07-20 11:07:02 +05:30
Devin Slauenwhite	7083b3148b	fix: make customer_name field read only.	2022-07-19 11:02:43 -04:00
Devin Slauenwhite	d3f0897420	Merge branch 'develop' into fix-pl-customer-name	2022-07-19 11:01:28 -04:00
rohitwaghchaure	60dbd6a246	Merge pull request #31631 from rohitwaghchaure/slow-stock-reposting-issue ... fix: slow stock reposting	2022-07-19 18:47:23 +05:30
Rucha Mahabal	b30f66c029	chore: use get_single_value in place of get_value	2022-07-19 17:51:03 +05:30
Vladislav	756a7bcc5c	fix: update ru translate (#31594) ... * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * chore: Missing comma Co-authored-by: Marica <maricadsouza221197@gmail.com>	2022-07-19 17:35:08 +05:30
Rohit Waghchaure	1d80d37ccf	fix: slow stock reposting	2022-07-19 16:36:22 +05:30
Nabin Hait	69b906438d	fix: set status on submit/cancel	2022-07-19 15:05:56 +05:30
Nabin Hait	914a388ee3	test: Added test for PCV cancellation	2022-07-19 14:34:01 +05:30
Nabin Hait	4caaab32d1	perf: Optimization of gl entry processing logic in period closing voucher	2022-07-19 14:33:49 +05:30
Rucha Mahabal	8ce526115d	patch: Add HR & Payroll deprecation warning	2022-07-19 13:19:34 +05:30
Rucha Mahabal	eae39964e8	chore: Remove unused files	2022-07-19 13:04:07 +05:30
Marica	2a2db8c64a	Merge branch 'develop' into lcv-future-stock-update	2022-07-19 12:53:51 +05:30
Deepesh Garg	a6ff4db2ec	fix: Supplier details in TDS monthly report (#31599)	2022-07-19 10:14:44 +05:30
Rucha Mahabal	bc2c2aedad	fix(minor): Remove extra space from translated string (#31617)	2022-07-18 13:48:14 +05:30
Wolfram Schmidt	340bf905ec	fix: added Section translation in German for Salary Slip (#31608)	2022-07-18 13:33:51 +05:30
Ankush Menat	755a060ba7	refactor: dont force issue list options (#31613) ... Setting route option forces the filters, only default filters should be set and not forced for each visit.	2022-07-18 11:12:07 +05:30
Rucha Mahabal	2ae48fbdd4	Merge branch 'develop' into hr-separation	2022-07-18 10:58:22 +05:30
Deepesh Garg	b62028722e	Merge pull request #31549 from resilient-tech/ic-lingering-code ... chore: remove missed code for India localisation	2022-07-15 15:20:06 +05:30
Ankush Menat	67a74a4d14	fix: dont check first row on report load ... - This doesn't actually load the chart but leaves UI and data in inconsistent state - On refresh it randomly keeps toggling the first row - confusing behaviour.	2022-07-15 14:09:58 +05:30
Ankush Menat	ceeea6180e	fix: dont override default report options in charts ... Sales analytics and purchase analytics reports are clearing the default options which includes number shortening, axis options etc. This makes report unreadable when dealing with large numbers.	2022-07-15 14:09:58 +05:30
Devin Slauenwhite	1e20358c28	fix: sum stock_value and group by warehouse	2022-07-14 18:53:50 -04:00
Devin Slauenwhite	bc3023318e	chore: remove unused import	2022-07-14 18:09:52 -04:00
Devin Slauenwhite	73ade04dcf	pref: reduce count of db calls from n to 2	2022-07-14 18:09:08 -04:00
Sagar Vora	70c4117c22	fix: unlink custom fields in patch	2022-07-14 15:02:37 +05:30