Commit Graph

637 Commits

Author SHA1 Message Date
Rucha Mahabal
c4b2dceb01 feat: Fee Validity status (Ongoing, Expired, Completed) 2020-03-09 23:57:00 +05:30
Rucha Mahabal
99321cd538 fix: conflicts 2020-02-27 13:16:53 +05:30
Rucha Mahabal
41bd317e25 refactor: Patient Appointment status 2020-02-25 13:51:36 +05:30
Rucha Mahabal
5100e11fb6 fix: appointment reminders not working 2020-02-24 22:08:45 +05:30
vishal
dcef798be7 fix: minor changes 2020-01-13 12:59:52 +05:30
vishal
1dd289450f fix: docstring for auto cancel 2020-01-13 12:59:18 +05:30
vishal
eef05758b6 feat: Added docinfo for auto cancel exempt doctypes 2020-01-13 12:59:18 +05:30
vishal
70148a6748 feat: docstring added for auto cancel exempt doctypes 2020-01-13 12:59:12 +05:30
0Pranav
5f5c725ef9 add book appointment to the sidebar 2019-12-18 16:21:50 +05:30
Deepesh Garg
6e2c13f4c8 feat(regional): Auto state wise taxation for GST India (#19469)
* feat(regional): Auto state wise taxation for GST India

* fix: Update gst category on addition of GSTIN

* fix: Codacy and travis fixes

* fix: Travis

* fix(test): Update GST category only if GSTIN field available

* fix: Test Cases

* fix: Do not skip accounts if place of supply is not present

* fix: Auto GST taxation for SEZ Party types

* fix: Automatic taxation for multi state

* fix: Codacy and travis fixes

* fix: Auto GST template selection in Sales Order

* fix: Move inter state check and source state to tax category

* fix: Remove unique check from tax template

* fix: Remove unique check from tax template

* fix: Address fetching logic in Sales

* fix: fecth tax template on company address change

* fix: fetch company gstin on address change

* fix: company_gstin set value fix

* fix: Mutiple fixes and code refactor

* fix: Add missing semicolon

* fix: Company address fetching in sales invoice

* fix: Remove print statement

* fix: Import functools

* fix: Naming fixes and code cleanup

* fix: Iteritems compatibility for python 3
2019-12-10 15:55:05 +05:30
Shivam Mishra
30245a0673
Merge pull request #19677 from ruchamahabal/setup_wizard
feat: Slides for Onboading Wizard in ERPNext
2019-11-28 14:35:10 +05:30
deepeshgarg007
2fe0c98772 fix: Path for quotation expiry method in hooks 2019-11-28 08:09:47 +05:30
Rucha Mahabal
58928e8eae
Merge branch 'develop' into setup_wizard 2019-11-27 11:55:53 +05:30
deepeshgarg007
53a66ee386 fix: Method name in hooks, test case code clean up 2019-11-25 21:58:15 +05:30
Rucha Mahabal
00677f334e fix: user progress code cleanup 2019-11-25 11:58:14 +05:30
0Pranav
53b65ab8ed Add status expired to doctype quotation 2019-11-15 16:42:32 +05:30
Raffael Meyer
edba06038e feat(regional): enable transaction log for germany (#19198) 2019-11-06 19:07:04 +05:30
Gavin D'souza
d38f5374cb chore: moved email digest to long job 2019-10-30 14:43:58 +05:30
Faris Ansari
38ac7f7350 Enhancements to Supplier Portal (#19221)
* fix: Add Purchase Order to portal

* fix: Create Customer or Supplier on first login

Based on default role set in Portal Settings, a Customer or Supplier
will be created when the user logs in for the first time.

* fix: Styling for transaction_row

* fix: Styling for RFQ page

* fix: Add Purchase Invoice route

- Make Purchase Invoice from PO

* fix: minor

- Admissions for Student role
- Remove print statement
2019-10-09 11:41:33 +05:30
Himanshu
2985cffc52
Merge branch 'develop' into global_search_modules 2019-10-02 16:36:19 +05:30
Himanshu Warekar
23c916c0d6 fix: global search dict in hooks 2019-10-02 16:32:53 +05:30
Himanshu Warekar
21abc3aa50 fix: add doctypes for modules 2019-09-30 13:40:02 +05:30
Suraj Shetty
38794c0ca1
Merge branch 'develop' into leaderboard 2019-09-30 11:54:28 +05:30
Himanshu
83b0b2adec feat(Global Search): Add fixtures for global search (#19049) 2019-09-27 00:59:48 +05:30
prssanna
3f1444e410 fix: get leaderboards using hooks 2019-09-24 13:51:22 +05:30
Mangesh-Khairnar
dab5b1f319 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-08-13 13:33:26 +05:30
Suraj Shetty
d4edd284e6 fix: Set Contact or Lead for call log
- Set contact or lead to call log on new Contact or Lead creation
2019-08-09 19:23:04 +05:30
Mangesh-Khairnar
e173d54054 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-08-09 13:37:51 +05:30
Mangesh-Khairnar
f281f00d43 feat: auto leave encashment 2019-08-05 14:47:53 +05:30
Rucha Mahabal
b54459e588 dash: added Email Campaign to CRM dashboard 2019-07-22 03:23:40 +05:30
Rucha Mahabal
9e35bff55c feat: Email Campaign 2019-07-12 13:56:36 +05:30
Rucha Mahabal
8c747ce5cf merged 2019-07-09 15:18:45 +05:30
Rucha Mahabal
36963a8e04 feat: Email Campaign 2019-07-09 15:14:13 +05:30
Mangesh-Khairnar
8d19faa598 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-07-03 11:44:00 +05:30
Nabin Hait
34c551d9a5
fix: Missing commits from hotfix branch (#17997)
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
2019-07-03 10:34:31 +05:30
Rucha Mahabal
162f7d1b50 auto email and new communication linked to email campaign setup 2019-07-01 01:09:58 +05:30
Suraj Shetty
19e4fde737 Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-30 15:30:59 +05:30
Himanshu
9323c3ae29
Merge branch 'develop' into sla_fix 2019-06-26 12:54:08 +05:30
Mangesh-Khairnar
07aae76bbf fix: change the department to tree view (#18057) 2019-06-26 11:03:57 +05:30
Himanshu Warekar
6931ea68a2 Merge sla_fix into sla_fix 2019-06-25 16:27:58 +05:30
Himanshu Warekar
2373c095ed Merge develop into sla_fix 2019-06-25 16:27:06 +05:30
Himanshu
0e26deb463
Merge branch 'develop' into sla_fix 2019-06-24 19:30:36 +05:30
karthikeyan5
e0c5176383 refactor(HR): Auto Attendance
> moved all auto attendance settings from HR Settings to shift
> added shift in attendance and Employee Attendance Log
> reordered and cleaned up fields in HR Settings and Employee DocType
2019-06-24 15:15:38 +05:30
karthikeyan5
23cedfd6c8 feat(HR): Auto Attendance
>Marking attendance based on Employee Attendance Log
2019-06-24 15:15:38 +05:30
Himanshu
c26ce5c506
Merge branch 'develop' into sla_fix 2019-06-20 23:58:08 +05:30
Faris Ansari
4a1c7ddb09 fix: App logo URL 2019-06-19 19:15:37 +05:30
Suraj Shetty
54bb3e4b9f Merge branch 'develop' of github.com:frappe/erpnext into call-summary-dialog 2019-06-10 09:25:39 +05:30
Himanshu Warekar
0674d16fee feat: sla based on customer/group/territory 2019-06-07 15:28:42 +05:30
Suraj Shetty
f1ffdb3c12 feat: Add call sound effects 2019-06-07 12:48:13 +05:30
Mangesh-Khairnar
86e0f4c617 Merge branch 'develop' of https://github.com/frappe/erpnext into leave-management 2019-06-06 20:41:28 +05:30