Commit Graph

309 Commits

Author SHA1 Message Date
Rushabh Mehta
126f2c62f2 [merge] merge with master 2013-05-24 16:09:13 +05:30
Rushabh Mehta
b394a25904 [ui] fixed #83, #103, #114, #116 and other minor ui issues, upgraded to jquery 1.9 2013-05-23 16:03:49 +05:30
Anand Doshi
aabe11b689 [sales order] [validate] validate item details specifically when submitting 2013-05-23 12:59:12 +05:30
Nabin Hait
66928243c1 [fixes] removed communication section break from quotation 2013-05-22 16:55:10 +05:30
Nabin Hait
b7e07ac6a5 [fixes] updated no_copy field 2013-05-22 12:10:16 +05:30
Rushabh Mehta
4a2f0f8c36 [js-libs] upgraded to latest bootstrap and font-awesome 2013-05-22 11:57:05 +05:30
Anand Doshi
2186e83670 [lead to customer] [fix] fix for creating customer from lead when there are restrictive permissions based on company for creating customer 2013-05-10 00:39:15 +05:30
Anand Doshi
ef06a4b349 [autoname] [cleanup] strip blank spaces and remove autoname where naming_series: can be set in doctype 2013-05-09 15:13:47 +05:30
Anand Doshi
bddd5d9b0c [rename] [fix] merge should be passed to on_rename method of controller for further processing 2013-05-09 12:45:18 +05:30
Rushabh Mehta
f514998011 merge 2013-05-09 11:42:35 +05:30
Anand Doshi
c414175a44 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-05-08 11:45:32 +05:30
Nabin Hait
620576080a [fixes][currency symbol] fieldtype in report 2013-05-07 12:03:33 +05:30
Rushabh Mehta
08332ddacd [form] [scripting] fixes and cleanups for new triggering system 2013-05-06 12:46:13 +05:30
Anand Doshi
4cea651a36 Merge branch 'master' of github.com:webnotes/erpnext into edge 2013-05-06 11:36:51 +05:30
Nabin Hait
c51c0ce3e9 [fixes] salary slip 2013-05-03 15:40:26 +05:30
Nabin Hait
9c7eb486ed [Query Report] Item-wise Sales History 2013-05-03 14:50:12 +05:30
Anand Doshi
cba730c7bd [sales common] [fix] minor fix in validation message 2013-05-03 14:47:59 +05:30
Nabin Hait
fdd919a1d3 [report] sales personwise transaction summary 2013-05-03 14:24:24 +05:30
Rushabh Mehta
d3e00995db [conflicts] [merged] 2013-05-02 16:02:59 +05:30
Rushabh Mehta
3aeed95e0a [customer/supplier] [address] extended list to 5 2013-05-02 11:39:46 +05:30
Rushabh Mehta
cc32b65b66 [toolbars] [design] commonified into common toolbar 2013-04-19 13:01:32 +05:30
Rushabh Mehta
d6c8235fb5 [style] [upgrade] moved to bootstrap 3 2013-04-18 17:43:21 +05:30
Rushabh Mehta
651ce05fcc [merge master
]
2013-04-18 10:37:16 +05:30
Anand Doshi
c6aecb3f97 Merge branch 'master' into edge
Conflicts:
	home/page/latest_updates/latest_updates.js
	hr/doctype/employee/employee.txt
2013-04-16 21:32:06 +05:30
Rushabh Mehta
f61b680576 [style] moving to 100% bootstrap css, started form / appframe headers 2013-04-16 15:45:05 +05:30
Rushabh Mehta
ac118c8822 [cleanup] started responsive layouts and removed tinymce 2013-04-15 17:02:20 +05:30
Nabin Hait
69b410a2ed fixes in sales personwise transaction summary report 2013-04-15 12:34:42 +05:30
Anand Doshi
3b2fd6e334 [sql] [fix] fixed item.py injections 2013-04-13 15:54:38 +05:30
Anand Doshi
93b638af4d Merge branch 'master' into edge
Conflicts:
	patches/patch_list.py
2013-04-10 19:47:46 +05:30
Anand Doshi
0b80883088 [lead] [permission] cleanup of permission 2013-04-10 15:28:23 +05:30
Rushabh Mehta
33075e1f69 [files] [patch] dropped file_list property and moved links to 2013-04-10 11:08:50 +05:30
Anand Doshi
6c5a37167a Merge branch 'master' into edge 2013-04-04 13:59:16 +05:30
Anand Doshi
4db3b33dd6 [customer] [fix] on_trash sql syntax 2013-04-04 13:57:35 +05:30
Rushabh Mehta
d8cf1d74ba Merge branch 'master' into edge 2013-04-03 16:39:02 +05:30
Anand Doshi
458fda8ca5 [quotation] [fix] letter head 2013-04-03 13:30:17 +05:30
Rushabh Mehta
5bbe063222 Merge branch 'master' into edge 2013-04-03 10:42:12 +05:30
Rushabh Mehta
ad16279efd [quotation] [fix
] broken links
2013-04-03 09:53:24 +05:30
Nabin Hait
8f97d2dab0 [quotation][improvement] when made from lead 2013-04-02 18:14:31 +05:30
Nabin Hait
1e3fc88940 [quotation][improvement] when made from lead 2013-04-02 18:13:20 +05:30
Anand Doshi
19acce9fa1 [aii] [patches] minor fixes 2013-03-29 20:40:23 +05:30
Nabin Hait
787c02ee42 aii fixes 2013-03-29 16:42:33 +05:30
Rushabh Mehta
265c1947e3 [form] [usability] change z-index only if in form 2013-03-26 14:16:20 +05:30
Rushabh Mehta
988bca04f2 [selling] [usability] rearranged lead 2013-03-26 13:07:49 +05:30
Rushabh Mehta
b6c117957f [fields, project] [fix] NaN bug, project gantt refresh bug 2013-03-26 13:02:22 +05:30
Nabin Hait
557d858d89 aii: patches and default values fetching 2013-03-25 18:28:16 +05:30
Nabin Hait
57916252d9 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-25 15:35:03 +05:30
Akhilesh Darjee
7e062b3352 barcode error in sales_invoice fixed. 2013-03-25 12:28:39 +05:30
Nabin Hait
690fefe9c1 Merge branch 'master' of github.com:webnotes/erpnext 2013-03-25 11:07:38 +05:30
Nabin Hait
0fc2454384 aii: patches and fine tuning 2013-03-25 11:06:00 +05:30
Rushabh Mehta
3f725308e1 [website] [number_format] [fix] moved js function & added amount to order list 2013-03-22 14:56:31 +05:30