Rushabh Mehta
1210dda852
Merge pull request #1779 from wenzhixue/patch-1
...
fix bug for "duplicate key name" when db init
2016-06-07 10:55:21 +05:30
Rushabh Mehta
4db3e3ff52
Merge pull request #1782 from neilLasrado/develop
...
Fixed issue in link field
2016-06-06 20:48:15 +05:30
Neil Trini Lasrado
39bc69b0af
Fixed issue in link field
2016-06-06 18:55:03 +05:30
Anand Doshi
c7e551809b
[fix] socketio request.query
2016-06-06 15:43:01 +05:30
Rushabh Mehta
84fbd57b8e
[minor] new-app title by default
2016-06-06 09:34:12 +05:30
Rushabh Mehta
ce884882a2
[minor] fixes #1780
2016-06-06 09:18:49 +05:30
Rushabh Mehta
4550b16053
Merge pull request #1778 from strixaluco/develop
...
Update bench-commands-cheatsheet.md
2016-06-03 16:58:34 +05:30
Rushabh Mehta
c5be48802b
[fix] route for customize from list
2016-06-03 16:03:35 +05:30
Rushabh Mehta
4548cfbaa0
[minor] link-control to open in a new tab
2016-06-03 16:01:13 +05:30
Rushabh Mehta
b6214715e5
[ux] email alert - show tasks for today, fix for multiple address selection in email, fixes frappe/erpnext#5436
2016-06-03 15:57:18 +05:30
Rushabh Mehta
b22106b513
[fix] fixes #5437
2016-06-03 15:00:28 +05:30
Nick
e1bded65a2
fix bug for "duplicate key name" when db init
...
During the first init process for creating tables, if one field marked True for both "unique" and "search_index" , table creation will be failed.
for example :
create table `tabItem Barcode` (
name varchar(140) not null primary key,
creation datetime(6),
modified datetime(6),
modified_by varchar(140),
owner varchar(140),
docstatus int(1) not null default '0',
parent varchar(140),
parentfield varchar(140),
parenttype varchar(140),
idx int(8) not null default '0',
`item_barcode` varchar(140) unique,
`sku_id` varchar(140),
`unit_qty` varchar(140),
`_comments` text,
`_assign` text,
`_liked_by` text,
`store` varchar(140),
`retail_price` varchar(140),
`_user_tags` text,
`uom` varchar(140),
index `item_barcode`(`item_barcode`),
index parent(parent))
ENGINE=InnoDB
ROW_FORMAT=COMPRESSED
CHARACTER SET=utf8mb4
COLLATE=utf8mb4_unicode_ci
2016-06-03 16:34:28 +08:00
Nabin Hait
78f6282925
Merge branch 'master' into develop
2016-06-03 11:49:00 +05:30
Nabin Hait
7899fc9f6e
Merge branch 'hotfix'
2016-06-03 11:49:00 +05:30
Nabin Hait
6704fef89d
bumped to version 6.27.21
2016-06-03 12:19:00 +06:00
strixaluco
376a87ed46
Update bench-commands-cheatsheet.md
...
Backup and restore commands added
2016-06-03 14:09:14 +08:00
Rushabh Mehta
746ef26218
Merge pull request #1777 from mbauskar/develop
...
[minor-fix] replaced frm.call with frappe.call
2016-06-03 06:37:21 +05:30
mbauskar
c45f812ed6
[minor-fix] replaced frm.call with frappe.call
2016-06-02 19:18:58 +05:30
Rushabh Mehta
09de5b543e
[minor] added Serbian Dinar, fixes frappe/erpnext#5311 ;
2016-06-02 16:40:15 +05:30
Rushabh Mehta
2fc24df599
[fix] [grid] refresh_field
2016-06-02 16:33:22 +05:30
Rushabh Mehta
1e9bdec22d
[minor] separted js files into smaller chunks
2016-06-02 16:24:27 +05:30
Rushabh Mehta
9f9096dd33
[fix] grid refresh
2016-06-02 15:51:37 +05:30
Rushabh Mehta
592389570a
[fix] [minor] chart section hidden initially
2016-06-02 12:38:48 +05:30
Rushabh Mehta
ca2ca046c6
[fix] create new
2016-06-01 15:46:41 +05:30
Rushabh Mehta
c2e2919bbe
[fix] refresh grid after re-render
2016-06-01 14:51:55 +05:30
Rushabh Mehta
34c46335db
[minor] trigger primary action on save
2016-06-01 13:23:16 +05:30
Rushabh Mehta
dcf85cd4ce
Merge pull request #1776 from nabinhait/develop
...
[fix] Naming of docs
2016-06-01 12:56:50 +05:30
Nabin Hait
19dd64eb25
[fix] Naming of docs
2016-06-01 12:53:53 +05:30
Rushabh Mehta
5c16b294ae
[fix] new_doc
2016-06-01 12:40:35 +05:30
Nabin Hait
927be36eb0
Update country_info.json
2016-06-01 12:06:55 +05:30
Rushabh Mehta
e125357245
[fix] frappe.new_doc and with_mandatory_children
2016-06-01 11:45:12 +05:30
Nabin Hait
ae836ddc69
Merge pull request #1775 from shreyasp/issue/report-builder
...
[Fix] Disallow users from editing a standard report
2016-06-01 11:21:36 +05:30
Rushabh Mehta
d613820f82
[fix] [bug] grid-reorder
2016-06-01 07:01:41 +05:30
Rushabh Mehta
b33ab3ac75
Merge pull request #1770 from saurabh6790/ignore_ifnull_in_database_query
...
[fixes] AttributeError: 'DatabaseQuery' object has no attribute 'ignore_ifnull'
2016-06-01 06:56:37 +05:30
Rushabh Mehta
fd07b73a67
[fix] list_settings
2016-06-01 06:41:34 +05:30
Rushabh Mehta
fe6de7981d
Merge pull request #1774 from rmehta/list-settings
...
List Settings: Save user filters across sessions and list/report views
2016-05-31 18:28:01 +05:30
Rushabh Mehta
a5899a0d0c
[list-settings] save in redis, db, save filters while switching views and patch
2016-05-31 18:30:25 +05:30
shreyas
c7ede7e985
[Fix] Disallow users from editing a standard report
2016-05-31 18:21:55 +05:30
Rushabh Mehta
74919b99a0
[enhancement] remember list settings - sort, filters, paging
2016-05-30 18:19:47 +05:30
Rushabh Mehta
f97654a7c7
[grid] ux fixes and fixes for frappe/erpnext#5376
2016-05-30 15:44:42 +05:30
Nabin Hait
947505f608
[fix] query report if no chart data
2016-05-30 11:07:50 +05:30
Rushabh Mehta
d235f159bb
[minor] ignore_csrf in site_config and to check for autoname in hooks even if not autoname is present
2016-05-29 23:06:51 +05:30
Rushabh Mehta
6824df7ac9
[cleanup] rename functions in website and router for cleaner meaning
2016-05-29 14:25:49 +05:30
Saurabh
562dbc97dc
[fixes] AttributeError: 'DatabaseQuery' object has no attribute 'ignore_ifnull'
2016-05-27 17:30:24 +05:30
Nabin Hait
24839f8ce3
Merge pull request #1769 from nabinhait/chart-fix
...
Charts using rows data
2016-05-27 12:35:01 +05:30
Nabin Hait
3a17a69988
Charts using rows data
2016-05-27 12:20:34 +05:30
Anand Doshi
f57ad0dae4
[optimization] bulk flush index
2016-05-26 16:22:02 +05:30
Rushabh Mehta
fd46206abe
Merge pull request #1768 from nabinhait/report-graph
...
Charts on reports / activity page, deprecated flot library
2016-05-26 16:15:34 +05:30
Nabin Hait
aacad14890
Merge branch 'hotfix'
2016-05-26 15:41:49 +05:30
Nabin Hait
caa608fafa
Merge branch 'master' into develop
2016-05-26 15:41:49 +05:30
