Nabin Hait
c825e914d1
Added indexes for lft, rgt on nestedset doctypes ( #13420 )
2018-04-02 10:43:46 +05:30
Shreya Shah
5d71609f0b
Timer fixes ( #13443 )
...
* alert for exceeded time only when dialog is open
* fetch row having an activity without from_time
* fixes if timesheet created from work order
* reset timer limit exceeded
2018-04-02 10:32:39 +05:30
Dominik Ottenbreit
561e2a534b
Add Project Standard Filters ( #13417 )
2018-03-28 14:25:51 +05:30
Prateeksha Singh
e45f957ad9
Merge pull request #13363 from shreyashah115/timer
...
Timer in Timesheets!
2018-03-27 10:28:50 +05:30
Nabin Hait
061d912749
Fixed merge conflict
2018-03-23 16:20:27 +05:30
rohitwaghchaure
492de67d7b
Added consumed material cost in project ( #13365 )
2018-03-23 15:02:04 +05:30
Shreya
559011404a
removed timesheet.html, appended it as a helper function
2018-03-23 11:41:56 +05:30
Shreya
5bf24be704
minor fixes
2018-03-23 11:41:56 +05:30
Shreya
8f06266838
all fields editable
2018-03-23 11:41:55 +05:30
Shreya
5714260af4
replaced status with completed checkbox
2018-03-23 11:41:55 +05:30
Shreya
09937f3753
modified timer start button
2018-03-23 11:41:55 +05:30
Shreya
faff9d3bb2
thanks to faris for the css
2018-03-23 11:41:55 +05:30
Shreya
05e516efc4
Start the timer on the basis of time diff between now_time and timestamp
2018-03-23 11:41:55 +05:30
Shreya
7cc288a6db
New activity dialog removed, read only fields editable if no rows found, add a new row on timer start
2018-03-23 11:41:55 +05:30
Shreya
36040ce5f9
new field actual_end_time to record completed time
2018-03-23 11:41:55 +05:30
Shreya
dcce87d4a8
CSS modifications
2018-03-23 11:41:55 +05:30
Shreya
cd140da3ec
new dialog to create activity
2018-03-23 11:41:55 +05:30
Shreya
643528a3b8
added status field
2018-03-23 11:41:55 +05:30
Shreya
8f4e93f104
removed stop button and added a complete button
2018-03-23 11:41:55 +05:30
Shreya
eeaba29e5b
read only fields project and hours
2018-03-23 11:41:55 +05:30
Shreya
6a1bf70627
alert sound when timer exceeds the given hours
2018-03-23 11:41:55 +05:30
Shreya
1cfd28d50d
timer in timesheet
2018-03-23 11:41:55 +05:30
Faris Ansari
4fc74333bd
Fix Icons for Expense Claim and Timesheet ( #13359 )
2018-03-21 17:54:09 +05:30
Faris Ansari
ce08aabc84
Add Kanban Board button in project ( #13345 )
2018-03-20 19:03:32 +05:30
Achilles Rasquinha
0575b3e1c3
fixed inconsistent tab error ( #13339 )
2018-03-20 14:07:25 +05:30
Zarrar
13ddc7e188
[ Enhance ] Production to Work Order ( #12902 )
...
* remove occurrences of Production Order
* rename from report and jsons
* Change Production Order to Work Order
* change occurences of production order from other files
* resolve minor conflict issues and reports
* patch added
* codacy fix
* updated patches, leftover changes
* rename reports, rectify patches
2018-03-20 12:38:43 +05:30
renzodemie
417dfed214
Daily Reminder ( #12938 )
...
* for email sending
* test commit for new branch
* Removed test changes
* test commit renzo
* Email sending
* Project Uo
* Project Update
* "My first commit"
* "My second commit"
* "My second commit"
* Holiday is included
* delete idea
* first pull
* first pull
* "My third commit"
* Delete idea
* delete again
* "Edit Time"
* "Edit Time"
* Naming series and bug fixing
* "Edit current day and time"
* "Proper naming series, hidden time and date"
* Project and Project Update dashboard
* dashboard
* Remove hooks for PR
* Remove hooks for PR
* Remove hooks for PR
* Deleted project_time.py
* Corrected indention
* Hook back to original
* Delete project_time.py
* "Modified time"
* Fix indention
* Sample
* FRM
* FRM
* Time fix
* Hooks original state
* "Modified time"
* Added permission to Project User
* Added function/method to be called in order to create project update for the specific project
* Naming series
* this is not included
* Fix minor bug
* Indent again
* "Reformat Code"
* "Check Indent"
* Indent again and again
* semi colon
* "Check Again Indent"
* "Check again Indent"
* "Check again Indent"
* ind
* "Check again Indent"
* "Check again Indent"
* Generate Project update
With button in email
* []
* "Erro Summary"
* "Add syntax for the communcation"
* "add summary code"
* "Modified Summary code"
* "Modified Summary code"
* "Fix update ID and set localhost"
* Fix time and date error in project_update
Fix naming series problem in project_update
* included "not updated" in project update
* Bug in Number of Drafts
* "add notes in summary"
* Correct code
* With error
* Removed the method
* Minor fixes
* Correction for daily summary
2018-03-20 11:58:15 +05:30
Achilles Rasquinha
a4a62d5ea1
unordered types None vs int
2018-03-15 12:18:37 +05:30
Suraj Shetty
f2d28ebd6a
Data import Tool bug fix ( #13165 )
...
* fixes #13064
* commonified naming series checks
* test fixes
replaced test employee names according to naming series
2018-03-09 12:33:13 +05:30
Zarrar
4417cb0006
improve multiple add dialog, populate parent's depends on with child tasks ( #13142 )
2018-03-05 11:08:15 +05:30
Achilles Rasquinha
646522886c
self.assertEqual
2018-02-28 21:13:51 +05:30
Faris Ansari
72d8509b3d
python 3 fix ( #13127 )
2018-02-28 12:53:34 +05:30
Nabin Hait
7570774ebe
Merge branch 'master' into develop
2018-02-23 16:49:43 +05:30
Nabin Hait
d283ee73f3
Fetch timesheet based on project
2018-02-23 12:58:39 +05:30
tundebabzy
27d558c9ef
Optionally allow overlap on Timesheet #12893 ( #13018 )
...
* give user option to ignore time overlap validation
* move settings to new Projects Settings
* clean up - remove trailing space
2018-02-22 11:05:49 +05:30
Shreya Shah
093e7e6e98
Refactor Expense Claim ( #12883 )
...
* patch for custom workflow
* deleted field approval_status
* replaced approval_status with workflow_state
* updated test cases
* validation to check expense approver
* check if workflow_state_name already exists
* fixes
* modified notifications.py
* removed field exp_approval and modified test cases
2018-02-16 14:49:39 +05:30
Achilles Rasquinha
714c7465fb
Updated Python 3 fixes
2018-02-15 11:31:05 +05:30
Saurabh
cab73b8a02
[fix] execute update_time_and_costing and update_project only for distinct task and projects
2018-02-09 17:04:12 +05:30
Manas Solanki
b4693c6957
fix for making the invoice from the timesheet ( #12803 )
2018-02-07 12:07:27 +05:30
Zarrar
adc184c872
[Minor] Fix adding child to root task issue ( #12121 )
...
* make parent_task none
* adding multiple tasks - set project of parent
2017-12-22 11:00:19 +05:30
Vishal Dhayagude
c8ecfa15f3
[new] Make Timesheet UX Added ( #12100 )
2017-12-20 12:02:34 +05:30
Charles-Henri Decultot
d18423d9c7
Project Margin Calculation Improvement ( #11911 )
...
* Project Margin Calculation Improvement
* Documentation modification
* Change Total Planned Sales to Total Sales Amount
* Change documentation screenshot
2017-12-12 14:59:59 +05:30
Zarrar
17fd6610dc
Fix travis ( #11882 )
...
* fieldname wrong
* bifurcated test into two - error when both were running async
* minor fixes with link and route
* move school domain rename up
* fix async creation of operations test
* edit-in-full-page is button, not link
* set_route issue in production order test
* minor changes
* fix task tree test
* more fixes
* fix server side issue
* improvising ui tests
2017-12-08 14:57:38 +05:30
Zarrar
2ba198ec70
improvise query ( #11878 )
2017-12-08 11:35:53 +05:30
Zarrar
5e470f757f
[Fix] Filter on child table not working in Calendar ( #11824 )
...
* use the new get_events method
* using the common get_events method for calendar_view
* using add_fetch to fill customer_name
2017-12-04 11:22:25 +05:30
Zarrar
f71f3af938
adding task to root node ( #11666 )
2017-11-21 16:12:01 +05:30
Rushabh Mehta
4313326ba0
[fix] treeview for tasks ( #11515 )
...
[fix] treeview for tasks
2017-11-10 18:52:21 +05:30
Shreya Shah
d9e2b24535
task name in gantt view - clickable ( #11459 )
2017-11-08 11:35:19 +05:30
Nabin Hait
f15a8409eb
[tests] Test case fixes for task and project ( #11445 )
...
* [tests] Test case fixes for task and project
* Removed hard-coded dates from test cases
* Codacy fix
2017-11-06 11:11:34 +05:30
Zarrar
6d41a9a647
Converting Task to a Tree structure ( #11117 )
...
* added support for tree view
* nestedset added to handle tree based structure
* treeview ui added
* removed is_group dependency
* added validation while editing a group-task
* codacy fix
* BOM like filter added
* Added ui-test for treeview-task
2017-10-31 13:10:55 +05:30
Pawan Mehta
07ab4622e8
[fix] #9824 - Calculate costing amount even if billable is unchecked ( #11310 )
...
* [fix] #9824
* fix code
2017-10-25 11:55:49 +05:30
Makarand Bauskar
3e4ca4219f
[hotfix] fixed 'ValueError: Unknown string format' error if the from_time value is null ( #11162 )
2017-10-18 11:16:47 +05:30
Shridhar Patil
3f7d96ecba
Unassign from todo. ( #10896 )
...
Unassign from todo when the status is changed to Closed or Cancelled
2017-09-29 15:18:43 +05:30
Nabin Hait
945f502748
Fixes for updating item variant from template ( #10975 )
...
* Fixes for updating item variant from template
* More fixes for test cases
2017-09-29 15:11:50 +05:30
Nabin Hait
c314485d55
Fixes based on test case
2017-09-28 18:55:49 +05:30
ci2014
9bc197cfd5
Update project.js ( #10796 )
...
* Update project.js
Move indicators to setup to be less buggy
* fixed codecy trailing whitespace issues
2017-09-18 15:44:36 +05:30
Rushabh Mehta
f849915c13
[fix] label
2017-09-13 10:48:53 +05:30
rohitwaghchaure
fd39d6bd3c
[Enahance] Provision to select customer, item code while making an invoice from timesheet ( #10616 )
2017-09-04 10:20:40 +05:30
Makarand Bauskar
98b52a7245
resolved merge conflicts on develop ( #10185 )
...
* resolved merge conflicts on develop
* [minor] removed the validate_activity
2017-07-31 15:09:52 +05:30
mbauskar
8b6f7914b0
resolved merge conflicts
2017-07-31 12:30:53 +05:30
tundebabzy
41c954b8b3
Set billing hours to 0 in timesheet #9535 ( #10139 )
...
* `update_billing_hours` to use flt not cint
* if not billable, reset billable hours
* if not billable, reset time rates
* test
2017-07-28 21:05:15 +05:30
bcornwellmott
bab0c5a8a5
Add disable check for Activity Type ( #10120 )
...
* Add disable check for Activity Type
* Add check for disabled in Timesheet
* Codacy fixes
* Fixed bugs
* Restore permissions
2017-07-28 14:32:45 +05:30
KanchanChauhan
7800bd89dc
Added Project Type new doctype to be added as link field for Project Type field in project instead of select field ( #9929 )
2017-07-26 17:55:25 +05:30
Utkarsh Goswami
40937083bf
[UI-Test Project] To check a billing cost of a project with multiple tasks ( #10084 )
...
* Updated test for Project Timesheet with multiple tasks
* Updated test for Project Timesheet with multiple tasks
* Updated test for Project Timesheet with multiple tasks
* updated:
* Updated
* Updated
2017-07-26 16:31:08 +05:30
Vishal Dhayagude
edb2749dfd
Timesheet web ( #10037 )
...
* [new]Timesheet added
* [new] Customer wise timesheet on webportal added
2017-07-25 10:53:12 +05:30
Rushabh Mehta
9d27cf3c62
[tests] refactored ( #9984 )
...
* [tests] refactored
* [fix] test_quotation.js
* [fix] tests.text
* [fix] fiscal year not needed
* [test] add long test
* [fix] add timeout in lead
2017-07-20 15:35:03 +05:30
Doridel Cahanap
7b021e0fac
Show Expected End Date in Project List View ( #9964 )
2017-07-19 18:21:31 +05:30
KanchanChauhan
d6dd25a666
Added indicators on Project Tasks ( #9952 )
2017-07-19 18:06:52 +05:30
Rushabh Mehta
1283f6308d
[fix] company graph based on base currency
2017-07-18 18:22:16 +05:30
Rushabh Mehta
660de515b5
[fix] filters for calendars frappe/erpnext#9850 ( #9870 )
2017-07-18 10:50:30 +05:30
Makarand Bauskar
7a2a2dad35
Merge pull request #9381 from almeidapaulopt/so_proj
...
link sales order to new project
2017-06-21 18:48:30 +05:30
mbauskar
196f3b1fb8
resolved merge conflicts
2017-06-21 14:38:06 +05:30
Paulo Almeida
2d5e65ddcf
link sales order to new project
2017-06-20 12:08:22 +01:00
Rushabh Mehta
36311020de
[minor] ux fixes
2017-06-20 09:31:06 +05:30
almeidapaulopt
31692a2595
Create a project from a Sales Order ( #9111 )
...
* init commit
* don't get tasks if project name is none
* cleanup
* Update sales_order.js
2017-06-16 15:29:41 +05:30
Nabin Hait
84bc5601eb
Total sales cost in Project should be updated based on base_grand_total ( #9302 )
...
* Total sales cost in Project should be updated based on base_grand_total
* Patch to update sales cost in Project in base currency
2017-06-16 12:13:51 +05:30
mbauskar
f9e2bf1ab4
fixed merge conflicts
2017-06-15 13:42:47 +05:30
tundebabzy
f5604c101c
Once primary key is generated, do not allow changing Series #8911 ( #9265 )
...
* changes set_only_once field for tabDocField to 1
* changes all affected doctypes `set_only_once` option to 1
* add patch name to text file
* adds test cases
* Revert "add patch name to text file"
This reverts commit fc7cb6b4557217cee61abfbbf42ff6f40099f23c.
* Revert "changes set_only_once field for tabDocField to 1"
This reverts commit 2b1f7f31a0d6491056d809f319bae0f7b84be435.
2017-06-14 16:10:09 +05:30
Faris Ansari
5f27c94100
Merge pull request #9078 from netchampfaris/remove-globals
...
Lint and fix JS files
2017-06-06 11:35:42 +05:30
Nabin Hait
c9fa07b16d
Merge branch 'master' into develop
2017-05-30 15:59:04 +05:30
Nabin Hait
5d7e8d9e83
Minor fix in timesheet ( #9063 )
2017-05-30 15:34:35 +05:30
Faris Ansari
ab74ca7fff
Lint and fix JS files
2017-05-30 12:54:42 +05:30
Paulo Almeida
97ff6fea47
add milestone field
2017-05-23 11:55:37 +01:00
Faris Ansari
74e2e4672c
Fix for duplicated project dependencies ( #8817 )
...
- skip when task is not found
2017-05-16 08:32:45 +05:30
Nabin Hait
226ea7db88
Filter issue on timesheet calendar view ( #8730 )
2017-05-08 17:34:07 +05:30
Faris Ansari
695327a513
Duplicate dependencies when project is duplicated
...
- fix frappe/erpnext#8274
2017-04-19 20:48:49 +05:30
Makarand Bauskar
141c244ece
[minor] added order by args to get_*_list methods ( #8413 )
2017-04-12 13:02:28 +05:30
Faris Ansari
eae30e5642
[fix] Show project title in kanban view ( #8268 )
...
- frappe/erpnext#8232
2017-03-31 17:46:12 +05:30
Faris Ansari
df65d21225
[ui] show assignees in gantt popup frappe/erpnext#6916
2017-03-13 14:52:56 +05:30
Faris Ansari
0e4b924f59
[gantt] show task project in popup
2017-03-07 12:01:39 +05:30
Rohit Waghchaure
e7485150a1
added roles in the report
2017-03-06 14:26:09 +05:30
Nabin Hait
258c8199fb
Merge pull request #7842 from superlack/develop
...
Add Sales Orders to Project costing and billing section
2017-03-01 17:20:23 +05:30
superlack
62d7ba0afd
Update project.py
2017-02-27 07:00:30 -08:00
Kanchan Chauhan
e76685d925
Dependent task dates gets updated with parent dates
2017-02-27 14:55:03 +05:30
superlack
f800892ec3
Update project.py
2017-02-24 12:33:59 -08:00
superlack
868ef7738f
Update project.json
2017-02-23 17:46:07 -08:00
superlack
c4587d2945
Update project.py
2017-02-23 17:39:05 -08:00
Nabin Hait
5079c9ef47
Fixed merge conflict
2017-02-22 15:31:31 +05:30
Nabin Hait
fd3ec066ce
Added fields in global search
2017-02-20 13:38:31 +05:30
Rohit Waghchaure
a020e4eba4
Payment entry fields issue, added total billed hours in timesheet
2017-02-17 14:51:57 +05:30
Nabin Hait
2f7697d1bd
Merge pull request #7746 from pratu16x7/minor-search-presets
...
Preset doctypes fields to Search
2017-02-15 18:46:03 +05:30
pratu16x7
349ed568ed
Add task and item
2017-02-15 09:23:26 +05:30
Kanchan Chauhan
bab6c9c006
[Fix] Project perecentage set 0 if no tasks
2017-02-14 14:30:00 +05:30
bcornwellmott
92b6ceec41
Duplicate "title" field
...
The title field was duplicated - removed first one.
2017-02-06 10:51:02 -08:00
Kanchan Chauhan
5f5457085e
Joining date validation removed from Salary Structure
2017-02-06 14:50:39 +05:30
Rushabh Mehta
3714626dd0
[minor] enhance BOM view
2017-02-01 18:35:53 +05:30
Kanchan Chauhan
3dd85a0e9e
Task rename now possible
2017-01-27 12:34:06 +05:30
Nabin Hait
dd839055e3
Fixed merge conflict
2017-01-17 15:52:56 +05:30
Gaurav Naik
d9b4c52046
[Fix] Project: Enabled autocomplete for project users
2017-01-16 16:01:25 +05:30
Nabin Hait
b251cd4ccb
Fixed merge conflict
2017-01-13 14:34:54 +05:30
Nabin Hait
9e08ccdf39
Merge pull request #7425 from KanchanChauhan/sync-projecttask-task
...
Sync Project Task and Task
2017-01-10 17:26:51 +05:30
Nabin Hait
20aba32318
Merge pull request #7427 from KanchanChauhan/projects-manager-role
...
[Minor] Added Projects Manager role
2017-01-10 17:25:16 +05:30
Kanchan Chauhan
c4aceaad7f
[Minor] Added Projects Manager role
2017-01-10 16:35:54 +05:30
Kanchan Chauhan
4a15fa4c86
Sync Project Task and Task
2017-01-10 16:01:38 +05:30
Nabin Hait
51d45d8bce
Fixed merge conflict
2017-01-10 12:32:01 +05:30
Nabin Hait
01baceb74e
Revert "proposed usage of daterange picker"
2017-01-10 12:19:48 +05:30
Nabin Hait
6e9d2a3c1f
fixed conflict
2017-01-09 17:21:34 +05:30
Nabin Hait
a2fae844b6
Merge pull request #7410 from RobertSchouten/timesheet_overlap_validation
...
[fix] timesheet overlap validation not including modified timesheet
2017-01-09 17:15:40 +05:30
Nabin Hait
802b4359b5
Fetch same items multiple times from source doc if all qty not processed
2017-01-09 15:32:20 +05:30
robert schouten
138c2f6b29
[fix] timesheet overlap validation not including modified timesheet
2017-01-09 12:50:35 +08:00
robert schouten
81130e848e
proposed usage of daterange picker
2017-01-09 08:38:27 +08:00
Nabin Hait
4573029a5e
Merge pull request #7292 from frappe/bcornwellmott-patch-1
...
Add hours to calendar labels
2016-12-26 16:09:11 +05:30
Nabin Hait
58291c77e9
Fixed version conflict
2016-12-23 17:43:42 +05:30
Nabin Hait
c2d66bdfb2
Merge branch 'master' into develop
2016-12-23 16:45:09 +05:30
bcornwellmott
e549984a42
Grabs title from SQL
...
Gets a concatenated title label for the Calendar event that includes the number of hours
2016-12-21 12:36:45 -08:00
bcornwellmott
3385bd4921
Add hours to label in calendar view
...
Adds a label for the number of hours to each calendar event
2016-12-21 12:33:32 -08:00
Rohit Waghchaure
1af1a43616
[Enhancement] Setting to maintain the work hours and bill hours same on the timesheet
2016-12-21 19:19:16 +05:30
Kanchan Chauhan
b79aa1d091
[Minor] Read permissions to Employee on Activity Type and Appraisal Template
2016-12-13 14:16:57 +05:30
Kanchan Chauhan
a72841e5e5
Show only Project tasks in depends on tasks
2016-12-12 18:33:46 +05:30
Nabin Hait
f5460e9e6f
Merge pull request #6846 from KanchanChauhan/payroll-updates
...
Weekly, Fortnightly, Bimonthly and Monthly payroll frequency
2016-12-08 13:51:55 +05:30
Nabin Hait
1b9caf90dd
Merge branch 'master' into develop
2016-12-08 12:33:54 +05:30
Kanchan Chauhan
f7b25cbb6b
[WIP] Payroll Updates
2016-12-08 12:20:20 +05:30
Rohit Waghchaure
86ed030b5c
minor issue
2016-12-07 19:17:01 +05:30
Rohit Waghchaure
0327b35b5e
[fix] timesheet datetime issue
2016-12-07 18:32:36 +05:30
Nabin Hait
5c18bd9b61
Fixed merge conflict
2016-12-06 16:16:58 +05:30
Nabin Hait
12a396ef25
Merge pull request #7107 from RobertSchouten/timesheetdates
...
calc timesheet dates on validate not just submit
2016-12-05 14:23:21 +05:30
Rushabh Mehta
323c06ebbf
[minor] rename icons as per FontAwesome 4 ( #7136 )
2016-12-05 14:17:26 +05:30
Nabin Hait
c92e2f9044
Update project_wise_stock_tracking.json
2016-12-01 16:12:35 +05:30
robert schouten
81a5467c8f
[fix] Project wise Stock Tracking is script report
2016-12-01 09:02:17 +08:00
robert schouten
0beb5bdea6
calc timesheet dates on validate not just submit
2016-12-01 08:51:03 +08:00
Nabin Hait
7f3da5dbb1
Fixed merge conflict
2016-11-28 14:23:51 +05:30
Rohit Waghchaure
8c4e45ab3d
cleanup timesheet
2016-11-23 17:54:47 +05:30
Rushabh Mehta
4e61564f73
[minor] fixes to daily work summary formatting
2016-11-22 21:59:20 +05:30
Nabin Hait
d4e8b297cd
Merge pull request #6784 from RobertSchouten/calendar_fix
...
[fix] calendar range fixes
2016-11-17 14:45:59 +05:30
Nabin Hait
a469e659c5
Fixed merge conflict
2016-11-08 15:26:27 +05:30
Rushabh Mehta
13fc52d713
[minor] added default standard filters ( #6854 )
2016-11-07 17:19:19 +05:30
Rohit Waghchaure
0ecad33642
cleanup and fixes
2016-11-05 08:09:21 +05:30
Nabin Hait
81f7a265bc
Merge pull request #6723 from rohitwaghchaure/enhancement_remember_last_selected_value
...
Remember last selected value for link field
2016-11-04 16:13:49 +05:30
Rohit Waghchaure
0d2f7e62c0
set remember last selected value as true for company field
2016-11-03 16:19:34 +05:30
Rohit Waghchaure
3844d2cc01
Remember last selected value for link field
2016-11-03 14:49:27 +05:30
