diff --git a/client/src/partials/vouchers/complex.js b/client/src/partials/vouchers/complex.js
index 0b59724742..646dd907ac 100644
--- a/client/src/partials/vouchers/complex.js
+++ b/client/src/partials/vouchers/complex.js
@@ -234,6 +234,7 @@ function ComplexJournalVoucherController(Vouchers, $translate, Currencies, Sessi
       .then(function (result) {
         Receipts.voucher(result.uuid, true);
         vm.Voucher.clear();
+        form.$setPristine();
       })
       .catch(Notify.handleError);
   }
diff --git a/client/src/partials/vouchers/toolkit/convention_payment.js b/client/src/partials/vouchers/toolkit/convention_payment.js
index 0cd4765b0c..914afa1bc4 100644
--- a/client/src/partials/vouchers/toolkit/convention_payment.js
+++ b/client/src/partials/vouchers/toolkit/convention_payment.js
@@ -53,7 +53,7 @@ function ConventionPaymentKitController(Instance, DebtorGroup, Notify, Cashbox,
     .catch(Notify.handleError);
 
   // load conventions
-  DebtorGroup.read(null, { is_convention: 1})
+  DebtorGroup.read()
     .then(function (list) {
       vm.conventionGroupList = list;
     })
diff --git a/client/src/partials/vouchers/toolkit/convention_payment.modal.html b/client/src/partials/vouchers/toolkit/convention_payment.modal.html
index a3c24be78b..70eef41fa3 100644
--- a/client/src/partials/vouchers/toolkit/convention_payment.modal.html
+++ b/client/src/partials/vouchers/toolkit/convention_payment.modal.html
@@ -1,7 +1,7 @@
 <div class="modal-header">
   <ol class="headercrumb">
-    <li class="static">{{ ToolCtrl.tool.label | translate }}</li>
-    <li class="title">{{ "VOUCHERS.GLOBAL.IMPORT_TRANSACTION" | translate }}</li>
+    <li class="static" translate>{{ ToolCtrl.tool.label }}</li>
+    <li class="title" translate>VOUCHERS.GLOBAL.IMPORT_TRANSACTION</li>
   </ol>
 </div>
 
@@ -12,8 +12,8 @@
     <div
       class="form-group"
       ng-class="{ 'has-error' : ToolForm.$submitted && ToolForm.cashbox.$invalid }">
-      <label class="control-label">
-        {{ "FORM.LABELS.CASHBOX" | translate }}
+      <label class="control-label" translate>
+        FORM.LABELS.CASHBOX
       </label>
 
       <ui-select
@@ -38,8 +38,8 @@
     <div
       class="form-group"
       ng-class="{ 'has-error' : ToolForm.$submitted && ToolForm.convention.$invalid }">
-      <label class="control-label">
-        {{ "FORM.LABELS.CONVENTION" | translate }}
+      <label class="control-label" translate>
+        FORM.LABELS.CONVENTION
       </label>
 
       <ui-select
@@ -74,9 +74,9 @@
       </div>
     </div>
 
-    <div ng-show="ToolCtrl.convention" class="test-right">
-      <span>{{ 'FORM.LABELS.TOTAL_BILLED' | translate }}: <strong class="text-danger">{{ ToolCtrl.totalInvoices || 0 | currency: ToolCtrl.enterprise.currency_id }}</strong></span><br>
-      <span>{{ 'FORM.LABELS.TOTAL_SELECTED_INVOICES' | translate }}: <strong class="text-success">{{ ToolCtrl.totalSelected || 0 | currency: ToolCtrl.enterprise.currency_id }}</strong></span>
+    <div ng-show="ToolCtrl.convention" class="text-right">
+      <span translate>FORM.LABELS.TOTAL_BILLED</span>: <strong class="text-danger">{{ ToolCtrl.totalInvoices || 0 | currency: ToolCtrl.enterprise.currency_id }}</strong><br>
+      <span translate>FORM.LABELS.TOTAL_SELECTED_INVOICES</span>: <strong class="text-success">{{ ToolCtrl.totalSelected || 0 | currency: ToolCtrl.enterprise.currency_id }}</strong>
     </div>
   </div>
 
@@ -85,13 +85,13 @@
       type="button"
       class="btn btn-default"
       ng-click="ToolCtrl.close()"
-      data-method="close">
-      {{ "FORM.BUTTONS.CANCEL" | translate }}
+      data-method="close"
+      translate>
+      FORM.BUTTONS.CANCEL
     </button>
 
-    <bh-loading-button loading-state="ToolForm.$loading"
-      disabled="ToolCtrl.$invalid || !ToolCtrl.selectedRows.length">
-      {{ "FORM.BUTTONS.SUBMIT" | translate }}
+    <bh-loading-button loading-state="ToolForm.$loading" disabled="ToolCtrl.$invalid || !ToolCtrl.selectedRows.length">
+      <span translate>FORM.BUTTONS.SUBMIT</span>
     </bh-loading-button>
   </div>
 </form>