Revant Nandgaonkar
|
cc8fb1a8d6
|
changed path to login
frappe.templates.pages.login.login_via_google changed to frappe.www.login.login_via_google
|
2016-07-28 19:50:15 +05:30 |
|
Nabin Hait
|
1892520324
|
Merge branch 'develop'
|
2016-07-28 18:26:23 +05:30 |
|
Nabin Hait
|
3bf486c5c6
|
bumped to version 7.0.10
|
2016-07-28 18:56:23 +06:00 |
|
Nabin Hait
|
6b8024a834
|
Merge pull request #5909 from nabinhait/fix_113
[fix] Show supplier name field if it is different from supplier id
|
2016-07-28 17:52:02 +05:30 |
|
Nabin Hait
|
33b10a0405
|
Merge pull request #5908 from nabinhait/pe_precision_fix
Set difference amount in Payment Entry as per field precision
|
2016-07-28 17:51:57 +05:30 |
|
Nabin Hait
|
7bae70a993
|
[fix] Show supplier name field if it is different from supplier id
|
2016-07-28 17:19:35 +05:30 |
|
Nabin Hait
|
e7d0639edc
|
Set difference amount in Payment Entry as per field precision
|
2016-07-28 16:56:59 +05:30 |
|
Nabin Hait
|
0d5e208f8c
|
Merge branch 'develop'
|
2016-07-28 16:01:00 +05:30 |
|
Nabin Hait
|
a163299991
|
bumped to version 7.0.9
|
2016-07-28 16:31:00 +06:00 |
|
Nabin Hait
|
acff41ddd2
|
Merge pull request #5906 from nabinhait/opportunity_status_fix
Added converted status in Opportunity
|
2016-07-28 15:59:43 +05:30 |
|
Nabin Hait
|
e72ff9377a
|
Added converted status in Opportunity
|
2016-07-28 15:59:20 +05:30 |
|
Nabin Hait
|
a948407460
|
Merge branch 'develop'
|
2016-07-28 15:46:36 +05:30 |
|
Nabin Hait
|
ee70f26131
|
bumped to version 7.0.8
|
2016-07-28 16:16:35 +06:00 |
|
Rushabh Mehta
|
142b6187b3
|
Merge pull request #5902 from akshay83/develop
[fix] serial no button
|
2016-07-28 15:05:04 +05:30 |
|
akshay
|
14384c2787
|
[fix] serial no button
|
2016-07-28 13:53:17 +05:30 |
|
Nabin Hait
|
7357902802
|
Merge pull request #5896 from nabinhait/fix_112
[fix] repost gle only if there is any stock account without warehouse
|
2016-07-27 17:34:23 +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
|
95f53cca44
|
Merge pull request #5885 from nabinhait/payment_entry_fix12
[fix] Set amounts only if party and bank account exists
|
2016-07-27 16:45:20 +05:30 |
|
Nabin Hait
|
949ceb18fc
|
Merge pull request #5894 from nabinhait/sle_fix_101
minor fix for stock ledger entry
|
2016-07-27 16:44:54 +05:30 |
|
Nabin Hait
|
7590b8fff1
|
minor fix for stock ledger entry
|
2016-07-27 16:44:26 +05:30 |
|
Rushabh Mehta
|
5a8b7ca7be
|
Merge pull request #5888 from neilLasrado/develop
[Patch] Change status in Opportunity to Quotation where status is converted
|
2016-07-27 16:03:21 +05:30 |
|
Neil Trini Lasrado
|
98151ce5b2
|
[Patch] Change status in Opportunity to Quotation where status is converted
|
2016-07-27 15:58:16 +05:30 |
|
Rushabh Mehta
|
380dbb044f
|
Merge pull request #5886 from neilLasrado/develop
[Fix] Fixed issues in Fee records
|
2016-07-27 15:32:26 +05:30 |
|
Neil Trini Lasrado
|
ee75d41da0
|
[Fix] Fixed issues in Fee records
|
2016-07-27 15:23:19 +05:30 |
|
Rushabh Mehta
|
e26a42dc7a
|
Merge branch 'develop'
|
2016-07-27 15:19:58 +05:30 |
|
Rushabh Mehta
|
b2c9848886
|
bumped to version 7.0.7
|
2016-07-27 15:49:58 +06:00 |
|
Nabin Hait
|
b4bf757a15
|
Update fix_nonwarehouse_ledger_gl_entries_for_transactions.py
|
2016-07-27 15:19:12 +05:30 |
|
Rushabh Mehta
|
fc49c2c5f9
|
Merge branch 'develop'
|
2016-07-27 15:09:03 +05:30 |
|
Rushabh Mehta
|
384f0b18c0
|
bumped to version 7.0.6
|
2016-07-27 15:39:03 +06:00 |
|
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 |
|