f0a55fb951
Add model and views for bank accounts
2018-10-11 22:29:15 +02:00
ac11ba1cc1
Add pickups role
2018-01-25 18:09:29 +01:00
e7657b987f
Update model to support financial transactions #367
...
This change introduces two new data types to group the financial
transactions. Now every transaction has a "type", which itself belongs
to a "class".
Types should be used add structured information to an transaction, instead
of writing it into the notice textfield. E.g. this could be used to have
different types depending on the source of money (cash vs. bank transfer).
Classes are shown as different columns in the tables and will be uses to
group transactions of specific types. They should be used if not the whole
amount of ordergroup should be used to order food. E.g. if there is a
deposit or membership fee, which is independent of the normal credit.
This will allow us to implement additional features based on classes in
the future. E.g. the sum of transactions in the "membership fee" class
must be positive to allow food orders or show a big warning if it is bellow
a certain value.
2017-12-09 11:51:23 +01:00
dc94e98138
Add folders to the documents plugin
2017-11-21 10:12:13 +01:00
53bb096046
Add FinancialLinks
...
For now this is only usefull for plugins, since there is no UI.
2017-10-28 20:17:16 +02:00
564492afe4
Add an option to automatically finish an order
2017-10-12 21:14:29 +02:00
c3927e4013
Enable documents plugin by default
2017-10-12 20:46:39 +02:00
f509f85327
Save the timestamp of the last mail to supplier and confirm resending it
2017-10-11 23:48:27 +02:00
97abcabffa
Log mail delivery errors to database and add an UI for it
2017-10-02 16:02:39 +02:00
c6731b4e4f
Add IBAN field to supplier and user model
2017-01-21 22:43:48 +01:00
749791bb7a
Add possibility to add an attachment to an invoice #345
2016-05-06 15:04:58 +02:00
8d5467ab7c
Merge pull request #355 from foodcoop1040/expeted_delivery_date
...
Add expected delivery date
2016-05-04 17:42:29 +02:00
f286dd6053
Add pickup date
...
This additional date helps users to find the correct order if the time
between end and pickup varies a lot.
2016-04-29 15:28:05 +02:00
9e0ec35e9c
Fix schema version ( closes foodcoops/foodsoft#425 )
2016-03-30 20:27:00 +02:00
b067808937
Merge pull request #404 from foodcoop1040/ordergroup_break
...
Add break to ordergroup
2016-03-11 13:48:57 +01:00
9c4d9d5c20
Add stock group order
...
This allows us to add additional items to an order, which do not belong
a specific user, but will be put into stock. The benefit of this change
is that we use the same order for ordergroups and stock.
2016-03-11 13:15:16 +01:00
253512eb51
Add break to ordergroup
...
In some foodcoops it is possible that ordergroups make a break. During that
they e.g. pay reduced or no membership fees and do not need to do work for
the foodcoop. This new fields make this visible to all members.
2016-03-08 04:38:13 +01:00
b05ac2ab64
Add deleted_at for User
...
Do not remove the user from the database. Mark as deleted instead.
2016-03-04 19:03:52 +01:00
4e35e2d58e
Add handling for message reply via email
...
If the reply_email_domain configuration is set the messages plugin will
use unique Reply-To addresses for every email. They contain enough
information to reconstruct the message context and a hash to avoid
user forgery and spam.
A mail transfer agent must be configured to call the new rake task
foodsoft:parse_reply_email for incoming mails. The rake task requires
the receipt of the mail in the RECIPIENT variable and the raw message
via standard input. An example invocation would look like:
rake foodsoft:parse_reply_email RECIPIENT=f.1.1.HASH < test.eml
2016-03-04 18:11:27 +01:00
1315103a7d
Add role_invoices
...
This new role allows users to create invoices without role_finance. Users
can then only modify their own created invoices until somebody with the
role_finance sets the paid_on value.
2016-03-04 16:06:02 +01:00
460cf1e82c
Change relationship of invoices #390
...
This change will allow us to have invoices for more than one order/delivery
in the future. There are no UI changes for now.
2016-03-04 15:55:39 +01:00
3d6f908102
Add created_by to invoice and show it
2016-02-24 00:39:07 +01:00
a03789e048
Add optional boxfill phase to orders
2015-11-13 18:10:46 +01:00
700eed27b8
Add last user login and activity
2015-03-03 14:55:30 +01:00
b42672c06c
Add forgotten migration
2015-02-27 17:59:30 +01:00
55e8ff481c
Add reply_to and group_id to messages schema
2015-02-27 17:30:26 +01:00
3a3119f274
Regenerate schema
2015-02-27 17:28:50 +01:00
8e4f3a4caf
Increase account_balance precision ( closes foodcoops/foodsoft#322 )
2014-12-11 22:12:19 +01:00
0e1cde9e2b
more extensive database seeds (in two languages) (closes foodcoops#277)
2014-09-29 17:26:27 +02:00
c750416b9e
Remove all memberships where belonging group was deleted.
2014-09-21 12:54:01 +02:00
dd3ac0971c
allow to put foodcoop config in database
2014-09-02 14:21:32 +02:00
647b7f0430
allow to synchronize all articles of a shared supplier
2014-09-02 12:58:31 +02:00
133b832d78
fix database migrations
2014-06-24 09:13:35 +02:00
25854f2de7
do not store GroupOrderArticles with zero quantity and tolerance
2014-05-13 17:01:26 +02:00
7841245795
migrate to Rails 4.0 (closes foodcoops#214)
...
Conflicts:
Gemfile.lock
2014-02-24 12:46:28 +01:00
ebe2966895
fix migration, complements 7aae7f4d55
2014-01-03 12:50:49 +01:00
7aae7f4d55
Add result_computed to GroupOrderArticle
2014-01-03 10:07:03 +01:00
bd1b932775
add receive screen, quantities for model, redistribution
2013-11-25 14:17:31 +01:00
66ac3be81f
Merge branch 'master' into allow-no-nickname
...
Conflicts:
app/views/home/ordergroup.html.haml
app/views/login/new_password.html.haml
app/views/shared/_auto_complete_users.rhtml
app/views/shared/memberships/_current_members.rhtml
app/views/shared/memberships/_non_members.rhtml
2013-11-18 11:42:49 +01:00
9490357fcc
fix migration name
2013-11-07 12:03:28 +01:00
a27dda62e0
copy migrations to default directory instead of trying to make it more easy to use
2013-11-06 10:54:20 +01:00
c3068c8d51
move foodsoft_wiki db migration to plugin
2013-10-30 09:43:38 +01:00
a77c3b59b1
allow to login with email instead of nick as well + tests
2013-09-20 22:39:19 +02:00
2d549fc1da
do not recalculate GroupOrder totals, but show message to do so on migrations
2013-09-18 18:33:49 +02:00
ebb22ccb53
Merge branch 'master' into fix-closed-group_order-totals
...
Conflicts:
db/schema.rb
2013-09-18 18:14:07 +02:00
3792069fda
Fxed encoding error when uploading files with non-ascii characters.
2013-09-02 16:46:44 +02:00
bf1c2b5ed2
Handle missing due_date in weekly tasks migration.
2013-09-02 15:42:03 +02:00
c7cdcf2b82
Allow setting default locale in user settings migration.
...
Use DEFAULT_LOCALE=de to have german enabled for all users.
2013-09-02 10:42:05 +02:00
4ea940e4a3
Removed unused acts_as_configurable gem.
2013-09-02 10:03:12 +02:00
74bfc85562
Merge remote-tracking branch 'fsmanuel/master' into master.
...
Updated migration date to today.
Conflicts:
db/schema.rb
2013-07-18 18:48:49 +02:00
497c9e0cf1
fix closed group_order totals
2013-07-02 12:01:25 +02:00
e5d790021c
Add repeated symbol to task list.
2013-06-27 10:22:22 +02:00
7942ccfae6
Added missing migration files.
2013-06-24 12:02:22 +02:00
c27127c745
Added i18n strings.
2013-06-24 11:53:52 +02:00
abe7c7181d
Remove obsolete columns from database.
2013-06-24 10:57:42 +02:00
3d1faa9ed3
Skip save callback when migrating data.
2013-06-24 10:36:14 +02:00
ef329b5647
Added up and down migration for weekly task data.
2013-06-22 17:35:45 +02:00
71d8f9bde7
Fixed schema.rb.
2013-06-12 10:20:06 +02:00
60c4c5510a
adds a new user settings system + migration + rake task/worker updates
2013-06-06 03:40:15 +02:00
981944b869
Merge commit '1cdb9e85017a17e4dbee276cd87feaa2aab75932' into rails3-multiple-recurring-tasks
...
Conflicts:
Gemfile
db/schema.rb
2013-03-15 17:59:19 +01:00
28aec7e4d6
Replace ordergroup.account_updated with non database attr.
2012-12-30 15:31:37 +01:00
2c0fe08be6
Replaced delayed_job with resque. See README_DEVEL
2012-12-23 17:38:04 +01:00
0dff5ea784
Fixed some bugs in tasks, apple feature:
...
* Update ordergroup stats when task is destroyed.
* Removed assigned caching attribute in task object.
* A lot of eager loading for tasks controller.
2012-12-16 19:07:45 +01:00
0edd29dfd4
Merge branch 'master' into master-to-rails3
...
Conflicts:
Gemfile
README_DEVEL
app/controllers/articles_controller.rb
app/controllers/orders_controller.rb
app/controllers/tasks_controller.rb
app/models/task.rb
app/views/articles/_import_search_results.haml
app/views/articles/index.haml
app/views/messages/new.haml
app/views/ordering/_order_head.haml
app/views/ordering/my_order_result.haml
app/views/orders/show.haml
app/views/stockit/new.html.haml
db/schema.rb
2012-12-14 18:10:46 +01:00
1cdb9e8501
Outlined new concept for multiple periodically recurring tasks ( #3 ).
2012-11-28 10:13:54 +01:00
c17ff281c3
Save and display creator of Order
2012-11-12 14:24:49 +01:00
69c4fc5817
Add created_by_user_id to Order table
2012-11-12 11:37:26 +01:00
cd91436f7f
Allow ignoring apple restriction for specific ordergroup.
2012-09-30 13:34:16 +02:00
b0c9580b53
Added delayed_job as new background queue manager.
2012-08-24 13:48:45 +02:00
7b7d50a235
Added database indexes. Performance boost for balance page.
...
Conflicts:
db/schema.rb
2012-06-26 23:27:25 +02:00
182742fbec
Merge branch 'master' into rails3
...
Conflicts:
.gitignore
app/models/task.rb
app/models/workgroup.rb
app/views/shared/_group_form.html.haml
config/locales/de.yml
db/schema.rb
2012-06-26 11:51:56 +02:00
7d54a416df
Allow changing number of automaticly created next weekly tasks.
2012-06-24 11:01:16 +02:00
218f40eb8d
Added database indexes. Performance boost for balance page.
2012-05-28 10:41:33 +02:00
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
c2496aa4fd
Consider task duration in ordergroup stats.
...
* Also added duration to task template in workgroup task_duration.
2011-05-07 21:54:00 +02:00
dcd2a514a6
Added duration to tasks. Annotated all models.
2011-05-07 20:50:39 +02:00
1e49a44a92
Added seeds.rb for an easy start.
2011-05-06 20:23:33 +02:00
9f60a323ad
Add indexes for better sql query performance.
2009-09-07 15:35:19 +02:00
24854984ed
Added index for pages.
2009-08-15 17:36:13 +02:00
e75a42d509
Merge branch 'wiki'
2009-08-15 17:24:08 +02:00
a8c93c08b7
Added parent-child relationship to pages to visualize a breadcrump and subpages.
2009-08-12 18:41:25 +02:00
16346e3529
Added note to deliveries. Closes #34
2009-08-12 13:09:10 +02:00
d8cdbe4abb
Added rake task for auto create of upcoming workgroup tasks (weekly tasks).
2009-08-11 17:22:08 +02:00
d848831fea
Implemented stats for ordergroups on startpage. Annotated models.
2009-08-01 13:41:22 +02:00
55729e20f9
Create a redirect when editing the title of a page.
2009-06-11 23:51:26 +02:00
255a4cd6c7
Fixed problems in interacting of acts_as_versioned and optimistic locking.
2009-05-20 15:26:53 +02:00
053c665270
Added version control for wiki pages.
2009-05-15 17:32:45 +02:00
7ba6bc3680
Added optimistic locking to wiki pages.
2009-05-15 13:54:42 +02:00
36f9bffdb8
Allow input of decimal numbers for GroupOrderArticle-result.
2009-04-05 15:23:21 +02:00
f450070dbf
First steps for an own wiki.
...
* Scaffold for Page Objekt
* Using textile for rendering html
* Easy wiki-links with [[wikipage]]
2009-03-25 19:54:04 +01:00
da08365816
Fixed bug order.profit calculation.
...
Order.profit will also be saved, when order is closed.
2009-03-17 19:43:41 +01:00
a29053b4e9
Some language fixes. Finished migration path.
2009-03-01 18:45:34 +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
67743cd014
Implement notification for upcoming tasks via a daily fired rake-task.
2009-02-10 15:07:47 +01:00
6202e05841
Last part of order refactoring. Now order_article create/update is possible.
2009-02-09 20:12:56 +01:00
46d0a9c485
Updated database-schema.
2009-02-06 16:40:05 +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
251ced4fa1
Introduced group_order_article.result to save the result for each group/article.
2009-02-04 16:41:01 +01:00
Patrick Gansterer
wvengen
wvengen
Benjamin Meichsner
Benjamin Meichsner
Robert Waltemath
Manuel Wiedenmann
Julius
Benjamin Meichsner