fac0c05a46
Hide private messages on start page.
2009-04-20 13:54:39 +02:00
b1f16d5342
Calculate total prices correctly. ( Closes #6 )
2009-04-18 18:08:33 +02:00
e32e97d178
Added "ordergroups" view to list the ordergroups
...
* You can search in the name.
* You can show only active order groups (order in last 3 months)
* Future feature: generate text and pdf files for the box
labels
2009-04-18 15:39:07 +02:00
e95cdad5ec
Added ordergroups view to foodcoop namespace.
...
* For now just a searchable list. Nothing more.
2009-04-18 15:39:07 +02:00
c6187ebade
Fixed bug in password reset feature.
...
* Translated messages
* Cleaned up some code
2009-04-17 12:06:36 +02:00
394b4b161f
Merge branch 'master' of git://github.com/bennibu/foodsoft
2009-04-07 18:23:44 +02:00
582e4b1c1b
Beautified navigation on top of page.
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-07 18:08:36 +08:00
00696c0e64
Replaced account balance by available funds on start page.
...
* Closes #206
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-07 18:08:35 +08:00
e3f9df0a0c
Replaced account_balance by available_funds in ordergroup view.
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-07 18:08:33 +08:00
1e011256e9
Remove all non-digits before sorting by order number in finance/balancing
...
* Since order_number is a string, there can be more than a-zA-Z + digits
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-07 18:08:30 +08:00
15cec5b8f9
Merge branch 'master' of git://github.com/bennibu/foodsoft
2009-04-06 19:36:44 +02:00
36f9bffdb8
Allow input of decimal numbers for GroupOrderArticle-result.
2009-04-05 15:23:21 +02:00
40886b71f9
Fixed Bug in balancing controller when adding an ordergroup-result.
2009-04-05 14:59:55 +02:00
d62d45e4a4
Hide zero results in matrix pdf.
2009-04-03 23:32:24 +02:00
de1aa2ac38
Headers and table improvements for matrix pdf. Fixed #204
2009-04-03 19:20:16 +02:00
578002501b
Hide ordergroups with result = 0.
2009-04-03 18:01:19 +02:00
30aa04b710
Made sort by order_number balancing view work.
2009-04-03 17:50:17 +02:00
596f5657bc
Fixed remote and non-remote link mixtures bug.
2009-04-03 17:35:00 +02:00
8fb4334610
Modified sort_link helper method to allo non ajax links.
2009-04-03 17:16:39 +02:00
c9931b0e4e
Merge branch 'master' of git://github.com/bennibu/foodsoft
2009-04-03 16:18:41 +02:00
45c7e29ebb
Added field description to tooltip
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-03 22:14:51 +08:00
8c1bf93809
Translated "Sort by this field" tooltip
...
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-03 22:14:50 +08:00
5a7fe17437
Make list of ordered articles sortable in _edit_results_by_articles
...
* For the moment you can sort by article name and order number
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-03 22:14:48 +08:00
2db8aec0e5
Improved warning message when finishing an order.
...
* Hope this makes unwanted ending of an order like last week less
possible.
* Finally Closes #159
Signed-off-by: bennibu <benni@dresdener27.de>
2009-04-03 22:14:46 +08:00
f450070dbf
First steps for an own wiki.
...
* Scaffold for Page Objekt
* Using textile for rendering html
* Easy wiki-links with [[wikipage]]
2009-03-25 19:54:04 +01:00
1ec3c08157
Merge branch 'master' of git://github.com/bennibu/foodsoft
2009-03-24 21:55:26 +01:00
7e0d65a413
Updated Error Pages. Added page for maintenance.
2009-03-24 17:57:34 +01:00
412d145c83
Removed ensureUTF8 filter. It's no longer required.
2009-03-24 17:32:56 +01:00
ffc3adf907
Second (last) part of multiple foodcoop installation.
...
* When before_filter select_foodcoop is activated,
the database and configs will be loaded on each request.
* Replaced APP_CONFIG with new Foodsoft.config method.
2009-03-24 17:25:33 +01:00
1c24127928
First part of multiple foodcoop installation.
2009-03-24 17:01:10 +01:00
3309248865
Removed restriction on create for invoices with the same delivery date.
2009-03-24 10:45:41 +01:00
3a8de36ca6
Merge branch 'master' of git://github.com/bennibu/foodsoft
2009-03-23 23:58:10 +01:00
37199bae1d
Implemented pagination for messages overview.
2009-03-23 11:31:36 +01:00
759217763e
Added pagination to task archiv.
2009-03-23 11:23:41 +01:00
f018db5b15
Translated tasks/workgroup page.
2009-03-23 11:08:56 +01:00
549c03f223
Updated workgroups page.
...
* Make use of render :collection helper.
* Translated some links.
2009-03-23 10:57:41 +01:00
1772e8840c
Translated pagination links.
2009-03-23 10:47:42 +01:00
51f9826ea6
Merge branch 'master' of git://github.com/sandoz/foodsoft
2009-03-23 10:40:03 +01:00
48b6515c08
Genderchanged string 'Lieferant'
...
* Since s.b. started this already. I changed every string 'Lieferant' to
'Lieferantin' to give note on female existance in this world :-)
2009-03-22 15:04:29 +01:00
7c6a01b0fc
Genderneutralization in stockit/index.html.haml
...
* Genderneutralized string 'Lieferant'
2009-03-22 15:04:29 +01:00
1c62bf8786
Genderneutralized/Fixed strings in suppliers/index.haml
...
* Genderneutralized 'Lieferanten'
* Fixed string 'ArtikelDatenbank'
* Fixed string 'KundenNr'
2009-03-22 15:04:28 +01:00
a4900bf8e0
Translation/Genderneutralization in admin/index.html.haml
...
* Translated 'Nick' to 'Benutzername'
* Genderneutralized 'Neueste Benutzer'
* Genderneutralized '...Gruppen und Benutzer...'
* Changed 'Name' to 'Gruppenname' in section 'Neueste Gruppen'
2009-03-22 15:04:28 +01:00
de105bea70
SASS: Changed padding of input, textacrea, select
...
* At membership list, the layout was slightly broken by the top-padding
* of an input-element after a div with a float:left.
2009-03-22 15:03:50 +01:00
8cdcb10c69
Translation in foodcoop/members.html.haml
...
* Renamed "Sort by Ordergroups :"
* Removed whitespace before ':'
* Improved German Grammar. Hope you agree :-)
2009-03-22 14:16:53 +01:00
8171d3d173
Translation in foodcoop/_users.html.haml
...
* Transalated 'Nick' to 'Benutzername'
2009-03-22 14:16:53 +01:00
fea8c0993b
Translation in profile.html.erb
...
* Translated "cancal membership" and warning.
2009-03-22 14:16:53 +01:00
8d4acac081
Removed string "Benutzername: in home/profile.html.erb
...
* I think it doubles it self to have the same string again on the next
line. Hope you find it more beautiful too :-)
2009-03-22 14:16:52 +01:00
584431d00a
Translations in shared/_user_form.rhtml
...
* Added German text in order not to user default text.
2009-03-22 14:16:52 +01:00
ceec784e62
Translation in profile.html.erb
...
* Renamed "Nickname" to "Benutzername"
* Removed also '#' in end of line.
2009-03-22 14:16:52 +01:00
92e2bdd187
Renamed 'Help' to 'Hilfe' in top loginInfo bar
2009-03-22 14:16:52 +01:00
Benjamin Meichsner
sandoz