526ea51eac
Update Haml files for usage with version 5
2020-03-23 16:19:37 +01:00
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
17059a8104
Adopt model to reference GroupOrder in generated FinancialTransaction
2020-03-17 09:38:44 +01:00
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
5d84156bd8
Add BankAccountConnector to implement bank import methods in plugins
2020-02-24 14:30:03 +01:00
f15ca8610b
Add pickup date to order_result message
2020-02-18 19:04:10 +01:00
9757e7a216
Fix Mailer.upcoming_tasks
2019-11-11 11:26:55 +01:00
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
ff76fa60c0
Allow deletion of financial transactions
2019-11-01 20:56:00 +01:00
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
7875eeff2c
Fix link for creation of financial link on bank transaction page
2019-10-30 12:44:29 +01:00
d89254c42b
Show attachment and note in the unpaid invoices overview
2019-10-30 12:43:23 +01:00
c559a31a9e
Fix and clean up bank account translations for English and German
2019-10-30 12:42:41 +01:00
30c53746fc
Replace custom search placeholder with ui.search_placeholder
2019-10-30 12:00:46 +01:00
1550eedb5a
Add additional eager loading annotations
2019-10-30 11:53:44 +01:00
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
8e2ca5e7d7
Add automatic generation of financial transactions and links
2019-10-29 13:52:56 +01:00
6d9c35db20
Move to apparition for integration tests
2019-10-28 17:58:14 +00:00
71bdf3bfcc
Allow to copy articles (PR #673 , #541 )
2019-10-14 07:25:34 +00:00
2d0a81c92d
Fix and cleanup stock takings (PR #667 )
2019-05-14 14:24:41 +00:00
ef545e978e
add search to balancing page (PR #651 )
...
(cherry picked from commit 2039da54b2077a6befccb409ef02a3172bcba237)
2019-05-01 17:33:32 +00:00
366d92e421
Fix sync with unavailable by default ( #649 )
2019-04-03 18:53:23 +02:00
99052fa3a7
Don't allow changes to settled orders (PR #614 )
2019-03-26 19:14:39 +00:00
02328eba2b
fix missing translation
2019-02-20 22:26:51 +01:00
b029fb98d6
Show sums for financial transaction types for ordergroups
2019-02-05 23:31:16 +01:00
e5f64cff8c
units cannot show html in tooltip
2019-01-18 18:26:11 +01:00
52323b98b8
Fix create_collection in FinancialTransactionsController
2019-01-17 20:27:43 +01:00
71fd6f2a24
Add CSV download for ordergroups
2019-01-15 04:50:32 +01:00
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
fd96b6ccc1
Prepare for API v1 (PR #570 )
2018-10-13 20:16:35 +02:00
903086ab97
Add import route for bank_transactions
2018-10-12 15:47:02 +02:00
0bb0536903
Add short name to FinancialTransactionType
2018-10-12 13:33:41 +02:00
707501e3f8
Add edit functionality for financial links
2018-10-12 13:18:23 +02:00
f0a55fb951
Add model and views for bank accounts
2018-10-11 22:29:15 +02:00
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
6cc02cb563
Add format helper for currency
2018-10-11 21:56:46 +02:00
ac11ba1cc1
Add pickups role
2018-01-25 18:09:29 +01:00
4c41a99fde
Fix pickup view for orders without pickup data ( #537 )
2017-12-09 18:38:36 +01:00
209ad615b4
Add view to sort orders by pickup day
2017-12-09 12:56:34 +01:00
bd49a64cd7
Make the download button of orders reusable
2017-12-09 12:25:29 +01:00
dae4d075fe
Add UI to manage the financial transaction types and classes
2017-12-09 11:51:23 +01:00
924f346b4c
Show the financial transaction type if there are more than one type #367
2017-12-09 11:51:23 +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
f261272c7e
Fix size of receive_button in list of finished orders
2017-11-06 14:15:15 +01:00
2d641b683a
Show links to details beside the header to save space
2017-10-28 20:17:45 +02: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
75deec9f06
Add custom fields to invoice, odergroup, supplier and user
2017-10-28 20:16:47 +02:00
72b5a5ca82
Add option to show account balance instead of available funds
...
Some foodcoops do not use the accounting feature of the foodsoft, which
results in wrong calculation of the available credit. To avoid
confusions show the current account balance instead.
2017-10-28 20:16:25 +02:00
6989e2f4f7
Add view for unpaid invoices
2017-10-26 21:27:26 +02:00
da1ebe915c
Use deface in wiki plugin
2017-10-26 21:23:51 +02:00
564492afe4
Add an option to automatically finish an order
2017-10-12 21:14:29 +02:00
f509f85327
Save the timestamp of the last mail to supplier and confirm resending it
2017-10-11 23:48:27 +02:00
f27bbc2ffa
Add a button to send the order to the supplier
2017-10-10 23:45:37 +02:00
97abcabffa
Log mail delivery errors to database and add an UI for it
2017-10-02 16:02:39 +02:00
7bb5e74e0c
Fix mailer/not_enough_users_assigned view
2017-09-30 12:07:47 +02:00
8798b886db
Fix mailing of order_result (PR #493 )
2017-08-21 11:17:54 +02:00
c6297f2864
Sort workgroups of tasks by name
2017-08-20 01:08:47 +02:00
6a110ca429
Show the Help link only when a help_url is set
2017-08-20 01:07:48 +02:00
e0dbd396e1
Hide break in shared group template if empty
2017-02-03 20:30:28 +01:00
c6731b4e4f
Add IBAN field to supplier and user model
2017-01-21 22:43:48 +01:00
925727d3ae
Show button for creating invoices also at finished orders
...
Check if a order is not opened instead of checking if it is closed.
2017-01-21 22:42:16 +01:00
233ed415c7
Add "Copy" button for settled orders #383
2017-01-21 22:41:44 +01:00
d06a9ed3f0
Fix dynamic select2 usage (oops!)
2016-08-12 15:54:28 +02:00
326016dfb5
Fix tricky i18n error on html render (not js)
2016-08-09 20:38:55 +02:00
961c50b7e5
Hide delete attachment button when none present
2016-05-06 15:57:15 +02: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
5c56ae6775
Add missing changes for the stock order
2016-03-11 22:52:49 +01:00
42eb6c8509
Make ordergroup break fields a bit nicer
2016-03-11 13:56:02 +01:00
b067808937
Merge pull request #404 from foodcoop1040/ordergroup_break
...
Add break to ordergroup
2016-03-11 13:48:57 +01:00
4433a665e4
Merge pull request #421 from foodcoop1040/edit_links
...
Add page to edit deliveries and orders linked to an invoice
2016-03-11 13:39:27 +01:00
b8010fedca
Add ordergroup_name to GroupOrder
2016-03-11 13:36:49 +01:00
efb929e64f
Allow editing of linked deliveries and orders at invoice
2016-03-11 13:23:13 +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
b56df39623
Merge pull request #417 from foodcoop1040/deliveries_col
...
Hide deliveries column if there are no deliveries
2016-03-11 11:53:40 +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
14e2fd179e
Merge pull request #403 from foodcoops/feature/402-messagegroups
...
Add messagegroups
2016-03-07 22:36:37 +01:00
d358278333
Merge pull request #416 from foodcoop1040/invite_config
...
Add config option to disable the invites
2016-03-07 19:47:00 +01:00
0b70ce39a8
Merge pull request #414 from foodcoop1040/ftc
...
Add a button to add all ordergroups to a new finanacial transaction c…
2016-03-07 19:45:45 +01:00
b4e2ddf66d
Merge pull request #412 from foodcoop1040/confirm
...
Get rid of duplicated confirm_delete translations
2016-03-07 19:44:06 +01:00
7d7dfd7155
Hide deliveries column if there are no deliveries
...
For foodcoops which do not use the delivery feature the column occupies
space in the table, which could be user better with something else.
2016-03-06 14:01:24 +01:00
e16a0fb336
Add config option to disable the invites
...
Some foodcoops require that an admin adds all users to have more control
over the users.
2016-03-06 13:56:33 +01:00
a5d0c5ccab
Add a button to add all ordergroups to a new finanacial transaction collection
...
This function can be used if we need to add the same financial transaction
to all ordergroups at the same time. E.g. the monthly membership fee.
2016-03-06 11:53:31 +01:00
c62104a388
Get rid of duplicated confirm_delete translations
2016-03-04 23:13:28 +01:00
5e744453f8
Add more infos to the invoice page
...
When a foodcoop does not use the balancing feature the invoice page is
the main page for informations. Add all related information to it, so
people do not need to open the balancing page.
2016-03-04 22:26:55 +01:00
f5b6fbcf18
Merge pull request #408 from foodcoop1040/count_to_any
...
Replace "count > 0" with "any?"
2016-03-04 21:37:21 +01:00
0fc80a1ef5
Rename translation "admin.confirm" to "ui.confirm_delete"
2016-03-04 20:10:11 +01:00
1efd3745df
Replace "count > 0" with "any?"
2016-03-04 20:01:56 +01:00
97f81d9826
Merge pull request #406 from foodcoop1040/delete_user
...
Add deleted_at for User
2016-03-04 19:12:04 +01:00
b623b6abbf
Remove useless if in invoices form
...
The created_at field has a value all the time, so the check if it is set
make no sense since it evaluates to true all the time.
2016-03-04 19:06:05 +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
01cf6431a9
Add messagegroup
...
Messagegroups are a new kind of group. Every user can join and leave such a
group on her own. They are useful to create topics for mails.
E.g. if there is a weekly newsletter we can create a new messagegroup for
it and every user which is interested in receiving the newsletter can join
the corresponding group.
2016-03-04 18:32:57 +01:00
b30b4e46d8
Order items in select boxes
2016-03-04 18:28:00 +01:00
72ef31c0ec
Make unassigned tasks more prominent in the dashboard
...
Show all unassigned task in the dashboard to make it more interesting
for members to pick tasks. Some members do not (want to) click on the
task list very often it is not clear if there are new tasks if we show
the number of unassigned tasks only.
2016-03-04 17:15:45 +01:00
6015d16cab
Add link for creating invoice at an order
2016-03-04 17:12:46 +01:00
d383288f4f
Add missing class="btn" to edit button of invoice
...
This aligns the interface with all other pages.
2016-03-04 17:04:00 +01:00
d56828fa4d
Show last user activity in admin ordergroups too
2016-03-04 16:28:22 +01:00
8b8693df5a
Show last activity of ordergroups
2016-03-04 16:16:09 +01:00
4cacb740d1
Small improvement in invoice edit
2016-03-04 16:14:54 +01:00
Patrick Gansterer
wvengen
JuliusR
Tom Carchrae
Tom Carchrae
wvengen
Martin Ortbauer