Manuel Wiedenmann
|
7a63394dac
|
Merge remote-tracking branch 'origin/rails3'
Conflicts:
Gemfile
Gemfile.lock
|
2013-06-10 01:53:31 +02:00 |
Benjamin Meichsner
|
7c4ee01ff2
|
Define autofill attributes when creating new supplier from shared_supplier.
|
2013-06-09 18:02:47 +02:00 |
|
Benjamin Meichsner
|
60afa85ece
|
Merge pull request #116 from balkansalat/rails3-balancing-delete-article
Update ordergroup prices in OrderArticles via Order.
|
2013-06-09 08:26:38 -07:00 |
Robert Waltemath
|
82fb6d1dbe
|
Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112.
|
2013-06-06 00:37:50 +02:00 |
|
Robert Waltemath
|
2a1176c31a
|
Update ordergroup prices in OrderArticles via Order. Should fix bennibu#112.
|
2013-05-30 10:54:22 +02:00 |
wvengen
|
f6ba21832d
|
Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
app/controllers/articles_controller.rb
app/views/articles/_form.html.haml
app/views/articles/sync.html.haml
app/views/finance/balancing/_edit_note.html.haml
app/views/finance/group_order_articles/_form.html.haml
app/views/finance/order_articles/_edit.html.haml
app/views/finance/order_articles/_new.html.haml
app/views/group_orders/show.html.haml
app/views/invites/_modal_form.html.haml
|
2013-04-12 15:45:24 +02:00 |
|
Benjamin Meichsner
|
3e9ca336a8
|
Fixed loosing assignments when updating a task.
|
2013-04-10 10:55:43 +02:00 |
|
Benjamin Meichsner
|
79d1c5a66d
|
Allow article price equal to zero. Closes #111
|
2013-04-10 10:51:36 +02:00 |
|
Benjamin Meichsner
|
20e439c2a7
|
Allow article price equal to zero. Closes #111
|
2013-04-08 14:40:02 +02:00 |
|
Benjamin Meichsner
|
03ea8e194e
|
Fixed loosing assignments when updating a task.
|
2013-04-08 01:31:21 +02:00 |
|
Benjamin Meichsner
|
13e921a632
|
Fixed some errors in articles#sync. Show better error messages.
|
2013-04-08 01:00:49 +02:00 |
|
wvengen
|
0bb080526a
|
Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
app/controllers/login_controller.rb
app/models/message.rb
app/views/sessions/new.html.haml
|
2013-04-04 00:29:50 +02:00 |
|
Benjamin Meichsner
|
18f6cadca2
|
Ensure mail privacy in message reply and show view.
Thanks to @JuliusR for reporting.
|
2013-03-24 01:37:58 +01:00 |
|
wvengen
|
f81e315d6f
|
finish i18n of models without view
|
2013-03-22 01:21:44 +01:00 |
|
wvengen
|
75a1051668
|
finish articles i18n, controller+model
|
2013-03-22 00:59:42 +01:00 |
|
wvengen
|
7af796c09c
|
Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
|
2013-03-21 22:08:09 +01:00 |
|
Benjamin Meichsner
|
528295884e
|
Allow deleting of category, when there are only deleted articles left.
|
2013-03-17 20:13:11 +01:00 |
|
bennibu
|
28343fc124
|
Merge pull request #99 from balkansalat/rails3-fix-stock-ordering-2
Prevent sold-out articles from being removed from stock order when editing
|
2013-03-17 11:50:56 -07:00 |
|
Benjamin Meichsner
|
59de2e42a9
|
Fixed showing deleted articles when asking for available articles.
|
2013-03-17 18:36:34 +01:00 |
|
Benjamin Meichsner
|
dd0bd0ad7e
|
Fixed updating order article in stockit balancing.
|
2013-03-17 18:33:04 +01:00 |
|
Benjamin Meichsner
|
9cc98b4662
|
Added some more eager loading for balancing view.
|
2013-03-17 15:12:14 +01:00 |
|
Benjamin Meichsner
|
07581b7ecf
|
Removed acts_as_paranoid. Implemented own version.
|
2013-03-16 17:57:38 +01:00 |
Julius
|
6aa0e0b736
|
Rename and comment new functions for fixing stock ordering
|
2013-03-15 08:50:55 +01:00 |
|
Julius
|
8d0761a6c8
|
Merge branch 'rails3-fix-stock-ordering' into rails3-fix-stock-ordering-2
|
2013-03-14 21:14:42 +01:00 |
|
Benjamin Meichsner
|
0d3564492b
|
Fixed bug in sorting articles in balancing view.
|
2013-03-12 18:54:51 +01:00 |
|
Benjamin Meichsner
|
40d9195eac
|
Fixed broken group_orders after editing order.
Caution, when using the model.association = models operator,
the after save callbacks are not triggerd! See Order#save_order_articles
|
2013-03-12 11:26:14 +01:00 |
|
Benjamin Meichsner
|
c18fb20115
|
Ensure to get also deleted entries in belongs_to assoc.
|
2013-03-10 19:39:59 +01:00 |
|
Benjamin Meichsner
|
b0e12d177e
|
Fixed editing an order and take care of group_orders.
|
2013-03-10 19:22:26 +01:00 |
|
Robert Waltemath
|
63d8a3a1a6
|
Do not exclude ordered articles (with zero quantity) when editing orders.
|
2013-03-07 20:43:02 +01:00 |
|
Robert Waltemath
|
93a99c45d8
|
Revert "Do not subtract articles in open orders when calculating quantity."
This reverts commit 6bf3b241e6.
|
2013-03-07 20:39:35 +01:00 |
|
Robert Waltemath
|
6bf3b241e6
|
Do not subtract articles in open orders when calculating quantity.
|
2013-03-06 14:19:06 +01:00 |
|
wvengen
|
2d382df1f1
|
Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/controllers/stockit_controller.rb
app/models/ordergroup.rb
app/models/workgroup.rb
app/views/stockit/index.html.haml
|
2013-03-06 01:01:12 +01:00 |
|
wvengen
|
d9949681a2
|
localize invite model
|
2013-02-27 11:59:03 +01:00 |
|
Benjamin Meichsner
|
2d1ae0ad97
|
Fixed bad syntax (from already dropped meta_where gem).
Thanks to wvengen, closed #91
Conflicts:
app/models/workgroup.rb
|
2013-02-25 10:51:01 +01:00 |
|
Benjamin Meichsner
|
3fb5c313ee
|
Show usefull error message for uniqueness_of_name with acts_as_paranoid.
Fixed #88
Conflicts:
app/models/ordergroup.rb
|
2013-02-25 10:49:55 +01:00 |
|
Benjamin Meichsner
|
6685012a3e
|
Fixed bad syntax (from already dropped meta_where gem).
Thanks to wvengen, closed #91
|
2013-02-24 23:56:56 +01:00 |
|
Benjamin Meichsner
|
82178161fa
|
Show usefull error message for uniqueness_of_name with acts_as_paranoid.
Fixed #88
|
2013-02-24 23:26:16 +01:00 |
|
wvengen
|
8043fd2164
|
finish foodcoop i18n + controller + model
|
2013-02-22 00:19:22 +01:00 |
|
wvengen
|
cb2c724abd
|
fix typo
|
2013-02-11 23:37:52 +01:00 |
|
wvengen
|
a0a974b9ce
|
finish stockit i18n + controllers + model
|
2013-02-11 11:19:26 +01:00 |
|
wvengen
|
36b18bcfbd
|
finish messages i18n + controller + model
|
2013-02-09 10:18:52 +01:00 |
|
wvengen
|
e06524ca37
|
finish ordergroups and orders i18n + controller
|
2013-02-08 01:52:20 +01:00 |
|
Benjamin Meichsner
|
8b2b70f8bf
|
Fixed saving user for new orders.
|
2013-01-26 16:24:45 +01:00 |
|
Benjamin Meichsner
|
3ab3ff2bc4
|
Minor speed improvements for group order load.
|
2013-01-26 15:18:35 +01:00 |
|
benni
|
28aec7e4d6
|
Replace ordergroup.account_updated with non database attr.
|
2012-12-30 15:31:37 +01:00 |
|
benni
|
2c0fe08be6
|
Replaced delayed_job with resque. See README_DEVEL
|
2012-12-23 17:38:04 +01:00 |
|
benni
|
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 |
|
benni
|
0dff5ea784
|
Fixed some bugs in tasks, apple feature:
* Update ordergroup stats when task is destroyed.
* Removed assigned caching attribute in task object.
* A lot of eager loading for tasks controller.
|
2012-12-16 19:07:45 +01:00 |
|
benni
|
9919183cb0
|
Fixed missing group_order_article in group_order show.
Also add eager loading for associated objects.
|
2012-12-16 16:50:09 +01:00 |
|
benni
|
0fcd5abb3a
|
Fixed strange RecordReadOnly exception in task done.
|
2012-12-16 14:13:54 +01:00 |