Rohit Waghchaure
70be24d6f0
[Fix] Get account of the mode of payment on sales invoice and pos profile
2016-08-10 13:16:39 +05:30
Nabin Hait
88fff46ab4
Merge pull request #6038 from nabinhait/portal_settings_schools
...
Portal settings for schools
2016-08-09 17:20:56 +05:30
Nabin Hait
f44b5152d2
Portal settings for schools
2016-08-09 17:08:13 +05:30
Rushabh Mehta
ec2d09c557
[minor] setting up website optional in setup wizard
2016-08-09 16:44:37 +05:30
Nabin Hait
722b22a834
Merge branch 'develop'
2016-08-09 15:30:32 +05:30
Nabin Hait
08e2105b09
bumped to version 7.0.23
2016-08-09 16:00:31 +06:00
Nabin Hait
11d565b07c
Update migrate_schools_to_erpnext.py
2016-08-09 15:23:01 +05:30
Nabin Hait
a2c9d13f68
Merge branch 'develop'
2016-08-09 15:00:16 +05:30
Nabin Hait
508542d4d9
bumped to version 7.0.22
2016-08-09 15:30:16 +06:00
Nabin Hait
50ff8471e0
Merge pull request #6023 from neilLasrado/docs
...
Merged docs for schools to erpnext docs
2016-08-09 14:23:48 +05:30
Nabin Hait
78b8cdc3c1
Merge pull request #6033 from nabinhait/patch_fix_10
...
[patch] Reload Purchase Invoice in patch. Fixed #6032
2016-08-09 14:22:40 +05:30
Nabin Hait
2275cd15e6
[patch] Reload Purchase Invoice in patch
2016-08-09 14:21:29 +05:30
Nabin Hait
b9376641af
Merge pull request #6031 from nabinhait/patch_fix_9
...
[fix]Patch order changed. Fixed #6026
2016-08-09 11:28:48 +05:30
Nabin Hait
ee018b5ae1
[fix]Patch order changed. Fixed #6026
2016-08-09 11:27:28 +05:30
Neil Trini Lasrado
acf85dffc5
Merged docs for schools to erpnext docs
2016-08-08 18:59:15 +05:30
Nabin Hait
660f3ed0d6
Merge branch 'develop'
2016-08-08 15:50:00 +05:30
Nabin Hait
d5c83122f2
bumped to version 7.0.21
2016-08-08 16:20:00 +06:00
Nabin Hait
2777f23ace
Merge pull request #6019 from nabinhait/pcv_test_case
...
Fixed test cases for period closing voucher
2016-08-08 15:45:19 +05:30
Nabin Hait
ae65172dca
Added 'Ledger' button to show accounting entries against PCV
2016-08-08 15:44:45 +05:30
Nabin Hait
d261d40c7e
Fixed test cases for period closing voucher
2016-08-08 15:44:45 +05:30
Nabin Hait
4b231c2692
Merge pull request #6018 from rohitwaghchaure/add_calendar_to_timesheets
...
Added a Calendar view for timesheet logs
2016-08-08 14:46:18 +05:30
Nabin Hait
7e27e32e92
Merge pull request #6017 from nabinhait/repost_future_stock_transactions
...
Repost gle for future transactions if update stock checked in back dated purchase invoice
2016-08-08 14:45:17 +05:30
Ben Cornwell-Mott
ed1b8cfe3f
Added a Calendar view for timesheet logs
2016-08-08 14:17:06 +05:30
Nabin Hait
99d4ff4a29
Repost gle for future transactions if update stock checked in back dated purchase invoice
2016-08-08 14:12:58 +05:30
Nabin Hait
595dbd6dea
Merge pull request #5963 from neilLasrado/assessment
...
Assessment Groups
2016-08-08 12:50:10 +05:30
Nabin Hait
f979b18ddb
Merge pull request #6003 from neilLasrado/bug-fix
...
[bug fix] Fixed bug in fee caclulation, renamed functions
2016-08-08 12:44:27 +05:30
Nabin Hait
3ef6e7847e
Merge pull request #6010 from rohitwaghchaure/minor_fix_pos
...
[Fix] pos ambiguous issue
2016-08-08 12:40:28 +05:30
Nabin Hait
2dba3b5e25
Merge pull request #6012 from bohlian/develop
...
[Enhancement + Fix] Disable buttons when Production Order is Stopped, Fixed Stopping and Re-Opening of Production Order
2016-08-08 12:40:00 +05:30
Nabin Hait
2cb8c6a867
Merge pull request #6015 from nabinhait/ar_ap_cols
...
[fix] Label for ageing cols in AR/AP report
2016-08-08 12:37:19 +05:30
Nabin Hait
be3aee973c
Merge pull request #6011 from saurabh6790/get_acount_balance_fix
...
[minor][fix] return if account details not found
2016-08-08 12:36:40 +05:30
Nabin Hait
c30c342bdf
[fix] Label for ageing cols in AR/AP report
2016-08-08 11:47:13 +05:30
Neil Trini Lasrado
f02a0d4d24
[bug fix] Fixed bug in fee caclulation, renamed functions
2016-08-08 11:09:29 +05:30
Rohit Waghchaure
cd6c00d505
[Fix] pos ambiguous issue
2016-08-07 14:29:21 +05:30
Javier Wong
e6cd228288
[Enhancement + Fix] Disable buttons when Production Order is Stopped, Fixed Stopping and Re-Opening of Production Order
...
Disabled the following buttons:
- Make Timesheet
- Start
- Finish `
- A better fix than 316f78f859
2016-08-07 16:01:49 +08:00
Saurabh
ec14c81ebd
[minor][fix] return if account details not found
2016-08-07 08:52:45 +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
Neil Trini Lasrado
50b2278eda
Renamed fields in Examination Doctype, Renamed examination doctype to Assessment, Added Assessment Group, added patch
2016-08-05 15:09:49 +05:30
