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
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
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
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
Patrick Gansterer
e57fd500fc
Add possibility to copy an order
...
If a supplier has a long list of articles, which are all available, but
the order should contain only a subset of them, selecting them for every
order can take a long time. Starting with a copy of an existing order
can safe a lot of time.
2015-02-18 22:09:37 +01:00
wvengen
1c0db4374f
Merge pull request #332 from foodcoops/feature/edit-address
...
Allow to edit address from user profile
2014-12-23 21:00:20 +01:00
wvengen
bf6a31a032
Cleanup groups view on profile page
2014-12-16 21:14:20 +01:00
wvengen
86eee94249
Add hint for ordergroup address in user form
2014-12-16 20:53:38 +01:00
wvengen
56f6efa590
Allow to edit address from user profile
2014-12-10 21:27:53 +01:00
wvengen
cee2ac8f9f
Merge pull request #331 from foodcoops/feature/configure-upfront-tasks
...
Configure upfront tasks
2014-12-06 14:35:22 +01:00
wvengen
5c78bdde7e
Cleanup old task-related i18n
2014-11-23 01:42:15 +01:00
wvengen
f6c008c79c
Allow configuration of task periods
2014-11-23 01:34:51 +01:00
wvengen
219eb71bc9
Allow to specify an order schedule for new orders.
2014-11-23 00:38:13 +01:00
wvengen
6188567931
hide message preferences when messages are disabled
2014-11-20 23:11:04 +01:00
wvengen
68d54e7e25
add sudo functionality
2014-10-18 17:58:31 +02:00
wvengen
a594dffed2
disable config validation (closes foodcoops#313)
2014-09-30 15:09:47 +02:00
wvengen
668ba1e5d6
add webstats_tracking_code to configuration screen (closes foodcoops#311)
2014-09-22 09:36:36 +02:00
Benjamin Meichsner
81d22e6077
Allow adding tracking code for webstatistics service. E.g. piwik.
2014-09-22 09:15:47 +02:00
wvengen
418a8b5806
fix i18n issues + localeapp roundtrip
...
thanks, i18n-tasks!
2014-09-15 13:52:35 +02:00
wvengen
f18cc367ae
workaround for CVE-2014-4920
2014-09-10 13:27:45 +02:00
wvengen
a699f95903
fix fax documents for stock orders (closes foodcoops#79)
2014-09-02 15:47:01 +02:00
wvengen
1a3b690757
add custom css to config screen
2014-09-02 15:02:26 +02:00
wvengen
cf680d3410
add page break to config screen
2014-09-02 15:02:26 +02:00
wvengen
68ccc19c70
allow to configure currency (closes foodcoops#258)
2014-09-02 15:02:25 +02:00
wvengen
3fee071a10
specify timezone in configuration (closes foodcoops#282)
2014-09-02 14:21:33 +02:00
wvengen
7b000c39eb
add foodcoop configuration screen
2014-09-02 14:21:32 +02:00
wvengen
97dc090e4d
Merge pull request #306 from wvengen/feature-styling
...
allow foodcoops to add custom css
2014-09-02 13:59:18 +02:00
wvengen
19630e8607
allow foodcoops to add custom css
2014-09-02 13:35:45 +02:00
wvengen
647b7f0430
allow to synchronize all articles of a shared supplier
2014-09-02 12:58:31 +02:00
wvengen
d9c61b2db3
allow to match category names on import/sync
2014-09-02 12:58:31 +02:00
wvengen
16b78ba2a0
fix shared import paging without query
2014-09-02 12:58:31 +02:00
wvengen
0b08d461fa
remove html escaping from all text mails
2014-09-01 11:08:32 +02:00
wvengen
8913ad615c
show articles ordered by members but not by foodcoop dimmed in receive
2014-08-29 12:23:23 +02:00
wvengen
e61c3c9267
order articles by number then name in fax+receive
...
This makes it easier to enter the receive screen from an order pdf print
with received amounts.
Conflicts:
app/documents/order_fax.rb
2014-08-19 09:19:01 +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
6466ea9653
revamp footer
2014-06-23 17:51:20 +02:00
wvengen
b112028935
fix invititation form
...
(complements 9146e99bca2011c52e9a06f987251e2f5d72b11e)
2014-06-23 17:51:19 +02:00
wvengen
4b6231129c
only show undeleted articles in receive screen
2014-06-23 17:51:19 +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
fee0cfbdc7
make orders helpers clearer
2014-06-23 17:51:19 +02:00
wvengen
e7a476e6b6
remove unused season import fields
2014-06-23 17:51:19 +02:00
wvengen
86a5576dc3
fix delete order confirmation
2014-06-23 17:51:18 +02:00
wvengen
8c0df3b4e8
edit order user-interface update
...
also closes foodcoops#145
2014-06-23 17:51:18 +02:00
wvengen
ef0888f38d
add view for all transactions + csv
2014-06-23 17:51:17 +02:00
wvengen
7b51f7aabe
fix negative balance email
2014-05-30 10:22:47 +02:00
wvengen
5d9c9856d1
show proper error when all articles are deselected in order edit
2014-05-13 17:01:27 +02:00
wvengen
3953c21ae2
use capture instead of layout-hack to allow deface overrides
2014-05-13 17:01:27 +02:00
wvengen
852f3484ad
make settle directly less dangerous
...
(closes foodcoops#275)
2014-05-13 17:01:26 +02:00
Robert Waltemath
7556c753d0
Extract message system to plugin.
2014-05-13 17:01:25 +02:00
wvengen
fe0b17cdb0
cleanup email footer
2014-05-13 17:01:25 +02:00
wvengen
48e9a3e4f5
add fax csv
2014-05-13 17:01:25 +02:00
wvengen
3f032e5dd9
make apple points optional
...
a next step would be to move this to a plugin
2014-05-13 17:01:25 +02:00
wvengen
0fa9bebac9
show supplier user-interface update
2014-05-13 17:01:24 +02:00
wvengen
0014435663
improved shared database import ui
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
f8fca4d630
fix order article add + test
2014-02-24 11:37:06 +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
f9d2c20aaa
cleanup articles sorted in groups
2014-02-10 15:58:58 +01:00
wvengen
2de4a2a3a0
Merge pull request #256 from wvengen/feature-partial_shared_sync
...
Small change to allow non-shared articles with shared suppliers
2014-02-07 11:24:33 +01:00
wvengen
c322545f85
fix i18n buglet
2014-02-06 10:15:20 +01:00
wvengen
6e0489b25f
Merge pull request #257 from wvengen/feature-touchclick
...
Better workaround for touch devices
2014-02-03 06:33:27 -08:00
wvengen
5aef8e445e
add html units history line
2014-01-31 13:08:20 +01:00
wvengen
7ebb2459e0
make click work better on touch devices (closes foodcoops#104)
2014-01-25 15:19:50 +01:00
wvengen
d08f120b27
show message when ignoring articles due to missing order number
2014-01-24 22:20:29 +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
6c0de3dc74
Merge remote-tracking branch 'foodcoop-rostock/fix-order-article-update'
...
Conflicts:
config/locales/de.yml
config/locales/en.yml
2014-01-20 12:12:00 +01:00
wvengen
65041c78c5
allow to preselect order view
2014-01-17 15:04:03 +01:00
wvengen
1129cf4094
include comments link
2014-01-17 14:32:12 +01:00
wvengen
5b6d1a66a6
complete show order i18n
...
Conflicts:
app/helpers/orders_helper.rb
2014-01-17 14:25:57 +01: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
bab28d2770
i18n update
2014-01-13 23:23:37 +01:00
wvengen
3b2d50b47d
make receive delta work when unit_quantity changes
2014-01-13 11:37:18 +01:00
wvengen
b30b424540
Merge branch 'master' into feature-receive
...
Conflicts:
app/helpers/finance/order_articles_helper.rb
2014-01-09 18:42:29 +01:00
wvengen
0b4cfde1b2
put footer below body, now that is allowed in html5
2014-01-09 14:47:05 +01:00
wvengen
dcb17e04b5
do not show article hint in order view after all, since "old price" is
...
actually the price of the current article, which will probably be
different in the future
2014-01-09 13:24:40 +01:00
wvengen
bea2706005
fix receive dynamic update (complements 90c81de872)
2014-01-09 13:19:27 +01:00
wvengen
124341c7d6
receive helper and i18n cleanup
2014-01-09 13:01:10 +01:00
wvengen
90c81de872
update receive delta column + responsive css
2014-01-09 12:20:54 +01:00
wvengen
5a7c9b817c
fix receive js for document updates [ci skip]
2014-01-09 10:14:05 +01:00
wvengen
65e79d7e1b
small receive usability changes
2014-01-08 19:28:39 +01:00
wvengen
bdb9499535
fix broken update password flow
2014-01-08 14:09:28 +01:00
wvengen
6e60f94484
small receive-related i18n updates
2014-01-08 12:52:29 +01:00
Julius
563993fffa
Complete I18n of current receive screen
2014-01-08 00:06:50 +01:00
Julius
d7c771d10a
Continue I18n of receive screen
2014-01-06 23:48:39 +01:00
wvengen
69a29b8296
Merge pull request #245 from fsmanuel/rss_feed + 1
2014-01-06 13:55:32 +01:00
Julius
f83f6971e8
Rename update_current_price to update_global_price to avoid confusion
2014-01-04 21:35:19 +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
Julius
a8e604c196
When receiving: hide OrderArticle unit fields also after failed validation
2014-01-04 20:46:50 +01:00
wvengen
aa57cee96f
do not show units fields in receive edit order article screen
2014-01-04 20:46:13 +01:00
Manuel Wiedenmann
0d0ff90a64
adds an RSS feed for pages/all
2014-01-04 20:12:01 +01:00
wvengen
b800da9b9b
use helper in ajax update too
2014-01-03 14:52:44 +01:00
wvengen
436ebc0190
Merge pull request #234 from foodcoop-adam/article-dialog
...
introduce new layout in balancing article screen as well
2014-01-03 05:16:03 -08:00
wvengen
9219d099c8
ui update for packages display
2014-01-03 12:42:36 +01:00
wvengen
4c9e84ecc6
change layout of receive unlock
2014-01-03 12:40:43 +01:00
wvengen
014a62aa11
use disabled property for input and fix style
2014-01-03 10:59:42 +01:00
wvengen
f1ae2724c6
fix unit quantity display after ajax update
2014-01-03 10:45:15 +01:00
wvengen
5ead0fb441
show correct price
2014-01-03 10:44:57 +01:00
Julius
f230d39055
Merge price columns in receive form into one
...
Conflicts:
app/views/orders/_edit_amount.html.haml
2014-01-03 10:36:57 +01:00
Julius
2ec3d38238
Set readonly property with javascript by .prop instead of .attr
2014-01-03 10:33:23 +01:00
wvengen
98f59a3de3
Readonly receive input if GroupOrderArticle result has manually been changed
...
Conflicts:
app/helpers/orders_helper.rb
app/views/orders/_edit_amount.html.haml
2014-01-03 10:33:09 +01:00
wvengen
a439f26b67
ui design update
2014-01-02 22:30:04 +01:00
Julius
8e52fca304
Do not set quantity of newly created OrderArticles to 1
2014-01-02 19:17:46 +01:00
Julius
a384532619
Revert some changes of 20adce8a4e2d32548e7d7016dace250dd3e2eb9b
2014-01-02 19:17:41 +01:00
Julius
033aa90698
Use OrderArticle#create in receive form instead of Order#add_article
2014-01-02 19:16:09 +01:00
Julius
59c118a171
Apply publish/subscribe for OrderArticle#create
2014-01-02 19:16:03 +01:00
Julius
01264bc0ac
Clean up OrderArticle#new form and related stuff
2014-01-02 19:14:46 +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
9ed906f425
Correct haml comment from '#' to '-#'
2014-01-02 19:14:37 +01:00
Julius
cf1e68f11d
Allow to edit OrderArticle in Order#receive form
2014-01-02 19:14:33 +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
699be6a6d9
introduce new layout in balancing article screen as well
2013-12-23 16:11:14 +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
Julius
ed228c4bd7
Allow control of password autocomplete by flag
2013-12-22 23:21:14 +01:00
Julius
53e611c1c0
Allow browser to store new password after change
2013-12-22 18:26:28 +01:00
wvengen
3e1d561a5e
fix user form field order and autocompletion
2013-12-22 13:28:33 +01:00
wvengen
df9cff0eee
Do not escape mailing list wiki link in the message form (foodcoops#227)
2013-12-22 01:59:33 +01:00
wvengen
537ac52f4e
Merge pull request #227 from foodcoop-rostock/fix-escape-new-message-hint
...
Do not escape mailing list links in message form
2013-12-21 16:14:20 -08:00
Julius
3099e740ca
Do not escape mailing list links in message form
2013-12-21 22:52:39 +01:00
wvengen
41ea9ed66e
hide receive screen for stock orders
2013-12-21 17:36:25 +01:00
wvengen
aa6041d337
show all articles in receive screen (not just of this order)
2013-12-21 17:33:06 +01:00
wvengen
bb331f99a7
fix units_to_order display [ci skip]
2013-12-19 00:45:39 +01:00
wvengen
68c4affb02
better disabled button
2013-12-18 22:22:34 +01:00
wvengen
3d511ea2fb
only show receive in finance when access to ordering
2013-12-18 22:19:36 +01:00
wvengen
7f813f2c0f
fix order add_article
2013-12-18 22:16:19 +01:00
wvengen
84fe791078
update balancing screen
2013-12-18 22:10:38 +01:00
wvengen
873a1ff108
update texts
2013-12-18 21:58:15 +01:00
wvengen
4fede30a19
hide invoice columns until implemented
2013-12-18 21:53:31 +01:00
wvengen
82d1c41e9f
update show order
2013-12-18 21:46:34 +01:00
wvengen
d299fa4870
move receive screen to orders
2013-12-18 21:08:58 +01:00
wvengen
94b4454a1b
add receive to order screen, and distinguish between finished and closed orders to put it in nicely
2013-12-18 19:21:39 +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
wvengen
a0c6cf8afe
fix warning without text
2013-12-18 16:04:30 +01:00
