Commit Graph

117 Commits

Author SHA1 Message Date
Benjamin Meichsner f72dccae18 Added edit invoice link to balancing sheet. Closes #8 2009-08-04 13:25:59 +02:00
Benjamin Meichsner ce375e1637 Fixed bad link in tasks/workgroups. Closes #23 2009-08-04 12:57:19 +02:00
root 68f8d00930 Fixed bug in stats on a fresh installation. 2009-08-04 12:32:25 +02:00
Benjamin Meichsner d9d800b41f Fixed bug in stats modul. Consider missing ordergroup. 2009-08-02 20:04:54 +02:00
Benjamin Meichsner 6659fe90f3 Merge branch 'stats' 2009-08-02 19:57:19 +02:00
Benjamin Meichsner 4545a5f17c Fixed wrong url during last commits. 2009-08-02 19:56:08 +02:00
Benjamin Meichsner 178fba7b30 Create restful invites controller and ajaxified the workflow. 2009-08-02 19:41:09 +02:00
Benjamin Meichsner 5cf75ee32a Moved foodcoop/members into new foodcoop/users restful controller. 2009-08-02 19:01:45 +02:00
Benjamin Meichsner 0d910dfbbd Moved foodcoop/workgroups into new namespace foodcoop. Closes #20 2009-08-02 18:42:52 +02:00
Benjamin Meichsner 1a8026c5a7 Move foodcoop/ordergroups into nwe namespace foodcoop. Made it more restful. 2009-08-02 18:12:13 +02:00
Benjamin Meichsner d848831fea Implemented stats for ordergroups on startpage. Annotated models. 2009-08-01 13:41:22 +02:00
Benjamin Meichsner d2efe64343 Fixed display bug in menu when using IE. Closes #15 2009-06-19 21:38:51 +02:00
Benjamin Meichsner 2af35e55bc Improved stockit overiew. Fixed article ordering by suppliers. 2009-05-17 16:50:13 +02:00
Benjamin Meichsner e59ce8c313 Added deliveries counter to suppliers overview. 2009-05-17 16:18:14 +02:00
Benjamin Meichsner a8e35bd421 Refactoring of delivery-workflow. Added ability to add stock_changes after creating a delivery. 2009-05-17 16:11:39 +02:00
Benjamin Meichsner c03f3da21a Added more info to delivery/show for easier comparision of invoice amount and sum of delivered items. 2009-05-15 17:58:02 +02:00
Benjamin Meichsner e8fa912e8c Removed contact data from ordergroups-page. Added names of users and date of last order. 2009-05-04 17:06:08 +02:00
Benjamin Meichsner ecc0340a70 Added message-link and notes to new foodcoop/ordergroups page. 2009-04-20 14:33:24 +02:00
Benjamin Meichsner a3fbc2d37b Merge branch 'master' of git@github.com:bennibu/foodsoft 2009-04-20 14:13:47 +02:00
Benjamin Meichsner 4db8184daa Fixed some bugs in orders lists. Closes #3 2009-04-20 14:11:11 +02:00
Benjamin Meichsner e71cacfe50 Fixed typing error and changed default foodcoop tab to /tasks 2009-04-20 13:58:22 +02:00
sandoz 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
sandoz e95cdad5ec Added ordergroups view to foodcoop namespace.
* For now just a searchable list. Nothing more.
2009-04-18 15:39:07 +02:00
Benjamin Meichsner c6187ebade Fixed bug in password reset feature.
* Translated messages
* Cleaned up some code
2009-04-17 12:06:36 +02:00
sandoz 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
sandoz 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
Benjamin Meichsner d62d45e4a4 Hide zero results in matrix pdf. 2009-04-03 23:32:24 +02:00
Benjamin Meichsner de1aa2ac38 Headers and table improvements for matrix pdf. Fixed #204 2009-04-03 19:20:16 +02:00
Benjamin Meichsner 578002501b Hide ordergroups with result = 0. 2009-04-03 18:01:19 +02:00
Benjamin Meichsner 8fb4334610 Modified sort_link helper method to allo non ajax links. 2009-04-03 17:16:39 +02:00
sandoz 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
sandoz 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
Benjamin Meichsner 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
Benjamin Meichsner 37199bae1d Implemented pagination for messages overview. 2009-03-23 11:31:36 +01:00
Benjamin Meichsner 759217763e Added pagination to task archiv. 2009-03-23 11:23:41 +01:00
Benjamin Meichsner f018db5b15 Translated tasks/workgroup page. 2009-03-23 11:08:56 +01:00
Benjamin Meichsner 549c03f223 Updated workgroups page.
* Make use of render :collection helper.
* Translated some links.
2009-03-23 10:57:41 +01:00
sandoz 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
sandoz 7c6a01b0fc Genderneutralization in stockit/index.html.haml
* Genderneutralized string 'Lieferant'
2009-03-22 15:04:29 +01:00
sandoz 1c62bf8786 Genderneutralized/Fixed strings in suppliers/index.haml
* Genderneutralized 'Lieferanten'
* Fixed string 'ArtikelDatenbank'
* Fixed string 'KundenNr'
2009-03-22 15:04:28 +01:00
sandoz 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
sandoz 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
sandoz 8171d3d173 Translation in foodcoop/_users.html.haml
* Transalated 'Nick' to 'Benutzername'
2009-03-22 14:16:53 +01:00
sandoz fea8c0993b Translation in profile.html.erb
* Translated "cancal membership" and warning.
2009-03-22 14:16:53 +01:00
sandoz 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
sandoz 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
sandoz ceec784e62 Translation in profile.html.erb
* Renamed "Nickname" to "Benutzername"
* Removed also '#' in end of line.
2009-03-22 14:16:52 +01:00
sandoz 92e2bdd187 Renamed 'Help' to 'Hilfe' in top loginInfo bar 2009-03-22 14:16:52 +01:00
sandoz 54715e50fc Changed caption of group orders sum price
* Changed caption of order_article.group_orders_sum[:price] to be "Summe
 (FC-Preis)" in _group_order_articles.html
* Trying to improve clarification of diffrent prices.
2009-03-22 14:16:52 +01:00
sandoz cde1fb3525 Show total price of ordered units per article in finance/balancing
* Implement functions total_price and total_gross_price on model
order_article
* Show total_price and total_gross_price in view finance/balancing
 _order_article (Closed #108)
2009-03-22 14:16:52 +01:00