Commit Graph

48 Commits

Author SHA1 Message Date
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 dbb7407005 Clear IBAN when deleting a supplier 2020-06-22 16:35:22 +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
JuliusR 5bf7f41005 Fix matching of uploaded articles by order_number 2019-06-14 10:08:19 +00:00
wvengen 25deefced1 Move setting availability to sync method 2019-03-24 22:14:10 +01:00
wvengen cd164bc3eb Small performance improvement for sync with many new articles 2019-03-24 22:02:53 +01:00
wvengen 9283ed4f5e Fix syncing articles with non-import sync methods (#633) 2019-03-23 18:31:22 +01:00
wvengen d669edb173 Fix shared database sync (relates to PR #610) 2019-03-23 08:54:10 +01:00
Patrick Gansterer abe847c0ee Add and inherit from ApplicationRecord to match Rails 5.0 style 2019-01-15 04:40:05 +01:00
Tom Carchrae 7e88798778 big speedup in syncing via caching/reducing queries (#610) 2019-01-15 02:56:21 +01:00
Tom Carchrae a66a44bdcf error was on incorrect property 2019-01-14 21:01:30 +01:00
Patrick Gansterer 75deec9f06 Add custom fields to invoice, odergroup, supplier and user 2017-10-28 20:16:47 +02:00
Patrick Gansterer c6731b4e4f Add IBAN field to supplier and user model 2017-01-21 22:43:48 +01:00
wvengen a03789e048 Add optional boxfill phase to orders 2015-11-13 18:10:46 +01:00
wvengen 17cbc57850 Don't error when deleting supplier/group with already existing deleted name (closes foodcoops/foodsoft#197) 2015-04-17 20:09:40 +02:00
wvengen c30ec67548 Allow synchronising units when uploading 2015-04-11 02:52:57 +02:00
wvengen 4d1e102f47 Checkbox to remove articles not in upload 2015-04-11 02:52:57 +02:00
wvengen d5a7f6a074 Move file import logic to model 2015-04-11 02:52:57 +02:00
wvengen 07ba6f0535 Import multiple spreadsheet formats. Make upload work like sync. 2015-04-11 02:52:57 +02:00
wvengen 1b48882c0e Refactor orders index 2015-02-18 23:46:50 +01:00
wvengen 118886344a Use boolean comparators where it makes sense 2015-01-14 21:17:00 +01:00
wvengen 8473f16091 query performance improvements 2014-09-02 12:58:32 +02:00
wvengen 647b7f0430 allow to synchronize all articles of a shared supplier 2014-09-02 12:58:31 +02:00
wvengen 7841245795 migrate to Rails 4.0 (closes foodcoops#214)
Conflicts:
	Gemfile.lock
2014-02-24 12:46:28 +01:00
wvengen 49e563af89 allow non-shared articles to be part of a shared supplier using a blank order number 2014-01-24 22:10:00 +01:00
wvengen db80fbd807 Merge branch 'master' into tests-rspec 2013-07-15 18:45:04 +02:00
wvengen 5e9a49b2c7 make uniqueness_of_name validations work again (closes foodcoops/foodsoft#157) 2013-07-15 18:03:02 +02:00
wvengen 3ed8e0bc84 allow longer supplier phone number 2013-07-15 17:57:00 +02:00
wvengen 13f2c128c6 do not use string values for integers (closes foodcoops/foodsoft#128) 2013-06-14 01:36:41 +02:00
Benjamin Meichsner 07581b7ecf Removed acts_as_paranoid. Implemented own version. 2013-03-16 17:57:38 +01:00
Benjamin Meichsner 82178161fa Show usefull error message for uniqueness_of_name with acts_as_paranoid.
Fixed #88
2013-02-24 23:26:16 +01:00
benni 9af26e1da6 Fixed deliveries. 2012-10-17 20:45:52 +02:00
benni 8a74e7d77f Removed annoate and hirb Gemfiles.
Annotate: Better look in schema.rb, this reference should be always up
to date.

Hirb: To reactivate hirb, look in railscasts:
http://railscasts.com/episodes/48-console-tricks-revised
2012-07-27 18:07:42 +02:00
benni 3f133bb8c3 Added client side validations. Fixed shared sync. 2011-05-19 22:35:13 +02:00
benni 0b1682af7c Fixed suppliers module. 2011-05-18 15:52:06 +02:00
benni 46450cebef New annotation, because of db switch to mysql.
Background: sqlite has some problems with decimal option.
2011-05-07 21:55:24 +02:00
Benjamin Meichsner e75a42d509 Merge branch 'wiki' 2009-08-15 17:24:08 +02:00
Benjamin Meichsner d848831fea Implemented stats for ordergroups on startpage. Annotated models. 2009-08-01 13:41:22 +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 053593f718 Translations for articles-pages. 2009-02-10 13:26:10 +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 1912a3fd80 First part of stock-integratino. Orders with supplier_id == 0 become stockorders. 2009-02-05 16:40:02 +01:00
Benjamin Meichsner 251ced4fa1 Introduced group_order_article.result to save the result for each group/article. 2009-02-04 16:41:01 +01:00
Benjamin Meichsner 0a2a79237a Moved User.address-info into Ordergroup.contact_... attributes. Updated model-fixtures for testing. 2009-02-02 16:35:43 +01:00
Benjamin Meichsner 9eb2125f15 Complete refactoring of orders-workflow.
OrderResult tables are removed. Data consistency is now possible through new article.price-history (ArticlePrice).
Balancing-workflow needs to be updated.
2009-01-29 01:57:51 +01:00
Benjamin Meichsner fc45345e0d Introduced acts_as_paranoid. Avoid deleting of suppliers and articles. (for consistency of order-results) 2009-01-20 19:37:15 +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