33280 Commits

Author	SHA1	Message	Date
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
Sagar Vora	be4a44fccd	Merge remote-tracking branch 'upstream/develop' into ic-lingering-code	2022-07-14 14:36:14 +05:30
Rucha Mahabal	f765428757	chore: Remove HRMS templates	2022-07-14 11:59:06 +05:30
Rucha Mahabal	db586afc7b	chore: Remove Salary Component Accounts doctype from Accounts module	2022-07-13 13:38:58 +05:30
Devin Slauenwhite	0a633a212d	fix: display customer name on picking list	2022-07-12 13:05:40 -04:00
Rucha Mahabal	d8aa1c59f1	Merge branch 'develop' into hr-separation	2022-07-12 19:27:19 +05:30
Deepesh Garg	d7446fd3ae	Merge pull request #31543 from lebmatter/loan_balance_adjustments ... feat: Loan balance adjustment doctypes	2022-07-12 18:25:45 +05:30
marination	de9ea70ce3	test: LCV impact on future stock balancees	2022-07-12 13:00:00 +05:30
Ankush Menat	2224b6503b	chore: typo ... [skip ci]	2022-07-12 12:39:22 +05:30
Deepesh Garg	0bac030ca7	chore: Linting Issues	2022-07-11 22:04:52 +05:30
Deepesh Garg	d933ff5cf6	chore: Linting Issues	2022-07-11 21:50:01 +05:30
Deepesh Garg	9b40f70ac2	Merge branch 'develop' into add_index_to_payment_ledger	2022-07-11 21:18:10 +05:30
Deepesh Garg	0b822dade0	Merge pull request #31566 from deepeshgarg007/ignore_account_currency ... fix: Allow multi currency invoice against single party account	2022-07-11 21:14:02 +05:30
Deepesh Garg	e04e67c6bf	chore: fix query	2022-07-11 19:25:18 +05:30
Rucha Mahabal	5a51951224	test: Basic Payment Entry for Employee	2022-07-11 14:36:33 +05:30
Deepesh Garg	3cf609fab1	chore: Ignore validation	2022-07-11 13:46:59 +05:30
Deepesh Garg	c83fbd5c50	fix: Allow multi currency invoice against single party account	2022-07-11 13:43:01 +05:30
Rucha Mahabal	cd9a01be5f	test: Loan entries in Bank Reco Statement report	2022-07-11 11:57:25 +05:30
Ankush Menat	3031592368	chore: form tour location ... closes https://github.com/frappe/frappe/issues/17247 [skip ci]	2022-07-11 11:50:57 +05:30
Marica	681b334236	Merge branch 'develop' into make-image-field-obsolete-in-web-item	2022-07-11 11:22:51 +05:30
Marica	18a8e3fd60	Merge pull request #31550 from marination/rfq-email-addressing ... fix: Use Contact Name instead of Supplier in RFQ Email	2022-07-11 11:21:17 +05:30
ruthra kumar	74d9fc2155	refactor: create index for payment ledger	2022-07-11 11:17:27 +05:30
Rucha Mahabal	f6fb00b59d	test: Matching Loan Repayment query in Bank Reco	2022-07-08 19:28:38 +05:30
Ankush Menat	4ec85cb2f0	test: don't silently fail reposts in tests (#31559)	2022-07-08 19:28:03 +05:30
Abhinav Raut	13b7ed1e2c	fix: on cancel for loan refund	2022-07-08 17:58:36 +05:30
Labeeb Mattra	35f2717ad2	Consider refund_amount in pending principal amount	2022-07-08 17:53:29 +05:30
Labeeb Mattra	9df1413adb	fix excess amount calculation in loan refund	2022-07-08 17:52:36 +05:30
Labeeb Mattra	245b0c7818	Update adjustment_type field options	2022-07-08 16:49:19 +05:30
Labeeb Mattra	6cc09ef3a2	fix adjustment amount field name	2022-07-08 16:38:41 +05:30
Marica	dc3d492c83	Merge branch 'develop' into rfq-email-addressing	2022-07-08 15:39:20 +05:30
marination	300e812a1f	chore: Instantiate variable unconditionally	2022-07-08 15:38:44 +05:30
Nabin Hait	a768b4cec3	Merge branch 'develop' into subcontracting	2022-07-08 15:21:03 +05:30
Sagar Sharma	57b6dab1da	fix: status filter in Job Card Summary	2022-07-07 23:19:17 +05:30
Deepesh Garg	5eb2e71f0f	Merge branch 'develop' into develop	2022-07-07 21:15:03 +05:30
Rucha Mahabal	108cce2785	refactor: rewrite raw sql queries with frappe.qb and database API	2022-07-07 19:00:19 +05:30
Labeeb Mattra	0ed6382ab6	fix indent and imports	2022-07-07 17:40:50 +05:30
Rucha Mahabal	64075cbebc	Merge branch 'develop' into hr-separation	2022-07-07 17:36:01 +05:30
Labeeb Mattra	8434ec09c3	fix lint	2022-07-07 17:20:21 +05:30
marination	88ac519b24	fix: Use Contact Name instead of Supplier in RFQ Email	2022-07-07 16:59:23 +05:30
Sagar Vora	93f87cb6e2	chore: remove missed code for India localisation	2022-07-07 16:41:41 +05:30
Ankush Menat	bc3f99321a	refactor: department creation (#31548) ... - all department creation always fails after first company, this is handled in exception handling code but better to not attempt this in first place. - move department creation to company.py this has nothing to do with setup and previous function signature made no sense.	2022-07-07 16:05:18 +05:30
marination	7a6ee8cf2d	chore: Remove image use in website item list	2022-07-07 14:25:02 +05:30
Rucha Mahabal	2248276fe9	chore: Remove gratuity rule patch	2022-07-07 13:48:59 +05:30
Rucha Mahabal	ef02e58859	Merge branch 'develop' into hr-separation	2022-07-07 13:46:54 +05:30
Deepesh Garg	f73408bfd6	fix: Unable to open quotation	2022-07-07 10:47:48 +05:30
Sagar Sharma	f9885746a8	Merge branch 'develop' into subcontracting	2022-07-07 09:56:23 +05:30
Suraj Shetty	c9dc902dee	Merge branch 'develop' into update-library-usage	2022-07-07 09:40:21 +05:30
Labeeb Mattra	1b5b2138ee	Use adjustment amounts in pending principal amnt	2022-07-06 18:52:04 +05:30
Labeeb Mattra	a1a51ce1a6	Add ref no to balance adjustment remarks	2022-07-06 18:52:04 +05:30
Labeeb Mattra	74dbf8c5d9	Add reference number to repayment remarks	2022-07-06 18:52:04 +05:30
Labeeb Mattra	27a8e16b28	Add NPA checkbox in Loan	2022-07-06 18:52:04 +05:30
Labeeb Mattra	7d6e4898c4	Update list view for Accrual and Shortfall	2022-07-06 18:52:04 +05:30
Labeeb Mattra	6febcd529b	Remove loan account field from doctype	2022-07-06 18:52:04 +05:30
Labeeb Mattra	7d468a8778	Use new adjustment amount fields	2022-07-06 18:52:04 +05:30
Labeeb Mattra	d6f632a770	Seperate credit and debit adjust amount fields in Loan	2022-07-06 18:52:04 +05:30
Abhinav Raut	5c0a25012c	feat: add adjustment amount to loan ... - fix: bugs in loan balance adjustment	2022-07-06 18:52:04 +05:30
Labeeb Mattra	2e8f056514	Add Loan Balance Adjustment doctype	2022-07-06 18:52:04 +05:30
Labeeb Mattra	e1682965c5	Add Loan Refund doctype	2022-07-06 18:52:04 +05:30
Labeeb Mattra	88cd780ca1	Add refund amount to loan	2022-07-06 18:52:04 +05:30
Labeeb Mattra	a81da2ea85	Add more loan interest accrual types	2022-07-06 18:52:04 +05:30
Labeeb Mattra	900c878e03	update loan interest accrual types	2022-07-06 18:52:04 +05:30
Suraj Shetty	f0e8a518cd	fix: Update font awesome path	2022-07-06 15:10:39 +05:30
Suraj Shetty	32fd753a14	fix: Update html2text import path	2022-07-06 15:09:44 +05:30
Marica	b58d7d1c89	Merge branch 'develop' into make-image-field-obsolete-in-web-item	2022-07-06 14:43:23 +05:30
rohitwaghchaure	8eb676eb5a	Merge pull request #31519 from rohitwaghchaure/fixed-time-out-error-reposting ... fix: timeout error while reposting	2022-07-06 11:45:02 +05:30
Marica	9b6bb1b3fc	Merge pull request #31529 from marination/petty-purchase ... fix: Use fallback conversion factor while setting incoming rate for petty purchase	2022-07-06 00:38:37 +05:30
Nihantra C. Patel	3e670eda68	fix: Set the condition to create a purchase receipt	2022-07-05 21:19:50 +05:30
marination	eec07833f4	chore: Remove image from ProductQuery fields	2022-07-05 20:31:04 +05:30
marination	aa043fe961	fix: Use fallback conversion factor while setting incoming rate for petty purchase ... - PIs for petty items (that do not need an Item record) are allowed using Item Name field - If a different UOM is used in this case, conversion factor stays 0 and causes an error - Fallback to 1 in `set_incoming_rate` for buying - Selling will need a proper item, so this change is not needed there	2022-07-05 19:43:02 +05:30
rohitwaghchaure	96f46b220b	Merge branch 'develop' into fixed-time-out-error-reposting	2022-07-05 19:23:46 +05:30
Deepesh Garg	37f7801cfb	Merge pull request #29884 from resilient-tech/remove-india ... refactor: remove India specific code	2022-07-05 18:50:41 +05:30
Rohit Waghchaure	78c8bb251e	fix: timeout error while reposting	2022-07-05 18:45:13 +05:30
rohitwaghchaure	c2432778ef	Merge branch 'develop' into fix_test_for_pr_tool	2022-07-05 17:18:50 +05:30
rohitwaghchaure	d5b0b5e798	Merge pull request #31523 from rohitwaghchaure/fixed-test-case-backflushed_batch-raw-materials ... fix: test case	2022-07-05 15:10:59 +05:30
Rohit Waghchaure	7282c8e65b	fix: test case	2022-07-05 15:10:28 +05:30
Sagar Sharma	f75d35ed60	Merge branch 'develop' into subcontracting	2022-07-05 11:25:08 +05:30
Ankush Menat	90942d2ba5	chore: remove currency info from boot (#31520) ... refactor: remove currency info from boot Framework loads this info by default now, so no need to add it here.	2022-07-05 11:22:32 +05:30
Sagar Sharma	a7161d3875	fix: SCO status on SCR cancel	2022-07-05 09:27:56 +05:30
Sagar Sharma	6f7e67db9d	chore: hide "Duplicate" button in PO	2022-07-05 08:44:35 +05:30
Sagar Sharma	687329f571	chore: update fg_item_qty based on qty in PO Item	2022-07-05 08:31:31 +05:30
Deepesh Garg	d5da8c7403	Merge pull request #31516 from deepeshgarg007/previsional_accounting_report ... fix: Incorrect provisional expense booking while reposting	2022-07-04 20:28:10 +05:30
Deepesh Garg	60aad31162	fix: Incorrect provisional expense booking while reposting	2022-07-04 18:38:26 +05:30
ruthra kumar	104c45ecc4	fix: test pr output for amount and currency	2022-07-04 18:04:29 +05:30
marination	7a5fd71a6c	fix: LCV updates wrong future qty/Bin qty ... - As -ve LCV SLE case is returned from `repost_current_voucher`, future qty is not updated - This just doubly shifts all future qty which is then fixed by a repost - Until the repost balance values are wrong - Bin continues to show wrong projected qty even after repost, this is fixed by next SLE that recalculates Bin	2022-07-04 17:46:54 +05:30
hrzzz	8cd3eb5286	fix: translation / linters	2022-07-04 08:02:02 -03:00
Rucha Mahabal	694d35e1c4	fix: Add Designation fixtures	2022-07-04 16:17:26 +05:30
Rucha Mahabal	2da427c023	patch: do not run deletion patch if HRMS is already installed	2022-07-04 14:54:23 +05:30
Marica	75fc4ee938	Merge branch 'develop' into make-image-field-obsolete-in-web-item	2022-07-04 13:14:12 +05:30
Deepesh Garg	ac9d38aa1c	Merge pull request #31499 from ruthra-kumar/bug_use_account_currency_on_reconciliation_tool ... fix: Use account currency on Payment Reconciliation tool	2022-07-03 19:20:29 +05:30
Sagar Vora	05351bee8b	Merge remote-tracking branch 'upstream/develop' into remove-india	2022-07-03 18:07:44 +05:30
Deepesh Garg	b168d2fc25	Merge branch 'develop' of https://github.com/frappe/erpnext into e_invoice_discounts	2022-07-03 11:02:32 +05:30
Deepesh Garg	e54ec4b9b6	chore: use get instead of . operator	2022-07-03 11:02:21 +05:30
Deepesh Garg	6bb203d1f5	Merge pull request #31410 from alyf-de/apply-price-list ... fix: apply price list rate	2022-07-02 22:47:55 +05:30
Deepesh Garg	a4edcfe33b	Merge pull request #31493 from deepeshgarg007/internal_invoicing_references ... fix: Internal PI link in Sales Invoice	2022-07-02 22:47:10 +05:30
Deepesh Garg	38352b3e46	test: Add test for einvoice discounts	2022-07-02 22:27:20 +05:30
Deepesh Garg	b4f6429e32	Merge branch 'develop' of https://github.com/frappe/erpnext into e_invoice_discounts	2022-07-02 18:42:31 +05:30
Sagar Sharma	caeaa3f940	fix: multiple SCO against a PO	2022-07-02 06:20:09 +05:30
Ankush Menat	7e40c86c56	fix(UX): dont apply price list when changing batch on mapped docs (#31503) ... fix(UX): dont apply price list batch change on mapped docs	2022-07-01 20:08:16 +05:30
Rucha Mahabal	466bf99835	fix: Remove Expense Claim from Bank Reconciliation ... - add hooks `get_matching_queries` and `bank_reconciliation_doctypes` to extend the functionality in other apps	2022-07-01 19:01:17 +05:30
Sagar Sharma	fd162f9b14	fix: supplier warehouse in PR	2022-07-01 16:51:19 +05:30
ruthra kumar	c9d67defd8	test: PR output should have account currency	2022-07-01 13:02:14 +05:30
ruthra kumar	219855311d	fix: wrong amount fetched in payment reconciliation tool ... - fetch amount on account currency for outstanding invoices and - unreconcilied dr/cr notes - fix currency field name in payment ledger entry creation	2022-07-01 12:47:07 +05:30
Rucha Mahabal	ef7299470b	Merge branch 'develop' into hr-separation	2022-07-01 11:30:25 +05:30
Rucha Mahabal	a1a6810b58	fix: Remove HR & Payroll from Authorization Control and Rules	2022-07-01 11:28:34 +05:30
mergify[bot]	7b093e5803	fix(Salary Slip): Components not updated when amount evaluates to 0 due to payment days (backport #31425) (#31432) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2022-07-01 10:35:59 +05:30
Rucha Mahabal	7442a886a6	test: fix Employee and Activation test	2022-07-01 10:34:32 +05:30
hrzzz	fbb71a2611	fix: translated message for credit limit blocking	2022-06-30 16:14:51 -03:00
Rucha Mahabal	3051f6e7f2	fix: Update triggers on Payment Reconciliation	2022-06-30 21:37:55 +05:30
Deepesh Garg	536e768ba9	fix: Internal PI link in Sales Invoice	2022-06-30 21:29:54 +05:30
Rucha Mahabal	9f7511d6bf	fix: Remove HR & Payroll Settings from Company master ... - moved setup to HRMS app	2022-06-30 18:12:12 +05:30
Sagar Sharma	b86710bb9a	fix(ui): hide "Update Items" button based on subcontracting conditions	2022-06-30 17:28:42 +05:30
Sagar Sharma	8e4458e0e6	fix: failing test ... Removed this test case as the new POs will not have the Supplied Items table.	2022-06-30 16:47:43 +05:30
Devin Slauenwhite	8a13ddc2f2	fix: gain/loss can be income or expense	2022-06-29 12:28:24 -04:00
Marica	3c1002f9be	Merge branch 'develop' into make-image-field-obsolete-in-web-item	2022-06-29 18:43:00 +05:30
Rucha Mahabal	1497e26f82	fix: patches	2022-06-29 18:38:39 +05:30
Rucha Mahabal	211b46b7e6	fix: Loan Application test	2022-06-29 18:00:48 +05:30
Sagar Sharma	6589c5f5e9	Merge branch 'develop' into subcontracting	2022-06-29 17:29:24 +05:30
gn306029	2a619fd789	fix: Modify opts parameter misspell (#31476) ... Modify opts parameter misspell closes #31474	2022-06-29 14:45:21 +05:30
Rucha Mahabal	f0e2bdf1dc	fix(Projects): Remove total_expense_claim calculation from gross margin	2022-06-29 13:07:06 +05:30
Rucha Mahabal	ef63c61ebd	Merge branch 'develop' into hr-separation	2022-06-29 12:35:51 +05:30
Marica	942aadf436	Merge branch 'develop' into make-image-field-obsolete-in-web-item	2022-06-29 12:23:41 +05:30
Devin Slauenwhite	cdf631b9de	fix: validate item dashboard material transfer entry (#31473)	2022-06-29 12:06:47 +05:30
Marica	1a749e2589	Merge branch 'develop' into make-image-field-obsolete-in-web-item	2022-06-29 10:25:30 +05:30
Deepesh Garg	3bbbf02ca8	Merge pull request #31460 from ruthra-kumar/bug_ar/ap_rpt_delivery_note ... fix: 'attribute error' on AR/AP report with delivery note filter	2022-06-29 08:06:34 +05:30
Sagar Sharma	78ff1783b1	Merge branch 'develop' into subcontracting	2022-06-28 22:20:32 +05:30
Rucha Mahabal	a24cc982e2	fix: Remove HR validations from Employee master	2022-06-28 18:47:14 +05:30
Rucha Mahabal	26a8de69c9	fix: Remove Designation Skill child table ... - moved to HRMS app, since it isn't used anywhere in ERPNext	2022-06-28 17:18:02 +05:30
Rucha Mahabal	6bee20c5e3	chore: Add Fleet Management masters in Setup module for Delivery Trip ... - Driver, Vehicle, Driving License Category (child table) - Removed Email Account setup for Job Applicant from setup wizard	2022-06-28 13:29:35 +05:30
Rucha Mahabal	3c059de122	chore: Remove links for Employee Hours Utilization Based On Timesheet and Project Profitability from Projects workspace	2022-06-28 12:34:01 +05:30
Rucha Mahabal	6f407d3c62	chore: fix code formatting	2022-06-28 12:29:22 +05:30
Ankush Menat	5d73697c64	fix: offset some scheduled jobs to avoid locks (#31466) ... If your site has multiple background workers then there's possibility that two jobs will execute in parallal, this creates problem when both are on operating on same data. This PR adds a separate section for hourly and daily jobs which have frequency offset from default frequency to avoid such conflicts.	2022-06-28 12:22:17 +05:30
Rucha Mahabal	6a65c8aff4	Merge branch 'develop' into hr-separation	2022-06-28 11:51:59 +05:30
Ankush Menat	bedb11ee67	fix: youtube stats background sync failures	2022-06-28 10:50:44 +05:30
Nabin Hait	925b9d985e	fix: open lead and opportunities based on today's event	2022-06-27 22:13:09 +05:30
Nabin Hait	7921a1a605	fix: Restored city, state and country fields	2022-06-27 22:13:09 +05:30
Rucha Mahabal	930e557fc6	fix: remove HR/Payroll patches	2022-06-27 20:25:16 +05:30
Rucha Mahabal	c8712b02f9	patch: Delete HR/Payroll doctypes	2022-06-27 19:59:04 +05:30
Rucha Mahabal	2b255bdddb	fix: Bank Statement loan amount query	2022-06-27 19:18:13 +05:30
ruthra kumar	3cd34ebab6	fix: 'attribute error' on AR/AP report with delivery note filter	2022-06-27 17:29:25 +05:30
Rucha Mahabal	ba8ea0f4fb	chore: Remove HR templates and references from other workspaces ... - Removed template `employees_to_mark_attendance.html` - Removed HR references from ERPNext Settings and Home workspaces	2022-06-27 16:56:24 +05:30
Ankush Menat	dd11f26eba	fix: dont update RM items table if not required (#31408) ... Currently on PO update RM item table is auto computed again and again, if there was any transfer/consumption against that then it will be lost. This change: 1. Disables updating RM table if no change in qty of FG was made. Since RM table can't possibly be different with same FG qty. 2. Blocks update completely if qty is changed and RM items are already transferred.	2022-06-27 15:55:08 +05:30
Ankush Menat	20dac08f5f	refactor: clean up product bundle client side code (#31455) ... refactor: clean up product bundle cient side code - Remove deprecated CUR_FRM scripts - Remove client side fetches and move it to doctype schema	2022-06-27 15:54:54 +05:30
Rucha Mahabal	1d5c8660bb	chore: Remove regional HR reports, custom field setups ... - Removed reports Provident Fund Deductions, Professional Tax Deductions, helper js file `salary_slip_deductions_report_filters.js` - Removed Gratuity rules setup for India and UAE - Removed custom field setup for India - Moved all setups to the HRMS app	2022-06-27 15:12:05 +05:30
marination	9541354ec7	chore: Make image field obsolete in Website Item (redundant) ... - Delete Image field and set `website_image` as form's image field for uploads - Remove instances of `image` field access via Website Item - Item -> Web Item via Desk: Map Item's `image` to Web Item's `website_image` - Item -> Web Item via patch: `website_image` will be mapped with thumbnail - Remove magic that auto-sets `website_image` from `image` in Website Item	2022-06-27 13:00:00 +05:30
Sagar Vora	0aafc75c90	fix: add missing print format	2022-06-26 18:36:00 +05:30
Sagar Vora	85c4c342d8	fix: improve patches	2022-06-26 18:30:54 +05:30
Sagar Vora	7f390fb755	Merge branch 'develop' into remove-india	2022-06-26 18:10:44 +05:30
Smit Vora	64de0d06ad	patch: remove custom field creation patch	2022-06-26 11:56:06 +05:30
Vladislav	7c682c55fa	Update ru.csv	2022-06-26 01:36:11 +03:00
Vladislav	99504ebe52	Update ru.csv	2022-06-26 00:15:30 +03:00
Deepesh Garg	904e69e541	Merge branch 'develop' into quotation_order_item_syn	2022-06-25 19:46:20 +05:30
Deepesh Garg	9c1eb770ba	Merge pull request #31442 from ruthra-kumar/incorrect_outstanding_on_multiple_cost_centers ... fix: incorrect outstanding for invoice	2022-06-25 19:42:14 +05:30
Nabin Hait	f72d5506de	fix: get_all replace by sql	2022-06-25 15:08:45 +05:30
Nabin Hait	2d226be3c4	fix: Made no of employees a select field	2022-06-25 11:40:23 +05:30
Nabin Hait	483fc420a1	test: invoice from timesheet	2022-06-25 11:40:23 +05:30
Nabin Hait	6a0d0a338d	fix: Test cases removed related to copying comments from opportunity to quotation	2022-06-25 11:40:23 +05:30
Nabin Hait	82bf59e2a3	fix: test case	2022-06-25 11:40:23 +05:30
Nabin Hait	d8163f3e47	fix: set exchange rate	2022-06-25 11:40:23 +05:30
Nabin Hait	f904ac599e	fix: merge conflicts and sider issues	2022-06-25 11:40:23 +05:30
Vladislav	49aa7634a3	Update ru.csv	2022-06-25 01:32:24 +03:00