shreyas
|
60e9f84c8a
|
[Minor] Updated the travis.yml to use new installer for erpnext
|
2016-08-01 17:40:20 +05:30 |
|
Nabin Hait
|
53133dbd4d
|
Merge branch 'develop'
|
2016-08-01 16:24:53 +05:30 |
|
Nabin Hait
|
cd339b2ecf
|
bumped to version 7.0.13
|
2016-08-01 16:54:53 +06:00 |
|
Nabin Hait
|
c9d04ab1fc
|
Merge pull request #5952 from nabinhait/lcv_reference
[patch] Update refdoc in Landed Cost Voucher
|
2016-08-01 16:23:33 +05:30 |
|
Nabin Hait
|
6f84026c24
|
Merge pull request #5951 from nabinhait/patch_fix_104
[patch] Reload RFQ and timesheet before removing customer/supplier roles
|
2016-08-01 16:15:47 +05:30 |
|
Rushabh Mehta
|
24f45af27e
|
[fix] minor dont make lead for invalid email
|
2016-08-01 16:07:56 +05:30 |
|
Nabin Hait
|
3c364dd5b8
|
[patch] Update refdoc in Landed Cost Voucher
|
2016-08-01 15:53:36 +05:30 |
|
Rushabh Mehta
|
185110159e
|
Merge pull request #5828 from neilLasrado/guardian
Added Guardian
|
2016-08-01 15:36:48 +05:30 |
|
Nabin Hait
|
5940dc1a8e
|
[patch] Reload RFQ and timesheet before removing customer/supplier roles
|
2016-08-01 15:30:44 +05:30 |
|
Neil Trini Lasrado
|
3e78558357
|
Moved Intrest to HR module
|
2016-08-01 15:18:36 +05:30 |
|
Neil Trini Lasrado
|
74dbd168c2
|
[new Feature] Added guardian master
|
2016-08-01 15:08:04 +05:30 |
|
Nabin Hait
|
1d7bd0efb8
|
Merge branch 'develop'
|
2016-08-01 14:12:47 +05:30 |
|
Nabin Hait
|
de745e1df6
|
bumped to version 7.0.12
|
2016-08-01 14:42:47 +06:00 |
|
Nabin Hait
|
77dd190cc8
|
Merge pull request #5939 from rohitwaghchaure/pos_batch_no_fixes
[Fix] batch no searching in pos & minor fixes
|
2016-08-01 13:17:00 +05:30 |
|
Nabin Hait
|
ddde4bec39
|
Merge pull request #5932 from rohitwaghchaure/demo_records
[demo] sales and purchase returns
|
2016-08-01 13:11:54 +05:30 |
|
Nabin Hait
|
9ed1891440
|
Merge pull request #5931 from neilLasrado/student-log
[new feature] Added Student Log
|
2016-08-01 13:10:19 +05:30 |
|
Nabin Hait
|
dfcf55d010
|
Merge pull request #5948 from nabinhait/department_role
Assigned permissions for Academic User role in Department
|
2016-08-01 13:07:02 +05:30 |
|
Nabin Hait
|
66126ffc7a
|
Merge pull request #5938 from nabinhait/salary_renaming
Delete old salary earning and deduction doctypes
|
2016-08-01 13:06:52 +05:30 |
|
Nabin Hait
|
7c52d09dc2
|
Merge pull request #5947 from nabinhait/patch_order_fix
Changed the order of the patch
|
2016-08-01 13:06:13 +05:30 |
|
Rohit Waghchaure
|
a88dec8775
|
[Fix] batch no searching in pos
|
2016-08-01 13:01:13 +05:30 |
|
Nabin Hait
|
86a477d07e
|
Assigned permissions for Academic User role in Department
|
2016-08-01 12:51:04 +05:30 |
|
Nabin Hait
|
bc691dccba
|
Changed the order of the patch
|
2016-08-01 12:36:28 +05:30 |
|
Nabin Hait
|
e9674f8866
|
Create columns for custom fields in new table Salary Detail and Component
|
2016-08-01 12:13:11 +05:30 |
|
Nabin Hait
|
84306ccc4c
|
Salary component fixtures
|
2016-08-01 11:54:19 +05:30 |
|
Nabin Hait
|
feed313a66
|
Delete old salary earning and deduction doctypes
|
2016-08-01 11:54:19 +05:30 |
|
Rushabh Mehta
|
62658fde45
|
Merge pull request #5941 from nabinhait/link_formatter
minor fix for item and employee link formatter
|
2016-08-01 10:28:48 +05:30 |
|
Nabin Hait
|
981f6ea34e
|
minor fix for item and employee link formatter
|
2016-07-31 11:44:43 +05:30 |
|
Nabin Hait
|
ba1c34eef3
|
Merge pull request #5919 from bcornwellmott/timesheet_dates
Timesheets update on date changes in Salary Slip
|
2016-07-29 20:31:01 +05:30 |
|
Rushabh Mehta
|
3e001b5fac
|
Merge branch 'develop'
|
2016-07-29 18:55:48 +05:30 |
|
Rushabh Mehta
|
6201068f8f
|
bumped to version 7.0.11
|
2016-07-29 19:25:48 +06:00 |
|
Rushabh Mehta
|
9421a109cf
|
[fix] reports template
|
2016-07-29 18:52:00 +05:30 |
|
Rushabh Mehta
|
26005c25b2
|
[minor] fix filter for item-code
|
2016-07-29 18:52:00 +05:30 |
|
Rushabh Mehta
|
180e43585f
|
[minor] formatter for item and employee
|
2016-07-29 18:52:00 +05:30 |
|
Rohit Waghchaure
|
05cc36a864
|
[demo] sales and purchase returns
|
2016-07-29 18:26:02 +05:30 |
|
Neil Trini Lasrado
|
1e5c251ce2
|
[new feature] Added Student Log
|
2016-07-29 17:05:49 +05:30 |
|
Nabin Hait
|
95c2ba9736
|
Merge pull request #5901 from bcornwellmott/fix_employee_lookup
Fix Timesheet employee query to show names
|
2016-07-29 16:28:18 +05:30 |
|
Nabin Hait
|
69e0441041
|
Merge pull request #5930 from KanchanChauhan/demo-data-for-leave-attendance
Demo data for Leave Allocation, Leave Application and Attendance
|
2016-07-29 16:20:29 +05:30 |
|
Kanchan Chauhan
|
db0e57cdce
|
Demo data for Leave Allocation, Leave Application and Attendance
|
2016-07-29 15:59:39 +05:30 |
|
Rushabh Mehta
|
51a593b0b5
|
Merge pull request #5918 from revant/patch-1
[Docs] changed path to login
|
2016-07-29 07:50:55 +05:30 |
|
Revant Nandgaonkar
|
cc8fb1a8d6
|
changed path to login
frappe.templates.pages.login.login_via_google changed to frappe.www.login.login_via_google
|
2016-07-28 19:50:15 +05:30 |
|
Nabin Hait
|
1892520324
|
Merge branch 'develop'
|
2016-07-28 18:26:23 +05:30 |
|
Nabin Hait
|
3bf486c5c6
|
bumped to version 7.0.10
|
2016-07-28 18:56:23 +06:00 |
|
Nabin Hait
|
6b8024a834
|
Merge pull request #5909 from nabinhait/fix_113
[fix] Show supplier name field if it is different from supplier id
|
2016-07-28 17:52:02 +05:30 |
|
Nabin Hait
|
33b10a0405
|
Merge pull request #5908 from nabinhait/pe_precision_fix
Set difference amount in Payment Entry as per field precision
|
2016-07-28 17:51:57 +05:30 |
|
Nabin Hait
|
7bae70a993
|
[fix] Show supplier name field if it is different from supplier id
|
2016-07-28 17:19:35 +05:30 |
|
Nabin Hait
|
e7d0639edc
|
Set difference amount in Payment Entry as per field precision
|
2016-07-28 16:56:59 +05:30 |
|
Nabin Hait
|
0d5e208f8c
|
Merge branch 'develop'
|
2016-07-28 16:01:00 +05:30 |
|
Nabin Hait
|
a163299991
|
bumped to version 7.0.9
|
2016-07-28 16:31:00 +06:00 |
|
Nabin Hait
|
acff41ddd2
|
Merge pull request #5906 from nabinhait/opportunity_status_fix
Added converted status in Opportunity
|
2016-07-28 15:59:43 +05:30 |
|
Nabin Hait
|
e72ff9377a
|
Added converted status in Opportunity
|
2016-07-28 15:59:20 +05:30 |
|