Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,502 Commits 3 Branches 0 Tags 1 GiB
c09b92d673
Commit Graph

829 Commits

Author SHA1 Message Date
Michelle Alva
d8c38249e0
fix: Change naming series 
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-09-03 09:04:21 +05:30
marination
099d6718c9 fix: Dont Copy or Print Naming Series 2020-09-02 11:54:55 +05:30
michellealva
f46c1c5164 fix: Change property of field 2020-08-30 21:37:45 +05:30
michellealva
288ced24db feat: Add Naming Series for Project DocType 2020-08-30 19:33:27 +05:30
Afshan
d7d92c520e
fix: removed code relating to standard working hours (#23009) 2020-08-13 19:40:09 +05:30
Suraj Shetty
1923ef052c
refactor: Format and sanitise user inputs to search queries. (#22913) 
* refactor: Sanitize whitelisted method inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Format and sanitize tax_account_query inputs

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* refactor: Validate and sanitize search inputs via decorator

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

* style: Minor formatting fix

* refactor: Validate and sanitize search inputs using decorator

* fix: Typo

* fix: Remove unwanted import statement

* refactor: Repalce validate_and_sanitize_search_inputs() with validate_and_sanitize_search_inputs

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>

Co-authored-by: Prssanna Desai <prssud@gmail.com>
Co-authored-by: Shivam Mishra <scmmishra@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-08-05 19:42:25 +05:30
Afshan
ecb1460440
fix: update the project after task deletion so that the % completed s… (#22591) 
* fix: update the project after task deletion so that the % completed shows correct value

* fix: patch to correct % complete of previous projects

* fix: for version-13

* fix: removed patch from v13

Co-authored-by: Marica <maricadsouza221197@gmail.com>
Co-authored-by: Anurag Mishra <32095923+Anurag810@users.noreply.github.com>
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-07-24 10:48:16 +05:30
Anupam Kumar
a18f2ec23e
fix: setting filter for project in kanban board (#22717) 
Co-authored-by: Nabin Hait <nabinhait@gmail.com>
 2020-07-23 11:09:17 +05:30
Anupam Kumar
4a5fc23d5c
Export Project dashboard (#22782) 2020-07-23 11:07:56 +05:30
Abhishek Balam
a5b83e85c3
feat: dashboard for timesheet (#22750) 2020-07-21 12:54:59 +05:30
rohitwaghchaure
165d57aa0b
Merge pull request #22663 from rohitwaghchaure/fixed-error-report-related-to-task-develop 
fix: '>' not supported between instances of 'str' and 'int'
 2020-07-13 18:11:50 +05:30
Rohit Waghchaure
2e8d8b9aeb fix: '>' not supported between instances of 'str' and 'int' 2020-07-13 12:09:10 +05:30
rohitwaghchaure
ac984eb37c
Merge branch 'develop' into project-link-for-all-accounts 2020-07-13 11:50:11 +05:30
Afshan
83cd1dcc44
fix: Add project filter in parent task field (#22655) 
* fix: Add project filter in parent task field
 2020-07-11 21:54:54 +05:30
Rohan
cdf55cef80
fix: fetch project-related info in Timesheet (#22423) 
Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-07-09 11:36:01 +05:30
rohitwaghchaure
41c9708f99
Merge branch 'develop' into project-link-for-all-accounts 2020-07-08 13:11:37 +05:30
Marica
7860d9e699
Merge branch 'develop' into whitelist-query 2020-07-07 11:53:19 +05:30
Marica
e3e5fd7e74
fix: Skip Progress and Completed by fields on Task Duplication (#22565) 2020-07-06 18:26:19 +05:30
Deepesh Garg
92a03aa5db Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-07-06 12:37:28 +05:30
Chinmay D. Pai
ed0bb20e6f
chore: add query functions to whitelist 
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
 2020-07-02 12:35:41 +05:30
Nabin Hait
fdbd10f193
fix: Dashboard label in Projects and Assets module (#22517) 2020-06-30 09:25:17 +05:30
Afshan
a07a548622 fix: removed "standard working hours" also fixed test cases 2020-06-24 13:07:59 +05:30
Afshan
4e37d25374 fix: removed condition that considered "Standard working hours" while creating "timesheet" as it was setting wrong time #20848 2020-06-23 14:10:40 +05:30
Deepesh Garg
edd4aa6faa Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-22 09:59:39 +05:30
Anurag Mishra
289c82243f
feat: New Payroll module (#21990) 
* feat: Moved Document to Payroll Module

* feat: Moved Reports to Payroll Module

* feat: Moved Print fromat With Patch

* feat: Moved Notifiction to Payroll Module and patches

* feat: added dashboard and desk page to Payroll

* feat: Payroll Dashboard

* feat: Module onboarding

* feat: Income tax Deductions Report

* feat: Ecs Checklist Report

* feat: Provident Fund Report

* feat: Professional Fund report and commonified Code

* feat: Total Payments Based On Payment Mode Report

* fix: refactor and added chart Total Payments Based On Payment Mode

* feat: Payroll Settings

* fix: Bank remittance Report

* feat(Payroll based on): Considered unmarked days

* feat: Added Help for condition an formula in Salary structure

* fix: requested changes

* fix: rename report Ecs checklist to salary_payments_via_ecs

* fix: renamed report report/total_payments_based_on_payment_mode

* fix: added role via setup.py for regional report

* feat: added All reports to desk page

* fix: frappe.reload doc in all patches

* fix: codacy

* fix: frappe.reload_doctype for patches

* patch: is_income_tax_component and component_type for salary component

* fix: uncommented code

* test: fixture

* fix: test

* test: test_payment_days_based_on_attendance
 2020-06-19 19:17:57 +05:30
Deepesh Garg
3c63f5b76b Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-06-19 11:41:21 +05:30
Rohit Waghchaure
fa6e4f62e2 fix: travis for develop 2020-06-16 12:02:58 +05:30
Deepesh Garg
7e974c9e2c fix: Test Cases 2020-06-12 15:29:40 +05:30
rohitwaghchaure
95331a31a7
Merge pull request #22155 from frappe/barredterra-billing_hours 
feat(projects): bill all hours by default
 2020-06-10 14:16:18 +05:30
Raffael Meyer
088ab75083
fix: move feature into update_billing_hours 2020-06-09 16:09:40 +02:00
Deepesh Garg
e5fe00cf58 Revert "fix: docfield of sales_order is not fetching route options for new doc (#21123)" 
This reverts commit 5c54adec28.
 2020-06-09 17:41:27 +05:30
Raffael Meyer
d27d88c3e4
feat: bill all hours by default 2020-06-08 22:52:44 +02:00
Deepesh Garg
c897e800ed Merge branch 'develop' of https://github.com/frappe/erpnext into project-link-for-all-accounts 2020-05-29 11:04:20 +05:30
Shivam Mishra
6621e22c02
refactor: clean up desk pages (#22004) 
* refactor: clean up desk pages

* refactor: update label for CRM
 2020-05-28 14:48:50 +05:30
Shivam Mishra
2a81058f90
refactor: project summary report (#21943) 
* feat: added more filters

* feat: show only first 30 projects in chart

* Update erpnext/projects/report/project_summary/project_summary.js

Co-authored-by: Marica <maricadsouza221197@gmail.com>

Co-authored-by: Marica <maricadsouza221197@gmail.com>
 2020-05-27 11:53:48 +05:30
Nabin Hait
6277367d21 fix: project desk 2020-05-19 21:18:26 +05:30
Shivam Mishra
318affedb8 fix: divide by zero error 2020-05-06 20:26:12 +05:30
Shivam Mishra
20a1d375f3 feat: add fixture for project dashboards 2020-05-06 20:26:00 +05:30
Shivam Mishra
81f8fbb042 feat: update colors 2020-05-05 18:53:29 +05:30
Shivam Mishra
945aa08d92 feat: show stacked in report 2020-05-05 18:46:21 +05:30
Shivam Mishra
5f1240bcc6 feat: updated charts to use stacked layout 2020-05-05 18:44:02 +05:30
Shivam Mishra
4ea122662a refactor: less verbose labels for charts 2020-05-04 20:29:59 +05:30
Shivam Mishra
c7f5724fad feat: added project summary chart to desktop 2020-05-04 20:28:24 +05:30
Shivam Mishra
1607891a3c feat: added basic project summary report 2020-05-04 20:26:33 +05:30
Shivam Mishra
100453c64f feat: added open count tag 2020-05-04 19:32:20 +05:30
Abhishek Balam
84187fb8e9 Code cleanup and improvements requested in PR:21404 2020-04-26 05:00:36 +05:30
Wolfram Schmidt
6d49238159
Update project.json (#21274) 
unnecessary requirement for project creation as this is a field of the Type select which will be pre-filled. When creating a project of list view it will also bring up this field as it has "reqd": 1. A new projekt will have the status set to open in most cases.

Co-authored-by: Nabin Hait <nabinhait@gmail.com>
Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-04-19 20:19:10 +05:30
Saqib
b52cd59dc3
Merge branch 'develop' into project-link-for-all-accounts 2020-04-14 14:05:32 +05:30
Marica
02c9332695
fix: Project Update Email Error (#21208) 
* fix: Project Update Email Error

* Update project.json

Co-authored-by: Himanshu <himanshuwarekar@yahoo.com>
 2020-04-14 11:47:58 +05:30
Shivam Mishra
ebcc46d837
feat: updated desk pages (#21138) 2020-04-10 18:52:05 +05:30