4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +02:00
ea6348bc5c
Refactored finance/ordergroups|transactions module.
2011-06-09 21:35:05 +02:00
3a85d4f49f
Fixed bug on ordergroups account managment page.
2010-05-28 11:50:18 +02:00
305a4ac895
Don't show action "Create invoice" for stock order
2009-10-05 13:36:57 +02:00
529956ea5a
Merge branch 'wiki'
...
Conflicts:
app/helpers/pages_helper.rb
public/stylesheets/main.css
public/stylesheets/print.css
2009-09-28 15:04:07 +02:00
f7e24d26b4
Better layout with equal distance from each sides.
...
* Added css class middle_column
2009-08-21 23:37:05 +02:00
7e2506baa2
Fixed haml bug.
2009-08-06 16:14:36 +02:00
f72dccae18
Added edit invoice link to balancing sheet. Closes #8
2009-08-04 13:25:59 +02:00
578002501b
Hide ordergroups with result = 0.
2009-04-03 18:01:19 +02:00
8fb4334610
Modified sort_link helper method to allo non ajax links.
2009-04-03 17:16:39 +02: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
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
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
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
2e490d1a52
Capitalized first letter of 'netto' and 'brutto' in Captions.
2009-03-22 14:16:52 +01:00
6da9190b03
Added buttons to in/decrease group order article results.
2009-03-20 20:37:13 +01:00
8fbce954e3
Correct 'brutto'-price to be price.gross not fc_price.
...
* We want to be more consistent in the use of diffrent price types:
* netto, brutto, fc_price
2009-03-20 20:28:44 +01:00
2c52944956
Fixed buggy link in finance/balancing/new.html.haml
...
* Link to "Rechnung anlegen" did not send supplier id.
2009-03-20 16:32:47 +01:00
da08365816
Fixed bug order.profit calculation.
...
Order.profit will also be saved, when order is closed.
2009-03-17 19:43:41 +01:00
a0e10141dc
Translations and other little improvements.
2009-02-12 21:38:41 +01:00
86b2b28dc9
Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices.
2009-02-11 18:09:04 +01:00
6202e05841
Last part of order refactoring. Now order_article create/update is possible.
2009-02-09 20:12:56 +01:00
c17b63b192
Second part of stock-integration.
...
Introduced StockArticle and a special page for ordering from stock. StockChanges will be created and the StockArticle.quantity
updated in 'order.close!'.
2009-02-06 16:26:35 +01:00
1912a3fd80
First part of stock-integratino. Orders with supplier_id == 0 become stockorders.
2009-02-05 16:40:02 +01:00
251ced4fa1
Introduced group_order_article.result to save the result for each group/article.
2009-02-04 16:41:01 +01:00
6fd5d825f9
Order-refactoring part II.
2009-02-03 21:14:48 +01:00
0a2a79237a
Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing.
2009-02-02 16:35:43 +01:00
ec402ffa7b
Fixed order.close workflow. (formerly known as order.balance)
2009-01-30 22:27:55 +01:00
190a777278
Order refactoring part two: Balancing workflow was adapted to the new order schema. Article modification is still missing.
2009-01-29 21:28:22 +01:00
9eb2125f15
Complete refactoring of orders-workflow.
...
OrderResult tables are removed. Data consistency is now possible through new article.price-history (ArticlePrice).
Balancing-workflow needs to be updated.
2009-01-29 01:57:51 +01:00
2630ca2b14
Removed finance-controller for more clarity.
2009-01-19 16:40:06 +01:00
ff6b460cfc
Improved delivery-invoice-workflow.
2009-01-18 17:42:51 +01:00
6ce6c2c75a
Replaced IndexController by Home- and FoodcoopController. Some reorganizing in groups/memberships-logic (moved memberships out of admin-namespace).
2009-01-15 12:14:01 +01:00
fadc951208
Second part of admin-namespace-reorder. Also renamed OrderGroup into Ordergroup. More view-sharing between groups is neccessary.
2009-01-14 12:46:01 +01:00
47398c6a70
Moved balancing logic into new namespace 'finance'.
2009-01-10 22:22:16 +01:00
c282cae79c
Moved financial_transaction into the new finance-namespace.
2009-01-10 21:28:22 +01:00
1d85b880f2
Created namespace 'finance' and moved invoices into it.
2009-01-10 19:36:58 +01:00
9f8d0d28ac
Removed gettext and simplified_localization-plugin. L18n is now the appropriate module.
...
Upgraded to rails 2.2.2 and replaced complex foodsoft.rb-loader with simple
initializers/load_app_config.rb. Multiple foodcoops option is temporarly deactivated.
2009-01-06 15:45:19 +01:00
5b9a7e05df
Initial commit of foodsoft 2
2009-01-06 11:49:19 +01:00
benni
sandoz
Benjamin Meichsner
root
sandoz