From cec2a5e7f9e74d17b9f1e9548b504c0c8f3d8dd7 Mon Sep 17 00:00:00 2001 From: FHenry Date: Tue, 10 Apr 2012 14:38:32 +0200 Subject: [PATCH 1/3] Translation ES --- htdocs/langs/es_ES/mails.lang | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/langs/es_ES/mails.lang b/htdocs/langs/es_ES/mails.lang index c068a7d57d4..ba4acfc091a 100644 --- a/htdocs/langs/es_ES/mails.lang +++ b/htdocs/langs/es_ES/mails.lang @@ -74,6 +74,8 @@ SentTo=Enviado a %s MailingStatusRead=Leido CheckRead=Confirmación de lectura YourMailUnsubcribeOK=El correo electrónico %s es correcta desuscribe. +MailtoEMail=mailto email (hyperlink) +ActivateCheckRead=Activar Confirmación de lectura y desuscribe option # Libelle des modules de liste de destinataires mailing= MailingModuleDescContactCompanies=Contactos de terceros (clientes potenciales, clientes, proveedores...) From c59f01a70d0e2d152eae75459f83b8350486da75 Mon Sep 17 00:00:00 2001 From: FHenry Date: Tue, 10 Apr 2012 14:39:12 +0200 Subject: [PATCH 2/3] trad FR --- htdocs/langs/fr_FR/mails.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/fr_FR/mails.lang b/htdocs/langs/fr_FR/mails.lang index 9e1b08b84d1..45b5dd24263 100644 --- a/htdocs/langs/fr_FR/mails.lang +++ b/htdocs/langs/fr_FR/mails.lang @@ -76,7 +76,7 @@ MailingStatusRead=Lu CheckRead=Accusé de lecture YourMailUnsubcribeOK=L'adresse e-mail %s est bien désincrite de la liste. MailtoEMail=Ecrire a e-mail (lien) -ActivateCheckRead=Activer les tag d'accusé de lecture et de désincription +ActivateCheckRead=Activer les tags d'accusé de lecture et de désincription # Libelle des modules de liste de destinataires mailing MailingModuleDescContactCompanies=Contacts de tiers (prospects, clients, fournisseurs...) From 4e759b15fe33d16a52ca6f85808bcf7360bec7fe Mon Sep 17 00:00:00 2001 From: FHenry Date: Wed, 11 Apr 2012 10:03:57 +0200 Subject: [PATCH 3/3] Correction Bug #358 --- htdocs/commande/fiche.php | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index ef587e036a2..a741e19a2e8 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -464,7 +464,28 @@ else if ($action == 'setconditions' && $user->rights->commande->creer) { $object->fetch($id); $result=$object->setPaymentTerms(GETPOST('cond_reglement_id','int')); - if ($result < 0) dol_print_error($db,$object->error); + if ($result < 0) + { + dol_print_error($db,$object->error); + } + else + { + if (empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) + { + // Define output language + $outputlangs = $langs; + $newlang=GETPOST('lang_id','alpha'); + if ($conf->global->MAIN_MULTILANGS && empty($newlang)) $newlang=$object->client->default_lang; + if (! empty($newlang)) + { + $outputlangs = new Translate("",$conf); + $outputlangs->setDefaultLang($newlang); + } + + $ret=$object->fetch($id); // Reload to get new records + commande_pdf_create($db, $object, $object->modelpdf, $outputlangs, GETPOST('hidedetails'), GETPOST('hidedesc'), GETPOST('hideref'), $hookmanager); + } + } } else if ($action == 'setremisepercent' && $user->rights->commande->creer)