rohitwaghchaure
|
c9a1eb1081
|
[Fix] Not able to delete row in modal table (#13377)
|
2018-03-27 11:26:43 +05:30 |
|
rohitwaghchaure
|
2e560cb25d
|
[Fix] Same serial no returned two times (#13378)
|
2018-03-27 11:24:50 +05:30 |
|
Nabin Hait
|
651b612909
|
Fixed logic for reserved qty for subcontract and production and written a patch (#13396)
* Fixed logic for reserved qty for subcontract and production and written a patch
* repost reserved qty for filtered bins
|
2018-03-27 11:24:20 +05:30 |
|
Manas Solanki
|
398eac3f4c
|
message in the program enrollment tool (#13393)
|
2018-03-27 11:21:47 +05:30 |
|
Frappe PR Bot
|
7db805a031
|
[Translation] Updated Translations (#13394)
|
2018-03-27 11:21:08 +05:30 |
|
Shreya Shah
|
f3025f1596
|
operation time in grid view (#13400)
|
2018-03-27 10:34:05 +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 |
|
Nabin Hait
|
0712013960
|
Merge branch 'hotfix'
|
2018-03-23 16:05:06 +05:30 |
|
Nabin Hait
|
3fdda7a9b7
|
bumped to version 10.1.14
|
2018-03-23 16:35:06 +06:00 |
|
Shreya Shah
|
9bcadf8126
|
Tax Id in some reports and print formats (#13373)
* tax-id in sales and purchase registers
* tax-id in general ledger print_format
* tax-id in accounts payable
* tax-id in accounts receivable
|
2018-03-23 15:04:37 +05:30 |
|
rohitwaghchaure
|
492de67d7b
|
Added consumed material cost in project (#13365)
|
2018-03-23 15:02:04 +05:30 |
|
Nabin Hait
|
80a9f523d5
|
Minor fix AR/AP summary report
|
2018-03-23 13:02:27 +05:30 |
|
Shreya
|
8bb0f05451
|
added task field
|
2018-03-23 11:46:45 +05:30 |
|
Shreya
|
7619cd2e14
|
updated docs for timesheet
|
2018-03-23 11:41:56 +05:30 |
|
Shreya
|
822ba21f38
|
codacy fix
|
2018-03-23 11:41:56 +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
|
68ec22a90c
|
moved timer.js to public/js
|
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
|
35397a1033
|
Salary Register (#13367)
- convert date range to from_date and to_date
|
2018-03-22 15:26:45 +05:30 |
|
Nabin Hait
|
e3f0412570
|
Pass doc while autonaming item
|
2018-03-22 12:13:21 +05:30 |
|
rohitwaghchaure
|
6a2d073fe1
|
Merge pull request #13353 from PawanMeh/fixes_13352
Add total qty to offline POS
|
2018-03-22 11:36:32 +05:30 |
|
rohitwaghchaure
|
23fa8893a8
|
[Fix] Division by zero issue (#13362)
|
2018-03-22 11:16:00 +05:30 |
|
Faris Ansari
|
34dd079a68
|
Remove unnecessary columns Analytics Reports (#13344)
|
2018-03-22 11:12:02 +05:30 |
|
Manas Solanki
|
a3714e1678
|
Merge pull request #13360 from frappe/manassolanki-patch-3
Update update_project_in_sle.py
|
2018-03-21 18:25:26 +05:30 |
|
Manas Solanki
|
0f6c35d63f
|
Update update_project_in_sle.py
|
2018-03-21 18:24:45 +05:30 |
|
Faris Ansari
|
4fc74333bd
|
Fix Icons for Expense Claim and Timesheet (#13359)
|
2018-03-21 17:54:09 +05:30 |
|
Kenneth Sequeira
|
6a92cdc358
|
Update cost-center.md (#13354)
Fixed link to missing image for cost centre.
|
2018-03-21 17:52:52 +05:30 |
|
rohitwaghchaure
|
93779c21a7
|
[Fix] Project not set in the stock ledger entry (#13357)
|
2018-03-21 17:52:41 +05:30 |
|
Manas Solanki
|
e010ddf65f
|
Student Report Card (#13346)
* finalise the assessment report
* minor fixes for button
* fix the travis and codacy
|
2018-03-21 17:50:42 +05:30 |
|
Zarrar
|
969c8aaf52
|
[Enhance] Fetch Customer's Item code based on Customer Name or Customer Group (#13198)
* customer code can be assigned based on customer group
* improvise customer group selection
* requested changes made
|
2018-03-21 11:17:49 +05:30 |
|
Manas Solanki
|
c711445b91
|
add the student as party type (#13348)
|
2018-03-21 10:12:27 +05:30 |
|
rohitwaghchaure
|
2b88ac948e
|
[Fix] Special character issue (#13350)
|
2018-03-21 10:04:47 +05:30 |
|
pawan
|
53a4d2c430
|
[fix] #13352
|
2018-03-21 09:19:36 +05:30 |
|
Faris Ansari
|
ce08aabc84
|
Add Kanban Board button in project (#13345)
|
2018-03-20 19:03:32 +05:30 |
|
Prateeksha Singh
|
59057c6675
|
Merge pull request #13341 from Zlash65/min-fix
[Minor] Fix unindented code
|
2018-03-20 16:35:18 +05:30 |
|