Commit fb8e7ceb authored by Skia's avatar Skia 🤘
Browse files

Some templating and migration fix

parent 078b63d9
Pipeline #138 failed with stage
in 1 minute and 48 seconds
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('accounting', '0003_auto_20160824_1732'),
]
operations = [
migrations.AlterModelOptions(
name='accountingtype',
options={'ordering': ['movement_type', 'code'], 'verbose_name': 'accounting type'},
),
migrations.AlterModelOptions(
name='bankaccount',
options={'ordering': ['club', 'name'], 'verbose_name': 'Bank account'},
),
migrations.AlterModelOptions(
name='clubaccount',
options={'ordering': ['bank_account', 'name'], 'verbose_name': 'Club account'},
),
migrations.AlterModelOptions(
name='generaljournal',
options={'ordering': ['-start_date'], 'verbose_name': 'General journal'},
),
migrations.AlterModelOptions(
name='simplifiedaccountingtype',
options={'ordering': ['accounting_type__movement_type', 'accounting_type__code'], 'verbose_name': 'simplified type'},
),
]
......@@ -48,6 +48,10 @@ class BankAccount(models.Model):
number = models.CharField(_('account number'), max_length=255, blank=True)
club = models.ForeignKey(Club, related_name="bank_accounts", verbose_name=_("club"))
class Meta:
verbose_name = _("Bank account")
ordering = ['club', 'name']
def is_owned_by(self, user):
"""
Method to see if that object can be edited by the given user
......@@ -70,6 +74,10 @@ class ClubAccount(models.Model):
club = models.ForeignKey(Club, related_name="club_account", verbose_name=_("club"))
bank_account = models.ForeignKey(BankAccount, related_name="club_accounts", verbose_name=_("bank account"))
class Meta:
verbose_name = _("Club account")
ordering = ['bank_account', 'name']
def is_owned_by(self, user):
"""
Method to see if that object can be edited by the given user
......@@ -118,6 +126,10 @@ class GeneralJournal(models.Model):
amount = CurrencyField(_('amount'), default=0)
effective_amount = CurrencyField(_('effective_amount'), default=0)
class Meta:
verbose_name = _("General journal")
ordering = ['-start_date']
def is_owned_by(self, user):
"""
Method to see if that object can be edited by the given user
......@@ -259,10 +271,12 @@ class AccountingType(models.Model):
],
)
label = models.CharField(_('label'), max_length=128)
movement_type = models.CharField(_('movement type'), choices=[('CREDIT', 'Credit'), ('DEBIT', 'Debit'), ('NEUTRAL', 'Neutral')], max_length=12)
movement_type = models.CharField(_('movement type'), choices=[('CREDIT', _('Credit')), ('DEBIT', _('Debit')),
('NEUTRAL', _('Neutral'))], max_length=12)
class Meta:
verbose_name = _("accounting type")
ordering = ['movement_type', 'code']
def is_owned_by(self, user):
"""
......@@ -276,7 +290,7 @@ class AccountingType(models.Model):
return reverse('accounting:type_list')
def __str__(self):
return self.code+" - "+self.movement_type+" - "+self.label
return self.code+" - "+self.get_movement_type_display()+" - "+self.label
class SimplifiedAccountingType(models.Model):
"""
......@@ -288,6 +302,7 @@ class SimplifiedAccountingType(models.Model):
class Meta:
verbose_name = _("simplified type")
ordering = ['accounting_type__movement_type', 'accounting_type__code']
@property
def movement_type(self):
......@@ -300,5 +315,5 @@ class SimplifiedAccountingType(models.Model):
return reverse('accounting:simple_type_list')
def __str__(self):
return self.label+" - "+self.accounting_type.code+" - "+self.get_movement_type_display()
return self.get_movement_type_display()+" - "+self.accounting_type.code+" - "+self.label
......@@ -11,6 +11,9 @@
</p>
<hr>
<h2>{% trans %}Bank account: {% endtrans %}{{ object.name }}</h2>
{% if user.is_root and not object.club_accounts.exists() %}
<a href="{{ url('accounting:bank_delete', b_account_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
{% endif %}
<h4>{% trans %}Infos{% endtrans %}</h4>
<ul>
<li><strong>{% trans %}IBAN: {% endtrans %}</strong>{{ object.iban }}</li>
......@@ -21,9 +24,6 @@
{% for c in object.club_accounts.all() %}
<li><a href="{{ url('accounting:club_details', c_account_id=c.id) }}">{{ c }}</a>
- <a href="{{ url('accounting:club_edit', c_account_id=c.id) }}">{% trans %}Edit{% endtrans %}</a>
{% if user.is_root %}
- <a href="{{ url('accounting:club_delete', c_account_id=c.id) }}">{% trans %}Delete{% endtrans %}</a>
{% endif %}
</li>
{% endfor %}
</ul>
......
......@@ -19,9 +19,6 @@
{% for a in object_list %}
<li><a href="{{ url('accounting:bank_details', b_account_id=a.id) }}">{{ a }}</a>
- <a href="{{ url('accounting:bank_edit', b_account_id=a.id) }}">{% trans %}Edit{% endtrans %}</a>
{% if user.is_root %}
- <a href="{{ url('accounting:bank_delete', b_account_id=a.id) }}">{% trans %}Delete{% endtrans %}</a>
{% endif %}
</li>
{% endfor %}
</ul>
......
......@@ -12,6 +12,9 @@
</p>
<hr>
<h2>{% trans %}Club account:{% endtrans %} {{ object.name }}</h2>
{% if user.is_root and not object.journals.exists() %}
<a href="{{ url('accounting:club_delete', c_account_id=object.id) }}">{% trans %}Delete{% endtrans %}</a>
{% endif %}
{% if not object.has_open_journal() %}
<p><a href="{{ url('accounting:journal_new') }}?parent={{ object.id }}">{% trans %}New journal{% endtrans %}</a></p>
{% else %}
......
......@@ -5,6 +5,14 @@
{% endblock %}
{% block content %}
<p>
<a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
<a href="{{ url('accounting:bank_details', b_account_id=object.club_account.bank_account.id) }}">{{object.club_account.bank_account }}</a> >
<a href="{{ url('accounting:club_details', c_account_id=object.club_account.id) }}">{{ object.club_account }}</a> >
<a href="{{ url('accounting:journal_details', j_id=object.id) }}">{{ object.name }}</a> >
{% trans %}Edit operation{% endtrans %}
</p>
<hr>
<h2>{% trans %}Edit operation{% endtrans %}</h2>
<form action="" method="post">
{% csrf_token %}
......@@ -12,24 +20,12 @@
{{ form.target_id }}
<p>{{ form.amount.errors }}<label for="{{ form.amount.name }}">{{ form.amount.label }}</label> {{ form.amount }}</p>
<p>{{ form.remark.errors }}<label for="{{ form.remark.name }}">{{ form.remark.label }}</label> {{ form.remark }}</p>
<p>{{ form.target_type.errors }}<label for="{{ form.target_type.name }}">{{ form.target_type.label }}</label> </p>
{% for choice in form.target_type %}
{% if choice.choice_value != "" %}
{{ choice }}
{% if choice.choice_value == "USER" %}
{{ form.user }}
{% elif choice.choice_value == "CLUB" %}
{{ form.club }}
{% elif choice.choice_value == "ACCOUNT" %}
{{ form.club_account }}
{% elif choice.choice_value == "COMPANY" %}
{{ form.company }}
{% elif choice.choice_value == "OTHER" %}
{{ form.target_label }}
{% endif %}
{% else %}
{% endif %}
{% endfor %}
<p>{{ form.target_type.errors }}<label for="{{ form.target_type.name }}">{{ form.target_type.label }}</label> {{ form.target_type }}</p>
{{ form.user }}
{{ form.club }}
{{ form.club_account }}
{{ form.company }}
{{ form.target_label }}
<p>{{ form.date.errors }}<label for="{{ form.date.name }}">{{ form.date.label }}</label> {{ form.date }}</p>
<p>{{ form.mode.errors }}<label for="{{ form.mode.name }}">{{ form.mode.label }}</label> {{ form.mode }}</p>
<p>{{ form.cheque_number.errors }}<label for="{{ form.cheque_number.name }}">{{ form.cheque_number.label }}</label> {{
......@@ -48,7 +44,55 @@
{{ super() }}
<script>
$( function() {
} );
var target_type = $('#id_target_type');
var user = $('#id_user_wrapper');
var club = $('#id_club_wrapper');
var club_account = $('#id_club_account_wrapper');
var company = $('#id_company_wrapper');
var other = $('#id_target_label');
function update_targets () {
if (target_type.val() == "USER") {
console.log(user);
user.show();
club.hide();
club_account.hide();
company.hide();
other.hide();
} else if (target_type.val() == "ACCOUNT") {
club_account.show();
user.hide();
club.hide();
company.hide();
other.hide();
} else if (target_type.val() == "CLUB") {
club.show();
user.hide();
club_account.hide();
company.hide();
other.hide();
} else if (target_type.val() == "COMPANY") {
company.show();
user.hide();
club_account.hide();
club.hide();
other.hide();
} else if (target_type.val() == "OTHER") {
other.show();
user.hide();
club.hide();
club_account.hide();
company.hide();
} else {
company.hide();
user.hide();
club_account.hide();
club.hide();
other.hide();
}
}
update_targets();
target_type.change(update_targets);
} );
</script>
{% endblock %}
......
......@@ -202,7 +202,6 @@ class OperationForm(forms.ModelForm):
'target_id': HiddenInput,
'date': SelectDate,
'invoice': SelectFile,
'target_type': forms.RadioSelect,
}
user = AutoCompleteSelectField('users', help_text=None, required=False)
club_account = AutoCompleteSelectField('club_accounts', help_text=None, required=False)
......@@ -272,11 +271,18 @@ class OperationCreateView(CanCreateMixin, CreateView):
def get_initial(self):
ret = super(OperationCreateView, self).get_initial()
if 'parent' in self.request.GET.keys():
obj = GeneralJournal.objects.filter(id=int(self.request.GET['parent'])).first()
if obj is not None:
ret['journal'] = obj.id
self.journal = GeneralJournal.objects.filter(id=int(self.request.GET['parent'])).first()
if self.journal is not None:
ret['journal'] = self.journal.id
return ret
def get_context_data(self, **kwargs):
""" Add journal to the context """
kwargs = super(OperationCreateView, self).get_context_data(**kwargs)
if self.journal:
kwargs['object'] = self.journal
return kwargs
class OperationEditView(CanEditMixin, UpdateView):
"""
An edit view, working as detail for the moment
......@@ -286,6 +292,12 @@ class OperationEditView(CanEditMixin, UpdateView):
form_class = OperationForm
template_name = 'accounting/operation_edit.jinja'
def get_context_data(self, **kwargs):
""" Add journal to the context """
kwargs = super(OperationCreateView, self).get_context_data(**kwargs)
kwargs['object'] = self.object.journal
return kwargs
# Company views
class CompanyCreateView(CanCreateMixin, CreateView):
......
from django.core.exceptions import PermissionDenied
from ajax_select import register, LookupChannel
from core.views.site import search_user
......@@ -6,8 +7,13 @@ from club.models import Club
from counter.models import Product, Counter
from accounting.models import ClubAccount, Company
class RightManagedLookupChannel(LookupChannel):
def check_auth(self, request):
if not request.user.subscribed:
raise PermissionDenied
@register('users')
class UsersLookup(LookupChannel):
class UsersLookup(RightManagedLookupChannel):
model = User
def get_query(self, q, request):
......@@ -20,7 +26,7 @@ class UsersLookup(LookupChannel):
return item.get_display_name()
@register('groups')
class GroupsLookup(LookupChannel):
class GroupsLookup(RightManagedLookupChannel):
model = Group
def get_query(self, q, request):
......@@ -33,7 +39,7 @@ class GroupsLookup(LookupChannel):
return item.name
@register('clubs')
class ClubLookup(LookupChannel):
class ClubLookup(RightManagedLookupChannel):
model = Club
def get_query(self, q, request):
......@@ -46,7 +52,7 @@ class ClubLookup(LookupChannel):
return item.name
@register('counters')
class CountersLookup(LookupChannel):
class CountersLookup(RightManagedLookupChannel):
model = Counter
def get_query(self, q, request):
......@@ -56,7 +62,7 @@ class CountersLookup(LookupChannel):
return item.name
@register('products')
class ProductsLookup(LookupChannel):
class ProductsLookup(RightManagedLookupChannel):
model = Product
def get_query(self, q, request):
......@@ -66,7 +72,7 @@ class ProductsLookup(LookupChannel):
return item.name
@register('club_accounts')
class ClubAccountLookup(LookupChannel):
class ClubAccountLookup(RightManagedLookupChannel):
model = ClubAccount
def get_query(self, q, request):
......@@ -76,7 +82,7 @@ class ClubAccountLookup(LookupChannel):
return item.name
@register('companies')
class CompaniesLookup(LookupChannel):
class CompaniesLookup(RightManagedLookupChannel):
model = Company
def get_query(self, q, request):
......
......@@ -377,11 +377,18 @@ class User(AbstractBaseUser):
escape(self.get_display_name()),
)
@property
def subscribed(self):
return self.is_in_group(settings.SITH_MAIN_MEMBERS_GROUP)
class AnonymousUser(AuthAnonymousUser):
def __init__(self, request):
super(AnonymousUser, self).__init__()
@property
def subscribed(self):
return False
def is_in_group(self, group_name):
"""
The anonymous user is only the public group
......
......@@ -38,6 +38,7 @@
<div id="language_chooser">
{% for language in LANGUAGES %}
<form action="{{ url('set_language') }}" method="post">{% csrf_token %}
<input name="next" value="{{ request.path }}" type="hidden" />
<input name="language" value="{{ language[0] }}" type="hidden" />
<input type="submit" value="{{ language[1]}}" />
</form>
......
......@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-08-24 16:57+0200\n"
"POT-Creation-Date: 2016-08-24 21:38+0200\n"
"PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Skia <skia@libskia.so>\n"
"Language-Team: AE info <ae.info@utbm.fr>\n"
......@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: accounting/models.py:34 accounting/models.py:46 accounting/models.py:69
#: accounting/models.py:115 club/models.py:18 counter/models.py:52
#: accounting/models.py:34 accounting/models.py:46 accounting/models.py:73
#: accounting/models.py:123 club/models.py:18 counter/models.py:52
#: counter/models.py:77 counter/models.py:111 launderette/models.py:15
#: launderette/models.py:60 launderette/models.py:85
msgid "name"
......@@ -35,127 +35,139 @@ msgstr "IBAN"
msgid "account number"
msgstr "numero de compte"
#: accounting/models.py:49 accounting/models.py:70 club/models.py:146
#: accounting/models.py:49 accounting/models.py:74 club/models.py:146
#: counter/models.py:86
msgid "club"
msgstr "club"
#: accounting/models.py:71
#: accounting/models.py:52
msgid "Bank account"
msgstr "Compte en banque"
#: accounting/models.py:75
msgid "bank account"
msgstr "compte en banque"
#: accounting/models.py:106
#: accounting/models.py:78
msgid "Club account"
msgstr "Compte club"
#: accounting/models.py:114
#, python-format
msgid "%(club_account)s on %(bank_account)s"
msgstr "%(club_account)s sur %(bank_account)s"
#: accounting/models.py:113 club/models.py:147 counter/models.py:297
#: accounting/models.py:121 club/models.py:147 counter/models.py:297
#: launderette/models.py:122
msgid "start date"
msgstr "date de début"
#: accounting/models.py:114 club/models.py:148 counter/models.py:298
#: accounting/models.py:122 club/models.py:148 counter/models.py:298
msgid "end date"
msgstr "date de fin"
#: accounting/models.py:116
#: accounting/models.py:124
msgid "is closed"
msgstr "est fermé"
#: accounting/models.py:117
#: accounting/models.py:125
msgid "club account"
msgstr "compte club"
#: accounting/models.py:118 accounting/models.py:157 counter/models.py:25
#: accounting/models.py:126 accounting/models.py:169 counter/models.py:25
#: counter/models.py:212
msgid "amount"
msgstr "montant"
#: accounting/models.py:119
#: accounting/models.py:127
msgid "effective_amount"
msgstr "montant effectif"
#: accounting/models.py:155
#: accounting/models.py:130
msgid "General journal"
msgstr "Classeur"
#: accounting/models.py:167
msgid "number"
msgstr "numéro"
#: accounting/models.py:156
#: accounting/models.py:168
msgid "journal"
msgstr "classeur"
#: accounting/models.py:158 core/models.py:430 core/models.py:706
#: accounting/models.py:170 core/models.py:437 core/models.py:713
#: counter/models.py:215 counter/models.py:261 eboutic/models.py:14
#: eboutic/models.py:47
msgid "date"
msgstr "date"
#: accounting/models.py:159
#: accounting/models.py:171
msgid "comment"
msgstr "commentaire"
#: accounting/models.py:160 counter/models.py:216 counter/models.py:262
#: accounting/models.py:172 counter/models.py:216 counter/models.py:262
#: subscription/models.py:34
msgid "payment method"
msgstr "méthode de paiement"
#: accounting/models.py:161
#: accounting/models.py:173
msgid "cheque number"
msgstr "numéro de chèque"
#: accounting/models.py:162 eboutic/models.py:115
#: accounting/models.py:174 eboutic/models.py:115
msgid "invoice"
msgstr "facture"
#: accounting/models.py:163
#: accounting/models.py:175
msgid "is done"
msgstr "est fait"
#: accounting/models.py:165
#: accounting/models.py:177
msgid "simple type"
msgstr "type simplifié"
#: accounting/models.py:167 accounting/models.py:265
#: accounting/models.py:179 accounting/models.py:278
msgid "accounting type"
msgstr "type comptable"
#: accounting/models.py:168
#: accounting/models.py:180
msgid "target type"
msgstr "type de cible"
#: accounting/models.py:169
#: accounting/models.py:181
#: launderette/templates/launderette/launderette_admin.jinja:44
msgid "User"
msgstr "Utilisateur"
#: accounting/models.py:169 club/templates/club/club_detail.jinja:4
#: accounting/models.py:181 club/templates/club/club_detail.jinja:4
msgid "Club"
msgstr "Club"
#: accounting/models.py:169 core/templates/core/user_base.jinja:18
#: accounting/models.py:181 core/templates/core/user_base.jinja:18
msgid "Account"
msgstr "Compte"
#: accounting/models.py:169
#: accounting/models.py:181
msgid "Company"
msgstr "Entreprise"
#: accounting/models.py:169 sith/settings.py:284 sith/settings_sample.py:267
#: accounting/models.py:181 sith/settings.py:289 sith/settings_sample.py:272
msgid "Other"
msgstr "Autre"
#: accounting/models.py:170
#: accounting/models.py:182
msgid "target id"
msgstr "id de la cible"
#: accounting/models.py:171
#: accounting/models.py:183
msgid "target label"
msgstr "nom de la cible"
#: accounting/models.py:172
#: accounting/models.py:184
msgid "linked operation"
msgstr "opération liée"
#: accounting/models.py:188
#: accounting/models.py:200
#, python-format
msgid ""
"The date can not be before the start date of the journal, which is\n"
......@@ -164,16 +176,16 @@ msgstr ""
"La date ne peut pas être avant la date de début du journal, qui est\n"
"%(start_date)s."
#: accounting/models.py:191
#: accounting/models.py:203
msgid "Target does not exists"
msgstr "La cible n'existe pas."
#: accounting/models.py:193
#: accounting/models.py:205
msgid "Please add a target label if you set no existing target"
msgstr ""
"Merci d'ajouter un nom de cible si vous ne spécifiez pas de cible existante"
#: accounting/models.py:195
#: accounting/models.py:207
msgid ""
"You need to provide ether a simplified accounting type or a standard "
"accounting type"
......@@ -181,27 +193,39 @@ msgstr ""
"Vous devez fournir soit un type comptable simplifié ou un type comptable "
"standard"
#: accounting/models.py:256 counter/models.py:81
#: accounting/models.py:268 counter/models.py:81
msgid "code"
msgstr "code"
#: accounting/models.py:258
#: accounting/models.py:270
msgid "An accounting type code contains only numbers"