Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity
1929 commits 22 branches 1 tag 31 MiB
Commit graph

821 commits

Author SHA1 Message Date
Patrick Gansterer
e0dbd396e1 Hide break in shared group template if empty 2017-02-03 20:30:28 +01:00
Patrick Gansterer
c6731b4e4f Add IBAN field to supplier and user model 2017-01-21 22:43:48 +01:00
Patrick Gansterer
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
Patrick Gansterer
233ed415c7 Add "Copy" button for settled orders #383 2017-01-21 22:41:44 +01:00
wvengen
d06a9ed3f0 Fix dynamic select2 usage (oops!) 2016-08-12 15:54:28 +02:00
wvengen
326016dfb5 Fix tricky i18n error on html render (not js) 2016-08-09 20:38:55 +02:00
wvengen
961c50b7e5 Hide delete attachment button when none present 2016-05-06 15:57:15 +02:00
Patrick Gansterer
749791bb7a Add possibility to add an attachment to an invoice #345 2016-05-06 15:04:58 +02:00
wvengen
8d5467ab7c Merge pull request #355 from foodcoop1040/expeted_delivery_date 
Add expected delivery date
 2016-05-04 17:42:29 +02:00
Patrick Gansterer
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
Patrick Gansterer
5c56ae6775 Add missing changes for the stock order 2016-03-11 22:52:49 +01:00
wvengen
42eb6c8509 Make ordergroup break fields a bit nicer 2016-03-11 13:56:02 +01:00
wvengen
b067808937 Merge pull request #404 from foodcoop1040/ordergroup_break 
Add break to ordergroup
 2016-03-11 13:48:57 +01:00
wvengen
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
Patrick Gansterer
b8010fedca Add ordergroup_name to GroupOrder 2016-03-11 13:36:49 +01:00
Patrick Gansterer
efb929e64f Allow editing of linked deliveries and orders at invoice 2016-03-11 13:23:13 +01:00
Patrick Gansterer
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
wvengen
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
Patrick Gansterer
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
wvengen
14e2fd179e Merge pull request #403 from foodcoops/feature/402-messagegroups 
Add messagegroups
 2016-03-07 22:36:37 +01:00
wvengen
d358278333 Merge pull request #416 from foodcoop1040/invite_config 
Add config option to disable the invites
 2016-03-07 19:47:00 +01:00
wvengen
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
wvengen
b4e2ddf66d Merge pull request #412 from foodcoop1040/confirm 
Get rid of duplicated confirm_delete translations
 2016-03-07 19:44:06 +01:00
Patrick Gansterer
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
Patrick Gansterer
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
Patrick Gansterer
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
Patrick Gansterer
c62104a388 Get rid of duplicated confirm_delete translations 2016-03-04 23:13:28 +01:00
Patrick Gansterer
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
wvengen
f5b6fbcf18 Merge pull request #408 from foodcoop1040/count_to_any 
Replace "count > 0" with "any?"
 2016-03-04 21:37:21 +01:00
Patrick Gansterer
0fc80a1ef5 Rename translation "admin.confirm" to "ui.confirm_delete" 2016-03-04 20:10:11 +01:00
Patrick Gansterer
1efd3745df Replace "count > 0" with "any?" 2016-03-04 20:01:56 +01:00
wvengen
97f81d9826 Merge pull request #406 from foodcoop1040/delete_user 
Add deleted_at for User
 2016-03-04 19:12:04 +01:00
Patrick Gansterer
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
Patrick Gansterer
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
Patrick Gansterer
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
Patrick Gansterer
b30b4e46d8 Order items in select boxes 2016-03-04 18:28:00 +01:00
Patrick Gansterer
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
Patrick Gansterer
6015d16cab Add link for creating invoice at an order 2016-03-04 17:12:46 +01:00
Patrick Gansterer
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
wvengen
d56828fa4d Show last user activity in admin ordergroups too 2016-03-04 16:28:22 +01:00
Patrick Gansterer
8b8693df5a Show last activity of ordergroups 2016-03-04 16:16:09 +01:00
wvengen
4cacb740d1 Small improvement in invoice edit 2016-03-04 16:14:54 +01:00
Patrick Gansterer
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
Patrick Gansterer
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
Patrick Gansterer
a97eee68b1 Make date clickable in finance overview #392 2016-02-24 00:39:50 +01:00
Patrick Gansterer
a42dd07d5c Make invoice date clickable #391 2016-02-24 00:39:34 +01:00
Patrick Gansterer
3d6f908102 Add created_by to invoice and show it 2016-02-24 00:39:07 +01:00
wvengen
227ca0dd84 Merge pull request #387 from foodcoops/feature/boxfills 
Add optional boxfill phase to orders (+ bootstrap buttons)
 2015-11-20 14:25:41 +01:00
wvengen
6a0147d2e7 Improve article header consistency 2015-11-18 22:44:38 +01:00
wvengen
9d7735849d Disable relevant ordering buttons in boxfill phase 2015-11-13 18:10:46 +01:00