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
|
dcf921dc8d
|
Improve delta-input styling
|
2015-11-18 22:44:38 +01:00 |
|
wvengen
|
90b21ecc3a
|
Allow increasing just tolerance in the boxfill phase
|
2015-11-13 18:10:46 +01:00 |
|
wvengen
|
9d7735849d
|
Disable relevant ordering buttons in boxfill phase
|
2015-11-13 18:10:46 +01:00 |
|
wvengen
|
adb6089773
|
Disable +/- buttons on boundaries in ordering
|
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
|
4a9cf862be
|
Merge pull request #373 from foodcoops/feature/current-orders-plugin
Add current_orders plugin
|
2015-08-07 19:36:05 +02:00 |
|
wvengen
|
cb000a0438
|
Fix current_order PDFs and update article/group PDFs too
|
2015-07-21 00:13:15 +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
|
b07e855235
|
Make compatible with Ruby 2.0
|
2015-06-05 15:35:19 +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 |
|
Alexander Kirk
|
d9b3064c2e
|
fix missing units calculation, change missing-none background color
|
2015-05-19 17:58:29 +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
|
a8a434ef7b
|
Move due date according to delta
|
2015-05-01 21:31:06 +02:00 |
|
Robert
|
fd51b07e21
|
Allow editing recurring task groups, basic functionality for #152
|
2015-05-01 21:14:16 +02:00 |
|
wvengen
|
aa7a2a31ae
|
Bundle update & restructure tests (RSpec 3)
|
2015-04-25 17:14:37 +02:00 |
|
wvengen
|
dd799cf642
|
Allow to sort receive on unit
|
2015-04-22 20:08:24 +02:00 |
|
wvengen
|
17cbc57850
|
Don't error when deleting supplier/group with already existing deleted name (closes foodcoops/foodsoft#197)
|
2015-04-17 20:09:40 +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
|
5d47171b76
|
Improve upload error handling
|
2015-04-17 18:44:38 +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
|
d5a7f6a074
|
Move file import logic to model
|
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
|
08c8d25a9d
|
New message form and checkbox papercuts
|
2015-04-11 02:32:30 +02:00 |
|
wvengen
|
f47e0b5b2a
|
Give a bit more space to token inputs
|
2015-04-11 02:18:55 +02:00 |
|
wvengen
|
379dc86ffa
|
Make order_pdf more generally useful
|
2015-04-10 21:30:04 +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
|
497488ef0e
|
Improve associations
|
2015-04-10 18:30:12 +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 |
|