Vous voici sur le Git Rural du CRAW

Commit aaf84a9f authored by Patrick Houben's avatar Patrick Houben

1.4.3

parent 3ba30f3e
......@@ -2,8 +2,8 @@ __author__ = 'Patrick HOUBEN'
__email__ = 'p.houben@cra.wallonie.be'
__copyright__ = 'Copyright 2018-2020, Patrick HOUBEN'
__license__ = 'MIT'
__date__ = '2020-06-25'
__version__ = '1.4.2'
__date__ = '2020-07-22'
__version__ = '1.4.3'
__status__ = 'Stable'
# Version synonym
......
......@@ -105,8 +105,8 @@ BOOTSTRAP4 = {
if SERVER_NAME == "pythonprod":
INSTALLED_APPS = [
'pgcrypto',
'cacheops',
'pgcrypto',
'request',
]
else:
......
......@@ -74,7 +74,15 @@
<td>
<p>Mineur: Adaptations base de données SQLite</p>
</td>
</tr>
</tr>
<tr>
<td>1.4.3</td>
<td>24/07/2020</td>
<td>
<p>Mineur: Arrondi calcul TVA dans facture et bon de commande.</p>
<p>Mineur: Othographe + changements de textes.</p>
</td>
</tr>
</tbody>
......
......@@ -32,7 +32,7 @@ def ddl_revcat_inst(request):
inst = inst.filter(id__in=("FRM_BDC", "FRM_DEV"))
if origin == 'REVENUE':
inst = inst.exclude(id__in=("FRM_BDC", "FRM_DEV"))
return inst
......@@ -57,7 +57,7 @@ def ddl_expcat_inst(request):
class ClientSearch(forms.Form):
PAY_LIST = [("NADA", "--------"),
("Paid", "Payé"),
("ToPay", "À reçevoir")]
("ToPay", "À recevoir")]
txtsearch = forms.CharField(label=_("Rechercher"), max_length=20,
required=False,
widget=forms.TextInput(attrs={
......@@ -161,7 +161,7 @@ class ExpenseSearch(forms.Form):
# (2019, '2019'),
# (2020, '2020'),
# ]
# year = forms.ChoiceField(choices=LIST_YEAR, widget=forms.Select(attrs={'class': "form-control"}))
# year = forms.ChoiceField(choices=LIST_YEAR, widget=forms.Select(attrs={'class': "form-control"}))
expnr = forms.CharField(
label=_("Rechercher"),
max_length=10,
......@@ -239,7 +239,7 @@ class ExpenseSearch(forms.Form):
class RevenueSearch(forms.Form):
PAY_LIST = [("NADA", "--------"),
("Paid", "Payé"),
("ToPay", "À reçevoir")]
("ToPay", "À recevoir")]
# LIST_YEAR = [
# (2018, '2018'),
# (2019, '2019'),
......@@ -309,7 +309,7 @@ class RevenueSearch(forms.Form):
userpk = request.session["myuserpk"]
usermodel = get_user_model()
myuser = get_object_or_404(usermodel, pk=userpk)
# self.fields["year"].choices = get_year_list(request, "REV")
self.fields["year"].queryset = Revenue.objects.for_user(myuser).values_list('inputdate__year', flat=True).distinct().order_by('inputdate__year')
# Get year passed as GET argument
......
......@@ -28,7 +28,7 @@ var RevenueProductForm = {
}
else {
var amountvat = amount + (vat/100 * amount);
amountvat = (Math.round(amountvat*10))/10
amountvat = (Math.round(amountvat*100))/100
$("#id_form-" + pfx + "-amountvat").val(amountvat);
}
},
......
......@@ -37,7 +37,7 @@
</script>
{% if form_js %}
<!-- reloadjs sert juste à recharger l'entièreté de la page côté client si chgt js -->
<script src="{% static form_js %}?reloadjs=20200412"></script>
<script src="{% static form_js %}?reloadjs=20200722"></script>
{% endif %}
{% if "client" in request.path or "supplier" in request.path %}
<script src="{% static 'load_ddl_zip.js' %}"></script>
......
......@@ -62,7 +62,7 @@
{% block js %}
{{ block.super }}
{% if "revenueproduct" in request.path %}
<script src="{% static 'revenueproduct_form.js' %}"></script>
<script src="{% static 'revenueproduct_form.js' %}?reloadjs=20200722"></script>
{% endif %}
<!-- enableajaxindjango Activated only for the ajax delete call -->
<script src="{% static 'enableajaxindjango.js' %}"></script>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment