af3444bba6
replace update_attributes with updat since deprecated
continuous-integration/drone/push Build is failing
2022-10-13 18:25:52 +02:00
Patrick Gansterer
ea2862fdef
Run rubocop --fix-layout and remove encoding comments
2021-03-02 09:12:19 +01:00
Patrick Gansterer
d90d188dbf
Add SupplierCategory
...
This allows the categorization of suppliers. For a better reporting
it is necessary to split the expenses of the invoices.
E.g. we want to be able to generate independent sums of general cost
like the rent or electricity and the cost of the bought articles.
2020-07-30 17:46:07 +02:00
Patrick Gansterer
39aff78f11
Remove protected_attributes gem
...
We do not enforce the rules, so removing it and switching the existing
annotations to strong_parameters does not make our situation worse.
2019-10-29 18:09:24 +01:00
Patrick Gansterer
2100c738af
Change deprecated *_filter methods to *_action
2019-10-29 09:41:01 +01:00
Patrick Gansterer
8ed87730a8
Fix listing of shared suppliers
2017-03-04 13:17:46 +01:00
wvengen
0fa9bebac9
show supplier user-interface update
2014-05-13 17:01:24 +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
Manuel Wiedenmann
7a63394dac
Merge remote-tracking branch 'origin/rails3'
...
Conflicts:
Gemfile
Gemfile.lock
2013-06-10 01:53:31 +02:00
Benjamin Meichsner
7c4ee01ff2
Define autofill attributes when creating new supplier from shared_supplier.
2013-06-09 18:02:47 +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
d818ea5d53
finish suppliers controller I18n
2013-02-08 00:31:09 +01:00
benni
4a8e286d98
Fixed encoding issues with ruby > 1.9.2..
2012-04-16 08:49:54 +02:00
benni
0b1682af7c
Fixed suppliers module.
2011-05-18 15:52:06 +02:00
Benjamin Meichsner
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
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
