27571 Commits

Author	SHA1	Message	Date
GangaManoj	f3ae1dd23b	fix(Asset): Fix test	2021-07-09 22:38:57 +05:30
GangaManoj	18bbfdf343	fix(Asset Repair): Remove test that's no longer necessary	2021-07-09 22:38:56 +05:30
GangaManoj	39dba43b87	fix(Asset): Fix value_after_depreciation calculation	2021-07-09 22:38:56 +05:30
GangaManoj	3ba9fb32de	fix(Asset Repair): Replace asset_value with value_after_depreciation in tests	2021-07-09 22:38:56 +05:30
GangaManoj	72ea64f6ac	fix: Sider issues	2021-07-09 22:38:49 +05:30
GangaManoj	307fe43e08	fix: Remove changes made to Asset Maintenance	2021-07-09 22:38:02 +05:30
GangaManoj	55bca4cbc7	fix(Asset Repair): Revert Stock Entry on cancellation	2021-07-09 22:38:02 +05:30
GangaManoj	c34e6b1889	fix(Asset): Fix tests for Asset Repair	2021-07-09 22:38:02 +05:30
GangaManoj	ba9558527d	fix(Asset Repair): Return Depreciation Schedule to original state on cancellation	2021-07-09 22:37:08 +05:30
GangaManoj	6c2f4ce6a5	fix(Asset Repair): Increase stock quantity and decrease asset value on cancellation	2021-07-09 22:37:08 +05:30
GangaManoj	ad78888c86	fix(Asset Repair): Compute total_value instantly	2021-07-09 22:37:08 +05:30
GangaManoj	e921878633	fix: Rename 'Stock Item' to 'Asset Repair Consumed Item'	2021-07-09 22:37:08 +05:30
GangaManoj	852881e33e	fix(Asset Repair): Fix tests	2021-07-09 22:37:04 +05:30
GangaManoj	42fd7ffbc0	fix(Asset Repair): Set completion_date on changing repair_status to 'Completed'	2021-07-09 22:36:05 +05:30
GangaManoj	68e0c96c03	fix(Asset Repair): Prevent some fields from being copied on duplicating the doc	2021-07-09 22:36:05 +05:30
GangaManoj	399d17e40e	fix(Asset Repair): Make Error Description non-mandatory	2021-07-09 22:36:05 +05:30
GangaManoj	e755c74a60	fix(Asset Repair): Add Stock Entry field	2021-07-09 22:36:04 +05:30
GangaManoj	4004bcd436	fix(Asset Repair): Move Total Repair Cost to the Stock Consumption Details section	2021-07-09 22:36:04 +05:30
GangaManoj	bd1796cbb6	fix: Replace edit_dates with flags.increase_in_asset_life	2021-07-09 22:36:04 +05:30
GangaManoj	ae8cb335b6	fix(Asset Repair): Fix depreciation_amount calculation	2021-07-09 22:36:04 +05:30
GangaManoj	be536040df	fix: Add comments	2021-07-09 22:36:04 +05:30
GangaManoj	bd336c7d8e	fix(Asset): Add function to clear old depreciation schedule	2021-07-09 22:36:04 +05:30
GangaManoj	54cbc8324a	fix(Asset Repair): Create GL Entries for each item in Stock Items	2021-07-09 22:36:04 +05:30
GangaManoj	50826f16ee	fix(Asset): Replace asset_value with value_after_depreciation in Finance Books	2021-07-09 22:36:04 +05:30
GangaManoj	d354a301cb	fix(Asset Repair): Display value_after_depreciation in Finance Books	2021-07-09 22:36:04 +05:30
GangaManoj	9520efb941	fix(Asset Repair): Filter Warehouse by Company	2021-07-09 22:36:03 +05:30
GangaManoj	96de4fdf1f	fix(Asset Repair): Fix GL Entry creation	2021-07-09 22:36:03 +05:30
GangaManoj	71eaf3dbd8	fix(Asset Repair): Fix Sider issues	2021-07-09 22:36:03 +05:30
GangaManoj	75fbda10ad	fix(Asset Repair): Make Cost Center non-mandatory	2021-07-09 22:36:03 +05:30
GangaManoj	0aaf88cc0a	fix(Asset Repair): Uncheck allow_on_submit for all fields	2021-07-09 22:36:03 +05:30
GangaManoj	9779aa11fb	fix(Asset Repair): Use existing function from asset.py for fetching fixed_asset_account	2021-07-09 22:36:03 +05:30
GangaManoj	aff9709525	fix(Asset Repair): Add mandatory_depends_on condition for Purchase Invoice	2021-07-09 22:36:03 +05:30
GangaManoj	17fa121779	fix(Asset Repair): Filter Cost Center and Project by Company	2021-07-09 22:36:03 +05:30
GangaManoj	867fd02b2d	fix(Asset Repair): Add Company field	2021-07-09 22:36:03 +05:30
GangaManoj	5ab0cabf91	fix(Asset Repair): Make Stock Items and Warehouse mandatory if stock_consumption is checked	2021-07-09 22:36:03 +05:30
GangaManoj	654074ad7a	fix(Asset Repair): Add title to error messages	2021-07-09 22:36:03 +05:30
GangaManoj	fd272569aa	fix(Asset Repair): Display fields according to the state of the doc	2021-07-09 22:36:02 +05:30
GangaManoj	4e620c3b32	fix: Set asset_name as title	2021-07-09 22:35:49 +05:30
GangaManoj	65b2f9234b	fix(Asset Repair): Set company when creating Stock Entry	2021-07-09 22:15:58 +05:30
GangaManoj	2833903ce5	fix(Asset Repair): Add tests	2021-07-09 22:15:42 +05:30
GangaManoj	70de974496	fix(Asset): Add depreciation schedule details in create_asset()	2021-07-09 22:15:42 +05:30
GangaManoj	3f9f0ffdfe	fix(Asset Repair): Add Company in GL Entries	2021-07-09 22:15:42 +05:30
GangaManoj	c6ed66ec5b	fix(Asset Repair): Remove unnecessary condition	2021-07-09 22:15:42 +05:30
GangaManoj	794807ecc3	fix(Asset Repair): Only modify depreciation schedule if calculate_depreciation is checked	2021-07-09 22:15:42 +05:30
GangaManoj	97193a4632	fix: Sider issues	2021-07-09 22:15:10 +05:30
GangaManoj	4e284433d1	fix: Fix depreciation_amount calculation	2021-07-09 22:12:46 +05:30
GangaManoj	42c70fba3c	fix: Modify depreciation schedule when increase_in_asset_life is not a multiple of frequency_of_depreciation)	2021-07-09 22:11:50 +05:30
GangaManoj	58bc967073	fix: Rename 'Fixed Asset Depreciation Settings' to 'Fixed Asset Deafults'	2021-07-09 22:10:35 +05:30
GangaManoj	9e26f2d797	fix: Organize buttons	2021-07-09 22:08:56 +05:30
Deepesh Garg	eae7c1891f	fix: Remove unintentional changes	2021-07-09 20:08:29 +05:30
Deepesh Garg	c13ac4ab11	fix: Remove unintentional changes	2021-07-09 20:00:55 +05:30
Deepesh Garg	171ee51507	fix: Hide amount after tax fields	2021-07-09 18:52:39 +05:30
Deepesh Garg	38fa3a3f89	fix: Unallocated amount in Payment Entry after taxes	2021-07-09 18:04:24 +05:30
Saqib	13d7043451	fix: column 'outstanding_amount' cannot be null (#26404)	2021-07-09 15:33:14 +05:30
Saqib	fe4f58d0f6	fix(e-invoicing): allow export invoice even if no taxes applied (#26405)	2021-07-09 15:32:54 +05:30
Saqib	8e8434a78a	fix: omit item discount amount for e-invoicing (#26353) (#26407)	2021-07-09 15:32:28 +05:30
Subin Tom	9ac63da457	fix: value fetching for custom field in POS (#26367)	2021-07-09 14:35:11 +05:30
Subin Tom	d53991857c	fix: Fixed Budget Variance Graph color from all black to default (#26368)	2021-07-09 14:33:00 +05:30
Marica	eb0dea09bb	Merge pull request #26333 from marination/lcv-validate-invoice ... fix: Validate LCV for Invoices without Update Stock	2021-07-09 13:41:34 +05:30
Marica	01be96adb2	Merge branch 'version-13-hotfix' into qi-rejection	2021-07-09 13:30:21 +05:30
marination	bf462abb00	fix: Rename function and tweak logic ... - Dont validate PI on `else`	2021-07-09 13:12:33 +05:30
Anurag Mishra	afafe406c8	Merge pull request #26388 from Anurag810/training_fix_v13 ... fix: Query for Training Event	2021-07-09 12:21:17 +05:30
Saqib	8f3c7ab402	fix: escape quotes while fetching customer emails (#26329) (#26376)	2021-07-09 10:35:55 +05:30
Rucha Mahabal	3888488b36	fix: precision for expected values in payment entry test	2021-07-08 23:21:48 +05:30
Alan	257cbd3b92	fix: track changes on batch (#26382)	2021-07-08 18:44:30 +05:30
Anurag Mishra	a82e9e42e1	fix: query for training Event	2021-07-08 17:27:21 +05:30
Jannat Patel	cf28950327	Merge pull request #26349 from Anurag810/salary-slip-fix--hotfix ... fix: payroll-entry minor fix	2021-07-08 13:43:55 +05:30
Anurag Mishra	8f945a9852	fix: Removed un-used flag	2021-07-08 13:06:04 +05:30
Mohammad Hasnain Mohsin Rajan	00f90c50c0	chore: add product listing link in settings (#26026) ... * chore: add product listing link in settings * chore: add icon in workspace card Co-authored-by: Ankush <ankush@iwebnotes.com>	2021-07-07 18:21:12 +05:30
rohitwaghchaure	f130f8385e	Merge pull request #26332 from rohitwaghchaure/fixed-bom-stock-report-not-working ... fix: bom stock report not working	2021-07-07 00:22:03 +05:30
rohitwaghchaure	2bdc0e8993	Merge pull request #26350 from rohitwaghchaure/fixed-putaway-fixing-for-material-receipt ... fix: stock entry with putaway rule not working	2021-07-07 00:15:26 +05:30
Rohit Waghchaure	0bd190b885	fix: stock entry with putaway rule not working	2021-07-07 00:14:51 +05:30
Nabin Hait	11d56903e7	Merge pull request #25415 from deepeshgarg007/bootstraped_gst_setup ... feat(India): Bootstrapped GST Setup	2021-07-06 21:44:30 +05:30
Deepesh Garg	67c7067778	Merge pull request #26300 from AfshanKhan/fix-account-selection-gst-settings-v13 ... fix: only "Tax" type accounts should be shown for selection in GST Settings	2021-07-06 20:33:41 +05:30
Saqib	422325bb74	test: fetching of previous sle (#26352)	2021-07-06 18:37:12 +05:30
Deepesh Garg	3636efd7e6	Merge pull request #26355 from deepeshgarg007/flaky_test ... test: Purchase Invoice advance test case	2021-07-06 18:22:26 +05:30
Noah Jacob	5e99aa7f65	fix: stock_rbnb not defined (#26354)	2021-07-06 18:00:35 +05:30
Deepesh Garg	7f794cc0ea	fix: Purchase Invoice advance test case	2021-07-06 17:58:44 +05:30
Afshan	c8eca8a448	fix: remove cancelled entries in consolidated financial statements (#26331)	2021-07-06 14:37:57 +05:30
Anurag Mishra	f0b62f70d5	fix: payroll-entry minor fix	2021-07-06 13:40:22 +05:30
Mohammed Yusuf Shaikh	842674ce79	fix: Added a message to enable appontment booking if disabled (#26334)	2021-07-06 13:34:32 +05:30
Marica	dfe11aca6a	Merge pull request #26284 from marination/order-by-weightage-for-web-items ... fix: Order Items by weightage in the web items query	2021-07-06 13:20:08 +05:30
marination	57d06a86f8	chore: Test to block backdated reco causing future scarcity	2021-07-05 21:56:57 +05:30
Marica	4f51b56928	Merge branch 'version-13-hotfix' into stock-reco-repost_qty	2021-07-05 20:26:01 +05:30
marination	fa9e67502c	chore: Test for backdated reco qty reposting	2021-07-05 20:23:00 +05:30
Deepesh Garg	9b6d9a41f4	fix: Test Cases	2021-07-05 17:08:27 +05:30
Deepesh Garg	15b336df28	fix: Test cases	2021-07-05 14:45:33 +05:30
marination	c69bc54297	fix: Validate LCV for Invoices without Update Stock	2021-07-05 14:24:38 +05:30
Rohit Waghchaure	5638fbb1aa	fix: bom stock report not working	2021-07-05 13:54:05 +05:30
Deepesh Garg	db682d9e4c	fix: Create mode of payment if doesn't exists	2021-07-05 13:46:03 +05:30
Richard Case	75fdf79376	fix: incorrect bom no. added for non-variant items on variant boms (#26320)	2021-07-05 10:56:34 +05:30
Deepesh Garg	a0599e5ac2	fix: Test cases for M-pesa	2021-07-05 10:09:42 +05:30
rohitwaghchaure	22c2d4f118	Merge pull request #26312 from rohitwaghchaure/fixed-employee-issue-in-job-card ... fix: allow to make job card without employee	2021-07-04 22:58:50 +05:30
Deepesh Garg	ddf87594a1	Merge pull request #26287 from deepeshgarg007/bank_statement_import_fix ... fix: Bank statement import	2021-07-04 20:34:10 +05:30
Deepesh Garg	ea5b7d38bb	Merge pull request #26277 from deepeshgarg007/multi-company-deferred-revenue ... fix: Auto process deferred accounting for multi-company setup	2021-07-04 20:32:22 +05:30
Deepesh Garg	cd036e115b	Merge pull request #26231 from deepeshgarg007/party_dashboard ... fix: Do not consider cancelled entries in party dashboard	2021-07-04 20:30:34 +05:30
Rohit Waghchaure	3105332e3c	fix: allow to make job card without employee	2021-07-03 17:25:08 +05:30
Deepesh Garg	63096014a7	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup	2021-07-02 20:30:18 +05:30
marination	311e277204	fix: Sider	2021-07-02 18:11:13 +05:30
Anurag Mishra	73db919c99	fix: set query for training events (#26303) ... * fix: set query * fix: remove whitespace between function and params Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-07-02 17:55:42 +05:30
marination	4503a38361	fix: Handle Stock Reco cancellation and limit reposting ... - Handled cancellation of reco with and without prior SLE - Repost / Recalculate balance qty only till next stock reco	2021-07-02 17:13:45 +05:30
Afshan	b6076f772d	fix: only "Tax" type accounts should be shown for selection in GST Settings	2021-07-02 15:39:16 +05:30
Ashish Shah	c0817838d9	fix: when lead is created with mobile_no, mobile_no value gets lost (#26298) ... Summary: When a Lead is created with mobile_no, mobile_no value gets lost (mobile_no value is overwritten by phone value) It is backport of https://github.com/frappe/erpnext/pull/26116 Steps to reproduce [1]Create a Lead. [2]Enter Person Name(lead_name): before_fix Under Contact section, enter Phone(phone): 11 and Mobile No.(mobile_no):22 [3]Save it [4] F12, cur_frm.doc.phone : 11 (correct) cur_frm.doc.mobile_no : 11 (incorrect, it should be 22) [5]Under Address & Contact section ,check contact_html it shows before_fix Phone: 11 (Primary label is missing) Phone: 22 (incorrect, it should be Mobile No:22, also Primary label is missing) Actual: mobile_no value is lost. it is overwritten by phone value following is image with error (before fix)  Expected: mobile_no value should be retained following is image after fix 	2021-07-02 15:16:42 +05:30
Anupam Kumar	877597bc16	fix: feating employee in payroll entry (#26271)	2021-07-02 13:10:18 +05:30
Jannat Patel	18533e381a	fix: lms progress issue (#26253)	2021-07-02 12:57:06 +05:30
Mohammed Yusuf Shaikh	ad6f20c5c7	fix: Added permission for employee to book appointment (#26255)	2021-07-02 12:32:22 +05:30
Jannat Patel	5173e74a04	fix: Project Portal Enhancements (#26290) ... * fix: project portal enhancements * fix: condition for pills	2021-07-02 11:48:46 +05:30
Deepesh Garg	d4146a91d6	Merge pull request #25323 from m1ngaa/patch-1 ... Delete accounts (an empty file)	2021-07-01 23:38:56 +05:30
Deepesh Garg	991d3cdd76	fix: Incorrect discount amount on amended document	2021-07-01 21:17:17 +05:30
Deepesh Garg	ba2c3c776f	fix: Bank statement import	2021-07-01 18:56:51 +05:30
marination	752f099e9d	fix: Order Items by weightage in the web items query	2021-07-01 17:20:24 +05:30
18alantom	865900fd2d	refactor: add type hints, remove comment, sort imports	2021-07-01 14:37:37 +05:30
Anuja Pawar	d8bc514226	fix: to fetch the correct field in Tax Rule (#25927)	2021-07-01 14:06:01 +05:30
rohitwaghchaure	117cf4eca6	Merge pull request #26278 from rohitwaghchaure/fixed-employee-selection-issue-in-payroll-entry ... fix: employee selection not working in payroll entry	2021-07-01 12:31:45 +05:30
rohitwaghchaure	c14fc9530c	Merge pull request #26279 from rohitwaghchaure/fixed-update-cost-not-working-for-draft-bom ... fix: update cost not working in the draft BOM	2021-07-01 11:57:32 +05:30
Rohit Waghchaure	a856624ccb	fix: employee selection not working in payroll entry	2021-07-01 11:56:55 +05:30
Rohit Waghchaure	0bfd56e615	fix: update cost not working in the draft bom	2021-07-01 11:50:48 +05:30
Deepesh Garg	68c697b354	fix: Auto process deferred accounting for multi-company setup	2021-07-01 09:31:31 +05:30
Rohit Waghchaure	815e6ec846	fix: minor removed unused file	2021-06-30 11:35:50 +05:30
rohitwaghchaure	2a1d1e1cb1	Merge pull request #26240 from rohitwaghchaure/production-plan-sub-assembly-enhancement ... feat: provision to make subcontracted purchase order from the production plan	2021-06-30 11:15:11 +05:30
Rohit Waghchaure	46b67b901b	fix: incorrect valuation rate in stock reconciliation	2021-06-30 00:31:00 +05:30
Deepesh Garg	a287b22b55	Merge pull request #26252 from deepeshgarg007/loan_security_pledge_on_cancel ... fix: Cancellation of Loan Security Pledges	2021-06-29 20:23:46 +05:30
Rohit Waghchaure	61690775a8	feat: provision to make subcontracted purchase order from the production plan	2021-06-29 19:59:20 +05:30
Deepesh Garg	9181dde86a	fix: Cancelation of Loan Security Pledges	2021-06-29 17:18:39 +05:30
Rucha Mahabal	91dcc07e26	fix: Employee Inactive status implications (#26244)	2021-06-29 15:58:46 +05:30
Rohit Waghchaure	2d1c4fee1d	fix: allow to changes to date in the blanket order	2021-06-29 00:33:55 +05:30
Deepesh Garg	7d7d797ffc	fix: Do not consider cancelled entries in party dashboard	2021-06-28 11:24:32 +05:30
Deepesh Garg	ebc46c1e09	fix: Update account heads in GST test cases	2021-06-28 10:52:38 +05:30
Deepesh Garg	cf445eb7b4	fix: Add validate bank account method back	2021-06-26 23:59:47 +05:30
Deepesh Garg	1e5482cedd	fix: Revert Changes	2021-06-26 23:49:32 +05:30
rohitwaghchaure	c1853ddf73	Merge pull request #26226 from rohitwaghchaure/fixed-removed-values-out-of-sync-on-stock-transaction-submission ... fix: removed values out of sync validation from stock transactions	2021-06-26 22:28:42 +05:30
Rohit Waghchaure	170f2ad056	fix: removed values out of sync validation from stock transactions	2021-06-26 21:42:47 +05:30
Rohit Waghchaure	e5c47f8957	fix: fetch batch items in stock reco	2021-06-26 17:40:27 +05:30
18alantom	98c9b0e9ed	refactor: remove unused func, sider fixes	2021-06-25 16:13:09 +05:30
Marica	5474c09c70	Merge pull request #25886 from ankush/work_order_flat_ops ... fix: order and time of operations in multilevel BOM work order	2021-06-25 16:05:54 +05:30
Ankush Menat	9e43445f36	fix: order and time of operations for multilevel bom ... - Order of operations was being sorted by idx of individual operations in BOM table, which made the ordering useless. - This adds ordering that's sorted from lowest level item to top level item. - chore: remove dead functionality. There's no `items` table. Required item level operations get overwritten on fetching of items / operations e.g. when clicking on multi-level BOM checkbox. - test: add test for tree representation - feat: BOMTree class to get complete representation of a tree	2021-06-25 14:44:55 +05:30
Ankush Menat	6ec8875434	fix(ux): show bom in operations child table	2021-06-25 14:44:53 +05:30
Ankush Menat	ff4aadc657	chore: remove dead and py2 compatibility code ... form_grid_template doesn't exist	2021-06-25 14:43:49 +05:30
Deepesh Garg	e955a4ee72	fix: Check for is None	2021-06-25 13:38:06 +05:30
Deepesh Garg	2ca9b765ef	fix: Error while fetching item taxes	2021-06-25 13:34:00 +05:30
Noah Jacob	58daf5f916	fix: precision rate for packed items (#26046)	2021-06-25 12:52:17 +05:30
Subin Tom	43f85a2877	fix: changed profitability analysis report width (#26165)	2021-06-25 11:38:11 +05:30
Alan	8958f55890	fix: add validation for 'for_qty' else throws errors (#25829) ... * fix: add validation for 'for_qty' else throws errors * fix: check if for_qty is None * fix: check purpose * fix: add purpose to pick list get_doc * fix: set as read only to prevent se from picking up value Co-authored-by: Ankush <ankushmenat@gmail.com> * chore: undo changes to doctype modified timestamp Co-authored-by: Ankush <ankushmenat@gmail.com>	2021-06-24 21:01:55 +05:30
Ankush	21e44b19f0	perf: don't query unless required (bp #26175) ... re-order conditionals so queries are not evaluated unless required. # Conflicts: # erpnext/stock/doctype/batch/batch.py	2021-06-24 20:58:07 +05:30
Deepesh Garg	b4b76b75cd	Merge pull request #26176 from deepeshgarg007/item_tax_fetch_fix ... fix: User is not able to change item tax template	2021-06-24 19:55:49 +05:30
Deepesh Garg	970d2af7ad	Merge pull request #26211 from deepeshgarg007/include_dimension_filter ... fix: Account filter not working with accounting dimension filter	2021-06-24 19:55:12 +05:30
Deepesh Garg	1564d39bf4	Merge pull request #26188 from deepeshgarg007/internal_transfer_payment_tax_v13 ... fix: Taxes on Internal Transfer payment entry	2021-06-24 19:51:48 +05:30
Deepesh Garg	e3ca177828	fix: Remove debug flag	2021-06-24 19:51:23 +05:30
Deepesh Garg	bdba29bab5	fix: Account filter not working with accounting dimension filter	2021-06-24 19:48:11 +05:30
Ankush	5708b7140b	fix: batch nos in packed items (bp #26105) ... * test: batch info in packed_items * fix(ux): make packed items editable * refactor: allow custom table name for set_batch In some doctypes there are multiple child tables requiring batched items. This change makes the function a bit more flexible. * fix: Auto fetch batch_nos in packed_item table	2021-06-24 19:38:37 +05:30
Saqib	b3a0a7b432	fix: too many writes while renaming company abbreviation (#26203)	2021-06-24 19:30:10 +05:30
Deepesh Garg	1658107a92	fix: Linting fixes	2021-06-24 19:18:50 +05:30
Deepesh Garg	e21e435a0d	fix: Add python 3 compatible string types	2021-06-24 19:17:58 +05:30
Deepesh Garg	9382b1f154	fix: Flaky test	2021-06-24 19:03:22 +05:30
Deepesh Garg	11591b3e3e	Merge pull request #26202 from nextchamp-saqib/pr-item-gl-fix-v13 ... fix: purchase receipt gl entries with same item code	2021-06-24 18:36:23 +05:30
rohitwaghchaure	27797ffa46	Merge pull request #24523 from rohitwaghchaure/sub-operation-new-branch ... Feat: Job Card Enhancements	2021-06-24 18:19:42 +05:30
Rohit Waghchaure	2330c41cca	fix: total time calculation	2021-06-24 18:14:19 +05:30
Rohit Waghchaure	57307443f0	is corrective job card	2021-06-24 18:14:19 +05:30
Rohit Waghchaure	c878389050	fix: or condition filter in the get_all	2021-06-24 18:14:18 +05:30
Jannat Patel	6a9798f305	fix: update leave allocation after submit (#26191) ... * fix: update leave allocation after submit v13 * fix: test * fix: test	2021-06-24 18:11:33 +05:30
Rohit Waghchaure	fcab53b238	fix: skip job card	2021-06-24 18:07:31 +05:30
Rohit Waghchaure	6e81489095	feat: Job Card Enhancements	2021-06-24 18:07:30 +05:30
Saqib Ansari	f6dce4df73	test: service item purchase with perpetual inventory enabled	2021-06-24 17:41:52 +05:30
Saqib Ansari	1ca8f6a51d	fix: purchase receipt gl entries with same item code	2021-06-24 17:41:44 +05:30
Saqib	81d164134d	Merge pull request #26198 from nextchamp-saqib/pos-fixes-9-v13 ... refactor(pos): use pos invoice item name as unique identifier	2021-06-24 17:37:51 +05:30
Afshan	9dc625c1c9	fix: validate product bundle for existing transactions before deletion (#25978)	2021-06-24 17:36:39 +05:30
Deepesh Garg	79daed00c1	Merge pull request #26201 from noahjacob/shipping_address_fix_v13 ... fix: fetch preferred shipping address (bp #26132)	2021-06-24 17:35:34 +05:30
Deepesh Garg	755ebdf582	Update party.js	2021-06-24 17:35:14 +05:30
Noah Jacob	da82bd4b51	refactor: update cost updates operation time and hour rates in BOM (#25891) ... * refactor: updates hour_rate and operation time on update cost * refactor: hour_rates are updated in routing when updated in workstations * test: test cases for updating hour_rates and operation time in linked bom	2021-06-24 17:23:21 +05:30
Noah Jacob	dbdf2515cd	fix: fetches correct preferred shipping address	2021-06-24 17:06:18 +05:30
Nabin Hait	c1954ec72a	Merge pull request #26195 from deepeshgarg007/deferred_revenue_error ... fix: Error while booking deferred revenue	2021-06-24 15:35:02 +05:30
Saqib Ansari	3b12601461	fix: sider issues	2021-06-24 15:03:04 +05:30
Saqib Ansari	e39c3f2e69	fix: add missing semicolons	2021-06-24 15:02:59 +05:30
Saqib Ansari	ea70f6f933	fix: hide images from cart & details	2021-06-24 15:02:53 +05:30
Saqib Ansari	54cc1dedf2	refactor(pos): use pos invoice item name as unique identifier	2021-06-24 15:02:43 +05:30
Afshan	7fd44907ba	feat: fetching of qty as per received qty from PR to PI (#26184)	2021-06-24 14:26:36 +05:30
Ankush	98e98d25e6	fix(Work Order): added freeze when trying to stop work order (#26192) (#26196) ... * fix: added freeze when trying to stop work order * fix(ux): add freeze message Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>	2021-06-24 14:24:28 +05:30
Deepesh Garg	ca2e914715	fix: Error while booking deferred revenue	2021-06-24 14:14:46 +05:30
Marica	ce99701150	Merge pull request #26170 from marination/web-item-group ... fix: Website item group logic for product listing in Item Group pages	2021-06-24 13:28:18 +05:30
marination	a4f5dcaa9a	chore: Test for Item visibility in multiple item group pages	2021-06-24 13:08:20 +05:30
Marica	6b15a05de4	Merge pull request #26187 from marination/country-modal-cart ... fix: Address Card issues in e-commerce	2021-06-24 12:25:21 +05:30
Deepesh Garg	437e972108	Merge pull request #26143 from deepeshgarg007/gstr_1_export_invoices_error ... fix: Export invoices not visible in GSTR-1 report	2021-06-24 12:15:29 +05:30
Deepesh Garg	9d8e8f8bdf	fix: Do not show received amount after tax for internal tarnsfers	2021-06-24 12:02:39 +05:30
Deepesh Garg	bd9317956b	fix: Taxes on Internal Transfer payment entry	2021-06-24 12:02:32 +05:30
marination	bbe64b5604	fix: (style) Address card buttons hover state	2021-06-24 12:01:12 +05:30
Rucha Mahabal	a9b5dc6030	fix: chart not visible for First Response Time reports (#26032) (#26185)	2021-06-24 11:53:28 +05:30
marination	f5fa1ee4b6	fix: Country Link field in 'Add address' website modal auto-clears	2021-06-24 11:03:32 +05:30
Deepesh Garg	5e49bee755	Merge pull request #26083 from deepeshgarg007/payroll_accounting_dimension ... fix: Accounting Dimensions for payroll entry accrual Journal Entry	2021-06-24 10:38:42 +05:30
Deepesh Garg	03b629c851	Merge pull request #26100 from deepeshgarg007/pi_billing_address ... fix: Billing address not fetched in Purchase Invoice	2021-06-24 10:29:01 +05:30
Deepesh Garg	4cf0b02ddc	Merge pull request #26095 from deepeshgarg007/sales_order_billed_qty ... fix: Incorrect billed qty in Sales Order analytics	2021-06-24 10:21:57 +05:30
Deepesh Garg	3007c9900b	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payroll_accounting_dimension	2021-06-23 23:06:15 +05:30
Deepesh Garg	7e006496dd	fix: Check if item tax template exists	2021-06-23 22:52:51 +05:30
Deepesh Garg	c9c1d10435	fix: Make item tax templates optional	2021-06-23 22:47:29 +05:30
Deepesh Garg	1f7b95f390	fix: User is not able to change item tax template	2021-06-23 20:56:27 +05:30
marination	078826d510	fix: Sider	2021-06-23 20:12:59 +05:30
marination	f913e0dd05	fix: Consider Table Multiselect fields in Query engine ... - Since table multiselect fields were not handled, the query tried searching for this child field in item master - This broke the query - On trying to reload or go back to all-products page with field filters that are table mutiselect, page breaks	2021-06-23 20:06:11 +05:30
rohitwaghchaure	b4863bfa50	Merge pull request #25696 from rohitwaghchaure/incorrect-serial-no-qty-valuation-report ... feat: Incorrect valuation rate report for serialized items	2021-06-23 16:52:51 +05:30
marination	1b9b72d12e	fix: Filters did not consider Website Item Group	2021-06-23 16:03:24 +05:30
Deepesh Garg	0bfffddac4	fix: Test Cases	2021-06-23 15:37:17 +05:30
marination	d802d73973	fix: Consider Website Item Groups in Item group page product listing ... - Passed an argument to query engine to know when query is for item group page - If for item group page, get data with regards to website item group table - This query should be fast since there's one filter and that shortens the table beforehand - This data is merged with the results from the Item master (results only considering item attributes and field filters) - The combined data is then sorted as per weightage Co-authored-by: Gavin D'souza <gavin18d@gmail.com>	2021-06-23 14:24:13 +05:30
Jannat Patel	9ec0ded28f	fix: Staffing plan vacancies data type issue (#25941) ... * fix: staffing plan vacancies data type issue * fix: translation issue * fix: removed greater than 0 condition	2021-06-23 14:05:10 +05:30
Deepesh Garg	35e11fbea6	fix: Tests	2021-06-23 13:17:01 +05:30
Deepesh Garg	208b5f9e73	chore: Add comments	2021-06-23 12:44:56 +05:30
Deepesh Garg	40a4330ec1	fix: Move tax categories up in country wise json	2021-06-23 12:38:37 +05:30
Jannat Patel	44815393b3	fix: job applicant link issue (#25934)	2021-06-23 12:28:02 +05:30
Deepesh Garg	673470705b	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into bootstraped_gst_setup	2021-06-23 11:33:15 +05:30
Anurag Mishra	fc98abece9	feat: Employee Grievance (#25705) ... * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * feat: Employee Grievance * feat: link to desk and automatic unsuspend * test: Employee Grievance * fix: Sider and Translation * fix: sider * fix: formatting * feat: changes requested * fix: patch test and sider issue * fix: make Employee Responsible non-mandatory since there cannot be an employee responsible for all sorts of grievances - show pay cut and suspension buttons only if Employee Resposible is set - some label changes * feat: added subject field for more context - set title for documents - added list view settings - refactor suspend and unsuspend functions - add submit and cancel perms for system and hr managers - fix tests * fix: sider issues * fix: removed suspension and paycut * fix:sider * fix: test * fix: test * fix: resolved Conflicts * fix: sider * fix: remove debugging print statements * fix: validation message * fix: unnecessary comma Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 11:21:38 +05:30
marination	ea2c02738d	fix: Include Stock Reco logic in update_qty_in_future_sle	2021-06-22 21:44:50 +05:30
Noah Jacob	c05496a5a7	fix: fixed rounding off ordered percent to 100 in condition (#26152)	2021-06-22 17:53:53 +05:30
Subin Tom	219a87d530	fix: disable sales order cancellation if linked to draft invoice (#26125)	2021-06-22 16:28:58 +05:30
Subin Tom	889140fd8c	fix: sql syntax error in get_project_name method (#26147)	2021-06-22 16:26:19 +05:30
Deepesh Garg	cfdda21dd2	fix: Export invoices not visible in GSTR-1 report	2021-06-22 13:03:22 +05:30
Marica	703c30f5f8	fix: Consistent alert indicators	2021-06-22 11:20:17 +05:30
marination	f97206b3cb	fix: Sort website products by weightage mentioned in Item master	2021-06-21 19:38:37 +05:30
marination	ea0dea46e0	fix: sider and semgrep	2021-06-21 16:51:12 +05:30
marination	49ec0e5ac3	feat: Optionally allow rejected quality inspection on submission	2021-06-21 16:18:35 +05:30
rohitwaghchaure	d6eacf556d	Merge pull request #26126 from rohitwaghchaure/production-plan-fix-to-show-parent-warehouse ... fix: allow to select group warehouse while downloading materials from production plan	2021-06-21 15:39:13 +05:30
rohitwaghchaure	8347eb1dba	Update production_plan.js	2021-06-21 15:38:44 +05:30
Rohit Waghchaure	773aabae44	fix: allow to select group warehouse while downloading materials from production plan	2021-06-21 14:54:27 +05:30
rohitwaghchaure	3956f82e7c	Merge pull request #26122 from rohitwaghchaure/fix-rate-not-able-to-change ... fix: rate not able to change in purchase order	2021-06-21 13:40:29 +05:30
Ankush	e78364c191	fix: status indicator for delivery notes (#26062) ... On list view `per_returned` isn't fetched i.e. `undefined` which become 0 hence the list view indicator is false. This "computation" is already done by status updater, so relying on doc.status is better than redefining it.	2021-06-21 11:15:16 +05:30
Saqib	fb89008a13	fix(pos): unsupported operand type -=: for 'float' and 'NoneType' (#26097)	2021-06-21 10:49:09 +05:30
Rohit Waghchaure	582f187726	fix: rate not able to change in purchase order	2021-06-21 00:59:02 +05:30
rohitwaghchaure	ab3cd7e283	Merge pull request #26023 from rohitwaghchaure/fixed-linking-between-mr-and-sq ... fix: material request and supplier quotation not linked if supplier quotation created from supplier portal	2021-06-20 15:16:32 +05:30
Rohit Waghchaure	3d7f660bec	fix: test case for Project Profitability report	2021-06-20 10:20:35 +05:30
Rohit Waghchaure	f5db407461	fix: available qty for consumption	2021-06-19 23:19:45 +05:30
Rohit Waghchaure	5cc3f14506	fix: purchase invoice qty change not recalculate the consumed qty and added test cases for purchase invoice	2021-06-19 23:16:23 +05:30
Rohit Waghchaure	ddb0ec261a	fix: code cleanup and convert public method to private for subcontracting class	2021-06-19 23:16:23 +05:30
Rohit Waghchaure	2fb5291785	fix: toggle consumed qty field based on condition	2021-06-19 23:16:22 +05:30
Rohit Waghchaure	9a2db0b5b1	fix: semgrep error	2021-06-19 23:16:22 +05:30
Rohit Waghchaure	a94b89727c	feat: subcontract code refactor and enhancement	2021-06-19 23:16:22 +05:30
rohitwaghchaure	a2bb1b8acd	Merge pull request #26081 from rohitwaghchaure/fixed-stock-entry-submission-performance ... fix: time out while submit / cancel the stock transactions with more than 50 Items	2021-06-19 16:14:14 +05:30
Rohit Waghchaure	8c844e4515	fix: material request and supplier quotation not linked if sq created from supplier portal against rfq	2021-06-19 16:08:26 +05:30
Rohit Waghchaure	8520edc952	fix: time out while submitting the stock transactions with more than 50 items	2021-06-19 00:55:35 +05:30
Deepesh Garg	81c97c13ce	fix: Sanctioned loan amount limit check	2021-06-18 19:57:53 +05:30
Anurag Mishra	ef6e005c04	Merge pull request #26071 from Anurag810/training_event_fixes_2.0 ... fix: Training event	2021-06-18 15:44:56 +05:30
Ganga Manoj	3d8f82459b	fix(Issue): reset response_by and resolution_by if SLA is removed (#25997)	2021-06-18 11:42:28 +05:30
Anuja Pawar	b066fe9519	fix: insufficient permission for dunning error (#26092)	2021-06-18 11:29:07 +05:30
Deepesh Garg	a58b571ccb	fix: Billing address not fetched in Purchase Invoice	2021-06-18 10:45:35 +05:30
rohitwaghchaure	3bb9f4a742	Merge pull request #26098 from rohitwaghchaure/enqueue-cancel-action-in-stock-reco ... fix: timeout while cancelling stock reconciliation	2021-06-18 10:44:59 +05:30
Rohit Waghchaure	ef97269386	fix: timeout while cancelling stock reconciliation	2021-06-18 10:11:53 +05:30
Deepesh Garg	59e2e4989b	fix: Incorrect billed qty in Sales Order analytics	2021-06-17 19:58:16 +05:30
Eben van Deventer	ddef85ae97	fix: Correct South Africa VAT Rate (#25894) ... On 1 April 2018 South Africa increased the VAT rate from 14% to 15%, this proposed change seeks to update the default parameters for a fresh ERPNext installation.	2021-06-17 18:43:30 +05:30
Alan	f9390f596d	fix: auto unlink warehouse from item on delete (#26073) ... * fix: auto unlink warehouse from item on delete * fix: sider * refactor: use delete_doc * test: add test for unlinking warehouse from item * refactor: add msgprint to inform user of unlink * refactor: cleanup and reuse extant functions * fix: don't delete row, update table	2021-06-17 18:13:23 +05:30
Deepesh Garg	d3ccb024f8	Merge pull request #26078 from nemesis189/fixed-label-rate-for-purchase-invoice-item-v13 ... fix: removed extra space from label rate	2021-06-17 17:19:17 +05:30
Deepesh Garg	510077b3d4	fix(minor): Translation and linting issues	2021-06-17 11:21:21 +05:30
Deepesh Garg	b8442816ca	Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into payroll_accounting_dimension	2021-06-17 11:19:12 +05:30
Deepesh Garg	913e92c29f	Merge pull request #26044 from GangaManoj/account-multiselect-gl ... feat(General Ledger): Implement multi-account selection	2021-06-16 22:33:50 +05:30
Deepesh Garg	5c19a9251f	fix: Accouting Dimensions for payroll entry accrual Journal Entry	2021-06-16 22:14:29 +05:30
Subin Tom	6f9de8c86f	fix: removed extra space from label rate	2021-06-16 20:01:29 +05:30