Commit graph

2201 commits

Author SHA1 Message Date
wvengen
46275fa564 Merge pull request #458 from foodcoop1040/break
Hide break in shared group template if empty
2017-02-03 23:05:22 +01:00
wvengen
d330b57b8a Merge pull request #457 from foodcoop1040/translations
Fix translations of messages plugin
2017-02-03 23:04:29 +01:00
Patrick Gansterer
e0dbd396e1 Hide break in shared group template if empty 2017-02-03 20:30:28 +01:00
Patrick Gansterer
eb2fc56fc8 Fix translations of messages plugin
We need to copy the locales of overrides into the main locales files
to work properly. Also add the missing German translations.
2017-02-03 20:25:00 +01:00
wvengen
571d927360 Merge pull request #454 from foodcoop1040/done
Make sure that newly created periodic task are not done
2017-01-28 17:09:34 +01:00
wvengen
1410e242a4 Merge pull request #455 from foodcoop1040/confirm_delete
Fix UI string for confirm_delete in documents plugin
2017-01-28 17:09:13 +01:00
Patrick Gansterer
a7f86dd0cd Fix UI string for confirm_delete in documents plugin 2017-01-26 22:49:13 +01:00
Patrick Gansterer
1056b86f9d Make sure that newly created periodic task are not done 2017-01-26 20:54:53 +01:00
wvengen
2072fbb4d5 Allow plugins to override some document prices 2017-01-21 22:44:11 +01:00
Patrick Gansterer
c6731b4e4f Add IBAN field to supplier and user model 2017-01-21 22:43:48 +01:00
Patrick Gansterer
925727d3ae Show button for creating invoices also at finished orders
Check if a order is not opened instead of checking if it is closed.
2017-01-21 22:42:16 +01:00
Patrick Gansterer
233ed415c7 Add "Copy" button for settled orders #383 2017-01-21 22:41:44 +01:00
Patrick Gansterer
e742958c0c Add missing German translations 2017-01-21 22:41:18 +01:00
wvengen
1ba84f03d5 Merge pull request #444 from foodcoop1040/docker
Add missing dependency in Dockerfile
2016-10-15 11:43:27 +02:00
Patrick Gansterer
ad2f2c5ead Add missing dependency in Dockerfile 2016-10-14 18:14:41 +02:00
wvengen
22aa9cd84a Fix changelog markup 2016-08-12 21:51:41 +02:00
wvengen
7009b36a64 continue development after release 2016-08-12 16:03:48 +02:00
wvengen
a7b6b0c803 Bumped new version: 4.5.1 2016-08-12 16:03:20 +02:00
wvengen
36706511c0 Be a bit more safe displaying stock ordergroup 2016-08-12 15:56:45 +02:00
wvengen
d06a9ed3f0 Fix dynamic select2 usage (oops!) 2016-08-12 15:54:28 +02:00
wvengen
326016dfb5 Fix tricky i18n error on html render (not js) 2016-08-09 20:38:55 +02:00
wvengen
bd22da50a6 Fix missing asset in wiki 2016-08-08 21:17:42 +02:00
wvengen
fc32c12ccd continue development after release 2016-06-28 20:53:21 +02:00
wvengen
bf62abefbc Bumped new version: 4.5.0 2016-06-28 20:50:48 +02:00
wvengen
0d309af5f6 Update translations from localeapp 2016-06-28 20:43:53 +02:00
wvengen
402a6e4251 Update changelog 2016-06-11 20:23:59 +02:00
wvengen
9e53b01ca3 Update Gemfile versions where it doesn't break things 2016-06-11 19:42:14 +02:00
wvengen
c2dc1d8697 Bundle update 2016-06-11 19:23:46 +02:00
wvengen
c6a625e5ed Localeapp update 2016-06-11 19:19:30 +02:00
wvengen
30f2a4c25b Merge pull request #433 from foodcoops/feature/fix-document-preloading
Speedup generating large PDFs
2016-06-09 22:56:51 +02:00
wvengen
b9bdd04311 Fix current_order's ordergroups document preloading 2016-06-09 19:14:53 +02:00
wvengen
5928640872 Fix current_order's order_articles preloading 2016-06-09 19:14:53 +02:00
wvengen
78604ae09f Fix order document preloading 2016-06-09 19:14:53 +02:00
wvengen
70c79137cf Fix order_articles document preloading 2016-06-09 19:14:53 +02:00
wvengen
020b75cac8 Fix group_orders document preloading 2016-06-09 19:14:52 +02:00
wvengen
0c9d20e01c Let current_order plugin play nicer with stock articles 2016-06-07 00:37:00 +02:00
wvengen
f08d131842 Fix Heroku deployment 2016-05-25 02:05:55 +02:00
wvengen
be287cf67e Fix new stock article failing 2016-05-20 21:30:56 +02:00
wvengen
f9ffa0caff Update documents plugin instructions 2016-05-06 16:48:46 +02:00
Patrick Gansterer
8bb58c5519 Add documents (merges foodcoops/foodsoft#353) 2016-05-06 16:45:16 +02:00
wvengen
33c9b23e2f Update installation documentation 2016-05-06 16:00:55 +02:00
wvengen
961c50b7e5 Hide delete attachment button when none present 2016-05-06 15:57:15 +02:00
wvengen
3e5b320a6b Merge pull request #345 from foodcoop1040/attachment
Add possibility to add an attachment to an invoice
2016-05-06 15:57:05 +02:00
Patrick Gansterer
749791bb7a Add possibility to add an attachment to an invoice #345 2016-05-06 15:04:58 +02:00
wvengen
8d5467ab7c Merge pull request #355 from foodcoop1040/expeted_delivery_date
Add expected delivery date
2016-05-04 17:42:29 +02:00
Patrick Gansterer
f286dd6053 Add pickup date
This additional date helps users to find the correct order if the time
between end and pickup varies a lot.
2016-04-29 15:28:05 +02:00
wvengen
de66cd5a2b Update badge urls 2016-04-29 15:13:45 +02:00
wvengen
86d8e90c06 Merge pull request #424 from foodcoop1040/stock_order_fixes
Add missing changes for the stock order
2016-04-29 15:06:58 +02:00
wvengen
2e2efec5e7 Get rid of coffeescript. 2016-04-25 20:34:30 +02:00
wvengen
483c2aba29 Fix rake in production environment 2016-04-25 09:01:19 +02:00