dd799cf642
Allow to sort receive on unit
2015-04-22 20:08:24 +02:00
bc1eb3bc44
Show receive button in grey when already received
2015-04-10 21:25:09 +02:00
507651f5ba
Move small close button to helper.
...
Workaround for show order deface override nuking attributes of the close button.
2015-04-10 18:58:51 +02:00
4239843b3e
Merge foodcoop1040:order_message into master
...
Conflicts:
plugins/messages/app/models/message.rb
2015-04-10 18:30:54 +02:00
124f77f2ab
Add messaging to order ( closes #327 )
2015-02-19 00:53:57 +01:00
1b48882c0e
Refactor orders index
2015-02-18 23:46:50 +01:00
27fe8a4d42
Merge pull request #347 from foodcoop1040/suppliers_with_articles
...
Show only suppliers with articles in the dropdown-menu for new orders
2015-02-18 23:42:37 +01:00
5b309d3d51
Show only suppliers with articles in the dropdown-menu for new orders
...
When there are many suppliers to be able to select them for invoices,
the menu for creating new orders gets unclear.
2015-02-18 22:35:38 +01:00
e57fd500fc
Add possibility to copy an order
...
If a supplier has a long list of articles, which are all available, but
the order should contain only a subset of them, selecting them for every
order can take a long time. Starting with a copy of an existing order
can safe a lot of time.
2015-02-18 22:09:37 +01:00
a699f95903
fix fax documents for stock orders (closes foodcoops#79)
2014-09-02 15:47:01 +02:00
8913ad615c
show articles ordered by members but not by foodcoop dimmed in receive
2014-08-29 12:23:23 +02:00
e61c3c9267
order articles by number then name in fax+receive
...
This makes it easier to enter the receive screen from an order pdf print
with received amounts.
Conflicts:
app/documents/order_fax.rb
2014-08-19 09:19:01 +02:00
4b6231129c
only show undeleted articles in receive screen
2014-06-23 17:51:19 +02:00
fee0cfbdc7
make orders helpers clearer
2014-06-23 17:51:19 +02:00
86a5576dc3
fix delete order confirmation
2014-06-23 17:51:18 +02:00
8c0df3b4e8
edit order user-interface update
...
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
5d9c9856d1
show proper error when all articles are deselected in order edit
2014-05-13 17:01:27 +02:00
48e9a3e4f5
add fax csv
2014-05-13 17:01:25 +02:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
60826ceedc
allow to edit GroupOrderArticle result from orders screen
...
Conflicts:
app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
6e0489b25f
Merge pull request #257 from wvengen/feature-touchclick
...
Better workaround for touch devices
2014-02-03 06:33:27 -08:00
5aef8e445e
add html units history line
2014-01-31 13:08:20 +01:00
7ebb2459e0
make click work better on touch devices (closes foodcoops#104)
2014-01-25 15:19:50 +01:00
65041c78c5
allow to preselect order view
2014-01-17 15:04:03 +01:00
1129cf4094
include comments link
2014-01-17 14:32:12 +01:00
5b6d1a66a6
complete show order i18n
...
Conflicts:
app/helpers/orders_helper.rb
2014-01-17 14:25:57 +01:00
42d622d1b2
cleanup orders and add search
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/views/orders/_articles.html.haml
app/views/orders/show.html.haml
2014-01-17 13:41:38 +01:00
bab28d2770
i18n update
2014-01-13 23:23:37 +01:00
3b2d50b47d
make receive delta work when unit_quantity changes
2014-01-13 11:37:18 +01:00
0b4cfde1b2
put footer below body, now that is allowed in html5
2014-01-09 14:47:05 +01:00
dcb17e04b5
do not show article hint in order view after all, since "old price" is
...
actually the price of the current article, which will probably be
different in the future
2014-01-09 13:24:40 +01:00
bea2706005
fix receive dynamic update (complements 90c81de872)
2014-01-09 13:19:27 +01:00
124341c7d6
receive helper and i18n cleanup
2014-01-09 13:01:10 +01:00
90c81de872
update receive delta column + responsive css
2014-01-09 12:20:54 +01:00
5a7c9b817c
fix receive js for document updates [ci skip]
2014-01-09 10:14:05 +01:00
65e79d7e1b
small receive usability changes
2014-01-08 19:28:39 +01:00
6e60f94484
small receive-related i18n updates
2014-01-08 12:52:29 +01:00
563993fffa
Complete I18n of current receive screen
2014-01-08 00:06:50 +01:00
d7c771d10a
Continue I18n of receive screen
2014-01-06 23:48:39 +01:00
8479678530
Improve unlock button for receiving OrderArticles manually adjusted
...
Conflicts:
app/views/orders/_edit_amount.html.haml
2014-01-04 20:51:42 +01:00
aa57cee96f
do not show units fields in receive edit order article screen
2014-01-04 20:46:13 +01:00
b800da9b9b
use helper in ajax update too
2014-01-03 14:52:44 +01:00
9219d099c8
ui update for packages display
2014-01-03 12:42:36 +01:00
4c9e84ecc6
change layout of receive unlock
2014-01-03 12:40:43 +01:00
014a62aa11
use disabled property for input and fix style
2014-01-03 10:59:42 +01:00
f1ae2724c6
fix unit quantity display after ajax update
2014-01-03 10:45:15 +01:00
5ead0fb441
show correct price
2014-01-03 10:44:57 +01:00
f230d39055
Merge price columns in receive form into one
...
Conflicts:
app/views/orders/_edit_amount.html.haml
2014-01-03 10:36:57 +01:00
2ec3d38238
Set readonly property with javascript by .prop instead of .attr
2014-01-03 10:33:23 +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
wvengen
Patrick Gansterer
wvengen
wvengen
Julius