Neil Trini Lasrado
|
80ca65c166
|
Added validation to ensure that the Sum of Scores of evaluation Criteras is equal to the max assessment score.
|
2017-01-30 15:28:41 +05:30 |
|
KanchanChauhan
|
fbaa6197f9
|
Employee Loan Management (#7126)
* [WIP] Employee Loan Management
* EMI calculation
* Fixing PR
|
2017-01-30 15:15:58 +05:30 |
|
Makarand Bauskar
|
d893efd0a9
|
[minor] replace object values in translations (#7602)
|
2017-01-30 12:35:34 +05:30 |
|
rohitwaghchaure
|
3b40098738
|
Merge pull request #7571 from RicardoJohann/projectfilter
added project filter to gl and carry project filter from P&L
|
2017-01-30 12:24:36 +05:30 |
|
rohitwaghchaure
|
0bdffa8130
|
Merge pull request #7533 from mbauskar/minor-fixes
[WIP] Address and Contact Fixes
|
2017-01-30 11:13:10 +05:30 |
|
mbauskar
|
16ce3623bc
|
[fixes] set lead to Null on delete company transaction & other minor fixes
|
2017-01-30 10:45:28 +05:30 |
|
mbauskar
|
51b1d6de48
|
[minor] moved the address_and_contact utils to frappe
|
2017-01-30 10:45:28 +05:30 |
|
mbauskar
|
7fa039f15c
|
[fixes] delete company transaction and other minor fixes
|
2017-01-30 10:45:28 +05:30 |
|
mbauskar
|
83f4780f74
|
[Fixes] Address and Contact fixes
|
2017-01-30 10:45:28 +05:30 |
|
mbauskar
|
8271b4c564
|
[minor] fixes in address filters
|
2017-01-30 10:45:28 +05:30 |
|
mbauskar
|
cbc49e2989
|
[WIP] Address and Contact Fixes
|
2017-01-30 10:45:28 +05:30 |
|
rohitwaghchaure
|
531b49f6c7
|
Merge pull request #7590 from KanchanChauhan/rename-task
[Minor]Task rename now possible
|
2017-01-30 09:29:10 +05:30 |
|
KanchanChauhan
|
2dfb90a922
|
Merge pull request #7565 from KanchanChauhan/leave-balance-report-fix
[Fix] Permissions to view Leave Balance Report
|
2017-01-29 21:07:02 +05:30 |
|
KanchanChauhan
|
ecc44e506b
|
Merge pull request #7597 from neilLasrado/guarding-name
Fixes to update student guardian name patch
|
2017-01-27 17:45:57 +05:30 |
|
Neil Trini Lasrado
|
6d0da98a78
|
Fixes to update student guardian name patch
|
2017-01-27 17:44:28 +05:30 |
|
KanchanChauhan
|
4db5dd3cc2
|
Merge pull request #7591 from neilLasrado/guarding-name
Added Guardian Name to Student Master
|
2017-01-27 17:31:22 +05:30 |
|
Neil Trini Lasrado
|
7ff5682193
|
Merge branch 'develop' into guarding-name
|
2017-01-27 16:54:50 +05:30 |
|
Neil Trini Lasrado
|
f36ff488c0
|
Added Guardian Name to Student Master
|
2017-01-27 16:53:55 +05:30 |
|
Rushabh Mehta
|
e239d4dfe9
|
Merge branch 'master' into develop
|
2017-01-27 16:18:26 +05:30 |
|
Rushabh Mehta
|
245c2e885a
|
Merge branch 'hotfix'
|
2017-01-27 16:18:26 +05:30 |
|
Rushabh Mehta
|
098bd34f00
|
bumped to version 7.2.17
|
2017-01-27 16:48:25 +06:00 |
|
Rushabh Mehta
|
063e86a1bf
|
[fix] remove on_update in Item
|
2017-01-27 16:16:08 +05:30 |
|
Rushabh Mehta
|
b5eaf324b3
|
Merge branch 'master' into develop
|
2017-01-27 16:03:30 +05:30 |
|
Rushabh Mehta
|
73bf1bc4b0
|
Merge branch 'hotfix'
|
2017-01-27 16:03:29 +05:30 |
|
Rushabh Mehta
|
5f0027a2d0
|
bumped to version 7.2.16
|
2017-01-27 16:33:29 +06:00 |
|
Rushabh Mehta
|
fd82f4b0d4
|
[minor] fix for item_group.py
|
2017-01-27 16:00:47 +05:30 |
|
Rushabh Mehta
|
710dc5392f
|
[merge]
|
2017-01-27 15:48:31 +05:30 |
|
Rushabh Mehta
|
83cc7c9382
|
Merge branch 'hotfix'
|
2017-01-27 15:46:07 +05:30 |
|
Rushabh Mehta
|
149c033c8f
|
bumped to version 7.2.15
|
2017-01-27 16:16:07 +06:00 |
|
KanchanChauhan
|
173fe24ef4
|
Merge pull request #7594 from neilLasrado/student-batch
Added 'Active' checkbox in list view for Student Batch and Student Group
|
2017-01-27 14:56:58 +05:30 |
|
Neil Trini Lasrado
|
7326217ab5
|
Added 'Active' checkbox in list view for Student Batch and Student Group
|
2017-01-27 14:50:48 +05:30 |
|
KanchanChauhan
|
6c85ad9726
|
Merge pull request #7593 from neilLasrado/student-batch
Fix- Student batch strength in Batch Wise attendance report
|
2017-01-27 14:18:40 +05:30 |
|
Neil Trini Lasrado
|
8c3fb43d8a
|
Fix- Student batch strength in Batch Wise attendance report
|
2017-01-27 14:13:25 +05:30 |
|
Kanchan Chauhan
|
3dd85a0e9e
|
Task rename now possible
|
2017-01-27 12:34:06 +05:30 |
|
Kanchan Chauhan
|
e877ecfb7b
|
[Fix] Permissions to view Leave Balance Report
|
2017-01-27 11:53:56 +05:30 |
|
Nabin Hait
|
355b4110c9
|
Merge pull request #7583 from rohitwaghchaure/valuation_rate_issue
[Fix] Get valuation rate from item master and update stock value difference
|
2017-01-25 19:21:04 +05:30 |
|
Nabin Hait
|
cb19f52985
|
Update stock_controller.py
|
2017-01-25 19:20:35 +05:30 |
|
Rohit Waghchaure
|
3899d74f15
|
[Fix] Get valuation rate from item master and update stock value difference
|
2017-01-25 18:47:53 +05:30 |
|
Nabin Hait
|
57e4ab70be
|
Merge pull request #7580 from KanchanChauhan/calendar-manual-screenshots
New screenshots for Calendar user manual
|
2017-01-25 17:35:01 +05:30 |
|
Nabin Hait
|
d288909310
|
Merge pull request #7561 from KanchanChauhan/salary-slip-fix-abbr
Patch to update Salary Detail where Salary Component Abbr is null
|
2017-01-25 17:23:43 +05:30 |
|
Kanchan Chauhan
|
ce116417e1
|
New screenshots for Calendar user manual
|
2017-01-25 15:38:35 +05:30 |
|
Ricardo Johann
|
34354237fd
|
added project filter to gl and carry project filter from P&L
|
2017-01-24 06:46:07 -03:00 |
|
vrms
|
1f1f56225c
|
Update warehouse.md (#7544)
added some detail about link between Warehouse & Warehouse account & machanics of sub-warehousese (Warehouse >Room >Row > Shelf >box
|
2017-01-24 11:29:27 +05:30 |
|
KanchanChauhan
|
4333ce0fd8
|
Merge pull request #7569 from neilLasrado/assessment
Fix for update assessment modules patch
|
2017-01-24 10:52:50 +05:30 |
|
rohitwaghchaure
|
8452e60204
|
Merge pull request #7566 from KanchanChauhan/naming-series-fix
[Fix] Naming series issue fix
|
2017-01-24 10:31:33 +05:30 |
|
Neil Trini Lasrado
|
15c5ae0918
|
Fix for update assessment modules patch
|
2017-01-24 10:28:49 +05:30 |
|
Kanchan Chauhan
|
679cc23abb
|
[Fix] Naming series issue fix
|
2017-01-23 17:20:55 +05:30 |
|
Kanchan Chauhan
|
c948a4fc92
|
Patch to update Salary Detail where Salary Component Abbr is null
|
2017-01-23 16:12:45 +05:30 |
|
rohitwaghchaure
|
ab65f6d8b1
|
Merge pull request #7547 from mnatalia/develop
Added translations to the web page and item dashboard.
|
2017-01-23 15:57:33 +05:30 |
|
KanchanChauhan
|
d825409226
|
Merge pull request #7564 from neilLasrado/patch-fix
Fix for update assessment modules patch
|
2017-01-23 15:46:57 +05:30 |
|