Julius
|
bba70dc875
|
Change DOM sort style to match existing style
|
2013-07-08 21:51:15 +02:00 |
|
Julius
|
ff1317b17b
|
Add hint to copy stock_article if price change desired in delivery process
|
2013-07-08 21:02:43 +02:00 |
|
Julius
|
5fcc14a36d
|
Fix trailing '*/' in application.css
|
2013-07-08 20:46:05 +02:00 |
|
Julius Rapp
|
a5565b436f
|
Resolve merge conflicts
|
2013-07-07 14:58:57 +02:00 |
|
Julius Rapp
|
1ebd4e3ce6
|
Use foodsoft button and table styles (no btn-group, no table-condensed)
|
2013-07-07 14:19:30 +02:00 |
|
Julius Rapp
|
4a208c83c0
|
Separate actions for new StockArticle
|
2013-07-07 14:14:32 +02:00 |
|
wvengen
|
d397132f7b
|
be safe even with locale string
|
2013-07-07 02:31:42 +02:00 |
|
wvengen
|
8080cd6b7e
|
pass locale to datepicker, use gem for that
|
2013-07-07 01:47:22 +02:00 |
|
wvengen
|
76645ebd12
|
add default tax percentage to app_config
|
2013-07-06 23:11:50 +02:00 |
|
wvengen
|
3da27734c7
|
allow import of files with categories that do not exist (map to no category)
|
2013-07-06 17:49:10 +02:00 |
|
wvengen
|
a6688b3b43
|
import manufacturer and origin too (closes #140)
|
2013-07-06 17:48:40 +02:00 |
|
wvengen
|
d7540bdd20
|
fix i18n key
|
2013-06-30 13:08:13 +02:00 |
|
wvengen
|
b807e9d059
|
beautify order mail
|
2013-06-29 02:54:00 +02:00 |
|
wvengen
|
f11d10ff07
|
update order result mail (fixing html quoting of quotes)
|
2013-06-29 02:22:01 +02:00 |
|
wvengen
|
9d406bbc08
|
make resque worker function on non-multi-coop-installs too
|
2013-06-29 01:48:57 +02:00 |
|
Julius
|
69060a6da6
|
Fix ordering of stock_changes in delivery 2
|
2013-06-27 09:10:46 +02:00 |
|
Julius
|
d0ccf07bc5
|
Merge latest changes in master of http://github.com/foodcoops/foodsoft
|
2013-06-26 20:23:11 +02:00 |
|
Julius
|
a29d52dcae
|
Fix ordering of stock_changes in delivery (case-insensitive ordering did not work properly for all database flavors)
|
2013-06-26 20:14:33 +02:00 |
|
Julius
|
8a79dfd167
|
Add tooltip for article prices
|
2013-06-26 20:06:38 +02:00 |
|
Julius
|
2ee7f716ae
|
Improve delivery validation: StockArticles must not be associated more than once
|
2013-06-26 17:58:55 +02:00 |
|
Julius
|
dd70b84ef0
|
Linearize and clean up delivery form
|
2013-06-26 15:16:52 +02:00 |
|
wvengen
|
befe89d4ef
|
fix tolerance display in group_order form
|
2013-06-26 01:36:44 +02:00 |
|
wvengen
|
c31e864c73
|
internationalise currency in order screen
|
2013-06-26 01:17:04 +02:00 |
|
wvengen
|
dddd11d8f0
|
do not autocapitalize or autocorrect on login fields to avoid login errors on iPad/iPhone
|
2013-06-26 00:42:09 +02:00 |
|
wvengen
|
7dbe1363ed
|
fix adding article balancing failing with 'already taken' (closes foodcoops/foodsoft#125)
|
2013-06-24 13:32:07 +02:00 |
|
wvengen
|
cab6ada8b8
|
small invoice i18n cleanup/refactoring
|
2013-06-21 14:24:05 +02:00 |
|
wvengen
|
906093b3ce
|
small i18n fixes and clarifications
|
2013-06-21 13:49:34 +02:00 |
|
wvengen
|
3cfd8b2d44
|
fix i18n key
|
2013-06-21 13:25:52 +02:00 |
|
wvengen
|
931b3bef5e
|
fix touch event twice bug (complements ac62dcce9d)
|
2013-06-20 01:20:13 +02:00 |
|
Julius
|
bf32e72414
|
Improve delivery form validation
|
2013-06-19 11:21:55 +02:00 |
|
Julius
|
04c9770e80
|
Complete I18n
|
2013-06-18 10:59:53 +02:00 |
|
Julius
|
cc1a839246
|
Allow to create stock_article as copy of article in delivery form
|
2013-06-18 10:48:19 +02:00 |
|
Julius
|
cc5574f8b5
|
Revert ac62dcce9d
|
2013-06-18 09:10:31 +02:00 |
|
wvengen
|
1e984df3aa
|
more beautiful ordergroup edit form
|
2013-06-18 01:35:12 +02:00 |
|
Julius
|
6e6cce1cb7
|
Add Select2 jQuery plugin
|
2013-06-17 16:15:19 +02:00 |
|
Julius
|
9502ca28dd
|
Merge latest changes in master
|
2013-06-17 15:47:08 +02:00 |
|
Julius
|
a9938df443
|
Clean up sort functionality; Remove title attributes due to hard I18n
|
2013-06-17 15:43:42 +02:00 |
|
Benjamin Meichsner
|
eee5d4a896
|
Fixed indentation bug in sync template.
|
2013-06-16 15:10:50 +02:00 |
|
Benjamin Meichsner
|
8c4da55561
|
Merge branch 'show-percent-sign' of git://github.com/foodcoop-rostock/foodsoft into foodcoop-rostock-show-percent-sign
|
2013-06-16 14:55:48 +02:00 |
|
wvengen
|
713c030213
|
i18n and translate missing entry
|
2013-06-15 18:43:42 +02:00 |
|
Julius
|
b5acd9b116
|
Merge master branch of base
|
2013-06-14 18:59:17 +02:00 |
|
wvengen
|
ac62dcce9d
|
make touch device events work on buttons (closes foodcoop-rostock/foodsoft#34, closes foodcoops/foodsoft#104)
|
2013-06-14 01:42:47 +02:00 |
|
wvengen
|
8141ad0233
|
remove duplicate code
|
2013-06-14 01:39:30 +02:00 |
|
wvengen
|
13f2c128c6
|
do not use string values for integers (closes foodcoops/foodsoft#128)
|
2013-06-14 01:36:41 +02:00 |
|
Julius
|
3a48d1576f
|
Remove broken sort-by-price; comment redundancy of stock_change template
|
2013-06-13 23:51:37 +02:00 |
|
Julius
|
65f61e09d5
|
Improve delivery workflow; introduce sortable tables; use js.erb for deliveries
|
2013-06-13 23:36:22 +02:00 |
|
wvengen
|
3d1847fabb
|
small i18n and translation updates
|
2013-06-12 22:44:51 +02:00 |
|
Julius
|
49cfa9aded
|
Cleanup StockArticle creation during delivery
|
2013-06-11 15:05:19 +02:00 |
|
Julius
|
e28f3eda65
|
Fix StockArticle creation during delivery; small cleanups
|
2013-06-11 13:10:18 +02:00 |
|
wvengen
|
b7f71f5859
|
fix reset password breakage by avoiding encoding ampersand in url (closes #123)
|
2013-06-11 00:01:57 +02:00 |
|