Commit Graph

22092 Commits

Author SHA1 Message Date
Shreya
30b2480cfe make inter company invoice button on Invoices 2018-05-02 14:34:14 +05:30
Shreya
462e18ad2e Allowed To Transact With child table in Customer & Supplier 2018-05-02 14:34:14 +05:30
Shreya
59512aaaaa Internal Supplier check in Supplier 2018-05-02 14:34:14 +05:30
Shreya
7946ca216e Internal Customer check in Customer 2018-05-02 14:34:14 +05:30
Nabin Hait
d2861df939 Renamed Health Insurance to Employee Health Insurance 2018-05-02 14:34:14 +05:30
Nabin Hait
43274de5df Removed employee table from Salary Structure and added employee name in all forms 2018-05-02 14:33:37 +05:30
Nabin Hait
e9ad03e23e Documents order in hr page 2018-05-02 14:31:27 +05:30
Nabin Hait
501a64becd Added links in HR module 2018-05-02 14:31:03 +05:30
Shreya Shah
24e8f31be1 [Enterprise] Patch and child table changes (#13656)
* [patch] rename field

* Employee Property History child table

* remove child tables
2018-05-02 14:29:44 +05:30
Nabin Hait
2f77ccce1b New doctypes for HR and Accounting (#13652) 2018-05-02 14:27:19 +05:30
Nabin Hait
d39386bd55 Renamed some salary related fields 2018-04-30 16:21:37 +05:30
Nabin Hait
2f82bce387 minor fix 2018-04-26 16:32:17 +05:30
Nabin Hait
25ccd1acbb minor fix in asset 2018-04-26 12:16:38 +05:30
Nabin Hait
dc75be8b6c Show company column in order in consolidated financial statement 2018-04-26 12:16:38 +05:30
Siddhi Sawant
a16c8d0a2b Establishment / Effective Date field in the Company master (#13723) 2018-04-26 12:16:38 +05:30
Rohit Waghchaure
4110e00b2d [Fix] general ledger group by validation 2018-04-26 12:16:38 +05:30
Rohit Waghchaure
26decaad6c [Fix] Profit and loss statment 2018-04-26 12:16:38 +05:30
Nabin Hait
074928cf6c Company field added in department 2018-04-26 12:16:38 +05:30
Nabin Hait
f164203520 Fixed merge conflict 2018-04-26 12:16:18 +05:30
Nabin Hait
ee09408dcc Minor fixes 2018-04-26 12:16:18 +05:30
Pawan Mehta
2215d4c593 Shift Management (#13667)
* [fix] #13634

* review_changes

* rename function

* rename function
2018-04-26 12:16:18 +05:30
rohitwaghchaure
efff6e53de Consolidated financial statement (#13678)
* added fields to support treeview

* tree file added, nestedset implemented

* patch added to reload doc and configure lft rgt

* Added consolidated financial statement report
2018-04-26 12:16:18 +05:30
rohitwaghchaure
fb9af38106 Group by party in general ledger report (#13649)
* Group wise Ledger for Customer and Supplier

* commonify group by fields
2018-04-26 12:16:18 +05:30
Pawan Mehta
0a17f8d51b remove shift schedule tool (#13658) 2018-04-26 12:16:18 +05:30
Nabin Hait
8076d6ddc8 Renamed Health Insurance to Employee Health Insurance 2018-04-26 12:16:17 +05:30
Nabin Hait
265426a5a6 Minor fixes 2018-04-26 12:14:02 +05:30
Nabin Hait
81706fdb46 Update rename_field_max_days_allowed.py 2018-04-26 12:14:02 +05:30
Nabin Hait
551844881b Removed employee table from Salary Structure and added employee name in all forms 2018-04-26 12:14:01 +05:30
Nabin Hait
fcdca7f2a0 Documents order in hr page 2018-04-26 12:13:46 +05:30
Nabin Hait
f914bd374d Added links in HR module 2018-04-26 12:13:24 +05:30
Shreya Shah
b15ef8450f [Enterprise] Patch and child table changes (#13656)
* [patch] rename field

* Employee Property History child table

* remove child tables
2018-04-26 12:13:06 +05:30
Pawan Mehta
8f14cb590c Add grade to employee master (#13654) 2018-04-26 12:12:45 +05:30
Nabin Hait
1c13e70d13 New doctypes for HR and Accounting (#13652) 2018-04-26 12:12:29 +05:30
Shreya Shah
ec38044fe2 New DocTypes for HR Module (#13650)
* New DocType Employee Incentive

* New DocType Shift Type

* New DocType Shift Assignment

* New DocType Shift Assignment Tool

* New DocType Shift Request

* New DocType Salary Structure Assignment

* Added Permissions

* New DocType Employee Lifecycle Process

* New DocType Employee Lifecycle Activity Type

* New DocType Employee Lifecycle Activity

* New DocType Employee Lifecycle Process Template

* New DocType Employee Lifecycle Process Template Detail

* Permissions and Auto Name

* New DocType Staffing Plan

* New DocType Staffing Plan Detail

* Added fields in Job Opening

* New DocType Employee Transfer

* New DocType Employee Promotion

* [minor]
2018-04-26 12:10:13 +05:30
Rushabh Mehta
369afce43c [patch] ignore validations while creating custom fields for gst via patch 2018-04-26 10:10:03 +05:30
Manas Solanki
30c267bec6
Merge pull request #13784 from KanchanChauhan/typo-fix
[Typo Fix] in Work Order
2018-04-25 17:23:36 +05:30
Kanchan Chauhan
7826dd1aeb Typo Fix in Work Order 2018-04-25 13:48:47 +05:30
Saurabh
1d5bbe1081 Merge branch 'master' into develop 2018-04-25 12:46:50 +05:30
Saurabh
07d030208f Merge branch 'hotfix' 2018-04-25 12:46:48 +05:30
Saurabh
47f6e32920 bumped to version 10.1.27 2018-04-25 13:16:48 +06:00
Saurabh
7bd1453f8f
Merge pull request #13785 from rohitwaghchaure/fix_patch_pos_taxes
[Fix] POS Patch
2018-04-25 12:44:20 +05:30
Rohit Waghchaure
bf416cfbf8 [Fix] POS Patch 2018-04-25 12:32:22 +05:30
Saurabh
63590496c1 [fix] resolved merge conflicts 2018-04-25 11:32:54 +05:30
Saurabh
67918fff32 Merge branch 'hotfix' 2018-04-25 11:31:48 +05:30
Saurabh
132dac9712 bumped to version 10.1.26 2018-04-25 12:01:48 +06:00
rohitwaghchaure
57914f140e [HotFix] Taxes not adding in POS sales invoice (#13776) 2018-04-24 19:19:47 +05:30
Nabin Hait
5643c3ead2 Minor fix in reloading email template 2018-04-24 17:51:13 +05:30
Shridhar Patil
02c93a3d05 [bug] Leave application ui issues fixed (#13740)
* validate to_date in leave application

if to_date is less than from_date show message to user
reset to_date value to ''

* var declaration and semicolon missed

* Updated popup message
2018-04-24 14:45:11 +05:30
Kenneth Sequeira
70330e8379 fixed user permission video link (#13774) 2018-04-24 14:12:41 +05:30
Shreya Shah
3cf35f2496 fix syntax (#13773) 2018-04-24 12:20:21 +05:30