wvengen
|
ecf5601023
|
make missing_units get correct details for closed orders
|
2014-09-01 12:25:42 +02:00 |
|
wvengen
|
8913ad615c
|
show articles ordered by members but not by foodcoop dimmed in receive
|
2014-08-29 12:23:23 +02:00 |
|
wvengen
|
a43020463d
|
normalize article and category attributes (closes foodcoops#294)
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
7c2ecd8658
|
add some model api docs
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
2bf13dbefa
|
give partially unused order articles a distinct colour
|
2014-06-23 17:51:19 +02:00 |
|
wvengen
|
c64a7ba3cd
|
validate date and time inputs
|
2014-06-23 17:51:18 +02:00 |
|
wvengen
|
8c0df3b4e8
|
edit order user-interface update
also closes foodcoops#145
|
2014-06-23 17:51:18 +02:00 |
|
wvengen
|
3a41e9530f
|
fix order bug
|
2014-05-13 17:01:27 +02:00 |
|
wvengen
|
852f3484ad
|
make settle directly less dangerous
(closes foodcoops#275)
|
2014-05-13 17:01:26 +02:00 |
|
wvengen
|
25854f2de7
|
do not store GroupOrderArticles with zero quantity and tolerance
|
2014-05-13 17:01:26 +02:00 |
|
Robert Waltemath
|
7556c753d0
|
Extract message system to plugin.
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
c25d4d3f4f
|
use ruby-units for unit parsing (closes foodcoops/foodsoft#200)
Conflicts:
Gemfile
Gemfile.lock
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
3f032e5dd9
|
make apple points optional
a next step would be to move this to a plugin
|
2014-05-13 17:01:25 +02:00 |
|
wvengen
|
0fa9bebac9
|
show supplier user-interface update
|
2014-05-13 17:01:24 +02:00 |
|
wvengen
|
7841245795
|
migrate to Rails 4.0 (closes foodcoops#214)
Conflicts:
Gemfile.lock
|
2014-02-24 12:46:28 +01:00 |
|
wvengen
|
f8fca4d630
|
fix order article add + test
|
2014-02-24 11:37:06 +01:00 |
|
wvengen
|
2c85618284
|
fix balancing and matrix since receive
|
2014-02-13 16:06:45 +01:00 |
|
wvengen
|
2de4a2a3a0
|
Merge pull request #256 from wvengen/feature-partial_shared_sync
Small change to allow non-shared articles with shared suppliers
|
2014-02-07 11:24:33 +01:00 |
|
wvengen
|
4bfd7fa6f8
|
fix database sync when value is nil
|
2014-02-03 15:32:53 +01:00 |
|
wvengen
|
49e563af89
|
allow non-shared articles to be part of a shared supplier using a blank order number
|
2014-01-24 22:10:00 +01:00 |
|
wvengen
|
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 |
|
Julius
|
dc92de771e
|
Comment on ArticlePrices without Article association
|
2014-01-04 21:39:11 +01:00 |
|
Julius
|
f83f6971e8
|
Rename update_current_price to update_global_price to avoid confusion
|
2014-01-04 21:35:19 +01:00 |
|
Julius
|
3c88f572a4
|
When updating OrderArticle: save ArticlePrice association
|
2014-01-04 21:22:57 +01:00 |
|
wvengen
|
1a5dc3ebe4
|
consider group_order_article without result not manually changed
|
2014-01-03 13:03:28 +01:00 |
|
Julius
|
0af8a065a1
|
Fix calculation of OrderArticle.total_price and .total_gross_price
|
2014-01-03 10:33:31 +01:00 |
|
wvengen
|
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 |
|
Julius
|
8e52fca304
|
Do not set quantity of newly created OrderArticles to 1
|
2014-01-02 19:17:46 +01:00 |
|
Julius
|
01264bc0ac
|
Clean up OrderArticle#new form and related stuff
|
2014-01-02 19:14:46 +01:00 |
|
wvengen
|
27a73be68f
|
Merge remote-tracking branch 'foodcoops/master' into feature-receive
|
2014-01-02 18:57:59 +01:00 |
|
wvengen
|
03bb83ecc0
|
show different warning signs for mismatch with ordered and received
|
2013-12-23 12:35:09 +01:00 |
|
wvengen
|
d071c5bba8
|
fix user search
|
2013-12-22 23:21:02 +01:00 |
|
wvengen
|
2b511ee559
|
Merge branch 'master' into fresh-flow
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
|
2013-12-18 17:03:26 +01:00 |
|
wvengen
|
94b2c8eac3
|
Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup
Conflicts:
app/views/deliveries/_stock_article_form.html.haml
config/locales/de.yml
config/locales/en.yml
|
2013-12-17 15:58:47 +01:00 |
|
wvengen
|
b26b124b0c
|
Merge pull request #211 from foodcoop-adam/group_order-cleanup
make order result calculation a bit cleaner
|
2013-12-17 06:29:15 -08:00 |
|
wvengen
|
46ab4dcc01
|
proper i18n of last ordergroup order (thanks @JuliusR)
|
2013-12-14 13:15:47 +01:00 |
|
wvengen
|
a475a27f79
|
i18n cleanup (affects foodcoops#137)
|
2013-12-06 22:43:36 +01:00 |
|
wvengen
|
b1e81dc1d7
|
make simple_form see that first_name is required
|
2013-12-03 22:04:22 +01:00 |
|
wvengen
|
c900cf4988
|
make product redistribution work!
|
2013-11-27 00:06:25 +01:00 |
|
wvengen
|
beabe22a01
|
simplify model
|
2013-11-26 13:22:44 +01:00 |
|
wvengen
|
bd1b932775
|
add receive screen, quantities for model, redistribution
|
2013-11-25 14:17:31 +01:00 |
|
wvengen
|
ed9a6cca39
|
make result calculation a bit cleaner
|
2013-11-22 23:40:44 +01:00 |
|
wvengen
|
66ac3be81f
|
Merge branch 'master' into allow-no-nickname
Conflicts:
app/views/home/ordergroup.html.haml
app/views/login/new_password.html.haml
app/views/shared/_auto_complete_users.rhtml
app/views/shared/memberships/_current_members.rhtml
app/views/shared/memberships/_non_members.rhtml
|
2013-11-18 11:42:49 +01:00 |
|
wvengen
|
9b47e5d6c4
|
use dynamic conditional in validation, to enable different foodcoops having different use_nick configuration values
|
2013-11-18 11:31:30 +01:00 |
|
wvengen
|
588898d7b0
|
do not error when calling shared_article on non-shared article
|
2013-11-13 23:20:48 +01:00 |
|
wvengen
|
bb5a67033d
|
Merge pull request #194 from foodcoop-adam/plugin-move
Better support for plugins (engines) + move wiki to plugin
|
2013-11-12 03:46:15 -08:00 |
|
wvengen
|
ce3b89c910
|
make authentication methods more readable (thanks @fsmanuel)
|
2013-11-11 16:23:20 +01:00 |
|
wvengen
|
f4e4d11bae
|
workaround for integration test problem
|
2013-11-01 20:27:53 +01:00 |
|
wvengen
|
6e9954c86f
|
remove user referencing page as it is not being used anyway
|
2013-10-30 11:04:22 +01:00 |
|
wvengen
|
70c12b7c1f
|
move wiki functionality to plugin
|
2013-10-29 22:42:06 +01:00 |
|
wvengen
|
c37ed74942
|
Merge branch 'master' into allow-no-nickname
Conflicts:
app/views/foodcoop/users/_users.html.haml
|
2013-10-29 19:15:52 +01:00 |
|
wvengen
|
e13ca74df3
|
fix new user form
|
2013-10-29 19:11:33 +01:00 |
|
wvengen
|
9ba425aafa
|
fallback for when nick is nil
|
2013-10-29 19:05:24 +01:00 |
|
wvengen
|
d64590a534
|
more robustness
|
2013-10-10 17:50:10 +02:00 |
|
Julius
|
28644dc334
|
Force update in Order#finish; rescue if error raised
|
2013-10-08 19:58:11 +02:00 |
|
wvengen
|
1946cd1ab3
|
make user creation possible again
|
2013-10-02 23:33:24 +02:00 |
|
wvengen
|
bc5795b052
|
small model change
|
2013-10-02 23:29:21 +02:00 |
|
wvengen
|
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 |
|
wvengen
|
ea3db22306
|
user display changes in model and mailer
|
2013-09-22 14:38:56 +02:00 |
|
wvengen
|
f6c2fd9a9d
|
more user display changes
|
2013-09-22 02:15:35 +02:00 |
|
wvengen
|
6d3db7636a
|
make search work without nickname usage
|
2013-09-20 23:18:06 +02:00 |
|
wvengen
|
a77c3b59b1
|
allow to login with email instead of nick as well + tests
|
2013-09-20 22:39:19 +02:00 |
|
Benjamin Meichsner
|
2060261c89
|
Merge pull request #144 from foodcoop-adam/fix-closed-group_order-totals
fix closed group_order totals
|
2013-09-19 03:14:40 -07:00 |
|
wvengen
|
c7f28a3b5c
|
use plain Ruby memoization to fix deprecation (closes #121)
|
2013-09-18 22:46:58 +02:00 |
|
wvengen
|
ebb22ccb53
|
Merge branch 'master' into fix-closed-group_order-totals
Conflicts:
db/schema.rb
|
2013-09-18 18:14:07 +02:00 |
|
Benjamin Meichsner
|
b015ceea0b
|
Merge branch 'warn-uncheck-ordered-article' of https://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-warn-uncheck-ordered-article
|
2013-09-18 17:50:30 +02:00 |
|
Benjamin Meichsner
|
7e659e2374
|
Merge branch 'order-display-improvements' of https://github.com/foodcoop-adam/foodsoft into foodcoop-adam-order-display-improvements
|
2013-09-18 17:16:04 +02:00 |
|
Robert Waltemath
|
142de28ade
|
Split up messages for stock/ supplier orders.
|
2013-09-18 10:50:56 +02:00 |
|
Robert Waltemath
|
e728e76729
|
Merge branch 'master' into warn-uncheck-ordered-article
|
2013-09-17 17:10:56 +02:00 |
|
wvengen
|
6d4aa5ed40
|
Merge pull request #163 from foodcoop-rostock/order-tasks-alphabetically
Order tasks with same date by name.
|
2013-09-17 05:45:13 -07:00 |
|
wvengen
|
b11706f30a
|
sort ordergroups in order screen and pdfs
|
2013-09-17 00:25:38 +02:00 |
|
wvengen
|
8ca95f396f
|
make both ordered and received products visible in order screens and pdfs
|
2013-09-16 23:52:58 +02:00 |
|
wvengen
|
7de57715f2
|
Merge branch 'master' into tests-rspec
Conflicts:
Gemfile
|
2013-09-07 01:11:24 +02:00 |
|
Benjamin Meichsner
|
a0760ebfdb
|
Fixed delivering emails to users.
There was a bug in User#receive_email? Return values are now true or false, not '1' or '0'.
|
2013-09-06 11:40:40 +02:00 |
|
Robert Waltemath
|
9f22615a25
|
Order tasks with same date by name.
|
2013-09-05 10:16:57 +02:00 |
|
Robert Waltemath
|
805071f3fb
|
Added checkbox to ignore warnings. Added translations.
|
2013-09-04 10:52:14 +02:00 |
|
Robert Waltemath
|
bb25bdc6eb
|
Improved error data passing.
|
2013-09-03 17:37:49 +02:00 |
|
Robert Waltemath
|
1c9fad0a7b
|
Added validation for removed but ordered articles.
|
2013-09-03 12:09:33 +02:00 |
|
Benjamin Meichsner
|
71e02ab569
|
Merge branch 'rails3' into rails3-to-master
Conflicts:
app/views/suppliers/shared_suppliers.haml
|
2013-09-02 13:31:40 +02:00 |
|
wvengen
|
bb20e9abea
|
Merge branch 'master' into tests-rspec
Conflicts:
Gemfile
Gemfile.lock
|
2013-07-24 21:25:36 +02:00 |
|
wvengen
|
74bfc85562
|
Merge remote-tracking branch 'fsmanuel/master' into master.
Updated migration date to today.
Conflicts:
db/schema.rb
|
2013-07-18 18:48:49 +02:00 |
|
Manuel Wiedenmann
|
c85a7fcc5c
|
fixes User#receive_email?
|
2013-07-18 16:58:04 +02:00 |
|
wvengen
|
ebe93e292b
|
Merge pull request #141 from foodcoop-rostock/improve-delivery-workflow-further
Improve delivery workflow
|
2013-07-17 01:43:59 -07:00 |
|
wvengen
|
db80fbd807
|
Merge branch 'master' into tests-rspec
|
2013-07-15 18:45:04 +02:00 |
|
wvengen
|
5e9a49b2c7
|
make uniqueness_of_name validations work again (closes foodcoops/foodsoft#157)
|
2013-07-15 18:03:02 +02:00 |
|
wvengen
|
3ed8e0bc84
|
allow longer supplier phone number
|
2013-07-15 17:57:00 +02:00 |
|
Julius
|
b303b48853
|
Merge branch 'master' into improve-delivery-workflow-further
|
2013-07-13 21:08:50 +02:00 |
|
wvengen
|
126f7e7459
|
Merge pull request #150 from foodcoop-rostock/stock_article_quantity_history
Show StockChanges index
|
2013-07-13 03:16:31 -07:00 |
|
wvengen
|
db8a929f0b
|
Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks
Great!
|
2013-07-11 12:48:41 -07:00 |
|
Julius
|
ef62a18ac9
|
Add StockChanges index
|
2013-07-09 21:46:04 +02:00 |
|
wvengen
|
497c9e0cf1
|
fix closed group_order totals
|
2013-07-02 12:01:25 +02:00 |
|
Julius
|
d0ccf07bc5
|
Merge latest changes in master of http://github.com/foodcoops/foodsoft
|
2013-06-26 20:23:11 +02:00 |
|
Julius
|
a29d52dcae
|
Fix ordering of stock_changes in delivery (case-insensitive ordering did not work properly for all database flavors)
|
2013-06-26 20:14:33 +02:00 |
|
Julius
|
2ee7f716ae
|
Improve delivery validation: StockArticles must not be associated more than once
|
2013-06-26 17:58:55 +02:00 |
|
wvengen
|
befe89d4ef
|
fix tolerance display in group_order form
|
2013-06-26 01:36:44 +02:00 |
|
Robert Waltemath
|
c27127c745
|
Added i18n strings.
|
2013-06-24 11:53:52 +02:00 |
|
Robert Waltemath
|
3d1faa9ed3
|
Skip save callback when migrating data.
|
2013-06-24 10:36:14 +02:00 |
|
Robert Waltemath
|
d081a2c66b
|
Validate done/weekly combination only on creation of task.
|
2013-06-24 09:49:06 +02:00 |
|
Robert Waltemath
|
577945e591
|
Add validation for task.done in combination with periodic task.
|
2013-06-22 18:56:17 +02:00 |
|
Robert Waltemath
|
a7fd7a7936
|
Removed obsolete code of old workgroup-centric weekly task concept.
|
2013-06-22 18:14:11 +02:00 |
|
Robert Waltemath
|
ef329b5647
|
Added up and down migration for weekly task data.
|
2013-06-22 17:35:45 +02:00 |
|
Robert Waltemath
|
990397a7f0
|
Delete only the FOLLOWING tasks.
|
2013-06-21 22:04:36 +02:00 |
|
Robert Waltemath
|
c52e482743
|
Exclude tasks from groups when changing attributes.
|
2013-06-21 20:54:24 +02:00 |
|
Robert Waltemath
|
6b62fc90d8
|
Now creating periodic task via button
|
2013-06-21 13:48:48 +02:00 |
|
Julius
|
bf32e72414
|
Improve delivery form validation
|
2013-06-19 11:21:55 +02:00 |
|
Julius
|
9502ca28dd
|
Merge latest changes in master
|
2013-06-17 15:47:08 +02:00 |
|
wvengen
|
713c030213
|
i18n and translate missing entry
|
2013-06-15 18:43:42 +02:00 |
|
Julius
|
b5acd9b116
|
Merge master branch of base
|
2013-06-14 18:59:17 +02:00 |
|
Manuel Wiedenmann
|
2c1d9aeb9c
|
finishes i18n set_locale with user settings
|
2013-06-14 02:39:25 +02:00 |
|
Manuel Wiedenmann
|
5b7ec86ed6
|
Merge branch master into i18n
|
2013-06-14 02:02:57 +02:00 |
|
wvengen
|
8141ad0233
|
remove duplicate code
|
2013-06-14 01:39:30 +02:00 |
|
wvengen
|
13f2c128c6
|
do not use string values for integers (closes foodcoops/foodsoft#128)
|
2013-06-14 01:36:41 +02:00 |
|
Julius
|
65f61e09d5
|
Improve delivery workflow; introduce sortable tables; use js.erb for deliveries
|
2013-06-13 23:36:22 +02:00 |
|
Benjamin Meichsner
|
25fbb47320
|
Merge branch 'rails3-allow-multiple-suppliers' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-rails3-allow-multiple-suppliers
|
2013-06-12 10:40:20 +02:00 |
|
Robert Waltemath
|
46b07a6136
|
Merge remote-tracking branch 'upstream/master' into multiple-recurring-tasks
Conflicts:
config/locales/de.yml
|
2013-06-12 10:00:11 +02:00 |
|
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 |
|
Manuel Wiedenmann
|
0061e45198
|
removes routes locale constrain and fixes some bugs
|
2013-06-06 04:29:53 +02:00 |
|
Manuel Wiedenmann
|
60c4c5510a
|
adds a new user settings system + migration + rake task/worker updates
|
2013-06-06 03:40:15 +02: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
|
c194d2545f
|
Allowing SharedSuppliers to have multiple Suppliers. Should fix bennibu#107.
|
2013-06-04 11:28:25 +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 |
|
Robert Waltemath
|
981944b869
|
Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks
Conflicts:
Gemfile
db/schema.rb
|
2013-03-15 17:59:19 +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 |
|