18360 Commits

Author	SHA1	Message	Date
Nabin Hait	8d3644d826	Merge pull request #17351 from nabinhait/rounded-salary-tax ... fix: Rounded tax amount in salary slip	2019-04-24 09:19:00 +05:30
Deepesh Garg	719dc506b9	Merge pull request #17352 from nabinhait/pos-advance ... fix: don't allocate advances if POS	2019-04-24 08:18:05 +05:30
Deepesh Garg	7dddc0c5bf	Merge branch 'develop' into fix-stock-entry-feed	2019-04-24 08:14:10 +05:30
Deepesh Garg	12af1c3837	Merge branch 'develop' into employee-skill-map	2019-04-24 00:03:04 +05:30
Rohan	d12e9426bd	fix(selling): Fix method to also consider return documents (#17340)	2019-04-23 23:08:26 +05:30
Nabin Hait	aa028d7856	fix: don't allocate advances if POS	2019-04-23 21:44:21 +05:30
Nabin Hait	c144f66dac	Merge branch 'develop' into income-tax-period-factor-dev	2019-04-23 21:39:33 +05:30
Nabin Hait	90bca999dd	Merge branch 'develop' into inactive_items	2019-04-23 21:39:22 +05:30
Nabin Hait	09438562d4	Merge branch 'develop' into fix-stock-entry-feed	2019-04-23 21:39:04 +05:30
Nabin Hait	80a5cb3dcc	Merge branch 'develop' into item-tax-patch	2019-04-23 21:38:45 +05:30
Nabin Hait	acac41d62b	Merge branch 'develop' into rounded-salary-tax	2019-04-23 21:38:16 +05:30
Nabin Hait	5e0bc20ab8	Merge pull request #17337 from nabinhait/travis-fix-dev ... fix: Load doc before save	2019-04-23 21:35:18 +05:30
Audacityy	bf8d3658c9	Issue form reorder (#17346) ... * fix: Issue form reorder	2019-04-23 18:55:42 +05:30
Nabin Hait	553a3ea7d2	fix: create account if not exists in item tax patch	2019-04-23 18:46:17 +05:30
Nabin Hait	1f61a1ecf2	minot fix	2019-04-23 18:44:57 +05:30
Nabin Hait	6592a6bcd4	Merge branch 'develop' into income-tax-period-factor-dev	2019-04-23 18:38:54 +05:30
Nabin Hait	8bbc0a0c3b	Merge branch 'develop' into inactive_items	2019-04-23 18:38:44 +05:30
Deepesh Garg	cb2c13fa50	fix: Stock Ledger report fix (#17343)	2019-04-23 17:29:59 +05:30
Nabin Hait	24b4a8722e	fix: Rounded tax amount in salary slip	2019-04-23 15:54:32 +05:30
Kanchan Chauhan	253c6f962d	fix: Subject of Stock Entry feed	2019-04-23 14:40:02 +05:30
Nabin Hait	64bfdd9596	fix: test cases	2019-04-23 13:37:19 +05:30
Nabin Hait	593242fa5c	fix: Calculate rate based on discount on server side only if not rate or pricing rule applied	2019-04-23 13:22:38 +05:30
Nabin Hait	319c912f91	fix: Load doc before save	2019-04-23 13:13:36 +05:30
Rushabh Mehta	77b82894ff	fix(style): buttons in address and contact	2019-04-23 07:57:31 +05:30
Suraj Shetty	df59c1573d	feat: Add training date field	2019-04-22 23:35:36 +05:30
deepeshgarg007	e3ea806390	fix: Ignore sql injections	2019-04-22 21:08:29 +05:30
deepeshgarg007	d5e7bf8f0f	Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items	2019-04-22 21:07:27 +05:30
deepeshgarg007	4f57328924	Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po	2019-04-22 20:25:41 +05:30
deepeshgarg007	555f425da1	fix: Test case and styling fixes	2019-04-22 20:24:31 +05:30
Deepesh Garg	2ef7022385	fix: Remove print statements (#17333)	2019-04-22 19:25:18 +05:30
scmmishra	936f36ccda	fix: import frappe._ in lms.py	2019-04-22 18:55:19 +05:30
scmmishra	68b3203366	chore: Moved get_quiz_progress and get_program_progress to a class function in program_enrollment	2019-04-22 18:50:08 +05:30
scmmishra	3673b25b64	fix: quiz is now visible to administrator	2019-04-22 18:10:19 +05:30
deepeshgarg007	d249325d98	Merge branch 'develop' of https://github.com/frappe/erpnext into automatic_so_po	2019-04-22 18:00:13 +05:30
deepeshgarg007	a89d1df655	fix: Typo fixes	2019-04-22 17:54:38 +05:30
scmmishra	804a74c01c	fix (ui): UI fixes to Video page	2019-04-22 17:52:48 +05:30
scmmishra	6c8f23b27e	fixed (ui): Fixed cards with better buttons	2019-04-22 17:51:30 +05:30
Nabin Hait	7f4e7b63d7	fix: Income tax period factor considering joining and relieving date	2019-04-22 17:39:36 +05:30
deepeshgarg007	bf2adae97d	fix: Ordering and datatype fixes in inactive items report	2019-04-22 17:15:23 +05:30
deepeshgarg007	8a5d556f53	Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items	2019-04-22 16:59:33 +05:30
deepeshgarg007	425699d9f2	fix: Material request list_view status fixes	2019-04-22 16:54:52 +05:30
Nabin Hait	af309473f8	Merge pull request #17326 from rohitwaghchaure/moved_erpnext_related_methods_from_frappe_to_erpnext_develop ... fix: moved erpnext related methods from frappe to erpnext(cherry-picked)	2019-04-22 15:59:30 +05:30
Nabin Hait	8624957cbc	Merge pull request #17291 from prasadarr/listing-fixes ... fix: Allow system manager to access share ledger	2019-04-22 15:35:35 +05:30
Nabin Hait	28a7aec124	Update accounting.py	2019-04-22 15:35:13 +05:30
deepeshgarg007	6f57b05fed	Merge branch 'develop' of https://github.com/frappe/erpnext into notification	2019-04-22 15:26:55 +05:30
Rushabh Mehta	3bf71cc18e	fix(splash): revert to old image	2019-04-22 15:24:28 +05:30
Deepesh Garg	15a7b7ce71	fix: GSTR 3b report fixes (#17317) ... * fix: GSTR-3b report total taxable value fixes * fix: Test Cases	2019-04-22 15:22:36 +05:30
scmmishra	5079e6c1c1	chore: minor improvements	2019-04-22 14:48:32 +05:30
scmmishra	ac8d3479c9	feat: Added add_quiz_activity function to course_enrollment class	2019-04-22 14:38:51 +05:30
scmmishra	33969b7d7c	chore: Minor change to question doctype	2019-04-22 14:30:14 +05:30
Rohit Waghchaure	270d4e9f4e	fix: moved erpnext related methods from frappe to erpnext	2019-04-22 14:11:43 +05:30
scmmishra	66d239281c	chore: minor code improvements	2019-04-22 14:10:09 +05:30
Nabin Hait	d3cd98c45e	fix: Renamed depends_on_lwp to depends_on_payment_days	2019-04-22 13:45:45 +05:30
Nabin Hait	452f2c5694	Merge pull request #17322 from nabinhait/salary-structure-child-docstatus ... Salary structure child docstatus	2019-04-22 13:42:55 +05:30
Nabin Hait	36561801c2	Update set_salary_details_submitable.py	2019-04-22 13:38:06 +05:30
Anurag Mishra	35e52b5596	fix: fixed spelling	2019-04-22 13:37:03 +05:30
Saif Ur Rehman	a216844d2c	fix: Set Allocate Advance Automatically disabled by default	2019-04-22 12:10:40 +05:00
scmmishra	64d2fe0ad7	fix: Minor typo	2019-04-22 12:30:08 +05:30
scmmishra	4add826703	chore: Minor code improvements ... - Changed variable name in `get_content` function - Added proper exceptions for `get_topic` and `get_content` functions in lms	2019-04-22 12:28:13 +05:30
deepeshgarg007	06c20400ee	feat: Track purchase receipt status in Material Request	2019-04-22 12:25:14 +05:30
scmmishra	da2c90cd18	chore: renamed get_program api functions ... - `get_program` is renamed to `get_program_and_enrollment_status` - `get_program_detail` is renamed to `get_program` - Minor code improvements	2019-04-22 12:21:40 +05:30
scmmishra	9967d27b9a	chore: renamed ambiguous variable names in lms.py	2019-04-22 12:08:41 +05:30
Faris Ansari	733ff48d51	fix: Refactor for Print Format changes (#17242) ... - Rename Server to Jinja - Rename Js to JS	2019-04-22 12:08:18 +05:30
scmmishra	d78c326f95	chore: renamed get_topic_meta to get_student_topic_details	2019-04-22 12:06:28 +05:30
scmmishra	d5973fe4bc	chore: renamed get_course_meta to get_student_course_details	2019-04-22 12:05:22 +05:30
scmmishra	327334a830	chore: refactor utils.get_current_student	2019-04-22 12:03:17 +05:30
scmmishra	823d89cf66	fix (linting): codacy fixes	2019-04-22 11:46:22 +05:30
Nabin Hait	89d3aaf349	Merge pull request #17310 from nabinhait/ar-fix-develop ... fix: Total row alignment in AR report	2019-04-22 11:11:38 +05:30
Suraj Shetty	2a9b17efd4	Merge branch 'develop' of github.com:frappe/erpnext into employee-skill-map	2019-04-21 23:53:54 +05:30
Suraj Shetty	079684f7da	feat: Task type (#17311) ... * feat: Add task type doctype	2019-04-20 23:37:49 +05:30
Nabin Hait	d21bacfc21	fix: Total row alignment in AR report	2019-04-20 10:58:58 +05:30
Nabin Hait	65b3a849d3	Merge pull request #17306 from surajshetty3416/fix-employee-permission ... fix: Do not create employee user permission if already exists	2019-04-20 01:44:06 +05:30
Nabin Hait	ee43f9d154	Merge pull request #17305 from nabinhait/inv-disc-fix1 ... fix: fetch party account as discounted receivable account in payment entry	2019-04-20 01:40:55 +05:30
Nabin Hait	d8783343f3	Merge pull request #17283 from rohitwaghchaure/requested_items_tobe_ordered_issue_for_multi_uom_develop ... fix: Requested Items To Be Ordered report showing records even if material request is fully ordered(Cherry-picked)	2019-04-20 01:27:31 +05:30
Suraj Shetty	98390dae49	fix: Do not create employee user permission if already exists	2019-04-19 21:52:08 +05:30
Nabin Hait	c8b1351e87	fix: fetch party account as discounted receivable account in payment entry	2019-04-19 21:33:29 +05:30
Nabin Hait	4a5bed5c07	fix: fetch party account as discounted receivable account in payment entry	2019-04-19 21:33:29 +05:30
Nabin Hait	06f992f850	Merge pull request #17299 from nabinhait/inv-disc-fixes ... fix: Close loan considering latest invoice outstanding balance	2019-04-19 21:27:02 +05:30
Nabin Hait	a6e09826b3	Merge pull request #17297 from netchampfaris/index-item-route ... fix: Add index to Item route	2019-04-19 20:11:29 +05:30
Nabin Hait	375f051b24	Merge pull request #17277 from nabinhait/invoice-discounting-fixes ... Invoice discounting fixes	2019-04-19 20:00:18 +05:30
Nabin Hait	d2797be1cd	fix: Close loan considering latest inv outstanding balance	2019-04-19 15:33:05 +05:30
Nabin Hait	8da71cebb7	fix: test cases	2019-04-19 15:10:02 +05:30
Rohit Waghchaure	72cc7508b0	fix: Requested Items To Be Ordered report showing records even if material request is fully ordered	2019-04-19 14:57:38 +05:30
Faris Ansari	1d78aae2af	fix: Add index to Item route ... Increases route resolve time if there are lots of Items.	2019-04-19 14:03:25 +05:30
Nabin Hait	0aa036cda5	Merge pull request #17294 from scmmishra/trial-detail-fix ... fix: fixed trial details	2019-04-19 13:18:03 +05:30
Nabin Hait	48e1e04df2	Merge pull request #17286 from rohitwaghchaure/task_not_able_to_search_by_name_in_global_search_develop ... fix: task name was not able to search by name in global search (Cherry-picked)	2019-04-19 13:06:42 +05:30
Prasad R	198c7ae73d	fix: show 2 missing doctypes in Accounts	2019-04-19 12:43:58 +05:30
scmmishra	a55d32236a	fix: fixed trial details	2019-04-19 12:22:30 +05:30
Prasad R	e1a6022c8c	fix: Allow system manager to access share ledger	2019-04-19 10:57:21 +05:30
Rohit Waghchaure	94f43ca2e2	fix: task name was not able to search by name in global search	2019-04-18 22:39:42 +05:30
Rohit Waghchaure	376db4f6b7	fix: credit amount in account's currency not be consider if debit amount is present in the general ledger	2019-04-18 22:06:22 +05:30
deepeshgarg007	c841bd486a	feat: Added validations and mapper to create inter company mapper	2019-04-18 20:10:31 +05:30
deepeshgarg007	90262f84af	feat: Added custom button to make inter company order	2019-04-18 20:09:07 +05:30
deepeshgarg007	100bd29dfd	feat: Updated doctypes for sales and purchase order	2019-04-18 20:08:20 +05:30
Nabin Hait	c99c712913	fix: Validate and update invoice discounting status on JE submit/cancel	2019-04-18 15:52:50 +05:30
Nabin Hait	8170585faf	fix: Don't fetch already discounted invoice	2019-04-18 15:13:18 +05:30
Nabin Hait	36bb3f55f2	fix: Added invoice discounting dashboard	2019-04-18 14:47:44 +05:30
Suraj Shetty	3aa5e125bd	feat: Add employee training section to the employee skill map	2019-04-18 12:46:33 +05:30
deepeshgarg007	767a00fa8d	feat: Logic for query and report creation for inactive items	2019-04-18 08:45:10 +05:30
deepeshgarg007	4d1df416e9	fix: Reordered and deleted unnecessary filters	2019-04-18 08:29:21 +05:30
Nabin Hait	0050652be9	Merge pull request #17265 from deepeshgarg007/gstr1-fixes-develop ... fix: GSTR-1 B2C Small report fix	2019-04-17 17:32:29 +05:30
Nabin Hait	3a2d6a4043	Merge pull request #17169 from rohitwaghchaure/production_plan_multiple_enhancements ... feat: Production plan enhancements	2019-04-17 17:31:14 +05:30
Nabin Hait	26dd192516	Merge pull request #17263 from rohitwaghchaure/finance_book_blank_issue_develop ... fix: If finance book filter is not set then show all the entries(Cherry-pick)	2019-04-17 17:22:45 +05:30
Shivam Mishra	f3cc87455a	Merge pull request #17249 from scmmishra/auto-fetch-serial ... feat: Auto fetch serial numbers	2019-04-17 17:15:27 +05:30
Rohit Waghchaure	38238b0cfd	fixed test cases	2019-04-17 15:56:00 +05:30
scmmishra	fed4fd0f02	style: linting issue fixed	2019-04-17 15:46:15 +05:30
Shivam Mishra	63921ebbc9	style: fixed formatting ... Fixed formatting for for auto_fetch_serial_number	2019-04-17 15:29:29 +05:30
deepeshgarg007	cab2d82ea8	Merge branch 'develop' of https://github.com/frappe/erpnext into inactive_items	2019-04-17 11:35:56 +05:30
scmmishra	5522cf8c26	fix: codacy linting	2019-04-17 10:26:21 +05:30
Faris Ansari	1cf9fa9662	fix: Refactor Upload Attendance (#17241) ... New API frappe.ui.FileUploader https://github.com/frappe/frappe/pull/7253	2019-04-17 09:45:46 +05:30
deepeshgarg007	9f873e97fa	fix: Remove print statement	2019-04-16 20:58:22 +05:30
deepeshgarg007	c354a17383	fix: Code cleanup	2019-04-16 20:56:49 +05:30
deepeshgarg007	e5a869bc45	fix: GSTR-1 B2CS report fix	2019-04-16 20:08:12 +05:30
Rohit Waghchaure	7aee809571	fix: If finance book filter is not set then show all the entries	2019-04-16 19:35:18 +05:30
Rohit Waghchaure	00d73cda50	fix: POS not working if user has access of multiple company	2019-04-16 18:43:16 +05:30
Rohit Waghchaure	34ee41a35e	fix: Pending SO Items For Purchase Request not showing the so quantity correctly if so has duplicate items	2019-04-16 18:26:11 +05:30
scmmishra	6d3302b0cc	style (codacy): code formatting fixes	2019-04-16 18:25:53 +05:30
deepeshgarg007	508e815db0	feat: Added filters and columns for inactive items report	2019-04-16 17:07:13 +05:30
scmmishra	ed4b052df8	style (codacy): code formatting fixes	2019-04-16 17:03:25 +05:30
scmmishra	46901076be	feat: Use standard serial picker to add as well as update serial numbers	2019-04-16 17:01:01 +05:30
scmmishra	c791c3b24b	fix: Minor bug in serial no auto fetch api	2019-04-16 16:07:32 +05:30
scmmishra	eee5c38911	feat: Use controller for serial no. API	2019-04-16 15:57:51 +05:30
scmmishra	61d6b677e4	feat: Show standard serial number selector in item grid form	2019-04-16 15:17:27 +05:30
Rushabh Mehta	59c5a16037	fix(account_balance_timeline): remove unused import	2019-04-16 15:11:45 +05:30
scmmishra	407496b528	chore: minor changes to labels	2019-04-16 13:32:41 +05:30
Nabin Hait	0c896c38f8	Merge pull request #17244 from hrwX/delivery_note_fix_v12 ... fix(Delivery Note): show get items even if note has been amended	2019-04-16 13:20:26 +05:30
Himanshu	ef848fda2a	fix: let user delete the elements of items	2019-04-16 13:17:20 +05:30
Nabin Hait	00e9659e3f	Merge pull request #17195 from asbasawaraj/fixed_account_ranme_when_company_abbr_is_updated ... Fixed Company Abbr Update Was Not Able To Update Account	2019-04-16 12:51:13 +05:30
scmmishra	19a41ed16d	chore: code cleaning	2019-04-16 12:51:05 +05:30
scmmishra	41cf945247	feat (UX): Refactored batch selector	2019-04-16 12:47:39 +05:30
Nabin Hait	d2044c0f23	Merge pull request #17184 from frappe/akurungadam-patch-1 ... fix: misleading condition example in field options	2019-04-16 12:44:17 +05:30
scmmishra	8ec54c2214	feat: Added auto fetch serial numbers API	2019-04-16 12:20:55 +05:30
scmmishra	b98612ff5b	feat: Added auto fetch logic and button for client	2019-04-16 12:20:42 +05:30
Himanshu Warekar	810dde2e0b	fix: show get items even if note has been amended	2019-04-16 12:20:35 +05:30
Suraj Shetty	006c3dccf9	feat: Add logic to auto fetch skill from designation doc ... - Set today as default evaluation date	2019-04-16 12:14:44 +05:30
Nabin Hait	b5199951ad	Merge pull request #17239 from nabinhait/pr-pi ... fix: Invoice against partially returned DN/PR	2019-04-16 11:54:12 +05:30
Rushabh Mehta	1c2eb51a91	fix(api)	2019-04-16 11:12:34 +05:30
Suraj Shetty	354c70a0e7	feat: Init employee skill map doctype	2019-04-16 10:20:32 +05:30
Suraj Shetty	a0f7656ffc	feat: Add skill child table to designation doctype ... - To record skills required of a particular designation	2019-04-16 10:19:53 +05:30
Nabin Hait	29997e2631	fix: Invoice against partially returned DN/PR	2019-04-16 09:55:42 +05:30
Nabin Hait	c066bbde06	Merge pull request #17235 from hrwX/remove_asset_permission_v12 ... fix(Asset): Remove user permission for employee in asset	2019-04-16 09:45:40 +05:30
Rushabh Mehta	6dff8038e6	fix(account_balance_timeline)	2019-04-16 09:35:46 +05:30
Rushabh Mehta	7efe01578d	fix(account_balance_timeline)	2019-04-16 09:33:21 +05:30
Faris Ansari	557520148e	fix: Item Variant Attribute Order (#17237) ... - Show Item Variant Attributes in order they appear in child table	2019-04-15 23:19:44 +05:30
Himanshu Warekar	9b7c7787e6	Merge develop	2019-04-15 22:56:41 +05:30
Himanshu Warekar	3e503f213b	fix: remove user permission for emp in asset	2019-04-15 22:50:22 +05:30
Nabin Hait	a5265113ce	Merge pull request #17232 from karthikeyan5/develop-woocommerce-fix ... fix(woocommerce integration): 403 error and adding defaults	2019-04-15 21:17:16 +05:30
Nabin Hait	e9d9576cd7	Merge pull request #17231 from nabinhait/Anurag810-invoice-discounting ... Invoice Discounting	2019-04-15 21:14:19 +05:30
karthikeyan5	605a0a0570	fix(woocommerce integration): travis fix ... (cherry picked from commit 2518a2ab169948cff56bfbbedbf7198327b33f25)	2019-04-15 19:47:13 +05:30
karthikeyan5	13563dc495	fix(woocommerce integration): fix strange travis error ... the patch was working locally. But, in was failing on travis. The strange thing was that the patch running in travis was looking for woocommerce_settings in the path 'frappe.core.doctype.woocommerce_settings.woocommerce_settings' (cherry picked from commit df3e8853aeedb4991e7f8b1c878adb7ba849a063)	2019-04-15 19:47:13 +05:30
karthikeyan5	63f8cda069	fix(woocommerce integration): possible travis fix ... possible fix for travis patch error "Error: No module named woocommerce_settings.woocommerce_settings)" (cherry picked from commit a0b7ff60b8c3303a405c98eac11e71cd556ba166)	2019-04-15 19:47:13 +05:30
karthikeyan5	69f0ce178e	fix(woocommerce integration): error in new-site ... resolving "Could not find UOM: Nos" error in travis (cherry picked from commit 97383716e633ae0911238fc02ffc659ad705b41a)	2019-04-15 19:47:13 +05:30
karthikeyan5	307e6a8825	fix(woocommerce integration): defaults in settings ... (cherry picked from commit f788117b3ea9be83c54e169a1535ded0722f229c)	2019-04-15 19:47:02 +05:30
karthikeyan5	2b0a8de74f	fix(woocommerce integration): fixing 403 error ... (cherry picked from commit 6784335e2ca3ea8883f08b3d94101f525f37bf1e)	2019-04-15 19:45:38 +05:30
Nabin Hait	076cc38c29	fix: Outstanding amount on making payment against discounted invoice	2019-04-15 18:42:10 +05:30
Rushabh Mehta	6aaac1e9db	fix(assign): do not assign if administrator	2019-04-15 16:58:45 +05:30
Rushabh Mehta	44b0cb6383	Merge pull request #17194 from rmehta/dashboard-refactor ... fix(dashboard): as per new features	2019-04-15 16:52:54 +05:30
Nabin Hait	d584cfbf43	Fixed merge conflict	2019-04-15 16:16:25 +05:30
Nabin Hait	fa8f13dc98	Merge pull request #17213 from rohitwaghchaure/optimized_code_to_get_items_for_pos ... fix: POS takes lot of time to load the items data	2019-04-15 10:11:31 +05:30
Nabin Hait	6ecc83aaf0	Merge pull request #17182 from hrwX/revert_salary_slip ... Revert(Salary Slip): Wrong Formula	2019-04-15 10:08:53 +05:30
Nabin Hait	e7e2e93419	Merge pull request #17183 from netchampfaris/duplicate-variant-check-d ... fix: Validate variant attributes only if is_new	2019-04-15 10:08:28 +05:30
Nabin Hait	8ab393448f	Merge pull request #17218 from netchampfaris/item-price-packing-unit-d ... fix: Set default value for Packing Unit as 0	2019-04-15 10:06:45 +05:30
Nabin Hait	9fd3f10b67	Merge pull request #17220 from Anurag810/payment-entry-fix ... fix: handle for party type member in payment entry (v12)	2019-04-15 10:06:08 +05:30
rohitwaghchaure	033b1babe8	Merge pull request #17186 from rohitwaghchaure/bank_account_in_bank_reconcilliation ... feat: Added bank account no in bank reconcilliation	2019-04-14 16:10:19 +05:30
scmmishra	5b9df676a4	fix: minor bug in breadcrumb routing	2019-04-13 18:53:49 +05:30
Deepesh Garg	1b0edbc8b3	fix: GSTR3b 3b template fix (#17224)	2019-04-13 18:37:08 +05:30
Anurag Mishra	95714297a4	fix: handle for party type member in payment entry	2019-04-12 15:03:46 +05:30
Suraj Shetty	c90364f94d	feat: Add task weight for employee onboarding activity (#17216) ... This activity weight will be used to update the task weight	2019-04-12 14:12:03 +05:30
Faris Ansari	581e5fbfda	fix: Set default value for Packing Unit as 0 ... The default value 1 assumes Items will be always packed in integer quantities. This is not the usual case.	2019-04-12 12:39:12 +05:30
Rushabh Mehta	54ba900e72	Merge pull request #17214 from rmehta/auto-assign-issue ... feat: auto assign lead/opportunity to lead owner, customer account manager	2019-04-12 11:11:59 +05:30
Nabin Hait	851acc30b3	Merge pull request #17208 from asbasawaraj/fixed_sanctioned_amount_update_issue ... fix: Fixed Sanctioned Amount Update Issue in Expense Claim	2019-04-12 11:06:02 +05:30
Nabin Hait	165e92ad5b	Merge pull request #17210 from rohitwaghchaure/fix_taxes_and_charges_are_adding_multiple_times ... fix: Taxes and charges table not clear the existing rows if the template is changed	2019-04-12 11:02:37 +05:30
Rushabh Mehta	4f49ce4124	feat: auto assign lead/opportunity to lead owner, customer account manager	2019-04-12 09:04:17 +05:30
Rohit Waghchaure	2454d89068	Optimized the code to fix slow loading of items in the POS	2019-04-11 19:52:00 +05:30
Rohit Waghchaure	72cc37e8da	fix: Taxes and charges table not clear the existing rows if the template is changed	2019-04-11 18:35:15 +05:30
scmmishra	ff970a8062	Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2	2019-04-11 18:32:19 +05:30
Basawaraj Savalagi	9ce8c3061f	Fixed Sanctioned Amount Update Issue in Expense Claim	2019-04-11 16:30:11 +05:30
Rushabh Mehta	d625c32ab1	fix(dashboard): for frappe updates, and a new splash logo	2019-04-11 16:13:58 +05:30
Mangesh-Khairnar	3ab2a18088	Merge branch 'develop' into so-on-hold	2019-04-11 15:49:06 +05:30
Faris Ansari	6472ed2c1e	Merge pull request #16941 from Mangesh-Khairnar/po-on-hold ... Feature: Purchase order on hold	2019-04-11 15:36:54 +05:30
Nabin Hait	65cca62ef9	fixed merge conflict	2019-04-11 12:32:43 +05:30
Nabin Hait	89206e74d0	fixed merge conflict	2019-04-11 12:31:14 +05:30
rohitwaghchaure	92b190febb	Merge pull request #17199 from Anurag810/pos_running_items ... fix: item order by idx in pos(v12)	2019-04-11 11:53:22 +05:30
Nabin Hait	0f62b13dd8	Merge pull request #17159 from rohitwaghchaure/sales_return_not_working_for_bundle_items ... fix: sales return not working for product bundle items	2019-04-11 11:44:57 +05:30
Nabin Hait	961d7ace4a	Merge pull request #17189 from nabinhait/sales-person ... fix: Made employee optional in sales person	2019-04-11 11:37:08 +05:30
Nabin Hait	38351587fc	Merge pull request #17197 from nabinhait/training-feedback ... fix: training feedback code cleanup	2019-04-11 11:36:50 +05:30
Anurag Mishra	4c29d80cf1	fix: minor fixes	2019-04-11 11:14:32 +05:30
Anurag Mishra	accf310aa3	fix: start date and loan period should be mandatory	2019-04-11 11:08:07 +05:30
rohitwaghchaure	4898d1936b	Merge pull request #17200 from Anurag810/pos_running ... fix: order by idx(v11)	2019-04-11 10:57:05 +05:30
rohitwaghchaure	22d6eb3eaa	Merge pull request #17191 from rohitwaghchaure/asset_depreciation_rate_hotfix ... fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method	2019-04-11 09:58:02 +05:30
rohitwaghchaure	6cd114b467	Merge pull request #17198 from rohitwaghchaure/fix_auto_assign_payment_entry_to_invoice ... fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled	2019-04-11 09:57:45 +05:30
Rohit Waghchaure	9665a531fc	fix: item variant test cases	2019-04-11 09:56:00 +05:30
scmmishra	5214c5cdb3	fix: Minor fix to test program	2019-04-10 20:37:45 +05:30
scmmishra	8c89083647	fix: test fixes for program doctype	2019-04-10 20:02:39 +05:30
scmmishra	7a1c649dbd	fix: Test fixes	2019-04-10 19:02:06 +05:30
Anurag Mishra	9a2ae67f86	fix: order by idx	2019-04-10 17:57:23 +05:30
Rohit Waghchaure	f3a9552e48	fix: item variant test cases	2019-04-10 17:57:09 +05:30
Anurag Mishra	5ab5f77fd4	fix: order by idx	2019-04-10 17:53:45 +05:30
scmmishra	d2917a8c38	feat: Fixed test data for student doctype	2019-04-10 17:50:26 +05:30
Rohit Waghchaure	49907e746b	fix: test cases	2019-04-10 17:33:32 +05:30
Rohit Waghchaure	45d0b31d44	fix: test cases	2019-04-10 17:25:08 +05:30
Rohit Waghchaure	b286fc99b8	fix: don't assign the advance payment entries if Allocate Advances Automatically is disabled	2019-04-10 16:16:30 +05:30
Nabin Hait	c8c678f747	fix: training feedback code cleanup	2019-04-10 15:56:16 +05:30
Basawaraj Savalagi	05458b7fc6	Fixed Company Abbr Update Was Not Able To Update Account	2019-04-10 13:33:43 +05:30
Rohit Waghchaure	bb0d4e37b9	fix: Asset depreciation formula for WDV method, user was not able to edit schedule table for Manula method	2019-04-10 03:14:11 +05:30
Nabin Hait	b305f38869	fix: Made employee optional in sales person	2019-04-09 20:06:11 +05:30
Rohit Waghchaure	30fda3ee54	feat: Added bank account no in bank reconcilliation	2019-04-09 18:58:23 +05:30
Rushabh Mehta	bead5b33f4	fix(dashboard): as per new features	2019-04-09 18:38:03 +05:30
Anoop	cb278975f3	fix: misleading condition example in field options ... condition example corrected - gender=\"Male\" to gender==\"Male\"	2019-04-09 18:10:41 +05:30
Mangesh-Khairnar	63cf56f406	style: change function call to anonymous function call	2019-04-09 17:47:25 +05:30
Faris Ansari	4da3d0015a	fix: Validate variant attributes only if is_new	2019-04-09 17:40:53 +05:30
Nabin Hait	7dcdb93596	Merge pull request #17178 from Anurag810/timesheet_report_fixes ... fix: timesheet_report (WN-SUP41913)	2019-04-09 17:28:22 +05:30
Himanshu Warekar	5632dbdd18	revert: wrong formula	2019-04-09 16:53:54 +05:30
Rohit Waghchaure	0e9cd2e00a	feat: Production plan enhancements	2019-04-09 16:53:38 +05:30
Nabin Hait	1245139c51	Merge branch 'develop' into invoice-d	2019-04-09 15:27:13 +05:30
Anurag Mishra	67e6da2086	fix: Removed Extra page on generating pdf in print formats	2019-04-09 15:19:05 +05:30
Anurag Mishra	ef11d378d4	fix: UI on generating pdf in print format	2019-04-09 15:19:05 +05:30
Anurag Mishra	ed82e8ba3b	fix: removed before from accounts_controlle.pyr and fetch the gl from frontend	2019-04-09 15:19:05 +05:30
Anurag Mishra	b62cfffdea	fix: Print Auditing print format	2019-04-09 15:19:05 +05:30
Anurag Mishra	22867f7fa5	fix: added currency	2019-04-09 15:06:49 +05:30
Anurag Mishra	3e8b8a4359	fix: filters and some conditions	2019-04-09 14:34:56 +05:30
scmmishra	acc0fa3b00	fix: Added desciption in program test record	2019-04-09 13:20:11 +05:30
scmmishra	bae2d669b5	fix: codacy linting issues	2019-04-09 12:57:56 +05:30
scmmishra	abb35ad308	fix: Possible fix for failing tests	2019-04-09 12:38:42 +05:30
Mangesh-Khairnar	b70b048fa2	style: change type comparison for boolean expression	2019-04-09 12:26:52 +05:30
Mangesh-Khairnar	16c4fd6733	Merge branch 'develop' of https://github.com/frappe/erpnext into so-on-hold	2019-04-09 12:13:45 +05:30
Mangesh-Khairnar	a2facd4dd2	style: change function call to anonymous function	2019-04-09 12:07:44 +05:30
scmmishra	b7d9efe901	Merged develop in lms	2019-04-09 11:39:12 +05:30
Rushabh Mehta	0d3986c9f6	fix(dashboard): account timeline for balance sheet accounts	2019-04-09 11:36:41 +05:30
scmmishra	dd889f8796	fix: Fixed hero image field in COurse and Topic	2019-04-09 11:36:31 +05:30
Anurag Mishra	17fbafa390	fix: filters,added total,only submitted doc,considered fraction	2019-04-09 11:31:11 +05:30
Faris Ansari	aac7719dd9	fix: Translated string method in Jinja (#17174)	2019-04-08 21:50:58 +05:30
scmmishra	88f0c464b4	feat: Added breadcrumbs	2019-04-08 19:56:21 +05:30
Rushabh Mehta	da3f07221c	fix(dashboard): accounting timeline query fix	2019-04-08 19:38:55 +05:30
Rushabh Mehta	3882a41c51	fix(dashboard): simpler way to get account timeline from first principles	2019-04-08 19:05:12 +05:30
Rushabh Mehta	1412a681f3	Revert "fix: Raise exception if apps are on incompatible branches"	2019-04-08 17:10:56 +05:30
Rushabh Mehta	fbc56c6d97	fix(style): left padding in marketplace view	2019-04-08 17:02:22 +05:30
Mangesh-Khairnar	1934a76cd8	feat: Add status field in multiple reports linked with purchase order and sales order creation (#17107) ... * enhancement: add status field in ordered itemd to be delivered * enhancement: add status field in purchase order itemd to be received * enhancement: add a status column in the billed reports	2019-04-08 16:29:59 +05:30
Saurabh	00a5e7a1d0	bumped to version 11.1.20	2019-04-08 15:39:03 +06:00
Nabin Hait	f1698bb2df	fix: unique variant based on	2019-04-08 14:59:43 +05:30
Nabin Hait	79c9d5d24a	Merge pull request #17146 from Anurag810/timesheet-report ... feat: Timesheet report	2019-04-08 10:33:44 +05:30
Rohit Waghchaure	3771db92b8	fix: sales return not working for bundle items	2019-04-06 17:34:40 +05:30
rohitwaghchaure	bc02ee23e0	Merge pull request #17078 from rohitwaghchaure/unlinked_advance_payment_on_cancellation_of_order ... feat: provision to unlink advance payment entry on cancelation of order	2019-04-06 12:30:05 +05:30
Rohit Waghchaure	9835c89e17	Added test cases	2019-04-06 12:29:05 +05:30
Saurabh	63fabc3723	bumped to version 11.1.19	2019-04-05 17:29:22 +06:00
Nabin Hait	398e4b9472	fix: Ignore item tax patch if old schema does not exists	2019-04-05 16:41:17 +05:30
Nabin Hait	e6ee43b102	Merge pull request #17145 from Mangesh-Khairnar/salary-register-doj ... feat: add date of joining column in salary register	2019-04-05 16:02:48 +05:30
Nabin Hait	374b85b38e	Merge pull request #17140 from hrwX/pe_supp_inv_v12 ... fix(Payment Entry): Return Bill No on for Payment Entry	2019-04-05 15:59:58 +05:30
Nabin Hait	d70476fbc8	Merge pull request #17139 from hrwX/pe_supp_inv_v11 ... fix(Payment Entry): Return Bill No for Payment Entry	2019-04-05 15:59:43 +05:30
Nabin Hait	843e440191	Merge branch 'hotfix' into validate_stock_transaction_v11	2019-04-05 15:41:26 +05:30
Nabin Hait	9302a19d74	Merge pull request #17135 from hrwX/validate_stock_transaction_v12 ... fix(Item): check transactions for batch, serial check	2019-04-05 15:40:19 +05:30
Nabin Hait	1580e24946	Merge pull request #17137 from netchampfaris/item-group-clean-description ... fix(Item Group): Don't clean description html	2019-04-05 15:39:44 +05:30
Nabin Hait	603dce428b	Merge pull request #17144 from nabinhait/variant-fix ... fix: Default variant Based on	2019-04-05 15:38:15 +05:30
Anurag Mishra	0dc62e8747	fix: Removed raw query and used frappe.get_all	2019-04-05 14:36:43 +05:30
Anurag Mishra	f71c147ea8	Added mandatory feilds to the report	2019-04-05 14:36:43 +05:30
Anurag Mishra	5c17e7760b	fix: readability	2019-04-05 14:36:43 +05:30
Anurag Mishra	b57c024ff7	feat: Project Billing Summary for timesheet	2019-04-05 14:36:43 +05:30
Anurag Mishra	61aab377b6	Minor Fixes	2019-04-05 14:36:42 +05:30
Anurag Mishra	3d27aabdeb	Commonify code	2019-04-05 14:36:42 +05:30
Anurag Mishra	94514ffee9	feat: timesheet Employee Summary Report	2019-04-05 14:36:42 +05:30
Mangesh-Khairnar	3c251663bb	style: add type comparison for boolean expression	2019-04-05 14:10:05 +05:30
rohitwaghchaure	e334413b34	Merge pull request #17141 from rohitwaghchaure/incorrect_pos_profile_selected_if ... fix: incorrect auto POS profile selected in the sales invoice	2019-04-05 13:04:05 +05:30
Mangesh-Khairnar	e7d53540de	feat: add doj column in salary register	2019-04-05 12:56:11 +05:30
Mangesh-Khairnar	3d667b4c94	Merge branch 'develop' of https://github.com/frappe/erpnext into po-on-hold	2019-04-05 12:11:26 +05:30
Nabin Hait	a3357e4e86	fix: Default variant Based on	2019-04-05 12:10:36 +05:30
John Clarke	b733984ca1	fix: Remove duplicate Timesheet item (#17066)	2019-04-05 11:02:25 +05:30
rohitwaghchaure	fc471ed63b	Merge pull request #17142 from rohitwaghchaure/incorrect_pos_profile_selected_develop ... fix: incorrect POS profile selected	2019-04-05 09:59:16 +05:30
Rohit Waghchaure	c2ed03f77a	always set the company from the POS Profile	2019-04-05 09:58:04 +05:30
Rohit Waghchaure	e8e3fb175d	fix: incorrect POS profile selected	2019-04-05 09:57:52 +05:30
Rohit Waghchaure	4324f43a06	always set the company from the POS Profile	2019-04-05 09:54:55 +05:30
rohitwaghchaure	cbdd3304a4	Merge pull request #17138 from rohitwaghchaure/search_items_not_works_in_the_pos ... fix: POS search items not works properly if item group filter has applied	2019-04-05 00:45:53 +05:30
Rohit Waghchaure	f7a83cb4f5	fix: incorrect POS profile selected	2019-04-05 00:42:48 +05:30
cjpit	0c87895afc	fix(node_modules): remove hardcoded symlink (#16975) ... * add node_modules directory to gitignore * remove node_modules symlink	2019-04-05 00:12:26 +05:30
Himanshu Warekar	b30f584410	fix: return bill_no	2019-04-04 19:55:13 +05:30
Himanshu Warekar	6443d7dd10	refactor: declare bill_on at function start	2019-04-04 19:54:23 +05:30
Himanshu Warekar	ad32324c4c	fix: get bill_no	2019-04-04 19:50:23 +05:30
Rohit Waghchaure	0a4aee0206	fix: POS search items not works properly if item group filter has applied	2019-04-04 16:02:15 +05:30
Faris Ansari	7a0a05d8f1	fix(Item Group): Don't clean description html	2019-04-04 15:53:16 +05:30
Himanshu Warekar	cdd79e3c40	fix: check transactions for batch, serial check	2019-04-04 15:26:35 +05:30
Rohit Waghchaure	55d3bcac37	fix: not able to change pos profile	2019-04-04 15:26:00 +05:30
Himanshu Warekar	7f253b679a	pull from hotfix	2019-04-04 15:19:44 +05:30
Himanshu Warekar	28db545947	fix: check transactions for batch, serial check	2019-04-04 15:02:25 +05:30
Nabin Hait	82bd388993	Merge pull request #17122 from frappe/asbasawaraj-remove-location-from-abbreviation-doctypes ... fix: Removed Location from Abbreviation Update DocTypes	2019-04-04 11:50:33 +05:30
Nabin Hait	9087efa5be	Merge pull request #17131 from Anurag810/desk-fixes ... fix: desk for selling module, sales invoice now avaialble at module page (WN-SUP41771).	2019-04-04 11:49:56 +05:30
Nabin Hait	b861c4bc46	Merge pull request #16895 from Alchez/hotfix-shipping-charge-override ... fix(transaction): Fix shipping rule charge override by tax template	2019-04-04 11:48:48 +05:30
Nabin Hait	e0a9835f30	Merge pull request #16987 from SaiFi0102/Party-Ledger-Summary-Fix ... fix(Party Ledger Summary): Show all adjustment entries as columns	2019-04-04 11:45:36 +05:30
Nabin Hait	0747273ea4	Merge pull request #17028 from sagarvora/field_order ... fix(accounts): dependent field should be displayed after source link field	2019-04-04 11:45:01 +05:30
Nabin Hait	94c822f5f0	Merge pull request #17022 from hrwX/cost_center_fix ... fix(Purchase Invoice): Cost Centre as per company	2019-04-04 11:43:44 +05:30
Nabin Hait	9eeb3715f0	Merge pull request #16992 from hrwX/cost_center ... fix(Purchase Invoice): Cost Centre as per company	2019-04-04 11:43:35 +05:30
Nabin Hait	2df623c693	Merge pull request #17072 from kennethsequeira/auto-re-val ... fix: spelling in validation message for Auto-reorder	2019-04-04 11:40:08 +05:30
Nabin Hait	1e5664ba5f	Update item.py	2019-04-04 11:39:55 +05:30
Nabin Hait	f4ae29320f	Merge pull request #17087 from deepeshgarg007/payment_entry ... Party type validation in payment entry	2019-04-04 11:39:00 +05:30
Anurag Mishra	76795aa086	fix: desk for selling module sales invoice now avaialble at module page	2019-04-04 11:38:42 +05:30
Nabin Hait	f86a01446f	Merge pull request #17086 from adityahase/check-version-hf ... fix: Raise exception if apps are on incompatible branches	2019-04-04 11:17:04 +05:30
Nabin Hait	9ee417888e	Merge pull request #17092 from nabinhait/ar-ap-print ... fix: Show Sales Person in AR/AP print is optional	2019-04-04 11:02:26 +05:30
Nabin Hait	2c869bd486	Merge pull request #17101 from hrwX/india_setup ... fix(India): Add HSN/SAC in setup	2019-04-04 11:02:11 +05:30
Himanshu Warekar	5ccc4731d0	fix: typo fix	2019-04-04 11:02:05 +05:30
Himanshu	c930cb10fa	fix: remove duplicate doctype	2019-04-04 11:01:10 +05:30
Nabin Hait	91b1875ccf	Merge pull request #17099 from nabinhait/return-precision-issue ... fix: Validate returned qty with ref qty considering field precision	2019-04-04 10:59:26 +05:30
Nabin Hait	2092a8b1cf	Merge pull request #17100 from nabinhait/gl-entry-precision ... fix: Validate gl entry debit/credit as per field's precision	2019-04-04 10:59:06 +05:30
Nabin Hait	6ffdddc100	Merge pull request #17126 from rmehta/warehouse-account-description ... fix(kaizen): warehouse account description	2019-04-04 10:50:52 +05:30
Nabin Hait	fdf52a82d6	Merge pull request #17127 from rmehta/warehouse-account-fix-develop ... fix(kaizen): warehouse account description	2019-04-04 10:50:42 +05:30
Nabin Hait	3149596b53	Merge pull request #17102 from hrwX/hsn_india_v12 ... fix(India): HSN Code	2019-04-04 10:49:55 +05:30
Nabin Hait	b652421a54	Merge pull request #17106 from nabinhait/loan-link ... fix: Added link for loan in HR module page	2019-04-04 10:49:37 +05:30
Nabin Hait	d2c370a215	Merge pull request #17113 from deepeshgarg007/item-register ... fix: Divide by zero exception handling	2019-04-04 10:49:13 +05:30
Rushabh Mehta	3720e64506	fix(kaizen): warehouse account description	2019-04-04 09:02:41 +05:30
Rushabh Mehta	1f0edabda8	fix(kaizen): warehouse account description	2019-04-04 08:58:34 +05:30
Rushabh Mehta	e7b6b46309	Merge pull request #17109 from PawanMeh/fixes_16894_v11 ... fix: Amazon v11 integration issues	2019-04-03 22:54:43 +05:30
asbasawaraj	d2b69445b1	Removed Location from Abbreviation Update DocTypes	2019-04-03 17:05:53 +05:30
rohitwaghchaure	fb48686d82	Merge pull request #17118 from rohitwaghchaure/_incorrect_prezzototale ... fix: incorrect PrezzoTotale	2019-04-03 16:33:56 +05:30
Rohit Waghchaure	a2f71cdeec	fix: incorrect PrezzoTotale	2019-04-03 16:10:14 +05:30
Nabin Hait	b1f3f04d71	fix: Validate gl entry debit/credit as per field's precision	2019-04-03 12:30:25 +05:30
deepeshgarg007	5ad7b655cf	fix: Divide by zero exception handling	2019-04-03 09:11:03 +05:30
Mangesh-Khairnar	b2dc6ef165	style: fix the message for reason for hold	2019-04-02 18:01:14 +05:30
hello@openetech.com	ea00f8cbc3	[fix] #16894	2019-04-02 14:22:23 +05:30
Rushabh Mehta	43257c8cc3	fix(rename): Help Desk => Support	2019-04-02 08:59:15 +05:30
rohitwaghchaure	c0435f21c2	Merge pull request #17098 from rohitwaghchaure/incorrect_calculation_of_imponibile_importo_develop ... fix: incorrect calcualtion of ImponibileImporto if tax rate is zero	2019-04-01 23:15:17 +05:30
rohitwaghchaure	b035bf7f39	Merge pull request #17095 from rohitwaghchaure/incorrect_calculation_of_imponibile_importo ... fix: incorrect calcualtion of ImponibileImporto if tax rate is zero	2019-04-01 23:14:56 +05:30
Nabin Hait	9d431a8a83	fix: Added link for Expense Claim in HR module page	2019-04-01 21:06:12 +05:30
Nabin Hait	948cc631c6	fix: Added link for loan in HR module page	2019-04-01 20:58:20 +05:30
Himanshu Warekar	656d8e4557	fix(India): HSN Code	2019-04-01 19:38:43 +05:30
Himanshu Warekar	624477cb21	fix(India): Add HSN/SAC in setup	2019-04-01 19:25:28 +05:30
Nabin Hait	b4263a41c6	fix: Validate gl entry debit/credit as per field's precision	2019-04-01 19:11:34 +05:30
Nabin Hait	88f036a171	fix: Validate returned qty with ref qty considering field precision	2019-04-01 18:41:31 +05:30
Rohit Waghchaure	58f489fec8	fix: calcualtion of ImponibileImporto if tax rate is zero	2019-04-01 18:18:27 +05:30
Nabin Hait	0049986efd	Merge pull request #17088 from nabinhait/hsn-fixes ... fix: Fetch HSN code only if empty	2019-04-01 18:17:26 +05:30
Deepesh Garg	6b320bea81	fix: GSTR3b test case fix (#17094)	2019-04-01 17:55:01 +05:30
Rohit Waghchaure	ebc2437516	fix: calcualtion of ImponibileImporto if tax rate is zero	2019-04-01 17:50:31 +05:30
Rohit Waghchaure	6f3f2185ab	fix: pos takes more time to add an item in the cart	2019-04-01 16:45:47 +05:30
Nabin Hait	51d08786dc	fix: Show Sales Person in AR/AP print is optional	2019-04-01 16:24:23 +05:30
scmmishra	a409400e58	feat: added hero image field	2019-04-01 15:42:38 +05:30
scmmishra	d3bae4e8b5	feat: better cards in lms	2019-04-01 15:38:56 +05:30
rohitwaghchaure	f4d8457905	Merge pull request #17090 from rohitwaghchaure/pos_qty_decrement_not_working ... fix: POS qty decrement freezing the screen	2019-04-01 14:57:33 +05:30
Rohit Waghchaure	e994494e3e	fix: POS qty decrement freezing the screen	2019-04-01 14:29:55 +05:30
Nabin Hait	f4af608408	fix: Fetch HSN code only if empty	2019-04-01 11:51:54 +05:30
deepeshgarg007	4614eb219b	Merge branch 'hotfix' of https://github.com/frappe/erpnext into payment_entry	2019-04-01 11:48:07 +05:30
Aditya Hase	b841cb2a66	fix: Raise exception if apps are on incompatible branches	2019-04-01 11:36:57 +05:30
Nabin Hait	4873875c1c	Merge pull request #17038 from netchampfaris/fix-leave-application-condition ... fix: Missing "and" in filter conditions	2019-04-01 11:15:36 +05:30
Nabin Hait	093f4c529b	Merge pull request #17055 from deepeshgarg007/tds ... fix: TDS payable monthly report fix	2019-04-01 11:12:45 +05:30
Anurag Mishra	5402451b35	feat: Loan repayment report ... Co-authored-by: crescent28 <mitali@erpnext.com>	2019-04-01 10:57:36 +05:30
Rohit Waghchaure	614f5adf6d	fix: code cleanup	2019-04-01 10:53:08 +05:30
Rohit Waghchaure	5fa9a7a1b4	feat: unlink advance payment entry on cancelation of order	2019-04-01 00:40:38 +05:30
Rohit Waghchaure	70b996af73	fix: test cases	2019-03-31 20:34:52 +05:30
scmmishra	751e75bb4c	chore: set lms as home page for lms user role	2019-03-31 18:31:53 +05:30
Rohit Waghchaure	e540534e42	fix: Pricing rule not working for POS	2019-03-31 17:13:18 +05:30
deepeshgarg007	d0b98d74de	fix: Allow doctype only in party account types	2019-03-30 19:44:31 +05:30
Nabin Hait	f9f04ed89e	fix: woocommerce settings	2019-03-30 17:39:40 +05:30
Nabin Hait	da7a193f11	fix(stock): Fixed stock balance and stock ledger report	2019-03-30 15:53:04 +05:30
Kenneth Sequeira	4f5839eb65	fixed spelling in validation message ... fixed typo in auto-reorder validation message	2019-03-30 15:37:51 +05:30
Saurabh	75b4de3e20	bumped to version 11.1.18	2019-03-30 15:30:36 +06:00