Commit graph

5815 commits

Author SHA1 Message Date
Rushabh Mehta
eebc83c05b [minor] [fix] appframe, back arrow fix 2014-07-25 13:01:50 +05:30
Rushabh Mehta
68cab5070a separated macros 2014-07-25 13:01:50 +05:30
Rushabh Mehta
70f84020d2 updates to print 2014-07-25 13:01:49 +05:30
Rushabh Mehta
8c52bf16aa added waning and cleaned up appframe css 2014-07-25 13:01:48 +05:30
Rushabh Mehta
8f022029a8 added print settings print style fixes etc. 2014-07-25 13:01:47 +05:30
Rushabh Mehta
2aa0e3d1b6 cleaned up print (js) and added print settings 2014-07-25 13:01:47 +05:30
Rushabh Mehta
1c101a6805 added more updates to new print formats 2014-07-25 13:01:47 +05:30
Rushabh Mehta
b0b5d85443 started print format redesign 2014-07-25 13:01:46 +05:30
Nabin Hait
7cafa2952f Merge pull request #715 from anandpdoshi/anand-july-22
Query Report: tree view, filter and formatter
2014-07-25 11:23:13 +05:30
Anand Doshi
6319485dc6 Merge pull request #717 from jevonearth/develop
Add the /g global flag, so all occourances of the '#' get replaced with ...
2014-07-25 11:13:56 +05:30
Jev Björsell
4e2e3569ad Fix replace() call by removing single quotes and adding leading slash. 2014-07-24 13:05:59 -07:00
Anand Doshi
0d5cd8b55d Merge pull request #720 from nabinhait/develop
Search fields for property setter fixed
2014-07-24 18:58:51 +05:30
nabinhait
15e24daf6f Search fields for property setter fixed 2014-07-24 11:36:49 +05:30
Jev Björsell
e26f79237c Add the /g global flag, so all occourances of the '#' get replaced with the encoded %23' value. Closes #1961 2014-07-23 09:54:11 -07:00
Rushabh Mehta
483e33002f [request] [minor] added silent option fixes #711 2014-07-23 14:31:50 +05:30
Rushabh Mehta
456207c44c [request] [minor] added silent option fixes #711 2014-07-23 14:30:02 +05:30
Anand Doshi
b31dfb4da7 Query Report: tree view, filter and formatter 2014-07-22 18:35:06 +05:30
Rushabh Mehta
803cf51bed Merge pull request #714 from rmehta/web-page-update
[templates] [web page] made static page dynamic via jinja
2014-07-22 17:01:09 +05:30
Rushabh Mehta
f7a75fb2c5 [templates] [web page] made static page dynamic via jinja 2014-07-22 17:00:01 +05:30
Rushabh Mehta
a65e19b506 Merge pull request #709 from anandpdoshi/anand-july-21
[fix] get_url_to_form should be relative. URLs are expanded to during email sending.
2014-07-22 09:59:08 +05:30
Rushabh Mehta
2364f1e579 Merge pull request #708 from anandpdoshi/notification-count-deadlock-fix
Clear notifications where necessary, and not during clear_cache
2014-07-22 09:56:14 +05:30
Anand Doshi
a02e5c810d [fix] get_url_to_form should be relative. URLs are expanded to during email sending. 2014-07-21 18:34:32 +05:30
Anand Doshi
3ef6793248 Clear notifications where necessary, and not during clear_cache 2014-07-21 17:35:33 +05:30
Anand Doshi
08425fd690 Merge pull request #705 from anandpdoshi/anand-reports
Babel and Query Reports
2014-07-21 12:08:16 +05:30
Anand Doshi
2c9f2edd21 Changed localize_date to formatdate 2014-07-21 12:02:56 +05:30
Anand Doshi
15fd8e7990 Fixed duplicate print buttons 2014-07-21 11:42:48 +05:30
Anand Doshi
b520567d01 Can use {% include 'path' %} to embed common print template for reports 2014-07-21 11:42:48 +05:30
Anand Doshi
7d9bd54915 Minor fix in query report 2014-07-21 11:42:47 +05:30
Anand Doshi
6ae8e26c5a Query Report: Load Print Format if specified in report's python module 2014-07-21 11:42:47 +05:30
Anand Doshi
f635f9aecc localize_date using babel 2014-07-21 11:42:46 +05:30
Anand Doshi
d6af832216 Added babel, allow script report columns and data as a list of dict 2014-07-21 11:42:46 +05:30
Rushabh Mehta
948f3672a4 Merge pull request #707 from pdvyas/attachment-url-hash
Escape hash in attachment url, fix frappe/erpnext#1961
2014-07-21 09:56:02 +05:30
Pratik Vyas
b878bb42e6 Escape hash in attachment url, fix frappe/erpnext#1961 2014-07-20 19:41:46 +05:30
Rushabh Mehta
4d6fd109bc Merge pull request #706 from anandpdoshi/anand-appframe-form
Show labels in appframe form
2014-07-19 21:09:47 +05:30
Anand Doshi
5e15bb94f0 Show labels in appframe form 2014-07-18 18:57:46 +05:30
Rushabh Mehta
804e35ec11 Merge pull request #704 from anandpdoshi/anand-july-18
Fixes in error throwing and reporting
2014-07-18 14:56:28 +05:30
Anand Doshi
49b4f7d9b0 Correct way to throw error in frappe.throw 2014-07-18 11:06:24 +05:30
Anand Doshi
7412e079d9 Error Reporting: Box for additional info, also send Route 2014-07-18 11:06:09 +05:30
Anand Doshi
399c0fc127 Merge pull request #703 from anandpdoshi/anand-july-17
changed self.delete to self.delete_key in base_document and document
2014-07-17 19:38:54 +05:30
Anand Doshi
92fd37bb1a changed self.delete to self.delete_key in base_document and document
DocPerm has a field called 'delete'. This clashes with the function name.
Leads to this error:
self.delete("__in_insert")
TypeError: 'int' object is not callable
2014-07-17 19:27:58 +05:30
Rushabh Mehta
9e1d6d38ad Merge pull request #702 from anandpdoshi/anand-july-17
Data Import and Outgoing Email Settings
2014-07-17 12:51:38 +05:30
Anand Doshi
786098e96b Minor fix in data import 2014-07-17 12:20:03 +05:30
Anand Doshi
2b9cf8d430 Validate auto_email_id 2014-07-17 12:19:33 +05:30
Anand Doshi
0b6d17ecd5 Merge pull request #700 from pdvyas/hotfix-email-filename
fix wrong filename in email attachment, frappe/erpnext#1947
2014-07-17 07:16:16 +05:30
Pratik Vyas
eb6a2cf42f fix wrong filename in email attachment, frappe/erpnext#1947 2014-07-16 23:45:16 +05:30
Nabin Hait
fbbf5beef0 Merge pull request #699 from anandpdoshi/anand-july-16
Fixed doctype boilerplate and communication permissions
2014-07-16 20:04:29 +05:30
Anand Doshi
0b84411c41 Fixed doctype boilerplate and communication permissions 2014-07-16 19:29:33 +05:30
Anand Doshi
c20be0a171 Merge pull request #698 from anandpdoshi/anand-july-16
Naming: Name cannot be same as DocType if not single
2014-07-16 17:56:12 +05:30
Anand Doshi
2b7519213e Fixed test case 2014-07-16 16:24:21 +05:30
Anand Doshi
9974363312 Fixed _fix_numeric_types 2014-07-16 16:07:39 +05:30