Commit graph

784 commits

Author SHA1 Message Date
Patrick Gansterer
6015d16cab Add link for creating invoice at an order 2016-03-04 17:12:46 +01:00
Patrick Gansterer
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
wvengen
d56828fa4d Show last user activity in admin ordergroups too 2016-03-04 16:28:22 +01:00
Patrick Gansterer
8b8693df5a Show last activity of ordergroups 2016-03-04 16:16:09 +01:00
wvengen
4cacb740d1 Small improvement in invoice edit 2016-03-04 16:14:54 +01:00
Patrick Gansterer
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
Patrick Gansterer
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
Patrick Gansterer
a97eee68b1 Make date clickable in finance overview #392 2016-02-24 00:39:50 +01:00
Patrick Gansterer
a42dd07d5c Make invoice date clickable #391 2016-02-24 00:39:34 +01:00
Patrick Gansterer
3d6f908102 Add created_by to invoice and show it 2016-02-24 00:39:07 +01:00
wvengen
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
wvengen
6a0147d2e7 Improve article header consistency 2015-11-18 22:44:38 +01:00
wvengen
9d7735849d Disable relevant ordering buttons in boxfill phase 2015-11-13 18:10:46 +01:00
wvengen
945a9e4d4a Use bootstrap buttons for ordering 2015-11-13 18:10:46 +01:00
wvengen
a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
wvengen
c1413ff817 Allow clearing default order schedule 2015-10-23 14:53:01 +02:00
wvengen
9efa9d5d43 Handle errors using Gaffe 2015-07-21 00:08:17 +02:00
wvengen
58df186a2a Make sharedlists optional (and disabled by default) 2015-07-20 22:33:28 +02:00
wvengen
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
wvengen
1a62ce55e3 Fix task form 2015-05-08 20:54:48 +02:00
wvengen
ec03d579d0 Merge branch 'feature/edit-recurring-task'
Conflicts:
	config/locales/en.yml
2015-05-08 20:10:23 +02:00
wvengen
a00e7c94be Rework user-interface for editing recurring tasks 2015-05-08 17:39:20 +02:00
Alexander Kirk
75967bad22 Add color marking to items in group orders that have missing items 2015-05-04 06:16:14 +02:00
Robert
fd51b07e21 Allow editing recurring task groups, basic functionality for #152 2015-05-01 21:14:16 +02:00
wvengen
dd799cf642 Allow to sort receive on unit 2015-04-22 20:08:24 +02:00
wvengen
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
wvengen
c08c29b0e7 Don't show deleted ordergroups (closes foodcoops/foodsoft#362) 2015-04-17 18:27:50 +02:00
wvengen
c30ec67548 Allow synchronising units when uploading 2015-04-11 02:52:57 +02:00
wvengen
4d1e102f47 Checkbox to remove articles not in upload 2015-04-11 02:52:57 +02:00
wvengen
6ce1b7f928 Handle errors in upload and sync form 2015-04-11 02:52:57 +02:00
wvengen
0d92007274 Improve upload form 2015-04-11 02:52:57 +02:00
wvengen
16e9210035 Fix title of new upload screen 2015-04-11 02:52:57 +02:00
wvengen
07ba6f0535 Import multiple spreadsheet formats. Make upload work like sync. 2015-04-11 02:52:57 +02:00
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