Commit Graph

18122 Commits

Author SHA1 Message Date
Nabin Hait
83ba5c1319 Merge pull request #7770 from rohitwaghchaure/minor_issue_develop
[Fix] Payment entry fields issue, added total billed hours in timesheet
2017-02-17 15:20:06 +05:30
Nabin Hait
64e222697c Merge pull request #7769 from nabinhait/setup_fy_dates
Set fiscal year start and end date based on country
2017-02-17 15:18:28 +05:30
Nabin Hait
e285258374 Merge pull request #7762 from mbauskar/hotfix
[minor] timestamp fixes for heatmap
2017-02-17 15:18:01 +05:30
Nabin Hait
a6eb1434b3 Merge pull request #7771 from rmehta/item-name
[minor] item name not mandatory and item price with quick edit
2017-02-17 15:17:24 +05:30
Rushabh Mehta
0c5375d0fa [minor] item name not mandatory and item price with quick edit 2017-02-17 14:57:31 +05:30
mbauskar
90818080b1 [minor] Configured Auto Close days for Opportunity and Issue 2017-02-17 14:56:00 +05:30
mbauskar
e1e25a0c9d [minor] auto close opportunity after 7 days 2017-02-17 14:54:50 +05:30
Rohit Waghchaure
a020e4eba4 Payment entry fields issue, added total billed hours in timesheet 2017-02-17 14:51:57 +05:30
Nabin Hait
6af7dd4e1b Set fiscal year start and end date based on country 2017-02-17 14:47:33 +05:30
Nabin Hait
801fa80b39 Merge pull request #7764 from rohitwaghchaure/clean_supplied_items
[Fix] Cleanup supplied items if supply raw material is set as No
2017-02-17 12:36:05 +05:30
Nabin Hait
9e5b3dad29 Minor fix in assesment 2017-02-17 11:03:44 +05:30
Rohit Waghchaure
4b9d2f2733 [Fix] Cleanup supplied items if supply raw material is set as No 2017-02-16 18:53:23 +05:30
Kanchan Chauhan
1b204c8e4e Accrual Payroll System 2017-02-16 16:30:51 +05:30
nick9822
23e174c270 Validation for purchase_date
Separate validation for purchase date.
2017-02-16 16:26:38 +05:30
mbauskar
e7b87ad071 [minor] timestamp fixes for heatmap 2017-02-16 16:05:46 +05:30
Nabin Hait
de45b0eddc Merge branch 'master' into develop 2017-02-16 15:59:59 +05:30
Nabin Hait
1b59b624c3 Merge branch 'hotfix' 2017-02-16 15:59:58 +05:30
Nabin Hait
a7d6b68bc0 bumped to version 7.2.21 2017-02-16 16:29:58 +06:00
Nabin Hait
c70a4d2037 Merge pull request #7760 from rmehta/add-activation-1
[add] site activation level
2017-02-16 15:51:04 +05:30
Nabin Hait
d13d198dc8 Merge pull request #7747 from KanchanChauhan/item-name-asset
[Minor] Item Name in Asset
2017-02-16 15:15:23 +05:30
Rushabh Mehta
6dd461fec4 [add] site activation level 2017-02-16 14:53:21 +05:30
Nabin Hait
92c52f4623 Merge pull request #7732 from neilLasrado/student-left
Added ability to send newsletter to Student batch Guardians and Student Group Guardians
2017-02-16 14:40:14 +05:30
Nabin Hait
ea1cb68fe7 Merge branch 'master' into develop 2017-02-16 14:37:50 +05:30
Nabin Hait
d5d0b36973 Merge branch 'hotfix' 2017-02-16 14:37:49 +05:30
Nabin Hait
7677b56f7c bumped to version 7.2.20 2017-02-16 15:07:48 +06:00
Nabin Hait
b280398626 Merge pull request #7739 from rohitwaghchaure/payment_entry_currency_symbol_issue
[Fix] Payment Entry currency symbol issue
2017-02-16 14:21:24 +05:30
Nabin Hait
99c6c79834 Update payment_entry.js 2017-02-16 14:21:04 +05:30
Nabin Hait
507e6fa46e Merge pull request #7749 from KanchanChauhan/leave-application-cleanup
Rejected leave application can be submitted
2017-02-16 14:19:11 +05:30
Neil Trini Lasrado
fa2023d3da Added ability to send newsletter to Student batch Guardians and Student Group Guardians 2017-02-16 13:33:09 +05:30
Nabin Hait
3437a9a123 minor fix 2017-02-16 12:14:30 +05:30
pratu16x7
86415f394d [minor] duration bar 2017-02-16 09:27:53 +05:30
mlisb0n
835a615af8 Add files via upload 2017-02-15 15:45:52 +01:00
Kanchan Chauhan
11f159193e Rejected leave application can be submitted 2017-02-15 19:09:21 +05:30
Nabin Hait
2f7697d1bd Merge pull request #7746 from pratu16x7/minor-search-presets
Preset doctypes fields to Search
2017-02-15 18:46:03 +05:30
Nabin Hait
d9068497cb Merge pull request #7736 from KanchanChauhan/serial-no-status-report
[Fix] Serial No Status
2017-02-15 17:56:50 +05:30
Nabin Hait
b8624efe3a Merge pull request #7750 from KanchanChauhan/territory-filter-opportunity
[Minor] Is group filter removed from Territory in Opportunity
2017-02-15 17:41:31 +05:30
Nabin Hait
afef62c887 Merge pull request #7737 from KanchanChauhan/project-percentage
[Fix] Project % Completed set to 0 if no tasks
2017-02-15 17:28:53 +05:30
Nabin Hait
e827104a52 Merge pull request #7738 from KanchanChauhan/appraisal-fix
[Fix] Empty row in Goals of Appraisal fixed
2017-02-15 17:26:40 +05:30
Nabin Hait
6a2e138021 Merge pull request #7731 from nabinhait/hotfix
Check existing SO, PO and MR for enabling / disabling 'Is Stock Item' checkbox
2017-02-15 17:25:56 +05:30
nick9822
e5cb3e34fe nowdate changed to purchase_date
next depreciation date should be compared with purchase_date instead of nowdate.
2017-02-15 15:32:50 +05:30
Kanchan Chauhan
7118b5a2bd [Minor] Is group filter removed from Territory in Opportunity 2017-02-15 14:46:08 +05:30
Kanchan Chauhan
2307f57f19 [Minor] Item Name in Asset 2017-02-15 11:52:29 +05:30
Rohit Waghchaure
ff41c82c2b [Fix] Payment Entry currency symbol issue 2017-02-15 11:44:15 +05:30
pratu16x7
349ed568ed Add task and item 2017-02-15 09:23:26 +05:30
pratu16x7
ca56ad0bfc [minor] fix test 2017-02-14 18:49:26 +05:30
pratu16x7
462e89e452 [minor] margin fix 2017-02-14 17:18:10 +05:30
pratu16x7
0e94b4bec4 Mobile view fixes 2017-02-14 17:18:09 +05:30
pratu16x7
60fe77cc90 Website data from existing child tables, layout, images 2017-02-14 17:18:09 +05:30
pratu16x7
dee36e10ae Add operations and items to website 2017-02-14 17:18:09 +05:30
pratu16x7
aad8257e20 Add template 2017-02-14 17:18:09 +05:30