From 80f72df1de43c78f1c04acd35f81b9485d092449 Mon Sep 17 00:00:00 2001
From: Skia <skia@libskia.so>
Date: Wed, 27 Jul 2016 20:05:45 +0200
Subject: [PATCH] Add product type management views

---
 core/templates/core/create.jinja              |   2 +-
 core/templates/core/page_hist.jinja           |   2 +-
 core/templates/core/user_tools.jinja          |   3 +-
 counter/models.py                             |  27 ++-
 .../templates/counter/producttype_list.jinja  |  24 +++
 counter/urls.py                               |   3 +
 counter/views.py                              |  41 ++++-
 locale/fr/LC_MESSAGES/django.mo               | Bin 18262 -> 19244 bytes
 locale/fr/LC_MESSAGES/django.po               | 157 +++++++++++++-----
 9 files changed, 201 insertions(+), 58 deletions(-)
 create mode 100644 counter/templates/counter/producttype_list.jinja

diff --git a/core/templates/core/create.jinja b/core/templates/core/create.jinja
index b175ede7..fcd5e201 100644
--- a/core/templates/core/create.jinja
+++ b/core/templates/core/create.jinja
@@ -1,7 +1,7 @@
 {% extends "core/base.jinja" %}
 
 {% block content %}
-<h2>{% trans %}Create{% endtrans %}</h2>
+<h2>{% trans name=form.instance.__class__._meta.verbose_name %}Create {{ name }}{% endtrans %}</h2>
 <form action="" method="post">
     {% csrf_token %}
     {{ form.as_p() }}
diff --git a/core/templates/core/page_hist.jinja b/core/templates/core/page_hist.jinja
index 2694ba82..a7554045 100644
--- a/core/templates/core/page_hist.jinja
+++ b/core/templates/core/page_hist.jinja
@@ -14,7 +14,7 @@
     {% else %}
     <li><a href="{{ url('core:page_rev', page_name=page.get_full_name(), rev=r['id']) }}">{{ r.revision }}</a> -
     {{ user_profile_link(r.author) }} -
-    {{ page.revisions.last().date|localtime|date(DATETIME_FORMAT) }} {{ page.revisions.last().date|localtime|time(DATETIME_FORMAT) }}</a></li>
+    {{ r.date|localtime|date(DATETIME_FORMAT) }} {{ r.date|localtime|time(DATETIME_FORMAT) }}</a></li>
     {% endif %}
 {% endfor %}
 </ul>
diff --git a/core/templates/core/user_tools.jinja b/core/templates/core/user_tools.jinja
index d3fc0477..a577ed71 100644
--- a/core/templates/core/user_tools.jinja
+++ b/core/templates/core/user_tools.jinja
@@ -23,7 +23,8 @@
 <ul>
     {% if user.is_in_group(settings.SITH_GROUPS['counter-admin']['name']) or user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
     <li><a href="{{ url('counter:admin_list') }}">{% trans %}General counters management{% endtrans %}</a></li>
-    <li><a href="{{ url('counter:product_list') }}">{% trans %}General products management{% endtrans %}</a></li>
+    <li><a href="{{ url('counter:product_list') }}">{% trans %}Products management{% endtrans %}</a></li>
+    <li><a href="{{ url('counter:producttype_list') }}">{% trans %}Products type management{% endtrans %}</a></li>
     {% endif %}
     {% for b in settings.SITH_COUNTER_BARS %}
     {% if user.is_in_group(b[1]+" admin") %}
diff --git a/counter/models.py b/counter/models.py
index 9059a961..18196aa4 100644
--- a/counter/models.py
+++ b/counter/models.py
@@ -39,6 +39,9 @@ class ProductType(models.Model):
     description = models.TextField(_('description'), null=True, blank=True)
     icon = models.ImageField(upload_to='products', null=True, blank=True)
 
+    class Meta:
+        verbose_name = _('product type')
+
     def is_owned_by(self, user):
         """
         Method to see if that object can be edited by the given user
@@ -50,6 +53,9 @@ class ProductType(models.Model):
     def __str__(self):
         return self.name
 
+    def get_absolute_url(self):
+        return reverse('counter:producttype_list')
+
 class Product(models.Model):
     """
     This describes a product, with all its related informations
@@ -64,6 +70,9 @@ class Product(models.Model):
     icon = models.ImageField(upload_to='products', null=True, blank=True)
     club = models.ForeignKey(Club, related_name="products")
 
+    class Meta:
+        verbose_name = _('product')
+
     def is_owned_by(self, user):
         """
         Method to see if that object can be edited by the given user
@@ -89,6 +98,9 @@ class Counter(models.Model):
     view_groups = models.ManyToManyField(Group, related_name="viewable_counters", blank=True)
     barmen_session = {}
 
+    class Meta:
+        verbose_name = _('counter')
+
     def __getattribute__(self, name):
         if name == "owner_group":
             return Group.objects.filter(name=self.club.unix_name+settings.SITH_BOARD_SUFFIX).first()
@@ -173,6 +185,9 @@ class Refilling(models.Model):
     bank = models.CharField(_('bank'), max_length=255,
             choices=settings.SITH_COUNTER_BANK, default='other')
 
+    class Meta:
+        verbose_name = _("refilling")
+
     def __str__(self):
         return "Refilling: %.2f for %s" % (self.amount, self.customer.user.get_display_name())
 
@@ -197,6 +212,9 @@ class Selling(models.Model):
     customer = models.ForeignKey(Customer, related_name="buyings", blank=False)
     date = models.DateTimeField(_('date'), auto_now=True)
 
+    class Meta:
+        verbose_name = _("selling")
+
     def __str__(self):
         return "Selling: %d x %s (%f) for %s" % (self.quantity, self.product.name,
                 self.quantity*self.unit_price, self.customer.user.get_display_name())
@@ -219,14 +237,11 @@ class Permanency(models.Model):
     start = models.DateTimeField(_('start date'))
     end = models.DateTimeField(_('end date'))
 
+    class Meta:
+        verbose_name = _("permanency")
+
     def __str__(self):
         return "%s in %s from %s to %s" % (self.user, self.counter,
                 self.start.strftime("%Y-%m-%d %H:%M:%S"), self.end.strftime("%Y-%m-%d %H:%M:%S"))
 
 
-# TODO:
-# une classe Vente
-# foreign key vers comptoir, vendeur, client, produit, mais stocker le prix du produit, pour gerer les maj de prix
-# une classe Rechargement
-# foreign key vers comptoir, vendeur, client, plus montant
-
diff --git a/counter/templates/counter/producttype_list.jinja b/counter/templates/counter/producttype_list.jinja
new file mode 100644
index 00000000..9a686dc8
--- /dev/null
+++ b/counter/templates/counter/producttype_list.jinja
@@ -0,0 +1,24 @@
+{% extends "core/base.jinja" %}
+
+{% block title %}
+{% trans %}Product type list{% endtrans %}
+{% endblock %}
+
+{% block content %}
+<p><a href="{{ url('counter:new_producttype') }}">{% trans %}New product type{% endtrans %}</a></p>
+{% if producttype_list %}
+<h3>{% trans %}Product type list{% endtrans %}</h3>
+<ul>
+    {% for t in producttype_list  %}
+    <li><a href="{{ url('counter:producttype_edit', type_id=t.id) }}">{{ t }}</a></li>
+    {% endfor %}
+</ul>
+{% else %}
+{% trans %}There is no product types in this website.{% endtrans %}
+{% endif %}
+{% endblock %}
+
+
+
+
+
diff --git a/counter/urls.py b/counter/urls.py
index 5092e100..860b34b3 100644
--- a/counter/urls.py
+++ b/counter/urls.py
@@ -14,6 +14,9 @@ urlpatterns = [
     url(r'^admin/product/list$', ProductListView.as_view(), name='product_list'),
     url(r'^admin/product/create$', ProductCreateView.as_view(), name='new_product'),
     url(r'^admin/product/(?P<product_id>[0-9]+)$', ProductEditView.as_view(), name='product_edit'),
+    url(r'^admin/producttype/list$', ProductTypeListView.as_view(), name='producttype_list'),
+    url(r'^admin/producttype/create$', ProductTypeCreateView.as_view(), name='new_producttype'),
+    url(r'^admin/producttype/(?P<type_id>[0-9]+)$', ProductTypeEditView.as_view(), name='producttype_edit'),
 ]
 
 
diff --git a/counter/views.py b/counter/views.py
index e44a1b7d..f8b1c047 100644
--- a/counter/views.py
+++ b/counter/views.py
@@ -16,7 +16,7 @@ import re
 
 from core.views import CanViewMixin, CanEditMixin, CanEditPropMixin
 from subscription.models import Subscriber
-from counter.models import Counter, Customer, Product, Selling, Refilling
+from counter.models import Counter, Customer, Product, Selling, Refilling, ProductType
 
 class GetUserForm(forms.Form):
     """
@@ -42,7 +42,7 @@ class GetUserForm(forms.Form):
         elif cleaned_data['id'] is not None:
             user = Customer.objects.filter(user=cleaned_data['id']).first()
         if user is None:
-            raise forms.ValidationError("User not found")
+            raise forms.ValidationError(_("User not found"))
         cleaned_data['user_id'] = user.user.id
         return cleaned_data
 
@@ -69,7 +69,6 @@ class CounterMain(DetailView, ProcessFormView, FormMixin):
         if self.request.method == 'POST':
             self.object = self.get_object()
         kwargs = super(CounterMain, self).get_context_data(**kwargs)
-# TODO: make some checks on the counter type, in order not to make the AuthenticationForm if there is no need to
         kwargs['login_form'] = AuthenticationForm()
         kwargs['login_form'].fields['username'].widget.attrs['autofocus'] = True
         kwargs['form'] = self.get_form()
@@ -353,6 +352,30 @@ class CounterDeleteView(CanEditMixin, DeleteView):
 
 # Product management
 
+class ProductTypeListView(ListView):
+    """
+    A list view for the admins
+    """
+    model = ProductType
+    template_name = 'counter/producttype_list.jinja'
+
+class ProductTypeCreateView(CreateView):
+    """
+    A create view for the admins
+    """
+    model = ProductType
+    fields = ['name', 'description', 'icon']
+    template_name = 'core/create.jinja'
+
+class ProductTypeEditView(UpdateView):
+    """
+    An edit view for the admins
+    """
+    model = ProductType
+    template_name = 'core/edit.jinja'
+    fields = ['name', 'description', 'icon']
+    pk_url_kwarg = "type_id"
+
 class ProductListView(ListView):
     """
     A list view for the admins
@@ -365,15 +388,17 @@ class ProductCreateView(CreateView):
     A create view for the admins
     """
     model = Product
-    template_name = 'core/edit.jinja'
+    fields = ['name', 'description', 'product_type', 'code', 'purchase_price',
+            'selling_price', 'special_selling_price', 'icon', 'club']
+    template_name = 'core/create.jinja'
 
 class ProductEditView(UpdateView):
     """
     An edit view for the admins
     """
     model = Product
-    form_class = modelform_factory(Product, fields=['name', 'description', 'product_type', 'code', 'purchase_price',
-        'selling_price', 'special_selling_price', 'icon', 'club'])
+    fields = ['name', 'description', 'product_type', 'code', 'purchase_price',
+            'selling_price', 'special_selling_price', 'icon', 'club']
     pk_url_kwarg = "product_id"
     template_name = 'core/edit.jinja'
     # TODO: add management of the 'counters' ForeignKey
@@ -391,8 +416,8 @@ class UserAccountView(DetailView):
     def dispatch(self, request, *arg, **kwargs):
         res = super(UserAccountView, self).dispatch(request, *arg, **kwargs)
         if (self.object.user == request.user
-            or request.user.is_in_group(settings.SITH_GROUPS['accounting-admin']['name'])
-            or request.user.is_in_group(settings.SITH_GROUPS['root']['name'])):
+                or request.user.is_in_group(settings.SITH_GROUPS['accounting-admin']['name'])
+                or request.user.is_in_group(settings.SITH_GROUPS['root']['name'])):
             return res
         raise PermissionDenied
 
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index 49bfa416bd521d84c5043f1b9d7d582dfea436da..091b46c0617b0c60d27fa02d0a4671b6e6193814 100644
GIT binary patch
delta 6967
zcmY+|2Ygo58OQPSk{t+ygfIhnGYBM*AW&8yY{FDz$Pytjyg(p(Kmp536-1Pwya*`6
z0TvO8wm}rID54C-fD4S35wvJgQM6W2i~arIdxCgBJo%n;?!9L`_uQN4sg<ssYhB*6
zQGt&djue+Mu{bTvm=%<FMyb`9^G%IO#~S3HiEL&}6HKx8!x-ulu|5`A7h)>)6_|!E
zV+vlxp%~fRm=I&UW)g*P8t%qMSm2y6_hJO~2QdKGV=!*SP~3tVU?<kY)2KOrhMLfi
z*bpOHI1`IQ^^=b3rxS)UzUkpF7}Fos(Qtdg1k?nkA~Q7ws17RZ`FR*feUYs%K}}#e
z2H_K^i9Tb`??PSwBC6kgSfBCDQ3_<;oJLKc29=S^sF_|vb*Sf~4uVk=s*4&h8ue(B
zZF?W<V0(TfY9e=|#+i)`umZgrXbFY7_^@>&YJg`^H@<)xcrR)~2QV7n#2#3UddAT$
zjqzYV)b-m?dtxUlbNf;KzG}}OX-WRI;^Q=EX4R-Y@F}YODr$m3t(^0bm_WTb>e*&u
zB#uO7A{#YO8IH%fI0a9j&ZoyY3+RWc4~ZlHWY^qDLmixp8gM>prAzP+xEwX}gSPz`
z>KUHI1$Y+qh$gv>VS}4&ROaTR+V8^-xXjk~qB8TU*EUq4QuYCA;A+$g&!aB<4)xl(
z;+=^!LtP(_x;`1TfHc&jxdoNMfv60PLjNAH_1UOL?!AYCQvZN$SdCiQW?SEh>fmMT
zG1NdG+xi*Q{g+V#Tt!XDmEcSu6qSJ()WllY_72E>Uek+$c4HRm!f~hzC!^luV$`0v
zAC-v>sFgj3dWJ7y2EK(nW)qa?EFcLru}-K**9&$1KwBS=_4NKvrJz*jqXu4xdYx9I
z_QDQSs`sE)xF6N=8}@vaZLdZx<N{{lcc=yRNOJn`gX(7#>i%&U!uTeef;ygQEx}~!
z^HCFd3bo>Wr~!_kIzEkhRA*3|_)BbzA+3!WjjfP>ri33n6|>IP_uBe7^rmvc#b}gG
zdnAiyG!DcH48ncZ*HEcEj9NjJ^&`|oE?_Wzi<<C{s0;?Saq10_q?lOL!uqx$|LSNW
z4e6MRdd90!13zW!+c1#&9t^?#_z)gKt$1WxCxg?GF-;Nb`n4E<8?Y-rfxYn*^2VB&
z6!PDhLYEY00(sbh`g&9bjv`~22+}lE*P$|{w9Ue2up>scWB*`()Mk7hwHYrVU6`=;
zP9{2|7T6n=saw4iw4$-LVKQpwxwbwNmD(cP{wM3bsQZ>;D6YaVTyM`mjdiJSL)~AA
zTJb^KUW0nAy<gi4uA@4tm*&hg1~m~kYM|Dr0n%)}8|o4DL0vb<o*!o0$D-b<Nf?3o
zsO#pVR_?`mVD6`&j(r%8n@}@<7L}^qw*3%lB2~723hBVqSTCcl{~5KA@N}o&Xw-l$
zQSC{niKJnO-v3S%B524!eQ<`LI-Y`>&}>wy=Ab?xOHnI(95wNssO$FF`a#qHZ=(i0
zX|1;BFJPw2n6I!0<D1l5oL?H#P~Z54*0t7MsDTe-BvxY^yo6maiXEt3KLjUZ5o*Q9
zQ44z?^-HM+mBF7;3k>K){?!mkK{iFL$c^-EQZWkeM7^(t$X``vDe8msH0q0a0QH)^
zhZ^`4s-H8~&ruV<V(WEy<?2(f*O~n5h88rag9Ow>l2NHkxAktQ3G}h`38(?GQTNY6
zrMv{y@f_<C)E9G&bt`Ib?M99BT4(aFU3`=Vbx>t5cpsywpF?%<J^E9|9|M|LB<g%K
z)I`!y=ewb<ABY-gtgUBTi%|nFLQVVuF9i*}3f0jXRBAWl0NjWAAYI2<n9c*&b&p{b
zZb4;k531vR*4I%JdCU4Sx~X46O}s9j!-nXMqo4~rVlwta{SKIkdS(xy2HJ=k=y@!|
zN*sf2x;c+#0V*?VY<&~DsqaBe>@;e?bGCj3`|AC_MnSJnMtA4JL8yUm#Vt4m^@!^5
zmu3?TMGfS(rl7v*olu!6K}~ppt*=C7cs=S7ZNemc4jbwHKS4pe`ZLr_e?_e{gb%r%
zQC+NqQP>z`Py@8brq~D7@dQ+AJ*WlDLv6+fZT&HO{y9{}4`36$|5f(HMbyAQp;C1n
zwTU8oIvI*ZO{fj3Jsp*q42;3P)^Vr-@=+PP2X);VOvT4-`<v+1Z>cjBw6b5Y5k~jo
zbBS$n6lNhGE3+Q8;v=X>b{@6DFKzozs0>DDIvHw#&8erO`W=d~I0dzU1)1busar~e
zfA^#6n^9k`9k#v~)zM+prmI1%s0$BX6Yq)2%xF}{6H(_qwtY5g&y*s+9?SyNUqst`
zlYc$Sw`owy&Z0WHjOyqIY>BQu&IID{4(b`0f)8Ud?!$IigRL>5FB=j&qf$N{JK`gl
zjfYU<BzgNeGi`^OVMl8QD#Zg(DZb5m7wVbjqc+=O)B@I{2HJt~cnX#Bt4Oj;M1SYL
z;iwGfq898erl8kj5o!WU@FiS{%`j_#Gm&i6N@t_4UyT8{4z;ok$Svj_)XF0V`rmIe
z0Qu&a#nyc|g8H}ES?_=5AY*3GP=aiDQ;o~8QI_*J+h)wB{vl4lu7jP_ud?pNhO~c*
zdhLF|APgSjY{q)lMi@+ctThp%^!}$(2;@YjwLgYZAB?);b_~JssOzSpQa%ke@Lc2@
zWtO4#%<HI$RG~KUIotj<s-J79eq2MTGrkF?pl4klL$Mi#VFGFb?J)p5qgK`p^}c7K
zCNRdH_n-#ILrt&*wRaYyCgejs^R1}8u^avW{eO&tZu|f><4;gGUP9e)4Yg^)hB*^!
zjH<g)6Hc@3T~QP4Yt2ISHv;vVPD1rtVqG+h{A(twXwa_SikkT=sFj^Sbx?yE=o{O9
z)fztBnRu)<30+)Qd#F!6lG>v_Clje$BCZfm>g+~)cB(HYCfeJYOTMBd3S$XA0RDYF
z31226X&a1*sHvYK^l3UqWD`2N66*+USIy@YC?>WLi-`_|jvV4ULNBro|NBtrl+Dvv
zL1?Qa5Pu;aCZ-c_6FLqMV~I~y;rKK0EO95XmKa0~Aaukqk#qPa5kR>UD%aW>4-q=5
z^*+?$BoEx2C;mYMQU4=m5iKa|&{Nd^F`R*i)xa^|;l|G&Da|HIiDkq~gpR*E_<v63
z=dHvM;zPCQeK<tSRfS_DF@^Y&2xGuEa5(WfahiyrtsM1{){#dvrtKs?Pt+lH5IYHN
z*+oP*Via+i;CH<lM=T`1CcGc>Bc2Z4#U!Eu<^SPZL=~}{m_s~6v?6qb5z$=7uTRqi
zU&EV^6e{--+QK&<4^SCn8?@cuF=m+me>XLy6MeO7kEXQ++(-Ok>*@Ft(VXjRk2Vzk
zNi5NJ_7%qjdgs|w7cq_a7cr4Y;I37uLwS!Q?pB3k1#yqR<owtR`i$$iop_&kfq0bI
zMBGL+AnM&Tlh>)=tFD7-{FaK2y7q!b*73Am@SoxD5NkNzMI0sC+O`7RYReCzkNAv;
zAllqCsGE9ATYryofR;9zf{uR^zxqpjU%2RJ%CSUSdqa21%_#qXxx@)VM{6S7UgK}z
z$78mTkN+VmiCM(oh!2P_h$QYQQEERTwh=9e+G7I+53!3lNL(epCqlVtIc5;GM+j|w
zsRR?Z5U&zCl4*~}mBbxH4bg{)As#0lA-tdP<2a#Xfy0fTLnx&ZLAE8tIt-s6rV;Ik
zZ;0*0OycIFqpduJMMOWs<>IevyiSbJ^N*upAeBE6wZ~s=p*^}eUwiDSE#QkpD|;@P
zaxda65lGv9EF(4(I@S}7iTjCbL^EOy;op`^VYR<v%zrBjnrsdTbGL3=m{Z_MDXXm8
zqJ2=);?kmN6}jc+HqTtQExXI-6?-Z>xi`B8xbySM%FXT0HU9SBwUoIFatd>1cnUm)
zH?AskF1vBUcO?E;u%~oRUaqHdMZ%-55Ic%5KB>9yWMcS@dQD<nWkOPSSGc>dsN6lh
zsG@LM<sGfR2n?oF?kV;4Ox^FhlDeRwr<A@ug}L)gZBMh>^-Y?dm!F?kIKz~B3UW$k
z!<@XbyrM!=T9ofGWgh=YUuC;5f;#rd=+dq7$@WP>H>Ki@j>W+VITcO@^2kO}#T*ZH
zWx_qpQ`=sd-o0y`i6h8~TFYvi%gk?0x})r-Tg+fjSveE={q;9D{&t7&u8ix!WBj?Q
zoY3=KSNLxu`*!t84E3)!ue?l^%EZhUUG+#+p}V}4*&f<ndA#?<ppc@1;_{-rQr`;$
z&jjb>mRET4eai=}Ygk;HHII|EJYRg)khZxqb4u;g^XILk!edGgZLdw;q21(e4$szC
Ho^|2>zsfx8

delta 6167
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
CIC+);

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 9a35c9ad..abc65c51 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-27 00:05+0200\n"
+"POT-Creation-Date: 2016-07-27 19:57+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"
@@ -17,8 +17,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: accounting/models.py:32 accounting/models.py:55 accounting/models.py:94
-#: club/models.py:18 counter/models.py:38 counter/models.py:57
-#: counter/models.py:79
+#: club/models.py:18 counter/models.py:38 counter/models.py:63
+#: counter/models.py:91
 msgid "name"
 msgstr "nom"
 
@@ -30,11 +30,11 @@ msgstr "IBAN"
 msgid "account number"
 msgstr "numero de compte"
 
-#: accounting/models.py:92 club/models.py:109 counter/models.py:216
+#: accounting/models.py:92 club/models.py:109 counter/models.py:237
 msgid "start date"
 msgstr "date de début"
 
-#: accounting/models.py:93 club/models.py:110 counter/models.py:217
+#: accounting/models.py:93 club/models.py:110 counter/models.py:238
 msgid "end date"
 msgstr "date de fin"
 
@@ -43,7 +43,7 @@ msgid "is closed"
 msgstr "est fermé"
 
 #: accounting/models.py:97 accounting/models.py:136 counter/models.py:21
-#: counter/models.py:164
+#: counter/models.py:179
 msgid "amount"
 msgstr "montant"
 
@@ -55,8 +55,8 @@ msgstr "montant effectif"
 msgid "number"
 msgstr "numéro"
 
-#: accounting/models.py:137 core/models.py:462 counter/models.py:167
-#: counter/models.py:195 eboutic/models.py:13 eboutic/models.py:46
+#: accounting/models.py:137 core/models.py:463 counter/models.py:182
+#: counter/models.py:213 eboutic/models.py:13 eboutic/models.py:46
 msgid "date"
 msgstr "date"
 
@@ -68,7 +68,7 @@ msgstr "intitulé"
 msgid "remark"
 msgstr "remarque"
 
-#: accounting/models.py:140 counter/models.py:168 eboutic/models.py:48
+#: accounting/models.py:140 counter/models.py:183 eboutic/models.py:48
 #: subscription/models.py:34
 msgid "payment method"
 msgstr "méthode de paiement"
@@ -90,7 +90,7 @@ msgstr ""
 "La date ne peut pas être avant la date de début du journal, qui est\n"
 "%(start_date)s."
 
-#: accounting/models.py:197 counter/models.py:60
+#: accounting/models.py:197 counter/models.py:66
 msgid "code"
 msgstr "code"
 
@@ -114,12 +114,12 @@ msgstr "Il n'y a pas de types comptable dans ce site web."
 #: accounting/templates/accounting/bank_account_details.jinja:5
 #: accounting/templates/accounting/club_account_details.jinja:5
 #: accounting/templates/accounting/journal_details.jinja:5
-#: core/templates/core/user_tools.jinja:36
+#: core/templates/core/user_tools.jinja:38
 msgid "Accounting"
 msgstr "Comptabilité"
 
 #: accounting/templates/accounting/bank_account_details.jinja:8
-#: core/templates/core/user_tools.jinja:43
+#: core/templates/core/user_tools.jinja:45
 msgid "Bank account: "
 msgstr "Compte en banque : "
 
@@ -146,7 +146,7 @@ msgstr "Nouveau compte club"
 #: accounting/templates/accounting/journal_details.jinja:51
 #: club/templates/club/club_detail.jinja:7 core/templates/core/page.jinja:31
 #: core/templates/core/user_base.jinja:8
-#: core/templates/core/user_tools.jinja:30
+#: core/templates/core/user_tools.jinja:32
 #: counter/templates/counter/counter_list.jinja:15
 #: counter/templates/counter/counter_list.jinja:18
 msgid "Edit"
@@ -323,7 +323,7 @@ msgid "role"
 msgstr "rôle"
 
 #: club/models.py:113 core/models.py:27 counter/models.py:39
-#: counter/models.py:58
+#: counter/models.py:64
 msgid "description"
 msgstr "description"
 
@@ -396,7 +396,7 @@ msgid "Add"
 msgstr "Ajouter"
 
 #: club/templates/club/club_tools.jinja:4
-#: core/templates/core/user_tools.jinja:54
+#: core/templates/core/user_tools.jinja:56
 msgid "Club tools"
 msgstr "Outils club"
 
@@ -507,10 +507,14 @@ msgid "Loop in page tree"
 msgstr "Boucle dans l'arborescence des pages"
 
 #: core/models.py:460
+msgid "revision"
+msgstr "révision"
+
+#: core/models.py:461
 msgid "page title"
 msgstr "titre de la page"
 
-#: core/models.py:461
+#: core/models.py:462
 msgid "page content"
 msgstr "contenu de la page"
 
@@ -563,13 +567,17 @@ msgstr "Pages"
 msgid "Clubs"
 msgstr "Clubs"
 
-#: core/templates/core/base.jinja:45
+#: core/templates/core/base.jinja:33
+msgid "Services"
+msgstr "Services"
+
+#: core/templates/core/base.jinja:46
 msgid "Site made by good people"
 msgstr "Site réalisé par des gens biens"
 
 #: core/templates/core/create.jinja:4
-msgid "Create"
-msgstr "Créer"
+msgid "Create %(name)s"
+msgstr "Créer %(name)s"
 
 #: core/templates/core/delete_confirm.jinja:4
 msgid "Delete confirmation"
@@ -676,15 +684,19 @@ msgstr ""
 "Ceci n'est peut-être pas la dernière version de la page. Vous consultez la "
 "version %(rev_id)s."
 
-#: core/templates/core/page_hist.jinja:4
+#: core/templates/core/page_hist.jinja:6
 msgid "Page history"
 msgstr "Historique de la page"
 
-#: core/templates/core/page_hist.jinja:5
+#: core/templates/core/page_hist.jinja:7
 #, python-format
 msgid "You're seeing the history of page \"%(page_name)s\""
 msgstr "Vous consultez l'historique de la page \"%(page_name)s\""
 
+#: core/templates/core/page_hist.jinja:11
+msgid "last"
+msgstr "actuel"
+
 #: core/templates/core/page_list.jinja:16
 msgid "There is no page in this website."
 msgstr "Il n'y a pas de page sur ce site web."
@@ -874,11 +886,19 @@ msgstr "Comptoirs"
 msgid "General counters management"
 msgstr "Gestion générale des comptoirs"
 
-#: core/templates/core/user_tools.jinja:39
+#: core/templates/core/user_tools.jinja:26
+msgid "Products management"
+msgstr "Gestion des produits"
+
+#: core/templates/core/user_tools.jinja:27
+msgid "Products type management"
+msgstr "Gestion des types de produit"
+
+#: core/templates/core/user_tools.jinja:41
 msgid "General accounting"
 msgstr "Comptabilité générale"
 
-#: core/templates/core/user_tools.jinja:47
+#: core/templates/core/user_tools.jinja:49
 msgid "Club account: "
 msgstr "Compte club : "
 
@@ -894,48 +914,72 @@ msgstr "client"
 msgid "customers"
 msgstr "clients"
 
-#: counter/models.py:61
+#: counter/models.py:43 eboutic/models.py:77
+msgid "product type"
+msgstr "type du produit"
+
+#: counter/models.py:67
 msgid "purchase price"
 msgstr "prix d'achat"
 
-#: counter/models.py:62
+#: counter/models.py:68
 msgid "selling price"
 msgstr "prix de vente"
 
-#: counter/models.py:63
+#: counter/models.py:69
 msgid "special selling price"
 msgstr "prix de vente spécial"
 
-#: counter/models.py:82 subscription/models.py:29
+#: counter/models.py:74
+msgid "product"
+msgstr "produit"
+
+#: counter/models.py:94 subscription/models.py:29
 msgid "subscription type"
 msgstr "type d'inscription"
 
-#: counter/models.py:84
+#: counter/models.py:96
 msgid "Bar"
 msgstr "Bar"
 
-#: counter/models.py:84
+#: counter/models.py:96
 msgid "Office"
 msgstr "Bureau"
 
-#: counter/models.py:84 eboutic/templates/eboutic/eboutic_main.jinja:20
+#: counter/models.py:96 eboutic/templates/eboutic/eboutic_main.jinja:20
 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:4
 #: eboutic/templates/eboutic/eboutic_payment_result.jinja:4
 msgid "Eboutic"
 msgstr "Eboutic"
 
-#: counter/models.py:170
+#: counter/models.py:102
+msgid "counter"
+msgstr "comptoir"
+
+#: counter/models.py:185
 msgid "bank"
 msgstr "banque"
 
-#: counter/models.py:191 eboutic/models.py:78
+#: counter/models.py:189
+msgid "refilling"
+msgstr "rechargement"
+
+#: counter/models.py:209 eboutic/models.py:78
 msgid "unit price"
 msgstr "prix unitaire"
 
-#: counter/models.py:192 eboutic/models.py:79
+#: counter/models.py:210 eboutic/models.py:79
 msgid "quantity"
 msgstr "quantité"
 
+#: counter/models.py:216
+msgid "selling"
+msgstr "vente"
+
+#: counter/models.py:241
+msgid "permanency"
+msgstr "permanence"
+
 #: counter/templates/counter/counter_click.jinja:20
 msgid "Counter"
 msgstr "Comptoir"
@@ -1040,6 +1084,32 @@ msgstr "Merci de vous identifier"
 msgid "Barman: "
 msgstr "Barman : "
 
+#: counter/templates/counter/product_list.jinja:4
+#: counter/templates/counter/product_list.jinja:10
+msgid "Product list"
+msgstr "Liste des produits"
+
+#: counter/templates/counter/product_list.jinja:8
+msgid "New product"
+msgstr "Nouveau produit"
+
+#: counter/templates/counter/product_list.jinja:17
+msgid "There is no products in this website."
+msgstr "Il n'y a pas de produits dans ce site web."
+
+#: counter/templates/counter/producttype_list.jinja:4
+#: counter/templates/counter/producttype_list.jinja:10
+msgid "Product type list"
+msgstr "Liste des types de produit"
+
+#: counter/templates/counter/producttype_list.jinja:8
+msgid "New product type"
+msgstr "Nouveau type de produit"
+
+#: counter/templates/counter/producttype_list.jinja:17
+msgid "There is no product types in this website."
+msgstr "Il n'y a pas de types de produit dans ce site web."
+
 #: counter/templates/counter/user_account.jinja:4
 #, python-format
 msgid "%(user_name)s's account"
@@ -1082,15 +1152,19 @@ msgstr "Factures"
 msgid "Items"
 msgstr "Articles"
 
-#: counter/views.py:208
+#: counter/views.py:45
+msgid "User not found"
+msgstr "Utilisateur non trouvé"
+
+#: counter/views.py:207
 msgid "END"
 msgstr "FIN"
 
-#: counter/views.py:210
+#: counter/views.py:209
 msgid "CAN"
 msgstr "ANN"
 
-#: counter/views.py:240
+#: counter/views.py:239
 msgid "You have not enough money to buy all the basket"
 msgstr "Vous n'avez pas assez d'argent pour acheter le panier"
 
@@ -1118,10 +1192,6 @@ msgstr "ID du produit"
 msgid "product name"
 msgstr "nom du produit"
 
-#: eboutic/models.py:77
-msgid "product type"
-msgstr "type du produit"
-
 #: eboutic/models.py:88
 msgid "basket"
 msgstr "panier"
@@ -1141,7 +1211,9 @@ msgstr "Payer avec une carte banquaire"
 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:34
 msgid ""
 "AE account payment disabled because your basket contains refilling items."
-msgstr "Paiement par compte AE désactivé parce que votre panier contient des bons de rechargement."
+msgstr ""
+"Paiement par compte AE désactivé parce que votre panier contient des bons de "
+"rechargement."
 
 #: eboutic/templates/eboutic/eboutic_makecommand.jinja:39
 msgid "Pay with Sith account"
@@ -1268,6 +1340,9 @@ msgid "You must either choose an existing user or create a new one properly"
 msgstr ""
 "Vous devez soit choisir un utilisateur existant, ou en créer un proprement."
 
+#~ msgid "Create"
+#~ msgstr "Créer"
+
 #~ msgid "%(c)s counter"
 #~ msgstr "Comptoir %(c)s"