Nabin Hait
|
afc0bbc8ff
|
Merge pull request #5964 from frappe/neilLasrado-patch-1-1
Fixes for patch - make_guardian.py
|
2016-08-02 11:30:45 +05:30 |
|
Nabin Hait
|
8869430a81
|
Merge pull request #5967 from rohitwaghchaure/minor_fix
minor fix in payment entry
|
2016-08-02 11:29:48 +05:30 |
|
Rohit Waghchaure
|
7f031d1bfd
|
minor fix in payment entry
|
2016-08-02 11:07:40 +05:30 |
|
Rushabh Mehta
|
5b1ebc5c54
|
Merge pull request #5933 from shreyasp/erpnext/update-travis
[Minor] Updated the travis.yml to use latest bench installer for erpnext
|
2016-08-02 10:44:39 +05:30 |
|
Neil Trini Lasrado
|
5bb2f56b47
|
Update make_guardian.py
|
2016-08-02 00:01:00 +05:30 |
|
Nabin Hait
|
1e3e6865ce
|
Merge branch 'develop'
|
2016-08-01 18:07:21 +05:30 |
|
Nabin Hait
|
94542e104c
|
bumped to version 7.0.16
|
2016-08-01 18:37:20 +06:00 |
|
Nabin Hait
|
90bf69aa52
|
Merge pull request #5957 from nabinhait/guardian_patch_fix
[patch] reload guardian interest
|
2016-08-01 18:05:33 +05:30 |
|
Nabin Hait
|
3b8109780f
|
[patch] reload guardian interest
|
2016-08-01 17:59:46 +05:30 |
|
Nabin Hait
|
f863055b91
|
Merge pull request #5955 from umairsy/28jul
added documentation for the new features
|
2016-08-01 17:53:26 +05:30 |
|
Nabin Hait
|
3aac12d56b
|
Merge branch 'develop'
|
2016-08-01 17:48:28 +05:30 |
|
Nabin Hait
|
ed75667f64
|
bumped to version 7.0.15
|
2016-08-01 18:18:27 +06:00 |
|
Nabin Hait
|
16a0fef759
|
Merge pull request #5956 from nabinhait/guardian_patch_fix
[patch] fixed reload doc and permission issue in guardian patch
|
2016-08-01 17:47:48 +05:30 |
|
Nabin Hait
|
08aec855c4
|
[patch] fixed reload doc and permission issue in guardian patch
|
2016-08-01 17:46:56 +05:30 |
|
Umair Sayyed
|
e96b3ce725
|
added documentation for the new features
|
2016-08-01 17:42:30 +05:30 |
|
shreyas
|
60e9f84c8a
|
[Minor] Updated the travis.yml to use new installer for erpnext
|
2016-08-01 17:40:20 +05:30 |
|
Nabin Hait
|
1ffa76ba5c
|
Merge branch 'develop'
|
2016-08-01 17:35:02 +05:30 |
|
Nabin Hait
|
798f3897a3
|
bumped to version 7.0.14
|
2016-08-01 18:05:02 +06:00 |
|
Nabin Hait
|
e810ea3a2f
|
Merge pull request #5954 from nabinhait/guardian_patch_fix
Run guardian patch only if student doctype exists and there is father_name column
|
2016-08-01 17:33:51 +05:30 |
|
Nabin Hait
|
29a8a93aa1
|
Run guardian patch only if student doctype exists and there is father_name column
|
2016-08-01 17:31:17 +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 |
|