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 |
|
Rushabh Mehta
|
62fcaa7900
|
Merge pull request #5758 from saurabh6790/is_group_fixes
[fix] alter fieldtype for is_group from select to check
|
2016-07-14 16:57:01 +05:30 |
|
Rohit Waghchaure
|
de8418efe5
|
[Fix] Timesheet patch
|
2016-07-14 14:36:47 +05:30 |
|
Saurabh
|
6bc7b892c4
|
[fix] alter fieldtype for is_group from select to check
|
2016-07-14 14:06:28 +05:30 |
|
Rohit Waghchaure
|
e3fe828ea6
|
[Fix] Added note in timesheet and minor fixes
|
2016-07-13 09:40:35 +05:30 |
|
Rohit Waghchaure
|
3e012b7e16
|
[Fix] Time sheet rename issues
|
2016-07-11 15:00:38 +05:30 |
|
Rohit Waghchaure
|
e94d18b4cd
|
Rename Time Sheet doctype
|
2016-07-06 20:38:50 +05:30 |
|
Nabin Hait
|
7796c2f0c0
|
Update rename_salary_components.py
|
2016-07-06 13:11:51 +05:30 |
|
Rohit Waghchaure
|
c8d231b26b
|
[Fix] Patch salary component
|
2016-07-06 12:33:54 +05:30 |
|
Rohit Waghchaure
|
a71d9d33af
|
Rename prevdoc field in purchase order and purchase receipt doctype
|
2016-07-06 12:13:29 +05:30 |
|
Nabin Hait
|
4647f24865
|
Merge pull request #5625 from KanchanChauhan/salary-component-cleanup
Salary component cleanup
|
2016-07-06 12:06:05 +05:30 |
|
Kanchan Chauhan
|
d963b76a4b
|
Salary component cleanup
|
2016-07-06 12:04:38 +05:30 |
|
Nabin Hait
|
281b07cdb6
|
Warehouse patch fix
|
2016-07-04 18:17:57 +05:30 |
|
Nabin Hait
|
7f3938b19f
|
Warehouse patch fix
|
2016-07-04 18:12:08 +05:30 |
|
Rohit Waghchaure
|
240407b155
|
[Fixes] Time log batch patch
|
2016-07-04 13:21:54 +05:30 |
|
Nabin Hait
|
13093b4b68
|
Make payment entry aginst order, payment request and patch to rename advance table fields
|
2016-07-04 11:42:24 +05:30 |
|
Rushabh Mehta
|
4177504860
|
[fix] [patch] reload doctype missing in patch
|
2016-07-04 11:41:12 +05:30 |
|
Rushabh Mehta
|
6703792472
|
Merge pull request #5618 from rohitwaghchaure/sq_field_and_rfq_fixes
[Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI
|
2016-07-04 10:59:11 +05:30 |
|
Rohit Waghchaure
|
ad884b9fa9
|
[Fixes] Time sheet dependency removed from sales invoice and patch fixes
|
2016-07-02 22:28:29 +05:30 |
|
Rohit Waghchaure
|
4d8f4d76e1
|
[Fixes] Fixed linked for MR to SQ from RFQ, changed field name in SQI
|
2016-07-01 15:33:57 +05:30 |
|
Rushabh Mehta
|
5b681666a0
|
Merge pull request #5605 from saurabh6790/warehouse_tree_fix_1
while creating warehouse tree check for non company warehouse and is_group default value fix
|
2016-06-29 21:58:31 +05:30 |
|
Rohit Waghchaure
|
3fa0b51e5e
|
[Fixes] Time sheet fixes and changed timesheets to time_logs
|
2016-06-29 19:04:16 +05:30 |
|
Saurabh
|
028bbee317
|
[fix] nestedset warehouse fix
|
2016-06-29 19:03:40 +05:30 |
|
Saurabh
|
b8a57a4b4d
|
[fix] wareehouse nestedset fix if company not associated with warehouse
|
2016-06-29 19:01:49 +05:30 |
|
Rushabh Mehta
|
e6920f6a58
|
Merge pull request #5603 from KanchanChauhan/Maintenance-Module
New Maintenance Module
|
2016-06-29 16:08:46 +05:30 |
|
Kanchan Chauhan
|
fb3eb13ca4
|
New Maintenance Module
|
2016-06-29 15:51:02 +05:30 |
|
Anand Doshi
|
5b9c6e7fa6
|
[fix] [patch] remove default activity type "Planning"
|
2016-06-29 15:32:36 +05:30 |
|
Saurabh
|
ee17e2f277
|
[fix] patch fix
|
2016-06-28 15:43:02 +05:30 |
|
Saurabh
|
52c2affc9c
|
[fix] check for parent account with type stock in patch if not exists get parent account from existing warehouse accounts
|
2016-06-28 14:41:48 +05:30 |
|
Saurabh
|
2f788a909f
|
[fixes] time sheet patch fix
|
2016-06-27 17:44:12 +05:30 |
|
Saurabh
|
93d68ac0c2
|
[fixes] change is group to check box
|
2016-06-27 17:16:56 +05:30 |
|
Saurabh
|
99892c7ce7
|
[fix] provision to convert group to ledger and vice versa
|
2016-06-27 17:16:56 +05:30 |
|
Rohit Waghchaure
|
d6c986da8f
|
[Enhancement] Time log wages and multiple active salary structure
|
2016-06-27 16:46:39 +05:30 |
|
Saurabh
|
7fecb50360
|
[enhance] rename warehouse account type to stock
|
2016-06-26 14:27:46 +05:30 |
|
Anand Doshi
|
f576f3b17b
|
implemented get_site_info for erpnext and patch to move setup complete to system settings
|
2016-06-25 19:52:26 +05:30 |
|
Saurabh
|
dc2fa86222
|
[fixes] rename ctype to doctype
|
2016-06-25 11:16:55 +05:30 |
|
Saurabh
|
3a0f96bd00
|
[patch] patch to move all warehouses under all warehouse group
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
4d02949814
|
[fixes] validate trash condition for warehouse and related account, move existing warehouses under all warehouse group, set account parent and is group for warehouse account
|
2016-06-25 11:06:14 +05:30 |
|
Saurabh
|
554f6f70aa
|
[fixes] nested set fix for warehouse, tree for accounts and cost center
|
2016-06-25 11:06:13 +05:30 |
|
Saurabh
|
eda1afb4eb
|
[fixes] comnify tree view
|
2016-06-25 11:06:13 +05:30 |
|
Saurabh
|
dfbcdeb8a0
|
[enhancement] warehouse tree structure
|
2016-06-25 11:06:12 +05:30 |
|
Rushabh Mehta
|
a334062b03
|
[redesign] website routing system
|
2016-06-24 16:18:07 +05:30 |
|
Rushabh Mehta
|
1d1bc27a57
|
[minor] fix update_mins_to_first_response patch
|
2016-06-14 16:27:50 +05:30 |
|
Rushabh Mehta
|
a55fb6426c
|
[patch] mins_to_first_response in opporutnity and issue
|
2016-06-14 15:54:54 +05:30 |
|
Rushabh Mehta
|
277cda195c
|
[fix] for #5419
|
2016-06-01 12:29:08 +05:30 |
|
Nabin Hait
|
a60ceba6d4
|
[fix] reload gl entry doctype in patch
|
2016-05-27 12:44:18 +05:30 |
|
Nabin Hait
|
591a5aba56
|
Added Project in GL Entry and General Ledger report
|
2016-05-26 17:51:20 +05:30 |
|
Rushabh Mehta
|
1885645d6d
|
[fix] [patch]
|
2016-05-24 16:10:21 +05:30 |
|
Nabin Hait
|
d9117cb726
|
reload budget doctype in patch
|
2016-05-23 13:04:26 +05:30 |
|
Nabin Hait
|
ca90963d5b
|
Redesigned budgets
|
2016-05-23 13:04:26 +05:30 |
|
Anand Doshi
|
1d88c6a742
|
[fix] [patch] home page + erpnext.css
|
2016-05-20 10:42:04 +05:30 |
|
Anand Doshi
|
e13c3ad048
|
[fix] [patch] homepage
|
2016-05-18 01:46:23 +05:30 |
|
Anand Doshi
|
0d66260d31
|
[fix] [patch] update home page
|
2016-05-17 10:21:08 +05:30 |
|
Rushabh Mehta
|
02f76dc0f9
|
[patch] [fix]
|
2016-05-16 11:46:29 +05:30 |
|
Rushabh Mehta
|
f1bdae4496
|
[patch] [fix]
|
2016-05-16 11:41:29 +05:30 |
|
Rushabh Mehta
|
c8b2a9d654
|
[patch] [fix]
|
2016-05-15 10:08:52 +05:30 |
|
Rushabh Mehta
|
9c6c0d2836
|
[patch] [fix]
|
2016-05-13 17:50:33 +05:30 |
|
Rushabh Mehta
|
d774f40497
|
remove print in homepage
|
2016-05-13 16:21:37 +05:30 |
|
Rushabh Mehta
|
4b9238a03b
|
[cleanup] homepage
|
2016-05-12 15:23:17 +05:30 |
|
Rushabh Mehta
|
d42167e0e5
|
[cleanup] remove Features Setup
|
2016-05-11 16:47:14 +05:30 |
|
Rushabh Mehta
|
0525387328
|
[enhancement] added reserved_qty_for_production in bin and updated item dashboard
|
2016-04-18 19:27:46 +05:30 |
|
Rushabh Mehta
|
c65726bf07
|
[patch] hide new icons if equivalent old ones are set
|
2016-04-15 12:51:28 +05:30 |
|
Rushabh Mehta
|
15a7f215b9
|
[enhancement] heatmaps on item and notifications for item
|
2016-04-14 17:30:53 +05:30 |
|
Nabin Hait
|
e1433aab30
|
[fix] Fixed party update status patch
|
2016-04-09 16:12:40 +05:30 |
|
Rushabh Mehta
|
f16f9c569b
|
[enhancement] add status in customer, supplier
|
2016-04-08 17:21:00 +05:30 |
|