wvengen
|
98e7189d31
|
Merge branch 'master' into i18n
Conflicts:
app/assets/javascripts/application.js
|
2013-10-18 12:30:34 +02:00 |
|
wvengen
|
4e61e764df
|
fix haml indentation errors
|
2013-10-17 16:35:50 +02:00 |
|
wvengen
|
c3d22e883d
|
i18n simple_form move of suppliers
|
2013-10-09 23:12:26 +02:00 |
Benjamin Meichsner
|
71e02ab569
|
Merge branch 'rails3' into rails3-to-master
Conflicts:
app/views/suppliers/shared_suppliers.haml
|
2013-09-02 13:31:40 +02:00 |
|
Benjamin Meichsner
|
f4a0e29297
|
Fixed bug in with new shared multiple suppliers feature.
|
2013-06-12 10:47:54 +02:00 |
Robert Waltemath
|
6bdb7b35f0
|
Showing/allowing multiple suppliers per shared supplier in shared-supplier-listing.
|
2013-06-10 11:37:59 +02:00 |
|
wvengen
|
f1d6df9ecc
|
move commonly used verbs to common i18n identifier
|
2013-04-04 02:49:52 +02:00 |
|
wvengen
|
7af796c09c
|
Merge remote-tracking branch 'bennibu/rails3' into rails3
Conflicts:
app/controllers/admin/ordergroups_controller.rb
app/controllers/finance/balancing_controller.rb
app/controllers/suppliers_controller.rb
app/views/articles/_article.html.haml
app/views/finance/balancing/_summary.haml
app/views/finance/balancing/new.html.haml
app/views/group_orders/_form.html.haml
app/views/home/_apple_bar.html.haml
app/views/suppliers/index.haml
|
2013-03-21 22:08:09 +01:00 |
|
Benjamin Meichsner
|
07581b7ecf
|
Removed acts_as_paranoid. Implemented own version.
|
2013-03-16 17:57:38 +01:00 |
|
wvengen
|
eb1e02015e
|
finish suppliers i18n
|
2013-02-08 00:11:58 +01:00 |
|
benni
|
f4f10b1e4c
|
Introduced actionbar. Some fixes for balancing page.
|
2012-11-12 13:13:01 +01:00 |
|
benni
|
9af26e1da6
|
Fixed deliveries.
|
2012-10-17 20:45:52 +02:00 |
|
benni
|
0b1682af7c
|
Fixed suppliers module.
|
2011-05-18 15:52:06 +02:00 |
sandoz
|
8d243c8e60
|
Show supplier email in suppliers/show.haml
* Closes: #38
|
2009-08-15 12:29:08 +02:00 |
Benjamin Meichsner
|
e59ce8c313
|
Added deliveries counter to suppliers overview.
|
2009-05-17 16:18:14 +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 |
|
sandoz
|
1c62bf8786
|
Genderneutralized/Fixed strings in suppliers/index.haml
* Genderneutralized 'Lieferanten'
* Fixed string 'ArtikelDatenbank'
* Fixed string 'KundenNr'
|
2009-03-22 15:04:28 +01:00 |
|
Benjamin Meichsner
|
a0e10141dc
|
Translations and other little improvements.
|
2009-02-12 21:38:41 +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
|
053593f718
|
Translations for articles-pages.
|
2009-02-10 13:26:10 +01:00 |
|
Benjamin Meichsner
|
4d796b8e73
|
Since there are StockArticles for each supplier, the StockArticles has
to be excluded in normal articles-view.
|
2009-02-07 15:19:07 +01:00 |
|
Benjamin Meichsner
|
ff6b460cfc
|
Improved delivery-invoice-workflow.
|
2009-01-18 17:42:51 +01:00 |
|
Benjamin Meichsner
|
936e6ef69a
|
Refactoring of articles and article_categories. articles are now a nested resource of supplier.
|
2009-01-16 16:19:26 +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 |
|
Benjamin Meichsner
|
5b9a7e05df
|
Initial commit of foodsoft 2
|
2009-01-06 11:49:19 +01:00 |