Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,147 Commits 3 Branches 0 Tags 1 GiB
380d7c6a53
Commit Graph

315 Commits

Author SHA1 Message Date
Anand Doshi
bd59c461bc removed error console 2012-06-12 16:44:29 +05:30
Anand Doshi
f71d63fda0 fix in back button after save/submit 2012-06-12 15:45:44 +05:30
Rushabh Mehta
031d51b53e not in search, should be allowed in reports and loading place holder for reports 2012-06-11 10:38:47 +05:30
Rushabh Mehta
be7ce4744a website color should be black 2012-06-08 14:18:21 +05:30
Anand Doshi
fa1963164c Merge branch 'master' of github.com:webnotes/erpnext 2012-06-08 12:57:28 +05:30
Anand Doshi
cddc0e68bf Fix: Standard Print Format Heading to also consider value in 'Select 
Print Heading' field.
modified build_head method, inner method of print_std method to consider
three possibilities as print heading
1. value in cur_frm.pformat
2. value in select print heading
3. doctype / doctype label
 2012-06-08 12:34:57 +05:30
Nabin Hait
d491fc7a31 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-08 12:13:47 +05:30
Nabin Hait
2e3579a4eb Item Barcode implemented 2012-06-07 19:09:17 +05:30
Anand Doshi
4dbeae1eae escape double quotes in communication content, allow 0 as value in data/int field 2012-06-07 14:39:42 +05:30
Rushabh Mehta
a89f52041f communication is now created when email is sent 2012-06-07 11:30:02 +05:30
Anand Doshi
f36e15e92e fix in doclistview's order 2012-06-05 20:10:45 +05:30
Anand Doshi
dbb84a271e Merge branch 'master' of github.com:webnotes/erpnext into comm_log 
Conflicts:
	erpnext/selling/doctype/lead/lead.js
	erpnext/setup/doctype/contact_control/contact_control.js
 2012-06-05 18:37:17 +05:30
Rushabh Mehta
a660dd9d49 Merge branch 'master' of github.com:webnotes/erpnext 2012-06-04 13:21:03 +05:30
Rushabh Mehta
983c551796 gantt chart fixes 2012-06-04 13:20:42 +05:30
Anand Doshi
bfc52b99fd Merge branch 'master' of github.com:webnotes/erpnext 2012-06-04 13:07:03 +05:30
Anand Doshi
fdc20fdf69 fix in get_base_url of dom.js 2012-06-04 13:06:38 +05:30
Rushabh Mehta
07c94ce9c0 update in Task, notification and layout 2012-06-04 12:57:23 +05:30
Anand Doshi
c5d857896e fixes in communication doctype 2012-05-31 18:23:16 +05:30
Anand Doshi
a6708fb748 new doctype: communication 2012-05-31 14:53:55 +05:30
Rushabh Mehta
7c91e257e2 doclistview: sidebar refresh bugfix 2012-05-29 14:05:53 +05:30
Rushabh Mehta
f3c390aec3 refresh stats in doclist 2012-05-29 11:06:08 +05:30
Rushabh Mehta
92c2c8f1f6 Merge branch 'master' of github.com:webnotes/erpnext 2012-05-29 10:53:58 +05:30
Rushabh Mehta
16aea34a37 show new reports as well as old 2012-05-29 10:53:37 +05:30
Rushabh Mehta
3237d6af6f added font 'Marck Script' 2012-05-28 10:42:32 +02:00
Rushabh Mehta
e316795196 added font 'cookie' 2012-05-26 13:50:05 +02:00
Anand Doshi
822318fec7 removed font 'Satisfy' and added font 'Oleo Script' 2012-05-26 17:01:00 +05:30
Anand Doshi
6548b50f57 added font 'Satisfy' 2012-05-26 16:50:06 +05:30
Rushabh Mehta
c75877ae88 fixed fonts 2012-05-25 17:21:32 +05:30
Rushabh Mehta
e811753f70 added fontlib 2012-05-25 17:20:28 +05:30
Anand Doshi
9327bb9585 fix in tag viewing in doclistview 2012-05-23 15:12:22 +05:30
Anand Doshi
64483e6e18 fix in report builder's print function 2012-05-23 13:41:11 +05:30
Anand Doshi
2d1bd0a3f8 fix in body_div height 2012-05-23 11:20:12 +05:30
Anand Doshi
cb909d518c Merge branch 'shf_rename' 2012-05-21 18:44:19 +05:30
Anand Doshi
ba30cf1fa6 fix in reports2: do not add fieldtype 'table' in columns for slickgrid 2012-05-21 14:53:19 +05:30
Anand Doshi
1aae261490 delete button in doclistview 2012-05-21 14:31:03 +05:30
Anand Doshi
d643d367ca Merge branch 'shf_rename' 
Conflicts:
	public/js/all-app.js
	public/js/all-web.js
 2012-05-18 11:52:31 +05:30
Anand Doshi
ae4fc41e61 Merge branch 'shf_rename' 2012-05-16 14:35:15 +05:30
Anand Doshi
328cd2e868 do not refresh toolbar on set value 2012-05-16 12:21:45 +05:30
Anand Doshi
d5f8b91a49 Merge branch 'shf_rename' 2012-05-16 12:21:28 +05:30
Anand Doshi
0b721b8b96 do not track wn-web.js and wn-web.css in repositor as they are built for each implementation 2012-05-15 11:39:17 +05:30
Anand Doshi
ddc4cdd8f9 include button.js in all-web.js 2012-05-15 11:35:21 +05:30
Anand Doshi
f295591168 Merge branch 'shf_rename' 2012-05-14 18:03:45 +05:30
Rushabh Mehta
6598b6276b fixes to website settings and linking import data in setup 2012-05-14 15:02:35 +05:30
Rushabh Mehta
5997e507d9 time fix 2012-05-11 17:50:34 +05:30
Rushabh Mehta
7483ae9573 fix in button disablity leading to double click 2012-05-11 16:23:41 +05:30
Rushabh Mehta
0eb790a0ae cleaned up imports, doc 2012-05-11 15:53:37 +05:30
Rushabh Mehta
7f523ac33c merge 2012-05-10 19:11:00 +05:30
Rushabh Mehta
ea7ba72397 data import and upload issues 2012-05-10 19:07:53 +05:30
Anand Doshi
3fa25faca2 fixes after merge with cms 2012-05-10 15:15:43 +05:30
Anand Doshi
951d8ec342 fix in issues arising due to wn.require 2012-05-10 14:19:11 +05:30
Nabin Hait
a15740a974 fixed issue 2012-05-10 12:56:40 +05:30
Anand Doshi
17fb35fa4a erpnext installer 2012-05-10 12:39:25 +05:30
Rushabh Mehta
03262e0c12 report builder with links and width 2012-05-09 16:55:58 +05:30
Rushabh Mehta
078867c411 fixes to listview 2012-05-09 16:15:51 +05:30
Rushabh Mehta
e0f2df9506 cms fixes 2012-05-09 14:50:00 +05:30
Rushabh Mehta
3efd3ce475 cms fixes 2012-05-09 14:48:52 +05:30
Rushabh Mehta
8dc23e37bc fix app.html 2012-05-09 14:25:16 +05:30
Rushabh Mehta
6a47204e8a added app.html 2012-05-09 14:19:06 +05:30
Rushabh Mehta
e45042e011 merge 2012-05-09 12:22:50 +05:30
Rushabh Mehta
b9483d1809 cms updates 2012-05-09 11:42:52 +05:30
Rushabh Mehta
458ca8eddb cms fixes 2012-05-09 10:17:08 +05:30
Rushabh Mehta
a933b632ad templates cleaner and generation for all pages 2012-05-08 16:06:44 +05:30
Rushabh Mehta
5ab8163140 fixes to routing and activating web page 2012-05-08 12:58:32 +05:30
Rushabh Mehta
c22d9e03e7 Merge branch 'shf_rename' of github.com:webnotes/erpnext into cms 2012-05-08 11:02:58 +05:30
Rushabh Mehta
a920943e43 new cms with public folder 2012-05-07 18:00:57 +05:30