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

593 Commits

Author SHA1 Message Date
Rushabh Mehta
096b943b0c [minor] fixes to moment.defaultDateFormat and daily work summary eplies 2018-06-25 22:38:20 +05:30
Shreya Shah
b125ba9ed8 Update status if tasks have been completed (#14601) 2018-06-20 17:52:21 +05:30
Saurabh
59798b4e88 resolved merge conflict 2018-06-20 15:23:25 +05:30
Shreya Shah
222c550c29 Parse left out time (#14586) 2018-06-20 10:51:32 +05:30
Zarrar
42f2d1a7a8 fix incase no customer fetched (#14596) 2018-06-20 10:50:11 +05:30
Nabin Hait
380a74732c salary structure related test case fixes 2018-06-15 14:42:12 +05:30
Manas Solanki
b12f0d90af fix the timesheet 2018-06-13 12:30:02 +05:30
Shreya Shah
630721aacc Travis (#14354) 
* Fix Purchase Receipt tests

* Fix Item test

* Fix daily work summary test

* Modify currency exchange test cases

* Fix Leave Application test

* Update working hours when making salary slip from timesheet

* Replace fixer.io with exchangeratesapi

* Fix codacy
 2018-06-05 12:56:10 +05:30
Nabin Hait
153536bf70 minor test fixes 2018-05-29 10:58:57 +05:30
Suraj Shetty
084b0b3a67 Treeview permission (#14232) 
* Replace frappe.db.sql to frappe.get_list to apply permissions (#14037)

* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace

* Add parent filter

* Add ifnull checks
 2018-05-26 09:12:59 +05:30
Nabin Hait
33df0b4fbf
Test case fixes (#14219) 
* Test case fixes

* fetch_from fixes
 2018-05-26 09:09:02 +05:30
Zarrar
c141eb00ee [Enhance] Department added wherever applicable (#14121) 
* set All Department as default parent_department

* add department field in employee_transfer

* copied data from options to fetch_from

* add department field wherever employee's link field present

* empty options field where fetch_from is added
 2018-05-23 11:11:36 +05:30
Suraj Shetty
fbb6b3da5f Undo replace of frappe.db.sql with frappe.get_list (#14074) 2018-05-16 13:53:31 +05:30
Rushabh Mehta
0b628386de [minor] remove in_dialog old property 2018-05-16 12:51:22 +05:30
Suraj Shetty
8501010f12 Replace frappe.db.sql to frappe.get_list to apply permissions (#14037) 
* Replace frappe.db.sql to frappe.get_list to apply permission
- All get_children method had frappe.db.sql in them which
had no permission check, now its replaced with frappe.get_list
which will check permission based on the user.

* Fix codacy
- Remove trailing whitespace
 2018-05-16 10:44:38 +05:30
Saurabh
62a59301ef [fix] resolved merge conflicts 2018-05-15 13:02:40 +05:30
Saurabh
2ca83d61ea Resolve merge conflicts from enterprise_sprint branch 2018-05-14 21:15:46 +05:30
Manas Solanki
b698846c30 [feature] added the employee onboarding and separation doctype 2018-05-14 20:27:00 +05:30
Zarrar
8646ed45bc button triggers not working in tasks table (#13973) 2018-05-14 14:29:01 +05:30
Jamsheer
46b23f8e6e Salary Structure Refactor, Formula on Salary Component Master (#13967) 
* Salary structure refactor

* Salary Structure Assignment - filters applied

* Formula on Salary Component Master

* Salary Structure - filter updated, Salary Component - fields re-arranged

* Payroll Entry - get_employee_list fix

* Salary Structure Assignment - Validate Duplicate Assignment

* Salary Structure Assignment - filters for salary structure
 2018-05-11 21:05:24 +05:30
Vishal Dhayagude
3cf0d51e65 [fix] Compounding error in task weight (#13958) 
* [fix] Compounding error in task weight

* [minor] minor changes

* [fix] Requested Changes added
 2018-05-09 10:42:39 +05:30
Shreya Shah
7bd83f3d8e Rename occurrences for Production Order to Work Order (#13944) 2018-05-07 15:27:21 +05:30
Shreya
fd47b92138 renamed color field 2018-05-01 18:55:17 +05:30
Shreya
62907472f3 color field for calendar in task 2018-05-01 18:54:20 +05:30
Pawan Mehta
c0727633e7 [fix] #13589 (#13590) 2018-04-12 13:31:08 +05:30
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