diff --git a/accounting/views.py b/accounting/views.py index 2cbca1bf..9ab216e0 100644 --- a/accounting/views.py +++ b/accounting/views.py @@ -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 @@ -367,11 +367,11 @@ class OperationPDFView(CanViewMixin, DetailView): im = ImageReader("core/static/core/img/logo.jpg") iw, ih = im.getSize() p.drawImage(im, 40, height - 50, width=iw/2, height=ih/2) - + labelStr = [["%s %s - %s %s" % (_("Journal"), ti, _("Operation"), num)]] label = Table(labelStr, colWidths=[150], rowHeights=[20]) - + label.setStyle(TableStyle([ ('ALIGN',(0,0),(-1,-1),'CENTER'), ('BOX', (0,0), (-1,-1), 0.25, colors.black), @@ -385,11 +385,11 @@ class OperationPDFView(CanViewMixin, DetailView): p.drawString(90, height - 190, _("Date: %(date)s") % {"date": date}) data = [] - + data += [["%s" % (_("Credit").upper() if nature == 'CREDIT' else _("Debit").upper())]] data += [[_("Amount: %(amount).2f €") % {"amount": amount}]] - + payment_mode = "" for m in settings.SITH_ACCOUNTING_PAYMENT_METHOD: if m[0] == mode: @@ -399,11 +399,11 @@ class OperationPDFView(CanViewMixin, DetailView): payment_mode += " %s\n" %(m[1]) data += [[payment_mode]] - + data += [["%s : %s" % (_("Debtor") if nature == 'CREDIT' else _("Creditor"), target), ""]] data += [["%s \n%s" % (_("Comment:"), remark)]] - + t = Table(data, colWidths=[(width-90*2)/2]*2, rowHeights=[20, 20, 70, 20, 80]) t.setStyle(TableStyle([ ('ALIGN',(0,0),(-1,-1),'CENTER'), @@ -536,11 +536,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 = main_club_counter.club + refound_club_counter = Counter.objects.get(id=settings.SITH_COUNTER_REFOUND_ID) + refound_club = refound_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=refound_club, counter=refound_club_counter, + product=Product.objects.get(id=settings.SITH_PRODUCT_REFOUND_ID)) s.save() diff --git a/core/management/commands/populate.py b/core/management/commands/populate.py index 1c49e06e..3a3bb1ca 100644 --- a/core/management/commands/populate.py +++ b/core/management/commands/populate.py @@ -253,6 +253,9 @@ Cette page vise à documenter la syntaxe *Markdown* utilisée sur le site. troll = Club(name="Troll Penché", unix_name="troll", address="Terre Du Milieu", parent=main_club) troll.save() + refound = Club(name="Carte AE", unix_name="carte_ae", + address="Jamais imprimée", parent=main_club) + refound.save() # Counters Customer(user=skia, account_id="6568j", amount=0).save() @@ -274,6 +277,12 @@ Cette page vise à documenter la syntaxe *Markdown* utilisée sur le site. mde.products.add(cble) mde.save() + refound_counter = Counter(name="Carte AE", club=refound, type='OFFICE') + refound_counter.save() + refound_product = Product(name="remboursement", code="REMBOURS", purchase_price="0", selling_price="0", + special_selling_price="0", club=refound) + refound_product.save() + # Accounting test values: BankAccount(name="AE TG", club=main_club).save() BankAccount(name="Carte AE", club=main_club).save() @@ -295,4 +304,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() - diff --git a/core/templates/core/user_tools.jinja b/core/templates/core/user_tools.jinja index 7fc227d0..46e5f122 100644 --- a/core/templates/core/user_tools.jinja +++ b/core/templates/core/user_tools.jinja @@ -29,6 +29,8 @@
  • {% trans %}Products management{% endtrans %}
  • {% trans %}Product types management{% endtrans %}
  • {% trans %}Cash register summaries{% endtrans %}
  • +
  • {% trans %}Invoices call{% endtrans %}
  • +
  • {% trans %}Etickets{% endtrans %}
  • {% endif %} {% for b in settings.SITH_COUNTER_BARS %} {% if user.is_in_group(b[1]+" admin") %} diff --git a/sith/settings.py b/sith/settings.py index 356c7124..d33c939e 100644 --- a/sith/settings.py +++ b/sith/settings.py @@ -257,6 +257,11 @@ SITH_GROUP_BANNED_COUNTER_ID = 7 SITH_GROUP_BANNED_SUBSCRIPTION_ID = 8 SITH_GROUP_SAS_ADMIN_ID = 9 +SITH_CLUB_REFOUND_ID = 89 +SITH_COUNTER_REFOUND_ID = 38 +SITH_PRODUCT_REFOUND_ID = 5 + + # SAS variables SITH_SAS_ROOT_DIR_ID = 4