Nabin Hait
|
1b9f8006c2
|
Merge pull request #6140 from nabinhait/timesheet_patch_fix
Ignore validating mandatory fields on converting timelogs to timesheets
|
2016-08-22 14:36:08 +05:30 |
|
Nabin Hait
|
9239ed5c44
|
Ignore validating mandatory fields on converting timelogs to timesheets
|
2016-08-22 14:35:06 +05:30 |
|
Nabin Hait
|
17824c74cf
|
Merge pull request #6135 from KanchanChauhan/minor-salary-fixes
[Minor]Fixes
|
2016-08-22 12:12:02 +05:30 |
|
Kanchan Chauhan
|
681a86d70e
|
[Minor]Fixes
|
2016-08-22 00:28:20 +05:30 |
|
Nabin Hait
|
4cda566139
|
Merge pull request #6120 from KanchanChauhan/images-for-salary-doc
Better images for redesigned salary docs
|
2016-08-19 12:50:25 +05:30 |
|
Kanchan Chauhan
|
3769996dfd
|
Images for redesigned salary docs
|
2016-08-18 23:06:16 +05:30 |
|
Nabin Hait
|
6b3706aef8
|
Update move_employee_parent_to_child_in_salary_structure.py
|
2016-08-18 17:32:53 +05:30 |
|
Rushabh Mehta
|
69349f2672
|
[fix] [patch] column conversion before item reload
|
2016-08-18 17:06:55 +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 |
|
Nabin Hait
|
e4fb7b1b2f
|
Merge branch 'hotfix'
|
2016-08-18 16:15:49 +05:30 |
|
Nabin Hait
|
9a1bcac576
|
bumped to version 7.0.31
|
2016-08-18 16:45:49 +06:00 |
|
Nabin Hait
|
e68b089187
|
Query for warehouse in delivery note
|
2016-08-18 16:14:23 +05:30 |
|
Nabin Hait
|
d8a372587d
|
[fix] Legend in support analytics chart
|
2016-08-18 16:14:23 +05:30 |
|
Nabin Hait
|
f04ce3c5a6
|
[fix] check expense agaist budget
|
2016-08-18 16:14:23 +05:30 |
|
Nabin Hait
|
50f8262ac7
|
Currency fix in reports
|
2016-08-18 16:14:23 +05:30 |
|
Nabin Hait
|
e30fadc661
|
Merge branch 'develop'
|
2016-08-18 16:13:15 +05:30 |
|
Nabin Hait
|
f0937bf722
|
bumped to version 7.0.30
|
2016-08-18 16:43:15 +06:00 |
|
Nabin Hait
|
4810831678
|
Merge pull request #6107 from neilLasrado/develop
[Fix] Enroll Students from Student Applicants in Program Enrollment Tool.
|
2016-08-18 14:21:11 +05:30 |
|
Nabin Hait
|
7cdc6fd789
|
Merge pull request #6115 from rohitwaghchaure/pos_stock_update_issue
[POS] Fixed stock update issue
|
2016-08-18 14:20:26 +05:30 |
|
Rushabh Mehta
|
03e5ea3a0d
|
Merge pull request #6114 from hereabdulla/patch-1
Update employee_list.js
|
2016-08-18 14:05:58 +05:30 |
|
Rohit Waghchaure
|
9d5a07d101
|
[POS] Fixed stock update issue
|
2016-08-18 13:27:06 +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 |
|
Abdulla P I
|
23a6d05622
|
Update employee_list.js
|
2016-08-18 12:43:19 +05:30 |
|
Rushabh Mehta
|
b969c2cb60
|
[minor] budget link in cost center, fixes #6093
|
2016-08-18 12:36:20 +05:30 |
|
Neil Trini Lasrado
|
c4e71fcc51
|
[Fix] Enroll Students from Student Applicants in Program Enrollment Tool.
|
2016-08-17 17:37:19 +05:30 |
|
Nabin Hait
|
b8a8fb5877
|
Merge branch 'develop'
|
2016-08-17 17:11:09 +05:30 |
|
Nabin Hait
|
734cf70b43
|
bumped to version 7.0.29
|
2016-08-17 17:41:09 +06:00 |
|
Nabin Hait
|
6fe3ac49cf
|
Merge pull request #6039 from rohitwaghchaure/allow_to_edit_change_amount
Allow to edit change amount
|
2016-08-17 17:08:54 +05:30 |
|
Rohit Waghchaure
|
e4e69ec027
|
changed field name, validation for change amount account, validation for serial no qty
|
2016-08-17 16:20:13 +05:30 |
|
Nabin Hait
|
386d9e1613
|
Merge pull request #6106 from nabinhait/item_reload
Default material request type field restored
|
2016-08-17 16:16:28 +05:30 |
|
Nabin Hait
|
40c60b6182
|
Default material request type field restored
|
2016-08-17 16:14:24 +05:30 |
|
Nabin Hait
|
95c998109d
|
Merge pull request #6043 from aruizramon/purchase-taxes-client-validation
Validate on changing from Total to Valuation/Valuation&Total when add…
|
2016-08-17 12:12:14 +05:30 |
|
Nabin Hait
|
33bcaa8a07
|
Merge pull request #6080 from bcornwellmott/quoteditem_picksupplier
Quoted Item Comparison: Button for setting the default_supplier
|
2016-08-17 11:36:55 +05:30 |
|
Nabin Hait
|
4da2c81641
|
Merge pull request #6094 from rmehta/sales-purchase-items
[revert] is_sales_item, is_purchase_item back
|
2016-08-17 11:30:37 +05:30 |
|
Nabin Hait
|
c2595aa902
|
Merge pull request #6099 from nabinhait/patch_fix_for_v6_to_v7_migration
Patch fixed for v6 to v7 migration
|
2016-08-17 11:28:29 +05:30 |
|
Nabin Hait
|
613ef344f3
|
Patch fixed for v6 to v7 migration
|
2016-08-16 18:31:26 +05:30 |
|
Nabin Hait
|
0c1be8df35
|
Merge pull request #6096 from rohitwaghchaure/minor_fix
[Fix] lwp salary structure
|
2016-08-16 18:17:14 +05:30 |
|
Nabin Hait
|
815ebafa7b
|
Merge pull request #6092 from umairsy/9aug
Updated docs (please don't merge)
|
2016-08-16 18:16:28 +05:30 |
|
Umair Sayyed
|
8f7708ed5b
|
docs updated
|
2016-08-16 18:13:12 +05:30 |
|
Umair Sayyed
|
1bd9f22add
|
updated docsgd
|
2016-08-16 18:08:24 +05:30 |
|
Umair Sayyed
|
f369b5951e
|
updated docs
|
2016-08-16 18:08:00 +05:30 |
|
Umair Sayyed
|
81995389ac
|
updated docs
|
2016-08-16 18:08:00 +05:30 |
|
Rohit Waghchaure
|
fe913c9969
|
[Fix] lwp salary structure
|
2016-08-16 15:43:50 +05:30 |
|
Nabin Hait
|
18d6162935
|
Merge branch 'develop'
|
2016-08-16 15:25:34 +05:30 |
|
Nabin Hait
|
91d6544958
|
bumped to version 7.0.28
|
2016-08-16 15:55:33 +06:00 |
|
Nabin Hait
|
f640ad4389
|
Merge pull request #6095 from nabinhait/timesheet_patch
Ignore overlap validation while creating timesheet from existing time logs
|
2016-08-16 15:19:56 +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
|
d973c1606a
|
[revert] is_sales_item, is_purchase_item back
|
2016-08-16 11:32:08 +05:30 |
|
Nabin Hait
|
df9cf2ef8e
|
Merge pull request #6068 from neilLasrado/develop
Added image field to guardian, program enrollment, fixed some typos
|
2016-08-16 11:01:58 +05:30 |
|