wvengen
bc1eb3bc44
Show receive button in grey when already received
2015-04-10 21:25:09 +02:00
wvengen
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
wvengen
4239843b3e
Merge foodcoop1040:order_message into master
...
Conflicts:
plugins/messages/app/models/message.rb
2015-04-10 18:30:54 +02:00
wvengen
de794a48b0
Reorder roles and add icons
2015-04-04 10:56:42 +02:00
Patrick Gansterer
700eed27b8
Add last user login and activity
2015-03-03 14:55:30 +01:00
wvengen
c59ee3a6a7
Show wikipage on login screen when present
2015-02-28 14:50:25 +01:00
wvengen
1447b38bb3
Use foodsoft expansion variables in footer
2015-02-28 14:50:25 +01:00
Patrick Gansterer
124f77f2ab
Add messaging to order ( closes #327 )
2015-02-19 00:53:57 +01:00
wvengen
1b48882c0e
Refactor orders index
2015-02-18 23:46:50 +01:00
wvengen
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
Patrick Gansterer
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
Patrick Gansterer
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
wvengen
1c0db4374f
Merge pull request #332 from foodcoops/feature/edit-address
...
Allow to edit address from user profile
2014-12-23 21:00:20 +01:00
wvengen
bf6a31a032
Cleanup groups view on profile page
2014-12-16 21:14:20 +01:00
wvengen
86eee94249
Add hint for ordergroup address in user form
2014-12-16 20:53:38 +01:00
wvengen
56f6efa590
Allow to edit address from user profile
2014-12-10 21:27:53 +01:00
wvengen
cee2ac8f9f
Merge pull request #331 from foodcoops/feature/configure-upfront-tasks
...
Configure upfront tasks
2014-12-06 14:35:22 +01:00
wvengen
5c78bdde7e
Cleanup old task-related i18n
2014-11-23 01:42:15 +01:00
wvengen
f6c008c79c
Allow configuration of task periods
2014-11-23 01:34:51 +01:00
wvengen
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +01:00
wvengen
6188567931
hide message preferences when messages are disabled
2014-11-20 23:11:04 +01:00
wvengen
68d54e7e25
add sudo functionality
2014-10-18 17:58:31 +02:00
wvengen
a594dffed2
disable config validation (closes foodcoops#313)
2014-09-30 15:09:47 +02:00
wvengen
668ba1e5d6
add webstats_tracking_code to configuration screen (closes foodcoops#311)
2014-09-22 09:36:36 +02:00
Benjamin Meichsner
81d22e6077
Allow adding tracking code for webstatistics service. E.g. piwik.
2014-09-22 09:15:47 +02:00
wvengen
418a8b5806
fix i18n issues + localeapp roundtrip
...
thanks, i18n-tasks!
2014-09-15 13:52:35 +02:00
wvengen
f18cc367ae
workaround for CVE-2014-4920
2014-09-10 13:27:45 +02:00
wvengen
a699f95903
fix fax documents for stock orders (closes foodcoops#79)
2014-09-02 15:47:01 +02:00
wvengen
1a3b690757
add custom css to config screen
2014-09-02 15:02:26 +02:00
wvengen
cf680d3410
add page break to config screen
2014-09-02 15:02:26 +02:00
wvengen
68ccc19c70
allow to configure currency (closes foodcoops#258)
2014-09-02 15:02:25 +02:00
wvengen
3fee071a10
specify timezone in configuration (closes foodcoops#282)
2014-09-02 14:21:33 +02:00
wvengen
7b000c39eb
add foodcoop configuration screen
2014-09-02 14:21:32 +02:00
wvengen
97dc090e4d
Merge pull request #306 from wvengen/feature-styling
...
allow foodcoops to add custom css
2014-09-02 13:59:18 +02:00
wvengen
19630e8607
allow foodcoops to add custom css
2014-09-02 13:35:45 +02:00
wvengen
647b7f0430
allow to synchronize all articles of a shared supplier
2014-09-02 12:58:31 +02:00
wvengen
d9c61b2db3
allow to match category names on import/sync
2014-09-02 12:58:31 +02:00
wvengen
16b78ba2a0
fix shared import paging without query
2014-09-02 12:58:31 +02:00
wvengen
0b08d461fa
remove html escaping from all text mails
2014-09-01 11:08:32 +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
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
wvengen
fa725dbf38
fix csv download also when searching
2014-07-02 09:37:03 +02:00
wvengen
c80a9cd68b
fix csv download (closes foodcoop-adam#129)
2014-07-01 11:14:35 +02:00
wvengen
59ab628e2f
fix layout bug
2014-06-23 17:51:20 +02:00
wvengen
6466ea9653
revamp footer
2014-06-23 17:51:20 +02:00
wvengen
b112028935
fix invititation form
...
(complements 9146e99bca2011c52e9a06f987251e2f5d72b11e)
2014-06-23 17:51:19 +02:00
wvengen
4b6231129c
only show undeleted articles in receive screen
2014-06-23 17:51:19 +02:00
wvengen
9e58a6f2b1
fix csv download + template optional parameters
...
Conflicts:
app/views/finance/financial_transactions/_transactions.html.haml
app/views/home/ordergroup.html.haml
app/views/login/_accept_invitation_form.html.haml
2014-06-23 17:51:19 +02:00
wvengen
fee0cfbdc7
make orders helpers clearer
2014-06-23 17:51:19 +02:00
wvengen
e7a476e6b6
remove unused season import fields
2014-06-23 17:51:19 +02:00