lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2012-04-11 14:38:13 +02:00
commit 7daea97ebb
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
htdocs/commande/fiche.php
View File

@ -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)

2
htdocs/langs/es_ES/mails.lang
View File

@ -74,6 +74,8 @@ SentTo=Enviado a <b>%s</b>
MailingStatusRead=Leido
CheckRead=Confirmación de lectura
YourMailUnsubcribeOK=El correo electrónico <b>%s</b> 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...)

2
htdocs/langs/fr_FR/mails.lang
View File

@ -76,7 +76,7 @@ MailingStatusRead=Lu
CheckRead=Accusé de lecture
YourMailUnsubcribeOK=L'adresse e-mail <b>%s</b> 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...)