4433a665e4
Merge pull request #421 from foodcoop1040/edit_links
...
Add page to edit deliveries and orders linked to an invoice
2016-03-11 13:39:27 +01:00
b8010fedca
Add ordergroup_name to GroupOrder
2016-03-11 13:36:49 +01:00
efb929e64f
Allow editing of linked deliveries and orders at invoice
2016-03-11 13:23:13 +01:00
d56828fa4d
Show last user activity in admin ordergroups too
2016-03-04 16:28:22 +01:00
1315103a7d
Add role_invoices
...
This new role allows users to create invoices without role_finance. Users
can then only modify their own created invoices until somebody with the
role_finance sets the paid_on value.
2016-03-04 16:06:02 +01:00
a03789e048
Add optional boxfill phase to orders
2015-11-13 18:10:46 +01:00
c1413ff817
Allow clearing default order schedule
2015-10-23 14:53:01 +02:00
75967bad22
Add color marking to items in group orders that have missing items
2015-05-04 06:16:14 +02:00
07ba6f0535
Import multiple spreadsheet formats. Make upload work like sync.
2015-04-11 02:52:57 +02:00
379dc86ffa
Make order_pdf more generally useful
2015-04-10 21:30:04 +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
de794a48b0
Reorder roles and add icons
2015-04-04 10:56:42 +02:00
1447b38bb3
Use foodsoft expansion variables in footer
2015-02-28 14:50:25 +01:00
118886344a
Use boolean comparators where it makes sense
2015-01-14 21:17:00 +01:00
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +01:00
6e990fed4c
Upgrade to rails 4.1
2014-11-21 14:37:56 +01:00
71324ce5db
be more robust showing config list
2014-09-22 09:38:23 +02:00
418a8b5806
fix i18n issues + localeapp roundtrip
...
thanks, i18n-tasks!
2014-09-15 13:52:35 +02:00
f18cc367ae
workaround for CVE-2014-4920
2014-09-10 13:27:45 +02:00
cf680d3410
add page break to config screen
2014-09-02 15:02:26 +02:00
0f7dc37015
fix config value override
...
Conflicts:
app/helpers/admin/configs_helper.rb
2014-09-02 15:02:25 +02:00
3fee071a10
specify timezone in configuration (closes foodcoops#282)
2014-09-02 14:21:33 +02:00
6115979bae
allow protected keys to be set/unset + config_db tests
2014-09-02 14:21:32 +02:00
9beaac2627
allow to specify (un)checked values for config boolean
...
Conflicts:
app/helpers/admin/configs_helper.rb
2014-09-02 14:21:32 +02:00
429e111db4
hide protected keys from config
2014-09-02 14:21:32 +02:00
7b000c39eb
add foodcoop configuration screen
2014-09-02 14:21:32 +02:00
b5ddbcae21
make custom css more robust
2014-09-02 14:15:59 +02:00
97dc090e4d
Merge pull request #306 from wvengen/feature-styling
...
allow foodcoops to add custom css
2014-09-02 13:59:18 +02:00
19630e8607
allow foodcoops to add custom css
2014-09-02 13:35:45 +02:00
647b7f0430
allow to synchronize all articles of a shared supplier
2014-09-02 12:58:31 +02:00
16b78ba2a0
fix shared import paging without query
2014-09-02 12:58:31 +02:00
2bf13dbefa
give partially unused order articles a distinct colour
2014-06-23 17:51:19 +02:00
fee0cfbdc7
make orders helpers clearer
2014-06-23 17:51:19 +02:00
8c0df3b4e8
edit order user-interface update
...
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
ef0888f38d
add view for all transactions + csv
2014-06-23 17:51:17 +02:00
7556c753d0
Extract message system to plugin.
2014-05-13 17:01:25 +02:00
f71b78665e
allow 500 items per page
2014-05-13 17:01:24 +02:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
f8fca4d630
fix order article add + test
2014-02-24 11:37:06 +01:00
a4dca6ae11
show more info in add article dialog
2014-02-15 00:18:49 +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
f9d2c20aaa
cleanup articles sorted in groups
2014-02-10 15:58:58 +01:00
84e02b795c
proper history line
2014-01-31 17:53:10 +01:00
5e7925366d
allow to view stock orders too
2014-01-31 13:12:29 +01:00
5aef8e445e
add html units history line
2014-01-31 13:08:20 +01:00
65041c78c5
allow to preselect order view
2014-01-17 15:04:03 +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
3b2d50b47d
make receive delta work when unit_quantity changes
2014-01-13 11:37:18 +01:00
wvengen
Patrick Gansterer
wvengen
Alexander Kirk
wvengen
Robert Waltemath