Commit graph

78 commits

Author SHA1 Message Date
Philipp Rothmann
85bdf28f91 merge automatic group order invoice generation
see https://github.com/foodcoops/foodsoft/pull/907 for reference
and original work by viehlieb

Co-authored-by: viehlieb <pf@pragma-shift.net>

fix PDF Pdf
2023-08-11 10:48:52 +02:00
twothreenine
b2a6c198ac
Improve invoice and supplier show views (#840) 2021-03-24 21:29:44 +01:00
Patrick Gansterer
ff76fa60c0 Allow deletion of financial transactions 2019-11-01 20:56:00 +01:00
MatCast
7136d015c4 Added css to improve smaller screen usability (PR #668) 2019-06-05 21:50:11 +02:00
Patrick Gansterer
6cc02cb563 Add format helper for currency 2018-10-11 21:56:46 +02:00
Patrick Gansterer
dc94e98138 Add folders to the documents plugin 2017-11-21 10:12:13 +01:00
Patrick Gansterer
8ac1471a89 Add message threads #394
This new view sorts the messages by threads based on the reply_to.
Now we store only the message which started a new thread in the reply_to
field to avoid recursive queries.
2016-03-04 16:52:34 +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
945a9e4d4a Use bootstrap buttons for ordering 2015-11-13 18:10:46 +01:00
wvengen
9efa9d5d43 Handle errors using Gaffe 2015-07-21 00:08:17 +02:00
wvengen
08c8d25a9d New message form and checkbox papercuts 2015-04-11 02:32:30 +02:00
wvengen
bf6a31a032 Cleanup groups view on profile page 2014-12-16 21:14:20 +01:00
wvengen
7b000c39eb add foodcoop configuration screen 2014-09-02 14:21:32 +02:00
wvengen
6466ea9653 revamp footer 2014-06-23 17:51:20 +02:00
wvengen
2bf13dbefa give partially unused order articles a distinct colour 2014-06-23 17:51:19 +02:00
wvengen
2a6e0e0460 fix asset url in css (unbreaks heroku image 404) 2014-06-23 17:51:18 +02:00
wvengen
4c1e5e2b00 fix default textarea height 2014-05-13 17:01:27 +02:00
wvengen
60826ceedc allow to edit GroupOrderArticle result from orders screen
Conflicts:
	app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
wvengen
f9d2c20aaa cleanup articles sorted in groups 2014-02-10 15:58:58 +01:00
wvengen
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
wvengen
8b4c292ea0 Merge pull request #222 from wvengen/feature-receive
New receive screen
2014-01-20 03:02:27 -08:00
wvengen
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
wvengen
b2f032ac8e fix bootstrap menu on mobile [ci skip] 2014-01-13 14:45:48 +01:00
wvengen
90c81de872 update receive delta column + responsive css 2014-01-09 12:20:54 +01:00
wvengen
56bd527a8b keep white input background with package class [ci skip] 2014-01-09 10:51:54 +01:00
wvengen
b331d9a2a9 better css responsiveness [ci skip] 2014-01-08 19:58:51 +01:00
wvengen
65e79d7e1b small receive usability changes 2014-01-08 19:28:39 +01:00
wvengen
dcc3d21b4d center table rows vertically [ci skip] 2014-01-08 10:32:30 +01:00
Julius
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
wvengen
133429720c old price display tweaks 2014-01-03 14:11:50 +01:00
wvengen
9219d099c8 ui update for packages display 2014-01-03 12:42:36 +01:00
wvengen
014a62aa11 use disabled property for input and fix style 2014-01-03 10:59:42 +01:00
wvengen
a439f26b67 ui design update 2014-01-02 22:30:04 +01:00
wvengen
f5bd7a43e4 update balancing order article edit screen to support received units 2013-12-23 15:25:45 +01:00
wvengen
82d1c41e9f update show order 2013-12-18 21:46:34 +01:00
wvengen
2b511ee559 Merge branch 'master' into fresh-flow
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
2013-12-18 17:03:26 +01:00
wvengen
c5b1236f21 Merge pull request #218 from foodcoop-adam/article-dialog
Edit article user-interface update
2013-12-17 06:29:04 -08:00
wvengen
3f497e9274 allow more than two columns in horizontal form 2013-12-10 23:41:45 +01:00
wvengen
da737793e8 workaround help block margin issue [ci skip] 2013-12-10 16:50:04 +01:00
wvengen
85b6ff908b make new article dialog more responsive 2013-12-10 16:41:26 +01:00
Julius
cdb87a8389 Highlight created/updated stock_article in StockArticle#index view 2013-12-07 17:10:40 +01:00
wvengen
62ca3cb634 small layout cleanup [ci skip] 2013-12-06 14:49:13 +01:00
wvengen
2f10210c76 remove unimplemented unit_divide box 2013-12-06 14:38:28 +01:00
wvengen
c99aa7aab6 add availability to article edit dialog 2013-12-06 14:33:51 +01:00
wvengen
923b579bd1 Merge branch 'master' into article-dialog
Conflicts:
	app/assets/stylesheets/bootstrap_and_overrides.css.less
2013-12-06 14:26:50 +01:00
wvengen
3937400683 fix modal dialog margin [ci skip] 2013-12-06 14:26:04 +01:00
wvengen
c900cf4988 make product redistribution work! 2013-11-27 00:06:25 +01:00
wvengen
9c340ec08e more clarity whether a number is number units or boxes 2013-11-25 15:13:54 +01:00
wvengen
bd1b932775 add receive screen, quantities for model, redistribution 2013-11-25 14:17:31 +01:00