brotherton-erpnext

Author	SHA1	Message	Date
Ankush Menat	ad6a2657ae	chore: minor translation fixes	2021-04-17 16:56:09 +05:30
Ankush Menat	dedf2c1b61	fix: remove duplicate keys from dictionaries	2021-04-17 16:56:08 +05:30
Saqib	75e13f7bb6	fix(e-invoicing): add company validation for e-invoicing (#25348 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-04-17 15:38:47 +05:30
Saqib	18c7815a1b	fix: presentation currency in statement of accounts (#25367 )	2021-04-17 15:37:40 +05:30
rohitwaghchaure	fbc0d16d8b	Merge pull request #25372 from ankush/eq_assignment_fix fix: equality check instead of assignment in cart	2021-04-17 13:43:54 +05:30
rohitwaghchaure	1254af502b	Merge pull request #25362 from anupamvs/disable_rounded_total feat: added Disable Rounded Total in sales transactions	2021-04-17 13:30:24 +05:30
Ankush Menat	d6be154ac2	fix: implicit string concatenation (#25371 ) * fix: implicit string concatenations * chore: rerun healthcare patch for company fields	2021-04-16 22:08:44 +05:30
Ankush Menat	adf974810d	fix: equality check instead of assignment in cart	2021-04-16 21:15:50 +05:30
Saqib	36247faf1a	fix(e-invoicing): add company validation for e-invoicing (#25349 ) * fix(e-invoicing): add company validation for e-invoicing * fix: test	2021-04-16 18:45:19 +05:30
Nabin Hait	eeece59a17	Merge branch 'develop' into disable_rounded_total	2021-04-16 18:44:17 +05:30
Marica	ede339f80b	fix: Serial No not updated correctly via Inter Company Stock Transfer (#25006 ) * fix: Serial No not updated correctly via Inter Company Stock Transfer * chore: Added More Test Cases for inter company Serial Transfer * fix: Test for serial no duplication - fixed serial no test - made errors more meaningful on serial no validation * fix: Stock Reco Test Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2021-04-16 18:42:54 +05:30
Jannat Patel	b1aad63a99	fix: leave policy in leave allocation (#25334 ) Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-04-16 16:08:22 +05:30
Raffael Meyer	6daae681bd	Merge branch 'develop' into datev_fixes	2021-04-16 12:37:14 +02:00
Hussain Nagaria	2399e84052	Merge branch 'employee-util-report' of https://github.com/NagariaHussain/erpnext into employee-util-report	2021-04-16 15:41:25 +05:30
Hussain Nagaria	f1b4ce7430	feat: Add filtering by department Also: - Add department filter to js - Add department column to report - Fetch only those timesheets which have an Employee Linked - Update unit tests	2021-04-16 15:36:43 +05:30
Anupam	9d9c256e70	feat: added Disable Rounded Total in sales transactions	2021-04-16 00:11:40 +05:30
Afshan	4b496b65b7	fix: filter for employees in salary slip (#25361 )	2021-04-15 23:53:12 +05:30
Afshan	c0db286dc1	fix: filter for employees in salary slip (#25360 )	2021-04-15 23:48:25 +05:30
Ankush Menat	5207edc188	Merge branch 'develop' into fix_shipment_pickup_to	2021-04-15 21:01:52 +05:30
18alantom	6179cc1311	fix: make pickup_to and pickup_from mandatory fields	2021-04-15 20:36:28 +05:30
18alantom	597bb8be18	fix: remove pickup_to, pickup_from and get_pickup_time relies on server-side validation instead js controller	2021-04-15 20:32:45 +05:30
Rucha Mahabal	56c428663f	fix: Additional Salary component amount not getting set (#25356 )	2021-04-15 18:54:38 +05:30
Rucha Mahabal	39b1cd827a	fix: Additional Salary component amount not getting set (#25355 )	2021-04-15 18:54:29 +05:30
Afshan	2da6ab7f2a	Merge branch 'develop' into dimension-wise-accounts-balance-reports	2021-04-15 18:07:04 +05:30
rohitwaghchaure	72929aab38	Merge pull request #24878 from anupamvs/planning feat: add total available stock field in PO	2021-04-15 16:28:49 +05:30
Sun Howwrongbum	c50fbc6897	fix: list lookup with undefined variable (#25210 ) Co-authored-by: Ankush Menat <ankush@iwebnotes.com>	2021-04-15 14:52:13 +05:30
rohitwaghchaure	640b5e00ce	Merge pull request #25152 from ankush/customer_duplicates fix: disable auto naming of customer during import	2021-04-15 14:46:11 +05:30
rohitwaghchaure	1bdc457777	Merge pull request #25304 from ankush/fix_sl_rounding fix(stock_ledger): round off values near to zero	2021-04-15 14:44:09 +05:30
Saqib	593071bd53	fix: currency symbol in bank transaction list view (#25336 )	2021-04-15 14:12:11 +05:30
Anupam Kumar	ee0dda6ba5	Merge branch 'develop' into planning	2021-04-15 12:48:25 +05:30
Marica	f045fde9f4	Merge branch 'develop' into patch-8	2021-04-14 18:56:15 +05:30
Marica	24e45163d5	fix: Sider	2021-04-14 18:53:15 +05:30
Ganga Manoj	c4565651ff	fix: Let Administrator delete company transactions (#25300 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-04-14 17:11:36 +05:30
Saqib	b54cc7c7f5	fix: pos print receipt (#25330 )	2021-04-14 15:09:11 +05:30
Saqib	8798f30808	fix: pos print receipt (#25328 )	2021-04-14 15:05:33 +05:30
rohitwaghchaure	ac6facda3d	Merge pull request #25186 from rohitwaghchaure/fixed-incorrect-batch-selected-in-purchase-rceipt-develop fix: incorrect batch picked in subcontracted purchase receipt	2021-04-14 14:35:12 +05:30
Nabin Hait	2535fe9b1e	fix: Resolved merge conflict	2021-04-14 13:09:50 +05:30
Nabin Hait	88b3c52533	bumped to version 13.0.2	2021-04-14 13:13:53 +05:50
Nabin Hait	ece4c16d8f	chore: Added change log	2021-04-14 12:53:25 +05:30
rohitwaghchaure	3f6ba12344	Merge pull request #24408 from rohitwaghchaure/custom-user-type-feat feat: Employee Self Service	2021-04-14 11:54:25 +05:30
Nabin Hait	1bc65ddbe4	Merge branch 'develop' into purchase-invoice-to-purchase-receipt-develop	2021-04-14 11:23:34 +05:30
Nabin Hait	5931931c93	Merge branch 'develop' into customer_duplicates	2021-04-14 11:23:12 +05:30
Nabin Hait	f7441c4c0a	Merge branch 'develop' into fixed-incorrect-batch-selected-in-purchase-rceipt-develop	2021-04-14 11:23:00 +05:30
Nabin Hait	b7b35734a7	Merge branch 'develop' into employee-util-report	2021-04-14 11:22:51 +05:30
Deepesh Garg	e2dc102bc6	fix: Zero amount completed delivery notes being shown in Sales Invocie get items (#25317 )	2021-04-14 11:21:11 +05:30
Deepesh Garg	b67058869a	fix: Round off final tax amount instead of current tax amount (#25188 ) * fix: Round off final tax amount instead of current tax amount * fix: Syntax error * fix: Indentation * fix: Round Off taxes order execution Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-04-14 11:20:27 +05:30
Deepesh Garg	b717420842	fix: Role to override maintain same rate check in transactions (#25193 ) * feat: configurable action if the same purchase/selling rate is not maintained * fix: Role to override maintain same rate check in transactions Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-04-14 10:43:45 +05:30
Nabin Hait	dd02b5abf1	Merge branch 'develop' into fix_sl_rounding	2021-04-14 10:36:40 +05:30
rohitwaghchaure	ce6c3b5b74	fix: incorrect incoming rate for the sales return (#25306 )	2021-04-13 20:55:52 +05:30
Afshan	82ebc47ba1	Merge branch 'develop' into dimension-wise-accounts-balance-reports	2021-04-13 19:38:04 +05:30
Rohit Waghchaure	a8f78fabfd	fix: patch failing while migrating from v7 to v13	2021-04-13 18:51:21 +05:30
Rohit Waghchaure	610ccd4c03	fix: modified permission	2021-04-13 18:51:21 +05:30
Rohit Waghchaure	03635fb0c4	feat: ESS User	2021-04-13 18:51:21 +05:30
Saqib	dbb76a7d00	fix(e-invoicing): validations & tax calculation fixes (#25314 ) * fix: GST on freight charge in e-invoicing * feat(india): bulk e-invoice generation (#24969) * fix: cannot fetch e invoice settings * fix: patch condition (#25301) * fix: patch condition * fix: except einvoice loading error seperately * fix: json.loads error Co-authored-by: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2021-04-13 18:49:03 +05:30
Deepesh Garg	ca412d37c8	Merge pull request #25290 from deepeshgarg007/gstr_1_taxable_value_update fix: Taxable value including Freight and Forwarding charges in GSTR-1 Report	2021-04-13 17:49:56 +05:30
Nabin Hait	10c61376e3	fix: Backport missing commits to develop branch (#25305 )	2021-04-13 15:46:01 +05:30
Marica	1f9d231acf	Merge branch 'develop' into patch-8	2021-04-13 15:43:46 +05:30
Deepesh Garg	2fe3056fa2	Merge pull request #24993 from frappe/ishanloya-regional Correct state code for 'Other Territory'	2021-04-13 15:37:29 +05:30
Deepesh Garg	9aad73b9f0	Merge pull request #25195 from ankush/use_isinstance_instead_of_type fix: broken type check in stock ageing report	2021-04-13 15:24:53 +05:30
Deepesh Garg	0dcb48a6ee	Merge pull request #25167 from ankush/escape_sql_credit_report fix: escape sql filters in credit report	2021-04-13 15:24:15 +05:30
Deepesh Garg	3db8ba2d4a	Merge pull request #25033 from anupamvs/se-add-to-transit fix: unable to submit stock entry	2021-04-13 14:59:54 +05:30
Deepesh Garg	c05f4ee1aa	Merge pull request #25082 from AfshanKhan/add-blank-for-status-issue-reports fix: added blank option for status in report related to issue	2021-04-13 14:59:01 +05:30
Deepesh Garg	bb92929048	Merge pull request #25256 from nextchamp-saqib/italy-e-invoicing feat(italy): add document type field for e-invoicing	2021-04-13 13:48:21 +05:30
Suraj Shetty	36083ff36c	Merge pull request #25310 from rmehta/grid-field-fix	2021-04-13 12:40:27 +05:30
Suraj Shetty	82d0a1a13e	style: Add missing semicolons - & make formatting consistent	2021-04-13 12:35:42 +05:30
Rushabh Mehta	ff935b4586	fix(minor): fix dynamically changing grid properties	2021-04-13 12:09:36 +05:30
Rushabh Mehta	3c58fd4d5e	fix(minor): fix dynamically changing grid properties	2021-04-13 12:05:10 +05:30
Rushabh Mehta	65f25c27b3	fix(minor): fix dynamically changing grid properties	2021-04-13 11:58:16 +05:30
Abdullah Abouzekry	20140425c8	fix: sales order not saving due type mismatch in promo scheme (#24748 ) (#25222 )	2021-04-13 11:36:39 +05:30
Deepesh Garg	1f49335335	Merge branch 'develop' into gstr_1_taxable_value_update	2021-04-13 10:29:52 +05:30
Ankush Menat	6a014d12c1	fix(stock_ledger): round off values near to zero	2021-04-12 20:21:27 +05:30
Ankush Menat	c65751d97f	test: ignore floating point errors in test_bom	2021-04-12 19:45:34 +05:30
Saqib	a19c98255f	fix: patch condition (#25301 )	2021-04-12 19:02:28 +05:30
Saqib	9320316462	feat(india): bulk e-invoice generation (#24969 )	2021-04-12 17:55:46 +05:30
Andy Zhu	bffe933c22	Fix: attempts to add overrides function Overrides parent_fieldname in outer form to all child rows's fieldname	2021-04-12 22:49:26 +12:00
Rohit Waghchaure	bda4c5cc52	fix: update scheduler check tim	2021-04-12 16:11:52 +05:30
Rohit Waghchaure	2339de7333	fix: update scheduler check tim	2021-04-12 16:09:55 +05:30
Saqib Ansari	faca478317	fix: payment amount showing in foreign currency	2021-04-12 15:40:27 +05:30
Deepesh Garg	719e0c1e60	fix: Taxxable value including Freight and Forwarding charges in GSTR-1 Report	2021-04-12 14:37:43 +05:30
Ankush Menat	53ce877ad9	Merge branch 'develop' into escape_sql_credit_report	2021-04-12 14:37:31 +05:30
Saqib	49336b8065	fix: consolidated sales invoice posting date (#25119 )	2021-04-12 12:17:50 +05:30
prssanna	42f4a00c88	fix: declare data before assigining	2021-04-12 12:01:20 +05:30
Marica	be26e59087	Merge pull request #25196 from noahjacob/UX fix: Company field in Warehouse	2021-04-12 11:08:45 +05:30
Deepesh Garg	5f3d7f547c	fix: Item wise tax rate for consolidated POS invoice (#25029 ) * fix: Item wise tax rate for consolidated POS invoice * fix: Do not alter item wise taxes for consolidated invoices * fix: Add test case * fix: Update * fix: Set opening stock for test item * fix: Add valuation rate for opening stock	2021-04-12 10:56:47 +05:30
Deepesh Garg	c36e48a869	fix: GST on freight charge in e-invoicing (#25000 ) * fix: GST on freight charge in e-invocing * fix: Add patch for taxable value field * fix: Handle discounts on net total * fix: Handle all types of discounts for e-invoicing * fix: Absolute taxable values * fix: Use correct tax amount	2021-04-12 10:55:43 +05:30
Marica	99522252c4	Merge branch 'develop' into UX	2021-04-12 10:51:24 +05:30
Anupam Kumar	9f73bd8040	fix: don't delete mode of payment account details while deleting company transactions (#25217 )	2021-04-12 10:31:36 +05:30
Saqib	b8a270074e	fix(pos): cannot set qty to less than zero (#25258 )	2021-04-12 10:28:05 +05:30
Anoop	207166fe8b	fix(patch): copy Lab Test / Template renamed field values (#25276 ) reload_doc doctypes introduced since v11	2021-04-12 10:25:34 +05:30
Ankush Menat	d235fc75ad	fix: remove nonexistent method from pick list (#25279 ) This method is merged in calculate_rate_and_amount() during repost item valuation refactoring. Ref: `e10f0a5a6c (diff-a160e3a8907dcdf28ce7728bb7dd45914ad8ab033489ea3de4c80fb1c4ca7fe9)`	2021-04-12 10:23:06 +05:30
Deepesh Garg	4d4d7074d0	Merge pull request #25053 from deepeshgarg007/delivery_note_gst_category fix: Add GST category field in Delivery Note	2021-04-10 22:12:42 +05:30
Deepesh Garg	1466e2d758	Merge pull request #25271 from deepeshgarg007/loan_penalty_new_fix fix: Consider paid repayment entries in subsequent loan repayments	2021-04-10 21:00:46 +05:30
Deepesh Garg	81ecd0b8b6	Merge branch 'develop' of https://github.com/frappe/erpnext into delivery_note_gst_category	2021-04-10 20:54:38 +05:30
Deepesh Garg	b58590251b	fix: minor improvements and tests	2021-04-10 19:55:36 +05:30
rohitwaghchaure	5899477cbb	Merge pull request #25015 from rohitwaghchaure/fixed-patch-item-reposting-for-incorrect-sl-and-gl-develop fix: patch	2021-04-10 18:58:44 +05:30
Deepesh Garg	f38a653a08	fix: Show exact error message in datetime	2021-04-10 18:34:51 +05:30
Deepesh Garg	e7efbc1d33	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_penalty_new_fix	2021-04-10 18:33:38 +05:30
Deepesh Garg	37d6c19a34	fix: Consider paid repayment entries in subsequent loan repayments	2021-04-10 18:33:26 +05:30
Deepesh Garg	8a01dbe8e1	Merge pull request #25261 from ankush/issue_status_banner_fix fix: condition for SLA status banner	2021-04-10 17:56:51 +05:30
Rohit Waghchaure	a5d062453e	feat: added test case	2021-04-10 10:49:31 +05:30
Rohit Waghchaure	cb6494876f	feat: purchase receipt creation from purchase invoice	2021-04-10 10:49:30 +05:30
Rohit Waghchaure	1db8c51749	fix: changed logic	2021-04-10 10:45:29 +05:30
Rohit Waghchaure	b9aa775f3b	fix: pricing_rule test cases	2021-04-10 10:45:28 +05:30
Rohit Waghchaure	1358443cdb	fix: patch	2021-04-10 10:42:08 +05:30
Deepesh Garg	c85c243f9c	Merge pull request #25255 from nextchamp-saqib/issue-condition-fix fix: condition for setting agreement status	2021-04-09 21:40:14 +05:30
Deepesh Garg	df9388aa8e	Merge pull request #25086 from deepeshgarg007/advance_amount_precision fix: Precision issues while allocating advance amount	2021-04-09 21:39:02 +05:30
noahjacob	110f28f869	Company field editable and is readonly after saving.	2021-04-09 20:01:47 +05:30
Saqib	14b98c1737	Merge branch 'develop' into issue-condition-fix	2021-04-09 18:29:01 +05:30
Afshan	23f645e7da	Merge branch 'develop' into dimension-wise-accounts-balance-reports	2021-04-09 18:22:43 +05:30
Anupam Kumar	986452107b	fix: Lead Source's module (#24583 ) * fix: Lead Source's module * fix: patch fix	2021-04-09 18:15:51 +05:30
Anupam Kumar	a91d7bd4b5	Merge branch 'develop' into se-add-to-transit	2021-04-09 18:00:03 +05:30
Anupam Kumar	cd2aedd0c6	Merge branch 'develop' into planning	2021-04-09 17:59:47 +05:30
Afshan	1f08d8e3de	Merge branch 'develop' into dimension-wise-accounts-balance-reports	2021-04-09 17:44:54 +05:30
Afshan	c42318ec24	chores: clean up	2021-04-09 17:44:30 +05:30
Ankush Menat	5451bbf7d2	fix: condition for SLA status banner If the document is NOT in the closed state and fulfilled then there won't be any banner. This bug was introduced while fixing a bug related to buttons, so separated out code for showing buttons and showing banners.	2021-04-09 17:19:02 +05:30
rohitwaghchaure	526f76c27d	Merge pull request #25257 from rohitwaghchaure/travis-fix-for-project fix: travis	2021-04-09 17:07:22 +05:30
Afshan	31b5dfe9ee	feat: Dimension-wise Accounts Balance Report	2021-04-09 16:52:14 +05:30
Rohit Waghchaure	ca5e10892c	fix: travis	2021-04-09 16:23:45 +05:30
Afshan	dc73a9995d	Merge branch 'develop' into add-blank-for-status-issue-reports	2021-04-09 13:04:34 +05:30
Saqib Ansari	032246dc2b	feat(italy): add document type field for e-invoicing	2021-04-09 12:08:24 +05:30
Marica	d38618fc34	Merge branch 'develop' into item-dashboard-fixes	2021-04-09 11:57:56 +05:30
Marica	5467d7c3e3	fix: Use system precision instead of SLE precision	2021-04-09 11:56:49 +05:30
Marica	a7ac01153e	fix: Remove redundant import and import cint	2021-04-09 11:55:44 +05:30
Saqib Ansari	e7813b69c4	fix: condition for setting agreement status	2021-04-09 11:46:16 +05:30
Marica	b89a40aa3c	Merge branch 'develop' into fix_picked_qty_in_DN	2021-04-09 11:45:39 +05:30
Marica	7f0e92c9b9	Merge pull request #25232 from nextchamp-saqib/coa-importer-validate-fix fix: keyerror while validating coa file	2021-04-09 11:44:40 +05:30
Deepesh Garg	63e6036d12	Merge pull request #25235 from ankush/remove_purch_inv_validation fix: remove gst name validation for purchase Invoice	2021-04-09 10:48:34 +05:30
barredterra	e66cf0aa44	fix: hanging indent	2021-04-08 18:26:45 +02:00
barredterra	0a45fc8c58	fix: remove unused import	2021-04-08 18:25:17 +02:00
barredterra	3a12f1f1ae	fix: prettier error log	2021-04-08 17:53:48 +02:00
Saqib	4191e7999d	chore: add error title Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-04-08 21:04:56 +05:30
barredterra	ea0fd31f60	Merge branch 'datev_fixes' of https://github.com/alyf-de/erpnext into datev_fixes	2021-04-08 17:25:54 +02:00
Raffael Meyer	3b4b17476a	Merge branch 'develop' into datev_fixes	2021-04-08 17:25:12 +02:00
Deepesh Garg	edb4663258	Merge pull request #25251 from nextchamp-saqib/einv-ack-no-fix fix(india): set correct ack no. on irn generation	2021-04-08 20:48:01 +05:30
barredterra	c6e13ac218	fix: patch to fill Debtor/Creditor Number	2021-04-08 16:57:55 +02:00
barredterra	ed36fb2073	docs: doctring for patch	2021-04-08 16:57:20 +02:00
barredterra	03425071e7	fix: patch to add custom fields	2021-04-08 16:31:00 +02:00
barredterra	368a6541e9	fix: Debtor/Creditor Number is not translatable	2021-04-08 16:26:56 +02:00
Saqib Ansari	30720d2139	fix: set correct ack no. on irn generation	2021-04-08 19:06:44 +05:30
Rucha Mahabal	b7aa658a51	refactor(HR): Add missing reports and doctypes to the Workspace (#24994 ) * refactor(HR): Add missing reports and doctypes to the Workspace * refactor: remove Employee Tax and Benefits from HR Workspace Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>	2021-04-08 18:13:21 +05:30
Jannat Patel	d9fa79de99	fix: serial no refresh issue (#25127 ) * fix: serial no refresh issue * fix: sider	2021-04-08 16:04:57 +05:30
Anupam Kumar	9d830255c1	Merge branch 'develop' into se-add-to-transit	2021-04-08 14:44:08 +05:30
rohitwaghchaure	f9fde054e1	Merge pull request #25242 from rohitwaghchaure/fixed-test-case-for-bom-cost fix: bom cost test case	2021-04-08 14:39:08 +05:30
Marica	6a98d39201	Merge branch 'develop' into fixed-incorrect-batch-selected-in-purchase-rceipt-develop	2021-04-08 13:57:35 +05:30
HENRY Florian	e286750a0f	fix: UOM length unit in global setup list is empty (#24855 ) * When ERPNext is installed in localized language the category of UOM Conversion Factor is tranlasted into installed languaes. Filter must be locallized * fix * fix Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-04-08 13:56:29 +05:30
Marica	fb9fc944c5	Merge branch 'develop' into coa-importer-validate-fix	2021-04-08 13:46:42 +05:30
Rohit Waghchaure	fa8bb87a86	fix: bom cost test case	2021-04-08 13:38:22 +05:30
Ankush Menat	cb625d868c	fix: round total quantity in job card	2021-04-08 12:05:52 +05:30
Saqib	f10d107a0a	Merge branch 'develop' into coa-importer-validate-fix	2021-04-08 11:25:29 +05:30
Anupam Kumar	dfdf72cbb2	Merge branch 'develop' into planning	2021-04-08 10:58:05 +05:30
Anupam Kumar	8edf9d23c0	Merge branch 'develop' into se-add-to-transit	2021-04-08 10:57:50 +05:30
barredterra	94f293940c	fix: better party export	2021-04-07 20:06:16 +02:00
barredterra	4fe2d35b2e	feat: more infos for transactions	2021-04-07 20:05:41 +02:00
barredterra	b39608a02e	fix: handle encoding errors replace unknown characters by '?'	2021-04-07 20:04:38 +02:00
barredterra	6b2e4f2b5d	feat: add custom field debtor_creditor_number to Party Account	2021-04-07 20:03:59 +02:00
barredterra	09c7598a67	fix: make account field non-mandatory	2021-04-07 20:03:33 +02:00
Ankush Menat	76c8521010	fix: remove gst name validation for purch Invoice	2021-04-07 16:28:13 +05:30
Afshan	e2da3cbc28	fix: payroll issues (#24540 ) * fix: payroll issues * fix: enhancements * fix: rename variables and refactor * fix: slider * fix: added missing arguments * fix: test cases * fix: slider * fix: slider fix: slider Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-04-07 15:13:44 +05:30
Saqib Ansari	5541aeaa82	fix: keyerror while validating coa file	2021-04-07 12:34:20 +05:30
Walstan Baptista	c39720db50	fix: frappe.whitelist for doc methods (#25231 )	2021-04-07 11:51:22 +05:30
Walstan Baptista	90e240c3e6	fix: frappe.whitelist for doc methods (#25230 )	2021-04-07 11:32:51 +05:30
Saurabh	547fd31a37	bumped to version 13.0.1	2021-04-07 11:33:40 +05:50
Nabin Hait	aa809ceffe	fix: Patch fixes for v13 upgrade (#25220 )	2021-04-07 10:57:46 +05:30
Deepesh Garg	5af6aea9f9	fix: Posting Date check	2021-04-07 09:46:13 +05:30
Deepesh Garg	d551940dc5	fix: Remove comments	2021-04-06 23:55:48 +05:30
Deepesh Garg	a42194f3d5	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_fixes_phase_2	2021-04-06 23:53:34 +05:30
Rucha Mahabal	d77ea7c88b	Merge pull request #25190 from ruchamahabal/approver-perms feat(HR): share doc with employee approvers if they don't have access	2021-04-06 14:32:34 +05:30
Rucha Mahabal	0bcd3c45ed	fix: leave approver perms test	2021-04-06 13:46:53 +05:30
Hussain Nagaria	d2da7b673b	fix: Sider Issues	2021-04-06 11:44:54 +05:30
Hussain Nagaria	33e0c8ed19	test: Unique Employee IDs for tests	2021-04-06 11:40:35 +05:30
Deepesh Garg	dfe91b5df3	Merge pull request #25212 from deepeshgarg007/loan_shortfall_preference fix: Give first preference to loan security on repayment	2021-04-06 11:06:03 +05:30
Anupam Kumar	7b6c8bb3ab	fix: error message compensatory leave request (#25206 )	2021-04-06 10:20:10 +05:30
Rucha Mahabal	d1970d3c38	Merge branch 'develop' into approver-perms	2021-04-06 10:09:18 +05:30
Rucha Mahabal	084e90e5d3	fix(test): set user as Administrator	2021-04-06 10:07:50 +05:30
Deepesh Garg	015fd681ec	fix: Give first preference to loan security on repayment	2021-04-06 00:49:46 +05:30
Hussain Nagaria	bb32f5a92a	fix: Rename utilisation to utilization	2021-04-05 19:32:10 +05:30
Sagar Vora	c9cdf74dc5	test: remove `print()` (#25205 )	2021-04-05 16:38:10 +05:30
Marica	4440ff7a0d	Merge branch 'develop' into item-dashboard-fixes	2021-04-05 16:25:57 +05:30
Marica	bc50193702	Merge branch 'develop' into fix_picked_qty_in_DN	2021-04-05 16:24:53 +05:30
Sagar Vora	9967a7ce02	test: clear all existing quotations to avoid AssertionError (#25202 )	2021-04-05 15:35:52 +05:30
Rucha Mahabal	9948525dd3	Merge branch 'develop' into approver-perms	2021-04-05 14:54:11 +05:30
Sagar Vora	9a0907131a	test: create tax rule if it doesnt exist (#25199 )	2021-04-05 14:50:09 +05:30
Walstan Baptista	8789ef16a1	test: uses `_Test Item` instead of `_Test Item Home Desktop 100` (#25198 )	2021-04-05 13:18:03 +05:30
Hussain Nagaria	ccb15de1c9	fix: Handle overtime edge case	2021-04-05 11:23:06 +05:30
Anoop	b27441b40c	fix: failing patch - reload_doc new doctypes added in v13 (#25194 )	2021-04-05 10:41:28 +05:30
Ankush Menat	36ff0748bf	fix: broken type check in stock ageing report	2021-04-05 10:18:44 +05:30
Rucha Mahabal	b7436a04c3	fix: Ignore Permission for Leave Ledger Entry (#25172 )	2021-04-04 20:09:00 +05:30
Rucha Mahabal	57ab3a5a88	Merge branch 'develop' into approver-perms	2021-04-04 19:57:58 +05:30
Rucha Mahabal	19c3286b06	fix: linter and sider issues	2021-04-04 19:54:00 +05:30
Rucha Mahabal	8c055b5469	fix: ignore share permission while sharing doc with approver	2021-04-04 18:45:06 +05:30
Rucha Mahabal	13c0a350af	test: leave, expense, shift request approver permissions	2021-04-04 18:37:46 +05:30
Rucha Mahabal	ba10ef4403	feat(HR): share doc with employee approvers if they don't have access	2021-04-04 17:16:48 +05:30
Rohit Waghchaure	8b829711fc	fix: incorrect batch picked in subcontracted purchase receipt	2021-04-04 12:43:38 +05:30
Sagar Vora	8aacd341c7	test: disable shopping cart before running Tax Rule tests (#25183 )	2021-04-03 23:01:16 +05:30
Sagar Vora	993cf8c2cd	test: cleanup BOM in `test_routing` and prevent overlap in `test_job_card` (#25180 )	2021-04-03 20:25:19 +05:30
Walstan Baptista	37b826b988	fix: correct calculation for discount amount when margin is set (#25179 )	2021-04-03 19:48:46 +05:30
Sagar Vora	cce3efe0c1	test: specify warehouse list to avoid error (#25174 ) * test: specify warehouse list to avoid error * test: get_all_warehouses of BOM company	2021-04-03 19:46:44 +05:30
Walstan Baptista	b7481633b1	test: adds role after setting user to Administrator (#25177 )	2021-04-03 17:37:59 +05:30
Sagar Vora	f68f41d7a7	test: fix multiple tests in Leave Application (#25173 )	2021-04-03 17:34:57 +05:30
Deepesh Garg	232c127295	Merge pull request #25107 from deepeshgarg007/stock_entry_serial_batch_selector fix: Hide serial and batch selector in Stock Entry	2021-04-03 17:15:22 +05:30
Deepesh Garg	b7e7eeaf8d	Merge pull request #25138 from deepeshgarg007/loan_shortfall_percentage fix: Add shortfall ratio in Loan Security Shortfall	2021-04-03 17:13:27 +05:30
rohitwaghchaure	fe72e17a7b	Merge pull request #25109 from ankush/po_to_pr_fixes fix: incorrect status creating PR from PO after creating PI	2021-04-03 17:11:14 +05:30
Sagar Vora	f6b1fa0a1c	test: clear tax rules before making POS Invoices (#25171 )	2021-04-03 16:06:41 +05:30
Walstan Baptista	5d77f10baa	test: docs are not deleted in tearDown (#25123 ) * test: docs are not deleted in tearDown	2021-04-03 13:38:55 +05:30
Ankush Menat	87b2a51322	fix: escape sql filters in credit report closes #24965	2021-04-03 12:34:34 +05:30
Saqib	a30d70e490	Merge branch 'develop' into customer_duplicates	2021-04-03 12:22:22 +05:30
Kaviya Periyasamy	2cef23d4c9	fix: object referencing the same address issue (#25159 ) * fix: variable reference to same address * fix: object referencing same address issue * fix: value error	2021-04-03 11:30:49 +05:30
Hussain Nagaria	40abd2a2e1	test: Add test case for summary data	2021-04-02 19:55:54 +05:30
Hussain Nagaria	d27fc93edd	feat: Add additional stats to report summary	2021-04-02 19:54:58 +05:30
Rucha Mahabal	2453b0cf6a	fix: component amount calculation based on formula with abbr not working (#25117 )	2021-04-02 17:00:28 +05:30
bhavesh95863	7535341016	fix(regional): remove shipping address GSTIN validation for e-invoice (#25153 )	2021-04-02 15:04:48 +05:30
Ankush Menat	e41d48c7de	fix: disable auto naming of customer during import	2021-04-02 14:22:04 +05:30
Marica	7f9fedf08a	Merge branch 'develop' into fix_picked_qty_in_DN	2021-04-02 13:19:19 +05:30
Saqib	5447b250fe	fix: place of supply of e-invoicing (#25148 )	2021-04-02 12:16:19 +05:30
Deepesh Garg	7f10044195	fix: Typo	2021-04-02 12:04:42 +05:30
Jannat Patel	0353b0f5f6	Merge branch 'develop' into profitability-report	2021-04-02 10:15:28 +05:30
Saurabh	e7b3047eca	chore: Bump version to v13.0.0	2021-04-01 22:59:28 +05:30
Anuja Pawar	87dea3923b	fix: Picked Qty conversion from Stock Qty to Qty while creating DN from Pick List (#25106 ) * fix: picked qty from Stock Qty to Qty in DN * fix: suggested changes and added test * fix: sider changes * fix: sider changes	2021-04-01 22:05:08 +05:30
Saurabh	f9b9298a6d	fix: reload doc in patch (#25144 )	2021-04-01 21:59:35 +05:30
Jannat Patel	c01b2caaa3	fix: serial no refresh issue (#25129 )	2021-04-01 20:48:51 +05:30
Afshan	ace4ce64a0	fix: validation msg for TransDocNo e-invoicing (#25121 )	2021-04-01 20:28:12 +05:30
Suraj Shetty	c5347c4a34	fix: get_route_options_for_new_doc for project	2021-04-01 19:59:29 +05:30
Nabin Hait	db5f0f79b1	chore: added v13 change log (#25140 )	2021-04-01 19:59:02 +05:30
Suraj Shetty	7b97d49a58	Merge pull request #25141 from surajshetty3416/fix-get_route_options_for_new_doc fix: get_route_options_for_new_doc for Project	2021-04-01 19:58:01 +05:30
Suraj Shetty	67169ba2d3	fix: get_route_options_for_new_doc for project	2021-04-01 19:52:07 +05:30
Marica	f46fbcc1ad	Merge pull request #25118 from marination/qc-back-update fix: Query values incorrectly escaped while back updating Quality Inspection	2021-04-01 18:30:58 +05:30
Sagar Vora	d3ee8c7731	fix: customer creation from shopping cart (#25136 )	2021-04-01 18:18:19 +05:30
Deepesh Garg	eea20f83ab	fix: Add shortfall ratio in Loan Security Shortfall	2021-04-01 18:13:54 +05:30
Rucha Mahabal	0773d6772d	fix(POS): local variable 'customer_currency' referenced before assignment (#25137 )	2021-04-01 17:47:19 +05:30
Marica	913e7254cb	Merge branch 'develop' into qc-back-update	2021-04-01 17:40:46 +05:30
Marica	f4e7e72f67	Merge pull request #25131 from marination/qc-back-update-pre-release fix: Query values incorrectly escaped while back updating Quality Inspection	2021-04-01 17:39:56 +05:30
Walstan Baptista	446a6df662	test: set opening stock to fix NegativeStock errors (#25101 ) Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-04-01 16:54:26 +05:30
Sagar Vora	98d250995d	fix(India): create property setters for shorter naming series (#25134 )	2021-04-01 16:52:28 +05:30
Sagar Vora	88f5c42b09	test: set formula in scorecard to avoid ValidationError (#25116 )	2021-04-01 16:44:05 +05:30
Anuja P	7982688508	fix: sider changes	2021-04-01 16:04:28 +05:30
Walstan Baptista	58625674f4	test: correct naming series to avoid ValidationError (#25132 )	2021-04-01 15:55:37 +05:30
marination	a3da206b64	fix: Don't string format args as they may not be escaped properly - Append even conditional args to args list and send to query executer - It will escape all values that are sent to it - String formatting without escaping causes issues with % sign, etc.	2021-04-01 15:45:33 +05:30
Marica	9ef323fcfd	Merge branch 'develop' into qc-back-update	2021-04-01 15:44:20 +05:30
Anuja P	45d0b9bce6	test: added tests for Pick List for item with multiple UOM	2021-04-01 15:38:13 +05:30
Sagar Vora	4c31fbb687	fix(India): create property setters for shorter naming series (as per GST Rules) (#25128 )	2021-04-01 15:32:37 +05:30
Rucha Mahabal	6717773c28	fix: Travis (#25078 ) * fix(test): set default accounts in mode of payment * fix(test): import_doc params in shopify settings test * fix: syntax error in salary slip test * fix(test): use Temporary Opening account for Stock Reco opening entry * fix(test): skip GST doc naming validations for tests * fix(test): Salary Structure Assignment date edge case * fix(test): GST doc naming validations * fix: sider * revert: skip GST doc naming validations for tests	2021-04-01 15:30:34 +05:30
Nabin Hait	7f7b3608bb	fix: merge conflict	2021-04-01 15:05:53 +05:30
Nabin Hait	11eb30d082	fix: merge conflict	2021-04-01 15:03:11 +05:30
Rohit Waghchaure	58ca5a7329	fix: repost not completed backdated transactions	2021-04-01 14:59:49 +05:30
Rucha Mahabal	53a1aaf33d	fix: Salary Structure object has no attribute set_totals (#25113 )	2021-04-01 14:40:15 +05:30
Rucha Mahabal	d765b21825	fix: Salary Structure object has no attribute set_totals (#25114 )	2021-04-01 14:39:52 +05:30
marination	561fa6b530	fix: Don't string format args as they may not be escaped properly - Append even conditional args to args list and send to query executer - It will escape all values that are sent to it - String formatting without escaping causes issues with % sign, etc.	2021-04-01 12:56:05 +05:30
Ankush Menat	1bdf9c4161	fix: patch for purchase receipt status	2021-04-01 11:58:34 +05:30
Ankush Menat	427a98d6cd	fix: do not copy percent billed from PO to PR	2021-04-01 11:51:31 +05:30
Ankush Menat	8993ccb7d2	fix: update PR status in database	2021-04-01 11:51:31 +05:30
Ankush Menat	4198cf58e5	test: add tests for PO->PI, PO->PR workflow Add failing test cases for PR status and PR percent billed.	2021-04-01 11:51:30 +05:30
Hussain Nagaria	1e772bb9a4	test: Basic report data testing	2021-04-01 00:44:35 +05:30
rohitwaghchaure	56bd4d71a9	Merge pull request #25112 from rohitwaghchaure/fixed-clear-source-warehouse fix: not able to save material request	2021-03-31 23:58:44 +05:30
Rohit Waghchaure	825850a58f	fix: not able to save material request	2021-03-31 23:55:06 +05:30
Marica	bfc2590e3b	Merge branch 'develop' into patch-7	2021-03-31 22:23:23 +05:30
Marica	8617c0ab99	Merge pull request #25070 from marination/update-items-bin fix: Update Bin via Update Item on Purchase/Sales Order	2021-03-31 22:21:41 +05:30
Afshan	2fef245607	fix: don't set Company:company:default_currency as default for currency link fields (#25111 )	2021-03-31 21:57:04 +05:30
Prssanna Desai	f3c34aa6ae	fix: don't set "Company:company:default_currency" as default for currency link fields (#25095 ) * fix: don't set Company:company:default_currency as default for currency link fields * fix: Company:company:default_currency and refactor Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com> Co-authored-by: Afshan <afshan13k@gmail.com>	2021-03-31 21:52:48 +05:30
marination	85a7ec91a1	fix: Run Patches to updated Reserved, Requested and Ordered Qty	2021-03-31 21:07:59 +05:30
marination	7665a85039	fix: Run Patches to updated Reserved, Requested and Ordered Qty	2021-03-31 21:03:55 +05:30
Deepesh Garg	9f7bb14ea1	fix: Remove console	2021-03-31 20:01:00 +05:30
Anuja P	a1d0932093	fix: suggested changes	2021-03-31 19:59:28 +05:30
Deepesh Garg	2d86eb3ab1	fix: Hide serial and batch selector in Stock Entry	2021-03-31 19:57:50 +05:30
Ankush Menat	777745f1e0	fix: do not fetch stopped MR in production plan - Ignore stopped MR while using fetch button - Add filter on field inside child table. Related issue: ISS-20-21-10757	2021-03-31 19:53:19 +05:30
Anupam Kumar	1033cf72f6	fix: added flag for dont_fetch_price_list_rate in transaction (#25041 )	2021-03-31 19:39:45 +05:30
Anupam Kumar	35415fa575	fix: added flag for dont_fetch_price_list_rate in transaction (#25083 )	2021-03-31 19:39:33 +05:30
Anuja P	fb9ce3f37b	fix: Picked Qty conversion from Stock Qty to item Qty in DN	2021-03-31 19:26:42 +05:30
Prssanna Desai	9920d4062c	Merge pull request #25103 from prssanna/redesign-fixes-v13	2021-03-31 19:02:10 +05:30
Sagar Vora	27f48739d4	test: pass force parameter to avoid LinkExistsError (#25100 )	2021-03-31 18:49:03 +05:30
Anupam Kumar	526497bc43	Merge pull request #25104 from anupamvs/purchase-side-margin-beta feat: price margin in buying	2021-03-31 18:38:58 +05:30
Prssanna Desai	e9236ab60f	Merge pull request #25102 from prssanna/pos-print-v13	2021-03-31 18:36:07 +05:30
Sagar Vora	4e07695a08	test: use insert instead of save (#25045 ) * test: use insert instead of save * test: use do_not_save	2021-03-31 18:33:27 +05:30
Anupam	ad520e08ba	feat: price margin in buying	2021-03-31 18:31:12 +05:30
prssanna	bcd63f04da	style: missing semicolon	2021-03-31 18:26:52 +05:30
prssanna	5cdb1cb7a9	fix: item variant dialog dropdown issue	2021-03-31 18:26:45 +05:30
prssanna	56ab3fb132	fix: issue web list style	2021-03-31 18:26:37 +05:30
prssanna	b5843dbdcd	fix: print recepit dialog	2021-03-31 18:21:51 +05:30
prssanna	b6ce868199	fix: POS print receipt	2021-03-31 18:21:38 +05:30
Jannat Patel	c814aab0b6	fix: delivery note print error (#25081 )	2021-03-31 16:24:31 +05:30
Jannat Patel	11e9ae3841	fix: delivery note print error (#25080 )	2021-03-31 16:24:08 +05:30
Prssanna Desai	c5ae9ee0e1	fix: do not set standard link in Sales Invoice as custom (#25097 )	2021-03-31 16:16:12 +05:30
Prssanna Desai	45eccfafc1	fix: do not set standard link in Sales Invoice as custom (#25096 )	2021-03-31 16:16:00 +05:30
Marica	116ac3cde7	Merge pull request #24863 from marination/drop-shipping fix: PO not created against all selected suppliers (drop shipping)	2021-03-31 16:06:44 +05:30
Deepesh Garg	21a3ea462a	fix: Purchase from registered composition dealer (#25040 ) * fix: Purchase from registered composition dealer * fix: Test case for GSTR 3b report	2021-03-31 16:05:12 +05:30
Deepesh Garg	c482c9592f	fix: Purchase from registered composition dealer (#25057 ) * fix: Purchase from registered composition dealer * fix: Test case for GSTR 3b report	2021-03-31 16:04:46 +05:30
Marica	1b8d36634f	Merge branch 'develop' into patch-7	2021-03-31 16:04:24 +05:30
Marica	8339987cf1	Merge branch 'develop' into drop-shipping	2021-03-31 16:03:14 +05:30
Saqib	fb4051bddd	feat: discount configuration on early payments (#25089 ) * feat: discount configuration on early payments Co-authored-by: Nabin Hait <nabinhait@gmail.com> * fix: remove duplicate patch call Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-03-31 15:52:51 +05:30
Saqib	4d0939de8d	feat: introduce parameter group in quality inspection (#25094 ) * feat: introduce parameter group in quality inspection * chore: make parameter group optional	2021-03-31 15:51:48 +05:30
rohitwaghchaure	e353c84aa5	Merge pull request #25092 from rohitwaghchaure/fixed-multiply-issue-material-request-develop fix: can't multiply sequence by non-int of type 'float'	2021-03-31 15:31:50 +05:30
rohitwaghchaure	968885af26	Merge pull request #25091 from rohitwaghchaure/fixed-multiply-issue-material-request fix: can't multiply sequence by non-int of type 'float'	2021-03-31 15:31:30 +05:30
Rohit Waghchaure	1bc53a32bf	fix: can't multiply sequence by non-int of type 'float'	2021-03-31 15:30:42 +05:30
Rohit Waghchaure	94c145f3c3	fix: can't multiply sequence by non-int of type 'float'	2021-03-31 15:28:26 +05:30
Rohan	99a8cb7143	fix: commit individual SLE rename for large datasets (#25084 )	2021-03-31 15:22:00 +05:30
Saqib	f239dbdd03	feat: tax collected at source using tax withholding category (#25090 ) * refactor: tax withholding category against customer * feat: pan and tax withholding category fields for customer * fix: test * feat: charging tcs on sales invoice * fix: tcs chargable amount * fix: tcs amount calculation * fix: sider	2021-03-31 15:15:29 +05:30
Marica	0af1aedf34	Merge branch 'develop' into drop-shipping	2021-03-31 15:05:11 +05:30
Saqib	0586b7db79	feat: discount configuration on early payments (#24586 ) Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-03-31 15:03:53 +05:30
Saqib	df1ef6f8e5	fix: make round off GLE always non-opening (#25087 )	2021-03-31 14:23:09 +05:30
Deepesh Garg	5d73d8281b	fix: Remove unintentionally added field	2021-03-31 14:10:56 +05:30
Deepesh Garg	f54d596ae1	fix: Precision issues while allocating advance amoount	2021-03-31 14:06:02 +05:30
rohitwaghchaure	83b3e87497	Merge pull request #25076 from rohitwaghchaure/fixed-bom-stock-calculated-report fix: bom stock calculated report	2021-03-31 13:51:32 +05:30
Afshan	b07de03ddb	fix: added blank option for status in report related to issue	2021-03-31 13:39:04 +05:30
marination	59bff8a2f1	fix: Test - Preserve order of supplier list while removing duplicates - Dont use list of set, but list of dict with unique keys	2021-03-31 13:17:25 +05:30
marination	1b903e39c8	fix: Sider (unused variables)	2021-03-31 13:17:13 +05:30
marination	1999ae0a91	fix: PO not created against all selected suppliers (drop shipping) - Return list of created POs instead of first doc - test case added	2021-03-31 13:17:00 +05:30
Hussain Nagaria	39b75c63ad	feat: Add chart generation	2021-03-31 13:13:25 +05:30
Marica	5a601ce851	Merge branch 'develop' into drop-shipping	2021-03-31 13:12:13 +05:30
Sagar Vora	e50324aed7	perf: reduce number of queries for checking if future SL entry exists (#25064 )	2021-03-31 12:44:03 +05:30
Sagar Vora	368cb45147	fix(Italy): setup, validations, optimisations (#25065 )	2021-03-31 12:43:33 +05:30
Walstan Baptista	d6360755b9	chore: frappe.whitelist for doc methods (#25068 ) * chore: frappe.whitelist for doc methods * fix: incorrect spelling * fix: sider issue Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-31 12:30:32 +05:30
Marica	14c44e5e9e	Merge branch 'develop' into drop-shipping	2021-03-31 12:27:32 +05:30
marination	120da991d0	fix: Test - Preserve order of supplier list while removing duplicates - Dont use list of set, but list of dict with unique keys	2021-03-31 12:27:57 +05:30
Hussain Nagaria	92c768972f	fix: Missing quotation marks in SQL query	2021-03-31 12:26:37 +05:30
Hussain Nagaria	f5576d67dd	feat: Add Report Summary generation	2021-03-31 12:25:36 +05:30
Walstan Baptista	353aa59c42	test: sets company while making a project (#25061 )	2021-03-31 12:16:54 +05:30
Walstan Baptista	d65458d534	test: corrected item name (#25075 )	2021-03-31 12:14:41 +05:30
Rohit Waghchaure	410d36beca	fix: bom stock calculated report	2021-03-31 12:11:00 +05:30
Marica	8451da7924	Merge branch 'develop' into drop-shipping	2021-03-31 11:44:07 +05:30
Afshan	91a8a74d54	fix: column width in Recruitment Analytics report (#25074 )	2021-03-31 11:30:04 +05:30
Anurag Mishra	720f69caaf	fix: column width in Recruitment analytics report (#25003 ) Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-03-31 11:23:34 +05:30
Anupam	41229ba705	fix: unable to submit stock entry	2021-03-31 02:32:25 +05:30
marination	a5de6c779b	fix: Cleaned up and fixed validation and bin updation on deletion - Created separate smaller functions for validation and bin updation of deleted row - Made sure previous doc (linked doc) was also updated after deletion of row - Tests to check bin updation on add/update/delete - Made reserved qty for subcontrating read only in bin	2021-03-31 02:03:26 +05:30
Andy Zhu	ba3578929e	Update accounts_controller.py Updating Bin quantity based on doctype to optimize running efficiency.	2021-03-31 02:03:16 +05:30
Andy Zhu	c0ba6eafd5	fix: Update Items on Purchase Order 1. set warehouse using `get_item_warehouse` 2. update "reserved_qty" for sales order	2021-03-31 02:03:10 +05:30
Andy Zhu	a21e347bf1	fix: Update Items on Purchase Order If user add rows or remove rows to update items on purchase order, the quantity in bin won't get updated. This fix is not mature yet but to give an tempopary solution for fixing this issue.	2021-03-31 02:03:02 +05:30
marination	0673f558c1	fix: Cleaned up and fixed validation and bin updation on deletion - Created separate smaller functions for validation and bin updation of deleted row - Made sure previous doc (linked doc) was also updated after deletion of row - Tests to check bin updation on add/update/delete - Made reserved qty for subcontrating read only in bin	2021-03-31 01:42:18 +05:30
Prssanna Desai	7e442c74b6	Merge pull request #25020 from prssanna/help-links-fix-v13	2021-03-30 19:29:30 +05:30
Hussain Nagaria	1a0229eb36	feat: Add report table data generation	2021-03-30 18:20:22 +05:30
Marica	c5739957de	Merge branch 'develop' into patch-7	2021-03-30 18:07:32 +05:30
Deepesh Garg	6be78db62c	Merge pull request #25052 from deepeshgarg007/gst_rounding_v13_beta feat: Normal rounding for GST Taxes	2021-03-30 17:01:45 +05:30
Anurag Mishra	679177f9e0	Merge pull request #25022 from shariquerik/employee-profile-pic-access-fix fix: Employee profile pic upload access for erpnext user	2021-03-30 14:32:21 +05:30
Hussain Nagaria	2b85a81a1c	feat: Add filters to front end	2021-03-30 13:57:44 +05:30
Rucha Mahabal	30f67c3f57	fix: add filters to account link fields in Non Profit Settings (#25060 ) - fetch memberships ordered by date in certificate	2021-03-30 12:39:56 +05:30
Rucha Mahabal	04c0296558	fix: add filters to account link fields in Non Profit Settings - fetch memberships ordered by date in certificate	2021-03-30 12:30:40 +05:30
Hussain Nagaria	b7f2ba1556	feat: Add Report boilerplate	2021-03-30 12:19:16 +05:30
Anupam Kumar	9be11afbde	feat: price margin in buying (#25058 )	2021-03-30 12:09:46 +05:30
Rucha Mahabal	a54eecb230	fix: membership renewal validation (#24963 )	2021-03-30 12:02:52 +05:30
Rucha Mahabal	146cbb10f8	fix: calculate 80g certificate amount on validate for memberships (#24925 )	2021-03-30 12:02:28 +05:30
Rucha Mahabal	5f4a2bfc61	fix(Non Profit): Membership and Donation API fixes (#24900 ) * fix: Donation fixes - differentiate between subscription payment and payment - issue with donation amount * fix: existing membership validation * fix: ignore subscription payments while capturing donations	2021-03-30 12:02:09 +05:30
Rucha Mahabal	170d2efd35	fix(Payroll): Exchange Rate not getting set in Salary Slip (#25013 )	2021-03-30 11:02:46 +05:30
Sagar Vora	7f43c051df	fix(Italy): setup, validations, optimisations	2021-03-29 21:18:26 +05:30
Deepesh Garg	f954ec7c78	fix: Add patch for GST category field in Delivery Note	2021-03-29 20:31:11 +05:30
Sagar Vora	ba76f87e44	fix(Italy): setup, validations, optimisations (#25054 ) * fix(Italy): setup, validations, optimisations * fix: remove unused import	2021-03-29 20:18:45 +05:30
Deepesh Garg	29997414ad	fix: Add GST category field in Dellivery Note	2021-03-29 19:49:52 +05:30
Deepesh Garg	237033704f	fix: Add test case	2021-03-29 16:42:59 +05:30
Deepesh Garg	c2548ddc75	feat: Normal rounding for GST Taxes	2021-03-29 16:42:47 +05:30
Saurabh	ceb026c5ab	bumped to version 13.0.0-beta.14	2021-03-28 16:14:56 +05:50
rohitwaghchaure	b38ea0cc8b	fix: patch (#25014 ) * fix: patch * fix: pricing_rule test cases	2021-03-28 15:51:32 +05:30
Sagar Vora	5c907fa7f0	test: make Stock Entry to avoid NegativeStockError (#25044 )	2021-03-27 20:30:26 +05:30
rohitwaghchaure	f4901b4f22	Merge pull request #25034 from anupamvs/naming-pre-release fix: unable to submit stock entry	2021-03-27 19:50:06 +05:30
Walstan Baptista	ee822a9dcd	test: use different product attribute value; cleanup (#25043 ) Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-27 19:42:25 +05:30
Anupam	d429138dcc	fix: added flag for dont_fetch_price_list_rate in transaction	2021-03-27 19:31:23 +05:30
Walstan Baptista	d6c7d8e631	test: reset session user if test errors in test_sle (#25042 )	2021-03-27 18:30:07 +05:30
Sagar Vora	868c0bf45b	perf: reduce no of queries for checking if future sl entry exists (#24881 )	2021-03-27 16:10:20 +05:30
walstanb	ab673d9e4b	fix: minor changes	2021-03-27 12:54:49 +05:30
walstanb	225c64a1ad	test: sets is_purchase_item while item creation	2021-03-27 12:54:49 +05:30
walstanb	52403c537b	fix: check if gst account exists before appending	2021-03-27 12:54:49 +05:30
walstanb	9826ac4602	test: reset session user if test errors	2021-03-27 12:54:49 +05:30
walstanb	98dcf8a1fd	fix: type casting for None type value	2021-03-27 12:54:49 +05:30
rohitwaghchaure	6c7f029597	Merge pull request #25016 from hasnain2808/fix-ams-error-v13-pre-release fix: ams integration breaks when error raised	2021-03-27 09:59:51 +05:30
Anupam	4adaf7ed2e	Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into naming-pre-release	2021-03-27 00:56:48 +05:30
Anupam	5d994d8aa1	fix: unable to submit stock entry	2021-03-27 00:54:19 +05:30
Anupam	096da429ed	fix: unable to submit stock entry	2021-03-27 00:45:31 +05:30
rohitwaghchaure	d5759bab11	Merge pull request #24922 from rohitwaghchaure/feat-recursice-pricing-rule feat: recursive pricing rule	2021-03-26 19:10:10 +05:30
Rohit Waghchaure	256b9c7bf9	fix: total weight not set for free items	2021-03-26 19:05:46 +05:30
Rohit Waghchaure	0486276789	fix: don't club same free item	2021-03-26 19:05:45 +05:30
Rohit Waghchaure	fce552b811	fix: nonetype object has no attribute options	2021-03-26 19:05:45 +05:30
Rohit Waghchaure	cd8422a840	feat: recursive product discount	2021-03-26 19:05:43 +05:30
Rucha Mahabal	44853da7c2	feat: Show Required Qty as per BOM in Material Request Items	2021-03-26 18:55:16 +05:30
Rucha Mahabal	4cd68cdecb	feat: Add more fields to raw material download	2021-03-26 18:55:08 +05:30
Rucha Mahabal	d74ff72527	fix: Ordered and Reserved Qty for Production not getting fetched in Items	2021-03-26 18:55:00 +05:30
Rucha Mahabal	28a885a3a9	feat: show ordered and reserved qty in Material Request Plan Item table	2021-03-26 18:54:51 +05:30
Rucha Mahabal	efe2b425b1	feat(Production Plan): Consider Safety Stock in Required Qty Calculation	2021-03-26 18:54:34 +05:30
Rucha Mahabal	87a70fe8cb	feat: Show Required Qty as per BOM in Material Request Items	2021-03-26 18:37:50 +05:30
Rucha Mahabal	9dbabb92df	feat: Add more fields to raw material download	2021-03-26 18:37:40 +05:30
Rucha Mahabal	07409990a0	fix: Ordered and Reserved Qty for Production not getting fetched in Items	2021-03-26 18:37:24 +05:30
Rucha Mahabal	1f86471656	feat: show ordered and reserved qty in Material Request Plan Item table	2021-03-26 18:36:52 +05:30
Rucha Mahabal	66bae19c16	feat(Production Plan): Consider Safety Stock in Required Qty Calculation	2021-03-26 18:36:33 +05:30
shariquerik	82d7986a2f	fix: sider fix	2021-03-26 17:02:37 +05:30
Saqib	f66aab6d98	fix: e-invoicing option visible even if settings disabled (#25021 )	2021-03-26 16:40:51 +05:30
shariquerik	1989375be4	fix: Employee profile pic upload access for erpnext user	2021-03-26 16:34:22 +05:30
prssanna	5243eea532	style: fix formatting	2021-03-26 15:47:08 +05:30
prssanna	0ae0368d34	fix: re-execute add_standard_navbar_items patch - check that same items aren't appended again	2021-03-26 15:47:07 +05:30
prssanna	eeb3121622	fix: missing help links in navbar help dropdown	2021-03-26 15:47:07 +05:30
Prssanna Desai	3da2df55f4	Merge branch 'develop' into help-links-fix	2021-03-26 15:35:17 +05:30
Sagar Vora	0b569b3e43	fix: allow creating stock entry based on work order for customer provided items (#24885 )	2021-03-26 14:40:15 +05:30
prssanna	dd2a315d06	style: fix formatting	2021-03-26 14:35:47 +05:30
hasnain2808@gmail.com	e9c801e4bd	fix: ams integration breaks when error raised	2021-03-26 14:32:02 +05:30
Nabin Hait	2a39b74ad2	fix: Fixes on job card and salary slip (#25011 ) * fix: map conversion factor while making stock entry from job card * fix: fetch additional salary in salary slip	2021-03-26 10:49:39 +05:30
Marica	ffb4e3f280	Merge pull request #24937 from ankush/hide_alt_field fix: hide alt tag if item is not shown in website	2021-03-25 20:14:52 +05:30
Anurag Mishra	344c14c9ca	Merge pull request #25004 from ruchamahabal/fix-exchange-rate-in-salary-slip fix(Payroll): Exchange Rate not getting set in Salary Slip	2021-03-25 18:12:11 +05:30
Deepesh Garg	74200bcd62	Merge pull request #24975 from frappe/revert-24039-fixed-incorrect-gstr-report-issue Revert "fix: GSTR B2C report"	2021-03-25 16:50:10 +05:30
Deepesh Garg	7b8742bd70	Merge pull request #24998 from frappe/revert-24318-fix-currency-validation-for-party Revert "fix: validating party currency with doc currency"	2021-03-25 16:49:50 +05:30
Rucha Mahabal	b2b12f303e	fix(Payroll): Exchange Rate not getting set in Salary Slip	2021-03-25 14:48:08 +05:30
pateljannat	c0b4eea415	fix: sider	2021-03-25 14:39:05 +05:30
pateljannat	6597bf7dd7	feat: profitability report default working hours and tests	2021-03-25 13:31:43 +05:30
Mohammad Hasnain Mohsin Rajan	52701dcbbc	fix: patch regional fields for old companies (#24988 )	2021-03-25 12:56:33 +05:30
Mohammad Hasnain Mohsin Rajan	f29c075bc3	fix: patch regional fields for old companies (#24999 ) * fix: patch regional fields for old companies * chore: fix sider	2021-03-25 12:56:13 +05:30
Marica	36d125a720	Merge branch 'develop' into item-dashboard-fixes	2021-03-25 12:32:47 +05:30
Nabin Hait	d4499277b4	chore: Added change log	2021-03-25 12:18:22 +05:30

... 6 7 8 9 10 ...

26841 Commits