wvengen
|
33d3b9c466
|
merge branch minimum_balance into master (closes #133)
|
2013-07-10 22:03:57 +02:00 |
|
Julius
|
de9541a0df
|
Ask how to fetch readonly associations
|
2013-07-09 21:49:39 +02:00 |
|
Julius
|
ef62a18ac9
|
Add StockChanges index
|
2013-07-09 21:46:04 +02:00 |
|
Julius
|
5ed2659bc6
|
Fix StockArticle update in Delivery form
|
2013-07-09 17:08:59 +02:00 |
|
Julius
|
164b3f7415
|
Replace deprecated $.fn.live in delivery form
|
2013-07-08 22:49:49 +02:00 |
|
wvengen
|
33b27d2fa7
|
proper usage of jQuery.on(), and update javascript in views as well
|
2013-07-08 22:41:06 +02:00 |
|
Julius
|
f76b9da1e9
|
Separate columns for article price and unit in delivery form
|
2013-07-08 22:19:27 +02:00 |
|
Julius
|
a6228bdcf2
|
Style bootstrap tooltip; show FC share in article price info
|
2013-07-08 22:10:36 +02:00 |
|
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 |
|
wvengen
|
e9e7135639
|
run bundle update and make it work again
|
2013-07-08 14:32:24 +02:00 |
|
wvengen
|
1eeec23c80
|
only add undeleted articles in balancing screen
|
2013-07-08 02:31:54 +02:00 |
|
Julius Rapp
|
a5565b436f
|
Resolve merge conflicts
|
2013-07-07 14:58:57 +02:00 |
|
Julius Rapp
|
02e2ce4bc3
|
Update locales
|
2013-07-07 14:30:13 +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
|
d3ccfd1929
|
Add hint to change name of copied StockArticle
|
2013-07-07 14:16:06 +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
|
497c9e0cf1
|
fix closed group_order totals
|
2013-07-02 12:01:25 +02:00 |
|
wvengen
|
d7540bdd20
|
fix i18n key
|
2013-06-30 13:08:13 +02:00 |
|
wvengen
|
9ef208fa13
|
small translation changes
|
2013-06-29 03:02:05 +02:00 |
|
wvengen
|
b807e9d059
|
beautify order mail
|
2013-06-29 02:54:00 +02:00 |
|
wvengen
|
9b0db5bb0b
|
translation updates: capitalisations, order_result mail
|
2013-06-29 02:46:20 +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 |
|
wvengen
|
0978b84f4d
|
set user language on login to override session
|
2013-06-28 13:30:26 +02:00 |
|
Robert Waltemath
|
e5d790021c
|
Add repeated symbol to task list.
|
2013-06-27 10:22:22 +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
|
5df4c8f8a6
|
Update locales for delivery form
|
2013-06-26 15:21:11 +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
|
91c8be6b6c
|
make tests work again
|
2013-06-25 13:05:25 +02:00 |
|
wvengen
|
e450cf404e
|
harmonize order cycle translations
|
2013-06-25 00:16:30 +02:00 |
|
wvengen
|
7dbe1363ed
|
fix adding article balancing failing with 'already taken' (closes foodcoops/foodsoft#125)
|
2013-06-24 13:32:07 +02:00 |
|
Robert Waltemath
|
7942ccfae6
|
Added missing migration files.
|
2013-06-24 12:02:22 +02:00 |
|
Robert Waltemath
|
c27127c745
|
Added i18n strings.
|
2013-06-24 11:53:52 +02:00 |
|
Robert Waltemath
|
abe7c7181d
|
Remove obsolete columns from database.
|
2013-06-24 10:57:42 +02:00 |
|
Robert Waltemath
|
3d1faa9ed3
|
Skip save callback when migrating data.
|
2013-06-24 10:36:14 +02:00 |
|
Robert Waltemath
|
d081a2c66b
|
Validate done/weekly combination only on creation of task.
|
2013-06-24 09:49:06 +02:00 |
|