Rohit Waghchaure
|
0d4a9c225f
|
[Salary Structure] Make salary_component field mandatory if salary_slip_based_on_timesheet is true
|
2016-07-07 17:04:54 +05:30 |
|
Rushabh Mehta
|
964ad0fcae
|
[cleanup] rename "links" to "dashboard"
|
2016-07-07 14:28:05 +05:30 |
|
Rohit Waghchaure
|
e94d18b4cd
|
Rename Time Sheet doctype
|
2016-07-06 20:38:50 +05:30 |
|
Rohit Waghchaure
|
3188b56694
|
[Fixes] Time sheet fixes
|
2016-07-06 14:31:14 +05:30 |
|
Kanchan Chauhan
|
d963b76a4b
|
Salary component cleanup
|
2016-07-06 12:04:38 +05:30 |
|
Saurabh
|
c2934ba9da
|
[minor][fix] holiday list exception message fix
|
2016-07-04 13:06:29 +05:30 |
|
Nabin Hait
|
13093b4b68
|
Make payment entry aginst order, payment request and patch to rename advance table fields
|
2016-07-04 11:42:24 +05:30 |
|
Rushabh Mehta
|
b33df4afe8
|
[cleanup] link methods made common
|
2016-07-04 11:39:25 +05:30 |
|
Rushabh Mehta
|
8c2e79cf0d
|
[minor] fixes
|
2016-07-04 11:39:25 +05:30 |
|
Rohit Waghchaure
|
3fa0b51e5e
|
[Fixes] Time sheet fixes and changed timesheets to time_logs
|
2016-06-29 19:04:16 +05:30 |
|
Rohit Waghchaure
|
a62dcce46a
|
[Fix] make_for field removed
|
2016-06-29 01:42:52 +05:30 |
|
Rushabh Mehta
|
822209cb03
|
Merge pull request #5538 from rohitwaghchaure/time_sheet_wages
[Enhancement] Time log wages and multiple active salary structure
|
2016-06-27 17:13:48 +05:30 |
|
Rushabh Mehta
|
689130cf9b
|
[minor] fix holiday_list validation
|
2016-06-27 17:16:00 +05:30 |
|
Rohit Waghchaure
|
d6c986da8f
|
[Enhancement] Time log wages and multiple active salary structure
|
2016-06-27 16:46:39 +05:30 |
|
Kanchan Chauhan
|
68f5ae5cbf
|
Changes done
|
2016-06-26 14:10:24 +05:30 |
|
Kanchan Chauhan
|
4c0df04db0
|
Retirement Age option in HR Settings
|
2016-06-25 17:45:16 +05:30 |
|
Rushabh Mehta
|
a334062b03
|
[redesign] website routing system
|
2016-06-24 16:18:07 +05:30 |
|
Rushabh Mehta
|
8a065e0028
|
[rename] Bulk Email to Email Queue
|
2016-06-22 12:58:39 +05:30 |
|
Nabin Hait
|
2460ee897a
|
Merge pull request #5367 from KanchanChauhan/job_openings_public
[Minor Fix] Job Opening should not require login
|
2016-06-01 13:18:26 +05:30 |
|
Rushabh Mehta
|
535f3b0975
|
[minor] make task editable in project and add description to designation fixing #5361
|
2016-06-01 12:52:50 +05:30 |
|
Rushabh Mehta
|
aa60fd9037
|
[fix] new_doc to frappe.new_doc
|
2016-06-01 11:46:33 +05:30 |
|
Kanchan Chauhan
|
adad5fb11e
|
[Minor Fix] Job Opening should not require login
|
2016-05-18 16:33:29 +05:30 |
|
Anand Doshi
|
c2ade3d34f
|
Merge pull request #5298 from neilLasrado/sal-slip
Moved email salary slip to employee under HR Settings
|
2016-05-09 16:56:51 +05:30 |
|
Neil Trini Lasrado
|
b2b0b37cc1
|
Added reference_doctype and reference_name to link Bulk Email to Salary Slip
|
2016-05-09 13:24:31 +05:30 |
|
Nabin Hait
|
332d29f166
|
Merge branch 'master' into develop
|
2016-05-06 16:13:35 +05:30 |
|
Nabin Hait
|
09fec7a15e
|
Merge pull request #5313 from shreyasp/support-week-hotfix
[Hotfixes] Payment tool and Leave Allocation Tool
|
2016-05-05 16:44:40 +05:30 |
|
shreyas
|
55cbd52200
|
[Fix] Allocate leaves only to active employees
|
2016-05-05 15:16:39 +05:30 |
|
Valmik Jangla
|
a0b9c4cdeb
|
Fixed Leave Application issue
|
2016-05-05 01:20:47 -07:00 |
|
Neil Trini Lasrado
|
71e93d6691
|
Added test cased
|
2016-05-02 12:04:20 +05:30 |
|
Neil Trini Lasrado
|
b14af59d39
|
Moved send email checkbox from salary slip to a global setting under hr settings
|
2016-05-02 12:04:19 +05:30 |
|
Rushabh Mehta
|
be2ee18de4
|
[fixed] frappe.require is now async 💥
|
2016-04-29 17:22:42 +05:30 |
|
Rushabh Mehta
|
1aa1c8a9ef
|
[minor] remove hide_first in forms
|
2016-04-29 12:20:23 +05:30 |
|
Anand Doshi
|
79c536acb5
|
Merge branch 'master' into develop
|
2016-04-27 15:44:11 +05:30 |
|
Saurabh
|
9be40ee7c3
|
[fixes] raise exception while deleting fiscal year if fiscal year is set as default in Global Settings and while calculating get_month_details if year_start_date not found
|
2016-04-27 12:58:40 +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
|
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 |
|
Nabin Hait
|
972c25f78d
|
Fixed conflict
|
2016-04-14 18:25:53 +05:30 |
|
Rushabh Mehta
|
15a7f215b9
|
[enhancement] heatmaps on item and notifications for item
|
2016-04-14 17:30:53 +05:30 |
|
Rushabh Mehta
|
0e2dd859b0
|
[cleanup] link dashboard for customer, supplier, item, employee and hide form by default
|
2016-04-13 17:22:09 +05:30 |
|
Neil Trini Lasrado
|
cb6430575b
|
Fixed validation message for disabled employee
|
2016-04-08 16:36:26 +05:30 |
|
Valmik Jangla
|
c33e96f860
|
Leave Allocation Fix
|
2016-04-07 12:02:31 +05:30 |
|
Rushabh Mehta
|
78b7a53635
|
[cleanup] set default bold, print_hide for prints
|
2016-04-06 15:29:45 +05:30 |
|
Anand Doshi
|
ca95384f05
|
[fix] Salary Slip: use accounts.utils.get_fiscal_year
|
2016-04-06 12:31:01 +05:30 |
|
Rushabh Mehta
|
d690094b12
|
[image] added default image field for employee, customer, item, contact, lead, supplier and using - instead of / as separator in BOM
|
2016-04-04 16:57:56 +05:30 |
|
Rushabh Mehta
|
cb144bfcd4
|
[cleanup] projects
|
2016-03-31 14:27:35 +05:30 |
|
Rushabh Mehta
|
c9850f9e04
|
Merge pull request #5077 from frappe/master
Master
|
2016-03-29 11:59:32 +05:30 |
|
Rushabh Mehta
|
3117b4b8d6
|
[fix] minor for quick-entry
|
2016-03-29 11:53:17 +05:30 |
|