From 7c0463b215a2c46f0470f5d1c873b2d8e9fec4c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Wed, 29 Aug 2012 00:29:47 +0200 Subject: [PATCH 1/4] Used incorrect translation keys Duplicated keys --- htdocs/adherents/card_subscriptions.php | 4 ++-- htdocs/admin/commande.php | 2 +- htdocs/admin/facture.php | 2 +- htdocs/admin/propal.php | 2 +- htdocs/core/modules/dons/html_cerfafr.html | 4 ++-- htdocs/core/modules/dons/html_cerfafr.modules.php | 4 ++-- htdocs/langs/en_US/donations.lang | 2 -- htdocs/langs/fr_FR/donations.lang | 2 -- 8 files changed, 9 insertions(+), 13 deletions(-) diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index ece8bcf5cd7..61ef0da1314 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -978,10 +978,10 @@ if ($rowid) $helpcontent=''; $helpcontent.=''.$langs->trans("MailFrom").': '.$conf->global->ADHERENT_MAIL_FROM.'
'."\n"; $helpcontent.=''.$langs->trans("MailRecipient").': '.$object->email.'
'."\n"; - $helpcontent.=''.$langs->trans("Subject").':
'."\n"; + $helpcontent.=''.$langs->trans("MailTopic").':
'."\n"; $helpcontent.=$subjecttosend."\n"; $helpcontent.="
"; - $helpcontent.=''.$langs->trans("Content").':
'; + $helpcontent.=''.$langs->trans("MailText").':
'; $helpcontent.=dol_htmlentitiesbr($texttosend)."\n"; print $form->textwithpicto($tmp,$helpcontent,1,'help'); diff --git a/htdocs/admin/commande.php b/htdocs/admin/commande.php index 36c57926c4d..1a00c229150 100644 --- a/htdocs/admin/commande.php +++ b/htdocs/admin/commande.php @@ -472,7 +472,7 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1); $htmltooltip.='
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1); $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); - //$htmltooltip.='
'.$langs->trans("Escompte").': '.yn($module->option_escompte,1,1); + //$htmltooltip.='
'.$langs->trans("Discounts").': '.yn($module->option_escompte,1,1); //$htmltooltip.='
'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1); $htmltooltip.='
'.$langs->trans("WatermarkOnDraftOrders").': '.yn($module->option_draft_watermark,1,1); diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 6e54456f59e..46c793e0d72 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -571,7 +571,7 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("Logo").': '.yn($module->option_logo,1,1); $htmltooltip.='
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1); $htmltooltip.='
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1); - $htmltooltip.='
'.$langs->trans("Escompte").': '.yn($module->option_escompte,1,1); + $htmltooltip.='
'.$langs->trans("Discounts").': '.yn($module->option_escompte,1,1); $htmltooltip.='
'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1); $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); $htmltooltip.='
'.$langs->trans("WatermarkOnDraftInvoices").': '.yn($module->option_draft_watermark,1,1); diff --git a/htdocs/admin/propal.php b/htdocs/admin/propal.php index 02b57e63cb2..a0ed2dcba75 100644 --- a/htdocs/admin/propal.php +++ b/htdocs/admin/propal.php @@ -456,7 +456,7 @@ foreach ($dirmodels as $reldir) $htmltooltip.='
'.$langs->trans("PaymentMode").': '.yn($module->option_modereg,1,1); $htmltooltip.='
'.$langs->trans("PaymentConditions").': '.yn($module->option_condreg,1,1); $htmltooltip.='
'.$langs->trans("MultiLanguage").': '.yn($module->option_multilang,1,1); - //$htmltooltip.='
'.$langs->trans("Escompte").': '.yn($module->option_escompte,1,1); + //$htmltooltip.='
'.$langs->trans("Discounts").': '.yn($module->option_escompte,1,1); //$htmltooltip.='
'.$langs->trans("CreditNote").': '.yn($module->option_credit_note,1,1); $htmltooltip.='
'.$langs->trans("WatermarkOnDraftProposal").': '.yn($module->option_draft_watermark,1,1); diff --git a/htdocs/core/modules/dons/html_cerfafr.html b/htdocs/core/modules/dons/html_cerfafr.html index 246c31fc1c7..664bf54d965 100644 --- a/htdocs/core/modules/dons/html_cerfafr.html +++ b/htdocs/core/modules/dons/html_cerfafr.html @@ -123,8 +123,8 @@ - __DonationPaymentDate__ : __DATE__
- __DonationPaymentMode__ : __PAYMENTMODE_LIB__
+ __DatePayment__ : __DATE__
+ __PaymentMode__ : __PAYMENTMODE_LIB__
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php index e2f979b06ac..8c96087c38d 100644 --- a/htdocs/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/core/modules/dons/html_cerfafr.modules.php @@ -140,8 +140,8 @@ class html_cerfafr extends ModeleDon $form = str_replace('__DonationRef__',$outputlangs->trans("DonationRef"),$form); $form = str_replace('__DonationReceipt__',$outputlangs->trans("DonationReceipt"),$form); $form = str_replace('__DonationRecipient__',$outputlangs->trans("DonationRecipient"),$form); - $form = str_replace('__DonationPaymentDate__',$outputlangs->trans("DonationPaymentDate"),$form); - $form = str_replace('__DonationPaymentMode__',$outputlangs->trans("DonationPaymentMode"),$form); + $form = str_replace('__DatePayment__',$outputlangs->trans("DatePayment"),$form); + $form = str_replace('__PaymentMode__',$outputlangs->trans("PaymentMode"),$form); $form = str_replace('__Name__',$outputlangs->trans("Name"),$form); $form = str_replace('__Address__',$outputlangs->trans("Address"),$form); $form = str_replace('__Zip__',$outputlangs->trans("Zip"),$form); diff --git a/htdocs/langs/en_US/donations.lang b/htdocs/langs/en_US/donations.lang index 0618c99e695..0c32ae3c055 100644 --- a/htdocs/langs/en_US/donations.lang +++ b/htdocs/langs/en_US/donations.lang @@ -27,8 +27,6 @@ BuildDonationReceipt=Build receipt DonationsModels=Documents models for donation receipts LastModifiedDonations=Last %s modified donations SearchADonation=Search a donation -DonationPaymentDate=Donation payment date -DonationPaymentMode=Donation payment mode DonationRecipient=Donation recipient ThankYou=Thank You IConfirmDonationReception=The recipient declare reception, as a donation, of the following amount \ No newline at end of file diff --git a/htdocs/langs/fr_FR/donations.lang b/htdocs/langs/fr_FR/donations.lang index 1e270d17f0b..76a6452411b 100644 --- a/htdocs/langs/fr_FR/donations.lang +++ b/htdocs/langs/fr_FR/donations.lang @@ -27,8 +27,6 @@ BuildDonationReceipt=Créer reçu DonationsModels=Modèle de document de bon de réception de dons LastModifiedDonations=Les %s derniers dons modifiés SearchADonation=Rechercher un don -DonationPaymentDate=Date du versement -DonationPaymentMode=Mode de versement DonationRecipient=Bénéficiaire des versements ThankYou=Merci IConfirmDonationReception=Le bénéficiaire reconnait avoir reçu au titre des versements ouvrant droit à réduction d'impôt, la somme de \ No newline at end of file From 1a676b5b4b81d667b16ba7c08687d1e07e11ef16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Wed, 29 Aug 2012 00:32:16 +0200 Subject: [PATCH 2/4] Added missing permission translations --- htdocs/langs/en_US/admin.lang | 2 ++ htdocs/langs/es_ES/admin.lang | 2 ++ htdocs/langs/fr_FR/admin.lang | 2 ++ 3 files changed, 6 insertions(+) diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang index 7c5134a6c61..53aa67bb881 100644 --- a/htdocs/langs/en_US/admin.lang +++ b/htdocs/langs/en_US/admin.lang @@ -653,6 +653,8 @@ Permission2501=Read/Download documents Permission2502=Download documents Permission2503=Submit or delete documents Permission2515=Setup documents directories +Permission2801=Use FTP client in read mode (browse and download only) +Permission2802=Use FTP client in write mode (delete or upload files) Permission50101=Use Point of sales Permission50201= Read transactions Permission50202= Import transactions diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index d9f1b0661d7..00ff4873735 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -665,6 +665,8 @@ Permission2501=Consultar/Recuperar documentos Permission2502=Recuperar documentos Permission2503=Enviar o eliminar documentos Permission2515=Configuración directorios de documentos +Permission2801=Utilizar el cliente FTP en modo lectura (sólo explorar y descargar) +Permission2802=Utilizar el cliente FTP en modo escritura (borrar o subir archivos) Permission50101=Usar TPV Permission50201=Consultar las transacciones Permission50202=Importar las transacciones diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang index 6485c2d70a4..00c0082e1c7 100644 --- a/htdocs/langs/fr_FR/admin.lang +++ b/htdocs/langs/fr_FR/admin.lang @@ -661,6 +661,8 @@ Permission2501= Lire/Récupérer les documents Permission2502= Récupérer les documents Permission2503= Soumettre ou supprimer des documents Permission2515= Administrer les rubriques de documents +Permission2801=Utiliser un client FTP en mode lecture (parcours et download de fichiers) +Permission2802=Utiliser un client FTP en mode écriture (suppression et upload de fichiers) Permission50101=Utiliser Point de vente Permission50201= Consulter les transactions Permission50202= Importer les transactions From f9eb3873b0505fb9ab38e04901037031ff81738a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Garci=CC=81a?= Date: Wed, 29 Aug 2012 00:32:57 +0200 Subject: [PATCH 3/4] Improved and added missing es_ES translations --- htdocs/langs/en_US/members.lang | 4 ++-- htdocs/langs/es_ES/admin.lang | 4 +++- htdocs/langs/es_ES/companies.lang | 1 + htdocs/langs/es_ES/donations.lang | 7 ++++++- htdocs/langs/es_ES/main.lang | 5 +++-- htdocs/langs/es_ES/members.lang | 4 +++- htdocs/langs/es_ES/users.lang | 2 +- 7 files changed, 19 insertions(+), 8 deletions(-) diff --git a/htdocs/langs/en_US/members.lang b/htdocs/langs/en_US/members.lang index 188ac1c89f7..f691003ee13 100644 --- a/htdocs/langs/en_US/members.lang +++ b/htdocs/langs/en_US/members.lang @@ -131,8 +131,8 @@ AddSubscription=Add subscription ShowSubscription=Show subscription MemberModifiedInDolibarr=Member modified in Dolibarr SendAnEMailToMember=Send information email to member -DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Sujet du mail reçu en cas d'auto-inscription d'un invité -DescADHERENT_AUTOREGISTER_NOTIF_MAIL=Mail reçu en cas d'auto-inscription d'un invité +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Subject of the e-mail received in case of auto-inscription of a guest +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail received in case of auto-inscription of a guest DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=EMail subject for member autosubscription DescADHERENT_AUTOREGISTER_MAIL=EMail for member autosubscription DescADHERENT_MAIL_VALID_SUBJECT=EMail subject for member validation diff --git a/htdocs/langs/es_ES/admin.lang b/htdocs/langs/es_ES/admin.lang index 00ff4873735..5e93d6e6273 100644 --- a/htdocs/langs/es_ES/admin.lang +++ b/htdocs/langs/es_ES/admin.lang @@ -37,7 +37,7 @@ GlobalSetup=General GUISetup=Entorno SetupArea=Área configuración FormToTestFileUploadForm=Formulario de prueba de subida de archivo (según opciones elegidas) -IfModuleEnabled=Nota: sí sólo es eficaz si el módulo %s está activado +IfModuleEnabled=Nota: sólo es eficaz si el módulo %s está activado RemoveLock=Elimine el archivo %s, si existe, para permitir la utilidad de actualización. RestoreLock=Sustituir un archivo %s, dándole sólo derechos de lectura a este archivo con el fin de prohibir nuevas actualizaciones. SecuritySetup=Configuración de la seguridad @@ -1336,3 +1336,5 @@ ProjectsNumberingModules=Módulo de numeración para las referencias de los proy ProjectsSetup=Configuración del módulo Proyectos ProjectsModelModule=Modelo de documento para informes de proyectos Server=Servidor + +Logo=Logotipo \ No newline at end of file diff --git a/htdocs/langs/es_ES/companies.lang b/htdocs/langs/es_ES/companies.lang index febb31efef2..69a9b6437dc 100644 --- a/htdocs/langs/es_ES/companies.lang +++ b/htdocs/langs/es_ES/companies.lang @@ -70,6 +70,7 @@ Phone=Teléfono PhonePro=Teléf. trabajo PhonePerso=Teléf. particular PhoneMobile=Móvil +No_Email=No enviar emails masivos Fax=Fax Zip=Código postal Town=Población diff --git a/htdocs/langs/es_ES/donations.lang b/htdocs/langs/es_ES/donations.lang index fa8a7edcf42..30628fd5554 100644 --- a/htdocs/langs/es_ES/donations.lang +++ b/htdocs/langs/es_ES/donations.lang @@ -24,4 +24,9 @@ ValidPromess=Validar promesa BuildDonationReceipt=Crear recibo DonationsModels=Modelo de documento de recepción de donación LastModifiedDonations=Las %s últimas donaciones modificadas -SearchADonation=Buscar una donación \ No newline at end of file +SearchADonation=Buscar una donación +DonationReceipt=Recibo de donación +DonationRecipient=Beneficiario +DonationRef=Referencia +IConfirmDonationReception=El beneficiario confirma la recepción, como donación, de la siguiente cantidad +ThankYou=Muchas gracias \ No newline at end of file diff --git a/htdocs/langs/es_ES/main.lang b/htdocs/langs/es_ES/main.lang index 185e6421ec4..c6886883617 100644 --- a/htdocs/langs/es_ES/main.lang +++ b/htdocs/langs/es_ES/main.lang @@ -14,6 +14,7 @@ FormatDateHourShort=%d/%m/%Y %H:%M FormatDateHourTextShort=%d %b %Y %H:%M FormatDateHourText=%d %B %Y %H:%M DatabaseConnection=Conexión a la base de datos +NoTranslation=Sin traducción NoError=Ningún error Error=Error ErrorFieldRequired=El campo '%s' es obligatorio @@ -62,7 +63,7 @@ DolibarrInHttpAuthenticationSoPasswordUseless=Dolibarr está configurado en modo Administrator=Administrador Undefined=No definido PasswordForgotten=¿Olvidó su contraseña? -SeeAbove=Mencionar anteriormente +SeeAbove=Mencionado anteriormente HomeArea=Área inicio LastConnexion=Última conexión PreviousConnexion=Conexión anterior @@ -521,7 +522,7 @@ Priority=Prioridad SendByMail=Enviar por e-mail MailSentBy=Mail enviado por TextUsedInTheMessageBody=Texto utilizado en el cuerpo del mensaje -SendAcknowledgementByMail=Envio rec. por e-mail +SendAcknowledgementByMail=Enviar recibo por e-mail NoEMail=Sin e-mail Owner=Propietario DetectedVersion=Versión detectada diff --git a/htdocs/langs/es_ES/members.lang b/htdocs/langs/es_ES/members.lang index 4f55167c6cb..ecd037cbaa8 100644 --- a/htdocs/langs/es_ES/members.lang +++ b/htdocs/langs/es_ES/members.lang @@ -54,7 +54,7 @@ MembersAttributes=Atributos miembros SearchAMember=Buscar un miembro MemberStatusDraft=Borrador (a validar) MemberStatusDraftShort=A validar -MemberStatusActive=Validado (en espera de afiliación ) +MemberStatusActive=Validado (en espera de afiliación) MemberStatusActiveShort=Validado MemberStatusActiveLate=Afiliación no al día MemberStatusActiveLateShort=No al día @@ -134,6 +134,8 @@ AddSubscription=Añadir afiliación ShowSubscription=Mostrar afiliación MemberModifiedInDolibarr=Miembro modificado en Dolibarr SendAnEMailToMember=Enviar e-mail de información al miembro (E-mail: %s) +DescADHERENT_AUTOREGISTER_NOTIF_MAIL_SUBJECT=Asunto del e-mail recibido en caso de auto-inscripción de un invitado +DescADHERENT_AUTOREGISTER_NOTIF_MAIL=E-mail recibido en caso de auto-inscripción de un invitado DescADHERENT_AUTOREGISTER_MAIL_SUBJECT=Asunto del e-mail enviado cuando un invitado se auto-inscriba DescADHERENT_AUTOREGISTER_MAIL=E-mail enviado cuando un invitado se auto-inscriba DescADHERENT_MAIL_VALID_SUBJECT=Asunto del e-mail de validación de miembro diff --git a/htdocs/langs/es_ES/users.lang b/htdocs/langs/es_ES/users.lang index f0ac57cb693..d47d4ea548e 100644 --- a/htdocs/langs/es_ES/users.lang +++ b/htdocs/langs/es_ES/users.lang @@ -108,7 +108,7 @@ ConfirmCreateContact=¿Está seguro de querer crear una cuenta Dolibarr para est ConfirmCreateLogin=¿Está seguro de que desea crear una cuenta Dolibarr para este miembro? ConfirmCreateThirdParty=¿Está seguro de querer crear un tercero para este miembro? LoginToCreate=Login a crear -NameToCreate=nombre del tercero a crear +NameToCreate=Nombre del tercero a crear YourRole=Sus roles YourQuotaOfUsersIsReached=¡Ha llegado a su cuota de usuarios activos! NbOfUsers=Nº de usuarios From 70c467e4293dd66b983eba1412bb39a6ffef93aa Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Wed, 29 Aug 2012 08:17:25 +0200 Subject: [PATCH 4/4] Fix: Update vat rate combobox --- htdocs/core/ajax/vatrates.php | 11 ++++---- htdocs/core/lib/functions.lib.php | 4 +++ htdocs/core/tpl/objectline_add.tpl.php | 35 +++++++++++++++++++++----- 3 files changed, 39 insertions(+), 11 deletions(-) diff --git a/htdocs/core/ajax/vatrates.php b/htdocs/core/ajax/vatrates.php index 97ed9e4697c..6572bd883f1 100644 --- a/htdocs/core/ajax/vatrates.php +++ b/htdocs/core/ajax/vatrates.php @@ -32,6 +32,7 @@ require '../../main.inc.php'; $id = GETPOST('id','int'); $action = GETPOST('action','alpha'); $htmlname = GETPOST('htmlname','alpha'); +$productid = (GETPOST('productid','int')?GETPOST('productid','int'):0); /* * View @@ -46,15 +47,15 @@ if (! empty($id) && ! empty($action) && ! empty($htmlname)) { $form = new Form($db); $soc = new Societe($db); - + $soc->fetch($id); - + $return=array(); - - $return['value'] = $form->load_tva('tva_tx','',$soc,$mysoc,0,0,'',true); + + $return['value'] = $form->load_tva('tva_tx','',$soc,$mysoc,$productid,0,'',true); $return['num'] = $form->num; $return['error'] = $form->error; - + echo json_encode($return); } diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 878cee4812f..790d8580b93 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -2741,6 +2741,10 @@ function get_product_vat_for_country($idprod, $thirdparty_seller, $idprodfournpr { global $db,$mysoc; + if (! class_exists('Product')) { + require DOL_DOCUMENT_ROOT . '/product/class/product.class.php'; + } + $ret=0; $found=0; diff --git a/htdocs/core/tpl/objectline_add.tpl.php b/htdocs/core/tpl/objectline_add.tpl.php index 2fdf04d2403..203ea15931f 100644 --- a/htdocs/core/tpl/objectline_add.tpl.php +++ b/htdocs/core/tpl/objectline_add.tpl.php @@ -153,7 +153,7 @@ if (! empty($conf->margin->enabled)) {
tva_assuj == "0") echo '0'; + if ($buyer->tva_assuj == "0") echo '0'; else echo $form->load_tva('tva_tx', (GETPOST('tva_tx')?GETPOST('tva_tx'):-1), $seller, $buyer); ?> @@ -229,6 +229,18 @@ $(document).ready(function() { $('#product_desc').focus(); } + // Update vat rate combobox + $.post('/core/ajax/vatrates.php', { + 'action': 'getVATRate', + 'id': id; ?>, + 'productid': $(this).val(), + 'htmlname': 'tva_tx' }, + function(data) { + if (typeof data != 'undefined' && data.error == null) { + $("#tva_tx").html(data.value); + } + }, 'json'); + // For compatibility with combobox global->PRODUIT_USE_SEARCH_TO_SELECT)) { ?> $.post('/product/ajax/products.php', { @@ -258,6 +270,17 @@ $(document).ready(function() { $('#update_price_checkbox').removeAttr('checked'); $('#price_ttc').val(''); + // Update vat rate combobox + $.post('/core/ajax/vatrates.php', { + 'action': 'getVATRate', + 'id': id; ?>, + 'htmlname': 'tva_tx' }, + function(data) { + if (typeof data != 'undefined' && data.error == null) { + $("#tva_tx").html(data.value); + } + }, 'json'); + // For compatibility with combobox global->PRODUIT_USE_SEARCH_TO_SELECT)) { ?> $('#select_type').val('').removeAttr('disabled').trigger('change'); @@ -272,7 +295,6 @@ $(document).ready(function() { $('#update_desc_area').hide().trigger('hide'); $('#update_price_area').hide().trigger('hide'); - } }); @@ -346,11 +368,13 @@ $(document).ready(function() { $('#update_price_area').bind('hide', function() { $('#price_ht').removeAttr('disabled'); $('#price_ttc').removeAttr('disabled'); + $('#tva_tx').removeAttr('disabled'); }); $('#update_price_area').bind('show', function() { $('#price_ht').attr('disabled', 'disabled'); $('#price_ttc').attr('disabled', 'disabled'); + $('#tva_tx').attr('disabled', 'disabled'); }); $('#update_price_checkbox').change(function() { @@ -359,15 +383,14 @@ $(document).ready(function() { if ($('#tva_tx').val() > 0) { $('#price_ttc').removeAttr('disabled') } + $('#tva_tx').removeAttr('disabled'); } else { $('#price_ht') .attr('disabled','disabled') .val($('#origin_price_ht_cache').val()) .trigger('change'); - $('#price_ttc') - .attr('disabled','disabled'); - //.val($('#origin_price_ttc_cache').val()) - //.trigger('change'); + $('#price_ttc').attr('disabled','disabled'); + $('#tva_tx').attr('disabled', 'disabled'); } });