ecf5601023
make missing_units get correct details for closed orders
2014-09-01 12:25:42 +02:00
8913ad615c
show articles ordered by members but not by foodcoop dimmed in receive
2014-08-29 12:23:23 +02:00
2bf13dbefa
give partially unused order articles a distinct colour
2014-06-23 17:51:19 +02:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
6c0de3dc74
Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'
...
Conflicts:
config/locales/de.yml
config/locales/en.yml
2014-01-20 12:12:00 +01:00
dc92de771e
Comment on ArticlePrices without Article association
2014-01-04 21:39:11 +01:00
f83f6971e8
Rename update_current_price to update_global_price to avoid confusion
2014-01-04 21:35:19 +01:00
3c88f572a4
When updating OrderArticle: save ArticlePrice association
2014-01-04 21:22:57 +01:00
0af8a065a1
Fix calculation of OrderArticle.total_price and .total_gross_price
2014-01-03 10:33:31 +01:00
98f59a3de3
Readonly receive input if GroupOrderArticle result has manually been changed
...
Conflicts:
app/helpers/orders_helper.rb
app/views/orders/_edit_amount.html.haml
2014-01-03 10:33:09 +01:00
8e52fca304
Do not set quantity of newly created OrderArticles to 1
2014-01-02 19:17:46 +01:00
01264bc0ac
Clean up OrderArticle#new form and related stuff
2014-01-02 19:14:46 +01:00
03bb83ecc0
show different warning signs for mismatch with ordered and received
2013-12-23 12:35:09 +01:00
c900cf4988
make product redistribution work!
2013-11-27 00:06:25 +01:00
beabe22a01
simplify model
2013-11-26 13:22:44 +01:00
bd1b932775
add receive screen, quantities for model, redistribution
2013-11-25 14:17:31 +01:00
f4e4d11bae
workaround for integration test problem
2013-11-01 20:27:53 +01:00
6cfaa4979a
show lines with zero units but with member orders in balancing screen ( closes foodcoops/foodsoft#179 )
2013-10-02 16:32:29 +02:00
82fb6d1dbe
Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112.
2013-06-06 00:37:50 +02:00
f81e315d6f
finish i18n of models without view
2013-03-22 01:21:44 +01:00
dd0bd0ad7e
Fixed updating order article in stockit balancing.
2013-03-17 18:33:04 +01:00
07581b7ecf
Removed acts_as_paranoid. Implemented own version.
2013-03-16 17:57:38 +01:00
0d3564492b
Fixed bug in sorting articles in balancing view.
2013-03-12 18:54:51 +01:00
c18fb20115
Ensure to get also deleted entries in belongs_to assoc.
2013-03-10 19:39:59 +01:00
1298af8377
Small improvement for update price. Removed delayed job.
...
Attention, every delayed job has to know its Foodcoop scope. Otherwise
every task will be executed in the default database. See email delivery.
2012-12-16 21:46:24 +01:00
620ec946f1
Merge branch 'master' into master-rails3-merging
...
Conflicts:
.gitignore
.rbenv-version
app/controllers/finance/balancing_controller.rb
app/views/finance/balancing/_order_article_form.html.haml
Fixed updating current price in finance balancing.
2012-12-11 10:32:59 +01:00
8a74e7d77f
Removed annoate and hirb Gemfiles.
...
Annotate: Better look in schema.rb, this reference should be always up
to date.
Hirb: To reactivate hirb, look in railscasts:
http://railscasts.com/episodes/48-console-tricks-revised
2012-07-27 18:07:42 +02:00
2c1385c9ce
Preisänderungen beim Abrechnen können auch global angewandt werden.
2012-07-18 22:16:08 +02:00
467874a8a5
Simplify balancing view. Part 1 of ...
2012-06-21 17:19:00 +02:00
38b5dcba1f
Refactored ordering part two. Integrated stock order.
2011-06-19 19:56:04 +02:00
eab16e337e
Updated router. Temporarly replaced routing filter with rails internal.
2011-05-11 12:27:58 +02:00
46450cebef
New annotation, because of db switch to mysql.
...
Background: sqlite has some problems with decimal option.
2011-05-07 21:55:24 +02:00
e75a42d509
Merge branch 'wiki'
2009-08-15 17:24:08 +02:00
d848831fea
Implemented stats for ordergroups on startpage. Annotated models.
2009-08-01 13:41:22 +02:00
b1f16d5342
Calculate total prices correctly. ( Closes #6 )
2009-04-18 18:08:33 +02: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
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
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
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
30f3d199d3
Introduced invoices and deliveries. Integration (especially of deliveries) isn't finished yet.
2009-01-08 16:33:27 +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
wvengen
Julius
Robert Waltemath
Benjamin Meichsner
davidrabel
Benjamin Meichsner
sandoz
sandoz