wvengen
|
679fc673c7
|
add group_order spec
|
2013-07-15 18:45:02 +02:00 |
|
wvengen
|
5e9a49b2c7
|
make uniqueness_of_name validations work again (closes foodcoops/foodsoft#157)
|
2013-07-15 18:03:02 +02:00 |
|
wvengen
|
3a7d650ed8
|
fix tests
|
2013-07-15 17:57:20 +02:00 |
|
wvengen
|
3ed8e0bc84
|
allow longer supplier phone number
|
2013-07-15 17:57:00 +02:00 |
|
wvengen
|
cc6a188f4e
|
fix small test bug
|
2013-07-15 00:22:20 +02:00 |
|
wvengen
|
acd18721aa
|
expand rspec tests
|
2013-07-15 00:17:07 +02:00 |
|
Julius
|
0e66414534
|
Allow creation of StockArticles also if there are no Articles for a supplier in delivery form
|
2013-07-14 22:00:38 +02:00 |
|
wvengen
|
3c264f6225
|
add some rspec tests for supplier and article
|
2013-07-14 02:50:54 +02:00 |
|
wvengen
|
fc6fbdaa95
|
use less-rails, and make exception_notifier work again
|
2013-07-13 23:06:30 +02:00 |
|
Julius
|
b303b48853
|
Merge branch 'master' into improve-delivery-workflow-further
|
2013-07-13 21:08:50 +02:00 |
|
wvengen
|
3fd498d29f
|
translations update
|
2013-07-13 12:37:20 +02:00 |
|
wvengen
|
126f7e7459
|
Merge pull request #150 from foodcoop-rostock/stock_article_quantity_history
Show StockChanges index
|
2013-07-13 03:16:31 -07:00 |
|
Julius
|
12506e54b8
|
Remove stock_changes_helper.rb
|
2013-07-13 09:34:19 +02:00 |
|
Julius
|
730dc7cf2a
|
Move StockChanges#index to StockArticles#history
|
2013-07-13 09:32:27 +02:00 |
|
wvengen
|
cfae279196
|
bundle update
|
2013-07-12 23:35:31 +02:00 |
|
Julius
|
edaf91b029
|
Inline before_filter of stock_changes_controller
|
2013-07-12 22:19:11 +02:00 |
|
Julius
|
e5eff07abd
|
Move Select2 for stock_article_creation to tfoot of delivery form
|
2013-07-12 21:15:12 +02:00 |
|
wvengen
|
7fa8193010
|
start using rspec for tests
|
2013-07-12 20:06:49 +02:00 |
|
wvengen
|
f57038ff56
|
show quantity/tolerance in order screen when unit_quantity=1
|
2013-07-11 23:20:37 +02:00 |
|
wvengen
|
66e0bbc348
|
cleanup translation changes introduced by last merge
|
2013-07-11 22:09:58 +02:00 |
|
wvengen
|
db8a929f0b
|
Merge pull request #142 from foodcoop-rostock/multiple-recurring-tasks
Great!
|
2013-07-11 12:48:41 -07:00 |
|
wvengen
|
2ee1bef410
|
translation updates
|
2013-07-11 21:36:32 +02:00 |
|
Julius
|
469abb753d
|
Merge branch 'master' into improve-delivery-workflow-further
|
2013-07-11 19:24:37 +02:00 |
|
Julius
|
620686fa46
|
Merge branch 'master' into stock_article_quantity_history
|
2013-07-11 19:23:52 +02:00 |
|
Julius
|
54afbb7af5
|
Add locales for stock_changes index
|
2013-07-11 19:21:56 +02:00 |
|
Julius
|
7c27017306
|
Link delivery/stock_taking/order in stock_changes index
|
2013-07-11 18:37:55 +02:00 |
|
Julius
|
ffcb9490c9
|
Make stock_changes readonly in index view
|
2013-07-11 18:20:24 +02:00 |
|
Robert Waltemath
|
65c0b555c2
|
Added warning/ hint when updating periodic task.
|
2013-07-11 10:30:55 +02:00 |
|
wvengen
|
2ef7e58b0b
|
Merge pull request #146 from foodcoop-adam/add-only-undeleted-articles
only add undeleted articles in balancing screen
|
2013-07-10 13:05:50 -07:00 |
|
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 |
|