Nabin Hait
15cd12214e
Fixed conflict while merging v4 into v5
2015-02-10 16:37:18 +05:30
Rushabh Mehta
a232c80d77
[share] add share permission
2015-02-05 15:52:58 +05:30
Do Le Bao Nguyen
f9b63dd36a
Look like a minor bug
...
- There is no frappe.get_default but only frappe.db.get_default ?
- Error return if selecting Employee in Salary Slip without specifying the Fiscal Year first
2015-02-03 11:10:09 +08:00
Rushabh Mehta
06fa46fafe
[fix] onshow > on_page_show
2015-01-29 18:09:11 +05:30
Rushabh Mehta
5bceebc6a1
[fix] fixes birthday reminders #2021
2015-01-23 15:22:30 +05:30
Rushabh Mehta
0335005eea
[minor] added allow rename
2015-01-15 15:29:22 +05:30
Nabin Hait
fff3ab752c
Fixed conflict
2015-01-14 16:27:13 +05:30
Nabin Hait
024b537b7f
Merge pull request #2557 from neilLasrado/spelling-of-approver
...
Spelling Correction - Leave application #2552
2015-01-12 17:02:10 +05:30
Rushabh Mehta
d49a123fd0
[ui] listviews
2015-01-07 16:43:47 +05:30
Neil Trini Lasrado
1b7d66fab6
Update leave_application.js
2015-01-07 11:16:41 +05:30
Nabin Hait
56ac3fb29d
some fixes for renaming patch
2015-01-01 13:40:54 +05:30
Rushabh Mehta
419ae33c3e
[merge] v5-design
2014-12-31 15:03:14 +05:30
Nabin Hait
54361e8651
fixed conflict while merging develop into v5
2014-12-31 13:24:36 +05:30
Rushabh Mehta
f870527e7c
[design] wip
2014-12-26 12:52:11 +05:30
Nabin Hait
79f091e2fe
field renaming
2014-12-26 11:41:15 +05:30
Nabin Hait
4b8185db19
renaming: entries
2014-12-25 18:19:39 +05:30
Nabin Hait
23d2a53017
Code replacement for journal voucher renaming
2014-12-25 17:14:18 +05:30
Nabin Hait
e7d153624f
Table Field Renaming: code replace, JV and budget distribution renamed
2014-12-25 16:01:55 +05:30
Nabin Hait
d8f4984d71
Table fieldnames renaming: updated json and patch
2014-12-24 17:04:48 +05:30
Nabin Hait
0741ed3a82
Merge pull request #2472 from neilLasrado/expense-claim
...
New feature for issue #2419
2014-12-23 18:07:38 +05:30
Neil Trini Lasrado
41781ce686
test case fix - holiday list
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
e84fa67f30
Actual operating cost, Actal operating time added to 'production order operations' - auto fetched based on 'time log' creation 'make time log' button appears only if 'production order' document is submitted server side validation added to check if 'Production Order' mentioned on 'Time Log' is in submit state test cases added to check all of the above
...
Time Log Bug Fixed
Manufacturing seetings doctype added.
prod order holiday list time calculation added
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
5ec7542519
Holiday List name changed and workstation filter added to time log
2014-12-23 17:38:59 +05:30
Neil Trini Lasrado
637d804abd
Operations added in Production Order DocType Auto-Fetch added to operations in Production Order DocType made operations in production order read-only capacity & duration of cycle added to workstation workstation operation timings added operation master added, Time log added Time Log Fixed Test Records added to Production Order Test Recorde for over Production Time Log added Validation added to check if time log timings are within working hours of the workstation. Validation added to check if workstation is closed on time log dates. Test Case added for Time Log
2014-12-23 17:38:59 +05:30
Anand Doshi
f87a622ef0
[minor] use frappe.attach_print() in salary slip and recurring document
2014-12-15 23:14:35 +05:30
Nabin Hait
606af96c9f
minor fix
2014-12-15 11:57:19 +05:30
Neil Trini Lasrado
e1f21682fb
changes made
2014-12-12 13:09:42 +05:30
Neil Trini Lasrado
f13c4f0145
New feature for issue #2419
2014-12-12 12:33:55 +05:30
Nabin Hait
5cafcf66b0
Leave application fix
2014-12-10 23:59:04 +05:30
Nabin Hait
690bcd7b66
Added leave approver name field in leave application
2014-12-09 16:36:33 +05:30
Rushabh Mehta
3d65d9602e
[error-reports]
2014-11-28 14:58:43 +05:30
Rushabh Mehta
6d950d23a8
[merge]
2014-11-28 12:08:51 +05:30
Nabin Hait
eba88919c1
Merge pull request #2431 from mayur-patel/patch-2
...
Update leave_application.py : Modified get_holidays function
2014-11-25 10:55:11 +05:30
Nabin Hait
ea91d2aaf1
Merge pull request #2429 from ankitjavalkarwork/expclaimname
...
Add configurable naming series to Expense claim
2014-11-25 10:51:03 +05:30
Mayur Patel
5d8635a8dc
Update leave_application.py
...
See issue #2422 for more detail.
2014-11-24 16:57:53 +00:00
ankitjavalkarwork
7e911bae95
Add configurable naming series to Expense claim
2014-11-24 18:26:17 +05:30
Nabin Hait
0ad7db3bbd
Minor fix in salary slip net total calculation
2014-11-24 15:25:13 +05:30
ankitjavalkarwork
16e2c18c64
Delete events linked with employee on deletion of Employee
2014-11-10 18:08:23 +05:30
Nathan Do
8a55d9a795
Remove get_server_field from leave_application
...
- Make get_holidays and get_total_leave_days global to module
- Replace get_server_field with using whitelisted function
get_total_leave_days
2014-11-05 12:32:57 +08:00
Nabin Hait
a5082d6233
Merge pull request #2283 from neilLasrado/employee-reports-to
...
employee cannot report to himself validation added to employee doctype
2014-10-10 15:20:13 +05:30
Neil Trini Lasrado
9b08062bed
employee cannot report to himself validation added to employee doctype
2014-10-09 17:26:17 +05:30
Neil Trini Lasrado
9614b552fd
fiscal year auto-fetch added to c-form, installation_note, stock_reconciliation, customer_issue, maintanence_visit & removed for Expense Claim
2014-10-09 15:01:12 +05:30
Neil Trini Lasrado
565d986198
fiscal year auto fetch added to oppurtunity, quotation, material request, supplier quotation, expense claim doctypes + issues fixed
2014-10-09 15:01:12 +05:30
Nabin Hait
c68646c694
[merge] 4.x to 5.0
2014-10-06 12:57:48 +05:30
Rushabh Mehta
bf8715dba4
[refactor] used frappe.sendmail
2014-09-16 15:12:18 +05:30
Rushabh Mehta
5cdc8e560c
[mailbox] removed separate email settings for jobs, sales, support
2014-09-16 15:12:18 +05:30
Rushabh Mehta
e10cf021d9
[email] remove communicationlist #561
2014-09-16 15:12:18 +05:30
Rushabh Mehta
ce00772ac0
[cleanup] removed communication js, fields
2014-09-16 15:11:42 +05:30
Rushabh Mehta
c0bb453b88
[refactor] [frappe 5.0]
2014-09-16 15:10:54 +05:30
Rushabh Mehta
ed37cef32a
[refactor modules]
2014-09-16 15:08:02 +05:30
