Nabin Hait
|
ce5f942678
|
Merge branch 'master' into develop
|
2016-12-30 15:54:32 +05:30 |
|
Nabin Hait
|
3cae3a5190
|
Merge branch 'hotfix'
|
2016-12-30 15:54:31 +05:30 |
|
Nabin Hait
|
edb99f8750
|
bumped to version 7.2.5
|
2016-12-30 16:24:31 +06:00 |
|
Nabin Hait
|
4de4b56c60
|
Merge pull request #7363 from rohitwaghchaure/terms_and_conditions_for_company
set default terms and condition if tc_name is available on the form
|
2016-12-30 15:46:57 +05:30 |
|
Rohit Waghchaure
|
585448b225
|
set default terms and condition if tc_name is available on the form
|
2016-12-30 15:41:55 +05:30 |
|
Nabin Hait
|
e97d40806f
|
Merge branch 'master' into develop
|
2016-12-30 14:56:20 +05:30 |
|
Nabin Hait
|
257ecf71ac
|
Merge branch 'hotfix'
|
2016-12-30 14:56:20 +05:30 |
|
Nabin Hait
|
5105b1e789
|
bumped to version 7.2.4
|
2016-12-30 15:26:19 +06:00 |
|
Nabin Hait
|
dc0a277085
|
Merge pull request #7355 from manassolanki/hotfix
Fetching the item details from the reference doctype in QI
|
2016-12-30 14:10:21 +05:30 |
|
Nabin Hait
|
fa2feae314
|
Merge pull request #7359 from nabinhait/hotfix
[fix] Make Journal Entry against SO
|
2016-12-30 12:38:56 +05:30 |
|
Nabin Hait
|
494a4d9ba1
|
Merge pull request #7360 from KanchanChauhan/salary-register-repprt
[Fix] Monthly Salary Register Fix
|
2016-12-30 12:38:46 +05:30 |
|
Kanchan Chauhan
|
7b29dc7208
|
[Fix] Monthly Salary Register Fix
|
2016-12-30 12:36:00 +05:30 |
|
Nabin Hait
|
9646be1d5d
|
[fix] Make Journal Entry against SO
|
2016-12-30 11:14:41 +05:30 |
|
Rushabh Mehta
|
a8326de4d0
|
[fix] on_update in item.py
|
2016-12-30 06:17:45 +05:30 |
|
Rushabh Mehta
|
2097ccfaea
|
[fix] item_group.py #7358
|
2016-12-30 06:09:41 +05:30 |
|
Manas Solanki
|
5c82e9ef8b
|
Fetching the item details from the reference doctype in quality inspection
Error Report [2016-12-29]
|
2016-12-29 18:01:25 +05:30 |
|
Nabin Hait
|
ae25e0da88
|
Merge branch 'hotfix'
|
2016-12-29 11:04:05 +05:30 |
|
Nabin Hait
|
f327a58b7f
|
Merge branch 'master' into develop
|
2016-12-29 11:04:05 +05:30 |
|
Nabin Hait
|
3d98d23e22
|
bumped to version 7.2.3
|
2016-12-29 11:34:05 +06:00 |
|
Nabin Hait
|
11bde0ba14
|
Patch fixed
|
2016-12-29 10:58:05 +05:30 |
|
Nabin Hait
|
2469f247df
|
Merge pull request #7341 from StrellaGroup/develop
Fixed spelling errors on Production Planning Tool and manual.
|
2016-12-28 17:12:01 +05:30 |
|
Nabin Hait
|
392806c0d4
|
Merge pull request #7342 from neilLasrado/develop
Added Guardian to school module
|
2016-12-28 16:26:16 +05:30 |
|
Neil Trini Lasrado
|
986927ca98
|
Added Guardian to school module
|
2016-12-28 16:15:35 +05:30 |
|
Muhammad Huzaifah Bin Ismail
|
465da8ce09
|
Fixed spelling errors on Production Planning Tool and manual.
|
2016-12-28 18:15:45 +08:00 |
|
Nabin Hait
|
340c9d327a
|
Merge pull request #7339 from neilLasrado/develop
[Fix] Student Monthly Attendance Sheet
|
2016-12-28 13:42:18 +05:30 |
|
Neil Trini Lasrado
|
0152516ba4
|
[Fix] Student Monthly Attendance Sheet
|
2016-12-28 13:01:14 +05:30 |
|
Rushabh Mehta
|
94c4d7014d
|
[fix] item_name in stock reco
|
2016-12-28 06:56:09 +05:30 |
|
Rushabh Mehta
|
5cb1b6bf3f
|
[minor] translation fix
|
2016-12-27 16:30:20 +05:30 |
|
Nabin Hait
|
3bcf9b5e70
|
Fixed merge conflict
|
2016-12-27 14:30:17 +05:30 |
|
Nabin Hait
|
a6be7c71ed
|
Merge branch 'hotfix'
|
2016-12-27 14:27:19 +05:30 |
|
Nabin Hait
|
89c8b4d6ae
|
bumped to version 7.2.2
|
2016-12-27 14:57:19 +06:00 |
|
Nabin Hait
|
e5f5017973
|
Merge pull request #7333 from rmehta/variant-website-fix
[fix] item variants not directly shown in website due to route clash
|
2016-12-27 13:31:30 +05:30 |
|
Rushabh Mehta
|
174c3478a1
|
[fix] item variants not directly shown in website due to route clash
|
2016-12-27 12:30:30 +05:30 |
|
Rushabh Mehta
|
512b85e040
|
[minor] replace autocomplete with awesomplete
|
2016-12-27 12:14:37 +05:30 |
|
Rushabh Mehta
|
e60c2c7b7a
|
[minor] dashboard cleanups
|
2016-12-27 12:14:37 +05:30 |
|
Nabin Hait
|
9007815ddc
|
Merge pull request #7326 from neilLasrado/develop
Improved Student Dashboard
|
2016-12-26 18:33:19 +05:30 |
|
Neil Trini Lasrado
|
22239ac610
|
Improved Student Dashboard
|
2016-12-26 17:14:16 +05:30 |
|
Nabin Hait
|
88817b40df
|
Merge pull request #7284 from mntechnique/develop
Report : Batch Item Expiry Status
|
2016-12-26 16:10:46 +05:30 |
|
Nabin Hait
|
4573029a5e
|
Merge pull request #7292 from frappe/bcornwellmott-patch-1
Add hours to calendar labels
|
2016-12-26 16:09:11 +05:30 |
|
Nabin Hait
|
0631d516ce
|
Merge pull request #7290 from netchampfaris/pos-item-area-scroll
pos item area scrollable
|
2016-12-26 16:07:38 +05:30 |
|
Nabin Hait
|
c2690425e3
|
Merge pull request #7310 from bhupennewalkar1337/hotfix
Fix #7202 unchecking pos will reflect automatically
|
2016-12-26 16:07:19 +05:30 |
|
Nabin Hait
|
488ad54bbc
|
Merge pull request #7280 from neilLasrado/leave
Added mark as present to student leave application
|
2016-12-26 16:06:44 +05:30 |
|
Nabin Hait
|
0d49cdf024
|
Merge pull request #7324 from nabinhait/lcv_testcase
[test] Fixed test cases for LCV
|
2016-12-26 15:52:40 +05:30 |
|
Neil Trini Lasrado
|
df4b9ab630
|
Optimised code for Student Monthly Attendance Report
|
2016-12-26 15:40:01 +05:30 |
|
Nabin Hait
|
7b2177a544
|
[test] Fixed test cases for LCV
|
2016-12-26 15:31:05 +05:30 |
|
Neil Trini Lasrado
|
94f42ea145
|
Added from date and to date to student leave application
|
2016-12-26 12:09:27 +05:30 |
|
Neil Trini Lasrado
|
9a7cb6ce92
|
Added mark as present to student leave application
|
2016-12-26 12:09:27 +05:30 |
|
Nabin Hait
|
61a190dd69
|
Merge branch 'master' into develop
|
2016-12-24 11:01:26 +05:30 |
|
Nabin Hait
|
3322fafdbe
|
Merge branch 'hotfix'
|
2016-12-24 11:01:25 +05:30 |
|
Nabin Hait
|
8b3e39ed27
|
bumped to version 7.2.1
|
2016-12-24 11:31:25 +06:00 |
|