diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index aac2a88d044c3b92c7f26dd9d58ea03ab472ae00..6385aa43be18f52e2c67224371ede35629eb17b8 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -854,7 +854,7 @@ if ($rowid) if ($adht->cotisation) { // Amount - print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="cotisation" size="6" value="'.$_POST["cotisation"].'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<tr><td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="cotisation" size="6" value="'.$_POST["cotisation"].'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>'; // Label print '<tr><td class="fieldrequired">'.$langs->trans("Label").'</td>'; diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php index 9555921ad1331685ef00ffa60384d50f59d9b663..d0c7c93947d1a0491f3f1fdc86f3a581ef24a045 100644 --- a/htdocs/cashdesk/tpl/facturation1.tpl.php +++ b/htdocs/cashdesk/tpl/facturation1.tpl.php @@ -125,11 +125,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. </td> <!-- Affichage du prix unitaire --> <td><input class="texte1_off" type="text" name="txtPrixUnit" value="<?php echo price2num($obj_facturation->prix(), 'MU'); ?>" disabled="disabled" /></td> - <td><?php echo $conf->monnaie; ?></td> + <td><?php echo $conf->currency; ?></td> <!-- Choix de la remise --> <td><input class="texte1" type="text" name="txtRemise" value="0" onkeyup="javascript: modif();" onfocus="javascript: this.select();"/></td> <!-- Affichage du total HT --> - <td><input class="texte1_off" type="text" name="txtTotal" value="" disabled="disabled" /></td><td><?php echo $conf->monnaie; ?></td> + <td><input class="texte1_off" type="text" name="txtTotal" value="" disabled="disabled" /></td><td><?php echo $conf->currency; ?></td> <!-- Choix du taux de TVA --> <td class="select_tva"> <select name="selTva" onchange="javascript: modif();" > diff --git a/htdocs/cashdesk/tpl/liste_articles.tpl.php b/htdocs/cashdesk/tpl/liste_articles.tpl.php index 4be93a9636330bf5ccf4b86115952da482264a5b..c9fbce6644bc7a286c6519f7afdddab574f98fac 100644 --- a/htdocs/cashdesk/tpl/liste_articles.tpl.php +++ b/htdocs/cashdesk/tpl/liste_articles.tpl.php @@ -61,14 +61,14 @@ else $remise = $tab[$i]['remise']; - echo ('<p>'.$tab[$i]['qte'].' x '.price2num($tab[$i]['price'], 'MT').$remise_percent.' = '.price2num($tab[$i]['total_ht'], 'MT').' '.$conf->monnaie.' '.$langs->trans("HT").' ('.price2num($tab[$i]['total_ttc'], 'MT').' '.$conf->monnaie.' '.$langs->trans("TTC").')</p>'."\n"); + echo ('<p>'.$tab[$i]['qte'].' x '.price2num($tab[$i]['price'], 'MT').$remise_percent.' = '.price2num($tab[$i]['total_ht'], 'MT').' '.$conf->currency.' '.$langs->trans("HT").' ('.price2num($tab[$i]['total_ttc'], 'MT').' '.$conf->currency.' '.$langs->trans("TTC").')</p>'."\n"); echo ('</div>'."\n"); } } $obj_facturation->calculTotaux(); $total_ttc = $obj_facturation->prix_total_ttc(); -echo ('<p class="cadre_prix_total">'.$langs->trans("Total").' : '.price2num($total_ttc, 'MT').' '.$conf->monnaie.'<br></p>'."\n"); +echo ('<p class="cadre_prix_total">'.$langs->trans("Total").' : '.price2num($total_ttc, 'MT').' '.$conf->currency.'<br></p>'."\n"); ?></div> </div> diff --git a/htdocs/cashdesk/tpl/ticket.tpl.php b/htdocs/cashdesk/tpl/ticket.tpl.php index 14f6537181f76725396efca52fce26d20c0f50f1..3f65cdae40f0fefa83a413f2abb24322cb7e6c7c 100644 --- a/htdocs/cashdesk/tpl/ticket.tpl.php +++ b/htdocs/cashdesk/tpl/ticket.tpl.php @@ -130,7 +130,7 @@ print $object->ref; for($i=0;$i < $tab_size;$i++) { $remise = $tab[$i]['remise']; - echo ('<tr><td>'.$tab[$i]['ref'].'</td><td>'.$tab[$i]['label'].'</td><td>'.$tab[$i]['qte'].'</td><td>'.$tab[$i]['remise_percent'].'</td><td class="total">'.price2num($tab[$i]['total_ht'],'MT').' '.$conf->monnaie.'</td></tr>'."\n"); + echo ('<tr><td>'.$tab[$i]['ref'].'</td><td>'.$tab[$i]['label'].'</td><td>'.$tab[$i]['qte'].'</td><td>'.$tab[$i]['remise_percent'].'</td><td class="total">'.price2num($tab[$i]['total_ht'],'MT').' '.$conf->currency.'</td></tr>'."\n"); } ?> @@ -138,9 +138,9 @@ print $object->ref; <table class="totaux"> <?php -echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalHT").'</th><td nowrap="nowrap">'.price2num($obj_facturation->prix_total_ht(),'MT')." ".$conf->monnaie."</td></tr>\n"; -echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalVAT").'</th><td nowrap="nowrap">'.price2num($obj_facturation->montant_tva(),'MT')." ".$conf->monnaie."</td></tr>\n"; -echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalTTC").'</th><td nowrap="nowrap">'.price2num($obj_facturation->prix_total_ttc(),'MT')." ".$conf->monnaie."</td></tr>\n"; +echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalHT").'</th><td nowrap="nowrap">'.price2num($obj_facturation->prix_total_ht(),'MT')." ".$conf->currency."</td></tr>\n"; +echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalVAT").'</th><td nowrap="nowrap">'.price2num($obj_facturation->montant_tva(),'MT')." ".$conf->currency."</td></tr>\n"; +echo '<tr><th nowrap="nowrap">'.$langs->trans("TotalTTC").'</th><td nowrap="nowrap">'.price2num($obj_facturation->prix_total_ttc(),'MT')." ".$conf->currency."</td></tr>\n"; ?> </table> diff --git a/htdocs/cashdesk/tpl/validation1.tpl.php b/htdocs/cashdesk/tpl/validation1.tpl.php index 3938139b2f1cd0adfcef627491cf2d9654e78c9b..ea47038d24c60aafa134f1339b98039c46038b2a 100644 --- a/htdocs/cashdesk/tpl/validation1.tpl.php +++ b/htdocs/cashdesk/tpl/validation1.tpl.php @@ -22,12 +22,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. <table class="table_resume"> <tr><td class="resume_label"><?php echo $langs->trans("Invoice"); ?></td><td><?php echo $obj_facturation->num_facture(); ?></td></tr> - <tr><td class="resume_label"><?php echo $langs->trans("TotalHT"); ?></td><td><?php echo price2num($obj_facturation->prix_total_ht(),'MT').' '.$conf->monnaie; ?></td></tr> + <tr><td class="resume_label"><?php echo $langs->trans("TotalHT"); ?></td><td><?php echo price2num($obj_facturation->prix_total_ht(),'MT').' '.$conf->currency; ?></td></tr> <?php // Affichage de la tva par taux if ( $obj_facturation->montant_tva() ) { - echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.price2num($obj_facturation->montant_tva(),'MT').' '.$conf->monnaie.'</td></tr>'); + echo ('<tr><td class="resume_label">'.$langs->trans("VAT").'</td><td>'.price2num($obj_facturation->montant_tva(),'MT').' '.$conf->currency.'</td></tr>'); } else @@ -37,7 +37,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. } ?> - <tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price2num($obj_facturation->prix_total_ttc(),'MT').' '.$conf->monnaie; ?></td></tr> + <tr><td class="resume_label"><?php echo $langs->trans("TotalTTC"); ?> </td><td><?php echo price2num($obj_facturation->prix_total_ttc(),'MT').' '.$conf->currency; ?></td></tr> <tr><td class="resume_label"><?php echo $langs->trans("PaymentMode"); ?> </td><td> <?php switch ($obj_facturation->mode_reglement()) @@ -81,14 +81,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. } else { - echo ('<tr><td class="resume_label">'.$langs->trans("Received").'</td><td>'.price2num($obj_facturation->montant_encaisse(),'MT').' '.$conf->monnaie.'</td></tr>'); + echo ('<tr><td class="resume_label">'.$langs->trans("Received").'</td><td>'.price2num($obj_facturation->montant_encaisse(),'MT').' '.$conf->currency.'</td></tr>'); } // Affichage du montant rendu (reglement en especes) if ( $obj_facturation->montant_rendu() ) { - echo ('<tr><td class="resume_label">'.$langs->trans("Change").'</td><td>'.price2num($obj_facturation->montant_rendu(),'MT').' '.$conf->monnaie.'</td></tr>'); + echo ('<tr><td class="resume_label">'.$langs->trans("Change").'</td><td>'.price2num($obj_facturation->montant_rendu(),'MT').' '.$conf->currency.'</td></tr>'); } diff --git a/htdocs/cashdesk/validation_verif.php b/htdocs/cashdesk/validation_verif.php index 41d83303cb825972f818ee5a45fe8339536f3fce..da88e1b3d9cc33a56343a73d325b62e9be82fc9d 100644 --- a/htdocs/cashdesk/validation_verif.php +++ b/htdocs/cashdesk/validation_verif.php @@ -114,8 +114,8 @@ switch ($action) $mode_reglement_id = dol_getIdFromCode($db,'LIQ','c_paiement'); $cond_reglement_id = 0; $note .= $langs->trans("Cash")."\n"; - $note .= $langs->trans("Received").' : '.$obj_facturation->montant_encaisse()." ".$conf->monnaie."\n"; - $note .= $langs->trans("Rendu").' : '.$obj_facturation->montant_rendu()." ".$conf->monnaie."\n"; + $note .= $langs->trans("Received").' : '.$obj_facturation->montant_encaisse()." ".$conf->currency."\n"; + $note .= $langs->trans("Rendu").' : '.$obj_facturation->montant_rendu()." ".$conf->currency."\n"; $note .= "\n"; $note .= '--------------------------------------'."\n\n"; break; diff --git a/htdocs/comm/addpropal.php b/htdocs/comm/addpropal.php index 54a24e1c44b99fc9af698f5c873d5ab31fadfcf1..7bd028a76084609fee7516f7f3c3d3812c0aba87 100644 --- a/htdocs/comm/addpropal.php +++ b/htdocs/comm/addpropal.php @@ -146,7 +146,7 @@ if ($_GET["action"] == 'create') else print $langs->trans("CompanyHasNoRelativeDiscount"); $absolute_discount=$soc->getAvailableDiscounts(); print '. '; - if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->monnaie)); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print '</td></tr>'; diff --git a/htdocs/comm/fiche.php b/htdocs/comm/fiche.php index aaf89d6fd2153fd9841db34e567a84d50ed62d50..98a8a6188e3b64bff6b7b0fbfad4af19a1b978a7 100644 --- a/htdocs/comm/fiche.php +++ b/htdocs/comm/fiche.php @@ -361,7 +361,7 @@ if ($id > 0) print '<td colspan="3">'; $amount_discount=$object->getAvailableDiscounts(); if ($amount_discount < 0) dol_print_error($db,$object->error); - if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount).'</a> '.$langs->trans("Currency".$conf->monnaie); + if ($amount_discount > 0) print '<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$object->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$object->id).'">'.price($amount_discount).'</a> '.$langs->trans("Currency".$conf->currency); else print $langs->trans("DiscountNone"); print '</td>'; print '</tr>'; diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 8bd5bd98f8d09d8f9b3a0e6b24d9511496afa575..dc212fe38dbcfc697bab2db37e5b0b7ea337d043 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -720,7 +720,7 @@ if ($_POST['action'] == "addline" && $user->rights->propale->creer) if ($price_min && (price2num($pu_ht)*(1-price2num($_POST['remise_percent'])/100) < price2num($price_min))) { - $mesg = '<div class="error">'.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->monnaie)).'</div>' ; + $mesg = '<div class="error">'.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).'</div>' ; } else { @@ -810,7 +810,7 @@ if ($_POST['action'] == 'updateligne' && $user->rights->propale->creer && $_POST } if ($productid && $price_min && (price2num($up_ht)*(1-price2num($_POST['remise_percent'])/100) < price2num($price_min))) { - $mesg = '<div class="error">'.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->monnaie)).'</div>' ; + $mesg = '<div class="error">'.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).'</div>' ; } else { @@ -1140,7 +1140,7 @@ if ($id > 0 || ! empty($ref)) { if ($object->statut > 0) { - print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie)); + print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); } else { @@ -1152,7 +1152,7 @@ if ($id > 0 || ! empty($ref)) } if ($absolute_creditnote) { - print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie)).'. '; + print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)).'. '; } if (! $absolute_discount && ! $absolute_creditnote) print $langs->trans("CompanyHasNoAbsoluteDiscount").'.'; print '</td></tr>'; @@ -1412,12 +1412,12 @@ if ($id > 0 || ! empty($ref)) // Amount HT print '<tr><td height="10">'.$langs->trans('AmountHT').'</td>'; print '<td align="right" colspan="2" nowrap><b>'.price($object->total_ht).'</b></td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; // Amount VAT print '<tr><td height="10">'.$langs->trans('AmountVAT').'</td>'; print '<td align="right" colspan="2" nowrap>'.price($object->total_tva).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; // Amount Local Taxes if ($mysoc->pays_code=='ES') @@ -1426,20 +1426,20 @@ if ($id > 0 || ! empty($ref)) { print '<tr><td height="10">'.$langs->transcountry("AmountLT1",$mysoc->pays_code).'</td>'; print '<td align="right" colspan="2" nowrap>'.price($object->total_localtax1).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; } if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF { print '<tr><td height="10">'.$langs->transcountry("AmountLT2",$mysoc->pays_code).'</td>'; print '<td align="right" colspan="2" nowrap>'.price($object->total_localtax2).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; } } // Amount TTC print '<tr><td height="10">'.$langs->trans('AmountTTC').'</td>'; print '<td align="right" colspan="2" nowrap>'.price($object->total_ttc).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; // Statut print '<tr><td height="10">'.$langs->trans('Status').'</td><td align="left" colspan="3">'.$object->getLibStatut(4).'</td></tr>'; diff --git a/htdocs/comm/propal/apercu.php b/htdocs/comm/propal/apercu.php index 59213b04692431a8e79b78c76001c0f25c6402e6..56a0c9c06dec64f99c269866e9e1f5965e9f6c06 100644 --- a/htdocs/comm/propal/apercu.php +++ b/htdocs/comm/propal/apercu.php @@ -101,7 +101,7 @@ if ($id > 0 || ! empty($ref)) else print $langs->trans("CompanyHasNoRelativeDiscount"); $absolute_discount=$soc->getAvailableDiscounts(); print '. '; - if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie)); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->currency)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print '</td></tr>'; @@ -171,7 +171,7 @@ if ($id > 0 || ! empty($ref)) print '<tr><td height="10">'.$langs->trans('AmountHT').'</td>'; print '<td align="right" colspan="2"><b>'.price($object->price).'</b></td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; print '</table>'; } else diff --git a/htdocs/comm/propal/note.php b/htdocs/comm/propal/note.php index 646cdb413581f1874ae82bd9cc003e67870a008d..80ab342df3f49c14c37d1e1d32be3f09072c4269 100644 --- a/htdocs/comm/propal/note.php +++ b/htdocs/comm/propal/note.php @@ -141,7 +141,7 @@ if ($id > 0 || ! empty($ref)) else print $langs->trans("CompanyHasNoRelativeDiscount"); $absolute_discount=$societe->getAvailableDiscounts(); print '. '; - if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->monnaie)); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print '</td></tr>'; diff --git a/htdocs/comm/remx.php b/htdocs/comm/remx.php index 6ee7fc1f16d8ee70f80d0e489ff634c71ee73de2..8f26a58463e1de84d71821dc2c8982ccc453830b 100644 --- a/htdocs/comm/remx.php +++ b/htdocs/comm/remx.php @@ -258,17 +258,17 @@ if ($socid > 0) } print '<tr><td width="38%">'.$langs->trans("CustomerAbsoluteDiscountAllUsers").'</td>'; - print '<td>'.$remise_all.' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("HT").'</td></tr>'; + print '<td>'.$remise_all.' '.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>'; print '<tr><td>'.$langs->trans("CustomerAbsoluteDiscountMy").'</td>'; - print '<td>'.$remise_user.' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("HT").'</td></tr>'; + print '<td>'.$remise_user.' '.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").'</td></tr>'; print '</table>'; print '<br>'; print_fiche_titre($langs->trans("NewGlobalDiscount"),'',''); print '<table class="border" width="100%">'; print '<tr><td width="38%">'.$langs->trans("AmountHT").'</td>'; - print '<td><input type="text" size="5" name="amount_ht" value="'.$_POST["amount_ht"].'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td><input type="text" size="5" name="amount_ht" value="'.$_POST["amount_ht"].'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>'; print '<tr><td width="38%">'.$langs->trans("VAT").'</td>'; print '<td>'; print $form->load_tva('tva_tx',GETPOST('tva_tx'),'',$mysoc,''); @@ -392,7 +392,7 @@ if ($socid > 0) array('type' => 'text', 'name' => 'amount_ttc_2', 'label' => $langs->trans("AmountTTC").' 2', 'value' => $amount2, 'size' => '5') ); $langs->load("dict"); - $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$objsoc->id.'&remid='.$obj->rowid, $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount',price($obj->amount_ttc),$langs->transnoentities("Currency".$conf->monnaie)), 'confirm_split', $formquestion, 0, 0); + $ret=$form->form_confirm($_SERVER["PHP_SELF"].'?id='.$objsoc->id.'&remid='.$obj->rowid, $langs->trans('SplitDiscount'), $langs->trans('ConfirmSplitDiscount',price($obj->amount_ttc),$langs->transnoentities("Currency".$conf->currency)), 'confirm_split', $formquestion, 0, 0); print '</td>'; print '</tr>'; } diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php index a76fd8c27863b545113e8bff2640d61210a4fe2a..70561e6b8d4ca582aeb217ab318dacc537b74294 100644 --- a/htdocs/commande/apercu.php +++ b/htdocs/commande/apercu.php @@ -191,7 +191,7 @@ if ($id > 0 || ! empty($ref)) // partie Gauche print '<tr><td height="10">'.$langs->trans('AmountHT').'</td>'; print '<td align="right" colspan="1"><b>'.price($object->total_ht).'</b></td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; print '</table>'; } else diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php index f8df322e99a0ecbdd7211b6480426cf38fca0ae6..1b02201d072a9e6d115456dd3681267045a8cc0a 100644 --- a/htdocs/commande/fiche.php +++ b/htdocs/commande/fiche.php @@ -573,7 +573,7 @@ if ($action == 'addline' && $user->rights->commande->creer) if($price_min && (price2num($pu_ht)*(1-price2num($_POST['remise_percent'])/100) < price2num($price_min))) { //print "CantBeLessThanMinPrice ".$up_ht." - ".GETPOST('remise_percent')." - ".$product->price_min; - $mesg = '<div class="error">'.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->monnaie)).'</div>' ; + $mesg = '<div class="error">'.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).'</div>' ; } else { @@ -676,7 +676,7 @@ if ($action == 'updateligne' && $user->rights->commande->creer && $_POST['save'] } if ($price_min && GETPOST('productid') && (price2num($up_ht)*(1-price2num($_POST['remise_percent'])/100) < price2num($price_min))) { - $mesg = '<div class="error">'.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->monnaie)).'</div>' ; + $mesg = '<div class="error">'.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).'</div>' ; $result=-1; } @@ -1241,7 +1241,7 @@ if ($action == 'create' && $user->rights->commande->creer) else print $langs->trans("CompanyHasNoRelativeDiscount"); print '. '; $absolute_discount=$soc->getAvailableDiscounts(); - if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->monnaie)); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print '</td></tr>'; @@ -1643,7 +1643,7 @@ else { if ($object->statut > 0) { - print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie)); + print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); } else { @@ -1655,7 +1655,7 @@ else } if ($absolute_creditnote) { - print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie)).'. '; + print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)).'. '; } if (! $absolute_discount && ! $absolute_creditnote) print $langs->trans("CompanyHasNoAbsoluteDiscount").'.'; print '</td></tr>'; @@ -1846,11 +1846,11 @@ else // Total HT print '<tr><td>'.$langs->trans('AmountHT').'</td>'; print '<td align="right"><b>'.price($object->total_ht).'</b></td>'; - print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Total TVA print '<tr><td>'.$langs->trans('AmountVAT').'</td><td align="right">'.price($object->total_tva).'</td>'; - print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Amount Local Taxes if ($mysoc->pays_code=='ES') @@ -1859,19 +1859,19 @@ else { print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->pays_code).'</td>'; print '<td align="right">'.price($object->total_localtax1).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; } if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF { print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->pays_code).'</td>'; print '<td align="right">'.price($object->total_localtax2).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; } } // Total TTC print '<tr><td>'.$langs->trans('AmountTTC').'</td><td align="right">'.price($object->total_ttc).'</td>'; - print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Statut print '<tr><td>'.$langs->trans('Status').'</td>'; diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php index 346887d312d7de48cf964246cee3f18b8a6b18d7..d482be44d349150f54391df06a3225b03c6d9be6 100644 --- a/htdocs/compta/bank/bankid_fr.php +++ b/htdocs/compta/bank/bankid_fr.php @@ -160,7 +160,7 @@ if (($_GET["id"] || $_GET["ref"]) && $_GET["action"] != 'edit') print '<tr><td valign="top">'.$langs->trans("Currency").'</td>'; print '<td colspan="3">'; $selectedcode=$account->account_currency_code; - if (! $selectedcode) $selectedcode=$conf->monnaie; + if (! $selectedcode) $selectedcode=$conf->currency; print $langs->trans("Currency".$selectedcode); print '</td></tr>'; @@ -295,7 +295,7 @@ if ($_GET["id"] && $_GET["action"] == 'edit' && $user->rights->banque->configure print '<tr><td valign="top">'.$langs->trans("Currency").'</td>'; print '<td colspan="3">'; $selectedcode=$account->account_currency_code; - if (! $selectedcode) $selectedcode=$conf->monnaie; + if (! $selectedcode) $selectedcode=$conf->currency; print $langs->trans("Currency".$selectedcode); print '</td></tr>'; diff --git a/htdocs/compta/bank/fiche.php b/htdocs/compta/bank/fiche.php index 2ba2d61417ca73b56c620300d331f5a09bec8509..28d1bd7b4a4938486411eb8fc0a0c9df400afde4 100644 --- a/htdocs/compta/bank/fiche.php +++ b/htdocs/compta/bank/fiche.php @@ -244,10 +244,10 @@ if ($action == 'create') print '<tr><td valign="top" class="fieldrequired">'.$langs->trans("Currency").'</td>'; print '<td colspan="3">'; $selectedcode=$account->account_currency_code; - if (! $selectedcode) $selectedcode=$conf->monnaie; + if (! $selectedcode) $selectedcode=$conf->currency; $form->select_currency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code'); - //print $langs->trans("Currency".$conf->monnaie); - //print '<input type="hidden" name="account_currency_code" value="'.$conf->monnaie.'">'; + //print $langs->trans("Currency".$conf->currency); + //print '<input type="hidden" name="account_currency_code" value="'.$conf->currency.'">'; print '</td></tr>'; // Status @@ -386,7 +386,7 @@ else print '<tr><td valign="top">'.$langs->trans("Currency").'</td>'; print '<td colspan="3">'; $selectedcode=$account->account_currency_code; - if (! $selectedcode) $selectedcode=$conf->monnaie; + if (! $selectedcode) $selectedcode=$conf->currency; print $langs->trans("Currency".$selectedcode); print '</td></tr>'; @@ -517,10 +517,10 @@ else print '</td>'; print '<td colspan="3">'; $selectedcode=$account->account_currency_code; - if (! $selectedcode) $selectedcode=$conf->monnaie; + if (! $selectedcode) $selectedcode=$conf->currency; $form->select_currency((isset($_POST["account_currency_code"])?$_POST["account_currency_code"]:$selectedcode), 'account_currency_code'); - //print $langs->trans("Currency".$conf->monnaie); - //print '<input type="hidden" name="account_currency_code" value="'.$conf->monnaie.'">'; + //print $langs->trans("Currency".$conf->currency); + //print '<input type="hidden" name="account_currency_code" value="'.$conf->currency.'">'; print '</td></tr>'; // Status diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php index 0f0e16af275e687f2632bc9045516fe25507f447..f124b0352454356cff07e8e371cd10eb27d491ec 100644 --- a/htdocs/compta/bank/ligne.php +++ b/htdocs/compta/bank/ligne.php @@ -478,7 +478,7 @@ if ($result) if ($user->rights->banque->modifier) { print '<td colspan="3">'; - print '<input name="amount" class="flat" size="10" '.($objp->rappro?' disabled="disabled"':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$conf->monnaie); + print '<input name="amount" class="flat" size="10" '.($objp->rappro?' disabled="disabled"':'').' value="'.price($objp->amount).'"> '.$langs->trans("Currency".$conf->currency); print '</td>'; } else diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php index ed05f6e067b38b2c05a6e9b6a50ca1634f3030cd..6b5771a2becd8b9b913d21c85e51551d8ef350a9 100644 --- a/htdocs/compta/bank/virement.php +++ b/htdocs/compta/bank/virement.php @@ -106,7 +106,7 @@ if ($_POST["action"] == 'add') if (! $error) { $mesg.="<div class=\"ok\">"; - $mesg.=$langs->trans("TransferFromToDone","<a href=\"account.php?account=".$accountfrom->id."\">".$accountfrom->label."</a>","<a href=\"account.php?account=".$accountto->id."\">".$accountto->label."</a>",$amount,$langs->transnoentities("Currency".$conf->monnaie)); + $mesg.=$langs->trans("TransferFromToDone","<a href=\"account.php?account=".$accountfrom->id."\">".$accountfrom->label."</a>","<a href=\"account.php?account=".$accountto->id."\">".$accountto->label."</a>",$amount,$langs->transnoentities("Currency".$conf->currency)); $mesg.="</div>"; $db->commit(); } diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php index 4b41aabd622b135b27e1079cc4903e064d27fa5c..ea41649d3bc905671ca87b40afcf44bd30912ac1 100644 --- a/htdocs/compta/dons/fiche.php +++ b/htdocs/compta/dons/fiche.php @@ -280,7 +280,7 @@ if ($_GET["action"] == 'create') print "</tr>"; // Amount - print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" value="'.$_POST["amount"].'" size="10"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" value="'.$_POST["amount"].'" size="10"> '.$langs->trans("Currency".$conf->currency).'</td></tr>'; print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>"; print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1); @@ -365,7 +365,7 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit') print "</tr>"; // Amount - print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.$don->amount.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print "<tr>".'<td class="fieldrequired">'.$langs->trans("Amount").'</td><td><input type="text" name="amount" size="10" value="'.$don->amount.'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>'; print '<tr><td class="fieldrequired">'.$langs->trans("PublicDonation")."</td><td>"; print $form->selectyesno("public",1,1); @@ -455,7 +455,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit') print '<td rowspan="'.$nbrows.'" valign="top" width="50%">'.$langs->trans("Comments").' :<br>'; print nl2br($don->note).'</td></tr>'; - print "<tr>".'<td>'.$langs->trans("Amount").'</td><td>'.price($don->amount).' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print "<tr>".'<td>'.$langs->trans("Amount").'</td><td>'.price($don->amount).' '.$langs->trans("Currency".$conf->currency).'</td></tr>'; print "<tr><td>".$langs->trans("PublicDonation")."</td><td>"; print yn($don->public); diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php index 9b4b206bd551b84cd4ae29c2d079769b1133ae45..44926e4ecf20ab3af7ae5eba04c2c218879f7bb7 100644 --- a/htdocs/compta/facture.php +++ b/htdocs/compta/facture.php @@ -1011,7 +1011,7 @@ if (($action == 'addline' || $action == 'addline_predef') && $user->rights->fact { if($price_min && (price2num($pu_ht)*(1-price2num($_POST['remise_percent'])/100) < price2num($price_min))) { - $object->error = $langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->monnaie)); + $object->error = $langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)); $result = -1 ; } else @@ -1118,7 +1118,7 @@ if ($action == 'updateligne' && $user->rights->facture->creer && $_POST['save'] if ($object->type!=2 && $price_min && GETPOST('productid') && (price2num($up_ht)*(1-price2num(GETPOST('remise_percent'))/100) < price2num($price_min))) { //print "CantBeLessThanMinPrice ".$up_ht." - ".GETPOST('remise_percent')." - ".$product->price_min; - $mesg = '<div class="error">'.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->monnaie)).'</div>'; + $mesg = '<div class="error">'.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).'</div>'; $result=-1; } @@ -1726,7 +1726,7 @@ if ($action == 'create') print ' <a href="'.DOL_URL_ROOT.'/comm/remise.php?id='.$soc->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$soc->id.'&action='.$action.'&origin='.GETPOST('origin').'&originid='.GETPOST('originid')).'">('.$langs->trans("EditRelativeDiscount").')</a>'; print '. '; print '<br>'; - if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",'<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$soc->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$soc->id.'&action='.$action.'&origin='.GETPOST('origin').'&originid='.GETPOST('originid')).'">'.price($absolute_discount).'</a>',$langs->trans("Currency".$conf->monnaie)); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",'<a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$soc->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$soc->id.'&action='.$action.'&origin='.GETPOST('origin').'&originid='.GETPOST('originid')).'">'.price($absolute_discount).'</a>',$langs->trans("Currency".$conf->currency)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print ' <a href="'.DOL_URL_ROOT.'/comm/remx.php?id='.$soc->id.'&backtopage='.urlencode($_SERVER["PHP_SELF"].'?socid='.$soc->id.'&action='.$action.'&origin='.GETPOST('origin').'&originid='.GETPOST('originid')).'">('.$langs->trans("EditGlobalDiscounts").')</a>'; print '.'; @@ -2064,8 +2064,8 @@ else $close[$i]['label']=$langs->trans("ConfirmClassifyPaidPartiallyReasonBadCustomerDesc");$i++; // Texte $i=0; - $close[$i]['reason']=$form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonDiscountVat",$resteapayer,$langs->trans("Currency".$conf->monnaie)),$close[$i]['label'],1);$i++; - $close[$i]['reason']=$form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer",$resteapayer,$langs->trans("Currency".$conf->monnaie)),$close[$i]['label'],1);$i++; + $close[$i]['reason']=$form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonDiscountVat",$resteapayer,$langs->trans("Currency".$conf->currency)),$close[$i]['label'],1);$i++; + $close[$i]['reason']=$form->textwithpicto($langs->transnoentities("ConfirmClassifyPaidPartiallyReasonBadCustomer",$resteapayer,$langs->trans("Currency".$conf->currency)),$close[$i]['label'],1);$i++; // arrayreasons[code]=reason foreach($close as $key => $val) { @@ -2249,19 +2249,19 @@ else { if ($object->statut == 0) { - print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie)); + print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); print '. '; } else { if ($object->statut < 1 || $object->type == 2 || $object->type == 3) { - $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie)); + $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); print '<br>'.$text.'.<br>'; } else { - $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie)); + $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); $text2=$langs->trans("AbsoluteDiscountUse"); print $form->textwithpicto($text,$text2); } @@ -2290,12 +2290,12 @@ else { if ($object->statut == 0 && $object->type != 3) { - $text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie)); + $text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)); print $form->textwithpicto($text,$langs->trans("CreditNoteDepositUse")); } else { - print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie)).'.'; + print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)).'.'; } } else @@ -2588,9 +2588,9 @@ else // Amount print '<tr><td>'.$langs->trans('AmountHT').'</td>'; print '<td align="right" colspan="2" nowrap>'.price($object->total_ht).'</td>'; - print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; print '<tr><td>'.$langs->trans('AmountVAT').'</td><td align="right" colspan="2" nowrap>'.price($object->total_tva).'</td>'; - print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Amount Local Taxes if ($mysoc->pays_code=='ES') @@ -2599,18 +2599,18 @@ else { print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->pays_code).'</td>'; print '<td align="right" colspan="2" nowrap>'.price($object->total_localtax1).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; } if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF { print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->pays_code).'</td>'; print '<td align="right" colspan="2" nowrap>'.price($object->total_localtax2).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; } } print '<tr><td>'.$langs->trans('AmountTTC').'</td><td align="right" colspan="2" nowrap>'.price($object->total_ttc).'</td>'; - print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Statut print '<tr><td>'.$langs->trans('Status').'</td>'; diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php index b8f76d5c24b0c90c64facdf6cb96f1b40022cf6e..6c07791e2721bea161ed6197184471318e83dbdb 100644 --- a/htdocs/compta/facture/apercu.php +++ b/htdocs/compta/facture/apercu.php @@ -148,19 +148,19 @@ if ($id > 0 || ! empty($ref)) { if ($object->statut == 0) { - print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie)); + print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); print '. '; } else { if ($object->statut < 1 || $object->type == 2 || $object->type == 3) { - $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie)); + $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); print '<br>'.$text.'.<br>'; } else { - $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie)); + $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); $text2=$langs->trans("AbsoluteDiscountUse"); print $form->textwithpicto($text,$text2); } @@ -190,12 +190,12 @@ if ($id > 0 || ! empty($ref)) { if ($object->statut == 0 && $object->type != 3) { - $text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie)); + $text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)); print $form->textwithpicto($text,$langs->trans("CreditNoteDepositUse")); } else { - print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie)).'.'; + print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)).'.'; } } else @@ -344,12 +344,12 @@ if ($id > 0 || ! empty($ref)) print '<tr><td>'.$langs->trans("AmountHT").'</td>'; print '<td align="right" colspan="2"><b>'.price($object->total_ht).'</b></td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; print '<tr><td>'.$langs->trans('AmountVAT').'</td><td align="right" colspan="2" nowrap>'.price($object->total_tva).'</td>'; - print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; print '<tr><td>'.$langs->trans('AmountTTC').'</td><td align="right" colspan="2" nowrap>'.price($object->total_ttc).'</td>'; - print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Statut print '<tr><td>'.$langs->trans('Status').'</td><td align="left" colspan="3">'.($object->getLibStatut(4,$totalpaye)).'</td></tr>'; diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php index e227ff8ae7fc82058e62910d9594d4fb9bd665fc..4bcf25ece22173f1b3d4a7a8528e54c937bffe6e 100644 --- a/htdocs/compta/facture/fiche-rec.php +++ b/htdocs/compta/facture/fiche-rec.php @@ -373,12 +373,12 @@ else print '<tr><td>'.$langs->trans("AmountHT").'</td>'; print '<td align="right" colspan="2"><b>'.price($fac->total_ht).'</b></td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; print '<tr><td>'.$langs->trans("AmountVAT").'</td><td align="right" colspan="2">'.price($fac->total_tva).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; print '<tr><td>'.$langs->trans("AmountTTC").'</td><td align="right" colspan="2">'.price($fac->total_ttc).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; if ($fac->note) { print '<tr><td colspan="5">'.$langs->trans("Note").' : '.nl2br($fac->note)."</td></tr>"; diff --git a/htdocs/compta/facture/prelevement.php b/htdocs/compta/facture/prelevement.php index 8291b5ab37ebcf51a691e14ddde4f4746a4e0d92..100d8e31b3274b59e038327329d199e46f04c887 100644 --- a/htdocs/compta/facture/prelevement.php +++ b/htdocs/compta/facture/prelevement.php @@ -214,18 +214,18 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"]) { if ($fac->statut == 0) { - print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie)).'. '; + print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)).'. '; } else { if ($fac->statut < 1 || $fac->type == 2 || $fac->type == 3) { - $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie)); + $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); print '<br>'.$text.'.<br>'; } else { - $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie)); + $text=$langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); $text2=$langs->trans("AbsoluteDiscountUse"); print $form->textwithpicto($text,$text2); } @@ -246,10 +246,10 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"]) { if ($fac->statut == 0 && $fac->type != 3) { - $text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie)); + $text=$langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)); print $form->textwithpicto($text,$langs->trans("CreditNoteDepositUse")); } - else print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie)).'.'; + else print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)).'.'; } else { @@ -361,9 +361,9 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"]) // Montants print '<tr><td>'.$langs->trans('AmountHT').'</td>'; print '<td align="right" colspan="2" nowrap>'.price($fac->total_ht).'</td>'; - print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; print '<tr><td>'.$langs->trans('AmountVAT').'</td><td align="right" colspan="2" nowrap>'.price($fac->total_tva).'</td>'; - print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Amount Local Taxes if ($mysoc->pays_code=='ES') @@ -372,18 +372,18 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"]) { print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->pays_code).'</td>'; print '<td align="right" colspan="2" nowrap>'.price($fac->total_localtax1).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; } if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF { print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->pays_code).'</td>'; print '<td align="right" colspan="2" nowrap>'.price($fac->total_localtax2).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; } } print '<tr><td>'.$langs->trans('AmountTTC').'</td><td align="right" colspan="2" nowrap>'.price($fac->total_ttc).'</td>'; - print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Statut print '<tr><td>'.$langs->trans('Status').'</td>'; diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php index 6eaccc3fa33c506389b2bd9c5167591a29e0d123..5d5604deb18e33674af6af688d60983076b8072d 100644 --- a/htdocs/compta/paiement.php +++ b/htdocs/compta/paiement.php @@ -598,7 +598,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie $preselectedchoice=$addwarning?'no':'yes'; print '<br>'; - $text=$langs->trans('ConfirmCustomerPayment',$totalpaiement,$langs->trans("Currency".$conf->monnaie)); + $text=$langs->trans('ConfirmCustomerPayment',$totalpaiement,$langs->trans("Currency".$conf->currency)); if (GETPOST('closepaidinvoices')) { $text.='<br>'.$langs->trans("AllCompletelyPayedInvoiceWillBeClosed"); diff --git a/htdocs/compta/paiement/fiche.php b/htdocs/compta/paiement/fiche.php index 7e6e9fe06ce9dc85de35222e8247c0cf5a9c47d4..5a8234c6970eae388bcb6ff5a13cff6c85184a1f 100644 --- a/htdocs/compta/paiement/fiche.php +++ b/htdocs/compta/paiement/fiche.php @@ -233,7 +233,7 @@ print $form->editfieldval("Numero",'num',$paiement->numero,$paiement,$paiement-> print '</td></tr>'; // Amount -print '<tr><td valign="top">'.$langs->trans('Amount').'</td><td colspan="3">'.price($paiement->montant).' '.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; +print '<tr><td valign="top">'.$langs->trans('Amount').'</td><td colspan="3">'.price($paiement->montant).' '.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Note print '<tr><td valign="top">'.$form->editfieldkey("Note",'note',$paiement->note,$paiement,$user->rights->facture->paiement).'</td><td colspan="3">'; diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php index 2e3d9df41dd8fdf4f439a90b1b1128375c9992e7..00ccd3034081007adc0f8df3ebf6848914053d4d 100755 --- a/htdocs/compta/paiement_charge.php +++ b/htdocs/compta/paiement_charge.php @@ -185,7 +185,7 @@ if ($_GET["action"] == 'create') print '<tr><td>'.$langs->trans("Label").'</td><td colspan="2">'.$charge->lib."</td></tr>\n"; print '<tr><td>'.$langs->trans("DateDue")."</td><td colspan=\"2\">".dol_print_date($charge->date_ech,'day')."</td></tr>\n"; - print '<tr><td>'.$langs->trans("AmountTTC")."</td><td colspan=\"2\"><b>".price($charge->amount).'</b> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<tr><td>'.$langs->trans("AmountTTC")."</td><td colspan=\"2\"><b>".price($charge->amount).'</b> '.$langs->trans("Currency".$conf->currency).'</td></tr>'; $sql = "SELECT sum(p.amount) as total"; $sql.= " FROM ".MAIN_DB_PREFIX."paiementcharge as p"; @@ -197,8 +197,8 @@ if ($_GET["action"] == 'create') $sumpaid = $obj->total; $db->free(); } - print '<tr><td>'.$langs->trans("AlreadyPaid").'</td><td colspan="2"><b>'.price($sumpaid).'</b> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; - print "<tr><td valign=\"top\">".$langs->trans("RemainderToPay")."</td><td colspan=\"3\"><b>".price($total - $sumpaid).'</b> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<tr><td>'.$langs->trans("AlreadyPaid").'</td><td colspan="2"><b>'.price($sumpaid).'</b> '.$langs->trans("Currency".$conf->currency).'</td></tr>'; + print "<tr><td valign=\"top\">".$langs->trans("RemainderToPay")."</td><td colspan=\"3\"><b>".price($total - $sumpaid).'</b> '.$langs->trans("Currency".$conf->currency).'</td></tr>'; print "<tr class=\"liste_titre\"><td colspan=\"3\">".$langs->trans("Payment").'</td>'; diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php index 6c4a53fbb5154f3df09f390f589349375dc82a78..ab14d509a850c9c316cbb47167e3743ac60aec81 100644 --- a/htdocs/compta/payment_sc/fiche.php +++ b/htdocs/compta/payment_sc/fiche.php @@ -182,7 +182,7 @@ print '<tr><td valign="top">'.$langs->trans('Mode').'</td><td colspan="3">'.$lan print '<tr><td valign="top">'.$langs->trans('Numero').'</td><td colspan="3">'.$paiement->num_paiement.'</td></tr>'; // Montant -print '<tr><td valign="top">'.$langs->trans('Amount').'</td><td colspan="3">'.price($paiement->amount).' '.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; +print '<tr><td valign="top">'.$langs->trans('Amount').'</td><td colspan="3">'.price($paiement->amount).' '.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Note diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php index 606bc3600f25536bf44249c3b76765afac20e720..9e9c71b390df45f92f2a6f49df68dd1b4925d13b 100644 --- a/htdocs/compta/prelevement/create.php +++ b/htdocs/compta/prelevement/create.php @@ -198,7 +198,7 @@ if ($resql) print $thirdpartystatic->getNomUrl(1,'customer'); print '</td>'; print '<td align="right">'; - print price($obj->total_ttc).' '.$langs->trans("Currency".$conf->monnaie); + print price($obj->total_ttc).' '.$langs->trans("Currency".$conf->currency); print '</td>'; // Date print '<td align="right">'; @@ -258,7 +258,7 @@ if ($result) print "</td>\n"; print '<td align="center">'.dol_print_date($db->jdate($obj->datec),'day')."</td>\n"; - print '<td align="right">'.price($obj->amount).' '.$langs->trans("Currency".$conf->monnaie)."</td>\n"; + print '<td align="right">'.price($obj->amount).' '.$langs->trans("Currency".$conf->currency)."</td>\n"; print "</tr>\n"; $i++; diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php index a379d7a57916f2d052fd891459f75dd5e76aa90e..3a9b51b7fc6af484cf7e9c106f66d228851670eb 100644 --- a/htdocs/compta/propal.php +++ b/htdocs/compta/propal.php @@ -168,7 +168,7 @@ if ($id > 0 || ! empty($ref)) else print $langs->trans("CompanyHasNoRelativeDiscount"); $absolute_discount=$societe->getAvailableDiscounts(); print '. '; - if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->monnaie)); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print '</td></tr>'; @@ -289,10 +289,10 @@ if ($id > 0 || ! empty($ref)) // Amount print '<tr><td height="10">'.$langs->trans('AmountHT').'</td>'; print '<td align="right" colspan="2"><b>'.price($object->total_ht).'</b></td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; print '<tr><td height="10">'.$langs->trans('AmountVAT').'</td><td align="right" colspan="2">'.price($object->total_tva).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; // Amount Local Taxes if ($mysoc->pays_code=='ES') @@ -301,19 +301,19 @@ if ($id > 0 || ! empty($ref)) { print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->pays_code).'</td>'; print '<td align="right" colspan="2">'.price($object->total_localtax1).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; } if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF { print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->pays_code).'</td>'; print '<td align="right" colspan="2">'.price($object->total_localtax2).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; } } print '<tr><td height="10">'.$langs->trans('AmountTTC').'</td><td align="right" colspan="2">'.price($object->total_ttc).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; // Statut diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php index 565f5a933bdd3371b5ac10836b56e1c25e17bc50..c45c1168c9b9fc90f38bc78c6a483d5e5eacf157 100644 --- a/htdocs/compta/sociales/charges.php +++ b/htdocs/compta/sociales/charges.php @@ -351,7 +351,7 @@ if ($chid > 0) print '<a href="'.DOL_URL_ROOT.'/compta/payment_sc/fiche.php?id='.$objp->rowid.'">'.img_object($langs->trans("Payment"),"payment").'</a> '; print dol_print_date($db->jdate($objp->dp),'day')."</td>\n"; print "<td>".$objp->paiement_type.' '.$objp->num_paiement."</td>\n"; - print '<td align="right">'.price($objp->amount)."</td><td> ".$langs->trans("Currency".$conf->monnaie)."</td>\n"; + print '<td align="right">'.price($objp->amount)."</td><td> ".$langs->trans("Currency".$conf->currency)."</td>\n"; print "</tr>"; $totalpaye += $objp->amount; $i++; @@ -359,13 +359,13 @@ if ($chid > 0) if ($cha->paye == 0) { - print "<tr><td colspan=\"2\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\"><b>".price($totalpaye)."</b></td><td> ".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n"; - print "<tr><td colspan=\"2\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\" bgcolor=\"#d0d0d0\">".price($cha->amount)."</td><td bgcolor=\"#d0d0d0\"> ".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n"; + print "<tr><td colspan=\"2\" align=\"right\">".$langs->trans("AlreadyPaid")." :</td><td align=\"right\"><b>".price($totalpaye)."</b></td><td> ".$langs->trans("Currency".$conf->currency)."</td></tr>\n"; + print "<tr><td colspan=\"2\" align=\"right\">".$langs->trans("AmountExpected")." :</td><td align=\"right\" bgcolor=\"#d0d0d0\">".price($cha->amount)."</td><td bgcolor=\"#d0d0d0\"> ".$langs->trans("Currency".$conf->currency)."</td></tr>\n"; $resteapayer = $cha->amount - $totalpaye; print "<tr><td colspan=\"2\" align=\"right\">".$langs->trans("RemainderToPay")." :</td>"; - print "<td align=\"right\" bgcolor=\"#f0f0f0\"><b>".price($resteapayer)."</b></td><td bgcolor=\"#f0f0f0\"> ".$langs->trans("Currency".$conf->monnaie)."</td></tr>\n"; + print "<td align=\"right\" bgcolor=\"#f0f0f0\"><b>".price($resteapayer)."</b></td><td bgcolor=\"#f0f0f0\"> ".$langs->trans("Currency".$conf->currency)."</td></tr>\n"; } print "</table>"; $db->free($resql); diff --git a/htdocs/compta/stats/prev.php b/htdocs/compta/stats/prev.php index 7a37369c55feabf6ef30343a1f87eb426080c815..0b3e6e6bdcf84d6592ac78b4c27053f7a8bcbedb 100644 --- a/htdocs/compta/stats/prev.php +++ b/htdocs/compta/stats/prev.php @@ -56,7 +56,7 @@ function pt ($db, $sql, $title) { $total = $total + $obj->amount; $i++; } - print "<tr class=\"total\"><td colspan=\"2\" align=\"right\"><b>".$langs->trans("TotalHT").": ".price($total)."</b> ".$langs->trans("Currency".$conf->monnaie)."</td></tr>"; + print "<tr class=\"total\"><td colspan=\"2\" align=\"right\"><b>".$langs->trans("TotalHT").": ".price($total)."</b> ".$langs->trans("Currency".$conf->currency)."</td></tr>"; $db->free(); } diff --git a/htdocs/contrat/contact.php b/htdocs/contrat/contact.php index 938010289ee96ef7493b3ae1ea83dcbd8d243fa3..cee7fd453531880618db6ef22102a55214729d9f 100644 --- a/htdocs/contrat/contact.php +++ b/htdocs/contrat/contact.php @@ -157,7 +157,7 @@ if ($id > 0) else print $langs->trans("CompanyHasNoRelativeDiscount"); $absolute_discount=$contrat->societe->getAvailableDiscounts(); print '. '; - if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie)); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->currency)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print '</td></tr>'; diff --git a/htdocs/contrat/fiche.php b/htdocs/contrat/fiche.php index 33496cef4a0eae8afa45e849e92d4af2f648a784..286a5239b233404ceeffaeb1e7829bb6762dc0bb 100644 --- a/htdocs/contrat/fiche.php +++ b/htdocs/contrat/fiche.php @@ -290,7 +290,7 @@ if ($action == 'addline' && $user->rights->contrat->creer) if($price_min && (price2num($pu_ht)*(1-price2num($_POST['remise_percent'])/100) < price2num($price_min))) { - $object->error = $langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->monnaie)); + $object->error = $langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)); $result = -1 ; } else @@ -510,7 +510,7 @@ if ($action == 'create') else print $langs->trans("CompanyHasNoRelativeDiscount"); $absolute_discount=$soc->getAvailableDiscounts(); print '. '; - if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->monnaie)); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print '</td></tr>'; @@ -657,7 +657,7 @@ else else print $langs->trans("CompanyHasNoRelativeDiscount"); $absolute_discount=$object->societe->getAvailableDiscounts(); print '. '; - if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->monnaie)); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->trans("Currency".$conf->currency)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print '</td></tr>'; diff --git a/htdocs/contrat/note.php b/htdocs/contrat/note.php index 6554e5ad8c1537eb8c5eff975267a4726cbc1e25..4f758b4c3275fe934150c0c84e2154ee22a8bf0e 100644 --- a/htdocs/contrat/note.php +++ b/htdocs/contrat/note.php @@ -119,7 +119,7 @@ if ($_GET["id"]) else print $langs->trans("CompanyHasNoRelativeDiscount"); $absolute_discount=$contrat->societe->getAvailableDiscounts(); print '. '; - if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->monnaie)); + if ($absolute_discount) print $langs->trans("CompanyHasAbsoluteDiscount",$absolute_discount,$langs->trans("Currency".$conf->currency)); else print $langs->trans("CompanyHasNoAbsoluteDiscount"); print '.'; print '</td></tr>'; diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php index fc70f640161d7556f2978ee5f7f6158beccdedc2..d2267e115623b0f3b1b863394b39bb7e4bfb4162 100644 --- a/htdocs/core/boxes/box_comptes.php +++ b/htdocs/core/boxes/box_comptes.php @@ -130,7 +130,7 @@ class box_comptes extends ModeleBoxes { $this->info_box_contents[$i][2] = array('td' => 'align="right" class="liste_total"', 'text' => ' ' ); - $totalamount=price($solde_total).' '.$langs->trans("Currency".$conf->monnaie); + $totalamount=price($solde_total).' '.$langs->trans("Currency".$conf->currency); $this->info_box_contents[$i][3] = array('td' => 'align="right" class="liste_total"', 'text' => $totalamount ); diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php index 24cca609cec2a912d4055cc94df54acebe01b2e2..242d140dbaf2ebf9a6484f5597e85698263c4334 100644 --- a/htdocs/core/class/conf.class.php +++ b/htdocs/core/class/conf.class.php @@ -326,9 +326,8 @@ class Conf $this->global->PRODUIT_USE_SEARCH_TO_SELECT=0; } - // conf->monnaie + // conf->currency if (empty($this->global->MAIN_MONNAIE)) $this->global->MAIN_MONNAIE='EUR'; - $this->monnaie=$this->global->MAIN_MONNAIE; // TODO deprecated $this->currency=$this->global->MAIN_MONNAIE; // $this->global->COMPTA_MODE = Option des modules Comptabilites (simple ou expert). Defini le mode de calcul des etats comptables (CA,...) diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 9087c5bbd48675d59495ecccc4c3b500676484bf..ed5615f79f955e7b872f7bfaeef25cfd307d18b1 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -1249,10 +1249,10 @@ class Form $outval.=$objRef.' - '.dol_trunc($label,32).' - '; $found=0; - $currencytext=$langs->trans("Currency".$conf->monnaie); - $currencytextnoent=$langs->transnoentities("Currency".$conf->monnaie); - if (dol_strlen($currencytext) > 10) $currencytext=$conf->monnaie; // If text is too long, we use the short code - if (dol_strlen($currencytextnoent) > 10) $currencytextnoent=$conf->monnaie; // If text is too long, we use the short code + $currencytext=$langs->trans("Currency".$conf->currency); + $currencytextnoent=$langs->transnoentities("Currency".$conf->currency); + if (dol_strlen($currencytext) > 10) $currencytext=$conf->currency; // If text is too long, we use the short code + if (dol_strlen($currencytextnoent) > 10) $currencytextnoent=$conf->currency; // If text is too long, we use the short code // Multiprice if ($price_level >= 1) // If we need a particular price level (from 1 to 6) @@ -1464,10 +1464,10 @@ class Form if ($objp->fprice != '') // Keep != '' { - $currencytext=$langs->trans("Currency".$conf->monnaie); - $currencytextnoent=$langs->transnoentities("Currency".$conf->monnaie); - if (dol_strlen($currencytext) > 10) $currencytext=$conf->monnaie; // If text is too long, we use the short code - if (dol_strlen($currencytextnoent) > 10) $currencytextnoent=$conf->monnaie; // If text is too long, we use the short code + $currencytext=$langs->trans("Currency".$conf->currency); + $currencytextnoent=$langs->transnoentities("Currency".$conf->currency); + if (dol_strlen($currencytext) > 10) $currencytext=$conf->currency; // If text is too long, we use the short code + if (dol_strlen($currencytextnoent) > 10) $currencytextnoent=$conf->currency; // If text is too long, we use the short code $opt.= price($objp->fprice).' '.$currencytext."/".$objp->quantity; $outval.= price($objp->fprice).' '.$currencytextnoent."/".$objp->quantity; @@ -1578,7 +1578,7 @@ class Form if ($objp->quantity == 1) { $opt.= price($objp->fprice); - $opt.= $langs->trans("Currency".$conf->monnaie)."/"; + $opt.= $langs->trans("Currency".$conf->currency)."/"; } $opt.= $objp->quantity.' '; @@ -1594,7 +1594,7 @@ class Form if ($objp->quantity > 1) { $opt.=" - "; - $opt.= price($objp->unitprice).$langs->trans("Currency".$conf->monnaie)."/".strtolower($langs->trans("Unit")); + $opt.= price($objp->unitprice).$langs->trans("Currency".$conf->currency)."/".strtolower($langs->trans("Unit")); } if ($objp->duration) $opt .= " - ".$objp->duration; $opt .= "</option>\n"; @@ -2723,9 +2723,9 @@ class Form print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">'; print '<tr><td nowrap="nowrap">'; - //if (! $filter || $filter=="fk_facture_source IS NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount),$langs->transnoentities("Currency".$conf->monnaie)).': '; // If we want deposit to be substracted to payments only and not to total of final invoice - if (! $filter || $filter=="fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND description='(DEPOSIT)')") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount),$langs->transnoentities("Currency".$conf->monnaie)).': '; - else print $langs->trans("CompanyHasCreditNote",price($amount),$langs->transnoentities("Currency".$conf->monnaie)).': '; + //if (! $filter || $filter=="fk_facture_source IS NULL") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount),$langs->transnoentities("Currency".$conf->currency)).': '; // If we want deposit to be substracted to payments only and not to total of final invoice + if (! $filter || $filter=="fk_facture_source IS NULL OR (fk_facture_source IS NOT NULL AND description='(DEPOSIT)')") print $langs->trans("CompanyHasAbsoluteDiscount",price($amount),$langs->transnoentities("Currency".$conf->currency)).': '; + else print $langs->trans("CompanyHasCreditNote",price($amount),$langs->transnoentities("Currency".$conf->currency)).': '; $newfilter='fk_facture IS NULL AND fk_facture_line IS NULL'; // Remises disponibles if ($filter) $newfilter.=' AND ('.$filter.')'; $nbqualifiedlines=$this->select_remises($selected,$htmlname,$newfilter,$socid,$maxvalue); diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php index d51685d2f56ed90f02a5b1a87fdabb653991b943..96d9a5ed54153f3a27248a95e267bf7b7a2fbc6f 100755 --- a/htdocs/core/class/smtps.class.php +++ b/htdocs/core/class/smtps.class.php @@ -1189,7 +1189,6 @@ class SMTPs //$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"' . "\r\n"; $content = 'Content-Type: multipart/mixed; boundary="' . $this->_getBoundary() . '"' . "\r\n"; - // TODO Restore // . "\r\n" // . 'This is a multi-part message in MIME format.' . "\r\n"; $content .= "Content-Transfer-Encoding: 8bit" . "\r\n"; @@ -1203,8 +1202,6 @@ class SMTPs // loop through all attachments foreach ( $_content as $_file => $_data ) { - - // TODO Restore "\r\n" $content .= "--" . $this->_getBoundary() . "\r\n" . 'Content-Disposition: attachment; filename="' . $_data['fileName'] . '"' . "\r\n" . 'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['fileName'] . '"' . "\r\n" @@ -1225,7 +1222,6 @@ class SMTPs // loop through all images foreach ( $_content as $_image => $_data ) { - // TODO Restore "\r\n" $content .= "--" . $this->_getBoundary() . "\r\n"; $content .= 'Content-Type: ' . $_data['mimeType'] . '; name="' . $_data['imageName'] . '"' . "\r\n" @@ -1242,13 +1238,11 @@ class SMTPs } else { - // TODO Restore "\r\n" $content .= "--" . $this->_getBoundary() . "\r\n" . 'Content-Type: ' . $_content['mimeType'] . '; ' // . 'charset="' . $this->getCharSet() . '"'; . 'charset=' . $this->getCharSet() . ''; - // TODO Restore // $content .= ( $type == 'html') ? '; name="HTML Part"' : ''; $content .= "\r\n"; // $content .= 'Content-Transfer-Encoding: '; diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php index 7c94b19b66cb5428078fc14293b568de40786693..f73d3f7be607629d938e0038dccc60ce254f21a6 100644 --- a/htdocs/core/lib/pdf.lib.php +++ b/htdocs/core/lib/pdf.lib.php @@ -557,7 +557,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass // Capital if ($fromcompany->capital) { - $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",$fromcompany->capital)." ".$outputlangs->transnoentities("Currency".$conf->monnaie); + $line3.=($line3?" - ":"").$outputlangs->transnoentities("CapitalOf",$fromcompany->capital)." ".$outputlangs->transnoentities("Currency".$conf->currency); } // Prof Id 1 if ($fromcompany->idprof1 && ($fromcompany->pays_code != 'FR' || ! $fromcompany->idprof2)) diff --git a/htdocs/core/modules/commande/pdf_edison.modules.php b/htdocs/core/modules/commande/pdf_edison.modules.php index e293cae0ae1cb244e8ff168dd04e28d42d88c0b8..f3bcde89aff868f683c7f0f5c7d95d1100f8ba3e 100644 --- a/htdocs/core/modules/commande/pdf_edison.modules.php +++ b/htdocs/core/modules/commande/pdf_edison.modules.php @@ -487,7 +487,7 @@ class pdf_edison extends ModelePDFCommandes $pdf->SetTextColor(0,0,0); $pdf->SetFont('','', $default_font_size-1); - $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); + $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency)); $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4); $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre); } diff --git a/htdocs/core/modules/commande/pdf_einstein.modules.php b/htdocs/core/modules/commande/pdf_einstein.modules.php index b8292177a4f45c85fb08f59e06b2ea32234a2678..6a9b444deae90682e17a0ed6156b1603671a44eb 100644 --- a/htdocs/core/modules/commande/pdf_einstein.modules.php +++ b/htdocs/core/modules/commande/pdf_einstein.modules.php @@ -774,7 +774,7 @@ class pdf_einstein extends ModelePDFCommandes $default_font_size = pdf_getPDFFontSize($outputlangs); $pdf->SetTextColor(0,0,0); $pdf->SetFont('','', $default_font_size - 2); - $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); + $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency)); $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4); $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre); diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php index 2fff5557cfb0db3658210183d08007d65fc3e85e..14bb9dc0846abc995ac4c52f95eddac091cb46d9 100644 --- a/htdocs/core/modules/dons/html_cerfafr.modules.php +++ b/htdocs/core/modules/dons/html_cerfafr.modules.php @@ -119,8 +119,8 @@ class html_cerfafr extends ModeleDon $form = str_replace('__DATE__',dol_print_date($don->date,'day',false,$outputlangs),$form); $form = str_replace('__IP__',$user->ip,$form); $form = str_replace('__AMOUNT__',$don->amount,$form); - $form = str_replace('__CURRENCY__',$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie),$form); - $form = str_replace('__CURRENCYCODE__',$conf->monnaie,$form); + $form = str_replace('__CURRENCY__',$outputlangs->transnoentitiesnoconv("Currency".$conf->currency),$form); + $form = str_replace('__CURRENCYCODE__',$conf->currency,$form); $form = str_replace('__MAIN_INFO_SOCIETE_NOM__',$mysoc->name,$form); $form = str_replace('__MAIN_INFO_SOCIETE_ADRESSE__',$mysoc->address,$form); $form = str_replace('__MAIN_INFO_SOCIETE_CP__',$mysoc->zip,$form); diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php index 1b9b26275b4faf53ef14d86469e7d916aa03e512..381de4009fbdb8108401d8cff1fdb46c7f7d2e60 100755 --- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php @@ -933,7 +933,7 @@ class pdf_crabe extends ModelePDFFactures // Amount in (at tab_top - 1) $pdf->SetTextColor(0,0,0); $pdf->SetFont('','', $default_font_size - 2); - $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); + $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency)); $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4); $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre); diff --git a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php index cad37bf6e398768cb5d4fe06eaa842e2d0cc7d9c..0cbb903cfda33fbabf89598fd4cf9eec26ce20f2 100755 --- a/htdocs/core/modules/facture/doc/pdf_oursin.modules.php +++ b/htdocs/core/modules/facture/doc/pdf_oursin.modules.php @@ -1013,7 +1013,7 @@ class pdf_oursin extends ModelePDFFactures // Amount in (at tab_top - 1) $pdf->SetTextColor(0,0,0); $pdf->SetFont('','', $default_font_size-1); - $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); + $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency)); $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), 90); $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre); } diff --git a/htdocs/core/modules/propale/pdf_propale_azur.modules.php b/htdocs/core/modules/propale/pdf_propale_azur.modules.php index 86db4b61f5505304a0b73de47e90254a21ff003b..2a036aa8f0fc69b51ba1678a3c60232023031606 100644 --- a/htdocs/core/modules/propale/pdf_propale_azur.modules.php +++ b/htdocs/core/modules/propale/pdf_propale_azur.modules.php @@ -804,7 +804,7 @@ class pdf_propale_azur extends ModelePDFPropales // Montants exprimes en (en tab_top - 1) $pdf->SetTextColor(0,0,0); $pdf->SetFont('','',$default_font_size - 2); - $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); + $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency)); $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4); $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre); diff --git a/htdocs/core/modules/propale/pdf_propale_jaune.modules.php b/htdocs/core/modules/propale/pdf_propale_jaune.modules.php index 7643b5c9ade6a5e51bc0483cb0bb43acf7ba1811..79c76a4c5c913802168047db68dd3a1f65872896 100644 --- a/htdocs/core/modules/propale/pdf_propale_jaune.modules.php +++ b/htdocs/core/modules/propale/pdf_propale_jaune.modules.php @@ -804,7 +804,7 @@ class pdf_propale_jaune extends ModelePDFPropales // Montants exprimes en (en tab_top - 1) $pdf->SetTextColor(0,0,0); $pdf->SetFont('','',$default_font_size - 2); - $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); + $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency)); $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4); $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre); diff --git a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php index c80ad2266e458dca6fc8dffcefc2d721aafa3dd6..26262e3bc96bdd53e5b6c1a02a77f53e1f45a43b 100755 --- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php +++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php @@ -587,7 +587,7 @@ class pdf_canelle extends ModelePDFSuppliersInvoices // Amount in (at tab_top - 1) $pdf->SetTextColor(0,0,0); $pdf->SetFont('','',$default_font_size - 2); - $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); + $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency)); $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4); $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre); diff --git a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php index bd78be5eb83a586de066efa1d93c9b0d3fd41359..71b8c244d50207ce221700942bb640208e6e9573 100644 --- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php +++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php @@ -591,7 +591,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders // Amount in (at tab_top - 1) $pdf->SetTextColor(0,0,0); $pdf->SetFont('','', $default_font_size - 2); - $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->monnaie)); + $titre = $outputlangs->transnoentities("AmountInCurrency",$outputlangs->transnoentitiesnoconv("Currency".$conf->currency)); $pdf->SetXY($this->page_largeur - $this->marge_droite - ($pdf->GetStringWidth($titre) + 3), $tab_top-4); $pdf->MultiCell(($pdf->GetStringWidth($titre) + 3), 2, $titre); diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php index dc143d7c2e217987bfa4a7ac2ed70b66ea884660..f92de82038fa0c5afd2bbc3a767f6205b4b462e4 100644 --- a/htdocs/expedition/shipment.php +++ b/htdocs/expedition/shipment.php @@ -214,7 +214,7 @@ if ($id > 0 || ! empty($ref)) { if ($commande->statut > 0) { - print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->monnaie)); + print $langs->trans("CompanyHasAbsoluteDiscount",price($absolute_discount),$langs->transnoentities("Currency".$conf->currency)); } else { @@ -226,7 +226,7 @@ if ($id > 0 || ! empty($ref)) } if ($absolute_creditnote) { - print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->monnaie)).'. '; + print $langs->trans("CompanyHasCreditNote",price($absolute_creditnote),$langs->transnoentities("Currency".$conf->currency)).'. '; } if (! $absolute_discount && ! $absolute_creditnote) print $langs->trans("CompanyHasNoAbsoluteDiscount").'.'; print '</td></tr>'; @@ -360,15 +360,15 @@ if ($id > 0 || ! empty($ref)) // Total HT print '<tr><td>'.$langs->trans('AmountHT').'</td>'; print '<td align="right"><b>'.price($commande->total_ht).'</b></td>'; - print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Total TVA print '<tr><td>'.$langs->trans('AmountVAT').'</td><td align="right">'.price($commande->total_tva).'</td>'; - print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Total TTC print '<tr><td>'.$langs->trans('AmountTTC').'</td><td align="right">'.price($commande->total_ttc).'</td>'; - print '<td>'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Statut print '<tr><td>'.$langs->trans('Status').'</td>'; diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php index 77b08dae9670793a742e30c11ff92d4e8e09daba..e2d43151f07969600dad9c5b8fe44bd971537fea 100644 --- a/htdocs/fourn/commande/fiche.php +++ b/htdocs/fourn/commande/fiche.php @@ -1028,10 +1028,10 @@ if ($id > 0 || ! empty($ref)) // Ligne de 3 colonnes print '<tr><td>'.$langs->trans("AmountHT").'</td>'; print '<td align="right"><b>'.price($object->total_ht).'</b></td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; print '<tr><td>'.$langs->trans("AmountVAT").'</td><td align="right">'.price($object->total_tva).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; // Amount Local Taxes if ($mysoc->pays_code=='ES') @@ -1040,17 +1040,17 @@ if ($id > 0 || ! empty($ref)) { print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->pays_code).'</td>'; print '<td align="right">'.price($object->total_localtax1).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; } if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF { print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->pays_code).'</td>'; print '<td align="right">'.price($object->total_localtax2).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; } } print '<tr><td>'.$langs->trans("AmountTTC").'</td><td align="right">'.price($object->total_ttc).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; print "</table><br>"; diff --git a/htdocs/fourn/facture/fiche.php b/htdocs/fourn/facture/fiche.php index 86d235922e29110289248ceab50b697e6c26d32c..ff10216fcfafcbe2462c07afb99e8bd29e447fd0 100644 --- a/htdocs/fourn/facture/fiche.php +++ b/htdocs/fourn/facture/fiche.php @@ -1396,8 +1396,8 @@ else $alreadypaid=$object->getSommePaiement(); print '<tr><td>'.$langs->trans('Status').'</td><td colspan="3">'.$object->getLibStatut(4,$alreadypaid).'</td></tr>'; - print '<tr><td>'.$langs->trans('AmountHT').'</td><td align="right">'.price($object->total_ht).'</td><td colspan="2" align="left">'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; - print '<tr><td>'.$langs->trans('AmountVAT').'</td><td align="right">'.price($object->total_tva).'</td><td colspan="2" align="left">'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<tr><td>'.$langs->trans('AmountHT').'</td><td align="right">'.price($object->total_ht).'</td><td colspan="2" align="left">'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; + print '<tr><td>'.$langs->trans('AmountVAT').'</td><td align="right">'.price($object->total_tva).'</td><td colspan="2" align="left">'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Amount Local Taxes if ($mysoc->pays_code=='ES') @@ -1406,16 +1406,16 @@ else { print '<tr><td>'.$langs->transcountry("AmountLT1",$mysoc->pays_code).'</td>'; print '<td align="right">'.price($object->total_localtax1).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; } if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF { print '<tr><td>'.$langs->transcountry("AmountLT2",$mysoc->pays_code).'</td>'; print '<td align="right">'.price($object->total_localtax2).'</td>'; - print '<td>'.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<td>'.$langs->trans("Currency".$conf->currency).'</td></tr>'; } } - print '<tr><td>'.$langs->trans('AmountTTC').'</td><td align="right">'.price($object->total_ttc).'</td><td colspan="2" align="left">'.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<tr><td>'.$langs->trans('AmountTTC').'</td><td align="right">'.price($object->total_ttc).'</td><td colspan="2" align="left">'.$langs->trans('Currency'.$conf->currency).'</td></tr>'; // Project if ($conf->projet->enabled) diff --git a/htdocs/fourn/paiement/fiche.php b/htdocs/fourn/paiement/fiche.php index 40c2639ff9bd1ea9fe31d378a92f4e710f0586bb..fa9af22b9837fb060368bf4a9b0f06b6e6fdb32c 100644 --- a/htdocs/fourn/paiement/fiche.php +++ b/htdocs/fourn/paiement/fiche.php @@ -193,7 +193,7 @@ if ($result > 0) print '</td></tr>'; // Amount - print '<tr><td valign="top" colspan="2">'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->montant).' '.$langs->trans('Currency'.$conf->monnaie).'</td></tr>'; + print '<tr><td valign="top" colspan="2">'.$langs->trans('Amount').'</td><td colspan="3">'.price($object->montant).' '.$langs->trans('Currency'.$conf->currency).'</td></tr>'; if ($conf->global->BILL_ADD_PAYMENT_VALIDATION) { diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php index b00e62e0db69d526f03de60635d8d411e9e1993f..9182ed82d744f2913aea87145f8bf771572fa255 100755 --- a/htdocs/paybox/lib/paybox.lib.php +++ b/htdocs/paybox/lib/paybox.lib.php @@ -263,7 +263,7 @@ function html_print_paybox_footer($fromcompany,$langs) // Capital if ($fromcompany->capital) { - $line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->monnaie); + $line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency); } // Prof Id 1 if ($fromcompany->idprof1 && ($fromcompany->pays_code != 'FR' || ! $fromcompany->idprof2)) diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php index 6c7c086f897d5df7cef35f17189885ca1aa2651d..643085d09a4afef65d9c0bbf1d4b7a8bed00c772 100755 --- a/htdocs/paypal/lib/paypal.lib.php +++ b/htdocs/paypal/lib/paypal.lib.php @@ -91,7 +91,7 @@ function html_print_paypal_footer($fromcompany,$langs) // Capital if ($fromcompany->capital) { - $line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->monnaie); + $line1.=($line1?" - ":"").$langs->transnoentities("CapitalOf",$fromcompany->capital)." ".$langs->transnoentities("Currency".$conf->currency); } // Prof Id 1 if ($fromcompany->idprof1 && ($fromcompany->pays_code != 'FR' || ! $fromcompany->idprof2)) diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php index 9f9bbe47be342619ba9bc84a4b3b12e52805a084..0533094b598e9bc35e342134df6eb1475d4c6272 100644 --- a/htdocs/product/stock/valo.php +++ b/htdocs/product/stock/valo.php @@ -127,8 +127,8 @@ if ($result) print '<tr class="liste_total">'; print '<td colspan="2" align="right">'.$langs->trans("Total").'</td>'; - print '<td align="right">'.price(price2num($total,'MT')).' '.$langs->trans('Currency'.$conf->monnaie).'</td>'; - print '<td align="right">'.price(price2num($totalsell,'MT')).' '.$langs->trans('Currency'.$conf->monnaie).'</td>'; + print '<td align="right">'.price(price2num($total,'MT')).' '.$langs->trans('Currency'.$conf->currency).'</td>'; + print '<td align="right">'.price(price2num($totalsell,'MT')).' '.$langs->trans('Currency'.$conf->currency).'</td>'; print '<td align="right"> </td>'; print "</tr>\n"; diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php index c85942d07fe8024cee57b16a27c30de73e229282..e2992904f1212566a72a232c89211553826eeeb4 100644 --- a/htdocs/public/donations/donateurs_code.php +++ b/htdocs/public/donations/donateurs_code.php @@ -81,7 +81,7 @@ if ($resql) print "<td>Anonyme Anonyme</td>\n"; } print "<td>".dol_print_date($db->jdate($objp->datedon))."</td>\n"; - print '<td align="right">'.number_format($objp->amount,2,'.',' ').' '.$langs->trans("Currency".$conf->monnaie).'</td>'; + print '<td align="right">'.number_format($objp->amount,2,'.',' ').' '.$langs->trans("Currency".$conf->currency).'</td>'; print "</tr>"; $i++; } diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php index bb3da9ba07aeaefb9064c2ce878305a2459ba1c5..1923eff7c71d42e9d235fbfe3c4319918e14b212 100644 --- a/htdocs/public/members/new.php +++ b/htdocs/public/members/new.php @@ -533,7 +533,7 @@ if (! empty($conf->global->MEMBER_NEWFORM_AMOUNT) print '<input type="text" name="amount" id="amounthidden" class="flat amount" disabled="disabled" size="6" value="'.$amount.'">'; print '<input type="hidden" name="amount" id="amount" class="flat amount" size="6" value="'.$amount.'">'; } - print ' '.$langs->trans("Currency".$conf->monnaie); + print ' '.$langs->trans("Currency".$conf->currency); print '</td></tr>'; } print "</table>\n"; diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php index 880b69151feb26f023e58320a7f0496fbd2d2007..cb99d1404aa7de69241d3de2d6fa6667c744c533 100644 --- a/htdocs/public/paybox/newpayment.php +++ b/htdocs/public/paybox/newpayment.php @@ -115,7 +115,7 @@ if (GETPOST("action") == 'dopayment') { dol_syslog("newpayment.php call paybox api and do redirect", LOG_DEBUG); - print_paybox_redirect($PRICE, $conf->monnaie, $email, $urlok, $urlko, $FULLTAG); + print_paybox_redirect($PRICE, $conf->currency, $email, $urlok, $urlko, $FULLTAG); session_destroy(); exit; diff --git a/htdocs/societe/canvas/company/tpl/card_create.tpl.php b/htdocs/societe/canvas/company/tpl/card_create.tpl.php index 500760dcfd2bc8b58b5fb8722de6f6e9fce4082f..02faff3b9cc06b6a5b6f55298b1afe0ec97ff21e 100644 --- a/htdocs/societe/canvas/company/tpl/card_create.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_create.tpl.php @@ -140,7 +140,7 @@ <tr> <td><?php echo $langs->trans('Capital'); ?></td> - <td colspan="3"><input type="text" name="capital" size="10" value="<?php echo $this->control->tpl['capital']; ?>"> <?php echo $langs->trans("Currency".$conf->monnaie); ?></td> + <td colspan="3"><input type="text" name="capital" size="10" value="<?php echo $this->control->tpl['capital']; ?>"> <?php echo $langs->trans("Currency".$conf->currency); ?></td> </tr> <?php diff --git a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php index 619093376b4e56168559d61d2df41a1926b3bd24..4aff1d27bf15f12532ae9bb0cef6e734f5062724 100644 --- a/htdocs/societe/canvas/company/tpl/card_edit.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_edit.tpl.php @@ -180,7 +180,7 @@ for ($i=1; $i<=4; $i++) { <tr> <td><?php echo $langs->trans('Capital'); ?></td> - <td colspan="3"><input type="text" name="capital" size="10" value="<?php echo $this->control->tpl['capital']; ?>"> <?php echo $langs->trans("Currency".$conf->monnaie); ?></td> + <td colspan="3"><input type="text" name="capital" size="10" value="<?php echo $this->control->tpl['capital']; ?>"> <?php echo $langs->trans("Currency".$conf->currency); ?></td> </tr> <tr> diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php index 6797a3eb3a0329461b776869264120c79a5369d0..d5921d912438c9661a6cbb0e14aef01753084876 100644 --- a/htdocs/societe/canvas/company/tpl/card_view.tpl.php +++ b/htdocs/societe/canvas/company/tpl/card_view.tpl.php @@ -146,7 +146,7 @@ for ($i=1; $i<=4; $i++) { <td><?php echo $langs->trans('Capital'); ?></td> <td colspan="3"> <?php - if ($this->control->tpl['capital']) echo $this->control->tpl['capital'].' '.$langs->trans("Currency".$conf->monnaie); + if ($this->control->tpl['capital']) echo $this->control->tpl['capital'].' '.$langs->trans("Currency".$conf->currency); else echo ' '; ?> </td> diff --git a/htdocs/societe/lien.php b/htdocs/societe/lien.php index ee9cd90fb74a856076b50a7d715d33c3e3728efa..80ef3db594e09276f2611e435826e70df1a2b7aa 100644 --- a/htdocs/societe/lien.php +++ b/htdocs/societe/lien.php @@ -184,7 +184,7 @@ if ($socid) // Capital - print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3">'.$soc->capital.' '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3">'.$soc->capital.' '.$langs->trans("Currency".$conf->currency).'</td></tr>'; // Societe mere print '<tr><td>'.$langs->trans("ParentCompany").'</td><td colspan="3">'; diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 731a5e14eb229cbe4679dbeffd8e57f1edd2e1ad..b8b5c36296f3f4924a469455c0e829ce45b4f2bd 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -895,7 +895,7 @@ else print '</td></tr>'; // Capital - print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$object->capital.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$object->capital.'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>'; // Local Taxes // TODO add specific function by country @@ -1358,7 +1358,7 @@ else print '</td></tr>'; // Capital - print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$object->capital.'"> '.$langs->trans("Currency".$conf->monnaie).'</td></tr>'; + print '<tr><td>'.$langs->trans("Capital").'</td><td colspan="3"><input type="text" name="capital" size="10" value="'.$object->capital.'"> '.$langs->trans("Currency".$conf->currency).'</td></tr>'; // Default language if ($conf->global->MAIN_MULTILANGS) @@ -1693,7 +1693,7 @@ else // Capital print '<tr><td>'.$langs->trans('Capital').'</td><td colspan="3">'; - if ($object->capital) print $object->capital.' '.$langs->trans("Currency".$conf->monnaie); + if ($object->capital) print $object->capital.' '.$langs->trans("Currency".$conf->currency); else print ' '; print '</td></tr>';