28012 Commits

Author	SHA1	Message	Date
Deepesh Garg	8c1b764a90	fix: Debug tests	2021-07-05 21:49:10 +05:30
Afshan	668da102c9	Merge branch 'develop' into fix-account-selection-gst-settings	2021-07-05 21:35:23 +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
GangaManoj	6e0d83d925	feat(Sales Invoice): Add 'Discount Account' field in Items table	2021-07-05 15:09:05 +05:30
GangaManoj	be15e16b84	feat(Accounts Settings): Add 'Enable Discount Accounting' checkbox	2021-07-05 14:58:32 +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
Ankush Menat	03f7bf6589	test: variant BOM from template BOM	2021-07-05 12:26:14 +05:30
Richard Case	046e83bf50	fix: incorrect bom no. added for non-variant items on variant boms (#26320)	2021-07-05 12:26:14 +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	9d295ca939	fix: Bank statement import	2021-07-04 20:33:36 +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	5069095984	fix: Auto process deferred accounting for multi-company setup	2021-07-04 20:31:37 +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
Deepesh Garg	802e63a9d7	fix: Do not consider cancelled entries in party dashboard	2021-07-04 20:29:41 +05:30
Rohit Waghchaure	3105332e3c	fix: allow to make job card without employee	2021-07-03 17:25:08 +05:30
Noah Jacob	8db974b1b9	test: updated test cases	2021-07-02 22:00:33 +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
Afshan	d06a95b6fa	Merge branch 'develop' into fix-account-selection-gst-settings	2021-07-02 19:32:12 +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
Anurag Mishra	0a79cfa170	fix: set query for training events (#26302) ... * fix: set query * fix: whitespace between function name and param Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-07-02 17:54:43 +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
GangaManoj	f8ee8058e7	fix(Sales Invoice): Reset disposal_date on returning the Asset	2021-07-02 15:45:52 +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
Afshan	20f73d4c58	fix: only "Tax" type accounts should be shown for selection in GST Settings	2021-07-02 15:34:26 +05:30
GangaManoj	4cf3d9ac20	fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice	2021-07-02 15:25:04 +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
Ashish Shah	4e6805b04e	fix: When Lead is created with mobile_no, mobile_no value gets lost (it is overwritten by phon value) (#26116) ... Steps to reproduce [1]Create a Lead. [2]Enter Person Name(lead_name): XX 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) [5]Under Address & Contact section ,check contact_html it shows ty Phone: 22 (correct) Phone: 11 (in correct) Actual: mobile_no value is lost. it is overwritten by phone value Expected: mobile_no value should be retained	2021-07-02 13:35:04 +05:30
Anupam Kumar	877597bc16	fix: feating employee in payroll entry (#26271)	2021-07-02 13:10:18 +05:30
Jannat Patel	0a15a03522	fix: lms progress issue (#26250) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-07-02 13:06:56 +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
Mohammed Yusuf Shaikh	6c2f66b0a4	fix: Added permission for employee to book appointment (#26266)	2021-07-02 12:21:44 +05:30
Mohammed Yusuf Shaikh	86f41839fe	fix: Added a message to enable appointment booking if disabled (#26233) ... * fix: Added a message to enable appointment booking if disabled * refactor: added translation for the message Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com> * fix: added missing import * fix: minor identation and space fix Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-07-02 12:19:24 +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
Saqib	f9c58934d8	Merge branch 'develop' into asset-repair-refactor	2021-07-02 11:19:47 +05:30
Ankush	8ebf32e18f	fix: undo changes to issue.py (#26291) ... The fix ported from v13 to develop is not valid because of the new generic SLA feature. Hard resetting the file to the previous version. ec25d5938b	2021-07-02 11:09:19 +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
Subin Tom	d2c86bb9d7	fix: Fixed Budget Variance Graph color from all black to default	2021-07-01 19:59:08 +05:30
Saqib	49ef26075a	Merge branch 'develop' into asset-repair-refactor	2021-07-01 19:27:20 +05:30
Deepesh Garg	ba2c3c776f	fix: Bank statement import	2021-07-01 18:56:51 +05:30
Deepesh Garg	8a5c7ea9b4	Merge branch 'develop' into patch-4	2021-07-01 18:08:22 +05:30
marination	752f099e9d	fix: Order Items by weightage in the web items query	2021-07-01 17:20:24 +05:30
Jannat Patel	5a4251107c	feat: Project Portal Enhancements (#26090) ... * fix: project portal enhancements * fix: timesheet table and task nesting * fix: semgrep and link issue * fix: sider * fix: project details view title * fix: project progress pills * fix: website route rule for project * fix: multi level nesting * fix: added subject and indentation Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-07-01 17:17:34 +05:30
Anuja Pawar	d8bc514226	fix: to fetch the correct field in Tax Rule (#25927)	2021-07-01 14:06:01 +05:30
Nabin Hait	07a74abcc3	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2021-07-01 12:55:13 +05:30
Nabin Hait	fa006402b8	fix: merge conflict	2021-07-01 12:47:28 +05:30
Ankush	d45e307f02	test: fix expected test failure (#26275) ... reference: https://github.com/frappe/frappe/pull/13557	2021-07-01 12:38:09 +05:30
Nabin Hait	eee03fcbab	bumped to version 13.6.0	2021-07-01 12:57:13 +05:50
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
Nabin Hait	d7c4818a5d	Merge pull request #26281 from rohitwaghchaure/fixed-update-cost-not-working-for-draft-bom-pre ... fix: update cost not working in the draft BOM	2021-07-01 12:30:55 +05:30
Rohit Waghchaure	f99f872946	fix: update cost not working in the draft bom	2021-07-01 12:02:37 +05:30
Rohit Waghchaure	87b4e6ea32	fix: employee selection not working in payroll entry	2021-07-01 12:02:03 +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
Nabin Hait	cf4e29a604	chore: Added change log for v13.6.0	2021-06-30 20:27:43 +05:30
Deepesh Garg	970d90f3b2	Merge pull request #25970 from GangaManoj/exchange-rate-difference-handling ... feat: Exchange rate difference handling in procurement cycle	2021-06-30 20:25:39 +05:30
Anupam	8492bf040d	fix: feating employee in payroll entry	2021-06-30 17:17:43 +05:30
Deepesh Garg	cf7af62b05	fix: Code cleanup	2021-06-30 14:14:32 +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
GangaManoj	b4b6c8e262	Revert "fix: Test" ... This reverts commit feed97ec53.	2021-06-29 17:58:39 +05:30
Deepesh Garg	9181dde86a	fix: Cancelation of Loan Security Pledges	2021-06-29 17:18:39 +05:30
Rucha Mahabal	1f10a99910	fix: Employee Inactive status implications (#26245)	2021-06-29 15:58:56 +05:30
Rucha Mahabal	91dcc07e26	fix: Employee Inactive status implications (#26244)	2021-06-29 15:58:46 +05:30
Rucha Mahabal	8f2b8e47f7	fix: Employee Inactive status implications (#26243)	2021-06-29 15:58:30 +05:30
Rohit Waghchaure	2d1c4fee1d	fix: allow to changes to date in the blanket order	2021-06-29 00:33:55 +05:30
GangaManoj	d748e7f49c	fix: Create common function for fetching conversion rate details of linked docs	2021-06-28 22:39:43 +05:30
GangaManoj	506d5ac3d5	fix: Make exchange rate handling more efficient	2021-06-28 22:39:43 +05:30
GangaManoj	8f52db788a	fix(Purchase Invoice): Improve test for exchange rate difference handling	2021-06-28 22:39:41 +05:30
GangaManoj	a826fb8f95	fix(Purchase Receipt): Remove print statements	2021-06-28 22:38:59 +05:30
GangaManoj	3f5e7bf6d7	fix(Purchase Invoice): Fetch Purchase Receipt details using a function	2021-06-28 22:38:59 +05:30
marination	feed97ec53	fix: Test	2021-06-28 22:38:21 +05:30
GangaManoj	5314445d58	fix(Purchase Receipt): Add test for exchange rate difference handling	2021-06-28 22:02:57 +05:30
GangaManoj	d97505b277	fix(Purchase Receipt): Resolve difference caused by change in exchange rate	2021-06-28 22:02:22 +05:30
GangaManoj	206313d69b	fix(Purchase Invoice): Add test for exchange rate difference handling	2021-06-28 22:02:20 +05:30
GangaManoj	6233eaa3bb	fix(Purchase Invoice): Fix condition	2021-06-28 22:00:49 +05:30
GangaManoj	785a71dcd2	fix(Purchase Invoice): Resolve difference caused by change in exchange rate	2021-06-28 22:00:49 +05:30
Saqib	4277e4c94b	fix: unreachable test case (#26234)	2021-06-28 19:10:46 +05:30
rohitwaghchaure	3c97839826	Merge pull request #26130 from rohitwaghchaure/develop-production-plan-fix-to-show-parent-warehouse ... fix: allow to select group warehouse while downloading materials from…	2021-06-28 17:18:55 +05:30
rohitwaghchaure	9bcc402f41	Merge pull request #26230 from rohitwaghchaure/fixed-fetch-bom-items-in-stock-reco-pre ... fix: fetch batch items in stock reconciliation	2021-06-28 15:18:07 +05:30
Saqib	40c90d03a4	fix(Asset Repair): cancellation	2021-06-28 11:42:28 +05:30
Deepesh Garg	7d7d797ffc	fix: Do not consider cancelled entries in party dashboard	2021-06-28 11:24:32 +05:30
Saqib	4b69563a56	Merge branch 'develop' into asset-repair-refactor	2021-06-28 11:07:58 +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
Rohit Waghchaure	478360397d	fix: fetch batch items in stock reco	2021-06-26 22:31:03 +05:30
Rohit Waghchaure	5d5dc56f94	fix: removed values out of sync validation from stock transactions	2021-06-26 22:29:19 +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
GangaManoj	ca2dbcec59	fix(Asset Repair): Rearrange fields	2021-06-26 01:32:17 +05:30
Ankush Menat	6588a936d5	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 20:16:11 +05:30
Ankush Menat	9af3f12411	fix(ux): show bom in operations child table	2021-06-25 20:16:11 +05:30
Ankush Menat	b4e7ee0e45	chore: remove dead and py2 compatibility code ... form_grid_template doesn't exist	2021-06-25 20:16:11 +05:30
Ankush Menat	805ac4ffdf	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 16:44:57 +05:30
Ankush Menat	305bbc7619	fix(ux): show bom in operations child table ... # Conflicts: # erpnext/manufacturing/doctype/work_order_operation/work_order_operation.json	2021-06-25 16:44:57 +05:30
Ankush Menat	923832c316	chore: remove dead and py2 compatibility code ... form_grid_template doesn't exist	2021-06-25 16:44:57 +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	8dd99c02cc	fix: Check for is None	2021-06-25 14:27:50 +05:30
Deepesh Garg	cae42b48f1	fix: Error while fetching item taxes	2021-06-25 14:27:43 +05:30
Deepesh Garg	6eb8d19cc9	fix: Check for is None	2021-06-25 14:02:12 +05:30
Deepesh Garg	cd36ba7e64	fix: Error while fetching item taxes	2021-06-25 14:02:04 +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
Ankush	532a224c44	fix: precision rate for packed items (#26046) (#26217) ... Co-authored-by: Noah Jacob <noahjacobkurian@gmail.com>	2021-06-25 13:28:01 +05:30
Noah Jacob	58daf5f916	fix: precision rate for packed items (#26046)	2021-06-25 12:52:17 +05:30
Alan	37a25308ae	fix: add validation for 'for_qty' else throws errors (#25829) (#26214) ... * 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 * chore: undo changes to doctype modified timestamp	2021-06-25 12:40:38 +05:30
Subin Tom	43f85a2877	fix: changed profitability analysis report width (#26165)	2021-06-25 11:38:11 +05:30
Deepesh Garg	3239f774bd	Merge pull request #26183 from deepeshgarg007/item_tax_fetch_fix_develop ... fix: User is not able to change item tax template	2021-06-25 10:46:14 +05:30
GangaManoj	dcb8a2895c	fix(Asset Repair): Simplify code for Asset Repair creation in tests	2021-06-24 22:30:08 +05:30
GangaManoj	c73e137bfa	fix(Asset Repair): Edit description for total_repair_cost	2021-06-24 22:27:30 +05:30
GangaManoj	b44e4121da	fix(Asset Repair): Move filters for cost_center, warehouse and project to setup	2021-06-24 22:25:45 +05:30
GangaManoj	289b449f2b	fix(Asset): Add comment	2021-06-24 22:21:08 +05:30
GangaManoj	f4e8e7d933	fix(Asset): Remove extra tabs	2021-06-24 22:18:59 +05:30
Deepesh Garg	7b7796c1ed	fix: Linting fixes	2021-06-24 21:13:18 +05:30
Deepesh Garg	8cdd7ce7b6	fix: Add python 3 compatible string types	2021-06-24 21:13:10 +05:30
Deepesh Garg	dce2676f7a	Merge branch 'develop' of https://github.com/frappe/erpnext into internal_transfer_payment_tax	2021-06-24 21:08:57 +05:30
Deepesh Garg	c151c67d97	fix: Flaky test	2021-06-24 21:08:19 +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
Ankush	2ea750eadd	perf: don't query unless required (#26175) ... re-order conditionals so queries are not evaluated unless required.	2021-06-24 20:29:18 +05:30
Noah Jacob	0ceec76d98	refactor: update cost updates operation time and hour rates in BOM (fp #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 20:27:47 +05:30
Nabin Hait	67768faaef	Merge branch 'version-13-hotfix' into version-13-pre-release	2021-06-24 20:16:04 +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
Noah Jacob	ac0bc1f170	fix: precision rate for packed items (#26208)	2021-06-24 19:36:17 +05:30
Saqib	b3a0a7b432	fix: too many writes while renaming company abbreviation (#26203)	2021-06-24 19:30:10 +05:30
Saqib	64c6b34b94	fix: too many writes while renaming company abbreviation (#26142)	2021-06-24 19:29:56 +05:30
Saqib	3b5978cdb8	Merge pull request #26093 from nextchamp-saqib/pr-item-gl-fix ... fix: purchase receipt gl entries with same item code	2021-06-24 19:29:08 +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
Nabin Hait	a57976660a	fix: merge conflict	2021-06-24 19:14:33 +05:30
Ankush	7a63d782db	fix: batch nos in packed items (#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:07:16 +05:30
Deepesh Garg	9382b1f154	fix: Flaky test	2021-06-24 19:03:22 +05:30
Deepesh Garg	acbf56f162	Merge pull request #26182 from deepeshgarg007/gstr_1_export_invoices_error_develop ... fix: Export invoices not visible in GSTR-1 report	2021-06-24 18:43:40 +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
Anuja Pawar	a50196bcd9	fix: dunning permission error in payment entry (#26204)	2021-06-24 18:25:16 +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	c10fea8a59	Merge branch 'develop' into pr-item-gl-fix	2021-06-24 17:39:36 +05:30
Saqib	2980db30ce	Merge pull request #26157 from nextchamp-saqib/pos-fixes-9 ... refactor(pos): use pos invoice item name as unique identifier	2021-06-24 17:38:41 +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
Deepesh Garg	e693cceb58	Merge pull request #26132 from noahjacob/shipping_address_fix ... fix: fetch preferred shipping address	2021-06-24 17:31:21 +05:30
Deepesh Garg	f84f8d5260	Update party.js	2021-06-24 17:29:55 +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	5b462ad11a	fix: merge conflict	2021-06-24 15:36:51 +05:30
Nabin Hait	b5d1a7731c	bumped to version 13.5.2	2021-06-24 15:55:50 +05:50
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
Nabin Hait	7a8a449ed4	Merge pull request #26197 from deepeshgarg007/deferred_revenue_error_pre_release ... fix: Error while booking deferred revenue	2021-06-24 15:34:58 +05:30
GangaManoj	e21d44c5c3	fix(Asset): Remove to_date field	2021-06-24 15:04:44 +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
Saqib Ansari	4d3e748c00	fix: sider issues	2021-06-24 15:01:33 +05:30
Marica	bf3e191570	Merge pull request #26193 from marination/country-modal-cart-v13-release ... fix: Address Card issues in e-commerce	2021-06-24 14:57:39 +05:30
GangaManoj	2fdb923953	fix(Asset Repair): Change controller hooks	2021-06-24 14:56:34 +05:30
Deepesh Garg	f79a72dbf3	fix: Error while booking deferred revenue	2021-06-24 14:49:09 +05:30
Saqib	73aaa1c275	Merge branch 'develop' into pos-fixes-9	2021-06-24 14:31:19 +05:30
Saqib Ansari	8aa0e31bb4	fix: add missing semicolons	2021-06-24 14:29:22 +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
Noah Jacob	b2b7369874	fix(Work Order): added freeze when trying to stop work order (#26192) ... * fix: added freeze when trying to stop work order * fix(ux): add freeze message	2021-06-24 14:21:35 +05:30
Deepesh Garg	ca2e914715	fix: Error while booking deferred revenue	2021-06-24 14:14:46 +05:30
marination	820a579051	chore: Test for Item visibility in multiple item group pages	2021-06-24 13:57:18 +05:30
marination	4f0e6cd911	fix: Sider	2021-06-24 13:57:00 +05:30
marination	f913838373	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-24 13:56:49 +05:30
marination	9f305e983c	fix: Filters did not consider Website Item Group	2021-06-24 13:56:35 +05:30
marination	ea2408744a	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-24 13:56:15 +05:30
marination	5884f1aeb0	fix: (style) Address card buttons hover state	2021-06-24 13:50:29 +05:30
marination	26bec9d7b4	fix: Country Link field in 'Add address' website modal auto-clears	2021-06-24 13:50:18 +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
GangaManoj	550fe8ae39	fix(Asset): Remove redundant code	2021-06-24 13:22:26 +05:30
Jannat Patel	ca8c3b90f0	fix: Update leave allocation after submit (#25975) ... * update leave allocation after submit * fix: leave allocation update after submit * fix: circular dependency * fix: replaced update with submit in tests * fix: replaced update with submit in tests * fix: updating total leaves allocated	2021-06-24 13:13:03 +05:30
marination	a4f5dcaa9a	chore: Test for Item visibility in multiple item group pages	2021-06-24 13:08:20 +05:30
GangaManoj	60a44ae1e6	fix(Asset): Fix test	2021-06-24 12:44:13 +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	ab7a16a952	Merge pull request #26180 from deepeshgarg007/pi_billing_address_develop ... fix: Billing address not fetched in Purchase Invoice	2021-06-24 12:13:17 +05:30
Deepesh Garg	5b119ac4a4	Merge pull request #26178 from deepeshgarg007/payroll_accounting_dimension_develop ... fix: Accounting Dimensions for payroll entry accrual Journal Entry	2021-06-24 12:12:37 +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
Ganga Manoj	604f0b8f01	fix: message on successful creation of opening invoices (#25998)	2021-06-24 11:04:27 +05:30
marination	f5fa1ee4b6	fix: Country Link field in 'Add address' website modal auto-clears	2021-06-24 11:03:32 +05:30
Rucha Mahabal	7dbb032468	fix: chart not visible for First Response Time reports (#26032)	2021-06-24 10:41:56 +05:30
Deepesh Garg	269962a8dc	fix: Check if item tax template exists	2021-06-24 10:40:07 +05:30
Deepesh Garg	808f83f385	fix: Make item tax templates optional	2021-06-24 10:39:58 +05:30
Deepesh Garg	94d460412a	fix: User is not able to change item tax template	2021-06-24 10:39:49 +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	2dc90dd8ac	fix: Export invoices not visible in GSTR-1 report	2021-06-24 10:37:19 +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	7bef18f3d8	fix: Remove unintentional changes	2021-06-24 10:28:25 +05:30
Deepesh Garg	c8a6b31f06	Merge branch 'develop' of https://github.com/frappe/erpnext into pi_billing_address_develop	2021-06-24 10:27:16 +05:30
Deepesh Garg	da7f45130b	fix: Billing address not fetched in Purchase Invoice	2021-06-24 10:25:24 +05:30
Deepesh Garg	5f5bbf622a	Merge pull request #26179 from deepeshgarg007/sales_order_billed_qty_develop ... fix: Incorrect billed qty in Sales Order analytics	2021-06-24 10:22:07 +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	70823b6d9a	fix: Incorrect billed qty in Sales Order analytics	2021-06-24 10:21:17 +05:30
Deepesh Garg	c451f43f64	fix(minor): Translation and linting issues	2021-06-24 10:18:46 +05:30
Deepesh Garg	3da0541000	fix: Accouting Dimensions for payroll entry accrual Journal Entry	2021-06-24 10:18:36 +05:30
Afshan	53fefd7513	feat: fetching of qty as per received qty from PR to PI (#25837)	2021-06-24 10:09:02 +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
GangaManoj	dce2113736	fix(Asset Repair): Remove test that's no longer necessary	2021-06-23 22:26:45 +05:30
GangaManoj	2f5f9d8566	fix(Asset): Fix value_after_depreciation calculation	2021-06-23 22:19:05 +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
Noah Jacob	b4b6288596	fix: fetches correct preferred shipping address	2021-06-23 17:05:44 +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
Jannat Patel	da66cefefc	fix: staffing plan vacancies data type issue (#25936) ... * fix: staffing plan vacancies data type issue * fix: translation issue * fix: removed greater than 0 condition * fix: sider Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 14:04:48 +05:30
GangaManoj	80399802c6	fix(Asset Repair): Replace asset_value with value_after_depreciation in tests	2021-06-23 13:26:47 +05:30
Deepesh Garg	35e11fbea6	fix: Tests	2021-06-23 13:17:01 +05:30
Anurag Mishra	d021db1cb1	fix: Training event (#26164) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 12:59:43 +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
Jannat Patel	0354ec6363	fix: job applicant link issue (#25933) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 12:27:45 +05:30
Anurag Mishra	11c155e6ce	feat: Employee Grievance (#25705) (#26162) ... * 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> Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-06-23 12:13:32 +05:30
GangaManoj	88348e2da7	fix(Sales Invoice): Print appropriate message if Asset isn't specified when the Item is a Fixed Asset	2021-06-23 11:57:53 +05:30
Deepesh Garg	e8817f97d6	Merge pull request #26150 from nemesis189/changed-profitability-analysis-report-width ... fix: Changed profitability analysis report width	2021-06-23 11:36:43 +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
GangaManoj	32d7b1f6ad	fix(Sales Invoice): Fix GL Entry creation for Return Invoices linked with Assets	2021-06-23 11:24:05 +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
Saqib	46ae97dfd3	Merge branch 'develop' into pr-item-gl-fix	2021-06-23 11:02:48 +05:30
Saqib	5a824cad81	fix: cannot cancel payment entry if linked with invoices (#26075)	2021-06-23 11:02:05 +05:30
Saqib	08c269510e	Merge branch 'develop' into pos-fixes-9	2021-06-23 10:15:07 +05:30
GangaManoj	8127208774	fix(Sales Invoice): Reset Asset status on issuing Credit Note	2021-06-22 23:12:56 +05:30
GangaManoj	721ff9438a	Merge branch 'develop' into asset-credit-note	2021-06-22 22:45:11 +05:30
marination	ea2c02738d	fix: Include Stock Reco logic in update_qty_in_future_sle	2021-06-22 21:44:50 +05:30
Saqib Ansari	75ce023170	fix: hide images from cart & details	2021-06-22 21:18:44 +05:30
Saqib Ansari	3b225b13e8	refactor(pos): use pos invoice item name as unique identifier	2021-06-22 21:18:20 +05:30
Deepesh Garg	dc6e4f12c6	Merge pull request #26076 from nextchamp-saqib/export-round-off-fix ... fix(e-invoicing): IRN generation for export invoices with round off	2021-06-22 20:45:24 +05:30
Deepesh Garg	7b0d86ead5	fix: Do not show received amount after tax for internal tarnsfers	2021-06-22 20:38:35 +05:30
Deepesh Garg	2af8c171c1	fix: Taxes on Internal Transfer payment entry	2021-06-22 19:48:08 +05:30
Noah Jacob	ce72d0c2c1	fix: fixed rounding off ordered percent to 100 in condition (#26148)	2021-06-22 17:54:16 +05:30
Noah Jacob	c05496a5a7	fix: fixed rounding off ordered percent to 100 in condition (#26152)	2021-06-22 17:53:53 +05:30
GangaManoj	2e45965405	fix(Asset Repair): Fix Sider issues	2021-06-22 17:24:14 +05:30
GangaManoj	859c8c92f7	fix: Remove changes made to Asset Maintenance	2021-06-22 17:16:12 +05:30
Subin Tom	a446d61e10	fix: Changed profitability analysis report width	2021-06-22 16:51:15 +05:30
GangaManoj	2ea325c0c3	fix(Asset Repair): Revert Stock Entry on cancellation	2021-06-22 16:33:10 +05:30
Subin Tom	219a87d530	fix: disable sales order cancellation if linked to draft invoice (#26125)	2021-06-22 16:28:58 +05:30
GangaManoj	3a44d88866	fix(Asset): Fix tests for Asset Repair	2021-06-22 16:28:29 +05:30
Subin Tom	e3a697c582	fix: disable sales order cancellation if linked to draft invoice (#26104)	2021-06-22 16:27:53 +05:30
Subin Tom	889140fd8c	fix: sql syntax error in get_project_name method (#26147)	2021-06-22 16:26:19 +05:30
GangaManoj	3b0eac79bf	fix(Asset Repair): Compute total_value	2021-06-22 16:26:09 +05:30
Saqib	4b4eb990a9	Merge branch 'develop' into asset-repair-refactor	2021-06-22 16:21:13 +05:30
Subin Tom	943b46a759	fix: sql syntax error in get_project_name method (#26145)	2021-06-22 14:26:36 +05:30
Deepesh Garg	cfdda21dd2	fix: Export invoices not visible in GSTR-1 report	2021-06-22 13:03:22 +05:30
marination	c212d7fafd	fix: Sort website products by weightage mentioned in Item master	2021-06-22 11:20:23 +05:30
Marica	703c30f5f8	fix: Consistent alert indicators	2021-06-22 11:20:17 +05:30
Dany Robert	884dd9764b	Merge branch 'develop' into patch-4	2021-06-22 11:18:17 +05:30
GangaManoj	d0d5fedd48	fix(Sales Invoice): Print appropriate message if item.asset is missing when the Item is a Fixed Asset	2021-06-22 00:22:08 +05:30
GangaManoj	5b07e58412	fix(Sales Invoice): Let invoice be created for Sold Assets if it's a return invoice	2021-06-21 23:51:09 +05:30
GangaManoj	600333875a	fix(Sales Invoice): Let item.asset be copied on duplicating the doc	2021-06-21 23:41:35 +05:30
rohitwaghchaure	82adb4f16e	Merge pull request #26118 from rohitwaghchaure/fixed-linking-between-mr-and-sq-develop ... fix: material request and supplier quotation not linked if supplier quotation created from supplier portal	2021-06-21 22:36:03 +05:30
marination	f97206b3cb	fix: Sort website products by weightage mentioned in Item master	2021-06-21 19:38:37 +05:30
GangaManoj	5776a962b3	fix(Asset Repair): Return Depreciation Schedule to original state on cancellation	2021-06-21 18:57:11 +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	6a07869e55	Update production_plan.js	2021-06-21 15:41:30 +05:30