33187 Commits

Author	SHA1	Message	Date
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
Smit Vora	8fb0997cf1	patch: remove related docs and warn	2022-06-24 21:59:28 +05:30
Deepesh Garg	6acd0325be	fix: General Ledger and TB opening entries mismatch issues	2022-06-24 21:45:05 +05:30
Deepesh Garg	58fe220479	fix: Quotation and Sales Order item sync	2022-06-24 19:43:50 +05:30
ruthra kumar	321fea322c	test: invoice outstanding when gl's are split on cost center allocat	2022-06-24 17:47:11 +05:30
Sagar Vora	b6133c300e	test: create TDS payable account	2022-06-24 16:46:52 +05:30
Sagar Vora	4a2a02286a	test: create tax withholding category instead of updating	2022-06-24 15:49:19 +05:30
Sagar Vora	69ff61c838	fix: add Lower Deduction Certificate to the Accounting workspace for now	2022-06-24 15:12:43 +05:30
Sagar Vora	9b057d15b2	fix: move hooks to reduce diff	2022-06-24 15:04:28 +05:30
Rucha Mahabal	c619b58ba9	fix: remove HR/Payroll references from form dashboards ... - Employee, Holiday List, Project, Task, Timesheet	2022-06-24 15:03:16 +05:30
Vladislav	913b393969	Update ru.csv	2022-06-24 11:16:39 +03:00
Vladislav	2826056d41	Update ru.csv	2022-06-24 11:14:57 +03:00
Smit Vora	3c9eea54a5	fix: remove student naming series	2022-06-24 13:42:07 +05:30
Sagar Vora	593147d337	test: move code to ensure fixtures get created	2022-06-24 14:37:11 +05:30
Sagar Vora	2e6919b7be	fix: remove more India patches	2022-06-24 14:14:12 +05:30
Sagar Vora	ff10f557c0	test: use Sales Expenses instead of VAT to test disabled account	2022-06-24 13:49:20 +05:30
Sagar Vora	12b7e14fde	chore: keep back code to be a part of other apps / to be ported later	2022-06-24 13:38:13 +05:30
ruthra kumar	71f6f78d94	fix: incorrect outstanding for invoice	2022-06-24 13:36:15 +05:30
Rucha Mahabal	39e0d22044	chore: Remove HR related field references from Employee, Department form scripts ... - removed approver fields and payroll cost center from Employee master - removed query filter code for HR related fields from employee and department form scripts - removed `update_approver_role`	2022-06-24 13:14:26 +05:30
Sagar Vora	0810674c8a	Merge remote-tracking branch 'upstream/develop' into remove-india	2022-06-24 13:08:40 +05:30
Marica	1d683ca9f2	Merge pull request #31421 from s-aga-r/fix/production-plan/test/planned-qty ... fix: add UOM validation for planned-qty	2022-06-24 12:40:03 +05:30
Vladislav	f59a6248bc	Update ru.csv ... - fix logic - add translate	2022-06-24 01:02:41 +03:00
Rucha Mahabal	eac58abcc5	chore: Remove HR related reports from other modules ... - Project Profitability report: Projects - Employee Hours Utilization Based on Timesheet: Projects - Unpaid Expense Claims: Accounts	2022-06-23 20:50:55 +05:30
Rucha Mahabal	edb528ce41	chore: Remove code for Expense Claim from Project, Task, Delivery Trip ... - Remove `total_expense_claim` field from Project and Task, will be installed with hrms setup - Remove Expense Claim calculation from `update_costing` in project - Remove `update_total_expense_claim` from task - Remove Expense Claim references from employee form tour - Remove 'Make Expense Claim' button from Delivery Trip, will only be available if hrms is installed - Update delivery trip tests	2022-06-23 19:48:42 +05:30
Rucha Mahabal	1ff0e4519f	chore: Extract Expense Claim, FnF, Gratuity, Employee Advance related code from accounting ... - Added hooks `advance_payment_doctypes`, `invoice_doctypes`, `period_closing_doctypes` for other apps to extend accounting functionality - Removed `set_query` code from `journal_entry.js` and `payment_entry.js` - removed `update_status_for_full_and_final_statement` trigger on JE submission/cancellation - refactored `payment_entry.py`: split functions for validating reference doctypes for easy overriding, removed hrms references from `get_reference_details` and `get_payment_entry` - removed dead code: functions `get_bill_no_and_update_amounts`, `get_total_amount_exchange_rate_base_on_currency`, `get_total_amount_exchange_rate_for_employee_advance`, `get_amounts_based_on_ref_doc`, `get_amounts_based_on_reference_doctype`	2022-06-23 16:17:34 +05:30
GangaManoj	416d578290	fix: Add missing comma	2022-06-23 15:14:31 +05:30
GangaManoj	1b1786532a	test: Test monthly depreciation by Written Down Value method	2022-06-23 15:14:31 +05:30
GangaManoj	2b7ab72a72	fix: Convert string to datetime object	2022-06-23 15:14:31 +05:30
GangaManoj	e62beaefc1	test: Test if final day of the month is taken if depr_start_date is the last day of its month	2022-06-23 15:14:31 +05:30
GangaManoj	154e258ad0	fix: Get last day of the monthif depr posting date is the last day of its month	2022-06-23 15:14:31 +05:30
GangaManoj	b07aae4da5	fix: Correct pro-rata amount calculation	2022-06-23 15:14:31 +05:30
GangaManoj	2d9153ea30	fix: Remove misleading comment	2022-06-23 15:14:31 +05:30
GangaManoj	ab13a178b5	fix: Replace asset life with total no of depreciations	2022-06-23 15:14:31 +05:30
Sagar Sharma	73a15adc67	Merge branch 'develop' into fix/production-plan/test/planned-qty	2022-06-23 11:20:22 +05:30
Deepesh Garg	79d5d35df9	Merge pull request #31395 from nihantra/bank_clear_summ ... fix: filter set in Bank Clearance Summary	2022-06-23 10:54:56 +05:30
Sagar Sharma	70bc51a8fc	Merge branch 'develop' into fix/production-plan/test/planned-qty	2022-06-22 15:33:08 +05:30
s-aga-r	00807abe31	fix: add UOM validation for planned-qty	2022-06-22 14:28:17 +05:30
Deepesh Garg	db2484b6b2	Merge pull request #31418 from ruthra-kumar/payment_ledger_migration_logic_bug ... fix: handle empty values("") in against_voucher columns on gl migration	2022-06-22 12:51:21 +05:30
Marica	46d02ec4b2	Merge branch 'develop' into bom-update-log-cleanup-perf	2022-06-22 11:50:06 +05:30
Marica	55d67a0d09	Merge pull request #31420 from HarryPaulo/translate-status-filter-orders ... fix: translation for filter status on report	2022-06-22 11:45:59 +05:30
hrzzz	8b1ff96e30	fix: translation for filter status on report	2022-06-21 15:10:19 -03:00
rohitwaghchaure	186224a12a	Merge branch 'develop' into fixed-transferred-materials-are-not-consumed	2022-06-21 22:45:05 +05:30
ruthra kumar	5826b7b071	fix: identify empty values "" in against_voucher columns	2022-06-21 19:50:50 +05:30
Vladislav	ce1b4e40a1	fix: update ru translate (#31404) ... * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv fix logic * 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 * Update ru.csv * Update ru.csv	2022-06-21 19:25:05 +05:30
Rucha Mahabal	f6fbcc99a3	chore: Removed payroll dependencies from Loan Management, moved to hrms app ... - Salary Slip Loan dt moved to hrms, removed from erpnext app - Repay from Salary field removed from Loan and Loan Repayment, installed on hrms app setup - fixed references to salary slip loan fields	2022-06-21 18:13:01 +05:30
Ankush Menat	e866ec6e28	Merge pull request #31412 from s-aga-r/fix/bom/default ... fix: set default_bom for item	2022-06-21 16:42:38 +05:30
s-aga-r	dc2830da4d	fix: set default_bom for item	2022-06-21 15:13:01 +05:30
marination	4cf2225a29	chore: Implement Log clearing interface in BOM Update Log ... - Implement Log clearing interface in BOM Update Log - Add additional info in sidebar: Log clearing only happens for 'Update Cost' type logs - 'Replace BOM' logs have important info and is used in BOM timeline, so we'll let users decide if they wanna keep or discard it	2022-06-21 14:10:59 +05:30
Sagar Sharma	912d26361d	Merge branch 'develop' into fixed-transferred-materials-are-not-consumed	2022-06-21 13:23:37 +05:30
Marica	5ae8f5d4b8	Merge branch 'develop' into bom-update-log-cleanup-perf	2022-06-21 11:01:03 +05:30
Deepesh Garg	f572c20009	Merge branch 'develop' into internal_trasfer_precision_loss	2022-06-21 10:45:02 +05:30
s-aga-r	f6ef3068d7	Merge branch 'develop' into subcontracting	2022-06-20 23:10:31 +05:30
s-aga-r	6d89b2fa28	refactor: backport old subcontracting code	2022-06-20 23:10:02 +05:30
barredterra	e2295b4e2f	fix: apply price list rate	2022-06-20 18:52:40 +02:00
Deepesh Garg	46e6c2cd0f	Merge branch 'develop' of https://github.com/frappe/erpnext into sales_exchange_rate_validation	2022-06-20 22:00:49 +05:30
Deepesh Garg	8f37393044	test: Add test case	2022-06-20 22:00:32 +05:30
marination	0320b59ea6	chore: Clear Progress section for completed logs & on_submit UX ... - Delete `BOM Update Batch` table on 'Completed' log, to save space - Hide Progress section on 'Completed' log - Enqueue `on_submit` for 'Update Cost' job, getting leaf boms could take time for huge DBs. Users have to wait for screen to unfreeze. - Add error handling to `process_boms_cost_level_wise` (Called via cron job and on submit, both in background)	2022-06-20 16:25:34 +05:30
Vladislav	b5e22c8e16	Update ru.csv	2022-06-19 21:54:06 +03:00
Sagar Vora	e48a8cd1e8	fix: remove india hook	2022-06-19 23:20:28 +05:30
Sagar Vora	33b54c50ea	chore: remove ITC patch	2022-06-19 23:18:04 +05:30
Sagar Vora	ec9861266e	Merge remote-tracking branch 'upstream/develop' into remove-india	2022-06-19 22:57:22 +05:30
Deepesh Garg	f337213f33	fix(India): Discounts in E-Invoicing	2022-06-19 21:19:02 +05:30
Deepesh Garg	169ff5a0dd	feat: Cash and Non trade discounts in Sales Invoice	2022-06-19 21:18:12 +05:30
Deepesh Garg	9aea017990	Merge pull request #31136 from ruthra-kumar/refactor_payment_reconciliation_tool ... refactor: Payment Reconciliation tool will use Payment Ledger	2022-06-17 21:40:47 +05:30
Conor	ea28ed1bb3	refactor: if() to CASE WHEN (#31360) ... * refactor: if() to CASE WHEN * fix: remove duplicate order by * fix: remove extraneous table * style: reformat to black spec Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-06-17 21:17:48 +05:30
Deepesh Garg	4a90cd6d54	Merge branch 'develop' into refactor_payment_reconciliation_tool	2022-06-17 21:10:48 +05:30
Deepesh Garg	e457288dba	chore: fix condition	2022-06-17 18:56:53 +05:30
Deepesh Garg	02f9441e1a	fix: Quotation lost update	2022-06-17 18:54:42 +05:30
Nihantra C. Patel	0097a2b60c	Update bank_clearance_summary.py	2022-06-17 18:35:11 +05:30
ruthra kumar	3a238b4daa	docs: specification of payment ledger	2022-06-17 17:57:07 +05:30
ruthra kumar	7312f22f35	refactor: update voucher outstanding from payment ledger ... Outstanding amount is updated from payment ledger, only for receivable/payable accounts. For remaining account types, update happens from GL Entry.	2022-06-17 17:57:07 +05:30
ruthra kumar	524c175cf0	refactor: delink gl entry from reconciliation	2022-06-17 17:57:07 +05:30
ruthra kumar	ae8aa8f3e7	refactor: 'get outstanding invoices' popup in payment entry ... Payment entry has option to select outstanding invoices using a popup form. This change refactors the pop to use payment ledger to fetch +ve outstanding invoices.	2022-06-17 17:57:07 +05:30
ruthra kumar	8c87674c62	refactor: outstanding_invoice function and helper class ... outstanding invoice function has been refactored to use payment ledger	2022-06-17 17:57:07 +05:30
ruthra kumar	9cdc388c97	test: payment reconciliation tool ... unit test cases for partial reconciliation, return invoice against invoice, invoice against journals and journal against journal have been added	2022-06-17 17:57:07 +05:30
ruthra kumar	65f47bca31	refactor: payment reconciliation tool ... PR uses payment ledger for outstanding invoice and unreconcilied cr/dr notes.	2022-06-17 17:57:07 +05:30
ruthra kumar	7b383880c6	feat: helper class for quering Payment Ledger	2022-06-17 17:57:07 +05:30
ruthra kumar	05467ffce2	test: use fixture for payment entry test cases (#31390) ... refactor: use fixture for payment entry test cases	2022-06-17 17:23:29 +05:30
Conor	74a782d81d	refactor: DB independent quoting and truthy/falsy values (#31358) ... * refactor: DB independent quoting and truthy/falsy values * style: reformat to black spec * fix: ifnull -> coalesce * fix: coalesce -> Coalesce * fix: revert pypika comparison * refactor: convert queries to QB * fix: incorrect value types for query `=` query makes no sense with list of values * fix: remove warehouse docstatus condition * fix: keep using base rate as rate Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-06-17 17:01:27 +05:30
s-aga-r	ca24b5287e	chore: make "is_subcontracted" field read-only in PR and PI	2022-06-17 16:47:49 +05:30
s-aga-r	5002f1f1e5	feat: Add hidden field "is_old_subcontracting_flow" in PO, PR and PI	2022-06-17 16:47:41 +05:30
Rucha Mahabal	fbc1330ab0	chore: Remove HR/Payroll related setups and fixtures ... - Fixtures moved to HRMS app - 'HR' field in Terms and Conditions removed, added via HRMS setup	2022-06-17 16:34:13 +05:30
Marica	d6078aa911	fix: Respect system precision for user facing balance qty values (#30837) ... * fix: Respect system precision for user facing balance qty values - `get_precision` -> `set_precision` - Use system wide currency precision for `stock_value` - Round of qty defiiciency as per user defined precision (system flt precision), so that it is WYSIWYG for users * fix: Consider system precision when validating future negative qty * test: Immediate Negative Qty precision test - Test for Immediate Negative Qty precision - Stock Entry Negative Qty message: Format available qty in system precision - Pass `stock_uom` as confugrable option in `make_item` * test: Future Negative Qty validation with precision * fix: Use `get_field_precision` for currency precision as it used to - `get_field_precision` defaults to number format for precision (maintain old behaviour) - Don't pass `currency` to `get_field_precision` as its not used anymore	2022-06-17 15:13:13 +05:30
Ankush Menat	74007c8e91	fix(UX): hide irrelevant UOM fields (#31392) ... fix(UX): hide UOM-related fields if they are inconsequential	2022-06-17 15:10:21 +05:30
rohitwaghchaure	2ec133df6d	Merge branch 'develop' into fixed-transferred-materials-are-not-consumed	2022-06-17 15:02:07 +05:30
Ankush Menat	10583eb3ce	fix: UOM handling for transaction without item (#31389) ... If invoice is made without item code then UOM, Stock UOM and conversion_factor all need to be manually added, this is confusing and leads missing them out leads to errors. Simplest solution: - if either UOM exists then set both to same uom conversion factor to - also set conversion factor based on UOM conversions	2022-06-17 12:13:27 +05:30
Vladislav	0e8aad9038	Update ru.csv	2022-06-17 00:28:48 +03:00
Sagar Vora	1a3997a566	fix: transaction date gets unset in material request (#31327) ... * fix: set date correctly in material request * fix: use only `transaction_date` in `get_item_details`	2022-06-16 22:33:47 +05:30
Ankush Menat	6f2086d770	test: verify that all patches exist in patches.txt (#31371) ... * chore: delete orphaned patches * test: orphan/missing entries in patches.txt [skip ci]	2022-06-16 22:15:06 +05:30
Vladislav	75e1f01b9d	Update ru.csv	2022-06-16 18:32:57 +03:00
Vladislav	c869077c92	Update ru.csv	2022-06-16 18:18:35 +03:00
Jingxuan He	b4a93da9f3	chore: Fix a potential variable misuse bug (#31372) ... * Fix a potential variable misuse bug * chore: Separate check (separate line) for empty table in Pricing Rule * chore: Code readability & check for field in row (now row itself) Co-authored-by: marination <maricadsouza221197@gmail.com>	2022-06-16 12:16:59 +05:30
Rucha Mahabal	4b3fb83850	fix: remove Salary Slip creation from Timesheet ... - moved to HRMS app	2022-06-15 23:51:33 +05:30
Ankush Menat	86919d2a6d	test: silent test failure in stock assertions (#31377) ... If actual values are not present then test is silently passing, # of actual values should be at least equal to expected values.	2022-06-15 21:19:09 +05:30
Ankush Menat	5c6f22f275	refactor: simpler batching for GLE reposting (#31374) ... * refactor: simpler batching for GLE reposting * test: add "actual" test for chunked GLE reposting	2022-06-15 19:30:26 +05:30
Vladislav	041a5e7d1f	Merge branch 'frappe:develop' into develop	2022-06-15 15:03:19 +03:00
Rucha Mahabal	39c30f5b01	chore: remove test for employee ... - Moved to the HRMS app	2022-06-15 17:26:19 +05:30
Rushabh Mehta	c0f9b34ede	fix(minor): move variants to separate tab (#31354) ... * fix(minor): move variants to separate tab * fix(minor): variants tab * fix(minor): add counts Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-06-15 16:08:05 +05:30
Ankush Menat	276267d5a6	fix: remove agriculture module from patch (#31369)	2022-06-15 15:26:05 +05:30
Marica	c83b4043b8	Merge pull request #31353 from marination/so-to-wo-bom ... fix: Pick Template BOM if variant BOM absent in WO popup from SO	2022-06-15 14:37:15 +05:30
Rucha Mahabal	0f83e7af56	fix: removed expense claim, advance and salary slip updates from PE/JE events ... - moved them to HRMS app hooks	2022-06-15 13:58:41 +05:30
Ankush Menat	94ad66e55b	chore: revert naming to default (#31364)	2022-06-15 13:35:42 +05:30
Deepesh Garg	be14a7e657	Merge pull request #31365 from ruthra-kumar/add_gl_migration_to_patch ... chore: add gl to payment ledger migarion to patches	2022-06-15 13:20:10 +05:30
ruthra kumar	538faf3639	chore: add gl to payment ledger migarion to patches	2022-06-15 13:17:06 +05:30
Marica	fafdaff4d4	Merge branch 'develop' into so-to-wo-bom	2022-06-15 12:58:13 +05:30
Rucha Mahabal	3fe2ef6790	chore: update import paths for HR	2022-06-15 12:43:45 +05:30
Rucha Mahabal	8b2d045b06	fix(Projects): add a function get_users_email instead of importing from HR	2022-06-15 12:26:15 +05:30
Conor	b8f728a40a	refactor: use CURRENT_DATE instead of CURDATE() (#31356) ... * refactor: use CURRENT_DATE instead of CURDATE() * style: reformat to black spec * refactor: use QB for auto_close queries Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-06-15 12:07:33 +05:30
Nihantra C. Patel	37e9622426	fix: Spelling mistake in quotation depend on (#31362) ... Update quotation.json	2022-06-15 12:02:57 +05:30
Conor	2a9105f26f	refactor: DB independent capitalization of test cases (#31359)	2022-06-15 11:24:24 +05:30
rohitwaghchaure	a4c2c3e02f	Merge branch 'develop' into fixed-transferred-materials-are-not-consumed	2022-06-15 09:41:01 +05:30
Sagar Sharma	406114374b	Merge branch 'develop' into subcontracting	2022-06-14 06:44:29 -07:00
s-aga-r	9a68af36ec	Merge branch 'develop' into subcontracting	2022-06-14 19:13:10 +05:30
Marica	639e4c5714	Merge branch 'develop' into so-to-wo-bom	2022-06-14 18:22:11 +05:30
Ankush Menat	2535d5edd0	perf: GLE reposting with progress and chunking (#31343) ... If stock voucher count goes >1000 then fetching all gles and reposting them all at once requires much more memory and can cause crash. - This PR ensures that GLE reposting is done in chunks of 100 vouchers. - This PR also starts keeping track of how many such chunks were processed so in future progress is resumed in event of timeout.	2022-06-14 18:20:33 +05:30
marination	9f2d325e67	fix: Pick Template BOM if variant BOM absent in WO popup from SO ... - Use `get_default_bom` in sales_order.py (reduce duplicate utility functions) - Remove redundant if else in `get_work_order_items` - `get_default_bom`: If no BOM and template exists try to fetch template BOM - test: `get_work_order_items` via SO and if right BOM is picked	2022-06-14 17:20:44 +05:30
s-aga-r	ca9d55a2fd	chore: update err msg for FG Item in PO	2022-06-14 13:16:22 +05:30
Deepesh Garg	d05d15346a	fix: Conversion rate validation for multi-currency invoices	2022-06-14 12:50:49 +05:30
Deepesh Garg	5b2ba087a3	Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues	2022-06-14 10:50:47 +05:30
Deepesh Garg	fb3da124e5	chore: linting issues	2022-06-14 10:50:38 +05:30
Conor	00ef499739	refactor: use db independent offset syntax (#31345) ... * chore: use db independent offset syntax * fix: typo * style: reformat code to black spec Co-authored-by: Ankush Menat <ankush@frappe.io>	2022-06-14 10:49:07 +05:30
Rucha Mahabal	23b40ff13c	fix: remove active employee validation from timesheets ... - moved to hrms hooks, will only be triggered if app is installed	2022-06-13 20:08:48 +05:30
Marica	f5ebaed191	Merge branch 'develop' into subcontract-supplied-items	2022-06-13 18:32:43 +05:30
marination	b8f468cb4f	test: PO Supplied Qty reset on cancel/submit	2022-06-13 18:31:35 +05:30
marination	fa1d9d548e	fix: Supplied Qty not updated on Stock Entry cancel ... - Loop over PO supplied items and update them as data from SE will exclude a row if supplied qty becomes 0 on cancel - Use DB API insteaf of raw SQL	2022-06-13 17:59:03 +05:30
Ankush Menat	883598d59a	chore: delete BOT ... RIP	2022-06-13 16:24:48 +05:30
Sagar Sharma	f755430098	Merge branch 'develop' into subcontracting	2022-06-13 03:00:53 -07:00
Ankush Menat	697fbe946a	Merge pull request #31337 from gavindsouza/get_fiscal_years-refactor ... refactor: get_fiscal_years API	2022-06-13 14:56:33 +05:30
Gavin D'souza	e9af68e947	test: Remove deprecated as_tuple kwarg in FrappeTestAPI.post	2022-06-13 14:26:59 +05:30
Solufyin	0410752fcf	Merge branch 'frappe:develop' into solufy_rec_pay_report	2022-06-13 13:20:41 +05:30
Gavin D'souza	5f8cd34da5	fix: Use newer PyPDF2 APIs ... Depends on https://github.com/frappe/frappe/pull/17127	2022-06-13 12:43:08 +05:30
Gavin D'souza	0727d1d99b	refactor: get_fiscal_years API ... * Optimize fiscal year options generation * Don't pass unrequired criterions / values to prepared query * Use QB notation for raw query	2022-06-13 12:43:08 +05:30
Deepesh Garg	ea276a7b86	Merge branch 'develop' into refactor_ar/ap_report	2022-06-13 12:34:47 +05:30
Marica	d3d0ade89f	chore: Accidental '=' instead of comma in French translation (#31335)	2022-06-13 11:54:12 +05:30
HENRY Florian	83367bfe5e	fix: update fr translation (#31232) ... * update fr translation * fix:update fr translation * fix:update fr translation * fix:update fr translation * fix:update fr translation * fix:update fr translation * fix:update fr translation * fix:update fr translation * Update fr.csv update typo * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * update fr translation * fix: Use elision instead of HTML code equivalent * fix: Use elision instead of HTML code equivalent (pt 2) * fix: Use elision/single quote instead of HTML code equivalent (pt 3) Co-authored-by: Marica <maricadsouza221197@gmail.com>	2022-06-13 11:15:47 +05:30
ruthra kumar	3018756482	refactor: remove 'show remarks'	2022-06-13 10:56:33 +05:30
ruthra kumar	71521b6550	refactor: unit test for AR/AP report	2022-06-13 10:56:33 +05:30
ruthra kumar	cd9d70d6ee	refactor: show advance payments in AR/AP report	2022-06-13 10:56:33 +05:30
ruthra kumar	dfe3082596	refactor: AR/AP will use payment ledger	2022-06-13 10:56:30 +05:30
Deepesh Garg	eb93564db6	Merge branch 'develop' of https://github.com/frappe/erpnext into quotation_issues	2022-06-11 21:56:24 +05:30
Deepesh Garg	118c786e63	fix: Partially Ordered status for quotation	2022-06-11 21:55:59 +05:30
Vladislav	7bdeac49f4	Update ru.csv	2022-06-11 15:59:49 +03:00
Deepesh Garg	243625898e	fix(India): Sales taxes and charges template fetching in quotation	2022-06-10 22:05:58 +05:30
Vladislav	89e720fdf4	Update ru.csv	2022-06-10 17:24:28 +03:00
Deepesh Garg	2fc04f661a	fix: Company address filter in quotation	2022-06-10 19:23:17 +05:30
barredterra	f6695909c4	fix: remove DATEV from accounting workspace	2022-06-10 15:51:02 +02:00
Ankush Menat	39ec0aca95	fix(UX): use doc.status for Job Card status (#31320) ... fix(UX): use doc.status for JC status - Use doc.status directly for indicator - single source of truth - Update status to cancelled when doc is cancelled	2022-06-10 18:43:46 +05:30
Rucha Mahabal	ab8df98cab	chore: Remove regional code for India HR, moved to HRMS	2022-06-10 18:22:07 +05:30
Deepesh Garg	3d76b1a093	Merge pull request #31182 from ruthra-kumar/migrate_gl_to_payment_ledger_using_sql ... refactor: migrating data from GL to payment ledger using raw SQL	2022-06-10 17:15:58 +05:30
Rucha Mahabal	85b18e23d7	fix: remove employee reminders, move to HRMS app ... - change `erpnext.hr.EmployeeController` to `erpnext.setup.EmployeeController`	2022-06-10 16:26:07 +05:30
Vladislav	84620a775d	Update ru.csv	2022-06-10 13:35:51 +03:00
Vladislav	3e66f4214d	Update ru.csv	2022-06-10 13:12:09 +03:00
Rucha Mahabal	512c82f76d	chore: Update imports/paths for doctypes moved to erpnext setup module	2022-06-10 15:06:54 +05:30
hendrik	74b274f555	fix: update Period Closing Voucher per Company ... Validate period closing voucher company-wise	2022-06-10 14:52:53 +05:30
Ankush Menat	450bef8443	Merge pull request #31240 from ankush/repost_match_gle ... fix: unnecessary GLE reposts	2022-06-10 14:51:45 +05:30
Ankush Menat	3a3d13622d	refactor!: drop github connector from ERPNext (#31316)	2022-06-10 14:01:41 +05:30
Ankush Menat	1646fbe478	refactor: remove add_fetch (#31315) ... - Sales Team already had fetch from set up - Set up fetch from on sales partner in sales transaction Reason for removal: the JS code applies arbitrarily to any field called "sales_person"	2022-06-10 13:52:17 +05:30
ruthra kumar	e2c52436da	refactor: migrate gl to payment ledger using sql	2022-06-10 13:17:43 +05:30
Deepesh Garg	9562c28408	Merge pull request #31198 from HarryPaulo/gross-profit-monthly-schedule ... feat: two new groupby mode on gross profit: Monthly, Payment Term	2022-06-10 12:52:35 +05:30
Rucha Mahabal	0d34e589fd	chore: Remove HR and Payroll modules from ERPNext	2022-06-10 12:51:29 +05:30
Rucha Mahabal	a117af253b	fix: remove HR specific fields from depatment and employee ... - these will be added to the masters as custom fields on HRMS app setup	2022-06-10 12:42:59 +05:30
Marica	2941a8ce73	Merge pull request #31303 from marination/update-employee-compatibility-fix ... fix: locale Currency and Float setting in update_employee	2022-06-10 11:35:02 +05:30
Ankush Menat	6fc32b83c8	fix: revert show title field on Employee doctype (#31312)	2022-06-10 11:03:51 +05:30
Rucha Mahabal	f520f042af	chore: move widely used doctypes from HR to Setup module ... - Employee: used in Telephony, Stock, Quality, Projects, Manufacturing, Loans, Buying, Assets, Accounts, Dependent Apps: Healthcare - Holiday List: CRM (Appointment Booking), Projects, Healthcare, Support (SLA), Education (Student's Holiday List) - Branch: Selling (SMS Center), used widely as an accounting dimension - Department: Assets, Projects, SMS Center, used widely as an accounting dimension - Designation: Lead, Healthcare Practitioner, used in Employee master which will now be in core - Employee Group: Telephony, Communication - Child Tables for above dts: Employee Group Table (Employee Group), Employee Education (Employee), Employee External Work History (Employee), Employee Internal Work History (Employee), Designation Skill (Designation), Holiday (Holiday List)	2022-06-10 11:02:00 +05:30
Deepesh Garg	bbd930184c	Merge pull request #31273 from ruthra-kumar/ignore_payment_ledger_on_loan_cancelation ... fix: ignore payment ledger on cancellation of loan	2022-06-10 10:55:48 +05:30
Deepesh Garg	a2f34d74f3	Merge pull request #31225 from vishdha/fix_date_range_print ... fix: Print/PDF for financial statement reports displays either wrong date range or wrong fiscal year	2022-06-10 10:52:53 +05:30
Deepesh Garg	8008653082	Merge pull request #31294 from deepeshgarg007/gstr_3b_taxable_value ... fix(India): Incorrect taxable in GSTR-3B report	2022-06-10 10:49:14 +05:30
Deepesh Garg	43bf327f9b	Merge pull request #31216 from sunhoww/patch-4 ... fix: Trial Balance failing to ignore Finance Book	2022-06-09 20:34:33 +05:30
Sun Howwrongbum	ee2949aa3f	fix: typo in sql condition	2022-06-09 19:28:59 +05:30
Deepesh Garg	c13e5ad741	fix: Reset represents company on disabling internal customer and supplier (#31302)	2022-06-09 19:18:52 +05:30
Deepesh Garg	b9dbb36d0e	chore: Linting Issues	2022-06-09 18:58:04 +05:30
Vladislav	2675751d6c	fix: update ru translate (#31200) ... * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv * Update ru.csv fix logic * Update ru.csv * Update ru.csv * Update ru.csv	2022-06-09 18:46:08 +05:30
RJPvT	17887cde71	fix: locale Currency and Float setting in update_employee ... In fieldtypes locale settings (example NL) . and , changes whereby the field is inproperly filled	2022-06-09 18:40:51 +05:30
Deepesh Garg	7c8bceca34	Merge pull request #31016 from HarryPaulo/fix-average-discount-auth ... fix: correction of the calculation to the average value when there is…	2022-06-09 18:33:42 +05:30
mergify[bot]	e6f65e1697	chore: Asset Arabic translation Fix (backport #31221) (#31301) ... chore: Asset Arabic translation Fix (#31221) Update ar.csv Fix Translation arabic translation that caused an error when submitting an asset if user language was arabic (cherry picked from commit 9347cbbc9f7826116faf22db7bf9f3bf32e6e3c2) Co-authored-by: meaziz <minaeaziz@gmail.com>	2022-06-09 17:47:15 +05:30
Marica	60968419e7	Merge pull request #31296 from ruthra-kumar/misalinged_columns_in_AR_report ... fix: misaligned columns in print format of AR/AP report	2022-06-09 17:35:21 +05:30
Ankush Menat	16c8b7404d	Merge pull request #31072 from marination/perf-bom-update-tool ... perf: BOM Update Tool	2022-06-09 17:04:00 +05:30
marination	3fa0a46f39	chore: Less hacky tests, versioning (replace bom) and clearing log data (update cost) ... - Remove `auto_commit_on_many_writes` in `update_cost_in_level()` as commits happen every N BOMs - Auto commit every 50 BOMs - test: Remove hacky `frappe.flags.in_test` returns - test: Enqueue `now` if in tests (for update cost and replace bom) - Replace BOM: Copy bom object to `_doc_before_save` so that version.py finds a difference between the two - Replace BOM: Add reference to version - Update Cost: Unset `processed_boms` if Log is completed (useless after completion) - test: `update_cost_in_all_boms_in_test` works close to actual prod implementation (only call Cron job manually) - Test: use `enqueue_replace_bom` so that test works closest to production behaviour Co-authored-by: Ankush Menat <ankushmenat@gmail.com>	2022-06-09 16:27:51 +05:30
Ankush Menat	d9a5213952	fix(ux): hide new version btn on unsaved BOM (#31297)	2022-06-09 15:33:18 +05:30
ruthra kumar	bbaa14af16	fix: misaligned columns in print format of AR/AP report	2022-06-09 15:14:44 +05:30
Deepesh Garg	50aafdbe99	chore: cleanup	2022-06-09 11:52:46 +05:30
Deepesh Garg	20f568c159	fix(India): Incorrect taxable in GSTR-3B report	2022-06-09 11:50:37 +05:30
Ankush Menat	a6edce2397	Merge branch 'develop' into perf-bom-update-tool	2022-06-09 11:45:37 +05:30
Ankush Menat	eb53a9727d	perf: commit GL reposting periodically ... If you have a huge list of docs to repost then maintaining transaction throughtout entire GL reposting is not only unnecessary but also creates performance issues. Periodically commiting the changes prevents lost progress and reduces memory usage.	2022-06-09 11:37:43 +05:30
Ankush Menat	67c26325ee	fix: unnecessary GLE reposts ... In Sales/Purchase invoices credit/debit are flipped and negated while making GLE, this is unflipped while posting them but if we compare the flipped ones it will always result in comparison failure and repost it.	2022-06-09 11:37:40 +05:30
Ankush Menat	65b21ee7d6	fix: internal transfer GLE validation	2022-06-08 19:26:40 +05:30
Nihantra C. Patel	43b0f2efe6	[DEV] Accounts: Added total of future amount, Remaining Balance in Payable and Receivable reports.	2022-06-08 17:36:42 +05:30
Rushabh Mehta	b29edb302c	Merge pull request #31284 from rmehta/item-form-cleanup ... fix(ux): Add tabs in Item	2022-06-08 17:01:57 +05:30
Sagar Sharma	f7a52f76d4	Merge branch 'develop' into subcontracting	2022-06-08 04:27:24 -07:00
Rushabh Mehta	5c6937865c	fix(ux): Add tabs in Item	2022-06-08 16:30:44 +05:30
Marica	2832731601	fix: Use frappe.as_unicode to decode output of redis module list (#31282) ... - As of redis 7, a list is added to the result of fetching the module list - This list cannot be "decoded",so use `frappe.as_unicode` that handles bytes as well as other types	2022-06-08 15:52:13 +05:30
marination	7e41d84a11	chore: get_valuation_rate sider fixes ... - Use qb instead of db.sql - Don't use `args` as argument for function - Cleaner variable names	2022-06-08 14:01:04 +05:30
ruthra kumar	018bc2af43	fix: ignore payment ledger on cancellation of loan	2022-06-08 12:03:47 +05:30
marination	9f2793ccf1	test: Fix test_update_bom_cost_in_all_boms ... - Use base_rate for assertions as rate is subject to change due to conversion factor (USD)	2022-06-08 11:18:53 +05:30