klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-22 06:03:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Separate counter for account refounding

Browse Source
This commit is contained in:
Antoine Bartuccio 2016-12-06 23:04:41 +01:00
parent 39b7349034
commit e231c612c6
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
accounting/views.py
View File

@ -19,7 +19,7 @@ from ajax_select.fields import AutoCompleteSelectField, AutoCompleteSelectMultip
from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin, CanCreateMixin
from core.views.forms import SelectFile, SelectDate
from accounting.models import BankAccount, ClubAccount, GeneralJournal, Operation, AccountingType, Company, SimplifiedAccountingType, Label
from counter.models import Counter, Selling
from counter.models import Counter, Selling, Product
# Main accounting view
@ -524,11 +524,11 @@ class RefoundAccountView(FormView):
def create_selling(self):
with transaction.atomic():
uprice = self.customer.customer.amount
main_club_counter = Counter.objects.filter(club__unix_name=settings.SITH_MAIN_CLUB['unix_name'],
type='OFFICE').first()
main_club_counter = Counter.objects.get(name=settings.SITH_COUNTER_REFOUND[1])
main_club = main_club_counter.club
s = Selling(label=_('Refound account'), unit_price=uprice,
quantity=1, seller=self.operator,
customer=self.customer.customer,
club=main_club, counter=main_club_counter)
club=main_club, counter=main_club_counter,
product=Product.objects.get(code=settings.SITH_COUNTER_REFOUND_PRODUCT[1]))
s.save()

5
core/management/commands/populate.py
View File

@ -74,6 +74,7 @@ class Command(BaseCommand):
self.reset_index("counter")
Counter(name="Eboutic", club=main_club, type='EBOUTIC').save()
Counter(name="AE", club=main_club, type='OFFICE').save()
Counter(name=settings.SITH_COUNTER_REFOUND[1], club=main_club, type='OFFICE').save()
home_root.view_groups = [Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first()]
club_root.view_groups = [Group.objects.filter(name=settings.SITH_MAIN_MEMBERS_GROUP).first()]
@ -273,6 +274,9 @@ Cette page vise à documenter la syntaxe *Markdown* utilisée sur le site.
mde.products.add(barb)
mde.products.add(cble)
mde.save()
refound = Product(name=settings.SITH_COUNTER_REFOUND_PRODUCT[2], code=settings.SITH_COUNTER_REFOUND_PRODUCT[1], purchase_price="0", selling_price="0",
special_selling_price="0", club=main_club)
refound.save()
# Accounting test values:
BankAccount(name="AE TG", club=main_club).save()
@ -295,4 +299,3 @@ Cette page vise à documenter la syntaxe *Markdown* utilisée sur le site.
target_id=bar_club.id).save()
woenzco = Company(name="Woenzel & co")
woenzco.save()

2
core/templates/core/user_tools.jinja
View File

@ -29,6 +29,8 @@
<li><a href="{{ url('counter:product_list') }}">{% trans %}Products management{% endtrans %}</a></li>
<li><a href="{{ url('counter:producttype_list') }}">{% trans %}Product types management{% endtrans %}</a></li>
<li><a href="{{ url('counter:cash_summary_list') }}">{% trans %}Cash register summaries{% endtrans %}</a></li>
<li><a href="{{ url('counter:invoices_call') }}">{% trans %}Invoices call{% endtrans %}</a></li>
<li><a href="{{ url('counter:eticket_list') }}">{% trans %}Etickets{% endtrans %}</a></li>
{% endif %}
{% for b in settings.SITH_COUNTER_BARS %}
{% if user.is_in_group(b[1]+" admin") %}

4
sith/settings.py
View File

@ -313,6 +313,10 @@ SITH_COUNTER_BANK = [
('LA-POSTE', 'La Poste'),
]
SITH_COUNTER_REFOUND = (88, 'Carte AE')
SITH_COUNTER_REFOUND_PRODUCT = (1899, 'REMBOURS', 'Remboursement')
# Defines which product type is the refilling type, and thus increases the account amount
SITH_COUNTER_PRODUCTTYPE_REFILLING = 11