Nabin Hait
|
2a2346422d
|
[fix] Set amounts only if party and bank account exists
|
2016-07-27 13:08:00 +05:30 |
|
Rushabh Mehta
|
548ea777a9
|
Merge pull request #5883 from saurabh6790/maintenance_schedule_fix
[fix] report filter fix
|
2016-07-27 12:43:41 +05:30 |
|
Nabin Hait
|
67047fbb06
|
Merge branch 'rohitwaghchaure-warehouse_blank_issue_for_non_stock_account' into develop
|
2016-07-27 12:43:25 +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 |
|
Rushabh Mehta
|
2af5dfa9cc
|
Merge pull request #5884 from saurabh6790/schools_fix
[minor][fix] rename attribute from amount to components
|
2016-07-27 12:23:22 +05:30 |
|
Saurabh
|
4bc0f7d105
|
[minor][fix] rename attribute from amount to components
|
2016-07-27 12:10:21 +05:30 |
|
Saurabh
|
3642f987c7
|
[fix] report filter fix
|
2016-07-27 11:42:50 +05:30 |
|
Ben Cornwell-Mott
|
07e5758a94
|
Timesheets update on date changes in Salary Slip
|
2016-07-26 21:00:43 -07:00 |
|
Ben Cornwell-Mott
|
e326ae95ef
|
Fixed typo
|
2016-07-26 19:55:09 -07:00 |
|
bcornwellmott
|
5f59a0a00f
|
Corrected SQL query
|
2016-07-28 06:56:20 -07:00 |
|
Rushabh Mehta
|
fd288f36ec
|
Merge pull request #5880 from bcornwellmott/fixSalarySlip_TimeSheet_SQL
Added date filters for the Timesheet query in Salary Slip
|
2016-07-27 08:22:29 +05:30 |
|
Ben Cornwell-Mott
|
19cb34ce40
|
removed test variable
|
2016-07-26 13:48:36 -07:00 |
|
Ben Cornwell-Mott
|
5342ec5055
|
Added employee name to get_employee_list query
|
2016-07-26 13:47:55 -07:00 |
|
Rushabh Mehta
|
593d2e3146
|
Merge pull request #5877 from rohitwaghchaure/v7_fixes
[minor] Fixes
|
2016-07-26 21:21:45 +05:30 |
|
Rohit Waghchaure
|
c4afd63e50
|
[minor] Fixes
|
2016-07-26 20:47:42 +05:30 |
|
Rushabh Mehta
|
6fe4a336f1
|
Merge branch 'develop'
|
2016-07-26 18:02:38 +05:30 |
|
Rushabh Mehta
|
154be9b693
|
bumped to version 7.0.5
|
2016-07-26 18:32:38 +06:00 |
|
Rushabh Mehta
|
d46235ed83
|
Merge pull request #5874 from saurabh6790/maintenance_schedule_fix
[minor][fix] end date should not be less or equal to start date
|
2016-07-26 17:44:42 +05:30 |
|
Saurabh
|
17a9940f00
|
[minor][fix] end date should not be less or equal to start date
|
2016-07-26 17:18:45 +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 |
|
Ben Cornwell-Mott
|
d4d1f1b036
|
Added date filters for the Timesheet query in Salary Slip
|
2016-07-26 03:33:38 -07:00 |
|
Rushabh Mehta
|
9b542f303c
|
Merge pull request #5870 from saurabh6790/fee_component_patch_fix
[fix] fee component rename patch fix
|
2016-07-26 15:06:56 +05:30 |
|
Saurabh
|
21a5658fdf
|
[fix] fee component rename patch fix
|
2016-07-26 15:03:41 +05:30 |
|
Rushabh Mehta
|
0540d52449
|
Merge pull request #5868 from rohitwaghchaure/patch_issue
[Fix] Timesheet patch
|
2016-07-26 12:59:00 +05:30 |
|
Rohit Waghchaure
|
8a9daece7e
|
[Fix] Timesheet patch
|
2016-07-26 12:57:05 +05:30 |
|
Rushabh Mehta
|
c85aa3d9c5
|
Merge branch 'develop'
|
2016-07-26 09:24:00 +05:30 |
|
Rushabh Mehta
|
5662ad6d96
|
bumped to version 7.0.4
|
2016-07-26 09:54:00 +06:00 |
|
Rushabh Mehta
|
859843687e
|
[minor] add abbr if missing
|
2016-07-26 08:23:32 +05:30 |
|
Rushabh Mehta
|
40cf3db0b1
|
Merge pull request #5865 from rohitwaghchaure/v7_fixes_and_cleanup
[mionr] fixes and cleanups
|
2016-07-26 07:58:03 +05:30 |
|
Ben Cornwell-Mott
|
590d2d524b
|
Updated html file to use c3.js instead of Google Charts
|
2016-07-25 18:03:01 -07:00 |
|
Rohit Waghchaure
|
26cf01aaba
|
[mionr] fixes and cleanups
|
2016-07-26 00:30:25 +05:30 |
|
Rushabh Mehta
|
eac602304c
|
Merge pull request #5864 from neilLasrado/rename
[rename] Renamed Fee Amount to Fee Component
|
2016-07-25 18:37:09 +05:30 |
|
Neil Trini Lasrado
|
ce1c63f776
|
[rename] Renamed Fee Amount to Fee Component
|
2016-07-25 18:24:37 +05:30 |
|
Rushabh Mehta
|
95b550dd8f
|
Merge pull request #5862 from neilLasrado/rename
Renamed sg_creation_tool_course to Student Group Creation Tool Course
|
2016-07-25 16:21:32 +05:30 |
|
Rushabh Mehta
|
bb78f1ac16
|
Merge pull request #5861 from neilLasrado/develop
[Fix] fixed test cases for schools
|
2016-07-25 16:21:18 +05:30 |
|
Neil Trini Lasrado
|
feea2e3dec
|
[Doctype Rename] Renamed sg_creation_tool_course to Student Group Creation Tool Course
|
2016-07-25 16:13:05 +05:30 |
|
Neil Trini Lasrado
|
7dae3e1ed4
|
[Fix] fixed test cases for schools
|
2016-07-25 15:55:31 +05:30 |
|
Rushabh Mehta
|
5658fdfaed
|
Merge branch 'develop'
|
2016-07-25 15:45:46 +05:30 |
|
Rushabh Mehta
|
1c93dd0591
|
bumped to version 7.0.3
|
2016-07-25 16:15:46 +06:00 |
|
Rushabh Mehta
|
c910e0c614
|
[translations] update icenlandic
|
2016-07-25 15:03:39 +05:30 |
|
Rushabh Mehta
|
6c3ac9587e
|
[fix] quick entry
|
2016-07-25 15:03:39 +05:30 |
|
Rushabh Mehta
|
316f78f859
|
Merge pull request #5858 from bohlian/develop
[Fixed] Stopping and Re-Opening of Production Order
|
2016-07-25 14:24:16 +05:30 |
|
Javier Wong
|
5b2af6ad40
|
[Fixed] Stopping and Re-Opening of Production Order
|
2016-07-25 16:49:39 +08:00 |
|
Rushabh Mehta
|
00f7741288
|
Merge branch 'develop'
|
2016-07-25 12:58:03 +05:30 |
|
Rushabh Mehta
|
3f8428e972
|
bumped to version 7.0.2
|
2016-07-25 13:28:03 +06:00 |
|
Rushabh Mehta
|
644a04b378
|
[fix] translations v7.0
|
2016-07-25 12:15:30 +05:30 |
|
Rushabh Mehta
|
c9478fc4f1
|
[minor] setup website before domainify
|
2016-07-25 12:09:21 +05:30 |
|
Rushabh Mehta
|
7b13c11182
|
Merge pull request #5857 from neilLasrado/perm
Removed Administrator role from Doctypes
|
2016-07-25 11:46:50 +05:30 |
|
Neil Trini Lasrado
|
d69d961f2a
|
Removed Administrator role from Doctypes
|
2016-07-25 11:39:23 +05:30 |
|