b05ac2ab64
Add deleted_at for User
...
Do not remove the user from the database. Mark as deleted instead.
2016-03-04 19:03:52 +01:00
01cf6431a9
Add messagegroup
...
Messagegroups are a new kind of group. Every user can join and leave such a
group on her own. They are useful to create topics for mails.
E.g. if there is a weekly newsletter we can create a new messagegroup for
it and every user which is interested in receiving the newsletter can join
the corresponding group.
2016-03-04 18:32:57 +01:00
b30b4e46d8
Order items in select boxes
2016-03-04 18:28:00 +01:00
72ef31c0ec
Make unassigned tasks more prominent in the dashboard
...
Show all unassigned task in the dashboard to make it more interesting
for members to pick tasks. Some members do not (want to) click on the
task list very often it is not clear if there are new tasks if we show
the number of unassigned tasks only.
2016-03-04 17:15:45 +01:00
6015d16cab
Add link for creating invoice at an order
2016-03-04 17:12:46 +01:00
d383288f4f
Add missing class="btn" to edit button of invoice
...
This aligns the interface with all other pages.
2016-03-04 17:04:00 +01:00
d56828fa4d
Show last user activity in admin ordergroups too
2016-03-04 16:28:22 +01:00
8b8693df5a
Show last activity of ordergroups
2016-03-04 16:16:09 +01:00
4cacb740d1
Small improvement in invoice edit
2016-03-04 16:14:54 +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
460cf1e82c
Change relationship of invoices #390
...
This change will allow us to have invoices for more than one order/delivery
in the future. There are no UI changes for now.
2016-03-04 15:55:39 +01:00
a97eee68b1
Make date clickable in finance overview #392
2016-02-24 00:39:50 +01:00
a42dd07d5c
Make invoice date clickable #391
2016-02-24 00:39:34 +01:00
3d6f908102
Add created_by to invoice and show it
2016-02-24 00:39:07 +01:00
227ca0dd84
Merge pull request #387 from foodcoops/feature/boxfills
...
Add optional boxfill phase to orders (+ bootstrap buttons)
2015-11-20 14:25:41 +01:00
6a0147d2e7
Improve article header consistency
2015-11-18 22:44:38 +01:00
9d7735849d
Disable relevant ordering buttons in boxfill phase
2015-11-13 18:10:46 +01:00
945a9e4d4a
Use bootstrap buttons for ordering
2015-11-13 18:10:46 +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
9efa9d5d43
Handle errors using Gaffe
2015-07-21 00:08:17 +02:00
58df186a2a
Make sharedlists optional (and disabled by default)
2015-07-20 22:33:28 +02:00
6ded06a8ce
Merge pull request #365 from akirk/master
...
Add color marking to items in group orders that have missing items
2015-06-04 10:02:09 +02:00
1a62ce55e3
Fix task form
2015-05-08 20:54:48 +02:00
ec03d579d0
Merge branch 'feature/edit-recurring-task'
...
Conflicts:
config/locales/en.yml
2015-05-08 20:10:23 +02:00
a00e7c94be
Rework user-interface for editing recurring tasks
2015-05-08 17:39:20 +02:00
75967bad22
Add color marking to items in group orders that have missing items
2015-05-04 06:16:14 +02:00
fd51b07e21
Allow editing recurring task groups, basic functionality for #152
2015-05-01 21:14:16 +02:00
dd799cf642
Allow to sort receive on unit
2015-04-22 20:08:24 +02:00
b028431bf0
Merge pull request #361 from foodcoops/feature/spreadsheets
...
Let upload provide same functionality as shared database sync
2015-04-17 19:18:44 +02:00
c08c29b0e7
Don't show deleted ordergroups ( closes foodcoops/foodsoft#362 )
2015-04-17 18:27:50 +02:00
c30ec67548
Allow synchronising units when uploading
2015-04-11 02:52:57 +02:00
4d1e102f47
Checkbox to remove articles not in upload
2015-04-11 02:52:57 +02:00
6ce1b7f928
Handle errors in upload and sync form
2015-04-11 02:52:57 +02:00
0d92007274
Improve upload form
2015-04-11 02:52:57 +02:00
16e9210035
Fix title of new upload screen
2015-04-11 02:52:57 +02:00
07ba6f0535
Import multiple spreadsheet formats. Make upload work like sync.
2015-04-11 02:52:57 +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
de794a48b0
Reorder roles and add icons
2015-04-04 10:56:42 +02:00
700eed27b8
Add last user login and activity
2015-03-03 14:55:30 +01:00
c59ee3a6a7
Show wikipage on login screen when present
2015-02-28 14:50:25 +01:00
1447b38bb3
Use foodsoft expansion variables in footer
2015-02-28 14:50:25 +01: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
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
bf6a31a032
Cleanup groups view on profile page
2014-12-16 21:14:20 +01:00
86eee94249
Add hint for ordergroup address in user form
2014-12-16 20:53:38 +01:00
56f6efa590
Allow to edit address from user profile
2014-12-10 21:27:53 +01:00
cee2ac8f9f
Merge pull request #331 from foodcoops/feature/configure-upfront-tasks
...
Configure upfront tasks
2014-12-06 14:35:22 +01:00
5c78bdde7e
Cleanup old task-related i18n
2014-11-23 01:42:15 +01:00
f6c008c79c
Allow configuration of task periods
2014-11-23 01:34:51 +01:00
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +01:00
6188567931
hide message preferences when messages are disabled
2014-11-20 23:11:04 +01:00
68d54e7e25
add sudo functionality
2014-10-18 17:58:31 +02:00
a594dffed2
disable config validation (closes foodcoops#313)
2014-09-30 15:09:47 +02:00
668ba1e5d6
add webstats_tracking_code to configuration screen (closes foodcoops#311)
2014-09-22 09:36:36 +02:00
81d22e6077
Allow adding tracking code for webstatistics service. E.g. piwik.
2014-09-22 09:15:47 +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
a699f95903
fix fax documents for stock orders (closes foodcoops#79)
2014-09-02 15:47:01 +02:00
1a3b690757
add custom css to config screen
2014-09-02 15:02:26 +02:00
cf680d3410
add page break to config screen
2014-09-02 15:02:26 +02:00
68ccc19c70
allow to configure currency (closes foodcoops#258)
2014-09-02 15:02:25 +02:00
3fee071a10
specify timezone in configuration (closes foodcoops#282)
2014-09-02 14:21:33 +02:00
7b000c39eb
add foodcoop configuration screen
2014-09-02 14:21:32 +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
d9c61b2db3
allow to match category names on import/sync
2014-09-02 12:58:31 +02:00
16b78ba2a0
fix shared import paging without query
2014-09-02 12:58:31 +02:00
0b08d461fa
remove html escaping from all text mails
2014-09-01 11:08:32 +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
fa725dbf38
fix csv download also when searching
2014-07-02 09:37:03 +02:00
c80a9cd68b
fix csv download (closes foodcoop-adam#129)
2014-07-01 11:14:35 +02:00
59ab628e2f
fix layout bug
2014-06-23 17:51:20 +02:00
6466ea9653
revamp footer
2014-06-23 17:51:20 +02:00
b112028935
fix invititation form
...
(complements 9146e99bca2011c52e9a06f987251e2f5d72b11e)
2014-06-23 17:51:19 +02:00
4b6231129c
only show undeleted articles in receive screen
2014-06-23 17:51:19 +02:00
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
fee0cfbdc7
make orders helpers clearer
2014-06-23 17:51:19 +02:00
e7a476e6b6
remove unused season import fields
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
ef0888f38d
add view for all transactions + csv
2014-06-23 17:51:17 +02:00
7b51f7aabe
fix negative balance email
2014-05-30 10:22:47 +02:00
5d9c9856d1
show proper error when all articles are deselected in order edit
2014-05-13 17:01:27 +02:00
3953c21ae2
use capture instead of layout-hack to allow deface overrides
2014-05-13 17:01:27 +02:00
852f3484ad
make settle directly less dangerous
...
(closes foodcoops#275)
2014-05-13 17:01:26 +02:00
7556c753d0
Extract message system to plugin.
2014-05-13 17:01:25 +02:00
fe0b17cdb0
cleanup email footer
2014-05-13 17:01:25 +02:00
48e9a3e4f5
add fax csv
2014-05-13 17:01:25 +02:00
3f032e5dd9
make apple points optional
...
a next step would be to move this to a plugin
2014-05-13 17:01:25 +02:00
0fa9bebac9
show supplier user-interface update
2014-05-13 17:01:24 +02:00
0014435663
improved shared database import ui
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
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
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
c322545f85
fix i18n buglet
2014-02-06 10:15:20 +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
d08f120b27
show message when ignoring articles due to missing order number
2014-01-24 22:20:29 +01:00
8db516c5f0
Merge branch 'master' into feature-cleaner_order_details
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
2014-01-20 13:36:46 +01:00
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
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
b30b424540
Merge branch 'master' into feature-receive
...
Conflicts:
app/helpers/finance/order_articles_helper.rb
2014-01-09 18:42:29 +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
bdb9499535
fix broken update password flow
2014-01-08 14:09:28 +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
69a29b8296
Merge pull request #245 from fsmanuel/rss_feed + 1
2014-01-06 13:55:32 +01:00
f83f6971e8
Rename update_current_price to update_global_price to avoid confusion
2014-01-04 21:35:19 +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
a8e604c196
When receiving: hide OrderArticle unit fields also after failed validation
2014-01-04 20:46:50 +01:00
aa57cee96f
do not show units fields in receive edit order article screen
2014-01-04 20:46:13 +01:00
0d0ff90a64
adds an RSS feed for pages/all
2014-01-04 20:12:01 +01:00
b800da9b9b
use helper in ajax update too
2014-01-03 14:52:44 +01:00
436ebc0190
Merge pull request #234 from foodcoop-adam/article-dialog
...
introduce new layout in balancing article screen as well
2014-01-03 05:16:03 -08: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
a439f26b67
ui design update
2014-01-02 22:30:04 +01:00
8e52fca304
Do not set quantity of newly created OrderArticles to 1
2014-01-02 19:17:46 +01:00
a384532619
Revert some changes of 20adce8a4e2d32548e7d7016dace250dd3e2eb9b
2014-01-02 19:17:41 +01:00
033aa90698
Use OrderArticle#create in receive form instead of Order#add_article
2014-01-02 19:16:09 +01:00
Patrick Gansterer
wvengen
wvengen
Alexander Kirk
Robert
wvengen
Benjamin Meichsner
Julius
Manuel Wiedenmann