From d13c3acaa07a05b4da7afee006c2b7d05e8ae875 Mon Sep 17 00:00:00 2001 From: vChabot Date: Wed, 25 Apr 2012 08:37:14 +0000 Subject: [PATCH] [-] BO : BugFix #PSTEST-1137 Customers : Accounting export comment is now improved --- controllers/admin/AdminCustomersController.php | 6 +++--- translations/fr/admin.php | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminCustomersController.php b/controllers/admin/AdminCustomersController.php index 80411bd2b..ee649123b 100644 --- a/controllers/admin/AdminCustomersController.php +++ b/controllers/admin/AdminCustomersController.php @@ -226,7 +226,7 @@ class AdminCustomersControllerCore extends AdminController $days = Tools::dateDays(); $groups = Group::getGroups($this->default_form_language, true); - + $accounting_number = Accounting::getDisplayedCustomerAccount($this->getFieldValue($obj, 'id_customer'), true); $this->fields_form = array( 'legend' => array( 'title' => $this->l('Customer'), @@ -278,8 +278,8 @@ class AdminCustomersControllerCore extends AdminController 'name' => 'account_number', 'size' => 33, 'required' => false, - 'desc' => $this->l('Used for the accounting export. If this field is empty, the accounting export will use this number '). - Accounting::getDisplayedCustomerAccount($this->getFieldValue($obj, 'id_customer'), true) + 'desc' => sprintf($this->l('Used for the accounting export. If this field is empty, the accounting export will use the predefined number from your shop %s'), + $accounting_number ? '('.$accounting_number.')' : '') ), array( 'type' => 'birthday', diff --git a/translations/fr/admin.php b/translations/fr/admin.php index 30a8d656d..fbe14f8c2 100644 --- a/translations/fr/admin.php +++ b/translations/fr/admin.php @@ -902,6 +902,7 @@ $_LANGADM['AdminCustomerThreadsf752f758ff0b5c465d65c2d0bcc579cd'] = 'nouveau mes $_LANGADM['AdminCustomerThreadsf79c2e540bdb87cd7710bf1e075e49db'] = 'Les autres messages de cette catégorie ont tous été traités'; $_LANGADM['AdminCustomerThreadsf8c8b903cb2e4f297e4b96d4b9c1e98a'] = 'Employé'; $_LANGADM['AdminCustomerThreadsf9b68c21c5d51df2d6b54cfbfa985abe'] = 'Utilisateur IMAP'; +$_LANGADM['AdminCustomers8fb487f39e972f3d649b70f37ba97f44'] = 'Utilisé pour l\'export comptable. Si ce champs est vide, l\'export comptable utilisera le numéro prédéfini dans votre boutique %s'; $_LANGADM['AdminCustomers00d23a76e43b46dae9ec7aa9dcbebb32'] = 'Activé'; $_LANGADM['AdminCustomers00ee8a54c1a129585ad8027e6d35222d'] = 'Newsletter'; $_LANGADM['AdminCustomers019ec3132cdf8ee0f2e2a75cf5d3e459'] = 'Sexe';