Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,981 Commits 3 Branches 0 Tags 1 GiB
4e7b52952e
Commit Graph

322 Commits

Author SHA1 Message Date
Rushabh Mehta
c711b82889 Merge pull request #5296 from KanchanChauhan/websitemakeover 
New look to the website
 2016-05-02 15:54:41 +05:30
Rushabh Mehta
360b05f0f5 [enhancement] activity summary in projects 2016-05-02 14:13:38 +05:30
Kanchan Chauhan
239b351367 New look to the website 2016-05-02 11:43:44 +05:30
Rushabh Mehta
be2ee18de4 [fixed] frappe.require is now async 💥 2016-04-29 17:22:42 +05:30
Rushabh Mehta
127de729b2 [fix] making time log entry easier, to time not mandatory while making time log and Finish button 2016-04-29 14:19:21 +05:30
Rushabh Mehta
1aa1c8a9ef [minor] remove hide_first in forms 2016-04-29 12:20:23 +05:30
Rushabh Mehta
68d428bfd4 [fix] for sort selector 2016-04-22 13:23:34 +05:30
Rushabh Mehta
c291ab64a6 Merge pull request #5197 from KanchanChauhan/UXChanges_ERPNext 
[WIP] No not merge
 2016-04-21 11:39:45 +05:30
Rushabh Mehta
f2c3cb85a9 Merge pull request #5164 from KanchanChauhan/project-permissions 
Collaborate PM permission fixes and daily tme log fix
 2016-04-21 11:37:31 +05:30
Rushabh Mehta
02772442b6 [cleanup] added dashboard in project 2016-04-20 18:45:56 +05:30
Kanchan Chauhan
11638ba358 Changes 3 2016-04-20 16:24:25 +05:30
Kanchan Chauhan
704f248952 Changes 2 2016-04-20 16:24:24 +05:30
Rushabh Mehta
0525387328 [enhancement] added reserved_qty_for_production in bin and updated item dashboard 2016-04-18 19:27:46 +05:30
ShashaQin
14baa70de3 Update project.py 2016-04-14 10:53:08 +08:00
Kanchan Chauhan
a4ff5d3195 Collaborate PM permission fixes and daily tme log fix 2016-04-08 23:22:04 +05:30
Kanchan Chauhan
017d30f465 [Minor Fixes] Findings in setting up erpnext 2016-04-06 19:28:50 +05:30
Rushabh Mehta
cb144bfcd4 [cleanup] projects 2016-03-31 14:27:35 +05:30
Rushabh Mehta
8b43fd7f02 Merge pull request #5084 from KanchanChauhan/PM-UI-Edits 
UI Changes
 2016-03-29 18:45:58 +05:30
Kanchan Chauhan
b566d42d37 UI Changes 2016-03-29 18:21:59 +05:30
Rushabh Mehta
3117b4b8d6 [fix] minor for quick-entry 2016-03-29 11:53:17 +05:30
Rushabh Mehta
9904c5acf4 Merge pull request #5050 from neilLasrado/develop 
Fixes Translations
 2016-03-29 10:51:44 +05:30
Rushabh Mehta
0a9ad699cf Merge pull request #5047 from umairsy/task-list-fix 
On Task, added default filter, Status=Open
 2016-03-28 18:28:09 +05:30
Neil Trini Lasrado
b6d9946854 Fixes Translations 2016-03-28 12:44:05 +05:30
Rushabh Mehta
c20c536f28 [fix] [wip] cleanup for collaborative pm 2016-03-25 17:22:17 +05:30
Umair Sayyed
99a686237a On Task, added default filter, Status=Open 2016-03-23 15:00:51 +05:30
Kanchan Chauhan
b3fe6a45a7 WIP Collaborative Project Management first commit 2016-03-16 18:34:33 +05:30
Neil Trini Lasrado
6e343e23d9 Renamed project_name to project 2016-03-15 17:50:53 +05:30
Rushabh Mehta
5b9d6494a6 Merge pull request #4900 from rmehta/minor-fixes 
[minor] fix notification for material request, splash icon, cleanup project form layout
 2016-03-01 16:15:25 +05:30
Nabin Hait
94a1f3eb90 [fix] Time Log overlap validation and test cases 2016-02-29 13:15:27 +05:30
Rushabh Mehta
4403853828 [minor] fix notification for material request, splash icon, cleanup project form layout 2016-02-27 16:24:34 +05:30
Nabin Hait
56f7fa66ad [fix] Time log overlap validation 2016-02-26 17:19:11 +05:30
Anand Doshi
17d4fc4fa7 [enhancement] Merge Comment and Feed into Communication 💥 
Depends on frappe/frappe#1532
 2016-02-08 13:06:56 +05:30
Neil Trini Lasrado
5b7d0a960e Fixed indicators & List view in Time Log, Time Log Batch 2016-01-29 15:20:22 +05:30
Neil Trini Lasrado
172efb1e87 Fixed error messages while making Time Log Batch from Time Log List view 2016-01-29 14:27:03 +05:30
Neil Trini Lasrado
329e7783bc Fixed time log overlap validation. Fixed test case in time log 2016-01-15 16:34:06 +05:30
Rushabh Mehta
66eaf7e1c3 Merge pull request #4607 from saurabh6790/group_custom_buttons 
[enhance] merge customize buttons under groups
 2016-01-15 11:15:23 +05:30
Rushabh Mehta
9bf2df9303 [minor] [layout] cleaned up Time Log layout 2016-01-14 18:19:21 +05:30
Neil Trini Lasrado
975dcc2bf3 Added additional cost to time log. Fixed issues in Time log billing amount calculation and billing amount calculation while making time log batch 2016-01-14 16:09:35 +05:30
Saurabh
e23e99f4bd [enhance] merge customize buttons under groups 2016-01-13 09:18:31 +05:30
Rushabh Mehta
5760b79747 [translations] fixes #4533 2016-01-04 15:57:01 +05:30
partzsch
55ad42cfd0 Time Log now down to seconds 
according to request of @anadpdoshi
new branch new commit new PR
 2015-12-21 17:51:42 +01:00
Rushabh Mehta
a1a712b0c6 [minor] [fix] task close button condition 2015-12-11 11:16:03 +05:30
Rushabh Mehta
13ec41abb2 [enhancement] task status will be set to overdue when it crosses expected end date 2015-12-10 12:59:02 +05:30
Rushabh Mehta
c819fd4ee8 [translations] for #4461 2015-12-10 10:34:32 +05:30
Anand Doshi
602e8253be [enhancement] Int, Currency, Float, Percent as not null and default to 0 2015-11-19 13:23:36 +05:30
Anand Doshi
da79740cdf [fix] injection 2015-11-17 18:27:50 +05:30
Nabin Hait
58c4646199 [fix][cleanup] Leave allocation, application and balance report cleanup and fixes 2015-11-16 15:35:14 +05:30
Rushabh Mehta
55d0506155 Merge pull request #4264 from superlack/patch-3 
Update time_log_batch.py
 2015-11-02 15:21:59 +05:30
superlack
41f7f7442b Update time_log_batch.py 2015-11-02 00:39:36 -08:00
superlack
126fb31f9a Update time_log_batch_detail.json 2015-11-02 00:38:17 -08:00