Commit Graph

69 Commits

Author SHA1 Message Date
Aditya Hase
f3c22f342c fix(unicode): Import unicode_literals in every file 2019-01-22 18:36:10 +05:30
Nabin Hait
cce7c5c245 Fixed salary structure employee patches 2018-07-30 10:52:51 +05:30
Nabin Hait
7918b92d95 Invalid date value comparison, fixes for mariadb 10.2.3+ 2018-01-31 15:30:03 +05:30
Nabin Hait
bb09437d1f
Merge branch 'develop' into payroll_entry 2017-12-06 19:18:40 +05:30
Vishal Dhayagude
b930dfa74c [fix] fix patch failed erpnext/patches/v7_2/make_all_assessment_group.py () 2017-12-06 18:03:21 +05:30
Shreya
f8e7bc7c5b removed process payroll doctype 2017-12-04 16:49:44 +05:30
Nabin Hait
82ef26b327 Minor fix in patch 2017-11-23 17:57:33 +05:30
Manas Solanki
966f141f62 Rename schools to Education ()
* renaming for the docs, demo data and patch

* changes in the doctypes and reports

* rename the config file

* Few name changes in messages and license

* rename the school settings to education settings

* changes in the documentation

* added the setup file for the fixtures

* corrected the ui tests file path

* fix the codacy

* add the patch for renaming few doctypes and fields

* changes in the patch
2017-11-23 15:22:10 +05:30
Rohit Waghchaure
2e4b4454b3 [Fix] Module error during patch execution 2017-06-28 17:31:59 +05:30
Rushabh Mehta
d03203966a [minor] fix old patch 2017-06-24 10:37:19 +05:30
Nabin Hait
2f0c34385b Check if doctype exists before renaming 2017-05-24 17:12:07 +05:30
Nabin Hait
258f7da778 Paid amount + Write Off Amount can not be greater than Grand Total in return POS 2017-05-24 17:12:07 +05:30
Nabin Hait
7bf810300e Fixed , active students patch 2017-05-15 11:42:37 +05:30
Revant Nandgaonkar
3d5bdeb90d [Fix] patch v7_2.contact_address_links 2017-03-30 23:14:58 +05:30
Rohit Waghchaure
0bb434af3f minor fix in patch 2017-03-06 18:52:34 +05:30
Kanchan Chauhan
5a980ac87a UOM Conversion in Selling 2017-03-06 16:41:12 +05:30
Nabin Hait
697150f339 Leave application overlap validation for half day and test cases 2017-02-24 18:53:34 +05:30
Manas Solanki
d77fac113f Make All Assessment Group parent in assessment group tree 2017-02-24 15:30:22 +05:30
Nabin Hait
5079c9ef47 Fixed merge conflict 2017-02-22 15:31:31 +05:30
Manas Solanki
f869a679ae Fixed Student Attendence 2017-02-21 18:49:00 +05:30
Nabin Hait
0142fdc0d7 Update rename_att_date_attendance.py 2017-02-21 16:01:21 +05:30
Kanchan Chauhan
42f55cf4b1 [Patch] Attendance Date rename field 2017-02-21 13:44:01 +05:30
Nabin Hait
6a85752ead Merge branch 'hotfix' into remove-joining-datep-validation 2017-02-20 19:31:38 +05:30
Nabin Hait
0d66579e83 Merge branch 'develop' into develop 2017-02-20 19:22:03 +05:30
Nabin Hait
8bb69ff8bf Fixed merge conflict 2017-02-20 19:01:04 +05:30
Nabin Hait
9f4cb0c097 Fixed merge conflict 2017-02-20 15:00:04 +05:30
mbauskar
90818080b1 [minor] Configured Auto Close days for Opportunity and Issue 2017-02-17 14:56:00 +05:30
Rohit Waghchaure
4b9d2f2733 [Fix] Cleanup supplied items if supply raw material is set as No 2017-02-16 18:53:23 +05:30
Kanchan Chauhan
1b204c8e4e Accrual Payroll System 2017-02-16 16:30:51 +05:30
Kanchan Chauhan
5f5457085e Joining date validation removed from Salary Structure 2017-02-06 14:50:39 +05:30
Rushabh Mehta
e92a740b53 [minor] school patch fix 2017-02-03 16:05:53 +05:30
Neil Trini Lasrado
f37d329cf5 Merge branch 'develop' into eval-group 2017-02-02 17:30:10 +05:30
Neil Trini Lasrado
4aabe61197 Patch for renaming evaluation criteria 2017-02-01 19:32:28 +05:30
Neil Trini Lasrado
749516c22d Renamed Evaluation Criteria to Assessment Criteria 2017-02-01 18:47:36 +05:30
rohitwaghchaure
ea092a7b24 [Enhancement] Booking of an employee's expense claim ()
* [Enhancement] Auto book of an employee's expense claim

* test cases

* documentation

* fixes and changes

* removed payable from employee and added into the company

* Added party in account, patch to update party type for customer and supplier accounts

* added party type in erpnext, fix patch

* fixed travis
2017-02-01 12:02:08 +05:30
Neil Trini Lasrado
fd1767d2ea Patch fix for Update Assessment Module Patch 2017-01-30 17:50:05 +05:30
Neil Trini Lasrado
ab1ee1e6fc Patch fix for Update Assessment Module Patch 2017-01-30 16:40:14 +05:30
Neil Trini Lasrado
6d0da98a78 Fixes to update student guardian name patch 2017-01-27 17:44:28 +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
710dc5392f [merge] 2017-01-27 15:48:31 +05:30
Neil Trini Lasrado
15c5ae0918 Fix for update assessment modules patch 2017-01-24 10:28:49 +05:30
Kanchan Chauhan
c948a4fc92 Patch to update Salary Detail where Salary Component Abbr is null 2017-01-23 16:12:45 +05:30
Neil Trini Lasrado
d471ad2c45 Fix for update assessment modules patch 2017-01-23 14:59:19 +05:30
Nabin Hait
1f9d1bb877 Merge branch 'develop' into assessment 2017-01-20 20:09:44 +05:30
Neil Trini Lasrado
16d40cf0a3 Added ability to disable a student in student group/studnet batch 2017-01-20 19:33:09 +05:30
Nabin Hait
349d520ae2 Fixed merge conflict 2017-01-20 15:44:35 +05:30
Nabin Hait
f356e539bb Update set_null_value_to_fields.py 2017-01-20 12:35:22 +05:30
Rohit Waghchaure
84b827efcd [Fix] Budget not working properly 2017-01-20 12:33:50 +05:30
Rushabh Mehta
c81621d3ce [minor] add progress bar in patch 2017-01-19 14:32:36 +05:30