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 |
|
wvengen
|
94b2c8eac3
|
Merge remote-tracking branch 'foodcoops/master' into feature-i18n-cleanup
Conflicts:
app/views/deliveries/_stock_article_form.html.haml
config/locales/de.yml
config/locales/en.yml
|
2013-12-17 15:58:47 +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
|
5af82eb55c
|
Merge pull request #219 from foodcoop-rostock/publish-subscribe-from-scratch
Publish/subscribe pattern for DOM updates after AJAX database manipulation
|
2013-12-17 06:28:25 -08:00 |
|
wvengen
|
452db61af8
|
i18n fix (thanks @JuliusR)
|
2013-12-14 23:52:59 +01:00 |
|
Julius
|
9b92d6ff10
|
Mark two i18n issues
|
2013-12-14 14:48:58 +01:00 |
|
wvengen
|
142e8a0473
|
i18n fixes
|
2013-12-14 13:34:58 +01:00 |
|
wvengen
|
4e54388b83
|
Merge remote-tracking branch 'foodcoop-rostock/question-form-i18n' into feature-i18n-cleanup
|
2013-12-14 13:20:03 +01:00 |
|
wvengen
|
46ab4dcc01
|
proper i18n of last ordergroup order (thanks @JuliusR)
|
2013-12-14 13:15:47 +01:00 |
|
wvengen
|
d67a0083f1
|
fix price hint escaping (thanks @JuliusR)
|
2013-12-14 13:15:16 +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
|
b53cb36714
|
give proper block to link_to_ordering (closes #201)
|
2013-12-11 22:58:50 +01:00 |
|
wvengen
|
e25570d870
|
Merge remote-tracking branch 'tg-x/master'
Conflicts:
app/views/shared/_open_orders.html.haml
|
2013-12-11 22:39:37 +01:00 |
|
wvengen
|
3f497e9274
|
allow more than two columns in horizontal form
|
2013-12-10 23:41:45 +01:00 |
|
wvengen
|
675f0e6d16
|
fix workgroup link task list
|
2013-12-10 19:12:29 +01:00 |
|
wvengen
|
e42e27957d
|
improve task i18n (affects foodcoops#137)
|
2013-12-10 17:58:32 +01:00 |
|
wvengen
|
85b6ff908b
|
make new article dialog more responsive
|
2013-12-10 16:41:26 +01:00 |
|
wvengen
|
58de1a231b
|
update price during editing as well
|
2013-12-10 13:30:15 +01:00 |
|
Julius
|
30b35cdd11
|
Improve usability of supplier selection for stock_articles in delivery form
|
2013-12-09 00:03:07 +01:00 |
|
Julius
|
cdb87a8389
|
Highlight created/updated stock_article in StockArticle#index view
|
2013-12-07 17:10:40 +01:00 |
|
Julius
|
012327dd7c
|
Slightly cleanup delivery form
|
2013-12-07 16:57:53 +01:00 |
|
Julius
|
bceabfec5c
|
Apply publish/subscribe pattern to stock_article manipulation in delivery form
|
2013-12-07 16:42:25 +01:00 |
|
Julius Rapp
|
11117738ce
|
Resolve merge conflicts
|
2013-12-07 11:50:37 +01:00 |
|
Julius Rapp
|
dd08e277c7
|
AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates
|
2013-12-07 11:20:44 +01:00 |
|
wvengen
|
112fa3be23
|
fix forgotten i18n string (affects foodcoops#137)
|
2013-12-06 23:08:28 +01:00 |
|
wvengen
|
a475a27f79
|
i18n cleanup (affects foodcoops#137)
|
2013-12-06 22:43:36 +01:00 |
|
Julius Rapp
|
e99752e483
|
disable escape of html from local (one place)
|
2013-12-06 18:33:35 +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
|
1c4b9591a2
|
fix edit article dialog title
|
2013-12-06 12:34:14 +01:00 |
|
wvengen
|
05b934e79f
|
update fc price dynamically in article edit form
|
2013-12-06 12:19:13 +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 |
|