Neil Trini Lasrado
|
f02a0d4d24
|
[bug fix] Fixed bug in fee caclulation, renamed functions
|
2016-08-08 11:09:29 +05:30 |
|
Nabin Hait
|
8793b823af
|
Merge branch 'develop'
|
2016-08-06 14:15:34 +05:30 |
|
Nabin Hait
|
537301a210
|
bumped to version 7.0.20
|
2016-08-06 14:45:34 +06:00 |
|
Nabin Hait
|
f1d8fc3d51
|
Merge pull request #6008 from KanchanChauhan/leave-application-validation
Leave Application Validation for processed salary
|
2016-08-06 14:13:46 +05:30 |
|
Nabin Hait
|
20b4666e89
|
Merge pull request #5958 from rohitwaghchaure/minor_fixes_and_cleanups
fixes and cleanups.
|
2016-08-06 14:11:24 +05:30 |
|
Rushabh Mehta
|
84969bdb2d
|
Merge pull request #6007 from KanchanChauhan/task-json-fixed
[Minor] Removed hard coded success URL from task webform
|
2016-08-06 13:42:50 +05:30 |
|
Kanchan Chauhan
|
705384d8fe
|
Leave Application Validation for processed salary
|
2016-08-06 13:42:18 +05:30 |
|
Rushabh Mehta
|
2123e02eda
|
Merge pull request #6005 from revant/patch-2
[fix] success_url Issue #6004
|
2016-08-06 13:40:02 +05:30 |
|
Rohit Waghchaure
|
b77a1057ce
|
fixes and cleanups.
|
2016-08-06 12:45:02 +05:30 |
|
Kanchan Chauhan
|
93b1f2ad72
|
[Minor] Removed hard coded success URL
|
2016-08-06 12:09:08 +05:30 |
|
Revant Nandgaonkar
|
9a433ffca1
|
[fix] success_url Issue #6004
|
2016-08-05 21:44:34 +05:30 |
|
Nabin Hait
|
c1162796c5
|
Merge branch 'develop'
|
2016-08-05 16:45:14 +05:30 |
|
Nabin Hait
|
82446bf83e
|
bumped to version 7.0.19
|
2016-08-05 17:15:14 +06:00 |
|
Nabin Hait
|
c72f8976aa
|
Merge pull request #5989 from umairsy/2aug
updated docs
|
2016-08-05 15:50:34 +05:30 |
|
Nabin Hait
|
c49a3425ef
|
Merge pull request #6002 from nabinhait/pe_fix_101
Payment Entry fix: Unallocated amount in payment entry considering deductions
|
2016-08-05 15:44:44 +05:30 |
|
Nabin Hait
|
e1d85f2467
|
Payment Entry fix: Unallocated amount in payment entry considering deductions
|
2016-08-05 14:51:36 +05:30 |
|
Umair Sayyed
|
3962cded76
|
updated docs
|
2016-08-04 19:01:02 +05:30 |
|
Umair Sayyed
|
66360f694e
|
updated docs
|
2016-08-04 19:01:02 +05:30 |
|
Umair Sayyed
|
5dba950afa
|
docs update
|
2016-08-04 19:01:02 +05:30 |
|
Umair Sayyed
|
6a3f51bee2
|
updated docs
|
2016-08-04 19:01:02 +05:30 |
|
Rushabh Mehta
|
efe1ab742f
|
[minor] fixes for demo
|
2016-08-04 17:29:46 +05:30 |
|
Rushabh Mehta
|
4d32d5301a
|
Merge pull request #5996 from KanchanChauhan/users-selection-for-project
'Project Users' role not required to add user to the project
|
2016-08-04 14:25:52 +05:30 |
|
Kanchan Chauhan
|
58bc00f954
|
Project Users role not required to add user to the project
|
2016-08-04 14:21:20 +05:30 |
|
Nabin Hait
|
155074479b
|
Merge pull request #5986 from nabinhait/pe_fix_101
Set received amount based on paid amount if currency is same
|
2016-08-03 17:54:01 +05:30 |
|
Nabin Hait
|
fa1775b6a6
|
Merge pull request #5988 from nabinhait/item_route
default material request type field restored in item
|
2016-08-03 17:53:11 +05:30 |
|
Nabin Hait
|
764e6ef210
|
default material request type field restored in item
|
2016-08-03 17:32:26 +05:30 |
|
Rushabh Mehta
|
f2d89987f5
|
[minor] ignore email validation if comes from email;
|
2016-08-03 16:42:29 +05:30 |
|
Rushabh Mehta
|
06c92a782a
|
[fix] small text for route
|
2016-08-03 16:27:11 +05:30 |
|
Nabin Hait
|
f43e49f378
|
Set received amount based on paid amount if currency is same
|
2016-08-03 14:17:05 +05:30 |
|
Rushabh Mehta
|
ea5ad84c5e
|
[minor] fix image for demo
|
2016-08-02 21:26:04 +05:30 |
|
Nabin Hait
|
46f328cbda
|
Merge branch 'develop'
|
2016-08-02 18:07:53 +05:30 |
|
Nabin Hait
|
1b9a01b6c3
|
bumped to version 7.0.18
|
2016-08-02 18:37:52 +06:00 |
|
Nabin Hait
|
e8ab7b8898
|
Merge pull request #5976 from nabinhait/patch_fix_109
[patch] Set default material request type in Item based on default bom
|
2016-08-02 18:05:03 +05:30 |
|
Nabin Hait
|
ae921ce2c8
|
[patch] Set default material request type in Item based on default bom
|
2016-08-02 18:02:31 +05:30 |
|
Nabin Hait
|
b77ad7c31d
|
Merge branch 'develop'
|
2016-08-02 17:16:46 +05:30 |
|
Nabin Hait
|
cc13a9f2f6
|
bumped to version 7.0.17
|
2016-08-02 17:46:46 +06:00 |
|
Nabin Hait
|
97c74f9f8f
|
Merge pull request #5925 from rohitwaghchaure/bcornwellmott-1
PPT looks at default MR type in Item to set MR type.
|
2016-08-02 17:15:02 +05:30 |
|
Nabin Hait
|
e1e6468b33
|
Merge pull request #5974 from nabinhait/pos_change_amount
Change amount calcualtion in POS if there is write off amount and gl entries in this scenario
|
2016-08-02 17:14:50 +05:30 |
|
Nabin Hait
|
6620e2a494
|
Test case fixed for pos gl entry
|
2016-08-02 17:14:28 +05:30 |
|
Rohit Waghchaure
|
08aadb853c
|
PPT looks at default MR type in Item to set MR type.
|
2016-08-02 16:59:03 +05:30 |
|
Nabin Hait
|
3bb1a421f0
|
Change amount calcualtion in POS if there is write off amount and gl entries in this scenario
|
2016-08-02 16:41:15 +05:30 |
|
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 |
|