Nabin Hait
|
dac204b1e3
|
Merge pull request #6124 from rohitwaghchaure/hotfix
[POS] Fixed issue of paid amount, write off account
|
2016-08-22 15:56:20 +05:30 |
|
Nabin Hait
|
9c786948d5
|
Merge pull request #6125 from nabinhait/lcv_hotfix
[fix] Repost only distinct purchase receipts and invoices
|
2016-08-22 15:53:21 +05:30 |
|
Nabin Hait
|
6f1795cb3d
|
Merge pull request #6146 from neilLasrado/operation
Operations related fixes
|
2016-08-22 15:52:57 +05:30 |
|
Nabin Hait
|
01b555edc7
|
Change logs for v7
|
2016-08-22 15:50:21 +05:30 |
|
Nabin Hait
|
c95a3180c2
|
Merge pull request #6127 from KanchanChauhan/demo-fixes-salary
Demo updated for new salary structure
|
2016-08-22 15:22:41 +05:30 |
|
Neil Trini Lasrado
|
20b01873ab
|
Made operation mandatory and removed mandatory from operation desc in Production Order Operation, set operation name as desc in operation master if desc is blank
|
2016-08-22 15:05:50 +05:30 |
|
Rushabh Mehta
|
114cb9f1dc
|
Merge pull request #6145 from netchampfaris/help-feature
Added help links
|
2016-08-22 15:02:59 +05:30 |
|
Nabin Hait
|
43accf4c07
|
Merge pull request #6144 from nabinhait/timesheet_patch_fix
Ignore validating mandatory fields on converting timelogs to timesheets
|
2016-08-22 14:39:01 +05:30 |
|
Faris Ansari
|
3a6155b1b9
|
add help_links.js
|
2016-08-22 14:37:22 +05:30 |
|
Nabin Hait
|
64e0d16e6d
|
Merge pull request #6141 from frappe/revert-6140-timesheet_patch_fix
Revert "Ignore validating mandatory fields on converting timelogs to timesheets"
|
2016-08-22 14:36:55 +05:30 |
|
Nabin Hait
|
5c9a2b39bc
|
Revert "Ignore validating mandatory fields on converting timelogs to timesheets"
|
2016-08-22 14:36:33 +05:30 |
|
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 |
|
pawan
|
851e05672c
|
[fix] #6089
|
2016-08-22 14:25:17 +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 |
|
Rohit Waghchaure
|
26b646f8a3
|
Added validation for fiscal year
|
2016-08-21 17:14:12 +05:30 |
|
Kanchan Chauhan
|
db197d593a
|
Demo updated for new salary structure
|
2016-08-20 00:30:59 +05:30 |
|
Rohit Waghchaure
|
713e2b7b62
|
[POS] Fixed issue of paid amount, write off account
|
2016-08-19 19:27:16 +05:30 |
|
Rohit Waghchaure
|
4275c30059
|
[Enhancement] Multi year financial statements
|
2016-08-19 18:04:32 +05:30 |
|
Nabin Hait
|
3b6dc141c6
|
[fix] Repost only distinct purchase receipts and invoices
|
2016-08-19 16:39:50 +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 |
|
Ben Cornwell-Mott
|
a7c98ba0fe
|
More formatting adjustments
|
2016-08-17 05:56:00 -07:00 |
|
Ben Cornwell-Mott
|
d5a9d475e7
|
Adjusted formatting
|
2016-08-17 05:45:43 -07:00 |
|
Ben Cornwell-Mott
|
06bfecea73
|
Fixed formatting of code and repositioned checkboxes in PPT.
|
2016-08-17 05:42:25 -07:00 |
|
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 |
|