Commit graph

134 commits

Author SHA1 Message Date
wvengen
b4e2ddf66d Merge pull request #412 from foodcoop1040/confirm
Get rid of duplicated confirm_delete translations
2016-03-07 19:44:06 +01:00
Patrick Gansterer
c62104a388 Get rid of duplicated confirm_delete translations 2016-03-04 23:13:28 +01:00
Patrick Gansterer
5e744453f8 Add more infos to the invoice page
When a foodcoop does not use the balancing feature the invoice page is
the main page for informations. Add all related information to it, so
people do not need to open the balancing page.
2016-03-04 22:26:55 +01:00
Patrick Gansterer
1efd3745df Replace "count > 0" with "any?" 2016-03-04 20:01:56 +01:00
Patrick Gansterer
b623b6abbf Remove useless if in invoices form
The created_at field has a value all the time, so the check if it is set
make no sense since it evaluates to true all the time.
2016-03-04 19:06:05 +01:00
Patrick Gansterer
b30b4e46d8 Order items in select boxes 2016-03-04 18:28:00 +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
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
9efa9d5d43 Handle errors using Gaffe 2015-07-21 00:08:17 +02:00
wvengen
c08c29b0e7 Don't show deleted ordergroups (closes foodcoops/foodsoft#362) 2015-04-17 18:27:50 +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
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
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
ef0888f38d add view for all transactions + csv 2014-06-23 17:51:17 +02:00
wvengen
852f3484ad make settle directly less dangerous
(closes foodcoops#275)
2014-05-13 17:01:26 +02:00
wvengen
0fa9bebac9 show supplier user-interface update 2014-05-13 17:01:24 +02:00
wvengen
7841245795 migrate to Rails 4.0 (closes foodcoops#214)
Conflicts:
	Gemfile.lock
2014-02-24 12:46:28 +01: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
7ebb2459e0 make click work better on touch devices (closes foodcoops#104) 2014-01-25 15:19:50 +01:00
wvengen
9219d099c8 ui update for packages display 2014-01-03 12:42:36 +01:00
Julius
8e52fca304 Do not set quantity of newly created OrderArticles to 1 2014-01-02 19:17:46 +01:00
Julius
59c118a171 Apply publish/subscribe for OrderArticle#create 2014-01-02 19:16:03 +01:00
Julius
baa5f16cfc Free order_article resource from finance namespace; also unlock for role_orders 2014-01-02 19:14:41 +01:00
Julius
81dfe8110c Apply publish/subscribe for OrderArticle#update 2014-01-02 19:14:07 +01:00
wvengen
27a73be68f Merge remote-tracking branch 'foodcoops/master' into feature-receive 2014-01-02 18:57:59 +01:00
Julius
b22677eced Change order link from invoice form to avoid access problems 2013-12-30 11:26:10 +01:00
wvengen
f5bd7a43e4 update balancing order article edit screen to support received units 2013-12-23 15:25:45 +01:00
wvengen
03bb83ecc0 show different warning signs for mismatch with ordered and received 2013-12-23 12:35:09 +01:00
wvengen
41ea9ed66e hide receive screen for stock orders 2013-12-21 17:36:25 +01:00
wvengen
3d511ea2fb only show receive in finance when access to ordering 2013-12-18 22:19:36 +01:00
wvengen
84fe791078 update balancing screen 2013-12-18 22:10:38 +01:00
wvengen
d299fa4870 move receive screen to orders 2013-12-18 21:08:58 +01:00
wvengen
1ab09b41bd fix articles_for_select2 helper 2013-12-18 17:34:45 +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
Julius
40e9e82295 Mark two i18n issues 2013-12-14 10:03:32 +01:00
wvengen
d448707b1a i18n cleanup (affects foodcoops#137) 2013-12-12 00:13:19 +01:00
wvengen
c900cf4988 make product redistribution work! 2013-11-27 00:06:25 +01:00
wvengen
2d99141229 only allow to add articles not already present in receive 2013-11-26 13:31:07 +01:00
wvengen
9cb9bf6c1a focus newly added input in receive 2013-11-26 13:00:34 +01:00
wvengen
9990e059d4 fix i18n 2013-11-25 15:24:20 +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
wvengen
135e938d3d i18n cleanups (affects #137) 2013-11-23 12:05:29 +01:00