@@ -245,12 +245,14 @@ $(document).ready(function() {
if (account_data['id'] != 0) {
var url_base = '{% url 'kfet.account.read' 'LIQ' %}';
url_base = url_base.substr(0, url_base.length - 3);
- buttons += '
';
+ trigramme = encodeURIComponent(account_data['trigramme']) ;
+ buttons += '
';
}
if (account_data['id'] == 0) {
var trigramme = triInput.val().toUpperCase();
var url_base = '{% url 'kfet.account.create' %}'
if (isValidTrigramme(trigramme)) {
+ trigramme = encodeURIComponent(trigramme);
buttons += '
';
}
}
@@ -924,7 +926,7 @@ $(document).ready(function() {
}
});
},
- onClose: function() { this._lastFocused = articleSelect; }
+ onClose: function() { this._lastFocused = (articleSelect.val() ? articleNb : articleSelect) ; }
});
}
@@ -1250,13 +1252,13 @@ $(document).ready(function() {
return false;
case 113:
if (e.shiftKey) {
- // Shift+F2 - Basket reset
- resetBasket();
- articleSelect.focus();
- } else {
- // F2 - Account reset
+ // Shift+F2 - Account reset
resetAccount();
triInput.focus();
+ } else {
+ // F2 - Basket reset
+ resetBasket();
+ articleSelect.focus();
}
return false;
case 114:
diff --git a/kfet/templates/kfet/transfers_create.html b/kfet/templates/kfet/transfers_create.html
index 294db1e5..83a09762 100644
--- a/kfet/templates/kfet/transfers_create.html
+++ b/kfet/templates/kfet/transfers_create.html
@@ -34,12 +34,12 @@
|
-
+
{{ form.from_acc }}
|
{{ form.amount }} |
-
+
{{ form.to_acc }}
|
|
@@ -71,18 +71,21 @@ $(document).ready(function () {
var $next = $form.next('.transfer_form').find('.from_acc input');
}
var $input_id = $input.next('input');
- getAccountData(trigramme, function(data) {
- $input_id.val(data.id);
- $data.text(data.name);
- $next.focus();
- });
+ if (isValidTrigramme(trigramme)) {
+ getAccountData(trigramme, function(data) {
+ $input_id.val(data.id);
+ $data.text(data.name);
+ $next.focus();
+ });
+ } else {
+ $input_id.val('');
+ $data.text('');
+ }
}
$('.input_from_acc, .input_to_acc').on('input', function() {
var tri = $(this).val().toUpperCase();
- if (isValidTrigramme(tri)) {
- updateAccountData(tri, $(this));
- }
+ updateAccountData(tri, $(this));
});
$('#transfers_form').on('submit', function(e) {
diff --git a/kfet/views.py b/kfet/views.py
index 1614a27b..848df767 100644
--- a/kfet/views.py
+++ b/kfet/views.py
@@ -493,7 +493,8 @@ class AccountGroupUpdate(UpdateView):
class AccountNegativeList(ListView):
queryset = (AccountNegative.objects
- .select_related('account', 'account__cofprofile__user'))
+ .select_related('account', 'account__cofprofile__user')
+ .exclude(account__trigramme='#13'))
template_name = 'kfet/account_negative.html'
context_object_name = 'negatives'
@@ -504,12 +505,13 @@ class AccountNegativeList(ListView):
'overdraft_duration': Settings.OVERDRAFT_DURATION(),
}
negs_sum = (AccountNegative.objects
+ .exclude(account__trigramme='#13')
.aggregate(
bal = Coalesce(Sum('account__balance'),0),
offset = Coalesce(Sum('balance_offset'),0),
)
)
- context['negatives_sum'] = negs_sum['bal'] + negs_sum['offset']
+ context['negatives_sum'] = negs_sum['bal'] - negs_sum['offset']
return context
# -----