20245 Commits

Author	SHA1	Message	Date
deepeshgarg007	548293ad08	fix: Check zero valuation rate only for valid doctypes	2019-07-30 18:49:19 +05:30
Faris Ansari	f650cb8e4b	style: Indent and missing semicolon	2019-07-30 17:46:15 +05:30
Faris Ansari	a4ada93834	fix: Field labels	2019-07-30 17:11:34 +05:30
Faris Ansari	66064c7827	fix: Add BOM Comparison Tool to module view	2019-07-30 17:11:18 +05:30
Faris Ansari	1214e2d2a4	feat: BOM Comparison Tool	2019-07-30 16:54:46 +05:30
Sahil Khan	403968b2f7	bumped to version 12.0.3	2019-07-30 13:29:07 +05:50
Suraj Shetty	72d03464dc	fix: Show "Get Item Location" only if there are reference items	2019-07-30 11:56:24 +05:30
Suraj Shetty	14fb1600ec	fix: Select location based on group warehouse	2019-07-30 11:47:21 +05:30
Suraj Shetty	341f7733d1	fix: Make item read-only in item location table	2019-07-30 10:02:50 +05:30
Suraj Shetty	e260e8239f	fix: Batch number selection code	2019-07-30 10:02:10 +05:30
Suraj Shetty	55ab31314c	fix: Add code to set batch no ... - And split item based on batch availibility	2019-07-30 09:02:03 +05:30
rohitwaghchaure	2a45eadc28	Merge pull request #18514 from deepeshgarg007/trail_balance_fix_hotfix ... fix: Opening balance not getting calculated in trail_balance_report	2019-07-29 20:56:00 +05:30
Suraj Shetty	36c724d7b5	fix(Issue): reset issue fulfilled indicator (#18454) ... fix(Issue): reset issue fulfilled indicator	2019-07-29 18:27:53 +05:30
Suraj Shetty	344df219a4	Merge pull request #18453 from hrwX/iss_ful_fix_v12 ... fix(Issue): change agreement fulfilled to ongoing when resetting SLA	2019-07-29 18:27:43 +05:30
rohitwaghchaure	3e4cabfd6c	Merge pull request #18516 from rohitwaghchaure/can_t_compare_datetime_issue_for_quotation ... fix: can't compare datetime.date to unicode	2019-07-29 17:59:08 +05:30
Rohit Waghchaure	40e35048b8	fix: can't compare datetime.date to unicode	2019-07-29 17:14:39 +05:30
Suraj Shetty	9ad10cb425	test: Add basic tests	2019-07-29 16:52:26 +05:30
Deepesh Garg	62daa43a4c	Merge pull request #18513 from deepeshgarg007/trail_balance_fix ... fix: Opening balance not getting calculated in trail balance report	2019-07-29 15:38:39 +05:30
rohitwaghchaure	a55e4e2c03	Merge pull request #18452 from rohitwaghchaure/scrap_item_not_adding ... fix: scrap item not adding while doing finished good entry	2019-07-29 15:30:24 +05:30
deepeshgarg007	107c07e5cb	fix: Opening balance not getting calculated in trail_balance_report	2019-07-29 15:01:22 +05:30
deepeshgarg007	4c652396d0	fix: Opening balance not getting calculated in trail_balance_report	2019-07-29 14:57:33 +05:30
deepeshgarg007	f37fb82069	fix: Code cleanup	2019-07-29 12:14:49 +05:30
deepeshgarg007	d9f3ba5fda	fix: Reload doc in patch	2019-07-29 12:14:49 +05:30
deepeshgarg007	724be6eca2	fix: GL entry validation fix	2019-07-29 12:14:49 +05:30
deepeshgarg007	82661372f7	fix: Add accounting dimensions to subscription and opening invoice tool	2019-07-29 12:14:49 +05:30
deepeshgarg007	3d15128b91	fix: Test cases for accounting dimensions	2019-07-29 12:14:49 +05:30
deepeshgarg007	1c1f6f90bb	fix: Test Cases for accounting dimensions	2019-07-29 12:14:49 +05:30
deepeshgarg007	5dfe4df23b	fix: Set query fix	2019-07-29 12:14:49 +05:30
deepeshgarg007	22a4857a3c	fix: Codacy Fixes	2019-07-29 12:14:49 +05:30
deepeshgarg007	acc0958ead	fix: Patch	2019-07-29 12:14:49 +05:30
deepeshgarg007	f1f79ff1e1	fix: Remove dimensions from boot	2019-07-29 12:14:49 +05:30
deepeshgarg007	7d270edf79	fix: Added default dimension and filter in bootinfo	2019-07-29 12:14:49 +05:30
deepeshgarg007	b590f89310	fix: Default Accounting Dimensions in doctypes	2019-07-29 12:14:49 +05:30
rohitwaghchaure	8c8b1f2da6	Merge pull request #18463 from rohitwaghchaure/bank_reco_consider_incorrect_paid_amount_field_v12 ... fix: multi currency bank reconciliation issue	2019-07-29 11:40:40 +05:30
Suraj Shetty	7e20324776	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-07-29 09:41:08 +05:30
deepeshgarg007	ec421df4e4	fix: Code cleanup	2019-07-29 08:58:56 +05:30
Suraj Shetty	27bdba49d4	test: Add test case statements	2019-07-28 22:04:07 +05:30
Suraj Shetty	d43764c8e5	fix: Use .set method to set serial no.	2019-07-28 22:03:28 +05:30
deepeshgarg007	6a43f6718a	fix: Reload doc in patch	2019-07-28 10:30:32 +05:30
deepeshgarg007	a65ad10c62	fix: GL entry validation fix	2019-07-27 19:06:36 +05:30
deepeshgarg007	4fce891241	Merge branch 'develop' of https://github.com/frappe/erpnext into defaut_accounting_dimension	2019-07-27 18:11:34 +05:30
Sahil Khan	82a9118cb2	bumped to version 12.0.2	2019-07-27 13:14:21 +05:50
Mangesh-Khairnar	f0f4dbd5f8	fix(payroll-entry): show make bank entry button when manually submitting salary slip (#18498)	2019-07-27 10:05:33 +05:30
Michelle Alva	e666b882e7	fix: added payroll period in HR module (#18500)	2019-07-27 10:03:18 +05:30
Himanshu	e83b0c3599	Merge branch 'version-12-hotfix' into iss_ful_fix_v12	2019-07-26 12:51:55 +00:00
Himanshu	9443e8e85f	Merge branch 'develop' into iss_ful_fix_v13	2019-07-26 12:51:09 +00:00
rohitwaghchaure	0f3281fe43	Merge pull request #18496 from rohitwaghchaure/asset_pro_rata_cal_for_wdv_remaining_amt_v12 ... fix: Pro rata calculation is not working for WDV depreciation method	2019-07-26 16:11:38 +05:30
Saurabh	af19347376	Merge branch 'develop' into scrap_item_not_adding	2019-07-26 15:10:17 +05:30
Deepesh Garg	64968979b2	Merge branch 'version-12-hotfix' into stock-ageing-v12	2019-07-26 14:42:34 +05:30
Aditya Hase	dc4452ffe3	perf(travis): Faster builds (#18491) ... perf(travis): Faster builds	2019-07-26 13:44:05 +05:30
deepeshgarg007	2f87fd7951	Merge branch 'version-12-hotfix' of https://github.com/frappe/erpnext into stock-ageing-v12	2019-07-26 13:32:11 +05:30
Suraj Shetty	64f174fcaa	feat: Get item location from reference items ... - Add option to get items from multiple sales order - Add some required fiels to Pick TIcket Reference Item	2019-07-26 13:22:05 +05:30
Rohit Waghchaure	53f5e2e066	fixed test cases and the logic for pro rata calculation	2019-07-26 13:21:46 +05:30
Rohit Waghchaure	3844a98c42	fix: Pro rata calculation is not working for WDV depreciation method	2019-07-26 13:21:33 +05:30
Sahil Khan	ecd4d3883e	bumped to version 12.0.1	2019-07-26 13:29:14 +05:50
Himanshu	e87fbcc286	Merge branch 'develop' into iss_ful_fix_v13	2019-07-26 07:31:44 +00:00
Deepesh Garg	941e21092c	Merge branch 'develop' into stock_ageing_fix	2019-07-26 12:47:05 +05:30
Deepesh Garg	c391d65dc3	Merge pull request #18488 from adityahase/faster ... perf(travis): Faster builds	2019-07-26 12:41:01 +05:30
Himanshu	b4ecd29015	Merge branch 'version-12-hotfix' into iss_ful_fix_v12	2019-07-26 06:58:59 +00:00
Himanshu	0162d0a2ea	Merge branch 'develop' into iss_ful_fix_v13	2019-07-26 06:58:55 +00:00
rohitwaghchaure	ad89b029c2	Merge pull request #18494 from netchampfaris/parent-account-child-account-currency-fp ... fix(Account): Pass parent currency to child currency	2019-07-26 12:13:27 +05:30
rohitwaghchaure	a312f19fab	Merge pull request #18493 from netchampfaris/parent-account-child-account-currency ... fix(Account): Pass parent currency to child currency	2019-07-26 12:12:15 +05:30
deepeshgarg007	06f99cae36	fix: Fixes in stock ageing report	2019-07-26 10:32:08 +05:30
deepeshgarg007	15154d4bd0	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix	2019-07-26 10:30:22 +05:30
deepeshgarg007	7fdab021b6	fix: Use get_serial_no and remove batch	2019-07-26 10:26:13 +05:30
deepeshgarg007	1495c9599a	fix: Remove batch	2019-07-26 10:25:54 +05:30
deepeshgarg007	e3a2ab184e	fix: Consider serial no and batches in Stock ageing report	2019-07-26 10:25:15 +05:30
deepeshgarg007	f7733be322	fix: Enhancement in stock ageing report	2019-07-26 10:25:04 +05:30
deepeshgarg007	4d53992b35	fix: Changed columns to new dict form	2019-07-26 10:24:40 +05:30
deepeshgarg007	dda6b5cd53	fix: Add accounting dimensions to subscription and opening invoice tool	2019-07-26 09:14:42 +05:30
deepeshgarg007	aa92df4ddc	fix: Test cases for accounting dimensions	2019-07-26 09:14:42 +05:30
deepeshgarg007	0ce2afc9bc	fix: Test Cases for accounting dimensions	2019-07-26 09:14:42 +05:30
deepeshgarg007	41a1cd954c	fix: Set query fix	2019-07-26 09:14:42 +05:30
deepeshgarg007	b124aff0bb	fix: Codacy Fixes	2019-07-26 09:14:42 +05:30
deepeshgarg007	703fc08467	fix: Patch	2019-07-26 09:14:42 +05:30
deepeshgarg007	6dd5f74671	fix: Remove dimensions from boot	2019-07-26 09:14:42 +05:30
deepeshgarg007	ada1ac8013	fix: Added default dimension and filter in bootinfo	2019-07-26 09:14:42 +05:30
deepeshgarg007	efd6307bc4	fix: Default Accounting Dimensions in doctypes	2019-07-26 09:14:42 +05:30
Faris Ansari	0ec747f57c	fix(Account): Pass parent currency to child currency ... In a scenario where Parent Company Account's Currency is different from it's default currency, the Account Currency of Child would be set from the default currency of Company which might be wrong	2019-07-26 08:55:34 +05:30
Deepesh Garg	6f6f4b9417	Merge pull request #18481 from deepeshgarg007/bank_reco_v12 ... fix: Dynamic link issue fix in Bank reconciliation statement	2019-07-26 08:49:03 +05:30
Deepesh Garg	641e8fea02	Merge branch 'develop' into bank_reco_develop	2019-07-26 08:48:02 +05:30
Deepesh Garg	ea56f317c8	Merge pull request #18473 from deepeshgarg007/gstr-1-query-v12 ... fix: GSTR-1 query fix	2019-07-26 08:46:15 +05:30
Faris Ansari	6998412990	fix(Account): Pass parent currency to child currency ... In a scenario where Parent Company Account's Currency is different from it's default currency, the Account Currency of Child would be set from the default currency of Company which might be wrong	2019-07-26 08:15:45 +05:30
Aditya Hase	f2fb461e40	perf(tests): Remove unnecessary tearDown code	2019-07-26 05:54:04 +05:30
Aditya Hase	f4314a25b6	perf(travis): Use setUpClass instead of setUp	2019-07-26 05:54:04 +05:30
Aditya Hase	bd69f43322	fix(stock): Fix travis builds	2019-07-26 05:54:04 +05:30
Aditya Hase	d1bb274c22	perf(tests): Use country with lesser fixtures	2019-07-26 05:54:04 +05:30
Aditya Hase	8773d931be	perf(tests): Do not unnecessarily create companies	2019-07-26 05:54:04 +05:30
Aditya Hase	0d333894c9	perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown	2019-07-26 05:54:04 +05:30
Aditya Hase	1e82638ae8	perf(tests): Remove unnecessary tearDown code	2019-07-26 03:52:17 +05:30
Aditya Hase	ff79463e36	perf(travis): Use setUpClass instead of setUp	2019-07-26 03:08:45 +05:30
Aditya Hase	6bc2988623	fix(stock): Fix travis builds	2019-07-26 03:08:45 +05:30
Aditya Hase	0f072d7d40	perf(tests): Use country with lesser fixtures	2019-07-26 01:11:57 +05:30
Aditya Hase	0ae786adec	perf(tests): Do not unnecessarily create companies	2019-07-26 00:38:51 +05:30
Aditya Hase	6a5b7f751c	perf(tests): Use setUpClass and tearDownClass instead of setUp and tearDown	2019-07-26 00:23:13 +05:30
Himanshu	2d8f42a007	Merge branch 'version-12-hotfix' into iss_ful_fix_v12	2019-07-25 16:58:37 +00:00
Mangesh-Khairnar	5ca3e83a00	feat: add ledger link in hr config	2019-07-25 14:35:39 +05:30
deepeshgarg007	f56284b0c1	Dynamic link issue fix in Bank reconciliation statement	2019-07-25 12:47:32 +05:30
deepeshgarg007	53dc0c52ca	Dynamic link issue fix in Bank reconciliation statement	2019-07-25 12:44:50 +05:30
Suraj Shetty	3b31800533	fix: Add logic to set batch no [WIP] ... - Add pick ticket reference item	2019-07-25 11:22:45 +05:30
deepeshgarg007	b1f3e0224c	fix: GSTR-1 query fix	2019-07-24 21:36:56 +05:30
deepeshgarg007	89339bb80c	fix: GSTR-1 query fix	2019-07-24 21:32:55 +05:30
Anurag Mishra	0505135f90	Merge branch 'develop' into refactor-call-popup	2019-07-24 18:33:14 +05:30
sahil28297	6bd50b1e20	Merge branch 'version-12-hotfix' into release-notes-fixes	2019-07-24 16:13:44 +05:30
Shivam Mishra	8b08684e07	fix: more url fixes	2019-07-24 16:10:34 +05:30
Shivam Mishra	cb19ee457c	fix: urls for changelog	2019-07-24 16:05:59 +05:30
Suraj Shetty	0576ad5ef9	fix: Move pick list creation code to picklist.py file	2019-07-24 15:16:03 +05:30
Rucha Mahabal	4865eabee5	fix: add Company by default in session defaults (#18460)	2019-07-24 13:37:54 +05:30
Rohit Waghchaure	6d0c6a17d9	fix: multi currency bank reco issue	2019-07-24 12:48:06 +05:30
Suraj Shetty	778b4926bf	fix: Fetch warehouse location from Bin	2019-07-24 11:27:32 +05:30
Himanshu Warekar	20e1a3e199	fix: reset issue fulfilled indicator	2019-07-23 17:00:23 +05:30
Himanshu Warekar	05425d414c	fix: change agreement fulfilled to ongoing	2019-07-23 16:58:13 +05:30
Rohit Waghchaure	bcfbc792b4	fix: scrap item not adding while doing finished good entry	2019-07-23 16:05:29 +05:30
Faris Ansari	06c7a7e660	fix(website): Remove references to Product Settings.products_a… (#18451) ... This was accidentally added back in 34c551d9a5 (diff-f0a387cdb305471e74e523ecc4e646ac)	2019-07-23 13:40:40 +05:30
Suraj Shetty	ed4f8cf65d	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-07-23 13:29:41 +05:30
Mangesh-Khairnar	bb1be2e2ee	chore: change fieldname for carried forward leave expiry	2019-07-23 13:18:40 +05:30
Aditya Hase	48d9cfe304	fix(website): Remove references to Product Settings.products_a… (#18448) ... This was accidentally added back in 34c551d9a5 (diff-f0a387cdb305471e74e523ecc4e646ac)	2019-07-23 12:05:31 +05:30
deepeshgarg007	a19d1d6926	fix: Fixes in stock ageing report	2019-07-23 08:30:09 +05:30
Mangesh-Khairnar	fd1d4c2927	chore: split expire allocation	2019-07-22 18:05:27 +05:30
Mangesh-Khairnar	08c02287dd	fix: expiry allocaton after creating all the transactions	2019-07-22 17:47:03 +05:30
Saurabh	85d88395ba	changelog: release 12.0.0	2019-07-22 17:39:30 +05:30
sahil28297	3e85b4937b	Release Version 12	2019-07-22 17:31:14 +05:30
Nabin Hait	7b76cdbb29	Merge branch 'develop' of https://github.com/frappe/erpnext into develop	2019-07-22 17:01:44 +05:30
Nabin Hait	cd1094e1c2	Merge branch 'rohitwaghchaure-stock_reco_for_serialized_items' into develop	2019-07-22 17:01:08 +05:30
Nabin Hait	ca25b925f5	fix: Calcellation logic for reconciliation of serialized items	2019-07-22 17:00:32 +05:30
Mangesh-Khairnar	3f8326358b	fix: remove wrong status update for order type maintenance (#18444)	2019-07-22 16:24:56 +05:30
deepeshgarg007	d9cc84892b	fix: Use get_serial_no and remove batch	2019-07-22 15:56:41 +05:30
Mangesh-Khairnar	f6cf58fa8c	fix: change get all to sql list	2019-07-22 15:32:41 +05:30
deepeshgarg007	3877b5407c	fix: Remove batch	2019-07-22 15:30:18 +05:30
Suraj Shetty	4177ecb6b2	Merge branch 'develop' of github.com:frappe/erpnext into refactor-call-popup	2019-07-22 15:18:03 +05:30
Mangesh-Khairnar	cbc22e6369	Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management	2019-07-22 13:57:04 +05:30
Mangesh-Khairnar	29e9f14f95	fix: minor changes	2019-07-22 13:54:39 +05:30
Suraj Shetty	433e587a95	style: Add tabs	2019-07-22 13:21:35 +05:30
Suraj Shetty	002474367b	Merge branch 'develop' into email-campaign	2019-07-22 13:20:06 +05:30
Rucha Mahabal	6224266512	fix: replaced frappe.db.get_value with frappe.db.exists	2019-07-22 13:04:43 +05:30
deepeshgarg007	55ca054cb4	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix	2019-07-22 12:46:30 +05:30
Rucha Mahabal	d23a95c06e	fix: removed unnecessary fields from Campaign DocType and other fixes in Email Campaign	2019-07-22 12:26:52 +05:30
Rushin Parikh	40240b7d96	fix: filter reference name by cost center in journal entry account (#17948) ... * fix: filter reference name by cost center in journal entry account if reference_type is Sales Invoice or Purchase Invoice * Update journal_entry.js	2019-07-22 11:54:26 +05:30
Mangesh-Khairnar	0bbfca8142	fix: payment document link fix (#18301)	2019-07-22 11:49:18 +05:30
Mangesh-Khairnar	270c44a556	Enhancement(HR): hiring process (#18129) ... * feat: allow update of vacancies in staffing plan * feat: update staffing plan on creation of job offer * feat: update staffing plan after submit * fix: change staffing plan on creation of employee * fix: calculate vacancies based on job offers and staffing-plan * test: job applicant creation * feat: update job applicant on creation of job offer * test: staffing plan creation * fix: number of positions calculation * test: job offer creation and update * fix: update status of job applicant on change of job offer * fix: linting * fix: set number of positions * fix: linting * fix(job-offer): add a more descriptive message * fix: translations in validation message * Update validation message	2019-07-22 11:47:53 +05:30
Anurag Mishra	305da799a4	Handling case for Material Request type 'Manufacture' v12 (#18365) ... * fix: status for 'material request type == Manufacture' * Patch: for setting status * fix: list view status	2019-07-22 11:35:16 +05:30
Faris Ansari	74d5e9d32a	fix: Set project in Timesheet (#18371) ... * fix: Set project in Timesheet * style: Missing semicolon	2019-07-22 11:34:00 +05:30
Faris Ansari	e3b3ac8a59	fix: Fetch email when making Opportunity from Lead (#18373)	2019-07-22 11:31:30 +05:30
Faris Ansari	7ed5919d5b	fix(LoanApplication): Repayment amount check (#18376) ... * fix: Clickable Asset link * fix(LoanApplication): Repayment amount check	2019-07-22 11:30:05 +05:30
Mangesh-Khairnar	88620d6cbb	fix: precision on comparing with the outstanding amount (#18375)	2019-07-22 11:29:26 +05:30
Mangesh-Khairnar	64c780e8c7	fix: update percentage on creation of invoice for zero amt transaction (#18382)	2019-07-22 11:28:58 +05:30
rohitwaghchaure	5be91173a1	Merge pull request #18108 from kaynes-technology/batch_bom_operations ... feat: Add batch operation times in BOM Operation	2019-07-22 11:26:19 +05:30
Saurabh	90d7a8888f	fix: pass missing argument while generating consolidated financial statement for cash flow type (#18398)	2019-07-22 11:22:34 +05:30
Anurag Mishra	23d4b7cc46	fis: mapped cost center in gl entries (#18404)	2019-07-22 11:22:03 +05:30
Himanshu	73d446023d	fix: file attach via import (#18414)	2019-07-22 11:19:47 +05:30
Aditya Hase	dc42cc3998	fix(sales-invoice): Use orm instead of frappe.db.sql (#18434)	2019-07-22 11:19:07 +05:30
Aditya Hase	195465cdd9	fix(tally): Ignore unhandled vouchers silently (#18430) ... Vouchers that affect inventory entries but are not of type Sales, Purchase, Credit Note, Debit Note are not handled. Custom Vouchers are also not handled.	2019-07-22 11:18:11 +05:30
Mangesh-Khairnar	16a0458e29	fix(procurement-tracker): concatenate filter conditions with leading whitespaces (#18440)	2019-07-22 11:16:40 +05:30
Deepesh Garg	60a291af8f	fix: Sample qty validation fix in purchase receipt (#18419) ... Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>	2019-07-22 11:14:14 +05:30
crescent28	b978c9173d	fix: added null check for filters (#18416) ... filters when None, at `filters.get("outstanding_amt_greater_than")` would result in an Attribute Error. This PR just adds a simple null-check in the if conditions. I'm awesome! Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>	2019-07-22 11:13:27 +05:30
Rucha Mahabal	324ab98b99	Merge branch 'email-campaign' of https://github.com/ruchamahabal/erpnext into email-campaign	2019-07-22 03:27:29 +05:30
Rucha Mahabal	8d994cb1f2	fix: allow only 1 active Email Campaign for a lead/contact at a time	2019-07-22 03:26:40 +05:30
Rucha Mahabal	b54459e588	dash: added Email Campaign to CRM dashboard	2019-07-22 03:23:40 +05:30
Rohit Waghchaure	93b7ece8b0	fix: disable field's fieldtype changed from data to check	2019-07-21 00:02:09 +05:30
Suraj Shetty	34b4b77920	Merge branch 'develop' into email-campaign	2019-07-20 19:42:16 +05:30
deepeshgarg007	2ddbebfae0	fix: Condition fix	2019-07-20 14:52:59 +05:30
deepeshgarg007	e097d4f470	fix: Assignment fix	2019-07-20 14:49:32 +05:30
deepeshgarg007	1ee3d040a1	fix: Condition fix in get_balance_on function	2019-07-20 14:46:59 +05:30
Anurag Mishra	d1d8d24d0f	fix: filters conditions in loan repayment (#18428)	2019-07-20 06:31:22 +05:30
Karthikeyan S	fcdcfbf302	fix(loan): Loan Tenure Formula (#18424)	2019-07-20 00:18:44 +05:30
Karthikeyan S	747c2624cd	fix(BOM): Sever Error due in bom query to new behaviour of db.escape in v12 (#18401) ... fixes bug introduced by commit 6a7969117f	2019-07-19 22:49:21 +05:30
Rucha Mahabal	a566b4e24a	Merge branch 'develop' into email-campaign	2019-07-19 15:07:56 +05:30
Himanshu	0a8816e053	feat(Google Maps): Google Maps Refactor [Unified Google API Settings] (#18110)	2019-07-19 14:38:04 +05:30
Deepesh Garg	fefe4ac095	Merge pull request #18381 from surajshetty3416/fix-payroll-UI ... fix: Show submit after salary slip creation	2019-07-19 12:09:21 +05:30
Deepesh Garg	b7fc8fded8	Merge pull request #18397 from surajshetty3416/employee-skill-map-config ... fix: Add Employee Skill Map to HR module page	2019-07-19 12:07:39 +05:30
Salmanmulani	b752acf803	fix: added default value for projected_qty in bin_dict ... `projected_qty` if not in `bin_dict` would return None. And when compared to an integer would result in a TypeError. This PR fixes this Co-authored-by: Shivam Mishra <scm.mymail@gmail.com>	2019-07-19 11:44:49 +05:30
Suraj Shetty	d33c2337cf	Merge branch 'develop' into employee-skill-map-config	2019-07-19 10:45:03 +05:30
Suraj Shetty	fea0fc02cd	Merge branch 'develop' into fix-payroll-UI	2019-07-19 10:44:56 +05:30
Deepesh Garg	635dc1dfda	Merge pull request #18408 from rohitwaghchaure/not_able_to_make_material_request_for_product_bundle_from_so ... fix: not able to make material request for bundle items from the sale…	2019-07-19 09:48:07 +05:30
Deepesh Garg	f449f51147	Merge branch 'develop' into fix-payroll-UI	2019-07-19 08:07:35 +05:30
rohitwaghchaure	8fedf53304	Merge pull request #18379 from rohitwaghchaure/pos_fixed_address_and_taxes_and_charges_not_set_as_per_profile ... fix: address and taxes not set as per pos profile in the pos invoice	2019-07-19 08:00:33 +05:30
Rohit Waghchaure	9fe6e00a4e	fix: not able to make material request for bundle items from the sales order	2019-07-19 07:54:08 +05:30
Suraj Shetty	e0d8cf1851	fix: Add Employee Skill Map to HR module page	2019-07-18 15:58:50 +05:30
Suraj Shetty	22ff54b777	Merge branch 'develop' into fix-payroll-UI	2019-07-18 12:50:31 +05:30
Anurag Mishra	0e23307dbf	fix: handled value Error (#18361)	2019-07-18 12:43:18 +05:30
Frappe PR Bot	98a9a4865e	feat: Updated translation (#18364)	2019-07-18 12:42:31 +05:30
Suraj Shetty	4bf65dd0d9	Merge branch 'develop' into develop-customer-item-price-report	2019-07-18 10:15:20 +05:30
Suraj Shetty	4302c4aa4e	Merge branch 'develop' into fix-payroll-UI	2019-07-18 08:50:16 +05:30
Govind S Menokee	ce42c53c1c	Merge branch 'develop' into batch_bom_operations	2019-07-17 22:40:02 +05:30
Govind S Menokee	51b7b6f5d0	feat: remove explicit commit call	2019-07-17 22:38:30 +05:30
rohitwaghchaure	6349f61882	Merge pull request #18385 from rohitwaghchaure/offline_pos_syncing_issue_for_customer_develop ... fix: offline pos syncing issue for customer	2019-07-17 21:37:55 +05:30
Rohit Waghchaure	438efb4008	fix: cost center not able to access	2019-07-17 21:21:58 +05:30
Rohit Waghchaure	0851c94e9b	fix: offline pos syncing issue for customer	2019-07-17 20:36:33 +05:30
Suraj Shetty	f9c650f8e6	fix: Show submit after salary slip creation	2019-07-17 19:38:46 +05:30
Rohit Waghchaure	dcf2d3532e	fix: address and taxes not set as per pos profile in the pos invoice	2019-07-17 19:28:36 +05:30
rohitwaghchaure	41aee35070	Merge pull request #18369 from Anurag810/fix_precision_v12 ... fix: precision for base grand total amount	2019-07-17 19:00:43 +05:30
rohitwaghchaure	3403d1cc44	Merge pull request #18095 from scmmishra/remove-move-stock-summary ... refactor: move and add for serialized and batch items in stock summary	2019-07-17 18:50:00 +05:30
Suraj Shetty	06b56adc71	Merge branch 'develop' into develop-customer-item-price-report	2019-07-17 17:29:42 +05:30
Suraj Shetty	6824838ab0	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-07-17 15:39:09 +05:30
Anurag Mishra	8a06b8fd38	fix precision	2019-07-17 14:55:16 +05:30
Rucha Mahabal	65a627cb5b	fix: module changes for Auto Repeat from Desk to Automation (#18356)	2019-07-17 13:50:32 +05:30
Suraj Shetty	82cfccab2f	fix: Get user_id of employee instead of name ... - Remove caching from lead	2019-07-17 11:52:35 +05:30
Deepesh Garg	807ef6af41	Merge pull request #18340 from deepeshgarg007/ac_dim_usability_fixes ... fix: Usability fixes in Accounting Dimensions	2019-07-16 19:25:54 +05:30
Deepesh Garg	0d7cc663c8	Merge pull request #18348 from rohitwaghchaure/get_items_from_not_pulled_the_description_set_in_bom ... fix: description set in the bom not pulled in the material request	2019-07-16 19:23:35 +05:30
Deepesh Garg	902e5ab744	Merge branch 'develop' into ac_dim_usability_fixes	2019-07-16 16:17:07 +05:30
deepeshgarg007	4a7f370b15	fix: Consider serial no and batches in Stock ageing report	2019-07-16 16:08:50 +05:30
Faris Ansari	a4e0532df0	fix: Project Template should be set only once (#18354)	2019-07-16 15:59:37 +05:30
Suraj Shetty	2295921821	Merge branch 'develop' into refactor-call-popup	2019-07-16 13:54:07 +05:30
Suraj Shetty	e7d277d51e	fix: Last communication query	2019-07-16 13:53:41 +05:30
Shivam Mishra	7339c72208	Update item_dashboard.js	2019-07-16 13:19:13 +05:30
Shivam Mishra	5738c93b8f	style: commonified move and add button handler	2019-07-16 12:52:19 +05:30
Shivam Mishra	7ab6010225	Merge branch 'remove-move-stock-summary' of github.com:scmmishra/erpnext into remove-move-stock-summary	2019-07-16 12:33:13 +05:30
Shivam Mishra	fd6ff62bdb	style: code styling fixes	2019-07-16 12:32:50 +05:30
Mangesh-Khairnar	b560050334	fix(payment-entry):remove unused argument	2019-07-16 12:11:44 +05:30
Suraj Shetty	f5dd494716	fix(call popup): Multiple changes ... - Remove summary from call log use comments instead - Add contact and lead if matched to the call log - Add received by field with Employee Link - DocPerm to allow Employees to have read access on call log - Remove unwanted code - Add a method to get lead just by providing phone number - Show popup only to Employee to which the system is trying to connect. - Remove custom code from call popup dialog and replace it with standard fields - Increase timeout to hide popup after the call has been disconnected.	2019-07-16 11:07:25 +05:30
Deepesh Garg	8c21703959	fix: Fixes in get_balance_on function (#18324)	2019-07-16 09:41:01 +05:30
Faris Ansari	82770d9152	fix: Project fixes (#18343) ... * fix: Add fetch from in Full Name * fix: Remove deprecated buttons * fix: Show Project to Administrator	2019-07-16 09:40:09 +05:30
deepeshgarg007	6ecbd97fbe	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix	2019-07-16 09:02:48 +05:30
Deepesh Garg	ce3594796c	Merge pull request #18320 from deepeshgarg007/quo_opp_address_fix_develop ... fix: Address fixes in quotation and opportunity	2019-07-16 08:42:18 +05:30
Deepesh Garg	8fcd426dab	Merge pull request #18350 from rohitwaghchaure/added_payment_terms_in_accounts_payble_summary_develop ... feat: added payment terms filter in the accounts payable summary	2019-07-16 08:39:30 +05:30
deepeshgarg007	af6c09ae09	fix: Codacy	2019-07-16 08:33:13 +05:30
Govind S Menokee	2ab9947647	Merge branch 'develop' into batch_bom_operations	2019-07-16 02:12:24 +05:30
Govind S Menokee	7d9d027bfe	feat: update modified to fetch latest state in patches	2019-07-16 02:01:27 +05:30
Rohit Waghchaure	4c0dffe687	feat: added payment terms filter in the accounts payable summary	2019-07-16 02:00:41 +05:30
Govind S Menokee	90fc3aff72	feat: add patch for default batch_size for old records	2019-07-16 01:48:35 +05:30
Rohit Waghchaure	c67743b1f8	fix: description set in the bom not pulled in the material request	2019-07-16 01:27:26 +05:30
rohitwaghchaure	e9f0e88f9b	fix: taxes sequence if shipping rule is set in the sales invoice (#18329)	2019-07-15 18:57:25 +05:30
Deepesh Garg	322053ee1b	Merge pull request #18136 from nabinhait/inv-disc-improvements ... fix: set invoice status considering invoice discounting	2019-07-15 18:53:30 +05:30
deepeshgarg007	84d1e12f34	fix: Typo	2019-07-15 18:42:22 +05:30
deepeshgarg007	8cbc22062b	fix: Remove cost center filter from customer credit balance report	2019-07-15 18:35:19 +05:30
deepeshgarg007	ad4c111d91	fix: Remove cost center filter from customer credit balance report	2019-07-15 18:32:10 +05:30
deepeshgarg007	2093ffc15b	fix: Usability fixes in accountng dimensions	2019-07-15 18:21:05 +05:30
Nabin Hait	6e264701cb	Merge branch 'stock_reco_for_serialized_items' of https://github.com/rohitwaghchaure/erpnext_develop into rohitwaghchaure-stock_reco_for_serialized_items	2019-07-15 18:12:49 +05:30
Nabin Hait	868766ddf0	refactor: Refactored over delivery/receipt/billing fields (#17788) ... * refact: Refactored over delivery/receipt/billing fields * fix: test case	2019-07-15 18:02:58 +05:30
Rucha Mahabal	bbb22ad082	fix: child table naming	2019-07-15 17:52:50 +05:30
sahil28297	39c3cfa25d	fix(hr_setting): fix translation method call (#18328)	2019-07-15 11:25:26 +00:00
sahil28297	7697066cc2	fix(sales_order_list): compare type as well (#18331) ... * fix(sales_order_list): compare type as well * fix(sales_order_list): compare type as well	2019-07-15 11:25:06 +00:00
sahil28297	ec810a4a55	fix(product_page): compare type as well and provide base class for parseInt (#18332)	2019-07-15 11:24:41 +00:00
sahil28297	96f33cef49	Merge branch 'develop' into quo_opp_address_fix_develop	2019-07-15 15:42:55 +05:30
deepeshgarg007	1cc46c06b0	Merge branch develop into ac_dim_usability_fixes	2019-07-15 15:34:40 +05:30
Faris Ansari	1abd1e79a9	fix: Module Links (#18318) ... * fix: Add Project Billing Summary link * fix: Bank Guarantee shouldn't depend on Bank Guarantee	2019-07-15 14:34:10 +05:30
Faris Ansari	280fe396b9	fix: Dont rebuild cache on cache bust (#18319) ... - Results in a lot of stale background jobs - Cache will be built when needed	2019-07-15 14:30:21 +05:30
Anurag Mishra	e37ff39836	fix: Validate loan repayment amount in Loan Application (#18169) ... * fix: validate loan repayment amount * fix: test for loan application	2019-07-15 14:16:52 +05:30
Mangesh-Khairnar	1ac9a8e82e	fix(bin): update requested qty in bin (#18297)	2019-07-15 14:08:47 +05:30
Himanshu	94a0d45b77	fix: do not add an extra day (#18311)	2019-07-15 14:06:50 +05:30
Michelle Alva	6abb63b445	refactor: Refactor module links of Accounting, HR, Project (#18160)	2019-07-15 14:00:00 +05:30
Nabin Hait	d83e39d0ac	Merge branch 'develop' of https://github.com/frappe/erpnext into inv-disc-improvements	2019-07-15 13:56:29 +05:30
Nabin Hait	5435b7e9eb	fix: Null issue	2019-07-15 13:56:09 +05:30
deepeshgarg007	eac5461229	fix: Address filtering fix in opportunity	2019-07-15 13:55:08 +05:30
deepeshgarg007	d5fcab5f81	fix: Set taxes fix for lead	2019-07-15 12:44:11 +05:30
Govind S Menokee	14ec76e8d9	feat: remove is_batch_operation from select query	2019-07-14 23:06:10 +05:30
Govind S Menokee	5965469abd	feat: remove is_batch_operation checkbox from work order operation	2019-07-14 23:02:33 +05:30
Govind S Menokee	f3e10a489d	feat: remove check box for batch operation	2019-07-14 22:55:12 +05:30
deepeshgarg007	f7395916c8	fix: Accounting Dimensions in Customer Credit Balance report	2019-07-14 18:44:32 +05:30
deepeshgarg007	a85db66146	fix: Usability fixes in accounting dimensions	2019-07-14 18:15:19 +05:30
rohitwaghchaure	3643d67249	Merge pull request #18023 from fproldan/fix_by_voucher_order_develop ... fix: General Ledger Group by Voucher not ordering by posting_date for develop	2019-07-14 17:23:54 +05:30
rohitwaghchaure	f414c8945f	Merge pull request #18295 from rohitwaghchaure/fixed_dr_cr_issue_account_tree ... fix: Dr / Cr label for balance of the ledgers in the account tree	2019-07-14 17:00:58 +05:30
deepeshgarg007	581d931031	fix: Enhancement in stock ageing report	2019-07-13 21:58:32 +05:30
Himanshu Warekar	dc02f4d07d	fix: miscellaneous fixes	2019-07-13 20:00:25 +05:30
deepeshgarg007	d43d19acfd	Merge branch 'develop' of https://github.com/frappe/erpnext into stock_ageing_fix	2019-07-13 11:40:05 +05:30
deepeshgarg007	5ea542b08b	fix: Do not show Project, Cost Center and Accounting Dimension in ref doc	2019-07-13 11:39:32 +05:30
Deepesh Garg	74e0f2cbae	Merge pull request #18293 from nabinhait/taxes-calc-only-if-items-dev ... fix: Calculate taxes and totals only if items added in transaction	2019-07-12 23:03:12 +05:30
Rucha Mahabal	0fe37fda09	codacy fixes	2019-07-12 17:47:32 +05:30
Rucha Mahabal	4879e00d64	codacy fixes	2019-07-12 16:09:32 +05:30
Shivam Mishra	5594ea5298	Merge branch 'develop' into remove-move-stock-summary	2019-07-12 16:04:12 +05:30
karthikeyan5	625ec43fc9	fix(auto attendance): Prevent marking attendance for the ongoing shift	2019-07-12 15:57:37 +05:30
Rucha Mahabal	c35a9a4888	codacy fixes	2019-07-12 15:49:05 +05:30
Rohit Waghchaure	8412f847d4	fix: dr / cr label for balance of the ledgers in the account tree	2019-07-12 15:44:58 +05:30
Deepesh Garg	397013ec92	fix: Fix for customer lead merging in Quotation (#18294)	2019-07-12 14:51:01 +05:30
Rucha Mahabal	7396bb8933	codacy fixes	2019-07-12 14:47:02 +05:30
Deepesh Garg	ed9ac14f70	fix: Usability fixes for chart of Accounts Importer (#18285) ... * fix: Usablity fixes for chart of Accounts Importer * fix: Provide Row no with error messages	2019-07-12 14:47:00 +05:30
Deepesh Garg	d73426a3bc	fix: Add status field at parent level in quality inspection and minor UX fix (#18263) ... * fix: Add status field at parent level and minor UX fix * fix: Set default status as Accepted	2019-07-12 14:44:22 +05:30
Rucha Mahabal	2b7064a348	codacy fixes	2019-07-12 14:34:43 +05:30
Nabin Hait	b315acb5a7	fix: Calculate taxes and totals only if items added in transaction	2019-07-12 14:32:53 +05:30
Anurag Mishra	70dbca2263	fix: enable track changes for issue doctype (#18290)	2019-07-12 14:29:20 +05:30
Deepesh Garg	f9e4391998	Merge pull request #18038 from fproldan/sales_analytics_with_order_type_develop ... feat: "Order Type" tree type for Sales Analytics report (develop)	2019-07-12 14:28:16 +05:30
Deepesh Garg	49c97922b4	Merge pull request #18189 from bhavishyasharma/feat-manufacturer-is-missing-contacts ... feat: Manufacturer is Missing Contacts	2019-07-12 14:01:00 +05:30
Rucha Mahabal	9e35bff55c	feat: Email Campaign	2019-07-12 13:56:36 +05:30
Rushabh Mehta	64897d26a4	fix(minor): open colour status for issue	2019-07-12 12:55:28 +05:30
Deepesh Garg	587bdf09eb	Merge branch 'develop' into feat-manufacturer-is-missing-contacts	2019-07-12 12:30:42 +05:30
Deepesh Garg	f7c151e7ba	Merge pull request #18241 from scmmishra/cash-flow-chart ... feat: added chart to cash-flow report	2019-07-12 12:30:18 +05:30
Jamsheer	5073ac4dcb	fix: Patient History (Patient Medical Record) (#17972) ... * Page - Patient History * Healthcare Utils - get patient vitals * Healthcare Utils - render doc as html for patient history page * Page - Patient History - prcatitioner image in time line * Page - Patient History in menu * fix - page medical history * fix: page patient_history broken img, minor fixes * fix: patient_history page, add pagination, show doc if fetched * fix: Patient Medical Record to Patient History * fix: patient history page - set route options * fix: update to code standards * fix: remove Eidt button form patient history * fix: css update to code standards * fix: Remove page medical_record	2019-07-12 12:28:34 +05:30
Deepesh Garg	91417646b1	Fix: Add fieldtype as currency	2019-07-12 12:24:05 +05:30
Himanshu	7d1d9aa46b	feat(Issue): Reset SLA (#18244) ... * feat: reset sla * fix: db.get_single_value * feat: timeline entry for reset sla * fix: remove communication from support config * fix: reset sla on split_issue	2019-07-12 12:19:35 +05:30
Suraj Shetty	ca872381a1	Merge branch 'develop' of github.com:frappe/erpnext into feature-pick-list	2019-07-12 12:13:09 +05:30
Anurag Mishra	53e7df078e	fix: set project link in item tables (#18233)	2019-07-12 12:05:39 +05:30
Suraj Shetty	32371c8755	feat: Init Pick Ticket and Pick Ticket Item	2019-07-12 11:56:42 +05:30
rohitwaghchaure	9b34eab93a	Merge pull request #18258 from Mangesh-Khairnar/purchase-order-tax-category ... feat(purchase-order): Add tax category field in purchase order	2019-07-12 11:39:35 +05:30
Saurabh	acaf76a6de	Merge branch 'develop' into feat-manufacturer-is-missing-contacts	2019-07-12 11:10:12 +05:30
Saurabh	98d429d271	Merge pull request #18239 from netchampfaris/breadcrumbs-module-map-2 ... fix: Add module map for breadcrumbs	2019-07-12 11:09:20 +05:30
Deepesh Garg	abd4a7a950	Merge pull request #18253 from frappe/jigneshpshah-Report-link ... fix: navigation link updated for Item Shortage Report	2019-07-11 22:22:54 +05:30
Aditya Hase	f04b19aa2e	fix: Company might not have any warehouses when on_update hook for QBM is being executed ... This used to throw while renaming a Company that is either used with QuickBooks Migrator or is set as a Default Company in Global Defaults.	2019-07-11 18:29:24 +05:30
Mangesh-Khairnar	f8c92f30bf	feat(purchase-order): Add tax category field in purchase order	2019-07-11 18:27:49 +05:30
Aditya Hase	d4c10801d1	style: Remove multiple whitespace after :	2019-07-11 18:17:01 +05:30
Aditya Hase	7352227a24	fix: Remove unused local variable	2019-07-11 18:16:42 +05:30
Aditya Hase	2f6cd1999a	style: One import per line	2019-07-11 18:16:23 +05:30
Aditya Hase	9f40ffcd1e	style: Insert whitespace after ,	2019-07-11 18:10:05 +05:30
Aditya Hase	dfeb6bef8c	style: Remove whitespace before :	2019-07-11 18:08:46 +05:30
Aditya Hase	6bbb726769	fix: Remove unused imports	2019-07-11 18:04:41 +05:30
Nabin Hait	bd055a858c	fix: UX fixes in loan (#18220) ... * fix: UX fixes in loan * Update loan.py	2019-07-11 17:18:00 +05:30
Rushabh Mehta	af88e15e92	fix(patch): set_priority_for_support.py (#18255)	2019-07-11 17:14:29 +05:30
rohitwaghchaure	b390b70ee3	fix: set project in material request when pull items from bom (#18256)	2019-07-11 15:22:03 +05:30
Suraj Shetty	ef1d0d1d14	Merge branch 'develop' into breadcrumbs-module-map-2	2019-07-11 15:02:42 +05:30
Nabin Hait	fca86c48c8	fix: Revert #frappe/erpnext/17896 (#18251)	2019-07-11 14:39:24 +05:30
Jignesh Greycube	870cbad5b2	fix: navigation link updated for Item Shortage Report ... Item Shortage Report navigation link was incorrect , hence updated.	2019-07-11 13:56:43 +05:30
Himanshu Warekar	523d0ab0d4	fix: resolution by indicator	2019-07-11 13:24:28 +05:30
Suraj Shetty	bc2ff785f1	fix: Restore "allow delivery" condition checks (#18246) ... * fix: Remove `allow_delivery` flag - User was not able to create delivery note because allow_delivery flag was false and it never used to get updated * fix: Restore allow_delivery condition checks	2019-07-11 10:43:40 +05:30
Suraj Shetty	c6c6b05522	fix: update_due_date_in_gle patch (#18248)	2019-07-11 10:42:37 +05:30
Shivam Mishra	020f405367	Merge branch 'develop' into cash-flow-chart	2019-07-11 10:12:45 +05:30
Mangesh-Khairnar	bfcc84789f	fix(sales-invoice): get items from quotation (#18237)	2019-07-11 10:04:46 +05:30
rohitwaghchaure	4870e95b83	fix: po, rate set as zero against the item (#18242)	2019-07-11 10:03:35 +05:30
deepeshgarg007	285701d9f1	fix: Add missing Cost Center filter in cash flow statement	2019-07-10 22:22:14 +05:30
Shivam Mishra	f2f1e81a3f	feat: added chart to cash-flow report	2019-07-10 20:28:52 +05:30
Suraj Shetty	7391054603	Merge branch 'develop' into breadcrumbs-module-map-2	2019-07-10 19:39:56 +05:30
Suraj Shetty	7837fbe231	style: Add missing semicolon	2019-07-10 19:39:40 +05:30
Mangesh-Khairnar	d749f20f63	fix: installation note (#18232)	2019-07-10 19:29:39 +05:30
Faris Ansari	a7a6987c42	fix: Add Shopping Cart and Contacts	2019-07-10 19:27:57 +05:30
Faris Ansari	ab46f0f5bb	fix: Add module map for breadcrumbs	2019-07-10 19:27:44 +05:30
Don-Leopardo	365a572073	Merge branch 'develop' into fix_by_voucher_order_develop	2019-07-10 10:52:59 -03:00
Don-Leopardo	93fbba4f40	Merge branch 'develop' into sales_analytics_with_order_type_develop	2019-07-10 10:52:55 -03:00
Himanshu	e7bb54ed76	feat(Issue): Settings to stop SLA tracking (#18112) ... * fix: fix msgprint when creating new issues * fix: use getdate * fix: do not self save * fix: test case * fix: error due to comparing date and str * fix: creation time for replicated issue * feat: sla in support settings * fix: remove sla settings * feat: enable check in sla * fix: throw if sla is disabled * fix: enable sla	2019-07-10 17:15:59 +05:30
Nabin Hait	59c5c3c347	fix: Make material request against SO only for pending qty (#18216)	2019-07-10 17:05:49 +05:30
Suraj Shetty	61d8088be4	fix: Return fieldtype so that the client-side can format chart values (#18211)	2019-07-10 17:05:25 +05:30
rohitwaghchaure	058787d204	fix: error report for item price (#18212)	2019-07-10 17:03:48 +05:30
Mangesh-Khairnar	3d28c065db	fix(exchange-rate-revaluation): change create to view button on creation of journal entry (#18201)	2019-07-10 17:03:23 +05:30
deepeshgarg007	1dc124cf75	fix: Changed columns to new dict form	2019-07-10 14:49:25 +05:30
Rucha Mahabal	191a0bd43c	merged	2019-07-10 12:27:13 +05:30
Suraj Shetty	838697261d	fix: Call popup avatar ... Avoid getting session users image if customer doc has no image	2019-07-10 10:39:43 +05:30
Shivam Mishra	eb7c037bdf	Merge branch 'develop' of https://github.com/frappe/erpnext into remove-move-stock-summary	2019-07-10 10:22:20 +05:30
Shivam Mishra	444091b350	refactor: disable quick entry for batched and serialized items	2019-07-10 10:22:08 +05:30
Deepesh Garg	62911ec198	Merge pull request #18206 from Anurag810/sending_sms_from_quotation ... fix: sending sms from quotation	2019-07-10 09:18:43 +05:30
Anurag Mishra	e9dd9b842e	Update erpnext/public/js/sms_manager.js ... Co-Authored-By: Deepesh Garg <42651287+deepeshgarg007@users.noreply.github.com>	2019-07-09 17:54:00 +05:30
deepeshgarg007	890ea195f3	fix: Tree filter fixes for erpnext dimensions	2019-07-09 16:56:56 +05:30
Rucha Mahabal	8c747ce5cf	merged	2019-07-09 15:18:45 +05:30
Rucha Mahabal	36963a8e04	feat: Email Campaign	2019-07-09 15:14:13 +05:30
Anurag Mishra	de13faf19a	fix: sending sms from quotation	2019-07-09 14:27:20 +05:30
Raffael Meyer	59cee369ce	add header row	2019-07-08 14:48:54 +02:00
Mangesh-Khairnar	6a7969117f	fix(bom): escape name with wildcard character (#18164)	2019-07-08 10:40:40 +05:30
Rushabh Mehta	8309fcfbbc	BREAKING CHANGE: Remove anti-pattern "Project Task" (#18059) ... * BREAKING CHANGE: Remove anti-pattern "Project Task" * fix(tests): remove `tasks` from project/test_records.json * fix(tests) * fix(test): test_employee_onboarding.py * fix(tests): test_expense_claim.py * fix(refactor): cleanup project.py validate/update * fix(refactor): cleanup project.py validate/update * fix(test): test_expense_claim * fix(test): test_expense_claim * fix(test): test_expense_claim, try Test Company 4 * Update project.py	2019-07-08 10:39:30 +05:30
Suraj Shetty	bef897602d	fix: Use db_set since it triggers on_update event (#18175)	2019-07-08 10:30:26 +05:30
rohitwaghchaure	d86f027ce0	fix: default supplier was not set from the patch in item defaults for multi company instance (#18178)	2019-07-08 10:29:26 +05:30
rohitwaghchaure	334335a2ef	fix: not able to make credit note for the sales invoice in which item code is not set (#18184)	2019-07-08 10:26:29 +05:30
Himanshu	35f15148fb	fix: do not update modified (#18193)	2019-07-08 10:25:28 +05:30
Deepesh Garg	f753191fdf	Merge pull request #18195 from deepeshgarg007/b2cs_json ... fix: GSTR-1 B2CS JSON file generation and cess amount fixes	2019-07-08 10:10:52 +05:30
Deepesh Garg	6252c0490a	Merge pull request #18194 from deepeshgarg007/dimensions_reports ... fix: Add accounting dimensions to various reports and fixes	2019-07-07 22:40:57 +05:30
deepeshgarg007	6bb5ade667	fix: Add accounting dimensions to various reports and fixes	2019-07-07 21:24:45 +05:30
Mangesh-Khairnar	48d61fb072	Merge branch 'develop' into handle_large_outstanding_invoices_code_refactored	2019-07-07 20:17:07 +05:30
deepeshgarg007	7ce199807c	fix: GSTR-1 B2CS Json file generation and cess amount fixes	2019-07-07 14:25:08 +05:30
rohitwaghchaure	8a054e4b36	Merge pull request #18182 from rohitwaghchaure/provision_to_make_debit_credit_note_against_return_entry ... feat: provision to make debit / credit note against the stock returned entry	2019-07-07 00:51:46 +05:30
Bhavishya Sharma	607611ebdc	codacy fix	2019-07-06 15:02:57 +05:30
Bhavishya Sharma	db3c5625ae	feat: Manufacturer is Missing Contacts	2019-07-06 13:54:30 +05:30
rohitwaghchaure	94b3dd1db2	Merge pull request #18154 from netchampfaris/fix-price-list-on-website-d ... fix: Honor price list in Shopping Cart Settings	2019-07-05 18:14:45 +05:30
rohitwaghchaure	6b2075a115	Merge pull request #18161 from deepeshgarg007/additional_discount ... fix: Additonal discount not getting set in sales transactions	2019-07-05 18:13:23 +05:30
rohitwaghchaure	6ea1f7becf	Merge pull request #18177 from scmmishra/po-patch-1 ... refactor: added throw if supplier is not default for any item	2019-07-05 18:12:56 +05:30
rohitwaghchaure	d8196ced76	Merge pull request #18179 from rohitwaghchaure/income_booked_for_deferred_debit_and_credit_note_develop ... fix: on credit note / debit note deferred reversed instead of income	2019-07-05 17:28:50 +05:30
Rohit Waghchaure	5d4d70b75f	feat: provision to make debit / credit note against the stock returned entry	2019-07-05 17:06:25 +05:30
Deepesh Garg	1640e7012b	Merge pull request #18172 from karthikeyan5/develop-terms-selling-buying-filter ... feat(setup): adding selling buying filter in terms and conditions	2019-07-05 16:03:16 +05:30
Shivam Mishra	6277966105	chore: added check for auto-reorder in stock settings (#18174) ... * chore: added check for auto-reorder in stock settings * style: removed explicit return	2019-07-05 15:58:13 +05:30
Mangesh-Khairnar	ee01ba5879	fix: linting	2019-07-05 15:21:45 +05:30
Rohit Waghchaure	909d773462	fix: on credit note / debit note deferred reversed instead of income	2019-07-05 15:12:14 +05:30
Rohit Waghchaure	0f065d5de1	Added due date in the gl entry	2019-07-05 14:54:15 +05:30
Rohit Waghchaure	2f3f7507c4	fix: browser hangs while making payment entry for large number of outstaning invoices	2019-07-05 14:38:46 +05:30
Suraj Shetty	83f767b5a3	Merge pull request #18173 from karthikeyan5/develop-add-manufacturing-dashboards ... feat(manufacturing): added dashboard for doctypes	2019-07-05 14:22:13 +05:30
Govind S Menokee	473a5477b6	Merge pull request #3 from kaynes-technology/develop ... Merge develop	2019-07-05 13:33:25 +05:30
Shivam Mishra	7a7c66e95e	refactor: added throw if supplier is not default for any item	2019-07-05 13:06:53 +05:30
karthikeyan5	82e2bac891	fix(coding style): adding a few spaces	2019-07-05 12:41:19 +05:30
Rohit Waghchaure	cdb75b56c5	fix: removed item manaufacturer child table from item master	2019-07-05 12:24:14 +05:30
karthikeyan5	ad33c19510	fix: converting spaces to tabs on a few lines	2019-07-05 11:28:59 +05:30
Shivam Mishra	38b930b638	refactor: Move and Add buttons open new stock entry	2019-07-05 10:38:48 +05:30
karthikeyan5	830f2b642b	chore(manufacturing): added dashboard for doctypes	2019-07-05 09:48:38 +05:30
karthikeyan5	7fc6021ca5	feat(setup): adding selling buying filter in terms and conditions	2019-07-04 22:46:16 +05:30
rohitwaghchaure	2f67fb25a6	Merge pull request #18168 from netchampfaris/stock-validation-message ... fix: Add links in validation message	2019-07-04 19:13:08 +05:30
rohitwaghchaure	03db4c0efc	Merge pull request #18166 from netchampfaris/send-sms-bom ... fix: Don't show Send SMS in BOM	2019-07-04 19:11:42 +05:30
rohitwaghchaure	c1535a5542	Merge pull request #18167 from netchampfaris/manufacturing-module-sections ... fix(UX): Move Bill of Materials section to first	2019-07-04 19:11:08 +05:30
Faris Ansari	23c80658ba	fix: Add links in validation message	2019-07-04 18:54:04 +05:30
Faris Ansari	2b969a469a	fix: Build item cache in long worker (#18165)	2019-07-04 18:52:32 +05:30
Faris Ansari	1d3008750c	fix(UX): Move Bill of Materials section to first	2019-07-04 17:53:10 +05:30
Faris Ansari	a5d975d867	fix: Don't show Send SMS in BOM	2019-07-04 17:47:28 +05:30
deepeshgarg007	a9ea49c976	fix: Additonal discount not get set in sales transactions	2019-07-04 15:56:34 +05:30
Shivam Mishra	e528b29eea	Merge branch 'develop' of https://github.com/frappe/erpnext into remove-move-stock-summary	2019-07-04 13:46:30 +05:30
Mangesh-Khairnar	29734dae18	patch: reloads newly created docs in v12 (#18148)	2019-07-04 12:50:16 +05:30
Mangesh-Khairnar	100af0a635	fix(salary-slip): Nonetype error on amount calculation (#18147) ... * fix: amount calculation * Update salary_slip.py	2019-07-04 12:29:26 +05:30
Anurag Mishra	bdec7fea82	feat: purchase order against sales order (#17975) ... * feat: purchase order against sales order * fix: remove unwanted checks * fix:Related tests	2019-07-04 12:28:01 +05:30
Nabin Hait	7b684a01d3	fix: merge conflict	2019-07-04 12:06:50 +05:30
Mangesh-Khairnar	359a73e1aa	fix: invoice cancellation (#18152)	2019-07-04 11:37:20 +05:30
rohitwaghchaure	ca9d13cc9b	Merge pull request #18135 from rohitwaghchaure/all_default_values_not_moved_to_item_default_table_develop ... fix: as limit 100 was set in the query therefore not all item's default value moved to the Item Default table	2019-07-04 00:48:57 +05:30
Deepesh Garg	a37c51f93e	Merge pull request #18149 from deepeshgarg007/trial_balance_dimensions ... fix: Add filters for accounting dimensions in trial balance report	2019-07-03 22:00:25 +05:30
rohitwaghchaure	465196b0c7	Merge pull request #18155 from scmmishra/accounts-rec-report ... fix: format values for charts	2019-07-03 19:26:08 +05:30
Faris Ansari	76afcf4cba	fix: Honor price list in Shopping Cart Settings	2019-07-03 19:23:12 +05:30
Shivam Mishra	bb02c5105e	fix: format values for charts	2019-07-03 19:22:21 +05:30
deepeshgarg007	58b4644c1a	fix: Add filtesr for accounting dimensions in trial balance report	2019-07-03 18:08:41 +05:30
Deepesh Garg	e5f8d24ead	Merge pull request #18034 from rohitwaghchaure/payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss ... feat: payment reconciliation enhancements	2019-07-03 17:46:00 +05:30
Shivam Mishra	7dedd9a8cd	refactor: better error message when changing variant value (#18144)	2019-07-03 17:29:29 +05:30
Don-Leopardo	85e2fd965a	Merge branch 'develop' into fix_by_voucher_order_develop	2019-07-03 08:15:08 -03:00
Deepesh Garg	af4f7b4ea1	Merge branch 'develop' into payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss	2019-07-03 16:31:48 +05:30
Deepesh Garg	55fbddbee6	Add missing semicolon	2019-07-03 16:31:06 +05:30
Anurag Mishra	841d852f41	refactor: added missing translation functions (#18143) ... * fix: Translating Error and Messages * Update erpnext/controllers/item_variant.py Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com> * Update erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py Co-Authored-By: Shivam Mishra <scmmishra@users.noreply.github.com>	2019-07-03 15:15:08 +05:30
Deepesh Garg	824ad34270	Merge branch 'develop' into payment_reconciliation_enhancements_for_dr_or_cr_and_gain_or_loss	2019-07-03 13:28:49 +05:30
Deepesh Garg	8929c62113	Merge pull request #18145 from deepeshgarg007/gstr-itc-rev ... fix: Multiple fixes in GSTR-3b Report	2019-07-03 13:11:14 +05:30
Mangesh-Khairnar	80fb0bf520	fix: add employee leave balance report to the dashboard	2019-07-03 13:06:46 +05:30
Deepesh Garg	0891728705	Merge pull request #18142 from frappe/surajshetty3416-patch-1 ... refactor: Remove an unwanted debug flag	2019-07-03 12:18:30 +05:30
Mangesh-Khairnar	8d19faa598	Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management	2019-07-03 11:44:00 +05:30
rohitwaghchaure	f078031c60	fix: multiple minor issues in delayed order report (#18134)	2019-07-03 11:43:38 +05:30
Mangesh-Khairnar	0d4db95d99	fix: skip expired leaves on allocation end date	2019-07-03 11:35:51 +05:30
Deepesh Garg	1a6bfe986e	Merge pull request #18113 from deepeshgarg007/gstr1-total ... fix: Add total row in GSTR-1 report	2019-07-03 11:12:43 +05:30
Suraj Shetty	247d50e552	refactor: Remove unwanted debug flag	2019-07-03 10:47:35 +05:30
Nabin Hait	34c551d9a5	fix: Missing commits from hotfix branch (#17997) ... * fix: merge conflict * fix: restored missing set_gst_state_and_state_number function * fix: style linting as per codacy * fix: Fixes related to customer/lead merging * fix: merge conflict * fix: Fixes related to customer/lead merging * fix: Assign isue/opportunity to user * fix: Assign isue/opportunity to user * fix: Replaced Invoice type by GST Category * fix: merge conflict * fix: merge conflict * fix: test cases * fix: test cases	2019-07-03 10:34:31 +05:30
Don-Leopardo	46b21f88e1	Merge branch 'develop' into fix_by_voucher_order_develop	2019-07-02 14:03:45 -03:00
deepeshgarg007	723e76f2ac	fix: fix for test test_contact_search_in_foreign_language	2019-07-02 21:01:57 +05:30
Deepesh Garg	f866020f26	Merge branch 'develop' into gstr1-total	2019-07-02 19:59:53 +05:30
deepeshgarg007	3a83c7bd7d	fix: Multiple fixes in GSTR-3b Report	2019-07-02 19:56:33 +05:30
Nabin Hait	05fee62314	fix: inv status	2019-07-02 17:55:26 +05:30
Nabin Hait	3bbcd491e4	fix: set invoice status considering invoice discounting	2019-07-02 15:31:24 +05:30
Nabin Hait	126a02e208	fix: set invoice status considering invoice discounting	2019-07-02 15:28:57 +05:30
Rohit Waghchaure	09b44345df	fix: as limit 100 was set in the query therefore not all item's default value moved to the Item Default table	2019-07-02 15:18:02 +05:30
Frappe PR Bot	f773c8e8a3	feat: Updated translation (#18125)	2019-07-02 10:14:53 +05:30
Mangesh-Khairnar	98409159c8	Merge pull request #18120 from Mangesh-Khairnar/fix-leaderboard ... fix: leaderboard charts	2019-07-02 10:13:15 +05:30
Deepesh Garg	78a86af7fd	fix: Fiter passing fix in get batch query (#18131)	2019-07-02 10:10:55 +05:30
rohitwaghchaure	f949c5ddf7	Merge pull request #18104 from rohitwaghchaure/incorrect_value_of_accumualated_depreciation_in_the_sales_invoice_develop ... fix: incorrect value booked in the accumulated depreciation account on sell of the asset	2019-07-02 01:23:56 +05:30
Rohit Waghchaure	8847ecfe25	fix: incorrect value booked in the accumulated depreciation account on sell of the asset	2019-07-01 20:47:35 +05:30
Aditya Hase	8d70073cf8	refactor: Remove implicit auto assignment feature (#18124) ... This behaviour now can be replicated with Assignment Rule configurations.	2019-07-01 19:35:17 +05:30
Mangesh-Khairnar	fc3731f15e	Merge pull request #18107 from Mangesh-Khairnar/mapped_doc_fix ... fix: clear duplicates in mapped doc	2019-07-01 17:04:12 +05:30
Faris Ansari	8d2c996b50	feat: Call Popup and Exotel Integration (#17763) ... feat: Call Popup and Exotel Integration	2019-07-01 16:36:32 +05:30
Shivam Mishra	43cebdff4d	fix: translated title (#18119)	2019-07-01 11:01:28 +00:00
Nabin Hait	659a01d819	Update accounts_controller.py	2019-07-01 15:16:49 +05:30
Deepesh Garg	71359cc18b	Merge branch 'develop' into gstr1-total	2019-07-01 14:49:59 +05:30
Suraj Shetty	8e65d5bd5b	chore: Delete unwanted files	2019-07-01 14:32:29 +05:30
Suraj Shetty	b2e321686d	Merge branch 'develop' into call-summary-dialog	2019-07-01 14:29:49 +05:30
Suraj Shetty	56242a5077	Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog	2019-07-01 14:29:05 +05:30
Suraj Shetty	502565ff56	fix: Make required changes	2019-07-01 14:28:59 +05:30
Mangesh-Khairnar	4aed7cc310	Merge branch 'develop' into mapped_doc_fix	2019-07-01 13:40:52 +05:30
rohitwaghchaure	c77bd82083	Merge pull request #18118 from rohitwaghchaure/asset_staus_not_showing_in_the_listview ... fix: asset status not showing in the list view	2019-07-01 13:32:39 +05:30
Deepesh Garg	0cdf55033a	Merge branch 'develop' into gstr1-total	2019-07-01 12:36:35 +05:30
Rohit Waghchaure	7729fcea19	fix: asset status not shwoing in the list view	2019-07-01 12:26:34 +05:30
Mangesh-Khairnar	9955b189e4	fix: leaderboard chart	2019-07-01 12:20:09 +05:30
Rohit Waghchaure	2fa6224f8f	fix: accounts receivable / payable not working if the company is not seletced in filter	2019-07-01 11:55:12 +05:30
Suraj Shetty	edee06fc90	Merge branch 'develop' into call-summary-dialog	2019-07-01 11:05:59 +05:30
Himanshu	2d0fd9f519	fix: travis (#18116)	2019-07-01 10:24:02 +05:30
Suraj Shetty	1431bf2a3c	fix: User cannot create call log	2019-07-01 09:10:23 +05:30
Rucha Mahabal	162f7d1b50	auto email and new communication linked to email campaign setup	2019-07-01 01:09:58 +05:30
deepeshgarg007	cef54ae3c2	fix: Add total row in GSTR-1 report	2019-06-30 19:49:26 +05:30
Rucha Mahabal	dcf5fbd35d	added some validations	2019-06-30 16:36:09 +05:30
Rucha Mahabal	fc03509e46	created data structure for email automation	2019-06-30 16:24:29 +05:30
Suraj Shetty	19e4fde737	Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog	2019-06-30 15:30:59 +05:30
rohitwaghchaure	4c2eb0f13b	Merge pull request #17981 from rohitwaghchaure/added_include_default_finance_book_in_reports_develop ... fix: finance book filters includes the gl data which don't have finance book	2019-06-29 15:06:34 +05:30
rohitwaghchaure	ada1e4f0c4	Merge pull request #17962 from rohitwaghchaure/not_able_to_save_asset_for_manual_method_develop ... fix: not able to save asset if depreciation method is manual	2019-06-29 15:05:46 +05:30
Govind S Menokee	a596a7fd2b	feat: Add batch operation times in BOM Operation	2019-06-29 04:08:26 +05:30
Don-Leopardo	b2b5c3ac0a	Merge branch 'develop' into fix_by_voucher_order_develop	2019-06-28 19:36:25 -03:00
Himanshu Warekar	115da67713	fix: include standalone sla in issues	2019-06-28 22:26:58 +05:30
Himanshu	a917bec8da	Merge branch 'develop' into mapped_doc_fix	2019-06-28 19:46:00 +05:30
Himanshu Warekar	bc0bc6677e	fix: use db sql to delete property setter	2019-06-28 19:41:29 +05:30
Mangesh-Khairnar	e493490702	fix: mapped doc	2019-06-28 19:22:51 +05:30
Himanshu Warekar	c163b0de3d	Merge branch 'develop' of https://github.com/frappe/erpnext into issue-fix	2019-06-28 19:08:08 +05:30
Himanshu Warekar	5cec89d1ab	fix: remove frm call for priority change	2019-06-28 19:07:13 +05:30
rohitwaghchaure	42c8a4baa0	Merge pull request #18102 from adityahase/fix-buying-develop ... fix(buying): Translate label for "Supplier Addresses And Contacts" Report	2019-06-28 14:44:21 +05:30
Aditya Hase	d825ee57b7	fix(buying): Translate label for "Supplier Addresses And Contacts" Report	2019-06-28 14:40:59 +05:30
Himanshu	ea4c42d47b	fix(Utils): Do not add duplicate items (#17896) ... * fix: do not add duplicate items * Update erpnext/public/js/utils.js Co-Authored-By: Rohan <Alchez@users.noreply.github.com> * fix: compare warehouses, batch and qty for an item * fix: code fixes * Update utils.js * fix: check required_date and delivery_date * Update utils.js * fix: mixed tabs and spaces	2019-06-28 14:13:13 +05:30
Deepesh Garg	fb29ffc90c	fix: Usability fixes to Serial No and batch selector (#18071) ... * fix: Usability fixes to Serial No and batch selector * fix: Codacy * Update sales_common.js	2019-06-28 14:08:08 +05:30
Frappe PR Bot	a15d100cbd	feat: Updated translation (#17954)	2019-06-28 13:05:19 +05:30
KanchanChauhan	2433fb1596	feat: Terms and Conditions section in Blanket Order (#17991)	2019-06-28 12:54:12 +05:30
Deepesh Garg	dbe9a41389	feat: Confirmation to submit material request against Production Plan (#18062) ... * feat: Confirmation to submit material request against Production Plan * fix: Test cases for production plan * fix: Test Cases for production plan	2019-06-28 12:48:28 +05:30
Nabin Hait	f5aff98589	fix: Validate changes in batch, serial nos, val method fields (#18064)	2019-06-28 12:47:44 +05:30
Karthikeyan S	e6236094a6	fix(item): fix patch for barcode childtable migration in item (#18069) ... * fix(item): fix patch for barcode childtable migration in item (cherry picked from commit b2c43ee2d91599038f7bdf2038bbc4c4e7b36285) * fix(item): fixing broken patch item_barcode_childtable_migrate (cherry picked from commit beca677276e0b5b143cd6d1d08efa8529663f60c)	2019-06-28 12:46:42 +05:30
rohitwaghchaure	9dd7d3ebb3	fix: not able to make salary slip based on timesheet (#18088)	2019-06-28 12:40:52 +05:30
Mangesh-Khairnar	4000fb5bb8	fix: add a more descriptive message when no records are found (#18082) ... * fix: add a more descriptive message when no records are found * fix: translation by passing string to translation function	2019-06-28 12:38:40 +05:30
Don-Leopardo	c3f6bed650	Merge branch 'develop' into fix_by_voucher_order_develop	2019-06-27 18:09:19 -03:00
Don-Leopardo	a01d0a5311	Merge branch 'develop' into sales_analytics_with_order_type_develop	2019-06-27 18:09:09 -03:00
Himanshu Warekar	43e3dacba2	fix: remove whitelisted method	2019-06-28 00:00:48 +05:30
Himanshu Warekar	be0001ece6	fix: change to link field	2019-06-27 22:59:52 +05:30
Aditya Hase	ce9cdfb056	fix(ui): better message after creating serial numbers (#18093) ... fix(ui): better message after creating serial numbers	2019-06-27 18:20:13 +05:30
Aditya Hase	7f3ebb1d06	Merge branch 'develop' into stock-ledger-link	2019-06-27 18:19:15 +05:30
Aditya Hase	b9c9ada3f8	Merge pull request #18090 from scmmishra/twelve-fixes ... fix: print message for insufficient stock	2019-06-27 18:18:24 +05:30
Aditya Hase	a10912787c	fix: styling for sort selector (#18092) ... fix: styling for sort selector	2019-06-27 18:17:35 +05:30
Anurag Mishra	322eca61e6	fix: Wrong Casual Leave Opening in Employee Leave Balance Report ... fix: Wrong Casual Leave Opening in Employee Leave Balance Report	2019-06-27 17:00:55 +05:30
Shivam Mishra	c41403c8a9	fix: remove move and add buttons from stock summary	2019-06-27 16:34:38 +05:30
Shivam Mishra	0ec772194d	Merge branch 'develop' into page-sort-selector	2019-06-27 15:38:18 +05:30
Shivam Mishra	eeeccdb6da	Merge branch 'develop' into twelve-fixes	2019-06-27 15:37:58 +05:30
Shivam Mishra	0f67d22edd	Merge branch 'develop' into stock-ledger-link	2019-06-27 15:37:44 +05:30
Rushabh Mehta	09fed465fb	Merge pull request #18081 from Mangesh-Khairnar/fix-department ... fix: open department in tree view via awesome bar	2019-06-27 15:02:53 +05:30
Shivam Mishra	468d5563c6	fix: set serial numbers as data field	2019-06-27 14:13:54 +05:30
Shivam Mishra	e1aec5519b	fix(ui): better message after creating serial numbers	2019-06-27 13:14:41 +05:30
Shivam Mishra	bc777b1732	fix: styling for sort selector	2019-06-27 12:43:39 +05:30
Mangesh-Khairnar	3b60fac3b7	fix: open department in tree view via awesome bar	2019-06-27 11:43:22 +05:30
Shivam Mishra	9e07b7d2b8	Merge branch 'develop' into twelve-fixes	2019-06-27 09:44:41 +05:30
Himanshu Warekar	5ebdf76669	Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix	2019-06-27 01:29:25 +05:30
Himanshu Warekar	24b9d1e5a6	fix: patch fixes	2019-06-27 01:29:00 +05:30
Himanshu	6596f6e218	Merge branch 'develop' into sla_fix	2019-06-27 00:18:56 +05:30
Rohit Waghchaure	6de3ed5416	fix: dn test cases	2019-06-26 21:58:42 +05:30
Himanshu	27c1e844c7	Merge branch 'develop' into sla_fix	2019-06-26 18:24:29 +05:30
Faris Ansari	50644b5315	fix: Allow Rename in Issue Type (#18079) ... fix: Allow Rename in Issue Type	2019-06-26 17:51:30 +05:30
Faris Ansari	df7a6520b9	fix: Allow Rename in Issue Type	2019-06-26 16:57:33 +05:30
Himanshu	b134709aaf	Merge branch 'develop' into sla_fix	2019-06-26 16:36:51 +05:30
Karthikeyan S	48535e95e6	Fix(integrations): Adding Error Logs for Woocommerce (#18061) ... (cherry picked from commit ae255d6328b70b148d28d9a88a695932656bf276)	2019-06-26 13:41:49 +05:30
rohitwaghchaure	387ee8f511	fix: returned qty issue while making sales invoice from dn if same item added multiple times (#18076)	2019-06-26 13:40:26 +05:30
Rushabh Mehta	b8b506b105	Merge pull request #18072 from hrwX/att_gantt_fix_v12 ... fix(Attendance): Attendance gantt fix	2019-06-26 13:36:37 +05:30
Faris Ansari	2ab8d3ebcc	fix: Move links to appropriate section (#17999) ... * fix: Move links to appropriate section * fix: New section Accounting Entries	2019-06-26 13:32:41 +05:30
Faris Ansari	fbc861320f	fix: Don't append None values in against_account (#18031)	2019-06-26 13:31:31 +05:30
Anurag Mishra	0181eb0652	fix: removed unused function	2019-06-26 13:26:50 +05:30
Anurag Mishra	8a6255078b	fix: wrong Casual Leave opening	2019-06-26 13:22:34 +05:30
Himanshu	9323c3ae29	Merge branch 'develop' into sla_fix	2019-06-26 12:54:08 +05:30
Himanshu Warekar	d48b2ac126	fix: attendance gantt fix	2019-06-26 11:37:49 +05:30
Mangesh-Khairnar	8c621ab90c	fix: precision for certain calculations in buying controller (#18008) ... * fix: precision for certain numbers * fix: check precision of the received_qty * Update buying_controller.py	2019-06-26 11:10:17 +05:30
Deepesh Garg	ea0574679f	fix: Removed submitted status from Quotation (#18055) ... * fix: Change in list view and status updater * fix: Change status in doctype * fix: Patch for submitted status	2019-06-26 11:05:51 +05:30
Mangesh-Khairnar	07aae76bbf	fix: change the department to tree view (#18057)	2019-06-26 11:03:57 +05:30
Nabin Hait	40d25f4010	fix: Show close button if per_ordered is less than 99.999999 (#18067)	2019-06-26 10:57:45 +05:30
Shivam Mishra	9479f7f1ef	fix: print message for insufficient stock	2019-06-26 10:37:00 +05:30
rohitwaghchaure	b98e825ceb	Merge pull request #18060 from adityahase/fix-sales-funnel ... fix(sales-funnel): Use frappe.Chart() instead of Chart()	2019-06-25 21:36:26 +05:30
Himanshu	bd3ccad513	Merge branch 'develop' into sla_fix	2019-06-25 21:14:52 +05:30
Aditya Hase	2caaa1b03d	fix(sales-funnel): Remove duplicate code	2019-06-25 17:17:38 +05:30
Aditya Hase	10562b67fc	fix(sales-funnel): Use frappe.Chart() instead of Chart()	2019-06-25 17:07:41 +05:30
rohitwaghchaure	2b6cb6160f	Merge pull request #18042 from rohitwaghchaure/closed_job_opening_disaplying_in_job_applicant ... fix: Closed job opening disaplying in job applicant	2019-06-25 16:51:03 +05:30
Himanshu Warekar	6931ea68a2	Merge sla_fix into sla_fix	2019-06-25 16:27:58 +05:30
Himanshu Warekar	2373c095ed	Merge develop into sla_fix	2019-06-25 16:27:06 +05:30
Himanshu Warekar	99d46844d5	fix: minor patch fix	2019-06-25 16:25:51 +05:30
rohitwaghchaure	f9de144f07	Merge pull request #18045 from deepeshgarg007/accounts_controller_develop ... fix: Float division by zero error handling in group similar item	2019-06-25 15:25:42 +05:30
rohitwaghchaure	827ac1e291	Merge pull request #18040 from Mangesh-Khairnar/fix-price-list ... fix(price list): change the field name	2019-06-25 15:23:44 +05:30
rohitwaghchaure	8aff023abe	Merge pull request #18049 from deepeshgarg007/rounded_total_develop ... fix: Currency symbol fix for rounded total	2019-06-25 15:14:34 +05:30
sahil28297	b056595029	Merge branch 'develop' into fix_bom_exploded_item	2019-06-25 14:12:23 +05:30
Deepesh Garg	cc0bebacd2	Merge branch 'develop' into accounts_controller_develop	2019-06-25 13:15:42 +05:30
Himanshu	ce7603acc5	Merge branch 'develop' into sla_fix	2019-06-25 11:48:41 +05:30
Rohit Waghchaure	a64e4037d2	fix: revert changes of bom recursion	2019-06-25 07:08:59 +05:30
deepeshgarg007	ab13192dd4	fix: Currency symbol fix for rounded total	2019-06-24 21:22:52 +05:30
Don-Leopardo	fb2a05cb3f	Merge branch 'develop' into fix_by_voucher_order_develop	2019-06-24 11:29:28 -03:00
Don-Leopardo	54b9fd5bef	Merge branch 'develop' into sales_analytics_with_order_type_develop	2019-06-24 11:29:23 -03:00
Himanshu	0e26deb463	Merge branch 'develop' into sla_fix	2019-06-24 19:30:36 +05:30
deepeshgarg007	e8d21cd8fa	fix: Division by zero error fix in group similar item	2019-06-24 18:49:24 +05:30
Rohit Waghchaure	78d6086739	fix: Closed job opening disaplying in job applicant	2019-06-24 18:05:10 +05:30
rohitwaghchaure	55c9eb6d9e	Merge pull request #18037 from rohitwaghchaure/bom_update_tool_optimization ... fix: optimize bom update tool	2019-06-24 18:00:17 +05:30
Mangesh-Khairnar	558a5c199f	fix(price list): change the field name	2019-06-24 17:32:04 +05:30
NahuelOperto	42fe68d065	feat: order type in trr type filter	2019-06-24 08:29:14 -03:00
Himanshu Warekar	4538658d02	Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix	2019-06-24 15:22:25 +05:30
Himanshu Warekar	54ece39aef	fix: review changes	2019-06-24 15:18:56 +05:30
karthikeyan5	eadc144477	fix(HR): fixing bug introduced during merge conflict resolution. ... > while merging with https://github.com/frappe/erpnext/pull/17837	2019-06-24 15:15:38 +05:30
karthikeyan5	82256bc58b	fix(hr): Auto Attendance ... > fixing minor bug in shift calculation > adding 'Mark Auto Attendance' button in shift and related fixes > changed employee checkin naming series > added aditional validation for employee checkin > added/updated dashboard for Attendance, Employee, Shift Type	2019-06-24 15:15:38 +05:30
karthikeyan5	32197355ad	rename(HR): Employee Attendance Log DocType to Employee Checkin	2019-06-24 15:15:38 +05:30
karthikeyan5	e0c5176383	refactor(HR): Auto Attendance ... > moved all auto attendance settings from HR Settings to shift > added shift in attendance and Employee Attendance Log > reordered and cleaned up fields in HR Settings and Employee DocType	2019-06-24 15:15:38 +05:30
karthikeyan5	66e459b35d	fix(auto attendance): changes as requested in review ... > removed unused field from shift assignment > renamed 'biometric_rf_id' to 'attendance_device_id' > added more test cases > few other minor changes after demo	2019-06-24 15:15:38 +05:30
karthikeyan5	23cedfd6c8	feat(HR): Auto Attendance ... >Marking attendance based on Employee Attendance Log	2019-06-24 15:15:38 +05:30
karthikeyan5	ceea328542	fix(HR): validations and bug fixes for Attendance Log	2019-06-24 15:15:38 +05:30
karthikeyan5	a4d0ba222b	fix(HR): changes as per PR review ... > renamed 'Employee Checkin Log' DocType to 'Employee_attendance_log' DocType > renamed biometric_id to biometric_rf_if	2019-06-24 15:15:38 +05:30
karthikeyan5	e4bbda6ff5	feat(HR): Added Employee CheckIn Log ... > Employee CheckIn Log can be used to store IN/OUT Logs of employees from biometric/RFID devices. >added biometric_id in the Employee Doctype	2019-06-24 15:15:38 +05:30
Rohit Waghchaure	1777e60dc2	fix: test case for payment terms in quotation	2019-06-24 14:11:06 +05:30
Rohit Waghchaure	d95909c39a	fix: optimize bom update tool	2019-06-24 12:57:44 +05:30
Rohit Waghchaure	a2408a63da	feat: payment reconciliation enhancements	2019-06-24 02:11:51 +05:30
Himanshu Warekar	3780508ec5	Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix	2019-06-24 00:33:01 +05:30
Himanshu Warekar	de8c38f0fe	fix: datetime import	2019-06-24 00:31:33 +05:30
Himanshu	3ec19b7afa	Merge branch 'develop' into sla_fix	2019-06-23 23:22:53 +05:30
sahil28297	9a6517f8f0	fix(BOM): update modified field	2019-06-23 20:06:18 +05:30
Himanshu Warekar	d70c656142	Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix	2019-06-21 22:57:34 +05:30
Himanshu Warekar	d1ca820e1e	fix: add function for timedelta conversion	2019-06-21 22:57:06 +05:30
NahuelOperto	4448e2d66b	fix order in general ledger	2019-06-21 08:50:37 -03:00
Sahil Khan	aef77058b6	fix(BOM): set default value of include_exploded_item to 0	2019-06-21 11:37:45 +05:30
Rushabh Mehta	41721fe1c3	Merge pull request #17390 from ashish-greycube/develop_copy_payment_schedule_from_quot_to_SO ... fix: copy_payment_schedule_from_quot_to_SO	2019-06-21 09:19:20 +05:30
Aditya Hase	2f4f9a2af0	Merge branch 'develop' into not_able_to_save_asset_for_manual_method_develop	2019-06-21 06:11:13 +05:30
Mangesh-Khairnar	bd999b0908	fix: minor changes	2019-06-21 00:49:48 +05:30
Himanshu	c26ce5c506	Merge branch 'develop' into sla_fix	2019-06-20 23:58:08 +05:30
Himanshu Warekar	f5262c54ff	Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix	2019-06-20 23:30:20 +05:30
Himanshu Warekar	9f19a82ec9	fix: scheduling bug if out of bussiness hours	2019-06-20 23:29:56 +05:30
Aditya Hase	9986155e8e	chore: Python 3 Tests on Travis (#18012) ... chore: Python 3 Tests on Travis	2019-06-20 22:53:23 +05:30
rohitwaghchaure	8b7267eb60	Merge pull request #17921 from Mangesh-Khairnar/expense-claim ... feat: Tax based expense claim	2019-06-20 22:02:52 +05:30
Aditya Hase	d4aea67517	Merge branch 'develop' into py3-2	2019-06-20 21:22:24 +05:30
Aditya Hase	c980143764	fix(test): Explicitly search for Material Request Item with Item Code	2019-06-20 21:15:55 +05:30
Aditya Hase	bb5ca5a01f	fix(py3): Convert filter to list	2019-06-20 20:10:53 +05:30
Deepesh Garg	d11e481888	Merge pull request #18011 from surajshetty3416/fix-accounting-dimension-permission ... fix: Get Accounting Dimension only if user has read permission on it	2019-06-20 19:44:59 +05:30
rohitwaghchaure	d2061b44dd	fix: could not find company all (#17978)	2019-06-20 19:13:54 +05:30
Deepesh Garg	23deb6f79b	fix: Default cost center fix for delivery note item (#17990)	2019-06-20 19:11:58 +05:30
Suraj Shetty	01f56b867e	fix: Return empty array to avoid failure	2019-06-20 18:07:58 +05:30
Suraj Shetty	b663966c68	fix: Use can_read API	2019-06-20 18:00:19 +05:30
Rushabh Mehta	55c7b69afb	Merge pull request #17998 from netchampfaris/app-logo-url ... fix: App logo URL	2019-06-20 17:53:40 +05:30
Deepesh Garg	ffa4ba06ec	Merge pull request #18010 from deepeshgarg007/gst_tax_rate_fixes ... fix: GST report fixes	2019-06-20 17:22:59 +05:30
Suraj Shetty	da629810ad	fix: Get accounting dimensions only if user has access	2019-06-20 17:20:19 +05:30
deepeshgarg007	6ef38ebf34	fix: GSTR report fixes	2019-06-20 15:55:09 +05:30
deepeshgarg007	50f4fc48a5	fix: GSTR report fixes	2019-06-20 15:53:14 +05:30
deepeshgarg007	5ff830b6f4	fix: GSTR report fixes	2019-06-20 15:50:02 +05:30
deepeshgarg007	a8e49b8afd	Revert "fix: GSTR-2 Report fixes" ... This reverts commit a55413cb0d3828c20ad53e54ad7abe3ca2492668.	2019-06-20 15:26:04 +05:30
deepeshgarg007	7483cb49fe	Revert "fix: GSTR-1 Report fixes" ... This reverts commit 7592e0b588ad72d3e79cd101e94102ab1c1829f0.	2019-06-20 15:25:06 +05:30
Rushabh Mehta	5162b7457f	Merge pull request #17918 from Alchez/develop-item-code-gen ... fix(stock): Remove hardcoded validation for Item	2019-06-20 14:21:57 +05:30
Mangesh-Khairnar	8619fc7413	fix: fetch rate only if field is empty	2019-06-20 12:02:47 +05:30
Himanshu	014dc1729d	Merge branch 'develop' into sla_fix	2019-06-20 11:36:29 +05:30
Faris Ansari	23f9b6156f	fix(Opportunity): Don't assign to Guest (#17996) ... If Opportunity is created from Website, it breaks because the assign_to user is Guest	2019-06-20 11:34:14 +05:30
Himanshu Warekar	a1c1f74d84	Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix	2019-06-20 11:33:06 +05:30
Himanshu Warekar	a03aa0014e	feat: update sla using custom script	2019-06-20 11:32:49 +05:30
Aditya Hase	903d5201b4	fix(tests): Do not test order of features in Location (#17983) ... fix(tests): Do not test order of features in Location	2019-06-20 11:29:59 +05:30
Himanshu	d82175da36	Merge branch 'develop' into sla_fix	2019-06-20 10:54:01 +05:30
Himanshu Warekar	bbe84ac0ef	feat: change apply_to to entity	2019-06-20 10:53:34 +05:30
Himanshu Warekar	ed50452800	Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix	2019-06-20 10:01:05 +05:30
Himanshu Warekar	41bf0c6855	feat: filter sla based on customer in issue	2019-06-20 10:00:11 +05:30
Aditya Hase	b96956f35c	Merge branch 'develop' into fix-timesheet-tests	2019-06-20 09:40:23 +05:30
Deepesh Garg	12f2096846	Merge pull request #17995 from deepeshgarg007/hsn_summary_develop ... fix: From date and to date filters in HSN wise summary of out ward supplies	2019-06-19 21:48:15 +05:30
Faris Ansari	357592f55e	fix: Remove logo replace logic	2019-06-19 19:17:50 +05:30
Faris Ansari	4a1c7ddb09	fix: App logo URL	2019-06-19 19:15:37 +05:30
Aditya Hase	6a40c491df	Merge branch 'develop' into fix-location-tests	2019-06-19 18:50:00 +05:30
deepeshgarg007	ecc670047e	fix: From date and to date filters in HSN wise summary of out ward supplies	2019-06-19 18:36:24 +05:30
Suraj Shetty	16baa3b13a	fix: Move back .pylintrc to root	2019-06-19 18:35:36 +05:30
Suraj Shetty	d4420afb72	chore: Remove unwanted files	2019-06-19 18:33:56 +05:30
Deepesh Garg	2b739b304e	Merge pull request #17970 from Mangesh-Khairnar/employee-benefit-application ... fix(employee-benefit-application): remove query from setup	2019-06-19 18:18:47 +05:30
Mangesh-Khairnar	0ef1df72ad	refactor: fetch rate directly from the account head	2019-06-19 17:50:33 +05:30
Himanshu	3caf7b80e5	Merge branch 'develop' into sla_fix	2019-06-19 16:08:35 +05:30
rohitwaghchaure	d849ce7ce0	Merge pull request #17980 from adityahase/fix-buying-items-rate ... fix: Consider discount_amount only when provided to calculate rate	2019-06-19 14:47:06 +05:30
Himanshu Warekar	24cef8e26e	Merge branch 'sla_fix' of https://github.com/hrwx/erpnext into sla_fix	2019-06-19 14:43:59 +05:30
Himanshu Warekar	36d6e570c4	patch: try catch to handle TableMissingError	2019-06-19 14:43:21 +05:30
rohitwaghchaure	40c5fcc9cc	Merge pull request #17967 from Alchez/develop-delivery-email ... fix(delivery): Add items to context for dispatch notification email	2019-06-19 14:37:23 +05:30
Himanshu	7bb1402a37	Merge branch 'develop' into sla_fix	2019-06-19 13:42:49 +05:30
Mangesh-Khairnar	439313e524	Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management	2019-06-19 13:10:53 +05:30
Mangesh-Khairnar	12a2b21465	fix: track status for pending leaves	2019-06-19 13:00:52 +05:30
Faris Ansari	2632107129	fix: User MultiSelectList control for Party filter (#17943) ... * fix: User MultiSelectList control for Party filter The comma based filter wouldn't work for values that had comma in them * fix: Replace with MultiSelectList in reports * fix: Parse json instead of string split	2019-06-19 12:15:37 +05:30
Himanshu Warekar	f4f7e781c5	debug: travis	2019-06-19 12:01:59 +05:30
Aditya Hase	645afe16c3	fix(tests): Do not test order of features in Location	2019-06-18 23:01:20 +05:30
Aditya Hase	be8a46a92a	fix(tests): Timesheet tests	2019-06-18 21:50:05 +05:30
Rohit Waghchaure	5f9793e081	fix: finance book filters includes the gl data which don't have finance book	2019-06-18 21:09:52 +05:30
Himanshu Warekar	2724de9320	Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix	2019-06-18 20:02:26 +05:30
Himanshu Warekar	e48ca44bf5	patch: fix typo	2019-06-18 20:02:00 +05:30
Himanshu Warekar	7881e838c6	patch: refactor patch for travis test	2019-06-18 19:35:50 +05:30
Aditya Hase	48585c94ff	fix: Consider discount_amount only when provided to calculate rate ... After selecting item_code in items table and not entering rate, Clicking elsewhere will set rate to NaN. All DocTypes on buying side have this bug.	2019-06-18 19:11:17 +05:30
Himanshu Warekar	befd393dcb	fix: patch	2019-06-18 12:51:12 +05:30
rohitwaghchaure	226ff5a797	Merge pull request #17964 from rohitwaghchaure/bank_guarantee_project_not_found_error_develop ... fix: bank guarantee, not able to select the purchase order	2019-06-18 11:31:01 +05:30
Suraj Shetty	5b52aba8df	Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog	2019-06-18 11:28:20 +05:30
Suraj Shetty	a28b96493f	fix: Make field labels translatable	2019-06-18 11:28:14 +05:30
Suraj Shetty	a367a85a78	Merge branch 'develop' into call-summary-dialog	2019-06-18 11:09:29 +05:30
Suraj Shetty	9ba9a91631	fix: Strip leading zero from phone number	2019-06-18 10:56:47 +05:30
Deepesh Garg	c38e0bb75c	Merge pull request #17959 from deepeshgarg007/dimension-fixes ... fix: Is group filter fixes in dimensions	2019-06-18 08:37:32 +05:30
Himanshu Warekar	7c18f69727	Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix	2019-06-17 23:53:01 +05:30
Himanshu Warekar	0ad3887d51	patch: fixes	2019-06-17 23:52:53 +05:30
deepeshgarg007	946eefe039	fix: Codacy fixes	2019-06-17 23:10:36 +05:30
Mangesh-Khairnar	7293a98a10	fix: change formatting	2019-06-17 19:03:46 +05:30
Mangesh-Khairnar	9ee5c8a4c6	fix(employee-benefit-application): remove query from setup	2019-06-17 18:07:10 +05:30
Himanshu Warekar	bdf9737d73	patch: reload service level priority	2019-06-17 18:00:57 +05:30
Anurag Mishra	3d47a6dbb5	fix: Company filters in Total Stock Summary Report (#17965)	2019-06-17 17:49:04 +05:30
rohitwaghchaure	cfcf7ae7b6	Merge pull request #17960 from rohitwaghchaure/delayed_order_reports ... feat: delayed order reports	2019-06-17 17:42:18 +05:30
Rohit Waghchaure	4803e817e9	fix: bank guarantee, not able to select the purchase order	2019-06-17 17:40:40 +05:30
Rushabh Mehta	803f784351	fix(minor): format date in user format for accounting dashboard	2019-06-17 17:33:24 +05:30
rohitwaghchaure	fdb79063a0	Merge pull request #17969 from rohitwaghchaure/enabled_disabled_buttons_on_change_of_pos_profile_develop ... fix: allow edit is enabled in the pos profile still user not able to edit the rates	2019-06-17 17:24:29 +05:30
Rohit Waghchaure	7efeffa66a	fix: allow edit is enabled in the pos profile still user not able to edit the rates	2019-06-17 16:20:32 +05:30
Rohan Bansal	4babfdb987	fix(delivery): Add more context for dispatch notification email + formatting fixes	2019-06-17 16:16:51 +05:30
Mangesh-Khairnar	57f4e817f8	Merge branch 'develop' into company_ui/ux_fix	2019-06-17 15:36:45 +05:30
deepeshgarg007	dfe006be19	Merge branch 'develop' of https://github.com/frappe/erpnext into dimension-fixes	2019-06-17 15:26:05 +05:30
Suraj Shetty	04d623ab66	fix: Get employee login ids directly from child table	2019-06-17 15:20:28 +05:30
Suraj Shetty	db26191937	Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog	2019-06-17 14:17:26 +05:30
Suraj Shetty	8b95b61aa0	fix: Remove unwanted code	2019-06-17 14:17:21 +05:30
Rohit Waghchaure	b5f94e5f71	fix: not able to save asset if depreciation method is manual	2019-06-17 13:34:44 +05:30
Faris Ansari	2e968ece1a	Delete test_call_log.py	2019-06-17 13:03:44 +05:30
Faris Ansari	520c403a05	Delete call_log.js	2019-06-17 13:02:49 +05:30
Suraj Shetty	ec6afbbe99	Merge pull request #17953 from netchampfaris/website-theme-import ... fix: Add erpnext website theme import	2019-06-17 12:56:24 +05:30
Rohit Waghchaure	725f56faca	feat: delayed order reports	2019-06-17 12:50:44 +05:30
deepeshgarg007	d1e0f42fea	fix: Styling fix	2019-06-17 12:47:39 +05:30
deepeshgarg007	7e3a98ba33	fix: Is group filter fixes in dimensions	2019-06-17 12:44:49 +05:30
Suraj Shetty	93fc6004ad	Merge pull request #17942 from netchampfaris/product-page-cart-disabled ... fix: Show product page even if cart is not enabled	2019-06-17 12:36:09 +05:30
Suraj Shetty	f821b18a82	Merge pull request #17951 from netchampfaris/product-page-specification ... fix: Remove Specifications label	2019-06-17 12:32:58 +05:30
Rohan Bansal	0426636a32	fix(customer): Improve performance by reducing queries	2019-06-17 12:16:12 +05:30
Himanshu Warekar	67f9b63793	patch: get priority before reload_doc	2019-06-17 11:49:02 +05:30
Suraj Shetty	340ccb6c96	fix: Remove unwanted code	2019-06-17 10:16:38 +05:30
Himanshu Warekar	199b43dbbb	fix: patch fixes for sla	2019-06-17 09:35:34 +05:30
Suraj Shetty	a86a07ef37	fix: Add additional check to ensure doc_before save exists	2019-06-17 09:29:46 +05:30
Suraj Shetty	eb0ca67ced	fix: Caller name in call popup	2019-06-17 08:59:12 +05:30
Suraj Shetty	5ea6a5e33a	fix: Decouple call popup from exotel	2019-06-17 08:46:38 +05:30
Himanshu Warekar	c58d0317a4	Merge branch 'develop' of https://github.com/frappe/erpnext into sla_fix	2019-06-17 08:43:36 +05:30
Suraj Shetty	3fdeffff7a	feat: Add medium field in call log doctype	2019-06-17 08:27:00 +05:30
Suraj Shetty	be1dddd596	feat: Add call recording URL field to call log	2019-06-17 08:06:14 +05:30
Rohit Waghchaure	b821af44b6	fix: revert group by voucher general ledger changes	2019-06-17 07:42:53 +05:30
Deepesh Garg	7793df885b	Merge pull request #17947 from deepeshgarg007/gstr-3b-pos-fixes ... fix: GSTR-3b Report fixes	2019-06-16 20:03:48 +05:30
Himanshu Warekar	b9ddcc4bfa	Merge develop into sla_fix	2019-06-15 13:09:57 +05:30
Faris Ansari	8e99aaf605	fix: Add erpnext website theme import	2019-06-14 20:06:54 +05:30
Faris Ansari	b2ab1031e3	fix: Show Clear filters when attribute filters are set	2019-06-14 18:16:14 +05:30
Faris Ansari	22642a5f45	fix: Homepage products styling (#17912)	2019-06-14 18:15:40 +05:30
rohitwaghchaure	7ae0f25f11	Merge pull request #17952 from rohitwaghchaure/added_promotional_scheme_in_selling_buying ... fix: added promotional scheme in selling and buying module page	2019-06-14 17:31:43 +05:30
Rohit Waghchaure	1ecc78266c	fix: added promotional scheme in selling and buying module page	2019-06-14 17:31:15 +05:30
Rohit Waghchaure	059890ecef	Test cases for batch no	2019-06-14 17:24:47 +05:30
Faris Ansari	f472a49cf6	fix: Remove Specifications label	2019-06-14 16:32:21 +05:30
Mangesh-Khairnar	1db0fc91a5	fix: check generated ledger entries to avoid overlap	2019-06-14 15:48:31 +05:30
Mangesh-Khairnar	fefdac432c	refactor: add json changes	2019-06-14 15:39:50 +05:30
Mangesh-Khairnar	24fbe23c8d	fix: add indicators for expire in the leave allocation list	2019-06-14 15:36:26 +05:30
Anurag Mishra	a5527225b6	fix: requested changes	2019-06-14 15:26:19 +05:30
Mangesh-Khairnar	87adaed933	fix: generate ledger entries for all leave transactions	2019-06-14 15:13:53 +05:30
deepeshgarg007	37a717aa98	fix: Seperate queries for Taxable value and tax amounts	2019-06-14 14:30:36 +05:30
Anurag Mishra	e87ebcaf04	fix: upadated employee dashboard	2019-06-14 14:10:48 +05:30
Anurag Mishra	0ae6cbdd01	fix: requested Changes	2019-06-14 14:10:48 +05:30
Anurag Mishra	e6dd55d9f2	feat: dashboards for HR module	2019-06-14 14:10:47 +05:30
rohitwaghchaure	6f6a1c8908	Merge pull request #17946 from Anurag810/make_stock_entry_against_purchase_receipt_3 ... feat: Creating stock entry against purchase receipt and some minor fixes	2019-06-14 13:32:22 +05:30
deepeshgarg007	c62518c094	Merge branch 'develop' of https://github.com/frappe/erpnext into gstr-3b-pos-fixes	2019-06-14 13:14:51 +05:30
deepeshgarg007	8f04f6c631	fix: GSTR-3b Report fixes	2019-06-14 13:08:09 +05:30
Anurag Mishra	4c1639305f	feat: creating stock entry against purchase receipt	2019-06-14 12:31:08 +05:30
Deepesh Garg	b095d0a0c5	fix: GSTR-2 Report fixes (#17903)	2019-06-14 12:02:36 +05:30
Deepesh Garg	459155fae1	fix: GST Validation for UIN and OIDAR (#17866) ... * fix: GST Validation for UIN and OIDAR * fix: Define GST category * fix: Get gst category only for Customer and Supplier * fix: GST validation * fix: GST validation fixes	2019-06-14 12:01:34 +05:30
Rushabh Mehta	35bb7b8761	Merge pull request #17369 from alyf-de/datev_report ... feat(regional): Report for German tax consultants (DATEV)	2019-06-14 12:00:04 +05:30
rohitwaghchaure	a030138df8	fix: trial balance opening balance not showing in the debit side for the liability account (#17944)	2019-06-14 11:57:14 +05:30
Anurag Mishra	122cdaf87b	fix: column width (#17935)	2019-06-14 11:29:18 +05:30
Anurag Mishra	88cd502841	fix: company form (#17939)	2019-06-14 11:26:29 +05:30
Saurabh	0d50523723	Merge pull request #17941 from nabinhait/salary-slip-amount-dev ... fix: salary slip amount calculation based on formula	2019-06-14 11:19:31 +05:30
Mangesh-Khairnar	6726dea88b	style: change formatting	2019-06-14 11:17:17 +05:30
Mangesh-Khairnar	4e1b60d401	style: change formatting	2019-06-14 11:15:54 +05:30
Rushabh Mehta	b74454e501	Merge pull request #17894 from deepeshgarg007/serial_no_batch_selector_develop ... fix: Available qty not shown in item batch selector for batch	2019-06-14 10:51:34 +05:30
Nabin Hait	a2caf884fe	fix: salary slip amount calculation based on formula	2019-06-13 19:44:21 +05:30
Mangesh-Khairnar	f8bf57c956	fix: remove transaction section head	2019-06-13 18:09:23 +05:30
Shivam Mishra	1b5a54900c	Merge pull request #17933 from Anurag810/billing_summary_fixes ... fix: column sequence and add total hours	2019-06-13 17:26:56 +05:30
Suraj Shetty	7877ef22ba	Merge branch 'call-summary-dialog' of github.com:surajshetty3416/erpnext into call-summary-dialog	2019-06-13 17:13:59 +05:30
Suraj Shetty	06f8034542	refactor: Remove redundant code	2019-06-13 17:13:54 +05:30
rohitwaghchaure	da0d056a06	Merge pull request #17924 from rohitwaghchaure/cost_center_added_in_the_opening_invoice_creation ... feat: added cost center in the opening invoice creation tool	2019-06-13 16:27:18 +05:30
rohitwaghchaure	95c88a5e95	Merge pull request #17932 from rohitwaghchaure/fixed_pos_not_overriding_the_taxes_develop ... fix: taxes are not overriding after changing the tax template for the POS invoice	2019-06-13 16:26:11 +05:30
Shivam Mishra	4def9836e0	Merge branch 'develop' into bom-item-fix	2019-06-13 16:17:54 +05:30
Anurag Mishra	05c17a505c	fix: column sequence and add total	2019-06-13 16:08:01 +05:30
Rohit Waghchaure	033ed93586	fix: taxes are not overriding after changing the taxes template	2019-06-13 15:47:42 +05:30
Rohan Bansal	e3a3306b30	feat(customer): Add report to show item prices per Customer	2019-06-13 14:53:33 +05:30
Mangesh-Khairnar	b2f266ad10	fix: get bom item when company is not passed	2019-06-13 14:34:40 +05:30
Faris Ansari	00578ba632	fix: Show product page even if cart is not enabled	2019-06-13 13:30:39 +05:30
Rohit Waghchaure	02ae934d5c	feat: added cost center in the opening invoice creation tool	2019-06-13 12:00:30 +05:30
Deepesh Garg	0d7d4879a9	Merge pull request #17920 from Anurag810/stock_balance_report ... fix: fetch item on the base of item group	2019-06-13 10:49:30 +05:30
Mangesh-Khairnar	0a3ed374cd	test: validate tax based expense claim gl entries	2019-06-12 20:03:22 +05:30
Anurag Mishra	bbe2c4fb01	fix: fetch item on the base of item group	2019-06-12 19:09:51 +05:30
Mangesh-Khairnar	a1d354e147	feat: add grand total field	2019-06-12 18:18:38 +05:30
Rohan Bansal	ddea50fa22	fix(stock): Remove hardcoded validation for Item	2019-06-12 17:59:23 +05:30
Deepesh Garg	a3c0d2768e	Merge branch 'develop' into serial_no_batch_selector_develop	2019-06-12 17:21:23 +05:30
Shivam Mishra	d9aabb83cd	Merge branch 'develop' into lms-link-fix	2019-06-12 17:21:05 +05:30
Shivam Mishra	b94b1febee	refactor: topic card redirects to login	2019-06-12 17:20:33 +05:30
Rushabh Mehta	26dba8bb89	Merge pull request #17801 from deepeshgarg007/dashboards ... fix: Dashboards for doctypes in accounts module	2019-06-12 17:15:58 +05:30
Suraj Shetty	16fc5189d1	Merge branch 'develop' into call-summary-dialog	2019-06-12 17:13:13 +05:30
sahil28297	deef0908d7	Merge branch 'develop' into education-test-fixes	2019-06-12 16:59:58 +05:30
Shivam Mishra	147d5d9bf2	fix: redirect to lms home if query params not set	2019-06-12 16:01:02 +05:30
Deepesh Garg	9c3d2eeb1f	Merge branch 'develop' into serial_no_batch_selector_develop	2019-06-12 15:54:44 +05:30
Shivam Mishra	3264822c1c	test: fixed unknown column course_name	2019-06-12 15:43:36 +05:30
Suraj Shetty	12cd4bcd71	Merge branch 'develop' into call-summary-dialog	2019-06-12 15:43:19 +05:30
Shivam Mishra	44f98a9a4b	fix: back to course button	2019-06-12 15:22:42 +05:30
Shivam Mishra	8af1e87e83	fix: card imqge not visible for courses	2019-06-12 15:16:26 +05:30
Shivam Mishra	278ef4bf73	fix: template fix for null_card	2019-06-12 14:53:00 +05:30
Shivam Mishra	a99d3a844f	test: fix fixtures for program and course	2019-06-12 14:32:27 +05:30
Suraj Shetty	a7ac218584	Merge branch 'develop' into call-summary-dialog	2019-06-12 13:28:41 +05:30
Mangesh-Khairnar	444313bdfc	feat: change the claim amount in expenses to amount	2019-06-12 12:52:02 +05:30
Shivam Mishra	28b2da7850	Merge branch 'develop' into lms-patch-4	2019-06-12 12:51:53 +05:30
Shivam Mishra	8df7e1c215	fix: templates for cards	2019-06-12 12:50:38 +05:30
Shivam Mishra	147cd1035e	Merge branch 'develop' into lms-patch-3	2019-06-12 12:44:12 +05:30
Shivam Mishra	d9e68c9f69	refactor: remove course name field from ProgramCourse	2019-06-12 12:43:22 +05:30
Shivam Mishra	490d2e0357	Merge branch 'develop' into lms-acad-fixes	2019-06-12 12:40:30 +05:30
Shivam Mishra	a9508862b2	refactor: doctype settings for lms	2019-06-12 12:39:12 +05:30
Saurabh	ccbf646a4d	Merge pull request #17904 from deepeshgarg007/patch_fix ... fix(patch): Fix breaking patch on develop branch	2019-06-12 12:33:38 +05:30
Kenneth Sequeira	add002bb0f	fix: Make Travel Request Document Submittable (#17874) ... * make travel request submittable * add patch * remove patch	2019-06-12 12:25:48 +05:30
Suraj Shetty	2f84779667	fix: Last Communication for lead ... - Remove unused code - Remove unused import	2019-06-12 10:31:07 +05:30
deepeshgarg007	44ac3580d9	fix: Fix breaking patch on develop branch	2019-06-11 18:35:01 +05:30
Mangesh-Khairnar	283d2c5ca2	fix: only create leave application ledger on intermediate allocation expiry	2019-06-11 16:35:29 +05:30
Mangesh-Khairnar	ac9a4fe03c	feat: add tax and charges in expense claim	2019-06-11 14:25:44 +05:30
Suraj Shetty	7ff124db95	fix: Show lead name when the lead calls	2019-06-11 14:21:48 +05:30
Anurag Mishra	ff99cea1c4	Merge branch 'develop' into report_trial_balance_fix	2019-06-11 14:17:54 +05:30
Suraj Shetty	28f7c3ca3f	fix: Add Make contact button	2019-06-11 12:21:30 +05:30
rohitwaghchaure	ba715feb7f	Merge pull request #17899 from rohitwaghchaure/general_ledger_group_by_voucher_consolidated_issue_develop ... fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)	2019-06-11 11:39:48 +05:30
Anurag Mishra	0ef811d92d	Merge branch 'develop' into report_trial_balance_fix	2019-06-11 11:14:02 +05:30
Anurag Mishra	acae7a903b	fix: requested changes	2019-06-11 11:12:28 +05:30
Suraj Shetty	6013375fbb	fix: Improve call popup UX ... - Close modal after 10 secs if user is has not entered any call summary - Show alert once the summary was saved	2019-06-11 08:03:55 +05:30
Suraj Shetty	77302b3928	fix: Save summary to right field	2019-06-11 08:01:18 +05:30
Rohit Waghchaure	ef5dd87928	fix: debit and credit showing in the same row if the group by is set as group by voucher (consolidated)	2019-06-10 18:34:18 +05:30
rohitwaghchaure	3199f695aa	Merge pull request #17897 from rohitwaghchaure/fixed_print_format_for_ar_for_120_days_develop ... fix: accounts receivable for PDC not showing 120 days column	2019-06-10 18:16:59 +05:30
Rohit Waghchaure	5f41a3333b	fix: accounts receivable for PDC not showing 120 days column	2019-06-10 18:15:43 +05:30
deepeshgarg007	9297829804	fix: Codacy	2019-06-10 17:50:52 +05:30
deepeshgarg007	30f7e7be87	fix: Available qty not shown in item batch selector for batch	2019-06-10 17:46:16 +05:30
Deepesh Garg	ebeafa55ca	fix: Total Amount fix in journal entry (#17880)	2019-06-10 17:42:52 +05:30
sahil28297	3720126ee9	fix(patch): escape illegal characters to avoid SQL syntax error (#17890)	2019-06-10 17:39:42 +05:30
Deepesh Garg	b9102bba48	fix: GSTR-1 Report fixes (#17885)	2019-06-10 17:39:23 +05:30
rohitwaghchaure	dde4f93137	Merge pull request #17881 from rohitwaghchaure/cogs_only_for_material_issue_in_ste_develop ... fix: set COGS for material issue only	2019-06-10 16:57:23 +05:30
Himanshu Warekar	874326dc7b	patch: set apply_to as customer	2019-06-10 12:33:30 +05:30
Himanshu Warekar	a18ba9c718	Merge develop into sla_fix	2019-06-10 12:32:45 +05:30
Himanshu Warekar	0b36d324ee	fix: display depends for apply_to in sla	2019-06-10 11:36:51 +05:30
Himanshu Warekar	65e0ae2171	test: new test cases for sla	2019-06-10 11:24:24 +05:30
Shivam Mishra	9510e69910	fix (lms): null cards visible on xs	2019-06-10 10:53:25 +05:30
Suraj Shetty	13770ccf7a	fix: Codacy	2019-06-10 09:52:53 +05:30
Suraj Shetty	54bb3e4b9f	Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog	2019-06-10 09:25:39 +05:30
Himanshu Warekar	88becdd869	test: test cases for sla with apply_to	2019-06-09 19:33:55 +05:30
Himanshu Warekar	0674d16fee	feat: sla based on customer/group/territory	2019-06-07 15:28:42 +05:30
Rohit Waghchaure	9a792c2eed	stock_entry: set COGS for material issue only	2019-06-07 15:20:36 +05:30
Shivam Mishra	449f261128	feat: show signup dialog for Guest	2019-06-07 13:34:59 +05:30
Shivam Mishra	8d1117cbee	fix: link typo	2019-06-07 13:34:51 +05:30
Shivam Mishra	04d61717bc	fix: lms card hero image no visible	2019-06-07 13:34:41 +05:30
rohitwaghchaure	74d45f40a8	Merge pull request #17876 from rohitwaghchaure/salary_slip_update_component_row_error_develop ... fix: Not able to save salary slip	2019-06-07 12:58:25 +05:30
Suraj Shetty	f1ffdb3c12	feat: Add call sound effects	2019-06-07 12:48:13 +05:30
Suraj Shetty	6a87e3338b	fix: Call popup UI	2019-06-07 11:52:39 +05:30
Rohit Waghchaure	72264697be	fix: Not able to save salary slip	2019-06-07 11:46:27 +05:30
Mangesh-Khairnar	b16d395a8f	Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management	2019-06-07 11:33:06 +05:30
Mangesh-Khairnar	e4d03bf0d0	fix: consider expiry in leaves	2019-06-07 11:30:27 +05:30
rohitwaghchaure	74f502cfa6	Merge pull request #17830 from rohitwaghchaure/multiple_manufacturer_part_no_for_items ... feat: provision to set multiple manufacturer against the item	2019-06-07 10:24:53 +05:30
Suraj Shetty	c8c17422f7	fix: Change call log fieldname and some cleanups	2019-06-07 10:22:50 +05:30
Mangesh-Khairnar	368a974368	style: change formatting	2019-06-06 20:43:32 +05:30
Mangesh-Khairnar	86e0f4c617	Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management	2019-06-06 20:41:28 +05:30
Mangesh-Khairnar	c7b9ae9c5e	fix: get leave balance based on the ledger entries	2019-06-06 20:38:59 +05:30
Mangesh-Khairnar	b840ba4407	feat: show dashboard on submit	2019-06-06 20:38:23 +05:30
Mangesh-Khairnar	00c607116b	fix: handle negative leaves without allocation	2019-06-06 20:37:34 +05:30
Mangesh-Khairnar	f13243a92e	feat: fetch annual allocation based on leave policy	2019-06-06 20:35:10 +05:30
Mangesh-Khairnar	3863fc5fb2	feat: create ledger entry for each earned leave	2019-06-06 20:34:10 +05:30
Mangesh-Khairnar	050f65beb4	feat: fetch leave allocation from ledger entry	2019-06-06 20:32:01 +05:30
Rohit Waghchaure	3cf24366a9	feat: provision to set multiple manufacturer in the item master	2019-06-06 19:53:32 +05:30
Himanshu	c4366c9357	Merge branch 'develop' into qmsystem	2019-06-06 19:04:48 +05:30
Anurag Mishra	fd19678bc7	fix: show cost center in print fromat of report trial balance	2019-06-06 18:37:10 +05:30
Anurag Mishra	4ca393d14c	fix: renamed report BOM item scraps into BOM Explorer (#17869)	2019-06-06 18:05:08 +05:30
Anurag Mishra	4992fc98dd	Merge branch 'develop' into qmsystem	2019-06-06 17:25:39 +05:30
Shivam Mishra	d49b5e4736	fix: sql query case fix	2019-06-06 17:19:53 +05:30
Himanshu	b57b4a7199	Merge branch 'develop' into qmsystem	2019-06-06 16:42:53 +05:30
Shivam Mishra	76fe1b1e9f	Merge pull request #17674 from scmmishra/lms-refactor ... refactor: lms	2019-06-06 16:32:17 +05:30
Shivam Mishra	2a0483dee3	refactor: styling cards and article	2019-06-06 16:02:38 +05:30
Himanshu	d0d5380cb1	Merge branch 'develop' into qmsystem	2019-06-06 15:37:04 +05:30
Suraj Shetty	97780613ad	fix: Improve call popup UI	2019-06-06 14:48:37 +05:30
Suraj Shetty	c0a640c462	feat: Add user_id of employee to employee group	2019-06-06 14:47:40 +05:30
Shivam Mishra	6132c8527b	refactor: all programs are shown on home by deafult	2019-06-06 14:19:36 +05:30
Himanshu Warekar	db1d1197ea	feat: add fixtures	2019-06-06 14:17:07 +05:30
Shivam Mishra	098b8324f2	refactor: remove erpnext.com link	2019-06-06 14:14:17 +05:30
Himanshu Warekar	ab97cd4db1	feat: dashboards	2019-06-06 14:13:10 +05:30
Shivam Mishra	b31276572b	refactor: styling changes	2019-06-06 14:03:01 +05:30
Shivam Mishra	09cd46fa0b	fix: minor bugs	2019-06-06 14:02:49 +05:30
Himanshu Warekar	b114d9f621	test: fix test case	2019-06-06 12:14:19 +05:30
Prasann Shah	829172c267	[Add] GSTIN filters in hsn wise summary and itemised reports	2019-06-06 12:08:09 +05:30
Himanshu Warekar	b318b83bb7	patch: fixes	2019-06-06 12:03:37 +05:30