efb929e64f
Allow editing of linked deliveries and orders at invoice
2016-03-11 13:23:13 +01:00
b56df39623
Merge pull request #417 from foodcoop1040/deliveries_col
...
Hide deliveries column if there are no deliveries
2016-03-11 11:53:40 +01:00
0b70ce39a8
Merge pull request #414 from foodcoop1040/ftc
...
Add a button to add all ordergroups to a new finanacial transaction c…
2016-03-07 19:45:45 +01:00
b4e2ddf66d
Merge pull request #412 from foodcoop1040/confirm
...
Get rid of duplicated confirm_delete translations
2016-03-07 19:44:06 +01:00
7d7dfd7155
Hide deliveries column if there are no deliveries
...
For foodcoops which do not use the delivery feature the column occupies
space in the table, which could be user better with something else.
2016-03-06 14:01:24 +01:00
a5d0c5ccab
Add a button to add all ordergroups to a new finanacial transaction collection
...
This function can be used if we need to add the same financial transaction
to all ordergroups at the same time. E.g. the monthly membership fee.
2016-03-06 11:53:31 +01:00
c62104a388
Get rid of duplicated confirm_delete translations
2016-03-04 23:13:28 +01:00
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
1efd3745df
Replace "count > 0" with "any?"
2016-03-04 20:01:56 +01:00
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
b30b4e46d8
Order items in select boxes
2016-03-04 18:28:00 +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
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
9efa9d5d43
Handle errors using Gaffe
2015-07-21 00:08:17 +02:00
c08c29b0e7
Don't show deleted ordergroups ( closes foodcoops/foodsoft#362 )
2015-04-17 18:27:50 +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
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
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
ef0888f38d
add view for all transactions + csv
2014-06-23 17:51:17 +02:00
852f3484ad
make settle directly less dangerous
...
(closes foodcoops#275)
2014-05-13 17:01:26 +02:00
0fa9bebac9
show supplier user-interface update
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
60826ceedc
allow to edit GroupOrderArticle result from orders screen
...
Conflicts:
app/assets/javascripts/application.js
2014-02-10 16:03:08 +01:00
7ebb2459e0
make click work better on touch devices (closes foodcoops#104)
2014-01-25 15:19:50 +01:00
9219d099c8
ui update for packages display
2014-01-03 12:42:36 +01:00
8e52fca304
Do not set quantity of newly created OrderArticles to 1
2014-01-02 19:17:46 +01:00
59c118a171
Apply publish/subscribe for OrderArticle#create
2014-01-02 19:16:03 +01:00
baa5f16cfc
Free order_article resource from finance namespace; also unlock for role_orders
2014-01-02 19:14:41 +01:00
81dfe8110c
Apply publish/subscribe for OrderArticle#update
2014-01-02 19:14:07 +01:00
27a73be68f
Merge remote-tracking branch 'foodcoops/master' into feature-receive
2014-01-02 18:57:59 +01:00
b22677eced
Change order link from invoice form to avoid access problems
2013-12-30 11:26:10 +01:00
f5bd7a43e4
update balancing order article edit screen to support received units
2013-12-23 15:25:45 +01:00
03bb83ecc0
show different warning signs for mismatch with ordered and received
2013-12-23 12:35:09 +01:00
41ea9ed66e
hide receive screen for stock orders
2013-12-21 17:36:25 +01:00
3d511ea2fb
only show receive in finance when access to ordering
2013-12-18 22:19:36 +01:00
84fe791078
update balancing screen
2013-12-18 22:10:38 +01:00
d299fa4870
move receive screen to orders
2013-12-18 21:08:58 +01:00
1ab09b41bd
fix articles_for_select2 helper
2013-12-18 17:34:45 +01:00
2b511ee559
Merge branch 'master' into fresh-flow
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
2013-12-18 17:03:26 +01:00
40e9e82295
Mark two i18n issues
2013-12-14 10:03:32 +01:00
d448707b1a
i18n cleanup (affects foodcoops#137)
2013-12-12 00:13:19 +01:00
c900cf4988
make product redistribution work!
2013-11-27 00:06:25 +01:00
2d99141229
only allow to add articles not already present in receive
2013-11-26 13:31:07 +01:00
9cb9bf6c1a
focus newly added input in receive
2013-11-26 13:00:34 +01:00
9990e059d4
fix i18n
2013-11-25 15:24:20 +01:00
9c340ec08e
more clarity whether a number is number units or boxes
2013-11-25 15:13:54 +01:00
bd1b932775
add receive screen, quantities for model, redistribution
2013-11-25 14:17:31 +01:00
135e938d3d
i18n cleanups (affects #137 )
2013-11-23 12:05:29 +01:00
c37ed74942
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/foodcoop/users/_users.html.haml
2013-10-29 19:15:52 +01:00
98e7189d31
Merge branch 'master' into i18n
...
Conflicts:
app/assets/javascripts/application.js
2013-10-18 12:30:34 +02:00
67e29620f4
i18n simple_form move of invoices
2013-10-09 23:37:08 +02:00
a9dff7f1df
add missing i18n
2013-10-04 10:25:53 +02:00
e4f0a1e3ed
start of making nickname optional
2013-09-20 22:40:13 +02:00
0abb63279f
Merge branch 'master' into updated-gems
...
Conflicts:
Gemfile.lock
2013-09-18 13:00:26 +02:00
e20898c5ee
Merge branch 'tests-rspec' into master-spec
2013-09-10 11:37:05 +02:00
12c0636941
fix i18n buglets ( closes #167 )
2013-09-10 10:27:13 +02:00
37e5b0c25c
add balancing integration spec
2013-07-26 18:34:03 +02:00
33b27d2fa7
proper usage of jQuery.on(), and update javascript in views as well
2013-07-08 22:41:06 +02:00
cab6ada8b8
small invoice i18n cleanup/refactoring
2013-06-21 14:24:05 +02:00
906093b3ce
small i18n fixes and clarifications
2013-06-21 13:49:34 +02:00
3cfd8b2d44
fix i18n key
2013-06-21 13:25:52 +02:00
3d1847fabb
small i18n and translation updates
2013-06-12 22:44:51 +02:00
8929f69dc4
add missing i18n text
2013-06-06 02:42:38 +02:00
3b7cbf71e0
fix i18n typos
2013-05-16 00:05:47 +02:00
f6ba21832d
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/articles_controller.rb
app/views/articles/_form.html.haml
app/views/articles/sync.html.haml
app/views/finance/balancing/_edit_note.html.haml
app/views/finance/group_order_articles/_form.html.haml
app/views/finance/order_articles/_edit.html.haml
app/views/finance/order_articles/_new.html.haml
app/views/group_orders/show.html.haml
app/views/invites/_modal_form.html.haml
2013-04-12 15:45:24 +02:00
6c65799025
use more beautiful close mark
2013-04-10 17:34:24 +02:00
4966aae0ad
Fixed modal forms. Submit form when hitting enter.
2013-04-08 14:27:23 +02:00
9c21a14c7e
Update group results when editing order article in balancing.
2013-04-08 14:26:40 +02:00
f1d6df9ecc
move commonly used verbs to common i18n identifier
2013-04-04 02:49:52 +02:00
7af796c09c
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
2013-03-21 22:08:09 +01:00
dd0bd0ad7e
Fixed updating order article in stockit balancing.
2013-03-17 18:33:04 +01:00
c05b3e0e19
Balancing: Do not update oder summary automaticly when changing group orders.
2013-03-17 15:47:50 +01:00
6196bdae41
Added some eager loading for balancing new.
2013-03-12 12:38:08 +01:00
19527f8425
fix some link handling in i18n (using html_safe)
2013-03-09 00:48:52 +01:00
b81f414ae5
finish finance/order_articles i18n + en translation
2013-03-08 23:35:50 +01:00
2b03a15a9a
finish finance invoice i18n and en translation
2013-02-27 12:31:01 +01:00
0065c44b74
i18n finance ordergroups
2013-02-11 10:21:39 +07:00
d2cd5b2b02
i18n group order articles
2013-02-11 10:21:39 +07:00
640e9799aa
i18n financial_transactions + controller
2013-02-11 10:21:39 +07:00
8be93c33f8
i18n finance + controller
2013-02-10 15:05:31 +07:00
620ec946f1
Merge branch 'master' into master-rails3-merging
...
Conflicts:
.gitignore
.rbenv-version
app/controllers/finance/balancing_controller.rb
app/views/finance/balancing/_order_article_form.html.haml
Fixed updating current price in finance balancing.
2012-12-11 10:32:59 +01:00
f4f10b1e4c
Introduced actionbar. Some fixes for balancing page.
2012-11-12 13:13:01 +01:00
0236fb5a60
Fixed finance module to work with bootstrap design.
2012-11-10 16:44:05 +01:00
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
29a6cd8b62
Upgraded to rails 3.1.8. Fixed various bugs in wiki.
2012-09-30 21:15:55 +02:00
5fb0bc2444
Big feactoring and bug fixing, Mailer, Tasks, GroupOrders
2012-08-24 11:11:40 +02:00
af3c07f031
Simplifiying balancing view part 2. Lets call it finished.
2012-07-27 18:03:46 +02:00
cda3c37e20
Umlaute eingefügt
2012-07-19 15:37:17 +02:00
2c1385c9ce
Preisänderungen beim Abrechnen können auch global angewandt werden.
2012-07-18 22:16:08 +02:00
467874a8a5
Simplify balancing view. Part 1 of ...
2012-06-21 17:19:00 +02:00
6bd4bbec86
Deactivated broken links in balancing.
2012-05-12 11:18:46 +02:00
c49edb79a2
Fixed edit_not in balancing.
2012-05-12 10:55:20 +02:00
b295f62322
Updated finance/invoices
2012-04-20 18:33:47 +02:00
Patrick Gansterer
wvengen
wvengen
Julius
Benjamin Meichsner
Manuel Wiedenmann
davidrabel