27087 Commits

Author	SHA1	Message	Date
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
Rohan Bansal	a93b514b2f	feat: create Quality Inspections from account and stock documents	2021-04-06 17:20:16 +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
Marica	7c6f72fd39	Merge branch 'develop' into hide_alt_field	2021-03-25 12:15:58 +05:30
Nabin Hait	91026e026f	chore: Added change log	2021-03-25 11:53:07 +05:30
Syed Mujeer Hashmi	f8b44e05c4	refactor: Add student mobile number to student attendance (#24990) ... To setup SMS alert notification for student attendance we need student mobile number in this doctype. Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2021-03-25 11:48:29 +05:30
Anupam Kumar	b4e842e25e	fix: opportunity-quotation mapping order status (#25001)	2021-03-25 11:45:57 +05:30
Deepesh Garg	1a6e6320cf	Revert "fix: validating party currency with doc currency (#24318)" ... This reverts commit 02142c41bb.	2021-03-24 21:26:04 +05:30
Prssanna Desai	8a87ffc8f6	fix: POS print receipt (#24924) ... * fix: POS print receipt * fix: print recepit dialog	2021-03-24 19:52:39 +05:30
Saqib	dd39a6b47c	fix(pos): mode of payments disappear on loading draft pos invoice (#24917)	2021-03-24 17:56:24 +05:30
prssanna	194dd12882	fix: re-execute add_standard_navbar_items patch ... - check that same items aren't appended again	2021-03-24 16:45:32 +05:30
prssanna	97aab3ac21	fix: missing help links in navbar help dropdown	2021-03-24 16:44:49 +05:30
Rohit Waghchaure	244f3eeedc	fix: incorrect fieldname	2021-03-24 16:42:22 +05:30
Anurag Mishra	4217a4b1ff	Merge branch 'develop' into item-dashboard-fixes	2021-03-24 15:35:33 +05:30
Anupam Kumar	d1bbb4c311	Merge branch 'develop' into planning	2021-03-24 15:12:04 +05:30
rohitwaghchaure	3c490088c4	Merge pull request #24991 from rohitwaghchaure/repost-not-completed-transactions-pre ... fix: repost not completed backdated transactions	2021-03-24 12:38:42 +05:30
Ishan Loya	de774ae080	Correct state code for 'Other Territory' ... Corrects state code for 'Other Territory' to match e-invoicing state codes list. Attempts to fix #24992	2021-03-24 12:30:51 +05:30
Rohit Waghchaure	9165327cf6	fix: repost not completed backdated transactions	2021-03-24 11:32:26 +05:30
rohitwaghchaure	575f8f226b	fix: repost not completed backdated transactions (#24980)	2021-03-24 11:30:53 +05:30
Deepesh Garg	734f5c2533	Merge pull request #24971 from deepeshgarg007/loan_security_shortfall_process_update ... fix: Pending shortfall update on processing loan security shortfall	2021-03-24 11:24:49 +05:30
Anupam Kumar	5ce0569f80	fix: validate_series (#24984)	2021-03-23 21:13:41 +05:30
Anupam Kumar	5c172044d7	fix: validate_series (#24987)	2021-03-23 21:13:06 +05:30
Deepesh Garg	d26ed25c3e	fix: Period list for exponential smoothing forecasting report (#24983)	2021-03-23 21:11:06 +05:30
Deepesh Garg	82983369fa	fix: Period list for exponential smoothing forecasting report (#24982)	2021-03-23 21:11:01 +05:30
Jannat Patel	d7b139182b	fix: serial no trim issue (#24981) ... * fix: serial no trim issue * fix: sider	2021-03-23 21:09:54 +05:30
Jannat Patel	12f0923a61	fix: serial no trim issue (#24949) ... * fix: serial no trim issue * fix: valid serial nos * fix: sider Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-03-23 21:09:49 +05:30
Afshan	02142c41bb	fix: validating party currency with doc currency (#24318) ... * fix: validating supplier currency * fix: compare current currency with company currency as well. * fix: replaced or with add in condition * fix: conditioning to get proper payment terms values Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-03-23 20:53:56 +05:30
Syed Mujeer Hashmi	f114da2f67	refactor: Make Discharge Schedule Date as Datetime (#24940) ... * refactor: Make Discharge Schedule Date as Datetime Like Admitted Datetime make discharge date as discharge datetime. Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> * fix: Add patch for renaming discharge_date to discharge_datetime Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> * fix: quote style Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-03-23 17:48:25 +05:30
Anupam	940c75f8ac	fix: validate_series	2021-03-23 16:54:54 +05:30
Ankush Menat	2ba198576c	fix: set valuation rate for customer items to zero ... - In stock reconciliation always set valuation rate of customer provided items to zero during validation. - Let user know the valuation has been changed.	2021-03-23 14:03:09 +05:30
Ankush Menat	2a391298a7	test: customer item in stock reconciliation	2021-03-23 14:03:00 +05:30
Ankush Menat	6a534ea82b	fix: Allow zero valuation in stock reconciliation ... Stock reconciliation can not be done for customer provided item as they have zero valuation. This change adds a checkbox in item table to allow such items. Related issue: ISS-20-21-10248	2021-03-23 14:02:52 +05:30
Ankush Menat	e76ecb8f74	fix: set valuation rate for customer items to zero ... - In stock reconciliation always set valuation rate of customer provided items to zero during validation. - Let user know the valuation has been changed.	2021-03-23 13:01:21 +05:30
Ankush Menat	714b780868	test: customer item in stock reconciliation	2021-03-23 12:43:02 +05:30
pateljannat	453e07e32a	fix: exclude cancelled salary slips	2021-03-23 11:18:57 +05:30
Ankush Menat	762d6e38f7	fix: Allow zero valuation in stock reconciliation ... Stock reconciliation can not be done for customer provided item as they have zero valuation. This change adds a checkbox in item table to allow such items. Related issue: ISS-20-21-10248	2021-03-23 11:18:04 +05:30
Marica	e6ad39038e	chore: Allow changing Work Stations in WO. (#24897)	2021-03-23 10:46:03 +05:30
Marica	4ccda9f799	chore: Allow changing Work Stations in WO. (#24898)	2021-03-23 10:45:57 +05:30
Deepesh Garg	ad9b65fcf2	fix: TDS check getting checked after reload (#24972)	2021-03-23 10:45:20 +05:30
Deepesh Garg	d1f15b2a88	fix: TDS check getting checked after reload (#24973)	2021-03-23 10:45:06 +05:30
Rohit Waghchaure	bde159a77d	fix: total weight not set for free items	2021-03-22 23:36:48 +05:30
Deepesh Garg	48d5a65ef5	fix: Add test for pending shortfall update	2021-03-22 21:19:19 +05:30
Deepesh Garg	ea487b6c2e	Revert "fix: GSTR B2C report"	2021-03-22 20:54:07 +05:30
Deepesh Garg	f112ce14cf	fix: Pending shortfall update on processing loan security shortfall	2021-03-22 18:33:55 +05:30
Anupam	661b1e59c1	Merge branch 'develop' of https://github.com/frappe/erpnext into planning	2021-03-22 11:48:11 +05:30
Anupam	4980dd616b	fix: resolving commits	2021-03-22 11:23:47 +05:30
Anuja Pawar	c7c921495b	fix: payment reference on adding cost center in PE and Issue Summary Report error fixes (#24951)	2021-03-22 11:21:15 +05:30
Rucha Mahabal	dffa647071	fix: membership renewal validation (#24963) (#24964)	2021-03-20 22:24:55 +05:30
Rucha Mahabal	5e1cb5e4bc	fix: membership renewal validation (#24963)	2021-03-20 22:22:01 +05:30
Sagar Vora	a85959f574	fix: remove unwanted parameter in calculate_rate_and_amount (#24883) ... * fix: remove unwanted parameter in calculate_rate_and_amount * fix: translation syntax	2021-03-20 16:37:33 +05:30
Walstan Baptista	22054044a3	test: created a new user to test warehouse user perms (#24954) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-20 16:35:14 +05:30
Jannat Patel	08855182a3	test: fix test_loan for payroll module (#24946) ... * test: fix test_loan for payroll module * fix: minor style changes	2021-03-19 16:34:14 +05:30
rohitwaghchaure	98a40d81d5	Merge pull request #24957 from rohitwaghchaure/revert-stock-balance-value-calculation-v13-pre ... fix: revert stock balance value calculation	2021-03-19 16:22:51 +05:30
rohitwaghchaure	081499c0c0	Merge pull request #24956 from rohitwaghchaure/revert-stock-balance-value-calculation-develop ... fix: revert stock balance value calculation	2021-03-19 16:22:13 +05:30
Rohit Waghchaure	67d94ac0cc	fix: revert stock balance value calculation	2021-03-19 16:21:30 +05:30
Rohit Waghchaure	f21a55c8ef	fix: revert stock balance value calculation	2021-03-19 16:19:34 +05:30
Deepesh Garg	23af1ed372	Merge pull request #24947 from deepeshgarg007/multi_currency_lcv_issues_v13 ... fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-18 21:21:57 +05:30
Deepesh Garg	b75cbeee4d	fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-18 21:20:44 +05:30
Deepesh Garg	9b0a9cc2c0	Merge pull request #24912 from deepeshgarg007/multi_currency_lcv_issues ... fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-18 21:20:06 +05:30
Deepesh Garg	adcf9a42bd	Merge pull request #24916 from deepeshgarg007/nil_exempt_gstr_3b ... fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report	2021-03-18 21:02:51 +05:30
Deepesh Garg	a5de22cb8e	Merge pull request #24918 from deepeshgarg007/nil_exempt_gstr_3b_v13 ... fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report	2021-03-18 21:02:41 +05:30
Walstan Baptista	6df61d217f	test: created a new user to test child perms (#24943) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-18 19:23:59 +05:30
Sagar Vora	6ac11a04b0	test: added warehouse for TCS Item as it is a Stock Item (#24942)	2021-03-18 18:07:21 +05:30
Sagar Vora	8ee1146f72	test: add stock to avoid NegativeStockError (#24941)	2021-03-18 17:45:25 +05:30
Afshan	a04091aaf7	fix: exclude current doc while validation. (#24914)	2021-03-18 16:40:43 +05:30
Sagar Vora	b134b89fb0	test: fix NegativeStockError (#24936)	2021-03-18 16:36:40 +05:30
pateljannat	a2068d9b98	feat: profitability report	2021-03-18 15:25:22 +05:30
Sagar Vora	78e576ee6a	fix: default total_estimated_cost to zero (#24939) ... Co-authored-by: walstanb <walstanb@gmail.com>	2021-03-18 15:23:52 +05:30
Ankush Menat	c0a9c391eb	fix: hide alt tag if item is not shown in website	2021-03-18 14:07:24 +05:30
Deepesh Garg	d39055785a	Merge pull request #24934 from Anuja-pawar/fix_report_issue_summary ... fix: Report Issue Summary fix for zero issues	2021-03-18 12:24:43 +05:30
Anuja Pawar	9bf1083d9e	fix: payment references from disappearing on selecting cost center (#24831) ... Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-03-18 11:22:24 +05:30
Rushabh Mehta	14c3c5172d	fix(minor): rearrange the cards on home workspace	2021-03-18 10:45:38 +05:30
Anuja P	2c8a38d9fa	fix: report issue summary fix for zero issues	2021-03-18 10:36:46 +05:30
Sagar Vora	500f54e515	test: fix shift type not found (#24929)	2021-03-17 23:25:04 +05:30
Sagar Vora	52bbd4e182	test: clear Leave Period before running Leave Allocation tests (#24928)	2021-03-17 22:37:59 +05:30
Sagar Vora	7645315424	test: set correct qty when creating subcontract transfer entry (#24903)	2021-03-17 20:01:21 +05:30
Sagar Vora	95e9b2fd6e	refactor(payroll): simplified logic for additional salary (#24907)	2021-03-17 19:58:56 +05:30
Sagar Vora	f4a6c7823a	test: create new item instead of using _Test Item to prevent error (#24915)	2021-03-17 19:57:53 +05:30
Sagar Vora	cf3fc99b12	test: fix salary component not found; other optimisation (#24920)	2021-03-17 19:54:08 +05:30
Rucha Mahabal	bacfaa4396	fix: calculate 80g certificate amount on validate for memberships (#24925) (#24926)	2021-03-17 19:51:59 +05:30
Rucha Mahabal	cbd67e662f	fix: calculate 80g certificate amount on validate for memberships (#24925)	2021-03-17 19:49:27 +05:30
Anurag Mishra	abf974daee	fix: precision and formated document	2021-03-17 18:55:04 +05:30
Rohit Waghchaure	77add49c6a	fix: don't club same free item	2021-03-17 18:49:54 +05:30
Deepesh Garg	438d9cad90	fix: Remove print statement	2021-03-17 18:04:05 +05:30
Deepesh Garg	f9519c7e13	fix: Group nil exempted and non gst items separately	2021-03-17 18:03:58 +05:30
Deepesh Garg	f9f0e347ed	fix: Remove print statement	2021-03-17 18:03:17 +05:30
Deepesh Garg	084ec9773e	fix: Group nil exempted and non gst items separately	2021-03-17 18:00:08 +05:30
Anurag Mishra	23b6294f5c	Merge pull request #24842 from resilient-tech/allow-duplicate-additional ... fix(payroll): allow duplicate additional salaries	2021-03-17 17:39:52 +05:30
Deepesh Garg	a5987782bd	fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report	2021-03-17 15:49:44 +05:30
Deepesh Garg	56c20fb79f	fix(India): Incorrect Nil Exempt and Non GST amount in GSTR3B report	2021-03-17 15:47:03 +05:30
Rohit Waghchaure	a9b1347600	fix: nonetype object has no attribute options	2021-03-17 14:30:34 +05:30
Rohit Waghchaure	ff70e61d7a	feat: recursive product discount	2021-03-17 14:30:34 +05:30
Deepesh Garg	22f5ff8492	fix: Allow user to update exchange rate in Multi-currency LCV	2021-03-17 10:56:52 +05:30
Sagar Vora	68aaf12902	test: use _Test Company to avoid Holiday List error (#24902)	2021-03-17 10:06:05 +05:30
Sagar Vora	bce904cf97	test: fix Employee Not Found errors (#24906)	2021-03-17 10:03:30 +05:30
Sagar Vora	65d7f2c798	fix(Project): get correct holiday list when calculating dates; test fixes (#24901)	2021-03-17 10:00:35 +05:30
Andy Zhu	6117ac5aff	fix: copy_parent_value_in_all_row function error	2021-03-17 13:53:02 +13:00
Anurag Mishra	8fbb043190	Merge pull request #24824 from resilient-tech/fix-salary ... refactor(payroll): simplified logic for additional salary	2021-03-16 21:42:10 +05:30
Rucha Mahabal	00cce433a5	fix(Non Profit): Membership and Donation API fixes (#24900) (#24905) ... * 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-16 20:52:53 +05:30
Rucha Mahabal	1482b2883f	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-16 20:08:51 +05:30
prssanna	1cdef8bd97	style: missing semicolon	2021-03-16 15:39:16 +05:30
prssanna	b8b89a02af	fix: item variant dialog dropdown issue	2021-03-16 14:16:22 +05:30
prssanna	f1dbc021fc	fix: issue web list style	2021-03-16 14:15:59 +05:30
Deepesh Garg	d4a3cf1395	Merge branch 'version-13-beta-pre-release' of https://github.com/frappe/erpnext into add_account_method_v13	2021-03-16 13:24:33 +05:30
Deepesh Garg	635c480771	fix: Add method for regional round off account back	2021-03-16 13:22:20 +05:30
Afshan	46eb4b2f90	Merge branch 'develop' into settings_for_eanbling_leave_notificstion	2021-03-16 13:15:55 +05:30
Deepesh Garg	004f9e6b0c	fix: Add method for regional round off account back	2021-03-16 13:09:59 +05:30
Anurag Mishra	6bafbffee0	fix: added also for leave applier as requested	2021-03-16 13:01:39 +05:30
Anurag Mishra	54482fd83f	feat: added for disabling leave notification in HR settings	2021-03-16 13:01:39 +05:30
Rushabh Mehta	45735b35c4	fix(minor): login: set as Login to ERPNext	2021-03-16 12:22:31 +05:30
marination	dd7d71ca2e	fix: POS Opening Entry with empty balance detail rows	2021-03-16 12:05:37 +05:30
Rushabh Mehta	6ef213e5c6	fix(minor): patch add_state_code_for_ladakh	2021-03-16 11:59:54 +05:30
Marica	4d869906b6	Merge branch 'develop' into drop-shipping	2021-03-16 11:43:46 +05:30
Deepesh Garg	7f2e45e0f4	fix: Unequal debit and credit issue on RCM Invoice (#24838) ... * fix: Unequal debit and credit issue on RCM Invoice * fix: Travis	2021-03-15 18:04:47 +05:30
Deepesh Garg	93f925fb98	fix: Unequal debit and credit issue on RCM Invoice (#24836) ... * fix: Unequal debit and credit issue on RCM Invoice * fix: Travis Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-03-15 18:04:42 +05:30
Raffael Meyer	db24b13a7d	Merge branch 'develop' into improve_taxes_setup	2021-03-15 13:27:56 +01:00
Anurag Mishra	5e475f85b9	Merge branch 'develop' into suplier_portal_fixes	2021-03-15 16:21:55 +05:30
Raffael Meyer	6d5ea4cee8	Merge branch 'develop' into improve_taxes_setup	2021-03-15 11:40:39 +01:00
Rohit Waghchaure	00a0e8da10	fix: validation of job card in stock entry	2021-03-15 14:15:10 +05:30
Marica	3575314260	Merge branch 'develop' into drop-shipping	2021-03-15 12:53:45 +05:30
Marica	4ceea333a7	fix: POS Opening Entry with empty balance detail rows (#24876)	2021-03-15 12:49:14 +05:30
Mohammad Hasnain Mohsin Rajan	46d5431bad	fix: Github Action not failing when tests fail (#24867) ... Co-authored-by: Sagar Vora <sagar@resilient.tech>	2021-03-15 11:17:19 +05:30
Anupam Kumar	ed42afc5e8	feat: price margin in buying (#24685)	2021-03-15 11:11:28 +05:30
Marica	5499401fcb	Merge branch 'develop' into drop-shipping	2021-03-15 11:09:04 +05:30
Deepesh Garg	a2e4564464	fix: Prevent non sequential repayment entries	2021-03-15 10:32:38 +05:30
Anupam	d8f7a75eae	feat: add total available stock field	2021-03-15 10:31:53 +05:30
Deepesh Garg	5165859e51	Merge pull request #24873 from GangaManoj/filter-bank-reconciliation ... fix(Bank Reconciliation Tool): Filter Bank Account drop-down list	2021-03-15 10:21:14 +05:30
Deepesh Garg	61fb9bf869	fix: Loan Repayment entry cancellation on salary slip cancel	2021-03-14 21:25:21 +05:30
Ganga Manoj	ca03997ab5	fix(Bank Reconciliation): Filter Bank Account drop-down list	2021-03-13 22:21:07 +05:30
Deepesh Garg	e196be4d8a	Merge pull request #24866 from resilient-tech/fix-test-import ... test: fix import_doc call in test_shopify_settings	2021-03-13 19:12:15 +05:30
Sagar Vora	c5869d5b47	test: fix import_doc call in test_shopify_settings	2021-03-12 16:21:45 +05:30
Marica	51c500d446	fix: Don't throw exception on invoice lines when there is no item_code (fixes #24640) (#24864) ... Co-authored-by: casesolved-co-uk <richard@casesolved.co.uk>	2021-03-12 15:51:45 +05:30
Afshan	5d66a2b326	fix: added correct path in hooks (#24862)	2021-03-12 15:51:34 +05:30
Afshan	9ab3bedd0a	fix: added correct path in hooks (#24865)	2021-03-12 15:51:23 +05:30
marination	e685c787d2	fix: Sider (unused variables)	2021-03-12 14:24:09 +05:30
marination	86725a6580	fix: PO not created against all selected suppliers (drop shipping) ... - Return list of created POs instead of first doc - test case added	2021-03-12 14:12:46 +05:30
rohitwaghchaure	90ea17fbd6	Merge pull request #24825 from rohitwaghchaure/allow-to-set-item-in-batch-naming-pre ... fix: allow to select item code in batch naming	2021-03-12 11:52:43 +05:30
Sagar Vora	6727792aaf	test: fix syntax error	2021-03-11 18:12:01 +05:30
Raffael Meyer	fb68aba30d	Merge branch 'develop' into improve_taxes_setup	2021-03-11 13:17:44 +01:00
Sagar Vora	514122bf6f	refactor(payroll): simplified logic for additional salary	2021-03-11 17:22:11 +05:30
Nabin Hait	fe3529b194	fix: merge conflict	2021-03-11 16:45:41 +05:30
Nabin Hait	6e3668dc30	fix: merge conflict	2021-03-11 16:14:27 +05:30
Ankush Menat	2b61491adb	fix: use account_name only in consolidated report (#24840) ... Don't use account_number and only rely on account_name for preparing consolidated financial statement. Related issue: ISS-20-21-10217	2021-03-11 16:05:58 +05:30
Rucha Mahabal	0b29f87fa2	feat(Non Profit): 80G Certificates and Donations (#24848) ... * feat(Non Profit): 80G Certificates and Donations * fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849)	2021-03-11 16:02:23 +05:30
Rucha Mahabal	d1e331f77f	fix(Membership): Generate Invoice for membership webhook only if automation is enabled (#24849)	2021-03-11 15:27:22 +05:30
Rucha Mahabal	be2c1fca7b	feat(Non Profit): 80G Certificates and Donations (#24657) ... * feat: 80G Certificates * feat: add non-profit custom fields for India * feat: 80G Certificate print format for memberships * feat: Donation doctype and API endpoint to capture donations via razorpay * chore: Rename Membership Settings to Non Profit Settings * chore: clean up Non Profit Settings - Rename fields, better labels - patch for renaming * feat: Webhook secret generation for Razorpay donations in Non-Profit Settings * feat: Payment Entry for donations - added Donor as Party Type - setting for automating payment entries for donations created via web form * fix: linter and sider issues * fix: translation syntax * feat: PAN Details custom field for Indian donors * feat: 80G certificates for Donations with Print Format * fix: sider * feat: validations for donor and donation - create donor for website user from donations - validate donor email * feat: extract member name from subscription notes * test: Donation * test: Tax Exemption 80G Certificate * chore: styling fixes * fix: tests * fix: sider * feat: extract PAN number from additional subscription notes * feat: Add creation user field in Non Profit Settings fix: Payment Entry not generating for memberships and donations * feat: update desk page * fix: tests	2021-03-11 13:19:44 +05:30
Marica	63eb6bdb3c	Merge pull request #24643 from CaseSolvedUK/sinvfix-v13 ... fix: Don't throw exception on invoice lines when there is no item_code	2021-03-11 10:47:24 +05:30
Sagar Vora	5822b6d76f	fix(payroll): allow duplicate additional salaries	2021-03-10 21:45:32 +05:30
casesolved-co-uk	a780306ec7	fix: Don't throw exception on invoice lines when there is no item_code (fixes #24640)	2021-03-10 15:50:45 +00:00
Anupam Kumar	6f0fabc54e	fix: gle issue in internal transfer(Purchase) (#24830)	2021-03-10 18:36:46 +05:30
Ankush Menat	59fdee4dfa	Merge branch 'develop' into consolidated_report_acc_name_fix	2021-03-10 16:35:59 +05:30
Raffael Meyer	fbd810c2ae	Merge branch 'develop' into improve_taxes_setup	2021-03-10 11:38:52 +01:00
Rucha Mahabal	c7fff34cf5	fix(travis): Customer Testcase Failing (#24833)	2021-03-10 15:51:44 +05:30
Ankush Menat	000fa824d3	fix: use account_name only in consolidated report ... Don't use account_number and only rely on account_name for preparing consolidated financial statement. Related issue: ISS-20-21-10217	2021-03-10 15:23:48 +05:30
rohitwaghchaure	a0e7787f7b	fix: removed show cancelled entries checkbox from the stock ledger report (#24826)	2021-03-10 13:46:42 +05:30
Anupam Kumar	77eaf2939a	fix: rate of stock uom division by zero error (#24829)	2021-03-10 12:04:54 +05:30
Raffael Meyer	20cc2bb0d8	fix: autoname for Item Tax Template ... * fix: autoname for Item Tax Template Use title + company abbreviation instead of just title. * fix: test records of Item Tax Template * fix: rename item tax templates in test records * Revert "fix: test records of Item Tax Template" This reverts commit 53875c54ffe059c32d52b9ee60795d56f95473b1. * fix: rename hardcoded item tax templates in tests * fix: rename hardcoded Item Tax Templates in tests (2) * fix: delete Item Tax Template with company	2021-03-10 10:24:43 +05:30
Marica	6ccd64c2ec	Merge pull request #24464 from sgtpepper9907/feat-make-patient-age-translateable ... feat: Make patient age translateable	2021-03-10 10:15:38 +05:30
Afshan	0623a34210	fix: added supplier warehouse field back again (#24827)	2021-03-10 09:46:38 +05:30
David Angulo	fe0f46c5b3	fix sider	2021-03-09 13:28:08 -06:00
David Angulo	06e99dfe7b	fix sider	2021-03-09 13:23:48 -06:00
David Angulo	358153b04b	fix sider	2021-03-09 13:19:12 -06:00
Francisco Roldán	894cff5aa4	fix: lms program and index missing context variables when is no data available (#24828) ... * fix: program and index * fix: moved default value to get_course_progress	2021-03-09 23:35:24 +05:30
Afshan	27bcb2a064	fix: renamed "supplier_warehouse" to "set_from_warehouse" (#24816) ... * fix: reverting and adding new field for supplier warehouse	2021-03-09 22:25:48 +05:30
Anupam Kumar	832098f042	fix: In-Transit Feature enhancements (#24652)	2021-03-09 21:14:25 +05:30
Syed Mujeer Hashmi	ec829786e9	fix: Add student category to student applicant (#24779) ... * fix: Add student category to student applicant Student category will be automatically fetched during program enrollment while importing students into the system. Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in> * fix: Allow student category during program enrollment Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>	2021-03-09 21:04:55 +05:30
Rohan	db2d196296	fix: do not send emails to disabled users from Employee Onboarding (#24795)	2021-03-09 21:03:45 +05:30
Rohit Waghchaure	535406cb0c	fix: allow to select item code in batch naming	2021-03-09 21:01:12 +05:30
Jannat Patel	d7ac2394e8	fix: error in bulk attendance (#24806) ... * fix: error in bulk attendance * fix: no date selected scenario * fix: translation and sider	2021-03-09 20:41:58 +05:30
Sagar Vora	78777d6ed4	fix: fetch Material Requests of type Customer Provided in Stock Entry using Get Items From (#24756) ... Co-authored-by: walstanb <walstanb@gmail.com>	2021-03-09 20:35:08 +05:30
Afshan	e314b8b209	fix: general ledger report (#24770)	2021-03-09 20:31:57 +05:30
Afshan	9f6015a4e9	fix: batch no in POS (#24771) ... * fix: batch no in list * fix: check for batch no to be list	2021-03-09 20:31:14 +05:30
Shariq Ansari	261c42186f	fix: updating phone icon setup logic for readonly fields (#24787) ... * fix: updating phone icon setup logic for readonly fields * fix: sider fix	2021-03-09 20:28:00 +05:30
Jannat Patel	fa73074250	fix: salary structure assign to employee (#24798) ... * fix: salary structure assign to employee * fix: pass data from dialog	2021-03-09 20:27:29 +05:30
Raffael Meyer	79b5be1830	fix: Group German VAT Accounts (#24804) ... * fix: group account for tax assets and liabilities (germany) * fix: spacing	2021-03-09 20:26:43 +05:30
Deepesh Garg	06a6ee37cb	fix: Ignore mandatory fields in opening invoice via Opening Invoice Creation tool (#24821)	2021-03-09 20:23:26 +05:30
Deepesh Garg	47c6d2e00f	Merge pull request #24814 from AfshanKhan/fix-tds-computation-summary ... fix: sending proper arguments for TDS Computation Summary report	2021-03-09 20:01:30 +05:30
Deepesh Garg	6249798d84	Merge pull request #24801 from ankush/dont_update_pe_title ... fix: do not update PE title during data import	2021-03-09 19:47:21 +05:30
Deepesh Garg	79005a4a76	Merge pull request #24820 from resilient-tech/fix-company-breadcrumbs ... fix: breadcrumbs for company	2021-03-09 19:46:39 +05:30
Marica	e1ee9034ef	Merge branch 'develop' into item-attribute-fix	2021-03-09 18:35:44 +05:30
Marica	5accf8adf5	Merge branch 'develop' into salary_slip_error	2021-03-09 18:20:54 +05:30
Ankush Menat	9b4e5bfa87	chore: improve error message for missing fields.	2021-03-09 13:59:14 +05:30
Marica	5471265f92	Merge branch 'develop' into patch-6	2021-03-09 13:32:23 +05:30
walstanb	be98ee26cd	fix: breadcrumbs for company	2021-03-09 13:03:52 +05:30
Marica	baa406e99f	Merge pull request #24794 from alyf-de/set_value_instead_of_sql ... fix: use set_value instead of sql	2021-03-09 11:54:31 +05:30
barredterra	99c8b8efcf	Merge branch 'develop' into improve_taxes_setup	2021-03-08 20:00:59 +01:00
barredterra	ebd1d08e55	refactor: taxes setup ... Better structure of input data.	2021-03-08 19:53:50 +01:00
Afshan	d1fb363a37	Merge branch 'develop' into fix-tds-computation-summary	2021-03-08 22:50:04 +05:30
Afshan	d95b59e90c	fix: call function when arguments available	2021-03-08 18:19:53 +05:30
Ankush Menat	afc766bbf1	Merge branch 'develop' into dont_update_pe_title	2021-03-08 15:44:15 +05:30
Ankush Menat	5571b988dd	fix: make title field read only	2021-03-08 15:43:03 +05:30
Ankush Menat	cc46866cd9	fix: do not update PE title during data import ... Related issue: ISS-20-21-10132	2021-03-08 15:42:39 +05:30
Afshan	1002e36c53	fix: removed unused import	2021-03-08 14:39:19 +05:30
Afshan	fa932e2a3e	fix: sending proper arguments for report	2021-03-08 14:36:40 +05:30
Deepesh Garg	48b0f0da96	Merge pull request #24776 from ankush/gst_invoice_validation ... fix: Add warning for invalid GST invoice numbers	2021-03-07 18:09:00 +05:30
Rohit Waghchaure	4c089b5852	minor fixes	2021-03-07 12:17:59 +05:30
Deepesh Garg	45870317f2	Merge pull request #24797 from UrvashiKishnani/patch-1 ... fix: total row in AR/AP summary report	2021-03-06 21:28:04 +05:30
Saqib	92b0691c68	fix: einvoice button visiblity condition (#24800)	2021-03-06 19:00:08 +05:30
Deepesh Garg	36a0085905	Merge pull request #24799 from danielchalmers/patch-8 ... fix: typo in Charts of Account doctype	2021-03-06 13:11:26 +05:30
Deepesh Garg	3e0a9383b4	Merge pull request #24789 from ankush/track_settings ... fix: track setting changes	2021-03-06 13:09:58 +05:30
Saurabh	202ef92fa1	Merge branch 'version-13-beta-pre-release' into version-13-beta	2021-03-05 09:34:01 +05:30
Saurabh	4e1206bf21	bumped to version 13.0.0-beta.13	2021-03-05 09:54:01 +05:50
barredterra	25afad3dc1	refactor: extend taxes and charges setup ... Add option to specify taxes and charges template depending on the CoA used. Differentiate between purchase, sales and item taxes. Maintain flexibility by using wildcards.	2021-03-04 21:11:31 +01:00
barredterra	dcfc3d7d12	fix: remove redundant calls to create_sales_tax	2021-03-04 19:29:55 +01:00
Saqib Ansari	49e4693abf	fix(patch): updating pos closing reference in merge log	2021-03-04 11:58:45 +05:30
Daniel Chalmers	9b4a258c89	Chart Of Accounts -> Chart of Accounts	2021-03-04 00:15:46 -06:00
UrvashiKishnani	27ea23223d	fix: total row in AR/AP summary report	2021-03-04 09:21:25 +04:00
Raffael Meyer	f1d13a4ff3	Merge branch 'develop' into track_settings	2021-03-03 12:40:37 +01:00
barredterra	1521b31795	fix: use set_value instead of sql	2021-03-03 12:33:48 +01:00
barredterra	53d261702a	fix: make quick entry for Tax Category work	2021-03-03 11:52:48 +01:00
Ankush Menat	7c4c42ad67	refactor: move regex patterns to global variables	2021-03-03 14:56:19 +05:30
Ankush Menat	7c78220eac	Merge branch 'develop' into gst_invoice_validation	2021-03-03 13:38:14 +05:30
Ankush Menat	9b3f5d5f67	test: add tests for gst invoice name checks	2021-03-03 13:36:59 +05:30
Ankush Menat	a44df63a91	fix: Add warning for invalid GST invoice numbers ... GST Invoice numbers should be 16 characters alphanumeric with dash(/) or slash(-) only. Add check for doc.name before saving and warn about naming series.	2021-03-03 11:26:12 +05:30
Deepesh Garg	82c6223196	Merge pull request #24745 from ankush/no_team_updates ... fix(HR): hide "more" button from team updates	2021-03-02 18:55:34 +05:30
Deepesh Garg	ecde26409b	Update team_updates.js	2021-03-02 18:54:50 +05:30
Deepesh Garg	846500e8bc	Merge pull request #24751 from danielchalmers/patch-2 ... chore: Add description field & enable quick entry	2021-03-02 18:53:51 +05:30
Deepesh Garg	11092d0824	feat: Additon of leave details in Salary Slip (#24674) ... * feat: Additon of leave details in Salary Slip * fix: Change leaves to leave	2021-03-02 18:38:31 +05:30
Deepesh Garg	a5c4558f8b	feat: Additon of leave details in Salary Slip (#24674) ... * feat: Additon of leave details in Salary Slip * fix: Change leaves to leave	2021-03-02 18:36:48 +05:30
Deepesh Garg	7a5b6021b9	Merge pull request #24772 from anupamvs/si-timesheet ... feat: provision to pull timesheet in sales invoice	2021-03-02 18:05:42 +05:30
Ankush Menat	7d892438f0	fix: track setting changes	2021-03-02 17:50:58 +05:30
Deepesh Garg	f06c166ee4	Merge pull request #24773 from UrvashiKishnani/patch-1 ... fix: GL Entries for AP/AR Summary	2021-03-02 17:49:13 +05:30
Jannat Patel	b27d4f6095	fix: salary slip working hours increment (#24784)	2021-03-02 17:44:42 +05:30
Nabin Hait	d96be3f9f1	Reposting patch and earned leave rounding (#24783) ... * fix: rounding of earned leave is optional (#24782) * fix: reposting patch fixes (#24775)	2021-03-02 17:02:47 +05:30
Nabin Hait	190106a8b8	fix: rounding of earned leave is optional (#24782)	2021-03-02 13:38:14 +05:30
Nabin Hait	bd10d7c028	fix: reposting patch fixes (#24775)	2021-03-02 13:37:45 +05:30
Anupam	47ce85484b	feat: provistion to pull timesheet in sales invoice	2021-03-02 11:31:26 +05:30
UrvashiKishnani	810a36105c	fix: GL Entries for AP/AR Summary without SQL join ... SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is not in cancelled state.	2021-03-02 08:20:03 +04:00
Deepesh Garg	f45756d821	Merge pull request #24735 from FHenry/fix_create_item_tax_with_salespurchasetax ... fix: add item taxes at the same times as sales and purchase taxes	2021-03-01 20:52:42 +05:30
Deepesh Garg	236a232de0	Merge pull request #24769 from rohitwaghchaure/allow-to-set-item-in-batch-naming ... fix: allow to select item code in batch naming	2021-03-01 20:25:14 +05:30
Daniel Chalmers	2efdfa26b4	fix: Change FieldType from Text to Text Editor in Non-Conformance DocType (#24760) ... * Enable Text Editors Enable rich Text Editors for Corrective Action and Preventive Action fields. Closes #24759 * Update non_conformance.json	2021-03-01 15:44:16 +05:30
UrvashiKishnani	10e4b9d4e8	fix: GL Entries for AP/AR Summary ... SQL query modified to fetch only those GL Entries for Accounts Payable Summary and Accounts Receivable Summary reports where the corresponding payment entry is in submitted state.	2021-03-01 12:50:07 +04:00
Rohit Waghchaure	eb6b3cfe6d	fix: allow to select item code in batch naming	2021-03-01 11:32:39 +05:30
Anuja Pawar	8755339cba	fix: to update sales person's incentives on save (#24179)	2021-03-01 10:44:13 +05:30
Saqib	fa777555b7	fix(india): inflated item tax rate for e-invoicing (#24752)	2021-02-28 20:46:23 +05:30
Deepesh Garg	d7a81be56d	Merge pull request #24742 from deepeshgarg007/project_filter_search_fields ... fix: Add searchfields in project query	2021-02-27 18:20:56 +05:30
Deepesh Garg	6fdd859a10	Merge pull request #24700 from deepeshgarg007/rounding_issue_fix ... fix: Issue on posting inter-warehouse transfer invoice	2021-02-27 17:30:01 +05:30
Deepesh Garg	b5819c74c8	Merge branch 'develop' of https://github.com/frappe/erpnext into project_filter_search_fields	2021-02-27 17:29:11 +05:30
Daniel Chalmers	28da945ecd	Update quality_meeting.json	2021-02-26 21:14:12 -06:00
Daniel Chalmers	56f6dbb666	Remove obsolete section titles	2021-02-26 21:11:56 -06:00
Daniel Chalmers	aa09628358	Skill fields: enable allow_in_quick_entry	2021-02-26 15:24:34 -06:00
rohitwaghchaure	630ce6e531	Merge pull request #24754 from rohitwaghchaure/fixed-repost-item-valuation-patch ... fix: reposting patch	2021-02-26 23:58:29 +05:30
rohitwaghchaure	0e89d71d34	Merge pull request #24755 from rohitwaghchaure/fixed-repost-item-valuation-patch-v13-pre ... fix: reposting patch	2021-02-26 23:58:10 +05:30
Rohit Waghchaure	9f13a060f0	fix: reposting patch	2021-02-26 17:44:54 +05:30
Rohit Waghchaure	c603fd638b	fix: reposting patch	2021-02-26 17:42:52 +05:30
Saqib	3dfa017f1d	refactor: (coa importer) create coa tree with account no & account name (#23601)	2021-02-26 16:50:22 +05:30
Saqib	2a1b1537f9	fix(pos): rounded total and search fixes (#24738)	2021-02-26 16:49:28 +05:30
Daniel Chalmers	9803835436	Add "description" field to Skill doctype ... Lets us describe a skill past just the title. Closes #23592	2021-02-26 00:33:48 -06:00
Deepesh Garg	28ca4ec79d	Merge branch 'develop' into fix_create_item_tax_with_salespurchasetax	2021-02-26 10:43:15 +05:30
Deepesh Garg	27da2bb63a	fix: Remove unique check from represents company field	2021-02-25 22:39:47 +05:30
Ankush Menat	027db0b41e	fix(HR): hide "more" button from team updates	2021-02-25 21:29:00 +05:30
Deepesh Garg	b85fb0c3a4	Merge branch 'develop' into rounding_issue_fix	2021-02-25 20:17:35 +05:30
Ankush Menat	dca307e7cc	feat: track changes to HR settings (#24739) ... related issue: FR-ISS-259927	2021-02-25 19:05:07 +05:30
Syed Mujeer Hashmi	286e00bdf2	fix: Fetch Task subject from Task (#24729)	2021-02-25 19:02:54 +05:30
Afshan	1be997beb4	fix: reference variable in pricing rule (#24711)	2021-02-25 19:01:32 +05:30
Deepesh Garg	2d0b277ce0	Merge pull request #24054 from gwhitney/other_app_acc_dims ... feat(Accounting Dimension): accounting dimension doctypes for other apps	2021-02-25 18:48:42 +05:30
Anurag Mishra	02f50a93e5	fix: copy variants property and Attributes whil duplicatinh item Tamplate (#24662)	2021-02-25 18:47:17 +05:30
Anuja Pawar	118a4ffb08	fix: rounding error in finished goods qty (#24653)	2021-02-25 18:44:44 +05:30
Mohammad Hasnain Mohsin Rajan	8cdba8ab64	fix: ams integration breaks when error raised (#24383)	2021-02-25 18:36:19 +05:30
Deepesh Garg	6af3c3fa2a	Merge pull request #24722 from danielchalmers/patch-1 ... fix: Allow renaming skills	2021-02-25 15:44:44 +05:30
Deepesh Garg	7a837170ea	Merge branch 'develop' of https://github.com/frappe/erpnext into other_app_acc_dims	2021-02-25 15:41:03 +05:30
Deepesh Garg	b990e71b4c	fix: Add search field in project query	2021-02-25 14:01:22 +05:30
Deepesh Garg	834a8b740d	Merge branch 'develop' into subscription_fix_new	2021-02-25 11:24:27 +05:30
Ankush Menat	325a461c34	Merge branch 'develop' into opening_round_gl	2021-02-25 07:53:48 +05:30
Daniel Chalmers	d3e122259d	Update skill.json	2021-02-24 17:13:48 -06:00
Florian HENRY	e11ce57f3c	fix: add item taxes at the same times as sales and purchase taxes	2021-02-24 21:45:29 +01:00
Afshan	684fc4e27b	fix: asset category name disappear (#24728)	2021-02-24 19:08:56 +05:30
Afshan	6bd2bbc953	fix: show custom button for saved projects (#24730) ... * fix: show custom button for saved projects * fix: slider	2021-02-24 18:13:10 +05:30
rohitwaghchaure	d0baa90b50	Merge pull request #24715 from rohitwaghchaure/fixed-patch-item-reposting-develop ... fix: patch failing because of incorrect gl entries	2021-02-24 17:18:43 +05:30
Afshan	84184559bc	fix: currency symbol in update items (#24726)	2021-02-24 16:51:11 +05:30
Saurabh	fefacced13	bumped to version 13.0.0-beta.12	2021-02-24 15:21:19 +05:50
Shariq Ansari	1dba7d2161	fix: Added parent task expected end date validation (#24611) ... * fix: Added parent task expected end date validation * fix: implemented suggested code * fix: updated test case	2021-02-24 12:39:23 +05:30
Rucha Mahabal	402fcbd489	Merge pull request #24716 from pateljannat/issue-custom-buttons ... fix: custom buttons in issue	2021-02-24 11:47:29 +05:30
Rohit Waghchaure	f613d41408	chore: change log	2021-02-24 11:20:29 +05:30
Ankush Menat	23c30e43f0	fix: make round off GLE always non-opening ... Opening GL entries can not be for profit and loss accounts. Round off accounts are by default P&L account. Hence when making opening entry, make round off entries as non-opening. Related issue: ISS-20-21-09677	2021-02-24 11:03:24 +05:30
Daniel Chalmers	c04ed62863	Allow renaming skills	2021-02-23 22:02:09 -06:00
Rohit Waghchaure	39b5ad8e69	fix: patch failing because of incorrect gl entries	2021-02-23 18:35:36 +05:30
Rohit Waghchaure	bc8c9de26d	fix: patch failing because of incorrect gl entries	2021-02-23 18:26:48 +05:30
Deepesh Garg	231aec9257	Merge pull request #24478 from nextchamp-saqib/tcs_calculation ... feat: tax collected at source using tax withholding category	2021-02-23 18:04:38 +05:30
pateljannat	1e2772d389	fix: custom buttons in issue	2021-02-23 17:55:51 +05:30
Ankush Menat	d5656f4b76	fix(india): Escape json characters in text fields (#24699) ... Escape all text fields and add helpful error message if JSON decode error does happen.	2021-02-23 17:26:37 +05:30
Nabin Hait	d46b23699c	fix: optimize reposting of gle and sle (#24702) ... * fix(india): escape for special characters in JSON (#24695) JSON does not accept special whitespace characters like tab, carriage return, line feed Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf Related issue: ISS-20-21-09811 * fix: Accounting Dimension creation background job timeout * fix(regional): vehicle no is mandatory for ewaybill generation (#24679) * fix: vehicle no required for e-invoice * fix: ewaybill generation dialog condition * fix: excluding unidentified accounts from gstr-1 * fix: optimize reposting of sle and gle (#24694) * fix: optimize update_gl_entries_after method * fix: Optimized reposting patch * fix: accounting dimensions * added reload_doc in patch * Update item_reposting_for_incorrect_sl_and_gl.py Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com> * fix: Replaced spaces with tabs * fix: merge conflict * fix: test cases Co-authored-by: Ankush Menat <ankush@iwebnotes.com> Co-authored-by: Deepesh Garg <deepeshgarg6@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com> Co-authored-by: pateljannat <pateljannat2308@gmail.com> Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2021-02-23 16:38:52 +05:30
Saqib Ansari	85c91ca2db	Merge branch 'develop' into tcs_calculation	2021-02-23 15:56:29 +05:30
Afshan	ae63d66b8f	fix: column names	2021-02-23 13:38:52 +05:30
Deepesh Garg	3dd0e49525	Merge pull request #24703 from deepeshgarg007/loan_test_precision_fix_new ... fix: Precision fixes in loans	2021-02-23 11:22:52 +05:30
Deepesh Garg	8f8d9744f1	Merge pull request #24629 from deepeshgarg007/loan_dashboard ... feat: Loans Dashboard	2021-02-23 11:22:32 +05:30
Deepesh Garg	b5a2320b33	fix: Precision fixes in loans	2021-02-22 23:04:48 +05:30
Nabin Hait	19f8fa59d3	fix: optimize reposting of sle and gle (#24694) ... * fix: optimize update_gl_entries_after method * fix: Optimized reposting patch * fix: accounting dimensions * added reload_doc in patch * Update item_reposting_for_incorrect_sl_and_gl.py Co-authored-by: Rohit Waghchaure <rohitw1991@gmail.com>	2021-02-22 22:27:22 +05:30
Mohammad Hasnain Mohsin Rajan	07f40596bc	feat(Bank Reconciliation): Redesign (#24273) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-22 22:19:47 +05:30
Nabin Hait	866cf70d3a	fix: validate pan	2021-02-22 21:35:00 +05:30
shariquerik	f5d6bd77e5	fix: item attributes not editable until refresh	2021-02-22 21:27:14 +05:30
Deepesh Garg	c839177f8e	fix: Issue on posting inter-warehouse transfer invoice	2021-02-22 21:04:51 +05:30
Marica	214951a9c6	Merge pull request #24631 from AfshanKhan/fix-valuation-errror-customer-provided ... fix: check if customer provided item while setting opening stock	2021-02-22 20:10:27 +05:30
Nabin Hait	69a6bed106	fix: Replaced spaces with tabs	2021-02-22 20:03:23 +05:30
Shridhar Patil	58399f6524	fix: next follow up date should be always greater then current time (#24308)	2021-02-22 19:37:38 +05:30
Nabin Hait	0ca74ce04b	fix: Fixes related to client script renaming (#24698)	2021-02-22 19:32:51 +05:30
Ankush Menat	98a0feab89	fix(india): escape for special characters in JSON (#24695) ... JSON does not accept special whitespace characters like tab, carriage return, line feed Ref: https://www.ecma-international.org/wp-content/uploads/ECMA-404_2nd_edition_december_2017.pdf Related issue: ISS-20-21-09811	2021-02-22 19:30:02 +05:30
Deepesh Garg	bb8cd1cdaa	feat: Basic validation for indian PAN No. in Supplier (#24687)	2021-02-22 19:28:45 +05:30
Shariq Ansari	8676bedd18	fix: Add phone icon on read only phone fields (#24680) ... * fix: Add phone icon on read only phone fields * fix: sider fix	2021-02-22 19:28:01 +05:30
Saqib	14472f6bab	fix(regional): vehicle no is mandatory for ewaybill generation (#24679) ... * fix: vehicle no required for e-invoice * fix: ewaybill generation dialog condition	2021-02-22 19:27:23 +05:30
Afshan	fdafb55fba	fix: error message when making reverse journal entry (#24665)	2021-02-22 19:25:57 +05:30
Marica	28c834ac95	Merge branch 'develop' into fix-valuation-errror-customer-provided	2021-02-22 16:00:28 +05:30
rohitwaghchaure	311bb6452f	Merge pull request #24691 from deepeshgarg007/accounting_dimension_timeout ... fix: Accounting Dimension creation background job timeout	2021-02-22 15:29:41 +05:30
Deepesh Garg	d780f56ba8	Revert "fix: Error handling in loan reports and precision fixes"	2021-02-22 15:12:35 +05:30
Afshan	133ebc1d51	Merge branch 'develop' into fix-valuation-errror-customer-provided	2021-02-22 14:16:33 +05:30
Marica	4a1ffcf742	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-22 11:34:34 +05:30
Afshan	01b4ee8a3c	Merge branch 'develop' into fix-valuation-errror-customer-provided	2021-02-22 11:17:45 +05:30
Deepesh Garg	aa46def745	fix: Accounting Dimension creation background job timeout	2021-02-21 21:54:23 +05:30
Deepesh Garg	e4964a0c6c	fix: Update color in charts	2021-02-21 21:03:42 +05:30
Deepesh Garg	e53fd87669	fix: Rearrange cards	2021-02-21 20:57:56 +05:30
Deepesh Garg	cbb4fe2cce	fix: Add cards	2021-02-21 20:57:30 +05:30
Deepesh Garg	a6d0610730	Merge pull request #24505 from deepeshgarg007/loan_exposure_report_fix ... fix: Error handling in loan reports and precision fixes	2021-02-20 17:57:09 +05:30
Deepesh Garg	e12398e75e	Merge pull request #24682 from frappe/michellealva-leave ... fix: typo in Leave Balance Report	2021-02-20 17:53:04 +05:30
Deepesh Garg	75b01e3d72	Merge pull request #24683 from frappe/michellealva-patch-1 ... fix: Typo in Leave Application	2021-02-20 17:52:38 +05:30
Deepesh Garg	bbadebcf64	Merge branch 'develop' into loan_exposure_report_fix	2021-02-20 17:32:17 +05:30
Deepesh Garg	6f29f67a83	Merge pull request #24667 from pateljannat/gstr-1-unidentified-accounts-issue ... fix: excluding unidentified accounts from gstr-1	2021-02-20 17:27:56 +05:30
Michelle Alva	43f126ed13	fix: Typo in Leave Application ... Change "Leaves" to "Leave"	2021-02-20 10:46:22 +05:30
Michelle Alva	ab149f196e	fix: typo in Leave Balance Report ... Change Leaves to Leave	2021-02-20 10:43:47 +05:30
rohitwaghchaure	1aad27a539	Merge pull request #24612 from rohitwaghchaure/fixed-validation-for-job-card ... fix: [minor] validation of job card in stock entry	2021-02-19 21:22:57 +05:30
Saqib Ansari	8c7c682f17	chore: make parameter group optional	2021-02-19 20:35:23 +05:30
Deepesh Garg	6a5ef261f2	feat: Normal rounding for GST Taxes (#24488) ... * feat: Normal rounding for GST Taxes * fix: Add test case Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-19 14:30:23 +05:30
Deepesh Garg	811ff5c397	Merge pull request #24669 from deepeshgarg007/transaction_delete_fix ... fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master	2021-02-19 10:54:56 +05:30
Deepesh Garg	7efbbcf3aa	fix: Do not delete GST Accounts from GST Settings on clearing transactions from Company Master	2021-02-19 10:53:58 +05:30
Deepesh Garg	bc857522ad	fix: Loan Interest Accrual Chart	2021-02-19 10:13:56 +05:30
Ankush Menat	3248da9089	fix(India): Add GST state code for Ladakh	2021-02-18 21:32:48 +05:30
Anupam Kumar	b1997da488	feat: capture Rate of stock UOM in purchase (#24315) ... * feat: capture Rate of stock UOM in purchase * fix: review changes * added server side code * added stock uom rate in sales transactions * fix: review changes * fix: resolving conflicts * adding patch * fix: removing patch	2021-02-18 21:32:05 +05:30
Jannat Patel	4cef0f5983	fix: salary slip attribute error (#24455) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-02-18 21:30:13 +05:30
Ankush Menat	d9c84dff0f	fix(selling): cancel sales order with cancelled PE ... Allow cancelling sales order with cancelled payment entry. Ignoring GL entries while cancelling the document is required to cancel it, reverse entries are created by accounts controller. Related issue: ISS-20-21-09586	2021-02-18 21:29:12 +05:30
Ankush Menat	3508ed176b	test(selling): add test for cancelling sales order ... Add failing test to reproduce bug in cancelling sales order with advance payments Related issue: ISS-20-21-09586	2021-02-18 21:29:03 +05:30
Nabin Hait	186a045e28	fix: update qty in future sle (#24649) ... * fix: update qty in future sle * fix: validate cancellation due to ongoing reposting * fix: process sle against current timestamp	2021-02-18 21:28:28 +05:30
Nabin Hait	deddcc513d	fix: stock and account balance syncing (#24644) ... * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: minor fix	2021-02-18 21:28:16 +05:30
Rohit Waghchaure	83f5468ca1	fix: patch	2021-02-18 21:28:03 +05:30
rohitwaghchaure	7797e9d3ac	fix: added patch to fix incorrect stock qty and account value (#24628)	2021-02-18 21:27:01 +05:30
Nabin Hait	f2be0805f7	fix: formatting query args (#24627)	2021-02-18 21:25:59 +05:30
rohitwaghchaure	76f616565e	fix: Consolidated Financial Statement report not works if child company account not present in parent company (#24580) ... Fixed conflicts	2021-02-18 21:25:40 +05:30
Ankush Menat	4b2cbdc2dd	fix: update total in words after updating items (#24602) ... * fix: Update total in words after Updating items Update total in words after Updating items in sales/purchase orders. Port of #24592 Closes ISS-20-21-09425 * test: Add test for total & words after update item Add test for total & words after updating items in sales order.	2021-02-18 21:25:00 +05:30
rohitwaghchaure	83792ec009	fix: reposting issue with same posting date and posting time (#24570) ... * fix: reposting issue with same posting date and posting time * Update erpnext/stock/stock_ledger.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-18 21:24:48 +05:30
Nabin Hait	56e6ca6285	fix: couple of travis fixes (#24554) ... Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2021-02-18 21:24:31 +05:30
Afshan	33f4419a78	fix: StopIteration error when e-invoice not enabled (#24548) ... * fix: StopIteration error when e-invoice not enabled * chore: update message Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-02-18 21:23:38 +05:30
Deepesh Garg	d60a40ae82	fix: Add accounts user role permission for accounting dimension filter	2021-02-18 21:23:20 +05:30
Afshan	83768b68c1	fix: emp disappear (#24525) ... * fix: emp disappear * fix: renamed set_totals_call to set_totals Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-18 21:20:14 +05:30
Saqib	90ff48baa3	refactor: POS Invoice merging and cancellation (#24351) ... * feat: pos invoice merging with background jobs * fix: invoice threshold for queueing job * refactor: cancellation flow of point of sale * feat: tests for cancellation of pos closing Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-02-18 21:00:34 +05:30
Saqib	e965d0ff90	fix: discount amount calculation on net total (#24497)	2021-02-18 20:59:46 +05:30
Saqib	fd4bed1a38	fix(e-invoice): do not validate gstin for exports (#24561)	2021-02-18 20:59:26 +05:30
Saqib	ade96589b4	fix(e-invoice): skip e-invoice generation for non-taxable invoices (#24568)	2021-02-18 20:58:54 +05:30
Saqib	18c7c45cfe	fix: NoneType has no len() (#24600)	2021-02-18 20:55:53 +05:30
Saqib	4fb547179d	fix: customer_currency referenced before assignment (#24607)	2021-02-18 20:53:49 +05:30
Saqib	a439d19917	feat(pos): mpesa related fixes & additions (#24306) ... * fix: switching of mode of payments * feat: transaction limit for mpesa integration * feat: resend payment request if one fails * feat: make new request only for failed ones * fix: invalid amount for mpesa request * fix: payment successful message not shown * fix: url and business shortcode for live env * fix: duplicate items validation for pos invoices * fix: pos closing entry queued status * fix: peroid end date for amended pos closing	2021-02-18 20:53:26 +05:30
Saqib	57c2e07c45	fix: validate cancellation only if irn generated (#24608)	2021-02-18 20:45:27 +05:30
Anupam Kumar	4dad1f01ba	fix: contact permmission issue (#24503)	2021-02-18 20:26:39 +05:30
Rucha Mahabal	73c2d23a9a	feat: Department Wise Appointment Type charges (#24572) ... * feat: Appointment Type Service Items Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com> * fix: set practitioner service item charges mandatory on item selection Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com> * feat: use charges from appointment type during billing * feat: handle appointment charges priority for invoice automation * test: patient appointment auto invoicing scenarios * fix: sider * fix: minor fixes Co-authored-by: muhammad <muhammadmp@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-18 20:22:41 +05:30
Anupam Kumar	6485eeb302	fix: portal permission issue (#24577)	2021-02-18 20:21:39 +05:30
pateljannat	4858b40813	fix: excluding unidentified accounts from gstr-1	2021-02-18 18:44:29 +05:30
Marica	77d72d59ef	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-18 16:55:44 +05:30
Marica	f3ca4bcb70	Merge branch 'develop' into rfq-contact-email-set	2021-02-18 16:51:50 +05:30
Rucha Mahabal	ccc80927f6	feat: Department Wise Appointment Type charges (#24572) ... * feat: Appointment Type Service Items Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com> * fix: set practitioner service item charges mandatory on item selection Co-Authored-By: muhammad <muhammadmp@users.noreply.github.com> * feat: use charges from appointment type during billing * feat: handle appointment charges priority for invoice automation * test: patient appointment auto invoicing scenarios * fix: sider * fix: minor fixes Co-authored-by: muhammad <muhammadmp@users.noreply.github.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-18 16:41:10 +05:30
Raffael Meyer	d44e60f17c	feat: add Print Language to Lead and Opportunity (#24317) ... * fix: move "Print Language" to "More Information" * feat: add "Print Language" in "More Information" Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-02-18 16:24:37 +05:30
Rucha Mahabal	e7bf87cc84	fix: POS return for Serialized Items (#24292) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com> Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-02-18 16:04:35 +05:30
Jannat Patel	ef5c714de2	fix: salary slip attribute error (#24455) ... Co-authored-by: Rucha Mahabal <ruchamahabal2@gmail.com>	2021-02-18 15:52:29 +05:30
Rohit Waghchaure	c697cb8b2d	fix: validation of job card in stock entry	2021-02-18 15:10:12 +05:30
Nabin Hait	d826bee13a	fix: update qty in future sle (#24649) ... * fix: update qty in future sle * fix: validate cancellation due to ongoing reposting * fix: process sle against current timestamp	2021-02-18 14:14:21 +05:30
Anurag Mishra	5ec592d09c	fix: supplier was not able to Submit RFQ due to in sufficient permission	2021-02-18 13:42:04 +05:30
Deepesh Garg	c5b94adc87	Merge pull request #24651 from ankush/ignore_gl_while_cancelling_so ... fix(selling): cancel sales order with cancelled PE	2021-02-17 18:39:35 +05:30
rohitwaghchaure	03a1484aed	Merge pull request #24621 from rohitwaghchaure/fixed-consolidated-report-not-working-develop ... fix: Consolidated Financial Statement report not works if child compa…	2021-02-17 16:35:43 +05:30
Marica	208d1942c3	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-17 12:56:35 +05:30
Marica	7de7bb5202	Merge branch 'develop' into item_group_on_update_items	2021-02-16 23:06:20 +05:30
Marica	4441cebbb3	Merge branch 'develop' into shopping-cart	2021-02-16 20:55:00 +05:30
Ankush Menat	3f16902b00	fix(selling): cancel sales order with cancelled PE ... Allow cancelling sales order with cancelled payment entry. Ignoring GL entries while cancelling the document is required to cancel it, reverse entries are created by accounts controller. Related issue: ISS-20-21-09586	2021-02-16 18:53:40 +05:30
Ankush Menat	f9d4d9a095	test(selling): add test for cancelling sales order ... Add failing test to reproduce bug in cancelling sales order with advance payments Related issue: ISS-20-21-09586	2021-02-16 18:45:39 +05:30
prssanna	9c36dc3798	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2021-02-16 16:17:32 +05:30
prssanna	7166b6740f	fix: duplicate css property	2021-02-16 16:17:17 +05:30
Nabin Hait	9b178bcd10	fix: stock and account balance syncing (#24644) ... * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: stock and account balance syncing * fix: minor fix	2021-02-16 14:57:00 +05:30
prssanna	7e8113c7e8	fix: broken image style	2021-02-16 12:00:35 +05:30
Rohit Waghchaure	9a40c1b2e1	fix: patch	2021-02-16 10:35:10 +05:30
rohitwaghchaure	d60ff83b6f	fix: added patch to fix incorrect stock qty and account value (#24628)	2021-02-16 09:12:27 +05:30
Deepesh Garg	79f63526cb	Merge pull request #24632 from ankush/ladakh_gst_addition ... fix(India): Add GST state code for Ladakh	2021-02-15 21:11:54 +05:30
Deepesh Garg	e2324c77fe	fix: Test Cases	2021-02-15 20:01:32 +05:30
Nabin Hait	243661b37b	fix: formatting query args (#24627)	2021-02-15 19:27:49 +05:30
Rushabh Mehta	8cc6a2d62c	fix(typo): erpnext-logo.png	2021-02-15 17:40:50 +05:30
Rushabh Mehta	b0735732f9	fix(minor): add erpnext-logo.png	2021-02-15 17:38:55 +05:30
Deepesh Garg	df4eed4c0d	Merge pull request #24615 from ruchamahabal/packed-item-fixes_v13 ... fix: Issues with packing items	2021-02-15 16:44:10 +05:30
Deepesh Garg	47f5f4757a	Merge branch 'develop' into fixed-consolidated-report-not-working-develop	2021-02-15 16:35:31 +05:30
Deepesh Garg	b6cd97e5fc	Merge pull request #24320 from pateljannat/ldc-validations ... fix: validation for ldc against supplier and section code	2021-02-15 16:33:41 +05:30
Deepesh Garg	535dc4aea2	fix: Do not round off per day interest	2021-02-15 15:54:25 +05:30
Ankush Menat	57c3d373a7	fix(India): Add GST state code for Ladakh	2021-02-15 15:03:50 +05:30
Afshan	e963362dfd	fix: check if customer provided item while setting opening stock	2021-02-15 15:00:37 +05:30
Deepesh Garg	429fb3bba8	Merge branch 'develop' of https://github.com/frappe/erpnext into loan_exposure_report_fix	2021-02-15 14:10:10 +05:30
Deepesh Garg	9bf05ad927	feat: Loans Dashboard	2021-02-15 13:32:50 +05:30
Richard Case	fd4e7bdbb1	fix: plaid client version to support latest API (#24531)	2021-02-15 11:58:27 +05:30
Marica	45db1c5d74	Merge branch 'develop' into shopping-cart	2021-02-15 10:35:05 +05:30
rohitwaghchaure	164ffac4ef	fix: Consolidated Financial Statement report not works if child company account not present in parent company (#24580) ... Fixed conflicts	2021-02-12 17:33:07 +05:30
Nabin Hait	85252e7aef	Merge branch 'develop' into packed-item-fixes_v13	2021-02-12 12:39:38 +05:30
Afshan	c44d6b9546	fix: NoneType object has no attribute len() (#24616)	2021-02-12 12:24:41 +05:30
Marica	87fcae4efd	Merge branch 'develop' into shopping-cart	2021-02-12 12:16:13 +05:30
Rucha Mahabal	ad1f2b41f4	fix: Issues with packing items	2021-02-12 11:29:24 +05:30
Saqib Ansari	138e98fef2	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-12 11:19:25 +05:30
Nabin Hait	1e6cce3593	Merge branch 'develop' into item_group_on_update_items	2021-02-11 21:59:38 +05:30
Jannat Patel	bb0d8f8038	Update accounts_controller.py	2021-02-11 20:59:28 +05:30
Anupam Kumar	7e1dcf911d	feat: capture Rate of stock UOM in purchase (#24315) ... * feat: capture Rate of stock UOM in purchase * fix: review changes * added server side code * added stock uom rate in sales transactions * fix: review changes * fix: resolving conflicts * adding patch * fix: removing patch	2021-02-11 20:19:30 +05:30
Afshan	ee87484134	fix: calculated discount percentage (#24510) ... * fix: calculated discount percentage * fix: slider Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-11 20:11:58 +05:30
Jannat Patel	0a7939277c	fix: dynamic links for reports (#24462) ... * fix: dynamic links for reports * fix: revert changes for payment period report * fix: link doctypes	2021-02-11 20:11:06 +05:30
marination	e2d0715cdf	fix: Server side validation for missing payment gateway account	2021-02-11 19:06:10 +05:30
marination	8615227090	fix: Shopping cart breaks without Payment Gateway Account	2021-02-11 18:51:35 +05:30
Saqib	f25ab6f826	fix: validate cancellation only if irn generated (#24608)	2021-02-11 17:50:57 +05:30
Jannat Patel	6756d3b561	Merge branch 'develop' into item_group_on_update_items	2021-02-11 16:29:34 +05:30
Marica	819b8d0266	Merge branch 'develop' into rfq-contact-email-set	2021-02-11 14:45:09 +05:30
Saqib	0681a480c2	feat(pos): mpesa related fixes & additions (#24306) ... * fix: switching of mode of payments * feat: transaction limit for mpesa integration * feat: resend payment request if one fails * feat: make new request only for failed ones * fix: invalid amount for mpesa request * fix: payment successful message not shown * fix: url and business shortcode for live env * fix: duplicate items validation for pos invoices * fix: pos closing entry queued status * fix: peroid end date for amended pos closing	2021-02-11 14:06:15 +05:30
Shariq Ansari	a46a83b476	fix: Assignment Rule Unassign Condition doesn't work (#24551) ... Co-authored-by: Marica <maricadsouza221197@gmail.com> Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-11 13:41:10 +05:30
Nabin Hait	aa235b36e0	Update erpnext/controllers/accounts_controller.py ... Co-authored-by: Marica <maricadsouza221197@gmail.com>	2021-02-11 13:26:53 +05:30
Marica	a5039e8f85	Merge branch 'develop' into rfq-contact-email-set	2021-02-11 13:23:56 +05:30
Shariq Ansari	47f784aa9c	fix: Lead not getting linked to call logs (#24593) ... Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-11 13:23:51 +05:30
rohitwaghchaure	aa00eb9898	fix: reposting issue with same posting date and posting time (#24570) ... * fix: reposting issue with same posting date and posting time * Update erpnext/stock/stock_ledger.py Co-authored-by: Nabin Hait <nabinhait@gmail.com>	2021-02-11 13:23:01 +05:30
Saqib	e37a5c2646	fix: customer_currency referenced before assignment (#24607)	2021-02-11 13:10:52 +05:30
Saqib	e07eb86498	Merge branch 'develop' into tcs_calculation	2021-02-11 12:13:47 +05:30
Saqib	15f4672ffa	fix: pos closing valdation (#24605)	2021-02-11 12:11:44 +05:30
Jannat Patel	30c8873f24	fix: validation for disabled warehouse (#24539) ... * fix: validation for disabled warehouse * fix: better function name * fix: validation in stock ledger entry	2021-02-11 11:46:48 +05:30
Kanchan Chauhan	bb05acb60d	fix(Leave Application): List view fix (#24550)	2021-02-11 11:18:59 +05:30
Nabin Hait	9d3f242f39	Update subscription.js	2021-02-11 11:17:33 +05:30
Nabin Hait	b58b8ec2fb	Merge branch 'develop' into quality-inspection-parameter-group	2021-02-11 11:14:02 +05:30
Anupam Kumar	e816ed89e6	fix: portal permission issue (#24577)	2021-02-11 11:12:13 +05:30
Anuja Pawar	e3c72a3d71	fix: fix filters for the report (#24594)	2021-02-11 11:06:12 +05:30
Afshan	8609d31430	fix: amend cancelled job offer (#24589)	2021-02-11 11:05:48 +05:30
Ankush Menat	df6e20887d	fix: update total in words after updating items (#24602) ... * fix: Update total in words after Updating items Update total in words after Updating items in sales/purchase orders. Port of #24592 Closes ISS-20-21-09425 * test: Add test for total & words after update item Add test for total & words after updating items in sales order.	2021-02-11 11:04:39 +05:30
Nabin Hait	79ba299abc	Merge branch 'develop' into subscription_fix_new	2021-02-11 11:03:45 +05:30
Suraj Shetty	969d37da4c	Merge pull request #24598 from surajshetty3416/fix-favicon	2021-02-10 22:18:10 +05:30
Saqib	7b2afaf349	fix: NoneType has no len() (#24600)	2021-02-10 17:21:12 +05:30
Prssanna Desai	161e3954a8	Merge branch 'develop' into fix-favicon	2021-02-10 16:37:13 +05:30
Rucha Mahabal	3237f5bb88	fix: Inpatient Medication Orders report test (#24596)	2021-02-10 16:36:49 +05:30
prssanna	fd0e8a4e23	fix: also fetch item variants if hide variants is disabled	2021-02-10 16:31:41 +05:30
Suraj Shetty	5f27c9e100	chore: Remove unnecessary image files	2021-02-10 15:48:58 +05:30
Suraj Shetty	6fa44fefc3	fix: Use new favicon	2021-02-10 15:48:32 +05:30
Marica	bb87950e96	Merge branch 'develop' into rfq-contact-email-set	2021-02-10 12:02:14 +05:30
pateljannat	1ab95413be	fix: conditions simplified	2021-02-09 17:35:17 +05:30
Deepesh Garg	516b3ae1bc	fix: get company attribute	2021-02-09 16:47:55 +05:30
Deepesh Garg	45cec6928b	fix: get company attribute	2021-02-09 16:44:12 +05:30
Deepesh Garg	5006a2065e	fix: Comment	2021-02-09 16:38:11 +05:30
Anurag Mishra	5164223b99	fix: error on group by filter (#24587) ... Co-authored-by: Afshan <33727827+AfshanKhan@users.noreply.github.com>	2021-02-09 16:22:28 +05:30
pateljannat	637ddff6e9	fix: code cleanup	2021-02-09 16:17:30 +05:30
Deepesh Garg	e56daeb347	fix: Multiple fixes in subscription	2021-02-09 16:13:45 +05:30
Suraj Shetty	1016ff48fc	fix: Create new call popup if call popup does not exists	2021-02-09 12:17:29 +05:30
Marica	6330e20d16	Merge pull request #24565 from marination/stock-dashboard-font-weight ... fix: (ui) Empty State text font weight in Item Dashboard	2021-02-09 11:03:18 +05:30
Deepesh Garg	236c9ae453	Merge pull request #24578 from marination/acc-dimension-update-fix ... fix: Avoid changing Ref. Doctype in Accounting Dimension after creation	2021-02-09 06:51:58 +05:30
Suraj Shetty	fbc3988037	Merge pull request #24581 from surajshetty3416/fix-telephony	2021-02-08 20:27:04 +05:30
Saqib	8991d4ed0b	fix: fetching of standalone cr/dr notes for reconciliation (#24575)	2021-02-08 20:19:11 +05:30
Suraj Shetty	dcc9947d10	fix: Update call_popup ... - Setup missed & call ended listeners - Show contacts based on links	2021-02-08 20:13:23 +05:30
Suraj Shetty	c5248b30eb	fix: Do not re-use call popup if call ID is different	2021-02-08 18:50:05 +05:30
Suraj Shetty	ba26020a82	fix: Show audio interface in call log which has recording URL ... - Also, remove unneccesary column & section break in call log doctype	2021-02-08 18:45:55 +05:30
Suraj Shetty	723e6dd73f	fix: Update style of call log shown in timeline	2021-02-08 18:43:26 +05:30
Suraj Shetty	c4d67c2afe	refactor: Move call_popup style from less to scss ... - Add style for audio	2021-02-08 18:42:27 +05:30
marination	5a7ddba9a3	fix: Avoid changing Ref. Doctype in Accounting Dimension after creation	2021-02-08 17:06:23 +05:30
Afshan	53dbe39d12	fix: StopIteration error when e-invoice not enabled (#24548) ... * fix: StopIteration error when e-invoice not enabled * chore: update message Co-authored-by: Saqib <nextchamp.saqib@gmail.com>	2021-02-08 12:32:42 +05:30
Saqib	9490122abb	fix(e-invoice): skip e-invoice generation for non-taxable invoices (#24568)	2021-02-08 11:40:56 +05:30
Marica	0aef0fd764	Merge branch 'develop' into stock-dashboard-font-weight	2021-02-08 10:34:17 +05:30
marination	a97eb6a052	fix: Empty State text font weight in Item Dashboard	2021-02-07 22:27:40 +05:30
Saqib	f29b811a56	fix(e-invoice): do not validate gstin for exports (#24561)	2021-02-06 17:55:20 +05:30
Anuja Pawar	ffb36aac8f	fix: fixing item_code not found error in the report (#24483)	2021-02-05 23:35:47 +05:30
Nabin Hait	c4a1bb0e1c	fix: couple of travis fixes (#24554) ... Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>	2021-02-05 23:34:18 +05:30