Nabin Hait
|
6b3706aef8
|
Update move_employee_parent_to_child_in_salary_structure.py
|
2016-08-18 17:32:53 +05:30 |
|
Nabin Hait
|
b5951b72f3
|
Merge pull request #5924 from KanchanChauhan/salary-structure-changes
Formula based Salary Structure
|
2016-08-18 16:39:58 +05:30 |
|
Kanchan Chauhan
|
bccf0fa041
|
[WIP] Formula based Salary Structure and multiple employees for same Salary Structure
|
2016-08-18 13:02:39 +05:30 |
|
Rushabh Mehta
|
b7bc6bd75d
|
[fix] better message for cost center, fixes #6109
|
2016-08-18 12:50:58 +05:30 |
|
Nabin Hait
|
613ef344f3
|
Patch fixed for v6 to v7 migration
|
2016-08-16 18:31:26 +05:30 |
|
Nabin Hait
|
39bc4b2a4c
|
Ignore overlap validation while creating timesheet from existing time logs
|
2016-08-16 15:18:28 +05:30 |
|
Rushabh Mehta
|
de08639d49
|
[minor] fixes to patches while moving from v5
|
2016-08-16 10:01:56 +05:30 |
|
Rushabh Mehta
|
36f2d4f81e
|
[fix] patch for schools;
|
2016-08-10 19:46:12 +05:30 |
|
Rushabh Mehta
|
4b08f9ad1f
|
[fix] patch
|
2016-08-10 18:18:14 +05:30 |
|
Rushabh Mehta
|
cc054a5bbc
|
[minor] fix reload for school migrate patch
|
2016-08-10 14:24:16 +05:30 |
|
Nabin Hait
|
f44b5152d2
|
Portal settings for schools
|
2016-08-09 17:08:13 +05:30 |
|
Nabin Hait
|
11d565b07c
|
Update migrate_schools_to_erpnext.py
|
2016-08-09 15:23:01 +05:30 |
|
Nabin Hait
|
2275cd15e6
|
[patch] Reload Purchase Invoice in patch
|
2016-08-09 14:21:29 +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 |
|
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 |
|
Nabin Hait
|
ae921ce2c8
|
[patch] Set default material request type in Item based on default bom
|
2016-08-02 18:02:31 +05:30 |
|
Neil Trini Lasrado
|
5bb2f56b47
|
Update make_guardian.py
|
2016-08-02 00:01:00 +05:30 |
|
Nabin Hait
|
3b8109780f
|
[patch] reload guardian interest
|
2016-08-01 17:59:46 +05:30 |
|
Nabin Hait
|
08aec855c4
|
[patch] fixed reload doc and permission issue in guardian patch
|
2016-08-01 17:46:56 +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
|
3c364dd5b8
|
[patch] Update refdoc in Landed Cost Voucher
|
2016-08-01 15:53:36 +05:30 |
|
Neil Trini Lasrado
|
74dbd168c2
|
[new Feature] Added guardian master
|
2016-08-01 15:08:04 +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
|
feed313a66
|
Delete old salary earning and deduction doctypes
|
2016-08-01 11:54:19 +05:30 |
|
Nabin Hait
|
fa97b3cac7
|
[fix] repost gle only if there is any stock account without warehouse
|
2016-07-27 17:33:32 +05:30 |
|
Nabin Hait
|
b4bf757a15
|
Update fix_nonwarehouse_ledger_gl_entries_for_transactions.py
|
2016-07-27 15:19:12 +05:30 |
|
Nabin Hait
|
10007ab4df
|
[fix] reposting of gle where stock account not linked with warehouse
|
2016-07-27 12:43:02 +05:30 |
|
Nabin Hait
|
444bedcd20
|
Merge branch 'warehouse_blank_issue_for_non_stock_account' of https://github.com/rohitwaghchaure/erpnext_develop into rohitwaghchaure-warehouse_blank_issue_for_non_stock_account
|
2016-07-27 12:33:10 +05:30 |
|
Rohit Waghchaure
|
c4afd63e50
|
[minor] Fixes
|
2016-07-26 20:47:42 +05:30 |
|
Rohit Waghchaure
|
4d3e8da4a2
|
[Fix] Set warehouse to stock account and fixed gl entries against transactions.
|
2016-07-26 17:09:33 +05:30 |
|
Saurabh
|
21a5658fdf
|
[fix] fee component rename patch fix
|
2016-07-26 15:03:41 +05:30 |
|
Rohit Waghchaure
|
8a9daece7e
|
[Fix] Timesheet patch
|
2016-07-26 12:57:05 +05:30 |
|
Rohit Waghchaure
|
26cf01aaba
|
[mionr] fixes and cleanups
|
2016-07-26 00:30:25 +05:30 |
|
Neil Trini Lasrado
|
ce1c63f776
|
[rename] Renamed Fee Amount to Fee Component
|
2016-07-25 18:24:37 +05:30 |
|
Neil Trini Lasrado
|
d69d961f2a
|
Removed Administrator role from Doctypes
|
2016-07-25 11:39:23 +05:30 |
|
Rushabh Mehta
|
e7399dff2d
|
[fix] homepage patch
|
2016-07-22 21:01:39 +05:30 |
|
Rushabh Mehta
|
6207883b7c
|
[fix] patch #5831
|
2016-07-22 12:20:52 +05:30 |
|
Rushabh Mehta
|
04a64a7f48
|
[fix] patch #5831
|
2016-07-22 12:19:18 +05:30 |
|
Rushabh Mehta
|
f276b52af3
|
[fix] patch #5831
|
2016-07-22 11:31:51 +05:30 |
|
Rushabh Mehta
|
d4f3c6b5e7
|
[fix] schools patch
|
2016-07-21 18:22:58 +05:30 |
|
Rushabh Mehta
|
39671e22c9
|
[fix] patch
|
2016-07-21 17:14:27 +05:30 |
|
Rushabh Mehta
|
fe7d6932ee
|
[fix] patch
|
2016-07-21 17:12:47 +05:30 |
|
Neil Trini Lasrado
|
a537e43838
|
Fixed patch for migrating schools to erpnext again
|
2016-07-21 16:57:04 +05:30 |
|
Neil Trini Lasrado
|
af5e00363a
|
Fixed patch for migrating schools to erpnext
|
2016-07-21 16:41:05 +05:30 |
|
Rushabh Mehta
|
20038ad2c9
|
[fixes] setup wizard and domainify for schools;
|
2016-07-21 16:01:59 +05:30 |
|
Neil Trini Lasrado
|
3f0a581b85
|
Merge ERPNext Schools into ERPNext
|
2016-07-20 19:25:02 +05:30 |
|
Nabin Hait
|
9a5dc452f1
|
Patch fixed for expense claim type
|
2016-07-20 12:16:35 +05:30 |
|
Saurabh
|
718d835f45
|
[enhance] Add Accounts table in to mention expense account based on company #5777
|
2016-07-19 11:38:16 +05:30 |
|
Saurabh
|
c63f2e2993
|
[fix] patch fix
|
2016-07-14 18:24:20 +05:30 |
|
Rushabh Mehta
|
176b63b354
|
[fix] remove first row on mapping, fixes #5707
|
2016-07-14 17:43:48 +05:30 |
|