brotherton-erpnext

Author	SHA1	Message	Date
Faris Ansari	d77fe38513	fix: Remove no_sitemap property	2019-03-20 14:11:05 +05:30
rohitwaghchaure	f45db71ba2	Merge pull request #16964 from rohitwaghchaure/fix_cost_center_mapping_not_working fix: Cost center from PO to PI is not mapping	2019-03-20 13:40:05 +05:30
Rohit Waghchaure	f288866130	fix: Cost center from PO to PI is not mapping	2019-03-20 13:34:28 +05:30
Mangesh-Khairnar	2ffa87ea34	feat: added erpnext doctype via hooks (#16930 )	2019-03-20 13:25:48 +05:30
scmmishra	43e9375642	feat [WIP]: Added multiple choice question component	2019-03-20 13:25:02 +05:30
Rohit Waghchaure	65d9435fd5	feat: sales partner reports	2019-03-20 12:05:21 +05:30
itusedyetnew	8aafbd22de	stock_values_on append function on string	2019-03-20 11:10:41 +05:30
Rohit Waghchaure	ca9f93cdc2	feat: Stock ageing warehouse wise	2019-03-20 02:14:54 +05:30
rohitwaghchaure	e521f51e5f	Merge pull request #16955 from rohitwaghchaure/sales_person_showing_wrong_on_ars fix: Accounts receivable report, remarks showing in the sales person column	2019-03-19 18:17:15 +05:30
Mangesh-Khairnar	7fc1bc0b27	fix: handle an empty match query condition in leave application (#16931 )	2019-03-19 18:14:02 +05:30
Rohit Waghchaure	a322687897	fix: Accounts receivable report, remarks showing in the sales person column	2019-03-19 18:10:08 +05:30
Himanshu	f3e5213190	feat(Support): Service Level Agreements (#16828 ) * init SLA * Added more inputs to the forms * set priority of issue * Removed UOM in favor of hours for tracking * updated js to autofill values * Removed unwanted fields * timer functionality * code refactor * parenthesis fix * fixed typo * added new fields * Updated fields * Updated fields for issue doctype * Updated fields for issue doctype * changed doctype structure * added new fields to issue * code refactor * new function to set criticality level * changed dropdown options * set timer for sla * calculation of resolution and response time * stopwatch counter * dashboard changes * renamed sla to support contract * countdown timer section * issue doctype changes * removed unwanted imports * fixed wrong response time and resolution time * update response and resolution time * calculate time to respond and resolve * feature enhancements * probable scheduling bug fix * fixed scheduling issue support sent out of support time * removed issue criticality link from support * Changed day order * skip date validation when support contract is default * removed mandatory field * fix scheduling conditions for now * code refactor * removed duplicate doctypes * fixed day inserted twice in service level * check to not add another default contract * default support contracts * removed commented code * removed unused imports * fix sla for non-listed days * reduced redundant code and optimized it and starting unit tests * added condition check to compute days correctly * renamed doc as per guidelines and added conditions for scheduling * removed per day support timings * added response and resolution time to support contract * scheduling based on hours kinda fix * set sla before_update and finally fixed time scheduling out of support time * DocType Issue removed test_records and rewrote test cases * test cases and codacy fixes * Doctype SLA instead of Support Contract to avoid confusion with Contract * fixed tests failing due to change in options for time period * change naming to Prompt * remove unknown doctype from help_desk * revert unwanted changes to default * refactor get_list for fetching service_level_agreement * change datatypes * fix tests * refactored tests * remove unused imports * code and comments refactor for better understandability * removed and renamed doctype to service days and minor fixes * Refactor test cases for response and resolution time for issue * add validation to check if response time < resolution time * minor fix for checking if current day is start day * calculate time in js rather than python * fix: parenthesis fixing customer dashboard * json changes to rename sections * refactor: alignment * refactor: beautify code * fix: use frm api to get the element * fix: replace '__' with '_' * refactor: remove pointless test	2019-03-19 16:47:56 +05:30
rohitwaghchaure	40046721b2	Merge pull request #16954 from rohitwaghchaure/pos_cost_center_not_added_against_debtors fix: POS, cost center not added against debtors	2019-03-19 16:38:07 +05:30
Rohit Waghchaure	8808a3fc8e	fix: POS, cost center not added against debtors	2019-03-19 15:32:05 +05:30
rohitwaghchaure	4904ce649e	Merge pull request #16952 from rohitwaghchaure/fixed_accounts_receivable_summary_advance_amt fix: advance amount is not calculating properly	2019-03-19 15:26:41 +05:30
Rohit Waghchaure	1a6e01542a	fix: advance amount is not calculating properly	2019-03-19 15:06:01 +05:30
Rohit Waghchaure	8bfe330b37	feat: pricing rule enhancements	2019-03-19 12:44:30 +05:30
scmmishra	000e706337	feat: Only student progress is recorded in LMS Changes - Instructors can freely audit the course and their progress will not be recorded - Added check for super access for get_program in utils.py - Guests can view topics page - Instructors can see explore topic button - Content Activity is only saved for a student in lms.py - Modified variable names in topic.py	2019-03-19 12:30:43 +05:30
Faris Ansari	5f8b358fd4	Website: Product Configurator and Bootstrap 4 (#15965 ) - Refactored Homepage with customisable Hero Section - New Homepage Section to add content on Homepage as cards or using Custom HTML - Products page at "/all-products" with customisable filters - Item Configure dialog to find an Item Variant filtered by attribute values - Contact Us dialog on Item page - Customisable Item page content using the Website Content field	2019-03-19 11:48:32 +05:30
Himanshu Warekar	642a5b69f5	fix: change customer to supplier	2019-03-18 21:53:33 +05:30
Himanshu Warekar	2f5f17fcbb	refactor: fix issue credit note	2019-03-18 21:46:26 +05:30
scmmishra	7ad5619318	feat: Set default role to LMS User for signup in Education	2019-03-18 19:11:44 +05:30
scmmishra	eaed1ae3d6	fix: Added import statement for translate wrapper	2019-03-18 19:11:07 +05:30
scmmishra	f2c638f8ab	fix (minor): Replaced text editor with small text in course doctype	2019-03-18 18:38:51 +05:30
scmmishra	acc278de9c	feat: Added validations for question doctype - A question must have more than two options - A question must have at least one correct option	2019-03-18 18:38:18 +05:30
scmmishra	5c646e60f5	fix: Auto course enrollment for enrolled programs in LMS	2019-03-18 18:37:35 +05:30
scmmishra	a0978a2aab	chore: Cleaned up quiz.py	2019-03-18 18:37:06 +05:30
Rushabh Mehta	f060831cce	fix(escaping): make_italian_localization_fields.py	2019-03-18 18:04:34 +05:30
Rohit Waghchaure	5b43e2f31a	code cleanup	2019-03-18 17:00:44 +05:30
rohitwaghchaure	2046024de9	Merge pull request #16942 from hrwX/invoice-creation-tool fix(Invoice Creation Tool): Disable P/L validation for opening invoice creation	2019-03-18 15:48:55 +05:30
scmmishra	e3dea29f58	fix: Minor UI fix	2019-03-18 15:44:55 +05:30
Himanshu	ac199580af	fix(Customer Ledger): ambiguous error in where clause (#16914 ) fix for error "InternalError: (1052, u"Column 'company' in where clause is ambiguous")" in Customer Ledger Summary	2019-03-18 15:44:54 +05:30
scmmishra	621cad8781	fix: Default program list Shows two latest programs if no program is set as featured	2019-03-18 15:40:47 +05:30
scmmishra	c22eef28f7	fix: LMS Title Shows default company name if LMS title not set	2019-03-18 15:36:49 +05:30
scmmishra	dcbe7e5490	fix: Added permissions for instructor Also made description mandatory in program	2019-03-18 15:29:30 +05:30
scmmishra	b2c745827f	fix: Removed accidentally added course doctype in list	2019-03-18 15:28:49 +05:30
rohitwaghchaure	ac9f38bfc2	Merge pull request #16940 from rohitwaghchaure/added_cost_center_filters_in_ar_ap feat: added cost center filter in AR/AP reports	2019-03-18 14:22:15 +05:30
Rohit Waghchaure	d4e4316d0b	fix: test cases and codacy	2019-03-18 14:18:49 +05:30
Zlash65	01086ff60c	codacy fixes	2019-03-18 12:50:29 +05:30
Zlash65	11bba571af	test case added to check account syncing	2019-03-18 12:50:29 +05:30
Zlash65	cc65447e62	fix: chart of accounts field toggling improv	2019-03-18 12:50:29 +05:30
Zlash65	f71cb8dc6d	fix: return if no descendants found	2019-03-18 12:50:28 +05:30
Zlash65	73acb8c837	fix: set chart of accounts based on parent company on server side	2019-03-18 12:50:28 +05:30
Zlash65	d787ef8b8e	feat: sync account created for a group company to all its descendants	2019-03-18 12:50:28 +05:30
Zlash65	88c990901d	fix: added validation to if account is being added to child company	2019-03-18 12:50:28 +05:30
Zlash65	0407bf1e00	fix: override primary action button, change filter to root company	2019-03-18 12:50:27 +05:30
Zlash65	2def228da8	feat: allow adding account only if topmost parent company - hidden filter for Parent Company added - Add button overriden with new condition	2019-03-18 12:50:27 +05:30
Zlash65	a57d58f756	feat: once company is saved, parent_company cannot be selected	2019-03-18 12:50:27 +05:30
Zlash65	1a4bfdd090	feat: selecting parent_company should disable chart_of_accounts based fields	2019-03-18 12:50:27 +05:30
Himanshu Warekar	aa03ea2a56	disbale pl check for Sales and Purchase Invoice	2019-03-18 12:36:42 +05:30
Rohit Waghchaure	ace95d5a67	feat: added cost center filter in AR/AP reports	2019-03-18 12:21:00 +05:30
Mangesh-Khairnar	db96db2897	style: change position of hold and resume button	2019-03-18 12:14:25 +05:30
Mangesh-Khairnar	e613c4f380	test: purchase order on hold	2019-03-18 12:14:25 +05:30
Mangesh-Khairnar	873c579bb4	fix: check for both hold and closed status in po	2019-03-18 12:14:25 +05:30
Mangesh-Khairnar	4f74313baf	feat: record reason for hold as comment	2019-03-18 12:14:25 +05:30
Mangesh-Khairnar	a1afd78723	feat: add validation for on hold purchase order	2019-03-18 12:14:25 +05:30
Mangesh-Khairnar	439546c83c	feat: add on hold status in purchase order	2019-03-18 12:14:25 +05:30
scmmishra	b854d64401	Merge branch 'develop' of github.com:frappe/erpnext into lms-beta-v2	2019-03-18 11:51:27 +05:30
Aditya Hase	42640cb908	fix(dashboard): Add configuration to chart source	2019-03-18 11:18:43 +05:30
Deepesh Garg	3ead70ba3c	fix: Change IBAN Account length from 25 to 30 (#16847 )	2019-03-18 08:22:57 +05:30
Deepesh Garg	2ae7ed4cf0	fix: Gross profit report fix (#16935 )	2019-03-17 09:49:24 +05:30
Mangesh-Khairnar	b343407236	refactor: change validate email add to validate email address	2019-03-16 13:40:58 +05:30
rohitwaghchaure	fd33c55760	Merge pull request #16865 from rohitwaghchaure/purchase_invoice_asset_issue_not_able_to_submit feat: added provision to disable CWIP accounting in asset settings	2019-03-16 12:18:36 +05:30
rushin29	08a209bc52	fix: gst_state_number for address with Unregistered GST (#16798 )	2019-03-15 15:28:50 +05:30
rohitwaghchaure	ef74e94374	Merge pull request #16882 from rohitwaghchaure/multiple_time_logs_in_job_card feat: child table to add multiple time logs in job card	2019-03-15 11:46:33 +05:30
Rushabh Mehta	349a1157ef	Merge pull request #16717 from jigartarpara/fix_payment_term_template fix: Add credit month in validation	2019-03-15 09:03:54 +05:30
Rushabh Mehta	b7abdf1222	Merge pull request #16851 from JoyceBabu/develop fix: Add 'Half-Yearly' option to Earned Leave Frequency	2019-03-15 09:02:43 +05:30
Rushabh Mehta	957a3307ae	Merge pull request #16634 from Alchez/hotfix-stock-balance-balance fix(stock_balance): Make balance qty and value columns more visible in the Stock Balance report	2019-03-15 09:02:20 +05:30
Rushabh Mehta	59a3012a5c	Update payment_request.py	2019-03-15 08:57:49 +05:30
Rushabh Mehta	e5d79f3621	Merge pull request #16673 from Alchez/feat-task-from-issue feat(issue): Create and view Tasks from Issues	2019-03-15 08:55:20 +05:30
Anurag Mishra	ed190bb329	fix: codacy	2019-03-14 18:14:20 +05:30
Anurag Mishra	1c7baaeba5	test: tests for loan status Disbursed, Settled and on payment Entry for attached invoices	2019-03-14 16:45:02 +05:30
Anurag Mishra	6deffbd6e8	test: loan_return date and loan Sanctioned on submit	2019-03-14 16:44:49 +05:30
Anurag Mishra	4a538ba78a	Resolve merge conflict	2019-03-14 16:43:16 +05:30
Nabin Hait	ed96591618	feat(accounts): Invoice Discounting	2019-03-14 16:42:44 +05:30
scmmishra	0bcae95d3c	chore: Fixed config for education	2019-03-14 15:46:51 +05:30
scmmishra	21823f5f66	feat: Added test for program_enrollment	2019-03-14 15:44:01 +05:30
scmmishra	e3b7e1381d	feat: Moved make_course_activity to test_course_activity.py	2019-03-14 15:34:13 +05:30
scmmishra	8aa6ac7b03	feat: Moved setup_program to test_program.py	2019-03-14 15:32:22 +05:30
scmmishra	a98e936d26	chore: Removed LMS Activity Doctype	2019-03-14 15:24:26 +05:30
scmmishra	88b2244468	feat: Added test for course_enrollment	2019-03-14 15:19:20 +05:30
scmmishra	c75b513e2c	fix: Enrollment bug	2019-03-14 15:16:14 +05:30
scmmishra	34fa33d324	fix: Config bug, added type doctype	2019-03-14 15:14:25 +05:30
Bassam Ramadan	e14758c897	fix: add returns field to cashier closing (#16911 )	2019-03-14 15:01:50 +05:30
Rushabh Mehta	947d573276	Merge pull request #16892 from hrwX/uae_fix fix(UAE): Fetch from fix for UAE customizations	2019-03-14 14:20:32 +05:30
Rushabh Mehta	e8258fc352	Merge pull request #16854 from jay-parikh/hotfix fix: Default Company to Total Stock Summary Report	2019-03-14 14:18:36 +05:30
Rushabh Mehta	2352ce92cc	Merge pull request #16849 from frappe/bcornwellmott-patch-1 fix: Add date to currency exchange caching	2019-03-14 14:18:09 +05:30
Rushabh Mehta	d63e0f490c	Merge pull request #16856 from hrwX/sales-work-fix fix(Work Order): fetch item info when making work order from sales order	2019-03-14 14:17:40 +05:30
Rushabh Mehta	20af5a2b40	Merge pull request #16866 from deepeshgarg007/additional fix: Removed relieving date validation form additional salary	2019-03-14 14:16:18 +05:30
Rushabh Mehta	bd9622bfd5	Merge pull request #16918 from Alchez/hotfix-party-payments fix(transaction): Add link to payments made by Customer / Supplier in their dashboards	2019-03-14 14:14:42 +05:30
Rohan Bansal	82433845e5	fix(transaction): Add link to payments made by Customer / Supplier in their dashboards	2019-03-14 13:18:55 +05:30
scmmishra	14d70ce444	chore: updated education config	2019-03-14 12:31:25 +05:30
Rushabh Mehta	f49d0d8058	Merge pull request #16890 from Anurag810/timesheet feat: Timesheet Reports	2019-03-14 10:31:23 +05:30
Rushabh Mehta	6e2286f5f0	Merge pull request #16897 from PawanMeh/fixes_16894 fixes: Amazon v12 integration issues	2019-03-14 10:30:29 +05:30
Aditya Hase	3b75551739	feat(dashboard): Render Account Balance Timeline is a time series	2019-03-12 14:47:21 +05:30
Aditya Hase	59fc039c77	style: Linting fixes	2019-03-12 14:47:21 +05:30
Aditya Hase	1e0f9a2882	feat(dashboard): Use caching decorator for dashboard	2019-03-12 14:47:21 +05:30
Aditya Hase	76158e6643	feat(dashboard): Export chart source doc to JSON file	2019-03-12 14:47:21 +05:30
Aditya Hase	675c1d3a5a	refactor(dashboard): Move Soure settings to account_balance_timeline.js	2019-03-12 14:47:20 +05:30
Aditya Hase	09f2ed2e69	refactor(dashboard): Move dashboard.py to account_balance_timeline.py	2019-03-12 14:47:20 +05:30
Aditya Hase	d85b0ae602	fix(dashboard): Remove unused variables	2019-03-12 14:47:20 +05:30
Aditya Hase	2fa1d9caed	fix(dashboard): Remove print statement	2019-03-12 14:47:20 +05:30
Aditya Hase	15c0cfff0f	refactor(dashboard): Convert indentation to tabs	2019-03-12 14:47:20 +05:30
Aditya Hase	4b171ddebb	feat(dashboard): Remove hardcoded company filter	2019-03-12 14:47:20 +05:30
Aditya Hase	3b593e44c6	feat(dashboard): Set account from filters	2019-03-12 14:47:20 +05:30
Aditya Hase	5911e100ad	fix(dashboard): Consider opening balance	2019-03-12 14:47:20 +05:30
Aditya Hase	6cadf77073	feat(dashboard): Add Time Grain filter	2019-03-12 14:47:20 +05:30
Aditya Hase	c888e52788	feat(dashboard): Add missing dates	2019-03-12 14:47:20 +05:30
Aditya Hase	8896374413	feat(dashboard): Add timespan filter	2019-03-12 14:47:20 +05:30
Aditya Hase	953229fa47	feat(dashboard): Create Accounting dashboard from General Ledger Report	2019-03-12 14:47:20 +05:30
Anurag Mishra	641e412853	fix: Removed raw query and used frappe.get_all	2019-03-12 13:12:31 +05:30
Rohan Bansal	f4bce6a66e	fix(issue): Replace Make buttons on Issue and Task with a dashboard	2019-03-12 12:48:13 +05:30
Rohan Bansal	bf7c69f3c4	fix(issue): Don't auto-set project	2019-03-12 12:48:13 +05:30
Rohan Bansal	fa77b591ac	fix(issue): View Tasks against an Issue	2019-03-12 12:48:13 +05:30
Rohan Bansal	2ba21fb66c	fix(issue): Add issue name in Task and fix description in Issue	2019-03-12 12:48:13 +05:30
Rohan Bansal	5327d0253d	feat(issue): Create tasks from issues	2019-03-12 12:40:32 +05:30
Rohan Bansal	6cbd3998fb	fix(work_order): Use single update query	2019-03-12 12:15:37 +05:30
Rohan Bansal	b4745ec668	fix(work_order): Change Work Order title to show item name instead of item code	2019-03-12 12:13:02 +05:30
Anurag Mishra	9a1adc7c49	Added mandatory feilds to the report	2019-03-12 11:00:02 +05:30
Faris Ansari	47f1080f1e	fix: Update modified	2019-03-12 10:57:35 +05:30
Faris Ansari	175709ed50	fix: Update Training Level - Rename Expert to Intermediate, since it was ambiguous with Advance	2019-03-12 10:55:39 +05:30
Faris Ansari	2221151132	fix: Update Training Level	2019-03-12 10:55:11 +05:30
Anurag Mishra	34e1f92a7e	fix: readability	2019-03-11 18:17:22 +05:30
Anurag Mishra	1218255178	feat: Project Billing Summary for timesheet	2019-03-11 17:43:44 +05:30
Rohan Bansal	90972cfbf9	fix(transaction): Avoid shipping rule charge override by tax template	2019-03-11 15:00:48 +05:30
pawan	c0e1000919	fix: SKU issue	2019-03-11 14:58:17 +05:30
pawan	7c3e017ac3	fix: Amazon integration issues	2019-03-11 14:47:57 +05:30
Rohit Waghchaure	267723f57b	fix: stock ledgre report not working	2019-03-11 14:06:00 +05:30
Anurag Mishra	9b64baa734	Minor Fixes	2019-03-11 12:02:25 +05:30
Anurag Mishra	59f4556d95	Commonify code	2019-03-11 11:58:34 +05:30
Anurag Mishra	e86ac3c8d4	feat: timesheet Employee Summary Report	2019-03-11 11:58:28 +05:30
Rohit Waghchaure	52729bf369	feat: child table to add multiple time logs in job card	2019-03-11 00:02:32 +05:30
Himanshu Warekar	1692fbaf1c	fetch from fix	2019-03-08 18:37:34 +05:30
Frappe Bot	7e67a400cd	Merge branch 'master' into develop	2019-03-08 09:39:33 +00:00
Frappe Bot	3406229152	bumped to version 11.1.14	2019-03-08 09:39:32 +00:00
Rushabh Mehta	96842c9de6	fix(typo): leave_application.py	2019-03-08 12:36:43 +05:30
Rushabh Mehta	701c0b792c	feat: Pre mark attendance for Leave Application	2019-03-08 12:30:42 +05:30
Rohit Waghchaure	6b33c9b934	fix: purchase receipt not able to submit because default inventory account has not selected in another company	2019-03-08 11:13:35 +05:30
Rohit Waghchaure	821a002125	feat: added provision to disable CWIP accounting in asset settings	2019-03-08 10:51:37 +05:30
Nabin Hait	9ec4816b32	Update item_barcode_childtable_migrate.py	2019-03-08 10:44:13 +05:30
Saif Ur Rehman	e62bd893c5	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 # Conflicts: # erpnext/stock/doctype/item/test_item.py	2019-03-08 01:29:39 +05:00
deepeshgarg007	78a32ae172	fix: Remove validation for relieving date from additional salary	2019-03-07 20:00:07 +05:30
Anurag Mishra	1b0f5fd430	fix: pass correct argument to method get_deprication_amount	2019-03-07 16:17:00 +05:30
Rushabh Mehta	703a597478	fix(patch): update customization options if completed is not present	2019-03-07 13:03:40 +05:30
Rushabh Mehta	e9db0d2c61	fix(minor): update task list label from Closed to Completed	2019-03-07 12:50:02 +05:30
rohitwaghchaure	d4754619d0	Merge pull request #16806 from rohitwaghchaure/set_scanned_barcode_in_the_table fix: scan barcode not adding the barcode value in the items table	2019-03-07 11:29:56 +05:30
Himanshu Warekar	7ab961f798	remove debug code	2019-03-06 23:53:38 +05:30
Himanshu Warekar	59699bf46e	[debug] locally tests passed but travis failed	2019-03-06 23:33:03 +05:30
Himanshu Warekar	4f1737c2dd	fix sales order test for creating work order from sales order	2019-03-06 22:19:15 +05:30
scmmishra	62416224ab	feat: Added test utilities for course_activity	2019-03-06 19:01:28 +05:30
Himanshu Warekar	783331c645	sales_order to work_order item desc fix	2019-03-06 18:44:04 +05:30
Rohit Waghchaure	db8500c03a	POS profile, account for change amount must be cash or bank account	2019-03-06 18:28:45 +05:30
Jay Parikh	9757a603fa	Fix Company Default to Total Stock Summary Report	2019-03-06 12:44:41 +00:00
scmmishra	18ddc92947	feat: Added check for duplicate course enrollment	2019-03-06 17:05:17 +05:30
scmmishra	890ce60e86	style: Removed trailing spaces	2019-03-06 17:04:42 +05:30
scmmishra	531d2761cf	feat: Refactored some enrollment functions	2019-03-06 17:04:17 +05:30
scmmishra	b72ba416ff	feat: More tests	2019-03-06 17:03:51 +05:30
Rohan Bansal	e66f59654e	fix(report): Incorrectdata for balance quantity and value in Stock Balance report	2019-03-06 16:04:11 +05:30
scmmishra	bf9a10fd5e	chore(style): Renamed a function	2019-03-06 15:45:35 +05:30
scmmishra	bcfe6f024f	feat: Added lms tests for student doctype	2019-03-06 15:26:41 +05:30
scmmishra	92ab107b60	fix: Minor fix	2019-03-06 15:26:20 +05:30
scmmishra	4a7e2c1e2f	feat: Minor changes to topic tests	2019-03-06 15:19:02 +05:30
scmmishra	2cec025bbe	feat: Added test for program doctype	2019-03-06 15:18:43 +05:30
scmmishra	64347a5642	feat: Added test for Course Doctype	2019-03-06 15:18:27 +05:30
scmmishra	75defde940	fix: fixed user creation bug in student	2019-03-06 15:18:01 +05:30
Rushabh Mehta	29c46bb311	fix(sales_order.py): handle zero bundle qty	2019-03-06 14:49:13 +05:30
Joyce Babu	3d0121369f	Add 'Half-Yearly' option to Earned Leave Frequency in addition to the current values of Monthly, Quarterly and Yearly	2019-03-06 13:04:45 +05:30
scmmishra	18a1a8d4f4	style: Fixed route.js	2019-03-06 10:55:21 +05:30
bcornwellmott	b263876918	Add date to currency exchange caching The current currency exchange caching does not keep track of the transaction date, so if you are backdating transactions, the system probably isn't pulling the correct exchange rate (if it's looking up the currency exchange rate on the fly)	2019-03-05 16:44:02 -08:00
Raffael Meyer	33d0a9f684	fix(projects): change fieldtype of billing amounts to Currency	2019-03-05 21:57:11 +01:00
Himanshu Warekar	250ebe5888	Merge branch 'develop' of https://github.com/frappe/erpnext into additional_salary_develop	2019-03-05 17:45:14 +05:30
Himanshu Warekar	219b9f4150	Salary Component can be equal to zero	2019-03-05 17:44:07 +05:30
deepeshgarg007	e062acbbd3	fix: Removed shortcuts from desktop.py	2019-03-05 17:17:10 +05:30
Himanshu Warekar	acb7238ad6	Allow zero amount in additional salary	2019-03-05 12:20:19 +05:30
Rushabh Mehta	1f0792d5ea	Merge pull request #16823 from jay-parikh/sales-return fix: Python 3 Sales Invoice Return Validation "validate_pos"	2019-03-05 08:05:00 +05:30
rohitwaghchaure	55c382a780	Merge pull request #16820 from rohitwaghchaure/state_code_blank_if_not_matched_with_state_codes fix: on save of the address, state code field become blank	2019-03-04 16:59:45 +05:30
rohitwaghchaure	f6a8b17717	Merge pull request #16824 from rohitwaghchaure/user_not_able_to_search_item_by_description fix(sales order item): not able to search item by description	2019-03-04 16:59:19 +05:30
rohitwaghchaure	369d20ac2b	Merge pull request #16829 from rohitwaghchaure/gst_purchase_invoice_hsn_number fix: HSN code not disaplying for the GST Purchase Invoice print format	2019-03-04 16:58:58 +05:30
rohitwaghchaure	e552170ce6	Merge pull request #16704 from Anurag810/vedmata-print-formats feat: Auditors print formats	2019-03-04 16:58:31 +05:30
rohitwaghchaure	8c96e06e19	Merge pull request #16629 from Anurag810/gross-and-net-profit-report feat: Gross and Net Profit Report	2019-03-04 16:57:21 +05:30
Anurag Mishra	0c9945e0bf	Minor fixes	2019-03-04 16:14:53 +05:30
Anurag Mishra	02138b6bfc	fix: gross depends upon now report type	2019-03-04 14:46:28 +05:30
Prateeksha Singh	a5f2962c16	Merge pull request #16830 from pratu16x7/explore-2.0 minor(modules): add onboard keys, remove hidden	2019-03-04 14:39:29 +05:30
scmmishra	28dd4c139e	feat: Added test for Topic Doctype - Added test for get_contents function - Removed unused class functions	2019-03-04 14:21:22 +05:30
Prateeksha Singh	8aa4594b1e	feat(modules): add onboard keys, remove hidden	2019-03-04 14:00:26 +05:30
Rohit Waghchaure	9842ce5a79	fix: HSN code not disaplying for the GST Purchase Invoice print format	2019-03-04 13:39:52 +05:30
deepeshgarg007	511713e131	fix: Delete GL entry for supplier before creating new one	2019-03-04 13:25:39 +05:30
deepeshgarg007	e615051ccc	fix: Updated test_united_states	2019-03-04 13:22:51 +05:30
Deepesh Garg	44ff41188d	fix: Selling and buying amount precision fix (#16764 )	2019-03-04 12:56:27 +05:30
Deepesh Garg	40743840b7	fix: Print letter head only if checked in Print Settings (#16789 ) Letter head is printed in financial statements even if option is not checked ![letter head option](https://user-images.githubusercontent.com/42651287/53430759-26baa080-3a15-11e9-948a-bc95700a18d2.png)	2019-03-04 12:53:11 +05:30
Deepesh Garg	e1f72cc010	revert: Address and contact report fix (#16786 ) Reverts #16674 Address and other info are not visible in address and contact report ![screenshot 2019-02-27 at 11 31 38 am](https://user-images.githubusercontent.com/42651287/53469309-6029f500-3a83-11e9-9672-e5e7d14dc470.png)	2019-03-04 12:49:39 +05:30
Anurag Mishra	1e4e61bd94	Minor fixes	2019-03-04 12:36:51 +05:30
Anurag Mishra	f3bdeedc68	minor fixes	2019-03-04 12:27:41 +05:30
deepeshgarg007	f6d1f53aef	fix: Account type fix in test_united_states	2019-03-04 10:23:35 +05:30
Mangesh-Khairnar	83f1fbdc4e	test: assert validation error for sales order on hold	2019-03-02 22:24:23 +05:30
Rohit Waghchaure	2bfb063fdb	fix(sales order item): not able to search item by description	2019-03-02 21:47:55 +05:30
Mangesh-Khairnar	3ebeac13e9	feat: add resume funtionality for sales order on hold	2019-03-02 20:48:04 +05:30
Mangesh-Khairnar	86e650c1ed	feat: validate linked sales order on material request creation	2019-03-02 20:48:04 +05:30
Mangesh-Khairnar	8f7c7a6882	feat: check for on hold sales order	2019-03-02 20:48:04 +05:30
Mangesh-Khairnar	4f350fcadb	feat: validate sales order in sales invoice	2019-03-02 20:48:04 +05:30
Mangesh-Khairnar	1c276e9828	feat: validate on hold sales order	2019-03-02 20:48:04 +05:30
Mangesh-Khairnar	602223dd55	feat: add a option of on hold in sales order	2019-03-02 20:48:04 +05:30
Mangesh-Khairnar	5eb66aed77	feat: add on hold status check	2019-03-02 20:48:03 +05:30
Mangesh-Khairnar	e17b7095bf	feat(sales order on hold): check status of sales order to validate entry	2019-03-02 20:48:03 +05:30
Jay Parikh	c2090939d7	Fix Sales Invoice Return Validation "validate_pos"	2019-03-02 12:19:32 +00:00
Rohit Waghchaure	4ef924d0ba	fix: on save state code field become blank	2019-03-01 18:11:43 +05:30
Frappe Bot	8f0660ab31	Merge branch 'master' into develop	2019-03-01 09:22:36 +00:00
Frappe Bot	3ec0bb7e53	bumped to version 11.1.13	2019-03-01 09:12:25 +00:00
rohitwaghchaure	066da6b1b6	Merge pull request #16817 from gaurav-naik/italy-einvoice-bank-details-fix fix(regional,italy): bank details, custom button on sales invoice	2019-03-01 14:26:07 +05:30
rohitwaghchaure	5e71a56c7a	Merge pull request #16807 from rohitwaghchaure/remove_validation_for_group_by_voucher_consolidate fix: when General Ledger is opened from Purchase Receipt or Delivery note, user get Opening and Closing printed twice	2019-03-01 14:25:00 +05:30
Gaurav	6a4625b94c	fix(regional,italy): codacy fixes in regional sales_invoice js	2019-03-01 13:58:39 +05:30
Gaurav	b30a9b1869	fix(regional,italy): bank details, custom button on sales invoice Updates to Bank details in e-invoice XML Additional fields on Payment Schedule Button to Generate E-Invoice on Sales Invoice (generates and replaces attached e-invoice) Replaced `x.decode('utf-8')` with `frappe.safe_decode(x, encoding='utf-8')` in setup.py Updated italian localisation patch line in patches.txt	2019-03-01 12:38:35 +05:30
FinByz Tech Pvt. Ltd	6635583103	fix: Rounding adjustment in Rounded Total In Purchase Receipt and GST Purchase Receipt report, the Rounded Total column doesn't display rounding adjustment of Base Grand Total. So, we have created a fix for that rounding adjustment.	2019-03-01 11:57:06 +05:30
Rushabh Mehta	94d6f94e0e	Merge pull request #16421 from agritheory/usregional feat: US Regional Module with IRS 1099 reporting	2019-03-01 09:14:18 +05:30
scmmishra	471140c6d4	fix: Minor changes	2019-02-28 18:14:25 +05:30
scmmishra	f0a56b977a	feat: Minor fixes to profile page	2019-02-28 18:11:46 +05:30
scmmishra	ab8fc8c2bf	feat: Quizzes fixed	2019-02-28 16:42:37 +05:30
scmmishra	3726f8a7f6	feat: Added check for no content in topic meta	2019-02-28 16:33:53 +05:30
scmmishra	b793cc8e1e	fix: Minor changes	2019-02-28 16:33:38 +05:30
Rohit Waghchaure	c21cda2790	Removed validation for group by voucher in general ledger	2019-02-28 16:20:45 +05:30
Frappe Bot	1fcae10258	Merge branch 'master' into develop	2019-02-28 10:20:48 +00:00
scmmishra	5e61b17cf8	fix: Routing after finishing a course topic	2019-02-28 15:43:33 +05:30
scmmishra	de5f71ae9e	fix: Showing Topic Progress	2019-02-28 15:40:49 +05:30
Frappe Bot	58135976dd	bumped to version 11.1.12	2019-02-28 10:08:08 +00:00
scmmishra	b17d289bda	fix: Course card progress	2019-02-28 15:21:43 +05:30
Rohit Waghchaure	ab4ff984c4	fix: scan barcode not adding the barcode value in the items table	2019-02-28 13:31:02 +05:30
Rushabh Mehta	57128e413c	fix: task.js	2019-02-28 12:43:58 +05:30
Himanshu Warekar	3315a9fafb	fix routes	2019-02-28 11:51:36 +05:30
Himanshu Warekar	1cb695b7e9	fix route for Task and Tree of Procedure	2019-02-28 11:42:36 +05:30
rohitwaghchaure	1d41c1c2de	Merge pull request #16787 from rohitwaghchaure/italian_more_fixes fix: e-invoicing patch, patch to set country code in the address	2019-02-28 11:28:04 +05:30
Rohit Waghchaure	b48effebce	fix: test case	2019-02-27 19:33:22 +05:30
Rohit Waghchaure	cd34c70670	fix: bom cost update is not working	2019-02-27 18:01:30 +05:30
scmmishra	56ad5da090	fix: Minor Changes	2019-02-27 15:32:36 +05:30
Rohit Waghchaure	74cfe57716	fix: e-invoicing patch, patch to set country code in the address	2019-02-27 14:38:36 +05:30
Anurag Mishra	a9a1552e32	refactor	2019-02-27 14:10:24 +05:30
scmmishra	e6735e418f	fix: Content navigation	2019-02-27 12:46:23 +05:30
scmmishra	8747900aa1	Fix: Content title fields	2019-02-27 12:34:53 +05:30
scmmishra	47ccad9661	fix: Reloading bug on Content page	2019-02-27 12:24:17 +05:30
scmmishra	23880ae567	fix: Content fetching for articles and videos	2019-02-27 12:09:57 +05:30
scmmishra	628659e02a	fix: Routing for course	2019-02-27 12:09:28 +05:30
Rushabh Mehta	fcd0556119	Merge pull request #16709 from rmehta/project-template feat: Project Template	2019-02-27 09:22:12 +05:30
Rushabh Mehta	76f36f68d3	Merge pull request #16790 from crossxcell99/master fix: call base class onload method	2019-02-27 08:31:14 +05:30
crossxcell99	f95171e808	fix: call base clase onload method	2019-02-26 18:01:37 +01:00
scmmishra	90b503621b	fix: Content Routing	2019-02-26 17:20:38 +05:30
scmmishra	7e1678e287	fix: TopicMeta fixes	2019-02-26 17:11:01 +05:30
Sagar Vora	e0eafb1c2c	Merge branch 'master' into develop	2019-02-26 17:08:59 +05:30
Sagar Vora	5a14e46a1b	bumped to version 11.1.11	2019-02-26 17:28:58 +05:50
scmmishra	03c4c635e0	fix: list title on CoursePage	2019-02-26 16:54:32 +05:30
scmmishra	95bb3c0ee9	Minor fixes	2019-02-26 16:49:58 +05:30
scmmishra	c011b08699	fix: Fixed UI and API for course page	2019-02-26 16:49:38 +05:30
scmmishra	fed9adbc77	fix: Fixed API and UI for topic card	2019-02-26 16:49:15 +05:30
scmmishra	5ae51dc849	fix: Minor UI fixes	2019-02-26 16:48:49 +05:30
scmmishra	b5ba518bdb	style: Minor code formatting	2019-02-26 16:48:12 +05:30
scmmishra	a8ef773978	fix: Course Card shows topic list	2019-02-26 16:47:54 +05:30
scmmishra	a2ca8dd92f	fix: Route for course page	2019-02-26 16:47:10 +05:30
scmmishra	3866dee3e1	feat: Corse doctype	2019-02-26 16:37:31 +05:30
Rushabh Mehta	45c252a240	fix(test): test_task.py	2019-02-26 16:18:46 +05:30
Nabin Hait	39c489bfdc	Merge pull request #16781 from deepeshgarg007/summary fix: Make company filter mandatory in sales person wise transaction summary	2019-02-26 16:00:51 +05:30
Nabin Hait	be5124fe10	Merge pull request #16784 from rohitwaghchaure/multiple_fixes_e_invoicing fix: multiple e-invoicing issues for italy region	2019-02-26 15:52:56 +05:30
Rohit Waghchaure	0f98cb8b83	fix: multiple e-invoicing issues for italy region	2019-02-26 15:09:27 +05:30
Rushabh Mehta	b94c8b1c77	fix(tests): add test for bulk complete / cancellation of project	2019-02-26 14:30:38 +05:30
Rushabh Mehta	02a9ec33ed	BREAKING: Task status "Closed" renamed to Task status "Completed" and ability to close, cancel projects in bulk	2019-02-26 14:30:38 +05:30
Rushabh Mehta	2d2d176e5c	fix: linting	2019-02-26 14:30:38 +05:30
Rushabh Mehta	e9984672ce	feat: Project Template	2019-02-26 14:30:38 +05:30
Saurabh	acf83791ab	fix: file api	2019-02-26 13:58:18 +05:30
deepeshgarg007	d2d84e3c9d	fix: Company filter fix	2019-02-26 11:52:22 +05:30
Suraj Shetty	5636f924a9	fix: get mode of payment while selecting payment term in payment term template (#16765 )	2019-02-25 12:43:34 +05:30
Nabin Hait	9990306399	fix: Consider only active BOMs while updating cost via BOM Update Tool (#16753 )	2019-02-25 11:59:05 +05:30
Rushabh Mehta	e2de8e0fa5	fix: expense claim type (#16760 )	2019-02-25 11:56:30 +05:30
Suraj Shetty	2dadc1ef98	chore: Remove trailing whitespaces	2019-02-21 20:51:35 +05:30
deepeshgarg007	bf6b36a39b	fix: Removed white spaces	2019-02-21 19:30:27 +05:30
deepeshgarg007	56b52d43e6	Merge branch 'hotfix' of https://github.com/frappe/erpnext into bom-item	2019-02-21 18:30:02 +05:30
Saurabh	3dd7ddd838	Merge branch 'master' into develop	2019-02-21 18:25:29 +05:30
Saurabh	76cd402ca5	bumped to version 11.1.10	2019-02-21 18:55:28 +06:00
Saurabh	e5ff28a92c	Merge pull request #16754 from deepeshgarg007/state_code fix: State code issue fix	2019-02-21 18:21:24 +05:30
Nabin Hait	367d7c104e	Merge pull request #16724 from rohitwaghchaure/user_progress_issue fix: user progress issue	2019-02-21 18:13:52 +05:30
Saurabh	47738f9792	Merge pull request #16750 from nabinhait/cc-against-bs fix: Ignore cost center while fetching outstanding invoices if not allowed from accounts settings	2019-02-21 18:12:06 +05:30
Nabin Hait	e08cb3a49b	Merge pull request #16745 from nabinhait/manage-returned-qty fix: Consider returned qty while making invoice from DN / PR	2019-02-21 18:11:37 +05:30
Nabin Hait	31f46b313c	Merge pull request #16728 from rohitwaghchaure/maintainance_visit_issue fix: not able to cancel maintenance visit	2019-02-21 18:10:46 +05:30
Nabin Hait	e328869b10	Merge pull request #16738 from deepeshgarg007/unique_tree_options fix: Filter out unique values for tree options	2019-02-21 18:09:42 +05:30
Nabin Hait	e3b1b11bc5	Merge pull request #16740 from nabinhait/leave-calendar fix: Calendar events for leaves considering user permissions	2019-02-21 18:08:19 +05:30
Saurabh	a05ccb76f4	Merge pull request #16748 from nabinhait/multi-company-serial-invoicing fix: Validate serial no usage in invoice considering multi company transaction	2019-02-21 18:07:40 +05:30
Nabin Hait	e797ec7463	Merge pull request #16746 from deepeshgarg007/gross_profit fix: Decimal point issue in gross profit print	2019-02-21 18:07:14 +05:30
deepeshgarg007	1915e15a9e	fix: State code issue fix in regional module(Italy)	2019-02-21 17:55:57 +05:30
rohitwaghchaure	a49f59fcec	Merge pull request #16751 from rohitwaghchaure/parent_value_showing_as_zero (Profit and Loss Statement, fix): for parent account value was showing as zero	2019-02-21 17:50:51 +05:30
Rohit Waghchaure	90691dc0d8	(Profit and Loss Statement, fix): for parent account value was showing as zero	2019-02-21 17:18:28 +05:30
Nabin Hait	b24caad789	fix: Ignore cost center while fetching outstanding invocies if not allowed from accounts settings	2019-02-21 17:11:35 +05:30
Rohan Bansal	143973166f	fix(payments): Only check for Draft or Submitted paymentswhile cancelling payment requests	2019-02-21 15:57:06 +05:30
Suraj Shetty	463a3cf8cf	Merge pull request #16725 from deepeshgarg007/item_dashboard fix: Item name display issue fix in item dashboard	2019-02-21 14:42:38 +05:30
Nabin Hait	26972c954d	fix: Validate serial no usage in invoice considering multi company transaction	2019-02-21 14:32:41 +05:30
deepeshgarg007	14ff6bfc32	fix: Decimal point issue in gross profit print	2019-02-21 12:08:32 +05:30
Nabin Hait	816a4655a0	fix: Consider returned qty while making invoice from DN / PR	2019-02-21 12:02:36 +05:30
Nabin Hait	40c15d2e74	fix: Calendar events for leaves considering user permissions	2019-02-20 18:55:38 +05:30
Saurabh	482ebd2c7c	Merge branch 'master' into develop	2019-02-20 18:14:18 +05:30
Saurabh	ada93e5d77	bumped to version 11.1.9	2019-02-20 18:44:17 +06:00
deepeshgarg007	0d64d622e5	fix: filter only unique values for tree options	2019-02-20 17:55:14 +05:30
rohitwaghchaure	485bd93dae	Merge pull request #16737 from saurabh6790/indentation_fixes fix: reload report doc and indentation fixes	2019-02-20 17:40:50 +05:30
rohitwaghchaure	c18e925d61	fix: Moved regional methods from controller to hooks (#16736 )	2019-02-20 17:13:15 +05:30
Saurabh	9fcfc63f77	fix: reload report doc and indentation fixes	2019-02-20 17:04:18 +05:30
rohitwaghchaure	ef3f864123	fix: not able to submit purchase order (#16735 )	2019-02-20 15:47:06 +05:30
rohitwaghchaure	e141865c43	Merge pull request #16722 from rohitwaghchaure/stop_button_not_working fix: stop button not working in material request	2019-02-20 12:30:26 +05:30
Sagar Vora	eba76c99a3	Merge branch 'master' into develop	2019-02-20 12:11:25 +05:30
Sagar Vora	d48393541d	bumped to version 11.1.8	2019-02-20 12:31:25 +05:50
Gaurav Naik	3bf0acbac6	fix(regional,italy): renamed validate hook for address (#16732 )	2019-02-20 12:08:53 +05:30
Rohit Waghchaure	7e02e1c3cd	fix: not able to cancel maintenance visit	2019-02-19 22:53:31 +05:30
deepeshgarg007	1b04534095	fix: Removed duplicate fields from BOM Item	2019-02-19 21:36:12 +05:30
deepeshgarg007	942c894f93	fix: fetch item name in item dashboard	2019-02-19 19:51:23 +05:30
Rohit Waghchaure	f4049f9dfd	fix: user progress issue	2019-02-19 19:46:14 +05:30
Rohit Waghchaure	389cd6ad63	fix: stop button not working in material request	2019-02-19 19:18:07 +05:30
scmmishra	62968b318f	wip	2019-02-19 18:25:07 +05:30
Sagar Vora	cc6e51c62d	Merge branch 'master' into develop	2019-02-19 18:09:49 +05:30
Sagar Vora	f5c511c193	bumped to version 11.1.7	2019-02-19 18:14:14 +05:50
Nabin Hait	2c23f98b65	Merge pull request #16721 from nabinhait/ar-ap-fix fix: AR/AP report based on account type	2019-02-19 17:45:30 +05:30
Gaurav	3f046136d4	fix(regional,italy): added state code on address, updated patch moved state codes to init, rewired patch added logic to autoset state code on address validate handled multiple names for Italy refactored validate_address_italy to validate_address	2019-02-19 17:28:36 +05:30
Nabin Hait	e4f73929c4	fix: AR/AP report based on account type	2019-02-19 17:11:50 +05:30
scmmishra	cb8ef96f6b	chore (css): Switched to frappe navbar	2019-02-19 17:03:16 +05:30
scmmishra	1682aa8a36	fix (css): Removed container class	2019-02-19 17:01:31 +05:30
Nabin Hait	8e9d947527	Merge branch 'hotfix' into fix-item-variant-settings-barcodes	2019-02-19 15:07:46 +05:30
Nabin Hait	21706894af	Merge pull request #16705 from deepeshgarg007/pos-precision fix: Fetch precision form system settings in Sales invoice payment(POS)	2019-02-19 15:06:56 +05:30
Nabin Hait	818ead4041	Merge branch 'hotfix' into purchase-qty-fix	2019-02-19 15:06:10 +05:30
Nabin Hait	157526c978	Merge pull request #16711 from rohitwaghchaure/multi_uom_not_working_for_rate_pricing_rule fix: multi-uom not working for the pricing rule rate	2019-02-19 15:05:07 +05:30
Nabin Hait	6bd3098824	Merge pull request #16716 from deepeshgarg007/precision-fix fix: Removed precision from multiple doctypes	2019-02-19 15:03:00 +05:30
Gaurav	2670ad7eb2	mod(regional,italy): adjusted calculation logic for charges validation for missing code on mode of payment UOM from settings Replace str with cstr	2019-02-19 13:15:25 +05:30
scmmishra	765529241e	[Major][Breaking] More changes	2019-02-19 13:06:33 +05:30
scmmishra	da39da627c	[Major][Breaking] Server side changes to handle Topic Layer - Moved `get_course_progress` to CourseEnrollment class. - Added Topic context to progress functions in lms.py - Create user on creation of a student	2019-02-19 13:06:33 +05:30
scmmishra	cc7290b7af	[Major][Breaking] Student Class	2019-02-19 13:06:33 +05:30
scmmishra	766f68a20a	[Major][Breaking] Modified lms.py and utils	2019-02-19 13:06:33 +05:30
scmmishra	e7d52c594b	[Major][Breaking] Program Enrollment Creates Course enrollment	2019-02-19 13:06:33 +05:30
scmmishra	1253061055	[Major][Breaking] Modified Course Doctype, added Topic based functions	2019-02-19 13:06:33 +05:30
scmmishra	42f50fd82c	[Major][Breaking] Added Topic Layer in Course	2019-02-19 13:06:33 +05:30
scmmishra	699f7c6fee	Minor changes	2019-02-19 13:06:33 +05:30
scmmishra	42f3c51ff7	Removed Content Doctype	2019-02-19 13:06:33 +05:30
scmmishra	6663ca1d7f	Adding Test Utils	2019-02-19 13:06:33 +05:30
scmmishra	c51f738b03	Refactored student creation	2019-02-19 13:06:33 +05:30
scmmishra	689500d081	Minor UI Fixes	2019-02-19 13:06:33 +05:30
scmmishra	d02fd13bf0	UI Improvements: Added Custom Navbar	2019-02-19 13:06:33 +05:30
scmmishra	87df23b52d	Added quiz card on profile page	2019-02-19 13:06:33 +05:30
scmmishra	4d10229cef	Quiz Progress and Minor fixes	2019-02-19 13:06:33 +05:30
scmmishra	c84a318591	Student and User link for LMS added	2019-02-19 13:06:33 +05:30
scmmishra	b3154efa84	UI Fixes	2019-02-19 13:06:33 +05:30
scmmishra	798f13be0d	More Improvements	2019-02-19 13:06:33 +05:30
scmmishra	02420bd4ba	Client side improvements	2019-02-19 13:06:33 +05:30
scmmishra	edc54cd5f6	Minor improvements for CardList.vue	2019-02-19 13:06:33 +05:30
scmmishra	2955851867	Built Student Profile Page	2019-02-19 13:06:33 +05:30
scmmishra	308f235859	Added Profile page	2019-02-19 13:06:33 +05:30
scmmishra	201fec3101	Minor Improvements	2019-02-19 13:06:33 +05:30
scmmishra	97c994f394	create course enrollment if not already enrolled for a program	2019-02-19 13:06:33 +05:30
scmmishra	affbfe7d0c	Added get_program_meta	2019-02-19 13:06:33 +05:30
scmmishra	cbb7c7ff23	ui fixes	2019-02-19 13:06:33 +05:30
scmmishra	cc755f6204	Doctype Changes for Beta Release	2019-02-19 13:06:33 +05:30
scmmishra	788ffbd5b6	Minor improvements	2019-02-19 13:06:33 +05:30
scmmishra	9229f4fc92	UI fixes	2019-02-19 13:06:33 +05:30
scmmishra	082e3c94ef	Minor Fixes: Student Enrollment	2019-02-19 13:06:32 +05:30
scmmishra	fdbabde80a	UI fixes for course card	2019-02-19 13:06:32 +05:30
scmmishra	be7fadc521	Renamed CoursePage to ContentPage	2019-02-19 13:06:32 +05:30
scmmishra	d93cec374d	Minor UI changes	2019-02-19 13:06:32 +05:30
scmmishra	a592f70d4a	Refactored Course Progression Logic	2019-02-19 13:06:32 +05:30
scmmishra	1192529698	Refactored lms.py, modified utils	2019-02-19 13:06:32 +05:30
scmmishra	8951c165f0	Fixed major bugs	2019-02-19 13:06:32 +05:30
scmmishra	53c2d5db63	Refactored lms store	2019-02-19 13:06:32 +05:30
scmmishra	0a5c7a6b46	Removed unnecessary prints	2019-02-19 13:06:32 +05:30
scmmishra	babb68d36c	Refactored server side code	2019-02-19 13:06:32 +05:30
scmmishra	19e12ac3d6	Minor changes to quiz doctype	2019-02-19 13:06:32 +05:30
scmmishra	80ecc56cbe	Using lms.call across the Vue app	2019-02-19 13:06:32 +05:30
scmmishra	0a4902f8b5	UI Changes	2019-02-19 13:06:32 +05:30
scmmishra	c5a1226e93	Refactored State management store	2019-02-19 13:06:32 +05:30
scmmishra	85c2feec0d	Added ListPage and other UI improvements	2019-02-19 13:06:32 +05:30
scmmishra	efb01c3f75	Renamed components	2019-02-19 13:06:32 +05:30
scmmishra	2596ea0816	Renamed Vue Files	2019-02-19 13:06:32 +05:30
scmmishra	0225642459	Renamed Pages	2019-02-19 13:06:32 +05:30
scmmishra	8ff1028665	Renamed AcademyRoot to lmsRoot	2019-02-19 13:06:32 +05:30
scmmishra	1fbe2d4b2b	Renamed academy to lms (Client Side)	2019-02-19 13:06:32 +05:30
scmmishra	35bf561a6f	Renamed academy to lms on server side	2019-02-19 13:06:32 +05:30
scmmishra	44921a3ee9	Renamed default element for Vue to mount on	2019-02-19 13:06:32 +05:30
scmmishra	91bbe776c1	Modified `academy.call` to point to erpnext.www.lms	2019-02-19 13:06:32 +05:30
scmmishra	af30b771f0	Renamed academy to lms on server side	2019-02-19 13:06:32 +05:30
scmmishra	f9f7318d3f	Deleted Old LMS Content	2019-02-19 13:06:32 +05:30
scmmishra	d7c993f028	Minor UI changes	2019-02-19 13:06:32 +05:30
scmmishra	f9b2fb6717	Fixed course and content page	2019-02-19 13:06:32 +05:30
scmmishra	db9c8b795a	Functions now have a login context	2019-02-19 13:06:32 +05:30
scmmishra	708756ed40	Added academy namespace	2019-02-19 13:06:32 +05:30
scmmishra	892b0c23fc	Added class functions	2019-02-19 13:06:31 +05:30
scmmishra	cc166c01eb	Improved Client implementation	2019-02-19 13:06:31 +05:30
scmmishra	c1b1a5ec37	Permission Changes	2019-02-19 13:06:31 +05:30
scmmishra	8fa9adec37	More Bug fixes UI and Permissions	2019-02-19 13:06:31 +05:30
scmmishra	05e07b44b1	Removed unused utils functions	2019-02-19 13:06:31 +05:30
scmmishra	734a746687	Minor DocType changes	2019-02-19 13:06:31 +05:30
scmmishra	b409f7a388	Minor UI Changes and Fixes	2019-02-19 13:06:31 +05:30
scmmishra	850dfd0358	Set appropriate permissions	2019-02-19 13:06:31 +05:30
scmmishra	9f316a3b30	Permission changes	2019-02-19 13:06:31 +05:30
scmmishra	86897b3cc8	UI: Kinda fixed "Completed" button render issue	2019-02-19 13:06:31 +05:30
scmmishra	5611bf4e29	Minor change	2019-02-19 13:06:31 +05:30
scmmishra	25e42baeaf	Course completion logic complete	2019-02-19 13:06:31 +05:30
scmmishra	a920bca044	Minor UI fixes	2019-02-19 13:06:31 +05:30
scmmishra	0187b18c06	Added methods to saving Quiz attempts	2019-02-19 13:06:31 +05:30
scmmishra	76222f7acc	Modified add-activity, no duplicates will be saved now	2019-02-19 13:06:31 +05:30
scmmishra	a3afe2a998	Sending session data explicitly	2019-02-19 13:06:31 +05:30
scmmishra	cfce153ed4	Minor UI changes	2019-02-19 13:06:31 +05:30
scmmishra	1f4835b3b4	Added Video UI	2019-02-19 13:06:31 +05:30
scmmishra	6de9cbb52d	Solved minor issue (Last activity not being saved)	2019-02-19 13:06:31 +05:30
scmmishra	1a04f774d7	LMS: Saving Course Activity	2019-02-19 13:06:31 +05:30
scmmishra	7d5e218155	Modified Quiz Evaluation	2019-02-19 13:06:31 +05:30
scmmishra	ed5892c7a5	UI: Components rendered based on student progress	2019-02-19 13:06:31 +05:30
scmmishra	a054655442	Updated state functions for session management	2019-02-19 13:06:31 +05:30
scmmishra	90722e3a9b	Fixed Permissions for LMS User	2019-02-19 13:06:31 +05:30
scmmishra	73a31ec7bb	Added functions to query Student enrollments	2019-02-19 13:06:31 +05:30
scmmishra	91aa0e07c8	Added class function for student enrollment	2019-02-19 13:06:31 +05:30
scmmishra	734d3e084c	Set home page for LMS User	2019-02-19 13:06:31 +05:30
scmmishra	8b8db54ef4	Added enroll function	2019-02-19 13:06:30 +05:30
scmmishra	15012c08a4	UI Fixes	2019-02-19 13:06:30 +05:30
scmmishra	72fd3bc0ea	Removed unnecessary watcher	2019-02-19 13:06:30 +05:30
scmmishra	3c412f56c9	UI: Changes to AcademyTopSection	2019-02-19 13:06:30 +05:30
scmmishra	bcafe84bb6	Adding session management to client	2019-02-19 13:06:30 +05:30
scmmishra	7a19b63837	Minor changes	2019-02-19 13:06:30 +05:30
scmmishra	e30f2eb297	Re-factored CourseCard UI	2019-02-19 13:06:30 +05:30
scmmishra	6678f5b88e	Added custom store for state management	2019-02-19 13:06:30 +05:30
scmmishra	ef9a75e50d	Removed unnecessary print statements	2019-02-19 13:06:30 +05:30
scmmishra	cd0cab78a5	Quiz UI Working	2019-02-19 13:06:30 +05:30
scmmishra	f9e8e4e2d3	Modified question.py	2019-02-19 13:06:30 +05:30
scmmishra	f7029f084c	Quiz is now submittable	2019-02-19 13:06:30 +05:30
scmmishra	cfc35f4424	Quiz: Save responses as an object	2019-02-19 13:06:30 +05:30
scmmishra	d2e040b6f1	Added separate ContentTitle component	2019-02-19 13:06:30 +05:30
scmmishra	160d8b0914	Added separate ContentTitle component	2019-02-19 13:06:30 +05:30
scmmishra	d87ca178d8	UI for Quiz	2019-02-19 13:06:30 +05:30
scmmishra	374184414b	Added quiz functions	2019-02-19 13:06:30 +05:30
scmmishra	7a59f9501e	UI for Content	2019-02-19 13:06:30 +05:30
scmmishra	bcafbea481	UI for Course page	2019-02-19 13:06:30 +05:30
scmmishra	b43ab3317c	UI for home page and program page	2019-02-19 13:06:30 +05:30
scmmishra	9c642ace52	Helper Functions for VueJS	2019-02-19 13:06:30 +05:30
scmmishra	84297fa349	Starting with VueJS	2019-02-19 13:06:30 +05:30
scmmishra	1778b59efa	Started with Vue	2019-02-19 13:06:30 +05:30
scmmishra	9456c82536	Getting started with Vue	2019-02-19 13:06:29 +05:30
scmmishra	5e758aea00	Minor Changes	2019-02-19 13:06:29 +05:30
scmmishra	75ad128912	Added LMS Settings	2019-02-19 13:06:29 +05:30
scmmishra	9e80f32e2a	Minor Changes	2019-02-19 13:06:29 +05:30
scmmishra	1e1f1ad186	LMS: Course Completion Status Working	2019-02-19 13:06:29 +05:30
scmmishra	a8703d4036	LMS: Changes to Course Activity Doctype, Course Activity Tracking Works Co-authored-by: Sahil <sahilkhan28297@gmail.com>	2019-02-19 13:06:29 +05:30
scmmishra	57c77e452b	LMS: Course Activity Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:29 +05:30
scmmishra	7409fe6438	LMS: Quiz Eval and Max Attempts Check Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:29 +05:30
Chinmay Pai	3574ac3f5e	quiz_activity: add quiz activity Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:29 +05:30
scmmishra	3bf71a2df6	Quiz Logic	2019-02-19 13:06:29 +05:30
scmmishra	d133e8229b	Quiz Evaluation Logic	2019-02-19 13:06:29 +05:30
scmmishra	4f439ec4dd	Quiz eval utils	2019-02-19 13:06:29 +05:30
scmmishra	0d4135ec2b	LMS: Fixed view for Quiz Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:29 +05:30
scmmishra	91bbe10495	LMS: More changes to the web view	2019-02-19 13:06:29 +05:30
scmmishra	5569cbf82c	Revert "LMS: Fixed views for article and video" This reverts commit 9b7585405f7e25dcdcba4e131066d6b57a1d8899.	2019-02-19 13:06:29 +05:30
scmmishra	1e10fc43f4	LMS: Fixed views for article and video	2019-02-19 13:06:29 +05:30
scmmishra	590227b107	LMS: Fixed views for article and video	2019-02-19 13:06:29 +05:30
scmmishra	18baff5fec	Minor changes to question doctype Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:29 +05:30
scmmishra	541a522b26	LMS:Added class methods for course, program and student doctypes Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:29 +05:30
Chinmay Pai	1869419bdc	lms: refactor entire course model each course item now has its own doctype. Co-authored-by: Shivam Mishra <scm.mymail@gmail.com> Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:28 +05:30
scmmishra	685584bf56	Quiz: Quiz now displays correctly on the portal Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:28 +05:30
scmmishra	3757a4eab8	Modified program and index view Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:28 +05:30
scmmishra	fa2db3c41b	LMS: Added functions to get LMS contents Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:06:28 +05:30
scmmishra	82df4378de	Changes to get_quiz function	2019-02-19 13:06:28 +05:30
scmmishra	3cbb9795a4	Minor changes to doctypes	2019-02-19 13:06:28 +05:30
scmmishra	f9cef33e41	Dashboard changes for student and program	2019-02-19 13:06:28 +05:30
scmmishra	5311e3898c	General Changes	2019-02-19 13:06:28 +05:30
scmmishra	31cbe3c0dc	Added function to retrieve quiz data as JSON	2019-02-19 13:05:23 +05:30
scmmishra	d1650b9f63	Modified Question doctype for a better design	2019-02-19 13:05:23 +05:30
scmmishra	1fc45c547b	Added Course Enrollment doctype	2019-02-19 13:05:23 +05:30
scmmishra	06d175a2bd	Added Quiz Activity doctype	2019-02-19 13:05:23 +05:30
scmmishra	e7308125b4	Replaced Student Course Activity with Course Activity	2019-02-19 13:05:23 +05:30
scmmishra	17294e703e	Course Activity linked to Student ID	2019-02-19 13:05:23 +05:30
scmmishra	38c1baf719	Templates: modified routing logic, added data attributes in template Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	9335593b56	LMS: JS Script to send quiz and activity data	2019-02-19 13:05:23 +05:30
scmmishra	4ae11f4d74	LMS: added python functions to evaulate quiz and save student activity Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	eab0b833a1	Modified Student Course Activity Doctype Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	6660a675f1	templates: add templates for LMS content Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	de36e13db7	modified doctypes for lms Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	836a4b5e54	lms: add activity child table and create frontend Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	b3b003f518	course_activity: create doctype for tracking student course activity Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	55e7c1a866	api: create user account for student Co-authored-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-19 13:05:23 +05:30
scmmishra	43da645be0	Added Web Academy Applicant doctype	2019-02-19 13:05:23 +05:30
scmmishra	4e208e99bc	Added Student Course Acitivity doctype	2019-02-19 13:05:23 +05:30
scmmishra	8c41abc2df	Modified education menu items	2019-02-19 13:03:59 +05:30
scmmishra	84a49d5ea7	Modified Content doctype, added question child table for quiz	2019-02-19 13:03:59 +05:30
scmmishra	f05837a895	Updated Content Doctype	2019-02-19 13:03:59 +05:30
scmmishra	abd1d209fb	Added Content Doctype	2019-02-19 13:03:59 +05:30
Gaurav	f1e28e0e8d	mod(regional,italy): Updates to Italian Localization fixes: removed cleanup_files from italy/utils removed extract_doc_number from italy/utils added country filter to italian localization patch replaced dict assignment with dot operator in prepare_invoice correcions in e-invoice xml following changes in prepare_invoice added setup_report in patch added section for e-invoicing custom fields in company added Italy in test_company	2019-02-19 10:39:22 +05:30
Gaurav	a4aa80fe05	feature(regional): Italian Localization Added setup.py for italy under regional Included fiscal regimes, tax exemption reasons and custom fields Issue #16259	2019-02-19 10:39:10 +05:30
Jigar Tarpara	1ac17ec1c4	Add credit month in validation	2019-02-19 10:21:01 +05:30
deepeshgarg007	de0f59b818	fix: Removed precision from multiple doctypes	2019-02-19 08:40:16 +05:30
Rohit Waghchaure	5821b672ad	fix: multi-uom not working for the pricing rule rate	2019-02-18 20:07:44 +05:30
Nabin Hait	750fe6eaea	fix: get item rate in bom	2019-02-18 18:56:08 +05:30
deepeshgarg007	9a19e06856	fix: Change Received qty to accepted qty and validation for indicators	2019-02-18 18:42:15 +05:30
Rohit Waghchaure	99e7362006	fix: Allow to make material request from draft job card	2019-02-18 18:26:50 +05:30
deepeshgarg007	48a7262fae	fix: Precision issue in POS payment	2019-02-18 15:05:36 +05:30
Anurag Mishra	879e5fd8bb	remove print and codacy	2019-02-18 14:43:55 +05:30
Anurag Mishra	42a106c7ba	Auditors print formats	2019-02-18 14:35:33 +05:30
rohitwaghchaure	1bcbe9069b	Merge pull request #16610 from jay-parikh/hotfix fix: (POS) Item listing issue in pos after submit for Multi Company POS Profile	2019-02-18 12:43:57 +05:30
Rushabh Mehta	20db65ef77	Merge pull request #16694 from rmehta/refactor-comments fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891	2019-02-18 12:05:35 +05:30
Anurag Mishra	61f981ae05	Changes Requested	2019-02-18 11:43:32 +05:30
Rushabh Mehta	f3b33f3ab2	Merge pull request #16611 from karthikeyan5/hotfix-marketplace-features feat(marketplace): seller profile page	2019-02-18 11:24:01 +05:30
Rushabh Mehta	1a6668ef3c	Merge pull request #16633 from pratu16x7/explore-2.0 feat(modules): Add getting started and help desk, merge settings	2019-02-18 11:20:14 +05:30
Rushabh Mehta	39c106dd05	fix(test): rename test in test_customer	2019-02-18 11:16:59 +05:30
Suraj Shetty	053d6a2ca1	Move reload doc before get query	2019-02-17 11:24:51 +05:30
Suraj Shetty	3a2f342ac1	Ignore duplicate entry	2019-02-16 21:09:24 +05:30
Suraj Shetty	1399fbe986	Move patch	2019-02-16 21:02:34 +05:30
Suraj Shetty	8cbe824c5b	Rerun item_barcode_chidtable_migrate patch	2019-02-16 17:54:15 +05:30
Suraj Shetty	cc0222a28a	Remove unwanted barcode field from item	2019-02-16 17:53:23 +05:30
Rushabh Mehta	7bb9eae685	Merge pull request #16541 from alyf-de/develop feat(regional): Germany module with address template	2019-02-16 10:54:28 +05:30
Frappe Bot	74fd5daeb2	Merge branch 'master' into develop	2019-02-15 10:22:33 +00:00
Frappe Bot	acf26c8569	bumped to version 11.1.6	2019-02-15 10:22:32 +00:00
Faris Ansari	8a01342e48	fix: Remove comment	2019-02-15 15:14:38 +05:30
Nabin Hait	09a4df74f0	Merge pull request #16645 from nabinhait/tds-fix fix: Ignore tds account while creating tax withholding category	2019-02-15 14:53:30 +05:30
Nabin Hait	eb0627356b	Merge pull request #16650 from nabinhait/general-ledger-fix fix: show values in account/party currency based in actual entry, no conversion	2019-02-15 14:53:12 +05:30
Nabin Hait	b5c249583a	Merge pull request #16651 from netchampfaris/fix-barcode-scanning-ux fix: Barcode scanning UX	2019-02-15 14:52:42 +05:30
Nabin Hait	b819f104e6	Merge pull request #16653 from nabinhait/item-variants fix: Enqueued item variants updation if there are more than 30 variants	2019-02-15 14:51:14 +05:30
Nabin Hait	c45962e3ef	Merge pull request #16675 from deepeshgarg007/purchase-fix fix: Purchase order item description fix	2019-02-15 14:50:38 +05:30
Nabin Hait	aa80a223d8	Merge pull request #16674 from deepeshgarg007/address-rep-fix fix: Address and contact report	2019-02-15 14:26:16 +05:30
Nabin Hait	8788a5c712	Merge pull request #16676 from nabinhait/get-item-details fix: get item details	2019-02-15 14:24:46 +05:30
Nabin Hait	b1cbe221b7	Merge pull request #16677 from nabinhait/total-qty-patch-fix fix: Consider parenttype while updating total qty in transactions	2019-02-15 14:24:30 +05:30
Nabin Hait	a0c9c7501b	Update update_total_qty_field.py	2019-02-15 14:24:08 +05:30
Tropicalrambler	3a88bc43dc	fix: typo in salary register report field name (#16670 ) When assigning salary slip field values to row list for salary register, line 22, the field was incorrectly spelled. The correct value in the Salary Slip DocType is `leave_without_pay`, and this change reflects this. Line 27 also reflects this adjustment.	2019-02-15 13:40:44 +05:30
Sagar Vora	379e6a4635	Merge branch 'hotfix' into address-rep-fix	2019-02-15 13:08:42 +05:30
Nabin Hait	4df7679c65	fix: Get outstanding invoices	2019-02-15 13:08:04 +05:30
Sagar Vora	ebdd8a9710	Merge branch 'hotfix' into purchase-fix	2019-02-15 13:04:32 +05:30
Sagar Vora	921f468950	Merge branch 'hotfix' into get-item-details	2019-02-15 13:03:04 +05:30
Nabin Hait	6f7a4d94ce	fix: Consider parenttype while updating total qty in transactions	2019-02-14 19:34:43 +05:30
Nabin Hait	f66c6874ca	Merge pull request #16652 from nabinhait/work-order-fix fix: Make work order from production plan considering already ordered qty	2019-02-14 18:50:30 +05:30
Nabin Hait	54f8ed1282	Merge branch 'hotfix' into item-variants	2019-02-14 18:50:11 +05:30
Nabin Hait	c3698e458f	Merge pull request #16666 from nabinhait/deferred-revenue-fix fix: errors in deferred revenue booking	2019-02-14 18:49:01 +05:30
Nabin Hait	1c6a1dd5c0	Merge branch 'hotfix' into general-ledger-fix	2019-02-14 18:37:40 +05:30
Nabin Hait	0d1ccc357f	fix: get item details	2019-02-14 18:30:10 +05:30
deepeshgarg007	867ca63750	fix: Purchase order item description fix	2019-02-14 18:10:47 +05:30
Deepesh Garg	20008946a3	Merge branch 'hotfix' into address-rep-fix	2019-02-14 17:37:41 +05:30
Deepesh Garg	4902f7b2a0	fix: Show tasks in timesheet with status as Closed (#16660 )	2019-02-14 17:32:52 +05:30
deepeshgarg007	34f4f24e21	fix: Address and contact report	2019-02-14 17:26:49 +05:30
Nabin Hait	29fcb14c42	fix: errors in deferred revenue booking	2019-02-13 17:18:12 +05:30
Deepesh Garg	4d1bc0ca85	fix: Add total row in analytics report (#16648 )	2019-02-13 16:58:46 +05:30
Anurag Mishra	4f0fd38209	refractor	2019-02-13 16:46:05 +05:30
Faris Ansari	a748ca69e7	fix: Validate invalid fields in Item Variant Settings - Some fields like barcodes cannot be copied in Item Variants - Wrote a patch that deletes the fields if they exist - Also, validate in controller	2019-02-13 13:02:39 +05:30
rohitwaghchaure	a0aaeafae8	Merge pull request #16644 from rohitwaghchaure/fix_work_order_time_log_msg fix: validation message for work order	2019-02-13 09:49:25 +05:30
Faris Ansari	795102125c	Merge branch 'hotfix' into fix-barcode-scanning-ux	2019-02-12 18:31:06 +05:30
Nabin Hait	db527bfb24	fix: Enqueued item variants updation if there are more than 30 variants	2019-02-12 18:30:00 +05:30
Nabin Hait	1a3c27bbea	fix: Make work order from production plan considering already ordered qty	2019-02-12 17:38:37 +05:30
Faris Ansari	5631ffca68	fix: Barcode scanning UX	2019-02-12 17:12:48 +05:30
Sagar Vora	551f52fd25	Merge branch 'master' into develop	2019-02-12 16:41:24 +05:30
Nabin Hait	6447069e50	fix: show values in account/party currency based in actual entry, no conversion	2019-02-12 16:41:20 +05:30
Sagar Vora	6837ae3377	bumped to version 11.1.5	2019-02-12 16:54:29 +05:50
karthikeyan5	4324dc6ea8	fix(marketplace): fixing hubmarket server specific error	2019-02-12 15:12:23 +05:30
karthikeyan5	4df6003bd9	feat(marketplace): seller profile page	2019-02-12 15:12:23 +05:30
karthikeyan5	2894f7935a	feat(marketplace): featured Items for sellers	2019-02-12 15:12:23 +05:30
karthikeyan5	88baf53cc1	feat(marketplace): navigation link to seller profile from item page	2019-02-12 15:12:23 +05:30
Nabin Hait	fdefbdb23b	Merge pull request #16609 from nabinhait/multipel_fixes Multiple fixes	2019-02-12 13:56:06 +05:30
Prateeksha Singh	426468183f	fix(getting_started): main domain specific masters	2019-02-12 13:08:21 +05:30
Nabin Hait	c46d995480	Merge pull request #16628 from Zlash65/fix-noti-patch fix: Notification Control delete	2019-02-12 13:04:45 +05:30
Nabin Hait	e6abee4bd5	Merge pull request #16643 from Zlash65/field-fix fix: Fieldtype and Fetch From fixes	2019-02-12 13:04:00 +05:30
Nabin Hait	ca536efe7b	Merge pull request #16640 from nabinhait/pur_reg_fix fix: show project even if PI is directly created	2019-02-12 13:01:18 +05:30
Deepesh Garg	da7c20e474	fix: Validate task dates in project (#16586 ) * fix: Validate task dates in project * fix: Test case fix and validation only if date exists * fix: Added dates in error messages	2019-02-12 12:55:50 +05:30
Rohit Waghchaure	e0412a177c	fix: validation message for work order	2019-02-12 11:47:16 +05:30
Zlash65	fc88029d7d	fix: fix item field for clinical procedure template	2019-02-12 11:38:27 +05:30
Zlash65	b614fb1d45	fix: make finance book field as link field and rectify fetch_from	2019-02-12 11:30:58 +05:30
Nabin Hait	afef9c1cc7	fix: Ignore tds account while creating tax withholding category	2019-02-12 11:28:20 +05:30
Zlash65	fd3998cfc9	fix: make branch as link field	2019-02-12 11:27:23 +05:30
Prateeksha Singh	9adad2988d	feat(getting_started): Minimum requirements to setup	2019-02-12 08:37:53 +05:30
Prateeksha Singh	08a6de6b41	fix(modules): shorten descriptions	2019-02-12 07:41:52 +05:30
Nabin Hait	ab50211e18	fix: show project even if PI is directly created	2019-02-11 18:25:18 +05:30
Anurag Mishra	aaa57026ac	Merge branch 'gross-and-net-profit-report' of https://github.com/Anurag810/erpnext into gross-and-net-profit-report	2019-02-11 17:02:59 +05:30
Anurag Mishra	f70d4089bc	fix: codacy	2019-02-11 17:02:20 +05:30
Sagar Vora	4e92414850	Merge branch 'hotfix' into gross-and-net-profit-report	2019-02-11 16:00:28 +05:30
sahil28297	1a7e438fb2	fix(pstch): allow duplicate entries (#16632 )	2019-02-11 15:53:04 +05:30
Rohan Bansal	d635f722fc	fix(stock_balance): Make balance qty and value columns more visible	2019-02-11 15:22:01 +05:30
Prateeksha Singh	9d4a183074	fix(modules): Merge Settings into one, Setup --> Settings	2019-02-11 15:14:50 +05:30
rohitwaghchaure	d95c8cfac3	Merge pull request #16621 from netchampfaris/fix-warehouse-currency fix: Set company_currency for Warehouse Tree	2019-02-11 14:58:02 +05:30
Prateeksha Singh	01a045a488	feat(modules): Add getting started and help desk	2019-02-11 14:01:04 +05:30
Anurag Mishra	a032f0528e	new report gross-and-net-profit-report	2019-02-11 13:12:44 +05:30
Zlash65	a206f06af9	delete notification control's docctype entry	2019-02-11 12:01:01 +05:30
Nabin Hait	bb6438af5a	Merge pull request #16537 from nabinhait/stock-balance-fix fix: Fixed error on stock balance report	2019-02-11 11:00:01 +05:30
Rushabh Mehta	c8018bdeb1	fix: refactored comments API. Depends on https://github.com/frappe/frappe/pull/6891	2019-02-09 21:10:29 +05:30
Faris Ansari	453964728d	fix: Set company_currency for Warehouse Tree	2019-02-09 20:27:42 +05:30
Nabin Hait	17e0513270	fix: message if stock reco is enqueued	2019-02-08 16:56:26 +05:30
Nabin Hait	8d4bb3e327	fix: backflush only if transferred item is present in work order	2019-02-08 16:56:26 +05:30
Nabin Hait	450fe309d6	fix: allow updating title of material request	2019-02-08 16:56:26 +05:30
Nabin Hait	e3b0f4f9f6	fix: removed account type filter on employee advance account	2019-02-08 16:56:26 +05:30
Nabin Hait	27af6b377f	fix: defered accounting fixes	2019-02-08 16:56:26 +05:30
Jay Parikh	1906f6da3a	Fix - POS >> Item listing after submit pos >> list all the items which are not restricted to that pos profile #16588	2019-02-08 11:13:09 +00:00
Aditya Hase	e53a6a6723	Merge branch 'develop' into fix-py3	2019-02-08 12:51:05 +05:30
Nabin Hait	208ce5dcea	fix: removed module type for learn	2019-02-08 12:25:30 +05:30
Aditya Hase	13808b4cc9	fix(py3): Convert to float before comparison	2019-02-08 12:03:25 +05:30
Aditya Hase	2a3c39f38a	fix(py3): Convert dict.values() to list for indexing	2019-02-08 12:02:57 +05:30
Aditya Hase	46d7456782	fix(py3): Convert list to filter for indexing	2019-02-08 12:02:14 +05:30
Prateeksha Singh	e31cdb5b85	fix(modules): add ERPNext settings module	2019-02-08 08:06:23 +05:30
Aditya Hase	a86a569787	fix(py3): Convert dict.values() to list for indexing	2019-02-07 22:21:06 +05:30
Aditya Hase	3e954734d0	fix(py3): Convert filter to list for indexing	2019-02-07 22:21:05 +05:30
Aditya Hase	6e1bb60b58	fix(py3): Convert filter to list for indexing	2019-02-07 22:21:05 +05:30
Aditya Hase	e1f867f29f	fix(py3): Explicitly convert to float for comparison	2019-02-07 22:21:05 +05:30
Aditya Hase	d9ce732d3e	fix(py3): Explicitly convert to float for comparison	2019-02-07 22:21:05 +05:30
Aditya Hase	a9f20d801d	Merge pull request #16599 from adityahase/python3-fix fix(py3): Use six.text_type instead of unicode	2019-02-07 22:20:41 +05:30
Aditya Hase	691c166a56	fix(py3): Use six.text_type instead of unicode	2019-02-07 20:35:52 +05:30
Aditya Hase	0b1dc32fcb	Merge pull request #16597 from adityahase/python3-fix fix(py3): Use range instead of xrange	2019-02-07 18:17:37 +05:30
Aditya Hase	b9dc031e86	fix(py3): Use range instead of xrange	2019-02-07 18:10:30 +05:30
Prateeksha Singh	3423407314	feat(module_links): rearrange links	2019-02-07 09:58:22 +05:30
Prateeksha Singh	9b14d46c1d	purge(modules): remove old desktop icon configs	2019-02-07 09:58:22 +05:30
Prateeksha Singh	063af4ed08	config(modules): Rearrange links	2019-02-07 09:58:22 +05:30
Prateeksha Singh	b5eb16faeb	feat(config): add some onboarding cues	2019-02-07 09:58:22 +05:30
Prateeksha Singh	ce27cffaad	refactor(desk_icon): Remove reference and patches to Desktop Icon	2019-02-07 09:58:21 +05:30
Prateeksha Singh	2c14704398	feat(modules): Add Retail module, update others	2019-02-07 09:57:10 +05:30
Prateeksha Singh	7cd6ebeb6d	feat(explore_page): rearrange links	2019-02-07 09:57:10 +05:30
Raffael Meyer	ff878c0c1d	fix formatting and names	2019-02-07 03:28:27 +01:00
Faris Ansari	504f317434	fix: BOM Stock Calculated Report (#16585 ) - Cast null values to 0 to avoid mathematic errors	2019-02-07 07:15:38 +05:30
Faris Ansari	8ae5dbcac8	fix: Set barcode in Item row after scanning barcode (#16591 )	2019-02-07 07:09:49 +05:30
Himanshu	088886e082	Remove illegal character after break (#16589 )	2019-02-07 07:09:20 +05:30
Sagar Vora	da1dc7fa52	Merge branch 'master' into develop	2019-02-05 18:40:39 +05:30
Sagar Vora	8aa34a0ce0	bumped to version 11.1.4	2019-02-05 19:00:38 +05:50
karthikeyan5	4cb0a250a0	fix(marketplace): bug in filtering menu_items > UX improvment for incomplete feature	2019-02-05 18:07:48 +05:30
Nabin Hait	efff826e15	Merge pull request #16556 from nabinhait/payroll-cost-center fix: Don't force fetch cost center from company in payroll entry	2019-02-05 13:32:16 +05:30
Nabin Hait	8a46df5c4b	Removed duplicate fields	2019-02-05 13:31:32 +05:30
Nabin Hait	38b05a1296	fix: Set default cost center in payroll entry	2019-02-05 10:46:41 +05:30
Nabin Hait	294319e71b	fix: Don't force fetch cost center from company in payroll entry	2019-02-05 10:37:41 +05:30
Nabin Hait	ad69e29334	Merge pull request #16548 from nabinhait/stock-balance-item fix: Fetch data based on item group filter in item dashboard stock balance report	2019-02-05 10:36:47 +05:30
Nabin Hait	1c288ca4ab	Merge pull request #16558 from deepeshgarg007/production_plan fix: Validation while getting raw materials for production in Production Plan	2019-02-05 10:35:16 +05:30
Nabin Hait	fe6f1ad244	Update production_plan.py	2019-02-05 10:34:58 +05:30
Nabin Hait	d4e029665c	Merge pull request #16569 from nabinhait/salary-allow-on-submit fix: Allow-on-submit enabled for formula and condition in salary structure	2019-02-05 10:31:24 +05:30
Nabin Hait	b6d2c7eb80	Merge pull request #16570 from saurabh6790/jinja_injection_fix fix: access request parameter directly	2019-02-05 10:31:08 +05:30
Nabin Hait	7b93e738ad	Merge pull request #16576 from nabinhait/pay_reco_fix fix: Optimising payment reconciliation queries	2019-02-05 10:28:03 +05:30
Nabin Hait	025e780f31	Merge pull request #16575 from rohitwaghchaure/fixed_job_card_not_working fix: job card not working if transfer against work order	2019-02-05 10:27:12 +05:30
Nabin Hait	ac18498ca5	fix: Optimising payment reconciliation queries	2019-02-04 21:13:43 +05:30
Rohit Waghchaure	780c6b0d77	fix: job card not working if transfer against work order	2019-02-04 21:04:48 +05:30
Chinmay Pai	125505f2aa	fix(purchase_invoice): fix undefined variable fixes issue while creating purchase invoice Signed-off-by: Chinmay Pai <chinmaydpai@gmail.com>	2019-02-04 16:30:20 +05:30
Saurabh	bbebceb31a	fix: access request parameter directly	2019-02-04 15:56:23 +05:30
Nabin Hait	ff05ee50e0	fix: Allow-on-submit enabled for formula and condition in salary structure	2019-02-04 14:42:57 +05:30
Deepesh Garg	d442d06947	Update production_plan.py	2019-02-03 12:45:20 +05:30
dgarg007	f667cff5a6	fix: Validation while getting raw materils for production in Production Plan	2019-02-02 21:57:00 +05:30
Saif Ur Rehman	590491779a	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults-V12 # Conflicts: # erpnext/stock/doctype/item/item.py	2019-02-02 02:49:04 +05:00
Saif Ur Rehman	00aaa48779	test(Item): test_item_defaults	2019-02-02 02:43:44 +05:00
Saif Ur Rehman	1a441b267d	Merge branch 'develop' of https://github.com/frappe/erpnext.git into Item-Tax-Template-V12 # Conflicts: # erpnext/patches.txt	2019-02-01 19:17:04 +05:00
Saif Ur Rehman	c8b61007b0	Merge branch 'master' of https://github.com/frappe/erpnext.git into Brand-Item-Defaults # Conflicts: # erpnext/setup/doctype/brand/brand.json # erpnext/stock/get_item_details.py	2019-02-01 17:05:46 +05:00
Saurabh	aba611e09f	Merge branch 'hotfix' into project_status_email_fix	2019-02-01 15:01:26 +05:30
Nabin Hait	e1c75a9d55	fix: fixed salary structure assignment patch (#16546 ) * fix: fixed salary structure assignment patch * fix: patch	2019-02-01 12:25:40 +05:30
Nabin Hait	f3f4ce9b87	fix: Fetch data based on item group filter in item dashboard stock balance report	2019-02-01 12:01:19 +05:30
Rohit Waghchaure	a4645b6d17	fix: check open status projects for project status update	2019-02-01 11:37:22 +05:30
Raffael Meyer	fef07eeae2	Merge remote-tracking branch 'upstream/develop' into develop	2019-01-31 22:16:26 +01:00
Sagar Vora	ec5faaeae6	Merge branch 'hotfix' into stock-balance-fix	2019-01-31 18:46:06 +05:30
Nabin Hait	9ea19b8fe1	fix: Fixed error on stock balance report	2019-01-31 15:53:25 +05:30
Sagar Vora	56cbfe4bb0	Merge branch 'master' into develop	2019-01-31 13:34:32 +05:30
Sagar Vora	fea55fc018	bumped to version 11.1.3	2019-01-31 13:53:07 +05:50
Nabin Hait	a85f008f30	Merge pull request #16528 from adityahase/payment-request-usability fix(accounts): fetch subscription details only if required fields are populated	2019-01-31 10:27:27 +05:30
Sagar Vora	7ea2497b9a	Fix salary patch (#16531 ) fix: salary structure assignment patch, add .vscode to gitignore	2019-01-31 09:17:29 +05:30
Sagar Vora	76728b87ab	fix: value missing for selling settings - sales_update_frequency (#16530 )	2019-01-31 08:19:38 +05:30
Sagar Vora	7a1c40c7c1	Merge branch 'master' into develop	2019-01-30 20:09:45 +05:30
Sagar Vora	664e21acbf	bumped to version 11.1.2	2019-01-30 20:29:45 +05:50
Aditya Hase	245b73b94f	fix(search): Fix possible reflected XSS attack vector (#16522 )	2019-01-30 19:56:04 +05:30
Aditya Hase	66833f109b	fix(accounts): fetch subscription details only if required fields are populated	2019-01-30 19:40:40 +05:30
Nabin Hait	78fc158b39	Merge pull request #16527 from nabinhait/bom-fix fix: Default value for 'raw materials rate based on' in BOM	2019-01-30 18:35:49 +05:30
Saurabh	429996752d	fix: patch fixes (#16524 )	2019-01-30 17:45:48 +05:30
Nabin Hait	16d7b49d73	fix: Default value for 'raw materials rate based on' in BOM	2019-01-30 17:27:08 +05:30
Saurabh	a342138625	Merge branch 'master' into develop	2019-01-30 12:38:58 +05:30
Saurabh	bb2031941e	bumped to version 11.1.1	2019-01-30 13:08:00 +06:00
Saurabh	5c12490709	fix: patch to add guardian role if not exists	2019-01-30 11:52:53 +05:30
rohitwaghchaure	25e63e806c	fix: modified date (#16520 )	2019-01-30 11:46:34 +05:30
Sagar Vora	1c44a6a0ba	fix: set version to 11.1.0, remove staging_version	2019-01-29 18:52:50 +05:30
Sagar Vora	f97c5dad82	Merge branch 'staging' into develop	2019-01-29 18:39:14 +05:30
Sagar Vora	1a4cd3b66a	bumped to version 11.1.0	2019-01-29 18:46:34 +05:50
Sagar Vora	606bd37316	fix: change changelog version to 11.1.0	2019-01-29 17:55:46 +05:30
Sagar Vora	b5dda63ddd	fix: change changelog version to 11.1.0	2019-01-29 17:54:47 +05:30
Sagar Vora	51a27b3524	fix: unsaved merge conflict	2019-01-29 17:52:47 +05:30
Sagar Vora	f3cfad7595	Merge branch 'master' into staging-fixes	2019-01-29 17:20:46 +05:30
Sagar Vora	b32d9458b5	bumped to version 10.1.81	2019-01-29 17:30:19 +05:50
Nabin Hait	f8e9734f16	Merge pull request #16514 from sagarvora/changelog docs: changelog for v11.0.4	2019-01-29 16:27:07 +05:30
rohitwaghchaure	a95ed44d3d	fix: test case for fiscal year (#16516 )	2019-01-29 16:24:53 +05:30
Nabin Hait	9f33c208d7	Update v11_0_4.md	2019-01-29 16:07:07 +05:30
Sagar Vora	7ef69b68f8	Update v11_0_4.md	2019-01-29 15:52:57 +05:30
Nabin Hait	cc41b876fb	Merge pull request #16497 from nabinhait/bom_price BOM raw materials price	2019-01-29 14:58:40 +05:30
Sagar Vora	115a252f55	docs: changelog for v11.0.4	2019-01-29 14:40:10 +05:30
Nabin Hait	4e45663297	fix(stock): get item price based on party	2019-01-29 14:02:08 +05:30
Sagar Vora	8f6509fa9a	Merge branch 'staging-fixes' into fiscal_year_should_always_be_for_12_months	2019-01-29 13:04:20 +05:30
Sagar Vora	9520e345bd	fix: better error messages	2019-01-29 13:03:46 +05:30
Nabin Hait	1df9a23e7b	Merge pull request #16513 from rohitwaghchaure/remove_zero_qty_items_on_click_os_pay feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart	2019-01-29 13:02:56 +05:30
Rohit Waghchaure	07f75a3e54	feat: on click of pay button and on focus out of qty field remove the zero qty items from the cart	2019-01-29 13:00:18 +05:30
Rohit Waghchaure	a8e743e3c4	fix: fiscal year always be for 12 months	2019-01-29 12:55:04 +05:30
Nabin Hait	6f7cc8b186	Merge pull request #16505 from deepeshgarg007/pos_issue feat: Enhancement in POS functionality	2019-01-29 12:51:00 +05:30
Nabin Hait	82421e24f6	Merge branch 'develop' into usregional	2019-01-29 12:14:11 +05:30
Nabin Hait	25cb13c0f8	Merge pull request #16508 from navdeepghai1/salary-slip-net-pay-fixes fix(human resources): gross pay calculation issue	2019-01-29 12:08:11 +05:30
Nabin Hait	7fc9825954	Merge pull request #16368 from ESS-LLP/pr_staging_fixes_2 feat: List Active Healthcare Practitioner	2019-01-29 11:52:55 +05:30
Nabin Hait	8ba9545b72	Merge pull request #16498 from nabinhait/stock-ledger-report fix(stock): Escaping issue in stock ledger report	2019-01-29 11:30:15 +05:30
Deepesh Garg	a8cc4b105d	Merge branch 'staging-fixes' into pos_issue	2019-01-29 11:29:41 +05:30
Nabin Hait	3b8623e207	Merge pull request #16491 from adityahase/ar-fix fix(ar-summary): Changes to column list to match recent changes	2019-01-29 11:28:02 +05:30
Nabin Hait	1467962f8a	Merge pull request #16490 from nabinhait/gst_settings_perm GST Settings permission and regional taxes creation	2019-01-29 11:27:18 +05:30
Nabin Hait	ff2922cbbb	Merge pull request #16488 from deepeshgarg007/price_list fix(sales_invoice): fetch customer price list if available before pos price list	2019-01-29 11:24:22 +05:30
Nabin Hait	7c0fbfab0a	Merge pull request #16482 from pipech/staging-fixes fix(Stock Entry): "Select Serial Numbers" dialog won't fill mandatory field	2019-01-29 11:23:05 +05:30
Nabin Hait	3ccc16e4e0	Merge pull request #16449 from scmmishra/remove-foundation feat: Deprecated In App Help	2019-01-29 11:20:23 +05:30
Nabin Hait	e8190473f5	Merge branch 'staging-fixes' into unicode	2019-01-29 11:13:04 +05:30
Nabin Hait	1c5d681f65	Merge pull request #16500 from scmmishra/v10-remove-docs feat: [v10] Deprecate In App Help	2019-01-29 11:05:25 +05:30
Nabin Hait	8fae0b3017	Merge pull request #16242 from rohitwaghchaure/is_fixed_asset_checkbox_not_copied [Fix] Is fixed asset checkbox not checked if user duplicate the existing invoice	2019-01-29 11:03:44 +05:30
Nabin Hait	b44b200e7c	Merge branch 'hotfix' into fix-scorecard	2019-01-29 11:00:07 +05:30
Aditya Hase	9acb885e60	fix(sqli): Avoid SQL Injection with sender param (#16509 )	2019-01-29 10:52:37 +05:30
Navdeep Ghai	ec570026e1	Merge branch 'hotfix' into salary-slip-net-pay-fixes	2019-01-29 09:12:37 +04:00
Nabin Hait	385e3bb284	Merge pull request #16446 from Zlash65/jv-fix fix(accounts): wrong filters sent to fetch reference name in Journal Entry	2019-01-29 10:41:15 +05:30
navdeepghai1	92bb84aa70	Changed static precision(2) value to system setting currency_precision value	2019-01-28 16:54:58 +04:00
deepeshgarg007	f0cfe98860	fix: Added missing semicolon and removed null from parameter	2019-01-28 17:58:44 +05:30
deepeshgarg007	0bee62b460	fix: Made period fields read only and added validation for multiple entries by same user	2019-01-28 12:45:11 +05:30
Sagar Vora	a1a946fcd6	Merge branch 'hotfix' into fix-scorecard	2019-01-28 12:20:55 +05:30
navdeepghai1	aac404a155	Fixed net_pay calculation issue	2019-01-28 10:42:16 +04:00
Raffael Meyer	1f72b44f12	add german module with address template	2019-01-27 23:32:41 +01:00
deepeshgarg007	4e4b200972	Merge branch 'staging-fixes' of https://github.com/frappe/erpnext into pos_issue	2019-01-27 22:54:34 +05:30
deepeshgarg007	c2ffcc5e71	feat(POS): Customer wise price list in offline mode and enhancement in POS closing voucher	2019-01-27 16:09:07 +05:30
scmmishra	1b63fa1920	[fix] Formatting issues	2019-01-25 20:45:04 +05:30
scmmishra	e1f5d22a02	[fix] Code formatting, removed trailing spaces	2019-01-25 20:45:04 +05:30

... 12 13 14 15 16 ...

18193 Commits