diff --git a/ChangeLog b/ChangeLog
index d5247f4c379..09f19a0890d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,7 @@ For users:
- New: Add hidden option PROJECT_HIDE_UNSELECTABLES to hide project you can't select into combo list.
- New: Add option INVOICE_POSITIVE_CREDIT_NOTE.
- New: Support zip/town autocompletion into warehouses.
+- New: Add box for last expired services.
- Fix: Can use POS module with several concurrent users.
For developers:
diff --git a/dev/examples/create_invoice.php b/dev/examples/create_invoice.php
index 8ef49197055..0f99a5775ff 100755
--- a/dev/examples/create_invoice.php
+++ b/dev/examples/create_invoice.php
@@ -55,7 +55,6 @@ $user->getrights();
print "***** ".$script_file." (".$version.") *****\n";
-
// Start of transaction
$db->begin();
@@ -63,6 +62,7 @@ require_once(DOL_DOCUMENT_ROOT."/compta/facture/class/facture.class.php");
// Create invoice object
$obj = new Facture($db);
+//$obj->initAsSpecimen();
$obj->ref = 'ABCDE';
$obj->socid = 4; // Put id of third party (rowid in llx_societe table)
diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php
index aac2a88d044..69caf4eeb5f 100644
--- a/htdocs/adherents/card_subscriptions.php
+++ b/htdocs/adherents/card_subscriptions.php
@@ -403,7 +403,7 @@ if ($user->rights->adherent->cotisation->creer && $action == 'cotisation' && ! $
}
// Update fk_bank for subscriptions
- $sql = 'UPDATE llx_cotisation set fk_bank='.$bank_line_id;
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'cotisation SET fk_bank='.$bank_line_id;
$sql.= ' WHERE rowid='.$crowid;
dol_syslog('sql='.$sql);
$result = $db->query($sql);
@@ -854,7 +854,7 @@ if ($rowid)
if ($adht->cotisation)
{
// Amount
- print ''.$langs->trans("Amount").' '.$langs->trans("Amount").' '.$langs->trans("Label").' ';
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 18673422697..694e696d6ee 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -435,7 +435,8 @@ class Adherent extends CommonObject
include_once(DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php');
$hookmanager=new HookManager($this->db);
$hookmanager->callHooks(array('memberdao'));
- $parameters=array('socid'=>$socid);
+ $parameters=array('id'=>$this->id);
+ $action='';
$reshook=$hookmanager->executeHooks('insertExtraFields',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if (empty($reshook))
{
diff --git a/htdocs/admin/accounting.php b/htdocs/admin/accounting.php
index 18a14a755fe..5fdfc965143 100644
--- a/htdocs/admin/accounting.php
+++ b/htdocs/admin/accounting.php
@@ -101,7 +101,7 @@ print "'.$langs->trans("CustomerAbsoluteDiscountMy").' ';
- print ''.$remise_user.' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("HT").' '.$remise_user.' '.$langs->trans("Currency".$conf->currency).' '.$langs->trans("HT").' ';
print '';
print '';
print ''.$langs->trans("AmountHT").' ';
- print ''.$langs->trans("VAT").' ';
print '';
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 ' ';
print ''.$langs->trans('AmountHT').' ';
print ''.price($object->total_ht).' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
print '
';
}
else
diff --git a/htdocs/commande/class/commande.class.php b/htdocs/commande/class/commande.class.php
index 1c8214cd583..4734a881ed0 100644
--- a/htdocs/commande/class/commande.class.php
+++ b/htdocs/commande/class/commande.class.php
@@ -829,6 +829,7 @@ class Commande extends CommonObject
if (is_object($hookmanager))
{
$parameters=array('objFrom'=>$objFrom);
+ $action='';
$reshook=$hookmanager->executeHooks('createfrom',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) $error++;
}
@@ -924,6 +925,7 @@ class Commande extends CommonObject
$hookmanager->callHooks(array('orderdao'));
$parameters=array('objFrom'=>$object);
+ $action='';
$reshook=$hookmanager->executeHooks('createfrom',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) $error++;
@@ -1580,7 +1582,8 @@ class Commande extends CommonObject
$this->stocks = array();
// Tableau des id de produit de la commande
-
+ $array_of_product=array();
+
// Recherche total en stock pour chaque produit
if (count($array_of_product))
diff --git a/htdocs/commande/fiche.php b/htdocs/commande/fiche.php
index f8df322e99a..1b02201d072 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 = ''.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->monnaie)).'
' ;
+ $mesg = ''.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).'
' ;
}
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 = ''.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->monnaie)).'
' ;
+ $mesg = ''.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).'
' ;
$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 '';
@@ -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 '';
@@ -1846,11 +1846,11 @@ else
// Total HT
print ''.$langs->trans('AmountHT').' ';
print ''.price($object->total_ht).' '.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Currency'.$conf->currency).' ';
// Total TVA
print ''.$langs->trans('AmountVAT').' '.price($object->total_tva).' ';
- print ''.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Currency'.$conf->currency).' ';
// Amount Local Taxes
if ($mysoc->pays_code=='ES')
@@ -1859,19 +1859,19 @@ else
{
print ''.$langs->transcountry("AmountLT1",$mysoc->pays_code).' ';
print ''.price($object->total_localtax1).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
}
if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
{
print ''.$langs->transcountry("AmountLT2",$mysoc->pays_code).' ';
print ''.price($object->total_localtax2).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
}
}
// Total TTC
print ''.$langs->trans('AmountTTC').' '.price($object->total_ttc).' ';
- print ''.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Currency'.$conf->currency).' ';
// Statut
print ''.$langs->trans('Status').' ';
diff --git a/htdocs/compta/bank/bankid_fr.php b/htdocs/compta/bank/bankid_fr.php
index 346887d312d..d482be44d34 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 ''.$langs->trans("Currency").' ';
print '';
$selectedcode=$account->account_currency_code;
- if (! $selectedcode) $selectedcode=$conf->monnaie;
+ if (! $selectedcode) $selectedcode=$conf->currency;
print $langs->trans("Currency".$selectedcode);
print ' '.$langs->trans("Currency").' ';
print '';
$selectedcode=$account->account_currency_code;
- if (! $selectedcode) $selectedcode=$conf->monnaie;
+ if (! $selectedcode) $selectedcode=$conf->currency;
print $langs->trans("Currency".$selectedcode);
print ' '.$langs->trans("Currency").' ';
print '';
$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 ' '.$langs->trans("Currency").' ';
print '';
$selectedcode=$account->account_currency_code;
- if (! $selectedcode) $selectedcode=$conf->monnaie;
+ if (! $selectedcode) $selectedcode=$conf->currency;
print $langs->trans("Currency".$selectedcode);
print ' ';
$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 ' ';
// Status
diff --git a/htdocs/compta/bank/ligne.php b/htdocs/compta/bank/ligne.php
index 0f0e16af275..f124b035245 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 '';
- print ' ';
}
else
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index a5e8743de4c..623909b2ba8 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -33,19 +33,20 @@ require_once(DOL_DOCUMENT_ROOT."/compta/bank/class/bankcateg.class.php");
if ($user->societe_id) $socid=$user->societe_id;
$result=restrictedArea($user,'banque');
-$description=$_REQUEST["description"];
-$debit=$_REQUEST["debit"];
-$credit=$_REQUEST["credit"];
-$type=$_REQUEST["type"];
-$account=$_REQUEST["account"];
+$description=GETPOST("description");
+$debit=GETPOST("debit");
+$credit=GETPOST("credit");
+$type=GETPOST("type");
+$account=GETPOST("account");
+$bid=GETPOST("bid");
$param='';
-if (! empty($_REQUEST["description"])) $param.='&description='.$_REQUEST["description"];
-if (! empty($_REQUEST["type"])) $param.='&type='.$_REQUEST["type"];
-if (! empty($_REQUEST["debit"])) $param.='&debit='.$_REQUEST["debit"];
-if (! empty($_REQUEST["credit"])) $param.='&credit='.$_REQUEST["credit"];
-if (! empty($_REQUEST["account"])) $param.='&account='.$_REQUEST["account"];
-if (! empty($_REQUEST["bid"])) $param.='&bid='.$_REQUEST["bid"];
+if ($description) $param.='&description='.$description;
+if ($type) $param.='&type='.$type;
+if ($debit) $param.='&debit='.$debit;
+if ($credit) $param.='&credit='.$credit;
+if ($account) $param.='&account='.$account;
+if ($bid) $param.='&bid='.$bid;
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
diff --git a/htdocs/compta/bank/virement.php b/htdocs/compta/bank/virement.php
index ed05f6e067b..6b5771a2bec 100644
--- a/htdocs/compta/bank/virement.php
+++ b/htdocs/compta/bank/virement.php
@@ -106,7 +106,7 @@ if ($_POST["action"] == 'add')
if (! $error)
{
$mesg.="";
$db->commit();
}
diff --git a/htdocs/compta/dons/fiche.php b/htdocs/compta/dons/fiche.php
index 4b41aabd622..ea41649d3bc 100644
--- a/htdocs/compta/dons/fiche.php
+++ b/htdocs/compta/dons/fiche.php
@@ -280,7 +280,7 @@ if ($_GET["action"] == 'create')
print "";
// Amount
- print "".''.$langs->trans("Amount").' ';
+ print "".''.$langs->trans("Amount").' ';
print ''.$langs->trans("PublicDonation")." ";
print $form->selectyesno("public",isset($_POST["public"])?$_POST["public"]:1,1);
@@ -365,7 +365,7 @@ if ($_GET["rowid"] && $_GET["action"] == 'edit')
print " ".''.$langs->trans("Amount").' ';
+ print "".''.$langs->trans("Amount").' ';
print ''.$langs->trans("PublicDonation")." ";
print $form->selectyesno("public",1,1);
@@ -455,7 +455,7 @@ if ($_GET["rowid"] && $_GET["action"] != 'edit')
print ' '.$langs->trans("Comments").' : ".''.$langs->trans("Amount").' '.price($don->amount).' '.$langs->trans("Currency".$conf->monnaie).' ';
+ print "".''.$langs->trans("Amount").' '.price($don->amount).' '.$langs->trans("Currency".$conf->currency).' ';
print "".$langs->trans("PublicDonation")." ";
print yn($don->public);
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 9b4b206bd55..44926e4ecf2 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 = ''.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->monnaie)).'
';
+ $mesg = ''.$langs->trans("CantBeLessThanMinPrice",price2num($price_min,'MU').' '.$langs->trans("Currency".$conf->currency)).'
';
$result=-1;
}
@@ -1726,7 +1726,7 @@ if ($action == 'create')
print ' ('.$langs->trans("EditRelativeDiscount").') ';
print '. ';
print ''.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 ' ('.$langs->trans("EditGlobalDiscounts").') ';
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 ' '.$langs->trans('AmountHT').' ';
print ''.price($object->total_ht).' ';
- print ''.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Currency'.$conf->currency).' ';
print ''.$langs->trans('AmountVAT').' '.price($object->total_tva).' ';
- print ''.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Currency'.$conf->currency).' ';
// Amount Local Taxes
if ($mysoc->pays_code=='ES')
@@ -2599,18 +2599,18 @@ else
{
print ''.$langs->transcountry("AmountLT1",$mysoc->pays_code).' ';
print ''.price($object->total_localtax1).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
}
if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
{
print ''.$langs->transcountry("AmountLT2",$mysoc->pays_code).' ';
print ''.price($object->total_localtax2).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
}
}
print ''.$langs->trans('AmountTTC').' '.price($object->total_ttc).' ';
- print ''.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Currency'.$conf->currency).' ';
// Statut
print ''.$langs->trans('Status').' ';
diff --git a/htdocs/compta/facture/apercu.php b/htdocs/compta/facture/apercu.php
index b8f76d5c24b..6c07791e272 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 ''.$langs->trans("AmountHT").' ';
print ''.price($object->total_ht).' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
print ''.$langs->trans('AmountVAT').' '.price($object->total_tva).' ';
- print ''.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Currency'.$conf->currency).' ';
print ''.$langs->trans('AmountTTC').' '.price($object->total_ttc).' ';
- print ''.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Currency'.$conf->currency).' ';
// Statut
print ''.$langs->trans('Status').' '.($object->getLibStatut(4,$totalpaye)).' '.$langs->trans("AmountHT").' ';
print ''.price($fac->total_ht).' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
print ''.$langs->trans("AmountVAT").' '.price($fac->total_tva).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
print ''.$langs->trans("AmountTTC").' '.price($fac->total_ttc).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
if ($fac->note)
{
print ''.$langs->trans("Note").' : '.nl2br($fac->note)." '.$langs->trans('AmountHT').' ';
print ''.price($fac->total_ht).' ';
- print ''.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Currency'.$conf->currency).' ';
print ''.$langs->trans('AmountVAT').' '.price($fac->total_tva).' ';
- print ''.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Currency'.$conf->currency).' ';
// Amount Local Taxes
if ($mysoc->pays_code=='ES')
@@ -372,18 +372,18 @@ if ($_REQUEST["facid"] > 0 || $_REQUEST["ref"])
{
print ''.$langs->transcountry("AmountLT1",$mysoc->pays_code).' ';
print ''.price($fac->total_localtax1).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
}
if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
{
print ''.$langs->transcountry("AmountLT2",$mysoc->pays_code).' ';
print ''.price($fac->total_localtax2).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
}
}
print ''.$langs->trans('AmountTTC').' '.price($fac->total_ttc).' ';
- print ''.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Currency'.$conf->currency).' ';
// Statut
print ''.$langs->trans('Status').' ';
diff --git a/htdocs/compta/localtax/class/localtax.class.php b/htdocs/compta/localtax/class/localtax.class.php
index b6ac1e02af9..4e0c70f07fa 100644
--- a/htdocs/compta/localtax/class/localtax.class.php
+++ b/htdocs/compta/localtax/class/localtax.class.php
@@ -551,7 +551,7 @@ class localtax extends CommonObject
*/
function update_fk_bank($id)
{
- $sql = 'UPDATE llx_localtax set fk_bank = '.$id;
+ $sql = 'UPDATE '.MAIN_DB_PREFIX.'localtax SET fk_bank = '.$id;
$sql.= ' WHERE rowid = '.$this->id;
$result = $this->db->query($sql);
if ($result)
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index 6eaccc3fa33..5d5604deb18 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 ''.$langs->trans('Amount').' '.price($paiement->montant).' '.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Amount').' '.price($paiement->montant).' '.$langs->trans('Currency'.$conf->currency).' '.$form->editfieldkey("Note",'note',$paiement->note,$paiement,$user->rights->facture->paiement).' ';
diff --git a/htdocs/compta/paiement_charge.php b/htdocs/compta/paiement_charge.php
index 2e3d9df41dd..00ccd303408 100755
--- a/htdocs/compta/paiement_charge.php
+++ b/htdocs/compta/paiement_charge.php
@@ -185,7 +185,7 @@ if ($_GET["action"] == 'create')
print ' '.$langs->trans("Label").' '.$charge->lib." '.$langs->trans("DateDue")." ".dol_print_date($charge->date_ech,'day')." '.$langs->trans("AmountTTC")." ".price($charge->amount).' '.$langs->trans("Currency".$conf->monnaie).''.$langs->trans("AmountTTC")." ".price($charge->amount).' '.$langs->trans("Currency".$conf->currency).''.$langs->trans("AlreadyPaid").' '.price($sumpaid).' '.$langs->trans("Currency".$conf->monnaie).'".$langs->trans("RemainderToPay")." ".price($total - $sumpaid).' '.$langs->trans("Currency".$conf->monnaie).''.$langs->trans("AlreadyPaid").' '.price($sumpaid).' '.$langs->trans("Currency".$conf->currency).'".$langs->trans("RemainderToPay")." ".price($total - $sumpaid).' '.$langs->trans("Currency".$conf->currency).'".$langs->trans("Payment").' ';
diff --git a/htdocs/compta/payment_sc/fiche.php b/htdocs/compta/payment_sc/fiche.php
index 6c4a53fbb51..ab14d509a85 100644
--- a/htdocs/compta/payment_sc/fiche.php
+++ b/htdocs/compta/payment_sc/fiche.php
@@ -182,7 +182,7 @@ print ''.$langs->trans('Mode').' '.$lan
print ' '.$langs->trans('Numero').' '.$paiement->num_paiement.' '.$langs->trans('Amount').' '.price($paiement->amount).' '.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Amount').' '.price($paiement->amount).' '.$langs->trans('Currency'.$conf->currency).' ';
- print price($obj->total_ttc).' '.$langs->trans("Currency".$conf->monnaie);
+ print price($obj->total_ttc).' '.$langs->trans("Currency".$conf->currency);
print ' ';
// Date
print '';
@@ -258,7 +258,7 @@ if ($result)
print " \n";
print ''.dol_print_date($db->jdate($obj->datec),'day')." \n";
- print ''.price($obj->amount).' '.$langs->trans("Currency".$conf->monnaie)." \n";
+ print ''.price($obj->amount).' '.$langs->trans("Currency".$conf->currency)." \n";
print "\n";
$i++;
diff --git a/htdocs/compta/propal.php b/htdocs/compta/propal.php
index a379d7a5791..3a9b51b7fc6 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 '';
@@ -289,10 +289,10 @@ if ($id > 0 || ! empty($ref))
// Amount
print ''.$langs->trans('AmountHT').' ';
print ''.price($object->total_ht).' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
print ''.$langs->trans('AmountVAT').' '.price($object->total_tva).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
// Amount Local Taxes
if ($mysoc->pays_code=='ES')
@@ -301,19 +301,19 @@ if ($id > 0 || ! empty($ref))
{
print ''.$langs->transcountry("AmountLT1",$mysoc->pays_code).' ';
print ''.price($object->total_localtax1).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
}
if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
{
print ''.$langs->transcountry("AmountLT2",$mysoc->pays_code).' ';
print ''.price($object->total_localtax2).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
}
}
print ''.$langs->trans('AmountTTC').' '.price($object->total_ttc).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
// Statut
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index 565f5a933bd..c45c1168c9b 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -351,7 +351,7 @@ if ($chid > 0)
print ''.img_object($langs->trans("Payment"),"payment").' ';
print dol_print_date($db->jdate($objp->dp),'day')."\n";
print "".$objp->paiement_type.' '.$objp->num_paiement." \n";
- print ''.price($objp->amount)." ".$langs->trans("Currency".$conf->monnaie)." \n";
+ print ''.price($objp->amount)." ".$langs->trans("Currency".$conf->currency)." \n";
print "";
$totalpaye += $objp->amount;
$i++;
@@ -359,13 +359,13 @@ if ($chid > 0)
if ($cha->paye == 0)
{
- print "".$langs->trans("AlreadyPaid")." : ".price($totalpaye)." ".$langs->trans("Currency".$conf->monnaie)." ".$langs->trans("AmountExpected")." : ".price($cha->amount)." ".$langs->trans("Currency".$conf->monnaie)." ".$langs->trans("AlreadyPaid")." : ".price($totalpaye)." ".$langs->trans("Currency".$conf->currency)." ".$langs->trans("AmountExpected")." : ".price($cha->amount)." ".$langs->trans("Currency".$conf->currency)." ".$langs->trans("RemainderToPay")." : ";
- print "".price($resteapayer)." ".$langs->trans("Currency".$conf->monnaie)." ".price($resteapayer)." ".$langs->trans("Currency".$conf->currency)." \n";
}
print "";
$db->free($resql);
diff --git a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
index 9e8c08c8e03..ab3dc275892 100644
--- a/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
+++ b/htdocs/compta/sociales/class/paymentsocialcontribution.class.php
@@ -78,7 +78,7 @@ class PaymentSocialContribution extends CommonObject
// Validate parametres
if (! $this->datepaye)
{
- $this->error='ErrorBadValueForParameters';
+ $this->error='ErrorBadValueForParameter';
return -1;
}
@@ -552,7 +552,7 @@ class PaymentSocialContribution extends CommonObject
*/
function update_fk_bank($id_bank)
{
- $sql = "UPDATE llx_paiementcharge set fk_bank = ".$id_bank." where rowid = ".$this->id;
+ $sql = "UPDATE ".MAIN_DB_PREFIX."paiementcharge SET fk_bank = ".$id_bank." WHERE rowid = ".$this->id;
dol_syslog(get_class($this)."::update_fk_bank sql=".$sql);
$result = $this->db->query($sql);
diff --git a/htdocs/compta/stats/index.php b/htdocs/compta/stats/index.php
index ebbec0f43af..420acbb93a2 100644
--- a/htdocs/compta/stats/index.php
+++ b/htdocs/compta/stats/index.php
@@ -451,7 +451,7 @@ print "";
En attendant correction.
$sql = "SELECT sum(f.total) as tot_fht,sum(f.total_ttc) as tot_fttc, p.rowid, p.ref, s.nom, s.rowid as socid, p.total_ht, p.total_ttc
- FROM ".MAIN_DB_PREFIX."commande AS p, llx_societe AS s
+ FROM ".MAIN_DB_PREFIX."commande AS p, ".MAIN_DB_PREFIX."societe AS s
LEFT JOIN ".MAIN_DB_PREFIX."co_fa AS co_fa ON co_fa.fk_commande = p.rowid
LEFT JOIN ".MAIN_DB_PREFIX."facture AS f ON co_fa.fk_facture = f.rowid
WHERE p.fk_soc = s.rowid
diff --git a/htdocs/compta/stats/prev.php b/htdocs/compta/stats/prev.php
index 7a37369c55f..0b3e6e6bdcf 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 "".$langs->trans("TotalHT").": ".price($total)." ".$langs->trans("Currency".$conf->monnaie)."".$langs->trans("TotalHT").": ".price($total)." ".$langs->trans("Currency".$conf->currency)."';
print ' ';
// Service label
print '';
- print ' ';
// Third party
print '';
- print ' ';
print '';
$arrayofoperators=array('<'=>'<','>'=>'>');
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index d8a9548f73d..267d238d5ce 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -52,8 +52,10 @@ class box_actions extends ModeleBoxes {
}
/**
- * Charge les donnees en memoire pour affichage ulterieur
- * @param $max Nombre maximum d'enregistrements a charger
+ * Load data for box to show them later
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -146,6 +148,13 @@ class box_actions extends ModeleBoxes {
}
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_bookmarks.php b/htdocs/core/boxes/box_bookmarks.php
index aa31aa3cf7d..89352d908aa 100644
--- a/htdocs/core/boxes/box_bookmarks.php
+++ b/htdocs/core/boxes/box_bookmarks.php
@@ -37,7 +37,7 @@ class box_bookmarks extends ModeleBoxes {
var $info_box_contents = array();
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_bookmarks()
{
@@ -48,8 +48,10 @@ class box_bookmarks extends ModeleBoxes {
}
/**
- * \brief Charge les donnees en memoire pour affichage ulterieur
- * \param $max Nombre maximum d'enregistrements a charger
+ * Load data for box to show them later
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -121,6 +123,13 @@ class box_bookmarks extends ModeleBoxes {
}
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index c9db0650c43..509641b7570 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -40,7 +40,7 @@ class box_clients extends ModeleBoxes {
var $info_box_contents = array();
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_clients()
{
@@ -51,8 +51,10 @@ class box_clients extends ModeleBoxes {
}
/**
- * Load data of box into memory for a future usage
- * @param $max Maximum number of records to show
+ * Load data for box to show them later
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -125,6 +127,13 @@ class box_clients extends ModeleBoxes {
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index 8aac9fada59..74da5a9ab39 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -40,7 +40,7 @@ class box_commandes extends ModeleBoxes {
var $info_box_contents = array();
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_commandes()
{
@@ -51,8 +51,10 @@ class box_commandes extends ModeleBoxes {
}
/**
- * \brief Charge les donnees en memoire pour affichage ulterieur
- * \param $max Nombre maximum d'enregistrements a charger
+ * Load data for box to show them later
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -134,6 +136,13 @@ class box_commandes extends ModeleBoxes {
}
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_comptes.php b/htdocs/core/boxes/box_comptes.php
index fc70f640161..f988017338a 100644
--- a/htdocs/core/boxes/box_comptes.php
+++ b/htdocs/core/boxes/box_comptes.php
@@ -54,7 +54,8 @@ class box_comptes extends ModeleBoxes {
/**
* Load data into info_box_contents array to show array later.
*
- * @param $max Maximum number of records to load
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -130,7 +131,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
);
@@ -147,6 +148,13 @@ class box_comptes extends ModeleBoxes {
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_contacts.php b/htdocs/core/boxes/box_contacts.php
index 0371e821d22..98c43b14f96 100755
--- a/htdocs/core/boxes/box_contacts.php
+++ b/htdocs/core/boxes/box_contacts.php
@@ -41,7 +41,7 @@ class box_contacts extends ModeleBoxes {
var $info_box_contents = array();
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_contacts()
{
@@ -52,8 +52,10 @@ class box_contacts extends ModeleBoxes {
}
/**
- * Load data of box into memory for a future usage
- * @param $max Maximum number of records to show
+ * Load data into info_box_contents array to show array later.
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -123,6 +125,13 @@ class box_contacts extends ModeleBoxes {
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 223d9259d8f..f92494b100a 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -39,7 +39,7 @@ class box_contracts extends ModeleBoxes {
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_contracts()
{
@@ -51,8 +51,10 @@ class box_contracts extends ModeleBoxes {
}
/**
- * \brief Charge les donnees en memoire pour affichage ulterieur
- * \param $max Nombre maximum d'enregistrements a charger
+ * Load data for box to show them later
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -143,6 +145,13 @@ class box_contracts extends ModeleBoxes {
}
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_external_rss.php b/htdocs/core/boxes/box_external_rss.php
index dfaf342f5e8..9d4e59358b4 100644
--- a/htdocs/core/boxes/box_external_rss.php
+++ b/htdocs/core/boxes/box_external_rss.php
@@ -42,7 +42,7 @@ class box_external_rss extends ModeleBoxes {
var $info_box_contents = array();
/**
- * Constructeur de la classe
+ * Constructor
*/
function box_external_rss($DB,$param)
{
@@ -56,10 +56,11 @@ class box_external_rss extends ModeleBoxes {
}
/**
- * Load information for box into memory to show them later with this->showBox method.
- *
- * @param int $max Max numbe rof records to load
- * @param int $cachedelay Delay we accept for cache file
+ * Load data into info_box_contents array to show array later.
+ *
+ * @param int $max Maximum number of records to load
+ * @param int $cachedelay Delay we accept for cache file
+ * @return void
*/
function loadBox($max=5, $cachedelay=3600)
{
@@ -152,6 +153,13 @@ class box_external_rss extends ModeleBoxes {
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index b7359c19932..f801afb650f 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -39,7 +39,7 @@ class box_factures extends ModeleBoxes {
var $info_box_contents = array();
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_factures()
{
@@ -50,8 +50,10 @@ class box_factures extends ModeleBoxes {
}
/**
- * \brief Charge les donnees en memoire pour affichage ulterieur
- * \param $max Nombre maximum d'enregistrements a charger
+ * Load data into info_box_contents array to show array later.
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -149,6 +151,13 @@ class box_factures extends ModeleBoxes {
}
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 5cbb0af5cd9..365c3a12a7f 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -39,7 +39,7 @@ class box_factures_fourn extends ModeleBoxes {
var $info_box_contents = array();
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_factures_fourn()
{
@@ -50,8 +50,10 @@ class box_factures_fourn extends ModeleBoxes {
}
/**
- * \brief Charge les donnees en memoire pour affichage ulterieur
- * \param $max Nombre maximum d'enregistrements a charger
+ * Load data into info_box_contents array to show array later.
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -143,6 +145,13 @@ class box_factures_fourn extends ModeleBoxes {
}
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index 61363d2bcac..3a9a48bedbd 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -39,7 +39,7 @@ class box_factures_fourn_imp extends ModeleBoxes {
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_factures_fourn_imp()
{
@@ -50,8 +50,10 @@ class box_factures_fourn_imp extends ModeleBoxes {
}
/**
- * \brief Charge les donnees en memoire pour affichage ulterieur
- * \param $max Nombre maximum d'enregistrements a charger
+ * Load data into info_box_contents array to show array later.
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -143,6 +145,13 @@ class box_factures_fourn_imp extends ModeleBoxes {
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 57b0e2cb722..7eeac19a248 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -42,7 +42,7 @@ class box_factures_imp extends ModeleBoxes {
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_factures_imp()
{
@@ -53,8 +53,10 @@ class box_factures_imp extends ModeleBoxes {
}
/**
- * \brief Charge les donnees en memoire pour affichage ulterieur
- * \param $max Nombre maximum d'enregistrements a charger
+ * Load data into info_box_contents array to show array later.
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -145,6 +147,13 @@ class box_factures_imp extends ModeleBoxes {
}
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index e93f60a84c3..9c02cab8462 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -39,7 +39,7 @@ class box_fournisseurs extends ModeleBoxes {
var $info_box_contents = array();
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_fournisseurs()
{
@@ -50,8 +50,10 @@ class box_fournisseurs extends ModeleBoxes {
}
/**
- * Load data of box into memory for a future usage
- * @param $max Maximum number of records to show
+ * Load data into info_box_contents array to show array later.
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -119,6 +121,13 @@ class box_fournisseurs extends ModeleBoxes {
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_members.php b/htdocs/core/boxes/box_members.php
index 8b3cc143b33..094ccd07a98 100755
--- a/htdocs/core/boxes/box_members.php
+++ b/htdocs/core/boxes/box_members.php
@@ -40,7 +40,7 @@ class box_members extends ModeleBoxes {
var $info_box_contents = array();
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_members()
{
@@ -51,8 +51,10 @@ class box_members extends ModeleBoxes {
}
/**
- * Load data of box into memory for a future usage
- * @param $max Maximum number of records to show
+ * Load data into info_box_contents array to show array later.
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -121,6 +123,13 @@ class box_members extends ModeleBoxes {
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_osc_client.php b/htdocs/core/boxes/box_osc_client.php
index a2a539f22ac..a784a0c8774 100644
--- a/htdocs/core/boxes/box_osc_client.php
+++ b/htdocs/core/boxes/box_osc_client.php
@@ -39,7 +39,7 @@ class box_osc_clients extends ModeleBoxes {
var $info_box_contents = array();
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_osc_clients()
{
@@ -50,8 +50,10 @@ class box_osc_clients extends ModeleBoxes {
}
/**
- * \brief Charge les donn�es en m�moire pour affichage ult�rieur
- * \param $max Nombre maximum d'enregistrements � charger
+ * Load data into info_box_contents array to show array later.
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -97,6 +99,13 @@ class box_osc_clients extends ModeleBoxes {
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_produits.php b/htdocs/core/boxes/box_produits.php
index 711ee033a8c..5c125cf421e 100644
--- a/htdocs/core/boxes/box_produits.php
+++ b/htdocs/core/boxes/box_produits.php
@@ -42,7 +42,7 @@ class box_produits extends ModeleBoxes {
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_produits()
{
@@ -53,8 +53,10 @@ class box_produits extends ModeleBoxes {
}
/**
- * \brief Charge les donnees en memoire pour affichage ulterieur
- * \param $max Nombre maximum d'enregistrements a charger
+ * Load data into info_box_contents array to show array later.
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -154,6 +156,13 @@ class box_produits extends ModeleBoxes {
}
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 91bc157ea80..4752e0ffc70 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -41,7 +41,7 @@ class box_propales extends ModeleBoxes {
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_propales()
{
@@ -52,8 +52,10 @@ class box_propales extends ModeleBoxes {
}
/**
- * \brief Charge les donnees en memoire pour affichage ulterieur
- * \param $max Nombre maximum d'enregistrements a charger
+ * Load data into info_box_contents array to show array later.
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -139,6 +141,13 @@ class box_propales extends ModeleBoxes {
}
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 3e4c3c67a0b..69bb2444008 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -42,7 +42,7 @@ class box_prospect extends ModeleBoxes {
var $info_box_contents = array();
/**
- * \brief Constructeur de la classe
+ * Constructor
*/
function box_prospect($DB,$param)
{
@@ -56,8 +56,10 @@ class box_prospect extends ModeleBoxes {
}
/**
- * \brief Charge les donnees en memoire pour affichage ulterieur
- * \param $max Nombre maximum d'enregistrements a charger
+ * Load data into info_box_contents array to show array later.
+ *
+ * @param int $max Maximum number of records to load
+ * @return void
*/
function loadBox($max=5)
{
@@ -132,6 +134,13 @@ class box_prospect extends ModeleBoxes {
}
}
+ /**
+ * Method to show box
+ *
+ * @param array $head Array with properties of box title
+ * @param array $contents Array with properties of box lines
+ * @return void
+ */
function showBox($head = null, $contents = null)
{
parent::showBox($this->info_box_head, $this->info_box_contents);
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
new file mode 100644
index 00000000000..895fa7713a2
--- /dev/null
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -0,0 +1,159 @@
+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see ';
print '';
- //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/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index f878dee86c3..41e570591a7 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -420,7 +420,7 @@ class FormCompany
// On recherche les formes juridiques actives des pays actifs
$sql = "SELECT f.rowid, f.code as code , f.libelle as nom, f.active, p.libelle as libelle_pays, p.code as code_pays";
- $sql .= " FROM llx_c_forme_juridique as f, llx_c_pays as p";
+ $sql .= " FROM ".MAIN_DB_PREFIX."c_forme_juridique as f, ".MAIN_DB_PREFIX."c_pays as p";
$sql .= " WHERE f.fk_pays=p.rowid";
$sql .= " AND f.active = 1 AND p.active = 1";
if ($pays_code) $sql .= " AND p.code = '".$pays_code."'";
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index d51685d2f56..96d9a5ed541 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/admin.lib.php b/htdocs/core/lib/admin.lib.php
index 949df2d1e7b..c8bf01a17c9 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -220,6 +220,12 @@ function run_sql($sqlfile,$silent=1,$entity='',$usesavepoint=1,$handler='')
{
if ($sql)
{
+ // Replace the prefix tables
+ if (MAIN_DB_PREFIX != 'llx_')
+ {
+ $sql=preg_replace('/llx_/i',MAIN_DB_PREFIX,$sql);
+ }
+
if (!empty($handler)) $sql=preg_replace('/__HANDLER__/i',"'".$handler."'",$sql);
$newsql=preg_replace('/__ENTITY__/i',(!empty($entity)?$entity:$conf->entity),$sql);
@@ -448,7 +454,7 @@ function dolibarr_set_const($db, $name, $value, $type='chaine', $visible=0, $not
if (strcmp($value,'')) // true if different. Must work for $value='0' or $value=0
{
- $sql = "INSERT INTO llx_const(name,value,type,visible,note,entity)";
+ $sql = "INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity)";
$sql.= " VALUES (";
$sql.= $db->encrypt($name,1);
$sql.= ", ".$db->encrypt($value,1);
diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php
index 16059e6fbe3..5eb45fcca67 100644
--- a/htdocs/core/lib/company.lib.php
+++ b/htdocs/core/lib/company.lib.php
@@ -480,11 +480,12 @@ function show_projects($conf,$langs,$db,$object,$backtopage='')
/**
* Show html area for list of contacts
- * @param conf Object conf
- * @param langs Object langs
- * @param db Database handler
- * @param object Third party object
- * @param backtopage Url to go once contact is created
+ *
+ * @param Conf $conf Object conf
+ * @param Translate $langs Object langs
+ * @param DoliDB $db Database handler
+ * @param Object $object Third party object
+ * @param string $backtopage Url to go once contact is created
*/
function show_contacts($conf,$langs,$db,$object,$backtopage='')
{
@@ -564,7 +565,7 @@ function show_contacts($conf,$langs,$db,$object,$backtopage='')
if ($conf->agenda->enabled && $user->rights->agenda->myactions->create)
{
- print ' ';
+ print ' ';
print img_object($langs->trans("Rendez-Vous"),"action");
print '
\n";
$out.=" '.$langs->trans("Parameter").' '.$langs->trans("DefaultValue").' ';
- print ' ';
+ print ''.$langs->trans("Parameter").' '.$langs->trans("DefaultValue").' ';
+ print ' ';
print ''.$langs->trans("DefaultSkin").' ';
- print '';
+ print ' '.$langs->trans("DefaultSkin").' ';
+ print '';
$url='http://www.dolistore.com/lang-en/4-skins';
if (preg_match('/fr/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-fr/4-themes';
//if (preg_match('/es/i',$langs->defaultlang)) $url='http://www.dolistore.com/lang-es/4-themes';
print '';
print $langs->trans('DownloadMoreSkins');
print ' ';
- print ' ';
print ''.$langs->trans("DefaultSkin").' ';
print ''.$conf->global->MAIN_THEME.' ';
- print ' ';
+ print ' ';
print ' ';
}
@@ -203,12 +204,6 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print '';
}
- if ($edit)
- {
- if ($subdir == $conf->global->MAIN_THEME) $title=$langs->trans("ThemeCurrentlyActive");
- else $title=$langs->trans("ShowPreview");
- }
-
$var=!$var;
print '';
diff --git a/htdocs/core/menus/standard/empty.php b/htdocs/core/menus/standard/empty.php
index e7ac7d0e6f4..6efd12367da 100644
--- a/htdocs/core/menus/standard/empty.php
+++ b/htdocs/core/menus/standard/empty.php
@@ -56,10 +56,10 @@ class MenuTop {
$classname='class="tmenu"';
print_start_menu_entry_empty($idsel);
- print '';
- print '';
+ print ' atarget?' target="'.$this->atarget.'"':'').'>';
print_text_menu_entry_empty($langs->trans("Home"));
print ' ';
print_end_menu_entry_empty();
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index 463ae3c172f..59673f7971c 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -408,7 +408,7 @@ abstract class DolibarrModules
$sql = "DELETE FROM ".MAIN_DB_PREFIX."dolibarr_modules";
$sql.= " WHERE numero = ".$this->numero;
- $sql.= " AND entity in (0, ".$conf->entity.")";
+ $sql.= " AND entity IN (0, ".$conf->entity.")";
dol_syslog(get_class($this)."::_dbunactive sql=".$sql, LOG_DEBUG);
$this->db->query($sql);
diff --git a/htdocs/core/modules/commande/pdf_edison.modules.php b/htdocs/core/modules/commande/pdf_edison.modules.php
index e293cae0ae1..f3bcde89aff 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 b8292177a4f..6a9b444deae 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 2fff5557cfb..14bb9dc0846 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 1b9b26275b4..381de4009fb 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 cad37bf6e39..0cbb903cfda 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/mailings/framboise.modules.php b/htdocs/core/modules/mailings/framboise.modules.php
index 6d689d7b081..3cc151abdda 100644
--- a/htdocs/core/modules/mailings/framboise.modules.php
+++ b/htdocs/core/modules/mailings/framboise.modules.php
@@ -63,14 +63,17 @@ class mailing_framboise extends MailingTargets
// CHANGE THIS
// Select the members from category
$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname,";
- if ($_POST['filter']) $sql.= " llx_categorie.label as label";
+ if ($_POST['filter']) $sql.= " c.label";
else $sql.=" null as label";
- $sql.= " FROM llx_adherent as s";
- if ($_POST['filter']) $sql.= " LEFT JOIN llx_categorie_member ON llx_categorie_member.fk_member=s.rowid";
- if ($_POST['filter']) $sql.= " LEFT JOIN llx_categorie ON llx_categorie.rowid = llx_categorie_member.fk_categorie";
+ $sql.= " FROM ".MAIN_DB_PREFIX."adherent as s";
+ if ($_POST['filter'])
+ {
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_member as cm ON cm.fk_member = s.rowid";
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cm.fk_categorie";
+ }
$sql.= " WHERE s.email != ''";
$sql.= " AND s.entity = ".$conf->entity;
- if ($_POST['filter']) $sql.= " AND llx_categorie.rowid='".$_POST['filter']."'";
+ if ($_POST['filter']) $sql.= " AND ".MAIN_DB_PREFIX."categorie.rowid='".$_POST['filter']."'";
$sql.= " ORDER BY s.email";
// Stocke destinataires dans cibles
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index afa6f987d35..b3d62e8fdbe 100755
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -63,14 +63,17 @@ class mailing_thirdparties extends MailingTargets
// CHANGE THIS
// Select the third parties from category
$sql = "SELECT s.rowid as id, s.email as email, s.nom as name, null as fk_contact, null as firstname,";
- if ($_POST['filter']) $sql.= " llx_categorie.label as label";
+ if ($_POST['filter']) $sql.= " c.label";
else $sql.=" null as label";
- $sql.= " FROM llx_societe as s";
- if ($_POST['filter']) $sql.= " LEFT JOIN llx_categorie_societe ON llx_categorie_societe.fk_societe=s.rowid";
- if ($_POST['filter']) $sql.= " LEFT JOIN llx_categorie ON llx_categorie.rowid = llx_categorie_societe.fk_categorie";
+ $sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
+ if ($_POST['filter'])
+ {
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_societe as cs ON cs.fk_societe = s.rowid";
+ $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie as c ON c.rowid = cs.fk_categorie";
+ }
$sql.= " WHERE s.email != ''";
$sql.= " AND s.entity = ".$conf->entity;
- if ($_POST['filter']) $sql.= " AND llx_categorie.rowid='".$_POST['filter']."'";
+ if ($_POST['filter']) $sql.= " AND c.rowid='".$_POST['filter']."'";
$sql.= " ORDER BY s.email";
// Stocke destinataires dans cibles
diff --git a/htdocs/core/modules/modContrat.class.php b/htdocs/core/modules/modContrat.class.php
index 0de06eb5e6a..7ba03b23c9e 100644
--- a/htdocs/core/modules/modContrat.class.php
+++ b/htdocs/core/modules/modContrat.class.php
@@ -79,6 +79,7 @@ class modContrat extends DolibarrModules
// Boxes
$this->boxes = array();
$this->boxes[0][1] = "box_contracts.php";
+ $this->boxes[1][1] = "box_services_expired.php";
// Permissions
$this->rights = array();
diff --git a/htdocs/core/modules/propale/pdf_propale_azur.modules.php b/htdocs/core/modules/propale/pdf_propale_azur.modules.php
index 86db4b61f55..2a036aa8f0f 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 7643b5c9ade..79c76a4c5c9 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 c80ad2266e4..26262e3bc96 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 625dbdee60c..71b8c244d50 100644
--- a/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
+++ b/htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
@@ -358,7 +358,7 @@ class pdf_muscadet extends ModelePDFSuppliersOrders
if ($deja_regle || $amount_credit_notes_included || $amount_deposits_included)
{
- $this->_tableau_versements($pdf, $fac, $posy);
+ $this->_tableau_versements($pdf, $object, $posy);
}
// Pied de page
@@ -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/ecm/class/ecmdirectory.class.php b/htdocs/ecm/class/ecmdirectory.class.php
index 31adb1bca7c..0c5f8c375f7 100644
--- a/htdocs/ecm/class/ecmdirectory.class.php
+++ b/htdocs/ecm/class/ecmdirectory.class.php
@@ -51,11 +51,11 @@ class EcmDirectory // extends CommonObject
/**
* Constructor
*
- * @param DoliDB $DB Database handler
+ * @param DoliDB $db Database handler
*/
- function EcmDirectory($DB)
+ function EcmDirectory($db)
{
- $this->db = $DB;
+ $this->db = $db;
return 1;
}
@@ -86,14 +86,14 @@ class EcmDirectory // extends CommonObject
$relativepath=$this->label;
if ($this->fk_parent)
{
- $parent = new ECMDirectory($this->db);
+ $parent = new EcmDirectory($this->db);
$parent->fetch($this->fk_parent);
$relativepath=$parent->getRelativePath().$relativepath;
}
$relativepath=preg_replace('/([\/])+/i','/',$relativepath); // Avoid duplicate / or \
//print $relativepath.'';
diff --git a/htdocs/ecm/docdir.php b/htdocs/ecm/docdir.php
index bf35901bd4c..162d55c4a2b 100644
--- a/htdocs/ecm/docdir.php
+++ b/htdocs/ecm/docdir.php
@@ -61,7 +61,7 @@ $pagenext = $page + 1;
if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="label";
-$ecmdir = new ECMDirectory($db);
+$ecmdir = new EcmDirectory($db);
if (! empty($_GET["section"]))
{
$result=$ecmdir->fetch($_GET["section"]);
diff --git a/htdocs/ecm/docfile.php b/htdocs/ecm/docfile.php
index ec851c6e2fa..49b2ed424b7 100644
--- a/htdocs/ecm/docfile.php
+++ b/htdocs/ecm/docfile.php
@@ -72,7 +72,7 @@ if (! $urlfile)
}
// Load ecm object
-$ecmdir = new ECMDirectory($db);
+$ecmdir = new EcmDirectory($db);
$result=$ecmdir->fetch(GETPOST("section"));
if (! $result > 0)
{
@@ -176,7 +176,7 @@ if ($_GET["action"] == 'edit')
print '';
print ''.$langs->trans("Ref").' ';
$s='';
-$tmpecmdir=new ECMDirectory($db); // Need to create a new one
+$tmpecmdir=new EcmDirectory($db); // Need to create a new one
$tmpecmdir->fetch($ecmdir->id);
$result = 1;
$i=0;
diff --git a/htdocs/ecm/docmine.php b/htdocs/ecm/docmine.php
index c0ffe1aa7dd..fd5b005d2fe 100644
--- a/htdocs/ecm/docmine.php
+++ b/htdocs/ecm/docmine.php
@@ -62,7 +62,7 @@ if (! $section)
// Load ecm object
-$ecmdir = new ECMDirectory($db);
+$ecmdir = new EcmDirectory($db);
$result=$ecmdir->fetch(GETPOST("section"));
if (! $result > 0)
{
@@ -232,7 +232,7 @@ if ($_GET["action"] == 'edit')
print '';
print ''.$langs->trans("Ref").' ';
$s='';
-$tmpecmdir=new ECMDirectory($db); // Need to create a new one
+$tmpecmdir=new EcmDirectory($db); // Need to create a new one
$tmpecmdir->fetch($ecmdir->id);
$result = 1;
$i=0;
diff --git a/htdocs/ecm/index.php b/htdocs/ecm/index.php
index 3a0d4be38fd..7547616ca46 100644
--- a/htdocs/ecm/index.php
+++ b/htdocs/ecm/index.php
@@ -68,7 +68,7 @@ $pagenext = $page + 1;
if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="label";
-$ecmdir = new ECMDirectory($db);
+$ecmdir = new EcmDirectory($db);
if (GETPOST("section"))
{
$result=$ecmdir->fetch(GETPOST("section"));
@@ -80,7 +80,7 @@ if (GETPOST("section"))
}
$form=new Form($db);
-$ecmdirstatic = new ECMDirectory($db);
+$ecmdirstatic = new EcmDirectory($db);
$userstatic = new User($db);
@@ -253,7 +253,7 @@ if (GETPOST("action") == 'refreshmanual')
if ($fk_parent >= 0)
{
- $ecmdirtmp=new ECMDirectory($db);
+ $ecmdirtmp=new EcmDirectory($db);
$ecmdirtmp->ref = 'NOTUSEDYET';
$ecmdirtmp->label = basename($dirdesc['fullname']);
$ecmdirtmp->description = '';
@@ -445,7 +445,7 @@ else
if (empty($action) || $action == 'file_manager' || preg_match('/refresh/i',$action) || $action == 'delete')
{
$userstatic = new User($db);
- $ecmdirstatic = new ECMDirectory($db);
+ $ecmdirstatic = new EcmDirectory($db);
// Confirmation de la suppression d'une ligne categorie
if ($_GET['action'] == 'delete_section')
diff --git a/htdocs/ecm/search.php b/htdocs/ecm/search.php
index f3e0016ee9d..102fca7ebdd 100644
--- a/htdocs/ecm/search.php
+++ b/htdocs/ecm/search.php
@@ -65,7 +65,7 @@ $pagenext = $page + 1;
if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="label";
-$ecmdir = new ECMDirectory($db);
+$ecmdir = new EcmDirectory($db);
if (! empty($_REQUEST["section"]))
{
$result=$ecmdir->fetch($_REQUEST["section"]);
@@ -96,7 +96,7 @@ if (! empty($_REQUEST["section"]))
llxHeader();
$form=new Form($db);
-$ecmdirstatic = new ECMDirectory($db);
+$ecmdirstatic = new EcmDirectory($db);
$userstatic = new User($db);
diff --git a/htdocs/expedition/shipment.php b/htdocs/expedition/shipment.php
index dc143d7c2e2..f92de82038f 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 ' '.$langs->trans('AmountHT').' ';
print ''.price($commande->total_ht).' '.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Currency'.$conf->currency).' ';
// Total TVA
print ''.$langs->trans('AmountVAT').' '.price($commande->total_tva).' ';
- print ''.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Currency'.$conf->currency).' ';
// Total TTC
print ''.$langs->trans('AmountTTC').' '.price($commande->total_ttc).' ';
- print ''.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Currency'.$conf->currency).' ';
// Statut
print ''.$langs->trans('Status').' ';
diff --git a/htdocs/fourn/commande/fiche.php b/htdocs/fourn/commande/fiche.php
index f4a76a7eeb3..e2d43151f07 100644
--- a/htdocs/fourn/commande/fiche.php
+++ b/htdocs/fourn/commande/fiche.php
@@ -126,18 +126,8 @@ if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
{
if (($_POST['qty'] || $_POST['pqty']) && (($_POST['pu'] && ($_POST['np_desc'] || $_POST['dp_desc'])) || $_POST['idprodfournprice']))
{
- $ret=$object->fetch($id);
- if ($ret < 0)
- {
- dol_print_error($db,$object->error);
- exit;
- }
-
- if ($object->socid)
- {
- $societe=new Societe($db);
- $societe->fetch($object->socid);
- }
+ if ($object->fetch($id) < 0) dol_print_error($db,$object->error);
+ if ($object->fetch_thirdparty() < 0) dol_print_error($db,$object->error);
// Ecrase $pu par celui du produit
// Ecrase $desc par celui du produit
@@ -149,13 +139,6 @@ if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
$productsupplier = new ProductFournisseur($db);
$idprod=$productsupplier->get_buyprice($_POST['idprodfournprice'], $qty);
- //$societe='';
- /*if ($object->socid)
- {
- $societe=new Societe($db);
- $societe->fetch($object->socid);
- }*/
-
if ($idprod > 0)
{
$res=$productsupplier->fetch($idprod);
@@ -170,12 +153,12 @@ if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
$remise_percent = $_POST["remise_percent"] ? $_POST["remise_percent"] : $_POST["p_remise_percent"];
- $tva_tx = get_default_tva($societe,$mysoc,$productsupplier->id);
+ $tva_tx = get_default_tva($object->thirdparty,$mysoc,$productsupplier->id);
$type = $productsupplier->type;
// Local Taxes
- $localtax1_tx= get_localtax($tva_tx, 1, $societe);
- $localtax2_tx= get_localtax($tva_tx, 2, $societe);
+ $localtax1_tx= get_localtax($tva_tx, 1, $object->thirdparty);
+ $localtax2_tx= get_localtax($tva_tx, 2, $object->thirdparty);
$result=$object->addline(
$desc,
@@ -206,8 +189,8 @@ if ($action == 'addline' && $user->rights->fournisseur->commande->creer)
$tva_tx = price2num($_POST['tva_tx']);
// Local Taxes
- $localtax1_tx= get_localtax($tva_tx, 1, $societe);
- $localtax2_tx= get_localtax($tva_tx, 2, $societe);
+ $localtax1_tx= get_localtax($tva_tx, 1, $object->thirdparty);
+ $localtax2_tx= get_localtax($tva_tx, 2, $object->thirdparty);
if (! $_POST['dp_desc'])
{
@@ -271,13 +254,11 @@ if ($action == 'updateligne' && $user->rights->fournisseur->commande->creer && $
if ($product->fetch($_POST["elrowid"]) < 0) dol_print_error($db);
}
- if ($object->fetch($id) < 0) dol_print_error($db);
+ if ($object->fetch($id) < 0) dol_print_error($db,$object->error);
+ if ($object->fetch_thirdparty() < 0) dol_print_error($db,$object->error);
- $societe=new Societe($db);
- $societe->fetch($object->socid);
-
- $localtax1_tx=get_localtax($_POST['tva_tx'],1,$societe);
- $localtax2_tx=get_localtax($_POST['tva_tx'],2,$societe);
+ $localtax1_tx=get_localtax($_POST['tva_tx'],1,$object->thirdparty);
+ $localtax2_tx=get_localtax($_POST['tva_tx'],2,$object->thirdparty);
$result = $object->updateline(
$_POST['elrowid'],
@@ -1047,10 +1028,10 @@ if ($id > 0 || ! empty($ref))
// Ligne de 3 colonnes
print ''.$langs->trans("AmountHT").' ';
print ''.price($object->total_ht).' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
print ''.$langs->trans("AmountVAT").' '.price($object->total_tva).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
// Amount Local Taxes
if ($mysoc->pays_code=='ES')
@@ -1059,17 +1040,17 @@ if ($id > 0 || ! empty($ref))
{
print ''.$langs->transcountry("AmountLT1",$mysoc->pays_code).' ';
print ''.price($object->total_localtax1).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
}
if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
{
print ''.$langs->transcountry("AmountLT2",$mysoc->pays_code).' ';
print ''.price($object->total_localtax2).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
}
}
print ''.$langs->trans("AmountTTC").' '.price($object->total_ttc).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
print "
'.$langs->trans('Status').' '.$object->getLibStatut(4,$alreadypaid).' '.$langs->trans('AmountHT').' '.price($object->total_ht).' '.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('AmountVAT').' '.price($object->total_tva).' '.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('AmountHT').' '.price($object->total_ht).' '.$langs->trans('Currency'.$conf->currency).' '.$langs->trans('AmountVAT').' '.price($object->total_tva).' '.$langs->trans('Currency'.$conf->currency).' '.$langs->transcountry("AmountLT1",$mysoc->pays_code).' ';
print ''.price($object->total_localtax1).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
}
if ($mysoc->localtax2_assuj=="1") //Localtax2 IRPF
{
print ''.$langs->transcountry("AmountLT2",$mysoc->pays_code).' ';
print ''.price($object->total_localtax2).' ';
- print ''.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Currency".$conf->currency).' ';
}
}
- print ''.$langs->trans('AmountTTC').' '.price($object->total_ttc).' '.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('AmountTTC').' '.price($object->total_ttc).' '.$langs->trans('Currency'.$conf->currency).' '.$langs->trans('Amount').' '.price($object->montant).' '.$langs->trans('Currency'.$conf->monnaie).' '.$langs->trans('Amount').' '.price($object->montant).' '.$langs->trans('Currency'.$conf->currency).' '.$langs->trans("ErrorBadValueForParameter",$_POST["db_port"],$langs->transnoentities("Port")).'
';
$error++;
}
+if (! empty($_POST["db_prefix"]) && ! preg_match('/^[a-z0-9]+_$/i', $_POST["db_prefix"]))
+{
+ print ''.$langs->trans("ErrorBadValueForParameter",$_POST["db_prefix"],$langs->transnoentities("DatabasePrefix")).'
';
+ $error++;
+}
// Remove last / into dans main_dir
@@ -365,12 +371,15 @@ if (! $error && $db->connected && $action == "set")
}
}
}
+
+ // Table prefix
+ $main_db_prefix = ((GETPOST("db_prefix") && GETPOST("db_prefix") != '') ? GETPOST("db_prefix") : 'llx_');
// Force https
- $main_force_https = ((GETPOST("main_force_https") && ( GETPOST("main_force_https") == "on" || GETPOST("main_force_https") == 1) ) ? '1' : '0');
+ $main_force_https = ((GETPOST("main_force_https") && (GETPOST("main_force_https") == "on" || GETPOST("main_force_https") == 1)) ? '1' : '0');
// Use alternative directory
- $main_use_alt_dir = ((GETPOST("main_use_alt_dir") && ( GETPOST("main_use_alt_dir") == "on" || GETPOST("main_use_alt_dir") == 1) ) ? '' : '#');
+ $main_use_alt_dir = ((GETPOST("main_use_alt_dir") && (GETPOST("main_use_alt_dir") == "on" || GETPOST("main_use_alt_dir") == 1)) ? '' : '#');
// Alternative root directory name
$main_alt_dir_name = ((GETPOST("main_alt_dir_name") && GETPOST("main_alt_dir_name") != '') ? GETPOST("main_alt_dir_name") : 'custom');
@@ -724,7 +733,7 @@ function write_master_file($masterfile,$main_dir)
function write_conf_file($conffile)
{
global $conf,$langs;
- global $_POST,$main_dir,$main_data_dir,$main_force_https,$main_use_alt_dir,$main_alt_dir_name;
+ global $_POST,$main_dir,$main_data_dir,$main_force_https,$main_use_alt_dir,$main_alt_dir_name,$main_db_prefix;
global $dolibarr_main_url_root,$dolibarr_main_document_root,$dolibarr_main_data_root,$dolibarr_main_db_host;
global $dolibarr_main_db_port,$dolibarr_main_db_name,$dolibarr_main_db_user,$dolibarr_main_db_pass;
global $dolibarr_main_db_type,$dolibarr_main_db_character_set,$dolibarr_main_db_collation,$dolibarr_main_authentication;
@@ -777,6 +786,9 @@ function write_conf_file($conffile)
fputs($fp, '$dolibarr_main_db_name=\''.addslashes($_POST["db_name"]).'\';');
fputs($fp,"\n");
+
+ fputs($fp, '$dolibarr_main_db_prefix=\''.addslashes($main_db_prefix).'\';');
+ fputs($fp,"\n");
fputs($fp, '$dolibarr_main_db_user=\''.addslashes($_POST["db_user"]).'\';');
fputs($fp,"\n");
diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index 865989f9e61..8f81e55614c 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -188,6 +188,12 @@ if ($action == "set")
{
$buffer=preg_replace('/type=innodb/i','ENGINE=innodb',$buffer);
}
+
+ // Replace the prefix tables
+ if ($dolibarr_main_db_prefix != 'llx_')
+ {
+ $buffer=preg_replace('/llx_/i',$dolibarr_main_db_prefix,$buffer);
+ }
//print "Creation de la table $name/td>";
$requestnb++;
@@ -330,6 +336,12 @@ if ($action == "set")
$buffer=trim($req);
if ($buffer)
{
+ // Replace the prefix tables
+ if ($dolibarr_main_db_prefix != 'llx_')
+ {
+ $buffer=preg_replace('/llx_/i',$dolibarr_main_db_prefix,$buffer);
+ }
+
//print " Creation des cles et index de la table $name: '$buffer' ";
$requestnb++;
if ($conf->file->character_set_client == "UTF-8")
@@ -538,6 +550,12 @@ if ($action == "set")
// We loop on each requests
foreach($arrayofrequests as $buffer)
{
+ // Replace the prefix tables
+ if ($dolibarr_main_db_prefix != 'llx_')
+ {
+ $buffer=preg_replace('/llx_/i',$dolibarr_main_db_prefix,$buffer);
+ }
+
//dolibarr_install_syslog("Request: ".$buffer,LOG_DEBUG);
$resql=$db->query($buffer);
if ($resql)
diff --git a/htdocs/install/etape5.php b/htdocs/install/etape5.php
index 2f49092703b..89859bff6ea 100644
--- a/htdocs/install/etape5.php
+++ b/htdocs/install/etape5.php
@@ -197,18 +197,18 @@ if ($action == "set" || preg_match('/upgrade/i',$action))
$db->begin();
dolibarr_install_syslog('install/etape5.php set MAIN_VERSION_LAST_INSTALL const to '.$targetversion, LOG_DEBUG);
- $resql=$db->query("DELETE FROM llx_const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_INSTALL'");
+ $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_INSTALL'");
if (! $resql) dol_print_error($db,'Error in setup program');
- $resql=$db->query("INSERT INTO llx_const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version when install',0)");
+ $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_INSTALL',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version when install',0)");
if (! $resql) dol_print_error($db,'Error in setup program');
$conf->global->MAIN_VERSION_LAST_INSTALL=$targetversion;
if ($useforcedwizard)
{
dolibarr_install_syslog('install/etape5.php set MAIN_REMOVE_INSTALL_WARNING const to 1', LOG_DEBUG);
- $resql=$db->query("DELETE FROM llx_const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'");
+ $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_REMOVE_INSTALL_WARNING'");
if (! $resql) dol_print_error($db,'Error in setup program');
- $resql=$db->query("INSERT INTO llx_const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_REMOVE_INSTALL_WARNING',1).",".$db->encrypt(1,1).",'chaine',1,'Disable install warnings',0)");
+ $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_REMOVE_INSTALL_WARNING',1).",".$db->encrypt(1,1).",'chaine',1,'Disable install warnings',0)");
if (! $resql) dol_print_error($db,'Error in setup program');
$conf->global->MAIN_REMOVE_INSTALL_WARNING=1;
}
@@ -235,7 +235,7 @@ if ($action == "set" || preg_match('/upgrade/i',$action))
}
dolibarr_install_syslog('install/etape5.php Remove MAIN_NOT_INSTALLED const', LOG_DEBUG);
- $resql=$db->query("DELETE FROM llx_const WHERE ".$db->decrypt('name')."='MAIN_NOT_INSTALLED'");
+ $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_NOT_INSTALLED'");
if (! $resql) dol_print_error($db,'Error in setup program');
$db->commit();
@@ -266,9 +266,9 @@ if ($action == "set" || preg_match('/upgrade/i',$action))
if ($tagdatabase)
{
dolibarr_install_syslog('install/etape5.php set MAIN_VERSION_LAST_UPGRADE const to value '.$targetversion, LOG_DEBUG);
- $resql=$db->query("DELETE FROM llx_const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_UPGRADE'");
+ $resql=$db->query("DELETE FROM ".MAIN_DB_PREFIX."const WHERE ".$db->decrypt('name')."='MAIN_VERSION_LAST_UPGRADE'");
if (! $resql) dol_print_error($db,'Error in setup program');
- $resql=$db->query("INSERT INTO llx_const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_VERSION_LAST_UPGRADE',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version for last upgrade',0)");
+ $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_VERSION_LAST_UPGRADE',1).",".$db->encrypt($targetversion,1).",'chaine',0,'Dolibarr version for last upgrade',0)");
if (! $resql) dol_print_error($db,'Error in setup program');
$conf->global->MAIN_VERSION_LAST_UPGRADE=$targetversion;
}
@@ -288,7 +288,7 @@ if ($action == "set" || preg_match('/upgrade/i',$action))
}
// May fail if parameter already defined
- $resql=$db->query("INSERT INTO llx_const(name,value,type,visible,note,entity) values(".$db->encrypt('MAIN_LANG_DEFAULT',1).",".$db->encrypt($setuplang,1).",'chaine',0,'Default language',1)");
+ $resql=$db->query("INSERT INTO ".MAIN_DB_PREFIX."const(name,value,type,visible,note,entity) VALUES (".$db->encrypt('MAIN_LANG_DEFAULT',1).",".$db->encrypt($setuplang,1).",'chaine',0,'Default language',1)");
//if (! $resql) dol_print_error($db,'Error in setup program');
print '
';
diff --git a/htdocs/install/fileconf.php b/htdocs/install/fileconf.php
index 9c5e21fbf3e..4b2caef19dd 100644
--- a/htdocs/install/fileconf.php
+++ b/htdocs/install/fileconf.php
@@ -40,16 +40,17 @@ $langs->load("errors");
// install.forced.php into directory htdocs/install (This is the case with some wizard
// installer like DoliWamp, DoliMamp or DoliBuntu).
// We first init "forced values" to nothing.
-if (! isset($force_install_noedit)) $force_install_noedit='';
-if (! isset($force_install_type)) $force_install_type='';
-if (! isset($force_install_dbserver)) $force_install_dbserver='';
-if (! isset($force_install_port)) $force_install_port='';
-if (! isset($force_install_database)) $force_install_database='';
-if (! isset($force_install_createdatabase)) $force_install_createdatabase='';
-if (! isset($force_install_databaselogin)) $force_install_databaselogin='';
-if (! isset($force_install_databasepass)) $force_install_databasepass='';
-if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin='';
-if (! isset($force_install_databaserootpass)) $force_install_databaserootpass='';
+if (! isset($force_install_noedit)) $force_install_noedit='';
+if (! isset($force_install_type)) $force_install_type='';
+if (! isset($force_install_dbserver)) $force_install_dbserver='';
+if (! isset($force_install_port)) $force_install_port='';
+if (! isset($force_install_database)) $force_install_database='';
+if (! isset($force_install_prefix)) $force_install_prefix='';
+if (! isset($force_install_createdatabase)) $force_install_createdatabase='';
+if (! isset($force_install_databaselogin)) $force_install_databaselogin='';
+if (! isset($force_install_databasepass)) $force_install_databasepass='';
+if (! isset($force_install_databaserootlogin)) $force_install_databaserootlogin='';
+if (! isset($force_install_databaserootpass)) $force_install_databaserootpass='';
// Now we load forced value from install.forced.php file.
$useforcedwizard=false;
if (file_exists("./install.forced.php")) { $useforcedwizard=true; include_once("./install.forced.php"); }
@@ -80,8 +81,7 @@ if (! empty($force_install_message))
}
?>
-
+
@@ -348,6 +348,16 @@ if (! empty($force_install_message))
value="">
+
+
+ trans("DatabasePrefix"); ?>
+
trans("CreateDatabase"); ?>
diff --git a/htdocs/langs/ca_ES/bills.lang b/htdocs/langs/ca_ES/bills.lang
index 0bed48fefee..0c2333182d3 100644
--- a/htdocs/langs/ca_ES/bills.lang
+++ b/htdocs/langs/ca_ES/bills.lang
@@ -231,6 +231,7 @@ ReductionsShort=Dto.
Discount=Descompte
Discounts=Descomptes
ShowDiscount=Veure el abonament
+ShowReduc=Visualitzar la deducció
RelativeDiscount=Descompte relatiu
GlobalDiscount=Descompte fixe
CreditNote=Abonament
@@ -342,6 +343,7 @@ LawApplicationPart2=les mercaderies romanen en propietat de
LawApplicationPart3=venedor fins al cobrament de
LawApplicationPart4=els seus preus
LimitedLiabilityCompanyCapital=SRL amb capital de
+UseLine=Aplicar
UseDiscount=Aplicar descompte
UseCredit=Utilitzar crèdit
UseCreditNoteInInvoicePayment=Reduir el pagament amb aquest crèdit
@@ -384,4 +386,4 @@ PDFCrabeDescription=Model de factura complet (model recomanat per defecte)
# oursin PDF Model
PDFOursinDescription=Model de factura complet (model alternatiu)
# NumRef Modules
-TerreNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures i %syymm-nnnn per als abonaments on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense permanència a 0
+TerreNumRefModelDesc1=Retorna el nombre sota el format %syymm-nnnn per a les factures i %syymm-nnnn per als abonaments on yy és l'any, mm. el mes i nnnn un comptador seqüencial sense ruptura i sense permanència a 0
\ No newline at end of file
diff --git a/htdocs/langs/ca_ES/boxes.lang b/htdocs/langs/ca_ES/boxes.lang
index 5c1e38c97b7..f87373490c4 100644
--- a/htdocs/langs/ca_ES/boxes.lang
+++ b/htdocs/langs/ca_ES/boxes.lang
@@ -46,16 +46,18 @@ BoxTitleTotalUnpaidSuppliersBills=Pendent a proveïdors
BoxTitleLastModifiedContacts=Els últims %s contactes/adreçes modificades
BoxTitleLastModifiedMembers=Els %s últims membres modificats
BoxMyLastBookmarks=Els meus %s darrers marcadors
+BoxOldestExpiredServices=Serveis antics expirats
+BoxLastExpiredServices=Els %s contractes més antics amb serveis actius expirats
+BoxTitleLastActionsToDo=Les %s últims esdeveniments a realitzar
+BoxTitleLastContracts=Els %s últims contractes
+BoxTitleLastModifiedDonations=Les %s últimes subvencions modificades
+BoxTitleLastModifiedExpenses=Els %s últims honoraris modificats
FailedToRefreshDataInfoNotUpToDate=Error en el refresc del flux RSS. Data de l'últim refresc :%s
LastRefreshDate=Data darrera actualització
NoRecordedBookmarks=No hi ha marcadors personals.
ClickToAdd=Haga feu clic aquí per afegir.
NoRecordedCustomers=Cap client registrat
NoRecordedContacts=Cap contacte registrat
-BoxTitleLastActionsToDo=Les %s últims esdeveniments a realitzar
-BoxTitleLastContracts=Els %s últims contractes
-BoxTitleLastModifiedDonations=Les %s últimes subvencions modificades
-BoxTitleLastModifiedExpenses=Els %s últims honoraris modificats
NoActionsToDo=Sense esdeveniments a realitzar
NoRecordedOrders=Sense comandes de clients registrats
NoRecordedProposals=Sense pressupostos registrats
diff --git a/htdocs/langs/ca_ES/contracts.lang b/htdocs/langs/ca_ES/contracts.lang
index bfd921fc256..fdfb72003a4 100644
--- a/htdocs/langs/ca_ES/contracts.lang
+++ b/htdocs/langs/ca_ES/contracts.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - ca_ES - contracts
+# Dolibarr language file - ca_ES - contracts
CHARSET=UTF-8
ContractsArea=Àrea contractes
ListOfContracts=Llistat de contractes
@@ -84,6 +84,7 @@ ConfirmMoveToAnotherContractQuestion=Escolliu qualsevol altre contracte del mate
PaymentRenewContractId=Renovació servei (número %s)
ExpiredSince=Expirat des del
RelatedContracts=Contractes associats
+NoExpiredServices=Sense serveis actius expirats
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Comercial signant del contracte
TypeContact_contrat_internal_SALESREPFOLL=Comercial seguiment del contracte
diff --git a/htdocs/langs/ca_ES/errors.lang b/htdocs/langs/ca_ES/errors.lang
index 08be00bafa6..dd2057d7bd2 100644
--- a/htdocs/langs/ca_ES/errors.lang
+++ b/htdocs/langs/ca_ES/errors.lang
@@ -1,8 +1,7 @@
-# Dolibarr language file - ca_ES - errors
+# Dolibarr language file - ca_ES - errors
CHARSET=UTF-8
MenuManager=Gestor de menú
-
-# Errors
+# Errors=undefined=
Error=Error
Errors=Errors
ErrorBadEMail=e-mail %s incorrecte
@@ -71,7 +70,7 @@ ErrorFileIsInfectedWithAVirus=L'antivirus no ha pogut validar aquest arxiu (és
ErrorSpecialCharNotAllowedForField=Els caràcters especials no són admesos pel camp "%s"
ErrorDatabaseParameterWrong=El paràmetre de configuració de la base de dades '%s ' té un valor no compatible per una instal lació de Dolibarr (ha de tenir el valor '%s ').
ErrorNumRefModel=Hi ha una referència a la base de dades (%s) i és incompatible amb aquesta numeració. Elimineu la línia o renomeneu la referència per activar aquest mòdul.
-ErrorQtyTooLowForThisSupplier= Quantitat insuficient per aquest proveïdor
+ErrorQtyTooLowForThisSupplier=Quantitat insuficient per aquest proveïdor
ErrorModuleSetupNotComplete=La configuració del mòdul sembla incompleta. Aneu al àrea Configuració - Mòduls per corregir
ErrorBadMask=Error en la màscara
ErrorBadMaskFailedToLocatePosOfSequence=Error, sense número de seqüència en la màscara
@@ -98,15 +97,15 @@ ErrorFailedToChangePassword=Error en la modificació de la contrasenya
ErrorLoginDoesNotExists=El compte d'usuari de %s no s'ha trobat.
ErrorLoginHasNoEmail=Aquest usuari no té e-mail. Impossible continuar.
ErrorBadValueForCode=Valor no vàlid per al codi. Torneu a intentar-ho amb un nou valor ...
-
+ErrorBothFieldCantBeNegative=Els camps %s i %s no poden ser negatius
# Warnings
-WarningNoDocumentModelActivated=No hi ha cap model per a la generació del document activat. Es prendrà un model per defecte fins que es configuri el mòdul.
-WarningsOnXLines=Alertes a %s línies font
-WarningConfFileMustBeReadOnly=Atenció, el seu fitxer (htdocs/conf/conf.php ) és accessible en escriptura al servidor web. Això representa un error seriós de seguretat. Modifiqueu els permisos per ser llegit únicament pel compte que executa el servidor Web.Si està executant Windows en undisco amb format FAT, sigui conscient que aquest sistema d'arxius no protegeix els arxius i no ofereix cap solució per reduir els riscos de manipulació d'aquest fitxer.
WarningSafeModeOnCheckExecDir=Atenció, està activada l'opció PHP safe_mode , la comanda ha d'estar dins d'un directori declarat dins del paràmetre php safe_mode_exec_dir .
WarningAllowUrlFopenMustBeOn=El paràmetre allow_url_fopen ha de ser especificat a on a l'arxiu php.ini per disposar d'aquest mòdul completament actiu. Ha de modificar aquest arxiu manualment
WarningBuildScriptNotRunned=L'script %s encara no ha executat la construcció de gràfics.
WarningBookmarkAlreadyExists=Ja existeix un marcador amb aquest títol o aquest URL.
WarningPassIsEmpty=Atenció: La contrasenya de la base de dades està buida. Això és un forat de seguretat. Cal afegir una contrasenya a la seva base de dades i canviar el seu arxiu conf.php per reflectir això.
+WarningConfFileMustBeReadOnly=Atenció, el seu fitxer (htdocs/conf/conf.php ) és accessible en escriptura al servidor web. Això representa un error seriós de seguretat. Modifiqueu els permisos per ser llegit únicament pel compte que executa el servidor Web.Si està executant Windows en undisco amb format FAT, sigui conscient que aquest sistema d'arxius no protegeix els arxius i no ofereix cap solució per reduir els riscos de manipulació d'aquest fitxer.
+WarningsOnXLines=Alertes a %s línies font
+WarningNoDocumentModelActivated=No hi ha cap model per a la generació del document activat. Es prendrà un model per defecte fins que es configuri el mòdul.
WarningInstallDirExists=Atenció: La carpeta install (htdocs/install ) encara existeix. Una vegada finalitzada la instal·lació la seva presència no és necessària, i representa un error seriós de seguretat. Hauríeu eliminar-la el més aviat possible.
WarningUntilDirRemoved=Aquesta alerta seguirà activa mentre la carpeta existeixi (alerta visible per als usuaris admin solament).
\ No newline at end of file
diff --git a/htdocs/langs/ca_ES/install.lang b/htdocs/langs/ca_ES/install.lang
index c3ac01b7081..1a6b3862337 100644
--- a/htdocs/langs/ca_ES/install.lang
+++ b/htdocs/langs/ca_ES/install.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - ca_ES - install
+# Dolibarr language file - ca_ES - install
CHARSET=UTF-8
InstallEasy=Hem procurat que la instal·lació sigui el més simple possible, vostè només ha de seguir els passos un a un.
MiscellanousChecks=Comprovació dels Prerequisits
@@ -51,6 +51,7 @@ ServerAddressDescription=Nom o adreça IP del servidor de base de dades, general
ServerPortDescription=Port del servidor de la base de dades. Deixar en blanc si ho desconeix.
DatabaseServer=Servidor de la base de dades
DatabaseName=Nom de la base de dades
+DatabasePrefix=Prefixe per a les taules
Login=Usuari
AdminLogin=Usuari de l'administrador de la base de dades Dolibarr. Deixi buit si es connecta com a anonymous
Password=Contrasenya
@@ -152,8 +153,9 @@ MigrationShippingDelivery=Actualització de les dades de expedicions
MigrationShippingDelivery2=Actualització de les dades expedicions 2
MigrationFinished=Acabada l'actualització
LastStepDesc=Últim pas : Indiqueu aquí el compte i la contrasenya del primer usuari que fareu servir per connectar-se a l'aplicació. No perdi aquests identificadors, és el compte que permet administrar la resta.
-#########
-# upgrade
+ActivateModule=Activació del mòdul %s
+#########=undefined
+# upgrade=undefined
MigrationFixData=Correcció de dades desnormalitzades
MigrationOrder=Migració de dades de les comandes clients
MigrationSupplierOrder=Migració de dades de les comandes a proveïdors
@@ -163,56 +165,56 @@ MigrationContract=Migració de dades dels contractes
MigrationSuccessfullUpdate=Actualització finalitzada
MigrationUpdateFailed=L'actualització ha fallat
MigrationRelationshipTables=Migració de les taules de relació (%s)
-# Payments Update
+# Payments Update
MigrationPaymentsUpdate=Actualització dels pagaments (vincle nn pagaments-factures)
MigrationPaymentsNumberToUpdate=%s pagament(s) a actualitzar
MigrationProcessPaymentUpdate=Actualització pagament(s) %s
MigrationPaymentsNothingToUpdate=No hi ha més pagaments orfes que hagin de corregir.
MigrationPaymentsNothingUpdatable=Cap pagament orfe de correcció.
-# Contracts Update
+# Contracts Update
MigrationContractsUpdate=Actualització dels contractes sense detalls (gestió del contracte + detall de contracte)
MigrationContractsNumberToUpdate=%s contracte(s) a actualitzar
MigrationContractsLineCreation=Creació linia contracte per contracte Ref. %s
MigrationContractsNothingToUpdate=No hi ha més contractes (vinculats a un producte) sense línies de detalls que hagin de corregir.
MigrationContractsFieldDontExist=Els camps fk_facture no existeixen ja. No hi ha operació pendent.
-# Contracts Empty Dates Update
+# Contracts Empty Dates Update
MigrationContractsEmptyDatesUpdate=Actualització de les dades de contractes no indicades
MigrationContractsEmptyDatesUpdateSuccess=Ok per data de contracte
MigrationContractsEmptyDatesNothingToUpdate=No hi ha més properes dates de contractes.
MigrationContractsEmptyCreationDatesUpdateSuccess=Ok per la data de creació
MigrationContractsEmptyCreationDatesNothingToUpdate=No hi ha més properes dates de creació.
-# Contracts Invalid Dates Update
+# Contracts Invalid Dates Update
MigrationContractsInvalidDatesUpdate=Actualització dades contracte incorrectes (per contractes amb detall en servei)
MigrationContractsInvalidDateFix=Corregir contracte %s (data contracte=%s, Data posada en servei min=%s)
MigrationContractsInvalidDatesNumber=%s contractes modificats
MigrationContractsInvalidDatesNothingToUpdate=No hi ha més de contractes que hagin de corregir-se.
-# Contracts Incoherent Dates Update
+# Contracts Incoherent Dates Update
MigrationContractsIncoherentCreationDateUpdate=Actualització de les dades de creació de contracte que tenen un valor incoherent
MigrationContractsIncoherentCreationDateUpdateSuccess=Ok
MigrationContractsIncoherentCreationDateNothingToUpdate=No hi ha més dades de contractes.
-# Reopening Contracts
+# Reopening Contracts
MigrationReopeningContracts=Reobertura dels contractes que tenen almenys un servei actiu no tancat
MigrationReopenThisContract=Reobertura contracte %s
MigrationReopenedContractsNumber=%s contractes modificats
MigrationReopeningContractsNothingToUpdate=No hi ha més contractes que hagin de reobrirse.
-# Migration transfert
+# Migration transfert
MigrationBankTransfertsUpdate=Actualització dels vincles entre registres bancaris i una transferència entre compte
MigrationBankTransfertsNothingToUpdate=Cap vincle desfasat
-# Migration delivery
+# Migration delivery
MigrationShipmentOrderMatching=Actualitzar notes d'expedició
MigrationDeliveryOrderMatching=Actualitzar recepcions
MigrationDeliveryDetail=Actualitzar recepcions
-# Migration stock
+# Migration stock
MigrationStockDetail=Actualitzar valor en stock dels productes
-# Migration menus
+# Migration menus
MigrationMenusDetail=Actualització de la taula de menús dinàmics
-# Migration delivery address
+# Migration delivery address
MigrationDeliveryAddress=Actualització de les adreces d'enviament en les notes de lliurament
-# Migration project task actors
+# Migration project task actors
MigrationProjectTaskActors=Migració de la taula llx_projet_task_actors
-# Migration project user resp
+# Migration project user resp
MigrationProjectUserResp=Migració del camp fk_user_resp de llx_projet a llx_element_contact
-# Migration project task time
+# Migration project task time
MigrationProjectTaskTime=Actualització de temps dedicat en segons
-# Migration Acctioncom
+# Migration Acctioncom=undefined
MigrationActioncommElement=Actualització de les dades de accions sobre elements
\ No newline at end of file
diff --git a/htdocs/langs/en_US/boxes.lang b/htdocs/langs/en_US/boxes.lang
index e60083b6258..6644af2ece3 100644
--- a/htdocs/langs/en_US/boxes.lang
+++ b/htdocs/langs/en_US/boxes.lang
@@ -46,16 +46,18 @@ BoxTitleTotalUnpaidCustomerBills=Unpaid customer's invoices
BoxTitleTotalUnpaidSuppliersBills=Unpaid supplier's invoices
BoxTitleLastModifiedContacts=Last %s modified contacts/addresses
BoxMyLastBookmarks=My last %s bookmarks
+BoxOldestExpiredServices=Oldest active expired services
+BoxLastExpiredServices=Last %s oldest contacts with active expired services
+BoxTitleLastActionsToDo=Last %s actions to do
+BoxTitleLastContracts=Last %s contracts
+BoxTitleLastModifiedDonations=Last %s modified donations
+BoxTitleLastModifiedExpenses=Last %s modified expenses
FailedToRefreshDataInfoNotUpToDate=Failed to refresh RSS flux. Last successfull refresh date: %s
LastRefreshDate=Last refresh date
NoRecordedBookmarks=No bookmarks defined.
ClickToAdd=Click here to add.
NoRecordedCustomers=No recorded customers
NoRecordedContacts=No recorded contacts
-BoxTitleLastActionsToDo=Last %s actions to do
-BoxTitleLastContracts=Last %s contracts
-BoxTitleLastModifiedDonations=Last %s modified donations
-BoxTitleLastModifiedExpenses=Last %s modified expenses
NoActionsToDo=No actions to do
NoRecordedOrders=No recorded customer's orders
NoRecordedProposals=No recorded proposals
@@ -67,4 +69,4 @@ NoModifiedSupplierBills=No recorded supplier's invoices
NoRecordedProducts=No recorded products/services
NoRecordedProspects=No recorded prospects
NoContractedProducts=No products/services contracted
-NoRecordedContracts=No recorded contracts
\ No newline at end of file
+NoRecordedContracts=No recorded contracts
diff --git a/htdocs/langs/en_US/contracts.lang b/htdocs/langs/en_US/contracts.lang
index d3f64feef96..c15fd25536d 100644
--- a/htdocs/langs/en_US/contracts.lang
+++ b/htdocs/langs/en_US/contracts.lang
@@ -85,6 +85,7 @@ ConfirmMoveToAnotherContractQuestion=Choose in which existing contract (of same
PaymentRenewContractId=Renew contract line (number %s)
ExpiredSince=Expiration date
RelatedContracts=Related contracts
+NoExpiredServices=No expired active services
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Sales representative signing contract
TypeContact_contrat_internal_SALESREPFOLL=Sales representative following-up contract
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 437e11c0faa..700f4750687 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -51,6 +51,7 @@ ServerAddressDescription=Name or ip address for database server, usually 'localh
ServerPortDescription=Database server port. Keep empty if unknown.
DatabaseServer=Database server
DatabaseName=Database name
+DatabasePrefix=Database prefix table
Login=Login
AdminLogin=Login for Dolibarr database owner.
Password=Password
diff --git a/htdocs/langs/es_ES/bills.lang b/htdocs/langs/es_ES/bills.lang
index 9501abc248f..e51b916dc7b 100644
--- a/htdocs/langs/es_ES/bills.lang
+++ b/htdocs/langs/es_ES/bills.lang
@@ -231,6 +231,7 @@ ReductionsShort=Dto.
Discount=Descuento
Discounts=Descuentos
ShowDiscount=Ver el abono
+ShowReduc=Visualizar la deducción
RelativeDiscount=Descuento relativo
GlobalDiscount=Descuento fijo
CreditNote=Abono
@@ -342,6 +343,7 @@ LawApplicationPart2=las mercancías permanecen en propiedad de
LawApplicationPart3=vendedor hasta el completo cobro de
LawApplicationPart4=sus precios
LimitedLiabilityCompanyCapital=SRL con capital de
+UseLine=Aplicar
UseDiscount=Aplicar descuento
UseCredit=Usar crédito
UseCreditNoteInInvoicePayment=Reducir el pago con este crédito
@@ -384,4 +386,4 @@ PDFCrabeDescription=Modelo de factura completo (modelo recomendado por defecto)
# oursin PDF Model
PDFOursinDescription=Modelo de factura completo (modelo alternativo)
# NumRef Modules
-TerreNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas y %syymm-nnnn para los abonos donde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin permanencia a 0
+TerreNumRefModelDesc1=Devuelve el número bajo el formato %syymm-nnnn para las facturas y %syymm-nnnn para los abonos donde yy es el año, mm. el mes y nnnn un contador secuencial sin ruptura y sin permanencia a 0
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/boxes.lang b/htdocs/langs/es_ES/boxes.lang
index 7ff3a8d01ad..734c8e0c8cd 100644
--- a/htdocs/langs/es_ES/boxes.lang
+++ b/htdocs/langs/es_ES/boxes.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - es_ES - boxes
+# Dolibarr language file - es_ES - boxes
CHARSET=UTF-8
BoxLastRssInfos=Hilos de información RSS
BoxLastProducts=Los %s últimos productos/servicios
@@ -46,16 +46,18 @@ BoxTitleTotalUnpaidSuppliersBills=Pendiente a proveedores
BoxTitleLastModifiedContacts=Los %s últimos contactos/direcciones modificadas
BoxTitleLastModifiedMembers=Los %s últimos miembros modificados
BoxMyLastBookmarks=Mis %s últimos marcadores
+BoxOldestExpiredServices=Servicios antiguos expirados
+BoxLastExpiredServices=Los %s contratos más antiguos con servicios activos expirados
+BoxTitleLastActionsToDo=Los %s últimos eventos a realizar
+BoxTitleLastContracts=Los %s últimos contratos
+BoxTitleLastModifiedDonations=Las %s últimas subvenciones modificadas
+BoxTitleLastModifiedExpenses=Los %s últimos honorarios modificados
FailedToRefreshDataInfoNotUpToDate=Error en el refresco del flujo RSS. Fecha del último refresco: %s
LastRefreshDate=Fecha última actualización
NoRecordedBookmarks=No hay marcadores personales.
ClickToAdd=Haga clic aquí para añadir.
NoRecordedCustomers=Ningún cliente registrado
NoRecordedContacts=Ningún contacto registrado
-BoxTitleLastActionsToDo=Los %s últimos eventos a realizar
-BoxTitleLastContracts=Los %s últimos contratos
-BoxTitleLastModifiedDonations=Las %s últimas subvenciones modificadas
-BoxTitleLastModifiedExpenses=Los %s últimos honorarios modificados
NoActionsToDo=Sin eventos a realizar
NoRecordedOrders=Sin pedidos de clientes registrados
NoRecordedProposals=Sin presupuestos registrados
diff --git a/htdocs/langs/es_ES/contracts.lang b/htdocs/langs/es_ES/contracts.lang
index 114ba38906b..12298ce4ca6 100644
--- a/htdocs/langs/es_ES/contracts.lang
+++ b/htdocs/langs/es_ES/contracts.lang
@@ -1,4 +1,4 @@
-# Dolibarr language file - es_ES - contracts
+# Dolibarr language file - es_ES - contracts
CHARSET=UTF-8
ContractsArea=Área contratos
ListOfContracts=Listado de contratos
@@ -84,10 +84,11 @@ ConfirmMoveToAnotherContractQuestion=Elija cualquier otro contrato del mismo ter
PaymentRenewContractId=Renovación servicio (número %s)
ExpiredSince=Expirado desde el
RelatedContracts=Contratos asociados
+NoExpiredServices=Sin servicios activos expirados
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Comercial firmante del contrato
TypeContact_contrat_internal_SALESREPFOLL=Comercial seguimiento del contrato
TypeContact_contrat_external_BILLING=Contacto cliente de facturación del contrato
TypeContact_contrat_external_CUSTOMER=Contacto cliente seguimiento del contrato
TypeContact_contrat_external_SALESREPSIGN=Contacto cliente firmante del contrato
-Error_CONTRACT_ADDON_NotDefined=Constante CONTRACT_ADDON no definida
\ No newline at end of file
+Error_CONTRACT_ADDON_NotDefined=Constante CONTRACT_ADDON no definida
\ No newline at end of file
diff --git a/htdocs/langs/es_ES/errors.lang b/htdocs/langs/es_ES/errors.lang
index 78a6d28c59e..170e20451b0 100644
--- a/htdocs/langs/es_ES/errors.lang
+++ b/htdocs/langs/es_ES/errors.lang
@@ -1,8 +1,7 @@
-# Dolibarr language file - es_ES - errors
+# Dolibarr language file - es_ES - errors
CHARSET=UTF-8
MenuManager=Gestor de menú
-
-# Errors
+# Errors=undefined
Error=Error
Errors=Errores
ErrorBadEMail=e-mail %s no correcto
@@ -71,7 +70,7 @@ ErrorFileIsInfectedWithAVirus=¡El antivirus no ha podido validar este archivo (
ErrorSpecialCharNotAllowedForField=Los caracteres especiales no son admitidos por el campo "%s"
ErrorDatabaseParameterWrong=El parámetro de configuración de la base de datos '%s ' tiene un valor no compatible para una instalación de Dolibarr (debe tener el valor '%s ').
ErrorNumRefModel=Hay una referencia en la base de datos (%s) y es incompatible con esta numeración. Elimine la línea o renombre la referencia para activar este módulo.
-ErrorQtyTooLowForThisSupplier= Cantidad insuficiente para este proveedor
+ErrorQtyTooLowForThisSupplier=Cantidad insuficiente para este proveedor
ErrorModuleSetupNotComplete=La configuración del módulo parece incompleta. Vaya al área Configuración - Módulos para corregir
ErrorBadMask=Error en la máscara
ErrorBadMaskFailedToLocatePosOfSequence=Error, sin número de secuencia en la máscara
@@ -98,7 +97,7 @@ ErrorFailedToChangePassword=Error en la modificación de la contraseña
ErrorLoginDoesNotExists=La cuenta de usuario de %s no se ha encontrado.
ErrorLoginHasNoEmail=Este usuario no tiene e-mail. Imposible continuar.
ErrorBadValueForCode=Valor incorrecto para el código. Vuelva a intentar con un nuevo valor...
-
+ErrorBothFieldCantBeNegative=Los campos %s y %s no pueden ser negativos
# Warnings
WarningSafeModeOnCheckExecDir=Atención, está activada la opción PHP safe_mode , el comando deberá estar dentro de un directorio declarado dentro del parámetro php safe_mode_exec_dir .
WarningAllowUrlFopenMustBeOn=El parámetro allow_url_fopen debe ser especificado a on en el archivo php.ini para disponer de este módulo completamente activo. Debe modificar este archivo manualmente
diff --git a/htdocs/langs/es_ES/install.lang b/htdocs/langs/es_ES/install.lang
index dcd1d5eeb40..1009d1a1e9f 100644
--- a/htdocs/langs/es_ES/install.lang
+++ b/htdocs/langs/es_ES/install.lang
@@ -51,6 +51,7 @@ ServerAddressDescription=Nombre o dirección IP del servidor de base de datos, g
ServerPortDescription=Puerto del servidor de la base de datos. Dejar en blanco si lo desconoce.
DatabaseServer=Servidor de la base de datos
DatabaseName=Nombre de la base de datos
+DatabasePrefix=Prefijo para las tablas
Login=Usuario
AdminLogin=Usuario del administrador de la base de datos Dolibarr. Deje vacío si se conecta en anonymous
Password=Contraseña
@@ -152,6 +153,7 @@ MigrationShippingDelivery=Actualización de los datos de expediciones
MigrationShippingDelivery2=Actualización de los datos de expediciones 2
MigrationFinished=Actualización terminada
LastStepDesc=Último paso : Indique aquí la cuenta y la contraseña del primer usuario que usted utilizará para conectarse a la aplicación. No pierda estos identificadores, es la cuenta que permite administrar el resto.
+ActivateModule=Activación del módulo %s
#########
# upgrade
MigrationFixData=Corrección de datos desnormalizados
@@ -163,56 +165,56 @@ MigrationContract=Migración de datos de los contratos
MigrationSuccessfullUpdate=Actualización finalizada
MigrationUpdateFailed=La actualización ha fallado
MigrationRelationshipTables=Migración de las tablas de relación (%s)
-# Payments Update
+# Payments Update=
MigrationPaymentsUpdate=Actualización de los pagos (vínculo n-n pagos-facturas)
MigrationPaymentsNumberToUpdate=%s pago(s) a actualizar
MigrationProcessPaymentUpdate=Actualización pago(s) %s
MigrationPaymentsNothingToUpdate=No hay más pagos huérfanos que deban corregirse.
MigrationPaymentsNothingUpdatable=Ningún pago huérfano corregible.
-# Contracts Update
+# Contracts Update=
MigrationContractsUpdate=Actualización de los contratos sin detalles (gestión del contrato + detalle de contrato)
MigrationContractsNumberToUpdate=%s contrato(s) a actualizar
MigrationContractsLineCreation=Creación linea contrato para contrato Ref. %s
MigrationContractsNothingToUpdate=No hay más contratos (vinculados a un producto) sin líneas de detalles que deban corregirse.
MigrationContractsFieldDontExist=Los campos fk_facture no existen ya. No hay operación pendiente.
-# Contracts Empty Dates Update
+# Contracts Empty Dates Update=
MigrationContractsEmptyDatesUpdate=Actualización de las fechas de contratos no indicadas
MigrationContractsEmptyDatesUpdateSuccess=Ok para fecha de contrato
MigrationContractsEmptyDatesNothingToUpdate=No hay más próximas fechas de contratos.
MigrationContractsEmptyCreationDatesUpdateSuccess=Ok para la fecha de creación
MigrationContractsEmptyCreationDatesNothingToUpdate=No hay más próximas fechas de creación.
-# Contracts Invalid Dates Update
+# Contracts Invalid Dates Update=
MigrationContractsInvalidDatesUpdate=Actualización fechas contrato incorrectas (para contratos con detalle en servicio)
MigrationContractsInvalidDateFix=Corregir contrato %s (fecha contrato=%s, Fecha puesta en servicio min=%s)
MigrationContractsInvalidDatesNumber=%s contratos modificados
MigrationContractsInvalidDatesNothingToUpdate=No hay más de contratos que deban corregirse.
-# Contracts Incoherent Dates Update
+# Contracts Incoherent Dates Update=
MigrationContractsIncoherentCreationDateUpdate=Actualización de las fechas de creación de contrato que tienen un valor incoherente
MigrationContractsIncoherentCreationDateUpdateSuccess=Ok
MigrationContractsIncoherentCreationDateNothingToUpdate=No hay más fechas de contratos.
-# Reopening Contracts
+# Reopening Contracts=
MigrationReopeningContracts=Reapertura de los contratos que tienen al menos un servicio activo no cerrado
MigrationReopenThisContract=Reapertura contrato %s
MigrationReopenedContractsNumber=%s contratos modificados
MigrationReopeningContractsNothingToUpdate=No hay más contratos que deban reabrirse.
-# Migration transfert
+# Migration transfert=
MigrationBankTransfertsUpdate=Actualización de los vínculos entre registros bancarios y una transferencia entre cuenta
MigrationBankTransfertsNothingToUpdate=Ningún vínculo desfasado
-# Migration delivery
+# Migration delivery=
MigrationShipmentOrderMatching=Actualizar notas de expedición
MigrationDeliveryOrderMatching=Actualizar recepciones
MigrationDeliveryDetail=Actualizar recepciones
-# Migration stock
+# Migration stock=
MigrationStockDetail=Actualizar valor en stock de los productos
-# Migration menus
+# Migration menus=
MigrationMenusDetail=Actualización de la tabla de menús dinámicos
-# Migration delivery address
+# Migration delivery address=
MigrationDeliveryAddress=Actualización de las direcciones de envío en las notas de entrega
-# Migration project task actors
+# Migration project task actors=
MigrationProjectTaskActors=Migración de la tabla llx_projet_task_actors
-# Migration project user resp
+# Migration project user resp=
MigrationProjectUserResp=Migración del campo fk_user_resp de llx_projet a llx_element_contact
-# Migration project task time
+# Migration project task time=
MigrationProjectTaskTime=Actualización de tiempo dedicado en segundos
# Migration Acctioncom
-MigrationActioncommElement=Actualización de los datos de acciones sobre elementos
\ No newline at end of file
+MigrationActioncommElement=Actualización de los datos de acciones sobre elementos
diff --git a/htdocs/langs/fr_FR/boxes.lang b/htdocs/langs/fr_FR/boxes.lang
index 9d027f04938..b70f098fc02 100644
--- a/htdocs/langs/fr_FR/boxes.lang
+++ b/htdocs/langs/fr_FR/boxes.lang
@@ -46,16 +46,18 @@ BoxTitleTotalUnpaidSuppliersBills=Impayés fournisseurs
BoxTitleLastModifiedContacts=Les %s derniers contacts/adresses modifiés
BoxTitleLastModifiedMembers=Les %s derniers adhérents modifiés
BoxMyLastBookmarks=Mes %s derniers marque-pages
+BoxOldestExpiredServices=Plus anciens services expirés
+BoxLastExpiredServices=Les %s plus anciens contrats avec services actifs expirés
+BoxTitleLastActionsToDo=Les %s derniers événements à réaliser
+BoxTitleLastContracts=Les %s derniers contrats
+BoxTitleLastModifiedDonations=Les %s derniers dons modifiés
+BoxTitleLastModifiedExpenses=Les %s dernières note de frais modifiées
FailedToRefreshDataInfoNotUpToDate=Échec du rafraichissement du flux RSS. Date du dernier rafraichissement: %s
LastRefreshDate=Date dernier rafraichissement
NoRecordedBookmarks=Pas de bookmarks personnels.
ClickToAdd=Cliquer ici pour ajouter.
NoRecordedCustomers=Pas de client enregistré
NoRecordedContacts=Pas de contact enregistré
-BoxTitleLastActionsToDo=Les %s derniers événements à réaliser
-BoxTitleLastContracts=Les %s derniers contrats
-BoxTitleLastModifiedDonations=Les %s derniers dons modifiés
-BoxTitleLastModifiedExpenses=Les %s dernières note de frais modifiées
NoActionsToDo=Pas d'événements à réaliser
NoRecordedOrders=Pas de commande client enregistrée
NoRecordedProposals=Pas de proposition commerciale enregistrée
@@ -67,4 +69,4 @@ NoModifiedSupplierBills=Pas de facture fournisseur modifiée
NoRecordedProducts=Pas de produit/service enregistré
NoRecordedProspects=Pas de prospect enregistré
NoContractedProducts=Pas de produit/service contracté
-NoRecordedContracts=Pas de contrat enregistré
\ No newline at end of file
+NoRecordedContracts=Pas de contrat enregistré
diff --git a/htdocs/langs/fr_FR/contracts.lang b/htdocs/langs/fr_FR/contracts.lang
index 36e28880dac..48524434588 100644
--- a/htdocs/langs/fr_FR/contracts.lang
+++ b/htdocs/langs/fr_FR/contracts.lang
@@ -85,6 +85,7 @@ ConfirmMoveToAnotherContractQuestion=Choisissez vers quel autre contrat de ce m
PaymentRenewContractId=Renouvellement service (numéro %s)
ExpiredSince=Expiré le
RelatedContracts=Contrats associés
+NoExpiredServices=Pas de services actifs expirés
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Commercial signataire du contrat
TypeContact_contrat_internal_SALESREPFOLL=Commercial suivi du contrat
diff --git a/htdocs/langs/fr_FR/install.lang b/htdocs/langs/fr_FR/install.lang
index 83619fd68aa..55872123ef4 100644
--- a/htdocs/langs/fr_FR/install.lang
+++ b/htdocs/langs/fr_FR/install.lang
@@ -51,6 +51,7 @@ ServerAddressDescription=Nom ou adresse ip du serveur de base de données, gén
ServerPortDescription=Port du serveur. Ne rien mettre si inconnu.
DatabaseServer=Serveur de la base de données
DatabaseName=Nom de la base de données
+DatabasePrefix=Préfixe des tables
Login=Login
AdminLogin=Login du propriétaire de la base de données Dolibarr.
Password=Mot de passe
diff --git a/htdocs/langs/pt_PT/projects.lang b/htdocs/langs/pt_PT/projects.lang
index 27119869d45..7acec13a463 100644
--- a/htdocs/langs/pt_PT/projects.lang
+++ b/htdocs/langs/pt_PT/projects.lang
@@ -1,97 +1,98 @@
-# Dolibarr language file - pt_PT - projects
-CHARSET=UTF-8
-Project=Projecto
-Projects=Projectos
-SharedProject=Projecto Partilhado
-Myprojects=Os Meus Projectos
-ProjectsArea=Área de Projectos
-NewProject=Novo Projecto
-AddProject=Criar Projecto
-DeleteAProject=Eliminar um Projecto
-DeleteATask=Eliminar uma Tarefa
-ConfirmDeleteAProject=¿Está seguro de querer eliminar este projecto?
-ConfirmDeleteATask=¿Está seguro de querer eliminar esta tarefa?
-OfficerProject=Responsável do Projecto
-LastProjects=Os %s Ultimos Projectos
-AllProjects=Todos os Projectos
-ProjectsList=Lista de Projectos
-ShowProject=Adicionar Projecto
-SetProject=Definir Projecto
-NoProject=Nenhum Projecto Definido
-NbOpenTasks=Nº Tarefas Abertas
-NbOfProjects=Nº de Projectos
-TimeSpent=Tempo Dedicado
-RefTask=Ref. Tarefa
-LabelTask=Etiqueta de Tarefa
-NewTimeSpent=Novo Tempo Dedicado
-MyTimeSpent=O Meu Tempo Dedicado
-MyTasks=As minhas Tarefas
-Tasks=Tarefas
-Task=Tarefa
-NewTask=Nova Tarefa
-AddTask=Adicionar Tarefa
-AddDuration=Indicar Duração
-Activity=Actividade
-Activities=Tarefas/Actividades
-MyActivity=A Minha Actividade
-MyActivities=As Tarefas/Actividades
-DurationEffective=Duração Efectiva
-MyProjects=Os Meus Projectos
-Time=Tempo
-ListProposalsAssociatedProject=Lista de Orçamentos Associados ao Projecto
-ListOrdersAssociatedProject=Lista de Pedidos Associados ao Projecto
-ListInvoicesAssociatedProject=Lista de Facturas Associadas ao Projecto
-ListPredefinedInvoicesAssociatedProject=Lista de Facturas a Clientes Predefinidas Associadas ao Projecto
-ListSupplierOrdersAssociatedProject=Lista de Pedidos a Fornecedores Associados ao Projecto
-ListSupplierInvoicesAssociatedProject=Lista de Facturas de Fornecedor Associados ao Projecto
-ListContractAssociatedProject=Lista de Contratos Associados ao Projecto
-ActivityOnProjectThisWeek=Actividade ao Projecto esta Semana
-ActivityOnProjectThisMonth=Actividade ao Projecto este Mês
-ActivityOnProjectThisYear=Actividade ao Projecto este Ano
-ChildOfTask=Link da Tarefa
-NotOwnerOfProject=Não é responsável deste projecto privado
-AffectedTo=Atribuido a
-CantRemoveProject=Este projecto não pode ser eliminado porque está referenciado por muito objectos (facturas, pedidos e outros). ver a lista no separador referencias.
-
-
-
-// START - Lines generated via autotranslator.php tool (2010-09-04 01:33:40).
-// Reference language: en_US -> pt_PT
-PrivateProject=Contatos do projeto
-MyProjectsDesc=Essa visão é limitada a projetos que você está um contato para (seja qual for o tipo).
-ProjectsPublicDesc=Essa visão apresenta todos os projetos que estão autorizados a ler.
-ProjectsDesc=Essa visão apresenta todos os projectos (as permissões de usuário conceder-lhe permissão para ver tudo).
-MyTasksDesc=Essa visão é limitada a projetos ou tarefas que são de um contato para (seja qual for o tipo).
-TasksPublicDesc=Essa visão apresenta todos os projectos e tarefas que têm permissão para ler.
-TasksDesc=Essa visão apresenta todos os projectos e tarefas (as permissões de usuário conceder-lhe permissão para ver tudo).
+# Dolibarr language file - pt_PT - projects
+CHARSET=UTF-8
+Project=Projeto
+Projects=Projetos
+SharedProject=Todos
+PrivateProject=Contactos do projeto
+MyProjectsDesc=Essa visão é limitada a projetos onde você é o contacto(seja qual for o tipo).
+ProjectsPublicDesc=Essa visão apresenta todos os projetos que está autorizado a ler.
+ProjectsDesc=Essa visão apresenta todos os projetos (as permissões de usuário concedar-lhe-ao permissão para ver tudo).
+MyTasksDesc=Essa visão é limitada a projetos ou tarefas que são de um contacto(seja qual for o tipo).
+TasksPublicDesc=Essa visão apresenta todos os projetos e tarefas que têm permissão para ler.
+TasksDesc=Essa visão apresenta todos os projetos e tarefas (as permissões de usuário concedar-lhe-ao permissão para ver tudo).
+Myprojects=Meus Projetos
+ProjectsArea=Área de Projetos
+NewProject=Novo Projeto
+AddProject=Adicionar Projeto
+DeleteAProject=Eliminar um Projeto
+DeleteATask=Eliminar uma Tarefa
+ConfirmDeleteAProject=Tem a certeza que quer eliminar este projeto?
+ConfirmDeleteATask=Tem a certeza que quer eliminar esta tarefa?
+OfficerProject=Responsável pelo Projeto
+LastProjects=Últimos Projetos
+AllProjects=Todos os Projetos
+ProjectsList=Lista de Projetos
+ShowProject=Mostrar Projeto
+SetProject=Definir Projeto
+NoProject=Nenhum Projeto Definido
+NbOpenTasks=Nº de Tarefas Abertas
+NbOfProjects=Nº de Projetos
+TimeSpent=Tempo Dispendido
+TimesSpent=Tempos Dispendidos
+RefTask=Ref. da Tarefa
+LabelTask=Etiqueta de Tarefa
+NewTimeSpent=Novo Tempo Dispendido
+MyTimeSpent=Meu Tempo Dispendido
+MyTasks=Minhas Tarefas
+Tasks=Tarefas
+Task=Tarefa
+NewTask=Nova Tarefa
+AddTask=Adicionar Tarefa
+AddDuration=Adicionar Duração
+Activity=Atividade
+Activities=Tarefas/Atividades
+MyActivity=Minha Actividade
+MyActivities=Minhas Tarefas/Actividades
+MyProjects=Meus Projetos
+DurationEffective=Duração Efetiva
Progress=Progresso
-ListFichinterAssociatedProject=Lista de intervenções associadas ao projecto
-ListTripAssociatedProject=Lista de viagens e as despesas associadas ao projecto
-ListActionsAssociatedProject=Lista de acções associadas ao projecto
-ValidateProject=Validar projet
-ConfirmValidateProject=Tem certeza que deseja validar esse projeto?
+Time=Tempo
+ListProposalsAssociatedProject=Lista de Orçamentos Associados ao Projeto
+ListOrdersAssociatedProject=Lista de Encomendas Associadas ao Projeto
+ListInvoicesAssociatedProject=Lista de Faturas Associadas ao Projeto
+ListPredefinedInvoicesAssociatedProject=Lista de Faturas a Clientes Predefinidas Associadas ao Projeto
+ListSupplierOrdersAssociatedProject=Lista de Pedidos a Fornecedores Associados ao Projeto
+ListSupplierInvoicesAssociatedProject=Lista de Faturas de Fornecedores Associados ao Projeto
+ListContractAssociatedProject=Lista de Contratos Associados ao Projeto
+ListFichinterAssociatedProject=Lista de intervenções associadas ao projeto
+ListTripAssociatedProject=Lista de viagens e despesas associadas ao projeto
+ListActionsAssociatedProject=Lista de eventos associados ao projeto
+ActivityOnProjectThisWeek=Atividade do Projeto nesta Semana
+ActivityOnProjectThisMonth=Actividade do Projecto neste Mês
+ActivityOnProjectThisYear=Actividade do Projecto neste Ano
+ChildOfTask=Link do Projeto/Tarefa
+NotOwnerOfProject=Não é responsável por este projeto privado
+AffectedTo=Atribuido a
+CantRemoveProject=Este projeto não pode ser eliminado porque está referenciado por alguns objetos (faturas, pedidos e outros). ver lista de referencias.
+ValidateProject=Validar Projeto
+ConfirmValidateProject=Tem certeza que deseja validar este projeto?
CloseAProject=Fechar projeto
ConfirmCloseAProject=Tem certeza que quer fechar este projeto?
-ReOpenAProject=projeto Open
-ConfirmReOpenAProject=Tem certeza que quer reabrir esse projeto?
-ProjectContact=contatos Project
-ActionsOnProject=Ações sobre o projecto
-YouAreNotContactOfProject=Você não é um contato deste projecto privado
-DeleteATimeSpent=Excluir tempo gasto
-ConfirmDeleteATimeSpent=Tem certeza que quer deletar este tempo?
-DoNotShowMyTasksOnly=Veja também as tarefas que eu não sou afetado
-ShowMyTasksOnly=Ver tarefas só sou afetado
-TaskRessourceLinks=Ressources
+ReOpenAProject=Abrir Projeto
+ConfirmReOpenAProject=Tem certeza que quer reabrir este projeto?
+ProjectContact=contatos do Projeto
+ActionsOnProject=Ações sobre o projeto
+YouAreNotContactOfProject=Não é um contato deste projeto privado
+DeleteATimeSpent=Excluir o tempo gasto
+ConfirmDeleteATimeSpent=Tem certeza que quer eliminar este tempo dispensado?
+DoNotShowMyTasksOnly=Ver também as tarefas não atribuidas por mim
+ShowMyTasksOnly=Ver tarefas atribuidas por mim
+TaskRessourceLinks=Recursos
ProjectsDedicatedToThisThirdParty=Projetos dedicados a este terceiro
-NoTasks=As tarefas para este projeto
-LinkedToAnotherCompany=Vinculado ao terceiro que
-TypeContact_project_internal_PROJECTLEADER=O líder do projeto
-TypeContact_project_external_PROJECTLEADER=O líder do projeto
+NoTasks=Não existem tarefas para este projeto
+LinkedToAnotherCompany=Vinculado a Terceiros
+TaskIsNotAffectedToYou=Tarefa não atribuida a si
+ErrorTimeSpentIsEmpty=Tempo dispensado está vazio
+ThisWillAlsoRemoveTasks=Esta ação também vai excluir todas as tarefas do projeto (%s tarefas no momento) e todas as entradas de tempo dispensadas.
+IfNeedToUseOhterObjectKeepEmpty=Caso alguns objetos (fatura, encomenda, ...), pertencentes a um terceiro, deve estar vinculado ao projeto para criar, manter este vazio para ter o projeto sendo multi-terceiros.
+##### Types de contacts #####
+TypeContact_project_internal_PROJECTLEADER=Líder do projeto
+TypeContact_project_external_PROJECTLEADER=Líder do projeto
TypeContact_project_internal_CONTRIBUTOR=Contribuinte
TypeContact_project_external_CONTRIBUTOR=Contribuinte
-TypeContact_project_task_internal_TASKEXECUTIVE=executivo Task
-TypeContact_project_task_external_TASKEXECUTIVE=executivo Task
+TypeContact_project_task_internal_TASKEXECUTIVE=Tarefa executiva
+TypeContact_project_task_external_TASKEXECUTIVE=Tarefa executiva
TypeContact_project_task_internal_CONTRIBUTOR=Contribuinte
TypeContact_project_task_external_CONTRIBUTOR=Contribuinte
+# Documents models
DocumentModelBaleine=modelo de um projeto completo do relatório (logo. ..)
-// STOP - Lines generated via autotranslator.php tool (2010-09-04 01:37:05).
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index b00e62e0db6..9182ed82d74 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 6c7c086f897..643085d09a4 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/canvas/service/actions_card_service.class.php b/htdocs/product/canvas/service/actions_card_service.class.php
index f43399e4670..dd3b7e1e98c 100755
--- a/htdocs/product/canvas/service/actions_card_service.class.php
+++ b/htdocs/product/canvas/service/actions_card_service.class.php
@@ -282,7 +282,7 @@ class ActionsCardService extends Product
}
else
{
- dol_print_error($db,$sql);
+ dol_print_error($this->db,$sql);
}
}
@@ -298,6 +298,7 @@ class ActionsCardService extends Product
function LoadListDatas($limit, $offset, $sortfield, $sortorder)
{
global $conf;
+ global $search_categ,$sall,$sref,$sbarcode,$snom,$catid;
$this->getFieldList();
diff --git a/htdocs/product/stock/fiche.php b/htdocs/product/stock/fiche.php
index f8043f306d8..20ef429d4c8 100644
--- a/htdocs/product/stock/fiche.php
+++ b/htdocs/product/stock/fiche.php
@@ -292,7 +292,7 @@ else
// Last movement
$sql = "SELECT max(m.datem) as datem";
- $sql .= " FROM llx_stock_mouvement as m";
+ $sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
$sql .= " WHERE m.fk_entrepot = '".$object->id."'";
$resqlbis = $db->query($sql);
if ($resqlbis)
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index fdfc8a86f66..8eb06a963d5 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -208,7 +208,7 @@ if ($resql)
// Last movement
$sql = "SELECT max(m.datem) as datem";
- $sql .= " FROM llx_stock_mouvement as m";
+ $sql .= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
$sql .= " WHERE m.fk_entrepot = '".$entrepot->id."'";
$resqlbis = $db->query($sql);
if ($resqlbis)
diff --git a/htdocs/product/stock/product.php b/htdocs/product/stock/product.php
index 873c27b1ff2..3f2e0bfb660 100644
--- a/htdocs/product/stock/product.php
+++ b/htdocs/product/stock/product.php
@@ -283,7 +283,7 @@ if ($_GET["id"] || $_GET["ref"])
// Last movement
$sql = "SELECT max(m.datem) as datem";
- $sql.= " FROM llx_stock_mouvement as m";
+ $sql.= " FROM ".MAIN_DB_PREFIX."stock_mouvement as m";
$sql.= " WHERE m.fk_product = '".$product->id."'";
$resqlbis = $db->query($sql);
if ($resqlbis)
diff --git a/htdocs/product/stock/valo.php b/htdocs/product/stock/valo.php
index 9f9bbe47be3..0533094b598 100644
--- a/htdocs/product/stock/valo.php
+++ b/htdocs/product/stock/valo.php
@@ -127,8 +127,8 @@ if ($result)
print ' ';
print ''.$langs->trans("Total").' ';
- print ''.price(price2num($total,'MT')).' '.$langs->trans('Currency'.$conf->monnaie).' ';
- print ''.price(price2num($totalsell,'MT')).' '.$langs->trans('Currency'.$conf->monnaie).' ';
+ print ''.price(price2num($total,'MT')).' '.$langs->trans('Currency'.$conf->currency).' ';
+ print ''.price(price2num($totalsell,'MT')).' '.$langs->trans('Currency'.$conf->currency).' ';
print ' ';
print " \n";
diff --git a/htdocs/public/donations/donateurs_code.php b/htdocs/public/donations/donateurs_code.php
index c85942d07fe..e2992904f12 100644
--- a/htdocs/public/donations/donateurs_code.php
+++ b/htdocs/public/donations/donateurs_code.php
@@ -81,7 +81,7 @@ if ($resql)
print "Anonyme Anonyme \n";
}
print "".dol_print_date($db->jdate($objp->datedon))." \n";
- print ''.number_format($objp->amount,2,'.',' ').' '.$langs->trans("Currency".$conf->monnaie).' ';
+ print ''.number_format($objp->amount,2,'.',' ').' '.$langs->trans("Currency".$conf->currency).' ';
print "";
$i++;
}
diff --git a/htdocs/public/members/new.php b/htdocs/public/members/new.php
index bb3da9ba07a..1923eff7c71 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 '
\n";
diff --git a/htdocs/public/paybox/newpayment.php b/htdocs/public/paybox/newpayment.php
index 880b69151fe..cb99d1404aa 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 500760dcfd2..02faff3b9cc 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 @@
trans('Capital'); ?>
-
trans('Capital'); ?>
-
diff --git a/htdocs/societe/canvas/company/tpl/card_view.tpl.php b/htdocs/societe/canvas/company/tpl/card_view.tpl.php
index 6797a3eb3a0..d5921d91243 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++) {
trans('Capital'); ?>
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 ' ';
?>
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index f36853e6bae..3d1b5ac9f70 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -1005,40 +1005,6 @@ class Societe extends CommonObject
}
- /**
- * \brief Retournes les factures impayees de la societe
- * \return array tableau des id de factures impayees
- *
- */
- function factures_impayes()
- {
- $facimp = array();
- /*
- * Lignes
- */
- $sql = "SELECT f.rowid";
- $sql .= " FROM ".MAIN_DB_PREFIX."facture as f WHERE f.fk_soc = '".$this->id . "'";
- $sql .= " AND f.fk_statut = '1' AND f.paye = '0'";
-
- $resql=$this->db->query($sql);
- if ($resql)
- {
- $num = $this->db->num_rows($resql);
- $i = 0;
-
- while ($i < $num)
- {
- $objp = $this->db->fetch_object($resql);
- $array_push($facimp, $objp->rowid);
- $i++;
- print $i;
- }
-
- $this->db->free();
- }
- return $facimp;
- }
-
/**
* Update record to set prefix
*/
diff --git a/htdocs/societe/lien.php b/htdocs/societe/lien.php
index ee9cd90fb74..80ef3db594e 100644
--- a/htdocs/societe/lien.php
+++ b/htdocs/societe/lien.php
@@ -184,7 +184,7 @@ if ($socid)
// Capital
- print ' '.$langs->trans("Capital").' '.$soc->capital.' '.$langs->trans("Currency".$conf->monnaie).' '.$langs->trans("Capital").' '.$soc->capital.' '.$langs->trans("Currency".$conf->currency).' '.$langs->trans("ParentCompany").' ';
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index 731a5e14eb2..b8b5c36296f 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -895,7 +895,7 @@ else
print ' '.$langs->trans('Capital').' '.$langs->trans('Capital').' '.$langs->trans("Capital").' '.$langs->trans("Capital").' '.$langs->trans('Capital').' ';
- 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 '