wvengen
bdce1b5872
Merge branch 'master' into updated-gems
...
Conflicts:
Gemfile
Gemfile.lock
2013-10-09 10:37:02 +02:00
Julius
d36f2dd4ac
Fix minor delivery bug
2013-09-30 11:04:55 +02:00
wvengen
1fed9834b3
fix tooltip after bootstrap update
2013-07-17 11:31:27 +02:00
Julius
7fd8abf381
Replace 'own' js table sorting by stupidtable plugin
2013-07-16 22:01:56 +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
Julius
e5eff07abd
Move Select2 for stock_article_creation to tfoot of delivery form
2013-07-12 21:15:12 +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
Julius
f76b9da1e9
Separate columns for article price and unit in delivery form
2013-07-08 22:19:27 +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 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
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
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
9502ca28dd
Merge latest changes in master
2013-06-17 15:47:08 +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
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
Julius
9753e6db00
Resolve merge conflicts with i18n
2013-06-10 20:05:47 +02:00
Julius
0f4614eb31
Add percent sign for tax in forms
2013-06-06 17:58:02 +02:00
wvengen
3f82138d84
finish deliveries i18n
2013-04-10 17:02:16 +02:00
Benjamin Meichsner
04b611a080
Temporairly deactivated helper in new delivery form.
2013-01-26 15:57:29 +01:00
benni
9af26e1da6
Fixed deliveries.
2012-10-17 20:45:52 +02:00
benni
552c553b77
Fixed admin, orders, wiki views. Converted all erb to haml.
2012-10-15 21:19:17 +02:00
benni
b295f62322
Updated finance/invoices
2012-04-20 18:33:47 +02:00
benni
fc1d130113
Refactored stockit, delivery an stock_takings.
2011-05-27 14:09:01 +02:00
Benjamin Meichsner
80691c441b
Fixed bug on new delivery page.
2010-09-17 18:45:07 +02:00
Benjamin Meichsner
83e741c1af
Improved delivery creating/updating prozess.
2009-08-12 13:38:03 +02:00
Benjamin Meichsner
16346e3529
Added note to deliveries. Closes #34
2009-08-12 13:09:10 +02:00
Benjamin Meichsner
a8e35bd421
Refactoring of delivery-workflow. Added ability to add stock_changes after creating a delivery.
2009-05-17 16:11:39 +02:00
Benjamin Meichsner
c03f3da21a
Added more info to delivery/show for easier comparision of invoice amount and sum of delivered items.
2009-05-15 17:58:02 +02:00
sandoz
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
Benjamin Meichsner
20d4177990
Added net|gross sum for deliveries-show-page. ( Fixed #193 )
2009-03-11 18:03:28 +01:00
Benjamin Meichsner
951d19db6a
Introduced StockTaking. TODO: Dry up the stockit/stock_takings/deliveries controllers/views!
2009-02-12 18:32:20 +01:00
Benjamin Meichsner
86b2b28dc9
Improved stockit: Creating/updating of stock_articles.\nTranslated deliveries and invoices.
2009-02-11 18:09:04 +01:00
Benjamin Meichsner
cd9636a650
Improved the creation/updating of deliveries.
2009-02-10 20:06:08 +01:00
Benjamin Meichsner
0a87294ed4
Fixed bug in deliveries. Extended test fixtures.
2009-02-06 17:06:08 +01:00
Benjamin Meichsner
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
Benjamin Meichsner
ff6b460cfc
Improved delivery-invoice-workflow.
2009-01-18 17:42:51 +01:00
Benjamin Meichsner
b38025869a
Introduced StockChange. Implemented first part of stockit-logic with updating article's quantity.
2009-01-16 02:17:49 +01:00
Benjamin Meichsner
30f3d199d3
Introduced invoices and deliveries. Integration (especially of deliveries) isn't finished yet.
2009-01-08 16:33:27 +01:00
