diff --git a/mondumas/templates/devis/devis_ligne.pt b/mondumas/templates/devis/devis_ligne.pt index 5cc18ee..f0cd1ee 100644 --- a/mondumas/templates/devis/devis_ligne.pt +++ b/mondumas/templates/devis/devis_ligne.pt @@ -47,8 +47,11 @@
- -
+
+ .00 + +
+
@@ -196,11 +199,13 @@ $(document).ready(function() { var ref = response[0]['ref']; var libelle = response[0]['libelle']; var prixht = response[0]['prixht']; + var unite = response[0]['unite']; // Set value to textboxes document.getElementById('ref').value = ref; document.getElementById('libelle').value = libelle; document.getElementById('prixht').value = prixht; + document.getElementById("unite").innerHTML= unite; } } }); diff --git a/mondumas/templates/parametres/parametres.pt b/mondumas/templates/parametres/parametres.pt index 6b3002e..e34783c 100644 --- a/mondumas/templates/parametres/parametres.pt +++ b/mondumas/templates/parametres/parametres.pt @@ -34,10 +34,6 @@

TEXTES EMAIL

-
- -

PROTOTYPE HOME

-

diff --git a/mondumas/templates/stats/ca_groupes.pt b/mondumas/templates/stats/ca_groupes.pt index 068cc16..abf9991 100644 --- a/mondumas/templates/stats/ca_groupes.pt +++ b/mondumas/templates/stats/ca_groupes.pt @@ -65,16 +65,19 @@ var options_ca_3y_1 = { title: '${title1}', colors: ['purple', 'ff9900', '#dc3912', '3366cc', 'green'], + pieHole: 0.3, }; var options_ca_3y_2 = { title: '${title2}', colors: ['purple', 'ff9900', '#dc3912', '3366cc', 'green'], + pieHole: 0.3, }; var options_ca_3y_3 = { title: '${title3}', colors: ['purple', 'ff9900', '#dc3912', '3366cc', 'green'], + pieHole: 0.3, }; var chart_ca_12m = new google.visualization.ColumnChart(document.getElementById('chart_ca_12m')); diff --git a/mondumas/views/default.py b/mondumas/views/default.py index 2fcf45c..cdf238f 100644 --- a/mondumas/views/default.py +++ b/mondumas/views/default.py @@ -410,6 +410,6 @@ def ajax_article(request): d['ref'] = items.ref d['libelle'] = items.libelle d['prixht'] = "%.2f" % items.prixht + d['unite'] = items.unite liste.append(d) - return Response(json.dumps(liste))