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
645c142bf6
Add FinancialLinksController#incomplete
2020-07-30 17:19:02 +02:00
Patrick Gansterer
057f3ec8ea
Add welcome mail
2020-07-30 17:14:14 +02:00
Patrick Gansterer
3f25138997
Add option to create foodcoop transaction when creating a collection
...
This option can be used, if a kind of "double-entry accounting" is used
and every transaction should have a corresponding transaction.
2020-07-29 18:11:51 +02:00
Patrick Gansterer
fc22a97f52
Nullify deliveries and orders depending on an invoice ( #718 )
2020-07-29 15:12:48 +02:00
Florian Lentsch
5eb8abf431
Potential fix for one of the issues mentioned in #49
...
Reduces the number of SQL queries used on group_orders/index and
group_orders/archive, but adds extra complexity to the code
2020-07-29 13:15:11 +02:00
Patrick Gansterer
602f663245
Add UI to show and create financial transactions for the foodcoop
2020-07-29 11:43:45 +02:00
Patrick Gansterer
1a49bee42d
Adopt model to allow FinancialTransaction without an ordergroup
...
This will allow us to add accounting for the foodcoop itself, to support
listing for spendings independent of the order (e.g. rent, electricity).
2020-07-29 11:43:31 +02:00
Patrick Gansterer
e16f03eebf
Add reference_calculator
2020-07-29 11:02:58 +02:00
wvengen
b96ce06d94
API v1 financial_transactions endpoints ( #627 )
2020-07-25 14:18:59 +00:00
Patrick Gansterer
dbb7407005
Clear IBAN when deleting a supplier
2020-06-22 16:35:22 +02:00
Patrick Gansterer
0aa853c53d
Add information text to the receive view
2020-06-22 16:35:22 +02:00
Patrick Gansterer
5a9cc811c9
Add download for articles
2020-06-22 16:35:22 +02:00
Patrick Gansterer
b6f5295267
Add created_by user to Task
2020-04-11 00:04:49 +02:00
Patrick Gansterer
18e38be6be
Create new FinancialLink for reverted FinancialTransaction
2020-04-11 00:04:49 +02:00
Patrick Gansterer
9b889dd643
Add option to create ordergroup together with user
2020-04-11 00:04:49 +02:00
Patrick Gansterer
a3946ed3d4
Add missing authorization for InvoicesController
2020-04-11 00:04:35 +02:00
Patrick Gansterer
3b79c05ffe
Add link to unpaid invoices to invoice index page
2020-04-11 00:03:55 +02:00
Patrick Gansterer
08065a09ec
Sort suppliers in dropdown menu for new deliveries
2020-04-10 23:59:06 +02:00
Patrick Gansterer
a3defc5463
Add FinacialTransaction create_collection for ordergroup custom fields
...
Custom fields of an ordergroup can set financial_transaction_source to
true, to act as an source for a new collection of FinacialTransaction.
A typical usecase would be a variable membership fee, which will be stored
in a custom field on the ordergroup. When a new membership period begins
a collection with all membership fees can be created with one click.
2020-03-23 17:40:18 +01:00
Patrick Gansterer
d73c206e29
Fix copy operation for stock orders
...
Stock orders have the supplier_id set to zero, which will be ignored
in the url-method by rails. Only use the order_id to fix this.
2020-03-23 17:20:21 +01:00
Patrick Gansterer
3fb3fa409b
Limit financial overview items to speed up loading
...
If a foodcoop does not use the balancing feature the list of unfinished
orders will be very long and needs a significant amount of time to load.
2020-03-23 16:29:30 +01:00
Patrick Gansterer
739914ad43
Show only started orders to members for ordering
2020-03-23 16:25:54 +01:00
Patrick Gansterer
ab912877c3
Fix query in HomeController::ordergroup
2020-03-23 16:23:13 +01:00
Patrick Gansterer
526ea51eac
Update Haml files for usage with version 5
2020-03-23 16:19:37 +01:00
Patrick Gansterer
e606f606da
Convert configuration parameters to Hash for passing to FoodsoftConfig
...
This is required for compatibility with Rails 5.0.
2020-03-23 16:18:58 +01:00
Patrick Gansterer
f8a4341c76
Remove unused edit variable in articles_by-views
...
The edit version is already handled in group_order_article_edit_result().
2020-03-23 16:09:30 +01:00
Patrick Gansterer
17059a8104
Adopt model to reference GroupOrder in generated FinancialTransaction
2020-03-17 09:38:44 +01:00
Patrick Gansterer
ecb4a8a4ba
Add method to close all invoices with an invoice direct
...
When the charge_members_manually option is active there is no need for an
explicit balancing step. This new function allows to close_direct all
orders which have an assigned invoice, which is usually indication enough
to find orders which can be closed finally.
2020-02-28 12:17:27 +01:00
Patrick Gansterer
226d2dda74
Validate the format of FinancialTransactionType.name_short
2020-02-24 14:56:45 +01:00
Patrick Gansterer
5d84156bd8
Add BankAccountConnector to implement bank import methods in plugins
2020-02-24 14:30:03 +01:00
Patrick Gansterer
d476993321
Add polls plugin
2020-02-24 14:27:22 +01:00
Patrick Gansterer
640e230d88
Fix usage of task_params in TasksController
2020-02-18 19:06:26 +01:00
Patrick Gansterer
f15ca8610b
Add pickup date to order_result message
2020-02-18 19:04:10 +01:00
Patrick Gansterer
341f86d98e
Fix invoice redirect
2020-02-18 19:02:34 +01:00
Patrick Gansterer
9babb6cfe9
Fix rendering of financial transaction types sums
2019-11-11 13:57:06 +01:00
Patrick Gansterer
9757e7a216
Fix Mailer.upcoming_tasks
2019-11-11 11:26:55 +01:00
Patrick Gansterer
de94220758
Add FoodsoftConfig.scope to ExceptionNotifier.notify_exception
2019-11-11 11:18:51 +01:00
Patrick Gansterer
db4c29ff1b
Make the uniqueness of the name of a group expicit in the model
2019-11-11 11:12:27 +01:00
Patrick Gansterer
eb8241cf04
Fix rescue in Admin::MailDeliveryStatusController#destroy
2019-11-11 11:11:33 +01:00
Patrick Gansterer
1d9856ff93
Handle nil values correctly in User.authenticateUser
2019-11-11 11:10:26 +01:00
Patrick Gansterer
e498f9cb58
Add default roles for users
...
Some foodcoops want to give some roles to every member by default,
without adding every users to a workgroup.
2019-11-04 11:39:33 +01:00
Patrick Gansterer
ff76fa60c0
Allow deletion of financial transactions
2019-11-01 20:56:00 +01:00
Patrick Gansterer
260ef90f6b
Add option to create a financial_link when creating financial_transaction
...
If multiple financial transaction belong to a bank transaction, it
is sometimes easier to create them as a collection and add the bank
transaction instead of adding all financial transaction to a link
created via a bank transaction.
2019-10-30 22:27:18 +01:00
Patrick Gansterer
7875eeff2c
Fix link for creation of financial link on bank transaction page
2019-10-30 12:44:29 +01:00
Patrick Gansterer
d89254c42b
Show attachment and note in the unpaid invoices overview
2019-10-30 12:43:23 +01:00
Patrick Gansterer
c559a31a9e
Fix and clean up bank account translations for English and German
2019-10-30 12:42:41 +01:00
Patrick Gansterer
30c53746fc
Replace custom search placeholder with ui.search_placeholder
2019-10-30 12:00:46 +01:00
Patrick Gansterer
1550eedb5a
Add additional eager loading annotations
2019-10-30 11:53:44 +01: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
d4ab0a055f
Fix "Cannot infer root key from collection type." in UserController
2019-10-29 17:46:04 +01:00
Patrick Gansterer
8e2ca5e7d7
Add automatic generation of financial transactions and links
2019-10-29 13:52:56 +01:00
Patrick Gansterer
2100c738af
Change deprecated *_filter methods to *_action
2019-10-29 09:41:01 +01:00
wvengen
6d9c35db20
Move to apparition for integration tests
2019-10-28 17:58:14 +00:00
JuliusR
71bdf3bfcc
Allow to copy articles (PR #673 , #541 )
2019-10-14 07:25:34 +00:00
JuliusR
00458f79ab
Suppress deleted suppliers from SharedSupplier.suppliers
...
Fixes #546 .
2019-06-14 10:10:20 +00:00
JuliusR
5bf7f41005
Fix matching of uploaded articles by order_number
2019-06-14 10:08:19 +00:00
MatCast
7136d015c4
Added css to improve smaller screen usability (PR #668 )
2019-06-05 21:50:11 +02:00
JuliusR
2d0a81c92d
Fix and cleanup stock takings (PR #667 )
2019-05-14 14:24:41 +00:00
Tom Carchrae
ef545e978e
add search to balancing page (PR #651 )
...
(cherry picked from commit 2039da54b2077a6befccb409ef02a3172bcba237)
2019-05-01 17:33:32 +00:00
wvengen
e9be38b3e9
Add OAuth scopes
...
https://github.com/foodcoops/foodsoft/issues/582#issuecomment-442513237
2019-04-03 17:20:44 +00:00
wvengen
366d92e421
Fix sync with unavailable by default ( #649 )
2019-04-03 18:53:23 +02:00
Tom Carchrae
99052fa3a7
Don't allow changes to settled orders (PR #614 )
2019-03-26 19:14:39 +00:00
Tom Carchrae
d70c3a9bf1
allow 1 char unit, eg L or g
2019-03-26 18:58:36 +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
Tom Carchrae
02328eba2b
fix missing translation
2019-02-20 22:26:51 +01:00
Patrick Gansterer
63e1541aa3
Use the default locale when sending mails to suppliers
2019-02-05 23:32:00 +01:00
Patrick Gansterer
d925533366
Fix rendering of stock order in OrderByGroups
2019-02-05 23:31:45 +01:00
Patrick Gansterer
b029fb98d6
Show sums for financial transaction types for ordergroups
2019-02-05 23:31:16 +01:00
Patrick Gansterer
5dab748fe3
Move sending of PDF into new ActiveSupport::Concern
2019-02-02 12:30:42 +01:00
Tom Carchrae
e5f64cff8c
units cannot show html in tooltip
2019-01-18 18:26:11 +01:00
Patrick Gansterer
52323b98b8
Fix create_collection in FinancialTransactionsController
2019-01-17 20:27:43 +01:00
Patrick Gansterer
a4f5b8fb33
Do not show deleted users as members of groups ( fixes #587 )
2019-01-15 05:20:58 +01:00
Patrick Gansterer
8d1dbe1448
Remove mail workaround after upgrade to 2.7
2019-01-15 05:08:03 +01:00
Patrick Gansterer
71fd6f2a24
Add CSV download for ordergroups
2019-01-15 04:50:32 +01:00
Patrick Gansterer
389f205a6b
Add set_balance to FinancialTransactions#new_collection ( fixes #438 )
...
A new checkbox will allow user to set the balance to a given ABSOLUTE value
in addition to changing it by a RELATIVE value. This can be used if the
balance is tracked outside of foodsoft and should be syncroniced or for
setting the balance to zero for multiple ordergroups.
2019-01-15 04:44:16 +01:00
Patrick Gansterer
abe847c0ee
Add and inherit from ApplicationRecord to match Rails 5.0 style
2019-01-15 04:40:05 +01:00
Patrick Gansterer
8c6d48da86
Avoid ActionView::MissingTemplate occurred in sessions#new
...
Some browser request /:foodcoop/login with the HTTP-Accept-Header set
to "image/webp,image/*;q=0.8", which leads to an internal server error
due to a not existing template. Call respond_to to allow only html and
respond with the correct "406 Not Acceptable" HTTP status code.
2019-01-15 04:18:47 +01:00
Tom Carchrae
7e88798778
big speedup in syncing via caching/reducing queries ( #610 )
2019-01-15 02:56:21 +01:00
Tom Carchrae
31689dfb75
allow override of default limit (<200) on articles on shared suppliers ( #609 )
2019-01-15 02:55:12 +01:00
Tom Carchrae
a66a44bdcf
error was on incorrect property
2019-01-14 21:01:30 +01:00
wvengen
554be093b9
API v1 navigation endpoint
2018-10-13 20:41:47 +02:00
wvengen
9c5a5d9492
API v1 config endpoint
2018-10-13 20:41:47 +02:00
wvengen
110c7cc3e9
API v1 user endpoint
2018-10-13 20:41:47 +02:00
wvengen
fd96b6ccc1
Prepare for API v1 (PR #570 )
2018-10-13 20:16:35 +02:00
Patrick Gansterer
4137992032
fix auto_close_and_send_min_quantity
2018-10-12 15:47:32 +02:00
Patrick Gansterer
4eef0f07d5
Fix internal server error at invoices
2018-10-12 15:47:16 +02:00
Patrick Gansterer
903086ab97
Add import route for bank_transactions
2018-10-12 15:47:02 +02:00
Patrick Gansterer
0bb0536903
Add short name to FinancialTransactionType
2018-10-12 13:33:41 +02:00
Patrick Gansterer
707501e3f8
Add edit functionality for financial links
2018-10-12 13:18:23 +02:00
Patrick Gansterer
f0a55fb951
Add model and views for bank accounts
2018-10-11 22:29:15 +02:00
Martin Ortbauer
4b1e9a6f53
improve usability when ordering (PR #552 )
...
also show box with links to currently open orders after the order has been saved
2018-10-11 22:15:00 +02:00
Patrick Gansterer
6cc02cb563
Add format helper for currency
2018-10-11 21:56:46 +02:00
Patrick Gansterer
66e9629858
Fix balancing with financial_transaction_types
2018-06-11 15:54:18 +02:00
Patrick Gansterer
91e8eb4950
Add missing brackets to the Message-ID of emails
2018-06-11 15:51:33 +02:00
Patrick Gansterer
ac11ba1cc1
Add pickups role
2018-01-25 18:09:29 +01:00
Patrick Gansterer
4c41a99fde
Fix pickup view for orders without pickup data ( #537 )
2017-12-09 18:38:36 +01:00