08065a09ec
Sort suppliers in dropdown menu for new deliveries
2020-04-10 23:59:06 +02:00
c62104a388
Get rid of duplicated confirm_delete translations
2016-03-04 23:13:28 +01:00
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
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
cdb87a8389
Highlight created/updated stock_article in StockArticle#index view
2013-12-07 17:10:40 +01:00
bceabfec5c
Apply publish/subscribe pattern to stock_article manipulation in delivery form
2013-12-07 16:42:25 +01:00
11117738ce
Resolve merge conflicts
2013-12-07 11:50:37 +01:00
dd08e277c7
AJAX_ify StockArticle manipulation; Introduce publish/subscribe pattern for DOM updates
2013-12-07 11:20:44 +01:00
a475a27f79
i18n cleanup (affects foodcoops#137)
2013-12-06 22:43:36 +01:00
389b45a505
fix stockit i18n reference
2013-10-10 19:23:37 +02:00
9a9a782bc4
Complete StockArticle#show view
2013-10-03 23:21:53 +02:00
fef8c6d99f
Move StockArticle#history to StockArticle#show
2013-10-03 22:24:21 +02:00
12c0636941
fix i18n buglets ( closes #167 )
2013-09-10 10:27:13 +02:00
b303b48853
Merge branch 'master' into improve-delivery-workflow-further
2013-07-13 21:08:50 +02:00
730dc7cf2a
Move StockChanges#index to StockArticles#history
2013-07-13 09:32:27 +02:00
ef62a18ac9
Add StockChanges index
2013-07-09 21:46:04 +02:00
9502ca28dd
Merge latest changes in master
2013-06-17 15:47:08 +02:00
e28f3eda65
Fix StockArticle creation during delivery; small cleanups
2013-06-11 13:10:18 +02:00
9753e6db00
Resolve merge conflicts with i18n
2013-06-10 20:05:47 +02:00
0f4614eb31
Add percent sign for tax in forms
2013-06-06 17:58:02 +02:00
6c65799025
use more beautiful close mark
2013-04-10 17:34:24 +02:00
f1d6df9ecc
move commonly used verbs to common i18n identifier
2013-04-04 02:49:52 +02:00
c9b2d01fa5
i18n last merge
2013-03-06 01:24:57 +01:00
2d382df1f1
Merge remote-tracking branch 'bennibu/rails3' into rails3
...
Conflicts:
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/controllers/stockit_controller.rb
app/models/ordergroup.rb
app/models/workgroup.rb
app/views/stockit/index.html.haml
2013-03-06 01:01:12 +01:00
0e1bd5c75e
Improve (AJAX) deletion of StockArticles
2013-02-25 11:12:28 +01:00
5dc3fc30ad
Revert 099e2b9b06
2013-02-25 10:29:47 +01:00
8f15cfb446
Revert 396a47b6af
2013-02-25 10:13:44 +01:00
ccf0d010b4
Apply AJAX for deleting a StockArticle
2013-02-25 10:02:21 +01:00
a0a974b9ce
finish stockit i18n + controllers + model
2013-02-11 11:19:26 +01:00
396a47b6af
Improve stock_article_selections
2013-01-28 20:46:35 +01:00
524819b86f
Merge branch 'rails3' of http://github.com/bennibu/foodsoft into rails3
...
Conflicts:
app/helpers/application_helper.rb
2013-01-27 22:01:53 +01:00
04b611a080
Temporairly deactivated helper in new delivery form.
2013-01-26 15:57:29 +01:00
099e2b9b06
Add stock_article_selection (deleting multiple stock articles at once)
2013-01-12 16:14:06 +01:00
8f7e21b918
Fixed stockit.
2012-10-29 18:28:17 +01:00
fc1d130113
Refactored stockit, delivery an stock_takings.
2011-05-27 14:09:01 +02:00
036bc10282
Hide/show unavailable articles via js.
2009-10-17 20:33:36 +02:00
5a93ca1641
Added tax to stockit index view.
2009-09-07 11:29:56 +02:00
aedfcae03b
Added stock_article number to stockit view. Closes #33
2009-08-12 11:46:27 +02:00
4d57bd2e73
Show current stock value on stockit page.
2009-08-04 13:41:28 +02:00
6761a41048
Hide articles with a stock amount of zero. Closes #17
2009-08-04 13:35:52 +02:00
2af35e55bc
Improved stockit overiew. Fixed article ordering by suppliers.
2009-05-17 16:50:13 +02:00
48b6515c08
Genderchanged string 'Lieferant'
...
* Since s.b. started this already. I changed every string 'Lieferant' to
'Lieferantin' to give note on female existance in this world :-)
2009-03-22 15:04:29 +01:00
7c6a01b0fc
Genderneutralization in stockit/index.html.haml
...
* Genderneutralized string 'Lieferant'
2009-03-22 15:04:29 +01:00
a0e10141dc
Translations and other little improvements.
2009-02-12 21:38:41 +01:00
951d19db6a
Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views!
2009-02-12 18:32:20 +01:00
86b2b28dc9
Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices.
2009-02-11 18:09:04 +01:00
325d47b22f
Changed behaviour of acts_as_paraniod. Finder wrapper removed an replaced by simple named_scope 'without_deleted'.
2009-02-11 15:23:59 +01:00
cd9636a650
Improved the creation/updating of deliveries.
2009-02-10 20:06:08 +01:00
c17b63b192
Second part of stock-integration.
...
Introduced StockArticle and a special page for ordering from stock. StockChanges will be created and the StockArticle.quantity
updated in 'order.close!'.
2009-02-06 16:26:35 +01:00
1912a3fd80
First part of stock-integratino. Orders with supplier_id == 0 become stockorders.
2009-02-05 16:40:02 +01:00
Patrick Gansterer
wvengen
Julius
Benjamin Meichsner
Benjamin Meichsner
sandoz