diff --git a/ChangeLog b/ChangeLog
index 032112429ae87c193a9fc01e617e69d4124a4419..dafb9ae8fa1818eea44f17cb8fe44e612f9d5e5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -52,7 +52,7 @@ For users:
- New: [ task #1204 ] add Numering contrat module free (like leopard in product module).
- New: [ task #712 ] Add warning when creating invoice from proposal or order, when there is already one invoice.
- New: Enable supplier price log table.
-- New: [ task #1204 ] add a External reference to contract.
+- New: [ task #1204 ] add a supplier reference to contract.
- New: [ task #1218 ] Can drag and drop an event from calendar to change its day.
- New: Optimize size of image static resources.
- New: Add hourly and daily amount on user card. Add weekly working hours and salary on user card.
@@ -60,7 +60,9 @@ For users:
- New: Add option MAIN_GENERATE_INVOICES_WITH_PICTURE to show picture
onto PDF like MAIN_GENERATE_PROPOSALS_WITH_PICTURE dir for proposals.
- New: Add more search field in list of cheque deposits.
+- New: Add feature to order to invoice on supplier part
- Upgrade phpexcel lib to 1.7.8
+- New : Use of MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR to use disk cache for big excel export
- Fix: [ bug #1487 ] PAYMENT_DELETE trigger does not intercept trigger action
- Fix: [ bug #1470, #1472, #1473] User trigger problem
- Fix: [ bug #1489, #1491 ] Intervention trigger problem
@@ -114,6 +116,7 @@ For developers:
- New: [ task #1511, #1426 ] Added hook "doActions" for supplier card and supplier order card.
- New: renamed table llx_c_pays to llx_c_country & libelle field to label.
- New: Added hook "formConfirm" and "doActions" for fichinter card
+- New: Can search list of thirdparties from web service on part of name.
- Qual: Renamed table llx_c_civilite into llx_c_civility,
field civilite into label in the same table,
and field civilite into civility in other table.
diff --git a/composer.json b/composer.json
index 4463efcfc749bcc97ba64e28c843c102db686438..f0de86ce7eaafb049a6c1c3678fae48dafa27cb0 100644
--- a/composer.json
+++ b/composer.json
@@ -24,6 +24,8 @@
"ext-mcrypt": "*",
"ext-openssl": "*",
"ext-mbstring": "*",
- "ext-soap": "*"
+ "ext-soap": "*",
+ "ext-zip": "*",
+ "ext-xml": "*"
}
}
diff --git a/htdocs/accountancy/class/accountingaccount.class.php b/htdocs/accountancy/class/accountingaccount.class.php
index e6ada14a7dbbe1703472338b3b6933a1d3263db2..c442eacc23c887543b6e58048b5ba61d823fe157 100644
--- a/htdocs/accountancy/class/accountingaccount.class.php
+++ b/htdocs/accountancy/class/accountingaccount.class.php
@@ -2,6 +2,7 @@
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
+ * Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
*
* 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
@@ -67,7 +68,7 @@ class AccountingAccount
{
if ($rowid || $account_number)
{
- $sql = "SELECT rowid, datec, tms, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, labe, fk_user_author, fk_user_modifn active";
+ $sql = "SELECT rowid, datec, tms, fk_pcg_version, pcg_type, pcg_subtype, account_number, account_parent, label, fk_user_author, fk_user_modif, active";
$sql.= " FROM " . MAIN_DB_PREFIX . "accountingaccount WHERE";
if ($rowid) {
$sql .= " rowid = '" . $rowid . "'";
diff --git a/htdocs/accountancy/customer/list.php b/htdocs/accountancy/customer/list.php
index 0d00a0a9127ab2a52df7df2e0bab96c1246583e8..3af059cad943c7d657f5d75227db40995cf939fe 100644
--- a/htdocs/accountancy/customer/list.php
+++ b/htdocs/accountancy/customer/list.php
@@ -3,7 +3,7 @@
* Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
* Copyright (C) 2014 Ari Elbaz (elarifr) <github@accedinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
*
* 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
@@ -26,7 +26,7 @@
*/
require '../../main.inc.php';
-
+
// Class
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
@@ -64,22 +64,22 @@ if ($action == 'ventil') {
$cpt = 0;
foreach ( $mesCasesCochees as $maLigneCochee ) {
// print '<div><font color="red">id selectionnee : '.$monChoix."</font></div>";
- $maLigneCourante = split("_", $maLigneCochee);
+ $maLigneCourante = explode("_", $maLigneCochee);
$monId = $maLigneCourante[0];
$monNumLigne = $maLigneCourante[1];
$monCompte = $mesCodesVentilChoisis[$monNumLigne];
-
+
$sql = " UPDATE " . MAIN_DB_PREFIX . "facturedet";
$sql .= " SET fk_code_ventilation = " . $monCompte;
$sql .= " WHERE rowid = " . $monId;
-
+
dol_syslog("/accountancy/customer/list.php sql=" . $sql, LOG_DEBUG);
if ($db->query($sql)) {
print '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '</font></div>';
} else {
print '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . $monCompte . '<br/> <pre>' . $sql . '</pre></font></div>';
}
-
+
$cpt ++;
}
} else {
@@ -130,15 +130,15 @@ $result = $db->query($sql);
if ($result) {
$num_lines = $db->num_rows($result);
$i = 0;
-
+
// TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list...
print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
-
+
print '<br><b>' . $langs->trans("DescVentilTodoCustomer") . '</b></br>';
-
+
print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
print '<input type="hidden" name="action" value="ventil">';
-
+
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>' . $langs->trans("Invoice") . '</td>';
print '<td>' . $langs->trans("Ref") . '</td>';
@@ -149,24 +149,24 @@ if ($result) {
print '<td align="center">' . $langs->trans("IntoAccount") . '</td>';
print '<td align="center">' . $langs->trans("Ventilate") . '</td>';
print '</tr>';
-
+
$facture_static = new Facture($db);
$product_static = new Product($db);
$form = new Form($db);
-
+
$var = True;
while ( $i < min($num_lines, $limit) ) {
$objp = $db->fetch_object($result);
$var = ! $var;
-
+
// product_type: 0 = service ? 1 = product
// if product does not exist we use the value of product_type provided in facturedet to define if this is a product or service
// issue : if we change product_type value in product DB it should differ from the value stored in facturedet DB !
$code_sell_notset = '';
-
+
if (empty($objp->code_sell)) {
$code_sell_notset = 'color:red';
-
+
if (! empty($objp->type)) {
if ($objp->type == 1) {
$objp->code_sell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
@@ -175,7 +175,7 @@ if ($result) {
}
} else {
$code_sell_notset = 'color:blue';
-
+
if ($objp->type == 1) {
$objp->code_sell = (! empty($conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT) ? $conf->global->ACCOUNTING_PRODUCT_SOLD_ACCOUNT : $langs->trans("CodeNotDef"));
} else {
@@ -183,14 +183,14 @@ if ($result) {
}
}
}
-
+
print "<tr $bc[$var]>";
-
+
// Ref facture
$facture_static->ref = $objp->facnumber;
$facture_static->id = $objp->facid;
print '<td>' . $facture_static->getNomUrl(1) . '</td>';
-
+
// Ref produit
$product_static->ref = $objp->product_ref;
$product_static->id = $objp->product_id;
@@ -201,34 +201,34 @@ if ($result) {
else
print ' ';
print '</td>';
-
+
print '<td>' . dol_trunc($objp->product_label, 24) . '</td>';
print '<td>' . nl2br(dol_trunc($objp->description, 32)) . '</td>';
-
+
print '<td align="right">';
print price($objp->total_ht);
print '</td>';
-
+
print '<td align="center" style="' . $code_sell_notset . '">';
print $objp->code_sell;
print '</td>';
-
+
// Colonne choix du compte
print '<td align="center">';
print $formventilation->select_account($objp->aarowid, 'codeventil[]', 1);
print '</td>';
-
+
// Colonne choix ligne a ventiler
print '<td align="center">';
print '<input type="checkbox" name="mesCasesCochees[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
print '</td>';
-
+
print '</tr>';
$i ++;
}
-
+
print '<tr><td colspan="8"> </td></tr><tr><td colspan="8" align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventilate") . '"></td></tr>';
-
+
print '</table>';
print '</form>';
} else {
diff --git a/htdocs/accountancy/journal/bankjournal.php b/htdocs/accountancy/journal/bankjournal.php
index cb308a7e1af9cef0e0a36769fd84a4b0e528d16a..dcd8fca4d41078a13b494b2d8b631c1973917464 100644
--- a/htdocs/accountancy/journal/bankjournal.php
+++ b/htdocs/accountancy/journal/bankjournal.php
@@ -189,7 +189,7 @@ if ($result) {
else if ($links[$key]['type'] == 'company')
{
$societestatic->id = $links[$key]['url_id'];
- $societestatic->nom = $links[$key]['label'];
+ $societestatic->name = $links[$key]['label'];
$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
}
diff --git a/htdocs/accountancy/journal/cashjournal.php b/htdocs/accountancy/journal/cashjournal.php
index 52cdbb4f616e4f1c0034e14cc28e87b0f46af2d3..8af84a9ed58a87ad3efc39d92b232cadf6cca54c 100644
--- a/htdocs/accountancy/journal/cashjournal.php
+++ b/htdocs/accountancy/journal/cashjournal.php
@@ -171,7 +171,7 @@ if ($result) {
} else if ($links[$key]['type'] == 'company') {
$societestatic->id = $links[$key]['url_id'];
- $societestatic->nom = $links[$key]['label'];
+ $societestatic->name = $links[$key]['label'];
$tabpay[$obj->rowid]["soclib"] = $societestatic->getNomUrl(1, '', 30);
$tabtp[$obj->rowid][$compta_soc] += $obj->amount;
} else if ($links[$key]['type'] == 'sc') {
@@ -448,14 +448,14 @@ if ($action == 'export_csv') {
llxHeader('', $langs->trans("CashJournal"), '');
- $nom = $langs->trans("CashJournal");
+ $name = $langs->trans("CashJournal");
$nomlink = '';
$periodlink = '';
$exportlink = '';
$builddate = time();
$description = $langs->trans("DescCashJournal") . '<br>';
$period = $form->select_date($date_start, 'date_start', 0, 0, 0, '', 1, 0, 1) . ' - ' . $form->select_date($date_end, 'date_end', 0, 0, 0, '', 1, 0, 1);
- report_header($nom, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
+ report_header($name, $nomlink, $period, $periodlink, $description, $builddate, $exportlink, array('action' => ''));
print '<input type="button" class="button" style="float: right;" value="Export CSV" onclick="launch_export();" />';
diff --git a/htdocs/accountancy/supplier/list.php b/htdocs/accountancy/supplier/list.php
index f066821e0358560a141d34aadde5ccf691c0477b..4bf603236db8d14f801175c8abfe79fbe21902b3 100644
--- a/htdocs/accountancy/supplier/list.php
+++ b/htdocs/accountancy/supplier/list.php
@@ -1,7 +1,7 @@
<?php
/* Copyright (C) 2013-2014 Olivier Geffroy <jeff@jeffinfo.com>
* Copyright (C) 2013-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
- * Copyright (C) 2014 Ari Elbaz (elarifr) <github@accedinfo.com>
+ * Copyright (C) 2014 Ari Elbaz (elarifr) <github@accedinfo.com>
* Copyright (C) 2013-2014 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>s
*
@@ -26,7 +26,7 @@
*/
require '../../main.inc.php';
-
+
// Class
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.product.class.php';
@@ -63,25 +63,25 @@ if ($action == 'ventil') {
print '<div><font color="red">' . count($_POST["mesCasesCochees"]) . ' ' . $langs->trans("SelectedLines") . '</font></div>';
$mesCodesVentilChoisis = $codeventil;
$cpt = 0;
-
+
foreach ( $mesCasesCochees as $maLigneCochee ) {
// print '<div><font color="red">id selectionnee : '.$monChoix."</font></div>";
- $maLigneCourante = split("_", $maLigneCochee);
+ $maLigneCourante = explode("_", $maLigneCochee);
$monId = $maLigneCourante[0];
$monNumLigne = $maLigneCourante[1];
$monCompte = $mesCodesVentilChoisis[$monNumLigne];
-
+
$sql = " UPDATE " . MAIN_DB_PREFIX . "facture_fourn_det";
$sql .= " SET fk_code_ventilation = " . $monCompte;
$sql .= " WHERE rowid = " . $monId;
-
+
dol_syslog('accountancy/supplier/list.php:: sql=' . $sql);
if ($db->query($sql)) {
print '<div><font color="green">' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("VentilatedinAccount") . ' : ' . $monCompte . '</font></div>';
} else {
print '<div><font color="red">' . $langs->trans("ErrorDB") . ' : ' . $langs->trans("Lineofinvoice") . ' ' . $monId . ' ' . $langs->trans("NotVentilatedinAccount") . ' : ' . $monCompte . '<br/> <pre>' . $sql . '</pre></font></div>';
}
-
+
$cpt ++;
}
} else {
@@ -133,15 +133,15 @@ $result = $db->query($sql);
if ($result) {
$num_lines = $db->num_rows($result);
$i = 0;
-
+
// TODO : print_barre_liste always use $conf->liste_limit and do not care about custom limit in list...
print_barre_liste($langs->trans("InvoiceLines"), $page, $_SERVER["PHP_SELF"], "", $sortfield, $sortorder, '', $num_lines);
-
+
print '<td align="left"><br><b>' . $langs->trans("DescVentilTodoSupplier") . '</b></br></td>';
-
+
print '<form action="' . $_SERVER["PHP_SELF"] . '" method="post">' . "\n";
print '<input type="hidden" name="action" value="ventil">';
-
+
print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><td>Facture</td>';
print '<td align="left">' . $langs->trans("Ref") . '</td>';
@@ -152,22 +152,22 @@ if ($result) {
print '<td align="center">' . $langs->trans("IntoAccount") . '</td>';
print '<td align="center">' . $langs->trans("Ventilate") . '</td>';
print "</tr>\n";
-
+
$facturefourn_static = new FactureFournisseur($db);
$productfourn_static = new ProductFournisseur($db);
$form = new Form($db);
-
+
$var = True;
while ( $i < min($num_lines, $limit) ) {
$objp = $db->fetch_object($result);
$var = ! $var;
print "<tr $bc[$var]>";
-
+
// Ref facture
$facturefourn_static->ref = $objp->ref;
$facturefourn_static->id = $objp->facid;
print '<td>' . $facturefourn_static->getNomUrl(1) . '</td>';
-
+
// Ref facture supplier
$productfourn_static->ref = $objp->product_ref;
$productfourn_static->id = $objp->product_id;
@@ -178,23 +178,23 @@ if ($result) {
else
print ' ';
print '</td>';
-
+
// print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objp->facid.'">'.$objp->ref.'</a></td>';
-
+
// print '<td><a href="'.DOL_URL_ROOT.'/fourn/facture/card.php?facid='.$objp->facid.'">'.$objp->ref_supplier.'</a></td>';
-
+
print '<td>' . dol_trunc($objp->product_label, 24) . '</td>';
-
+
print '<td>' . stripslashes(nl2br($objp->description)) . '</td>';
-
+
print '<td align="right">';
print price($objp->price);
print '</td>';
-
+
print '<td align="right">';
print $objp->code_buy;
print '</td>';
-
+
// Colonne choix du compte
print '<td align="center">';
print $formventilation->select_account($objp->aarowid, 'codeventil[]', 1);
@@ -203,15 +203,15 @@ if ($result) {
print '<td align="center">';
print '<input type="checkbox" name="mesCasesCochees[]" value="' . $objp->rowid . "_" . $i . '"' . ($objp->aarowid ? "checked" : "") . '/>';
print '</td>';
-
+
print "</tr>";
$i ++;
}
-
+
print '<tr><td colspan="8"> </td></tr><tr><td colspan="8" align="center"><input type="submit" class="butAction" value="' . $langs->trans("Ventiler") . '"></td></tr>';
-
+
print "</table>";
-
+
print '</form>';
} else {
print $db->error();
diff --git a/htdocs/adherents/card.php b/htdocs/adherents/card.php
index 1c9de056accdd6b40b7ef54b1e7e66c5cb3e9e20..ca7706989e01383b2cfee8369825c259d335ce7e 100644
--- a/htdocs/adherents/card.php
+++ b/htdocs/adherents/card.php
@@ -108,7 +108,7 @@ if ($rowid)
}
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('membercard'));
+$hookmanager->initHooks(array('membercard','globalcard'));
/*
@@ -460,7 +460,7 @@ if ($action == 'add' && $user->rights->adherent->creer)
$object->email = $email;
$object->login = $login;
$object->pass = $pass;
- $object->naiss = $birthdate;
+ $object->birth = $birthdate;
$object->photo = $photo;
$object->typeid = $typeid;
//$object->note = $comment;
@@ -883,7 +883,7 @@ else
// Birthday
print "<tr><td>".$langs->trans("Birthday")."</td><td>\n";
- $form->select_date(($object->naiss ? $object->naiss : -1),'naiss','','',1,'formsoc');
+ $form->select_date(($object->birth ? $object->birth : -1),'birth','','',1,'formsoc');
print "</td></tr>\n";
// Profil public
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index bd43ed134af2f57b98e36668e2047f19f07a8e12..a057e7cba936fca59fc1be97815c0a6b01b63204 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1090,7 +1090,7 @@ class Adherent extends CommonObject
$this->ref = $obj->rowid;
$this->id = $obj->rowid;
$this->ref_ext = $obj->ref_ext;
- $this->civility_id = $obj->civility;
+ $this->civility_id = $obj->civility_id;
$this->firstname = $obj->firstname;
$this->lastname = $obj->lastname;
$this->login = $obj->login;
diff --git a/htdocs/adherents/class/adherent_type.class.php b/htdocs/adherents/class/adherent_type.class.php
index 43a272cf5749d0ee61766ec49f382b14e51c40cc..2d5f3d835be71c8ed2dc8f2392b7db7fe82d85f0 100644
--- a/htdocs/adherents/class/adherent_type.class.php
+++ b/htdocs/adherents/class/adherent_type.class.php
@@ -119,7 +119,7 @@ class AdherentType extends CommonObject
if ($result)
{
$action='update';
-
+
// Actions on extra fields (by external module or standard code)
$hookmanager->initHooks(array('membertypedao'));
$parameters=array('membertype'=>$this->id);
@@ -151,21 +151,23 @@ class AdherentType extends CommonObject
* Fonction qui permet de supprimer le status de l'adherent
*
* @param int $rowid Id of member type to delete
- * @return int >0 if OK, < 0 if KO
+ * @return int >0 if OK, 0 if not found, < 0 if KO
*/
- function delete($rowid)
+ function delete($rowid='')
{
- $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type WHERE rowid = $rowid";
+ if (empty($rowid)) $rowid=$this->id;
+
+ $sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type WHERE rowid = ".$rowid;
$resql=$this->db->query($sql);
if ($resql)
{
- if ( $this->db->affected_rows($resql) )
+ if ($this->db->affected_rows($resql))
{
return 1;
}
else
- {
+ {
return 0;
}
}
diff --git a/htdocs/adherents/type.php b/htdocs/adherents/type.php
index d9b04e3c506c14051db7522762563f734d913a66..0ffdc8b7e7f6e55952298d2b1cebf3121b5eb621 100644
--- a/htdocs/adherents/type.php
+++ b/htdocs/adherents/type.php
@@ -70,7 +70,7 @@ if (GETPOST('button_removefilter'))
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('membertypecard'));
+$hookmanager->initHooks(array('membertypecard','globalcard'));
/*
* Actions
diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php
index dc7c4cb3d79f6801efdbcc818bd7a5caa79276a6..d5b296b493208886431aaee8761230e3afb5f4de 100644
--- a/htdocs/admin/agenda_xcal.php
+++ b/htdocs/admin/agenda_xcal.php
@@ -142,7 +142,7 @@ print "</center>";
print "</form>\n";
-print '</div>';
+dol_fiche_end();
clearstatcache();
diff --git a/htdocs/admin/barcode.php b/htdocs/admin/barcode.php
index 78c99916910f6af08962fbf9f8cca0925b6378a2..11341f632a2a24aaddb1d9c764baae4881f690ef 100644
--- a/htdocs/admin/barcode.php
+++ b/htdocs/admin/barcode.php
@@ -396,7 +396,7 @@ if ($conf->produit->enabled)
$var = !$var;
print '<tr '.$bc[$var].'>';
- print '<td>'.$modBarCode->nom."</td><td>\n";
+ print '<td>'.(isset($modBarCode->name)?$modBarCode->name:$modBarCode->nom)."</td><td>\n";
print $modBarCode->info($langs);
print '</td>';
print '<td class="nowrap">'.$modBarCode->getExample($langs)."</td>\n";
diff --git a/htdocs/barcode/codeinit.php b/htdocs/barcode/codeinit.php
index 1484566dbaff20949de0aded914959c32d8f4fa3..19fb5c193bb2ed64b5825f29ac80e940c54d9edd 100644
--- a/htdocs/barcode/codeinit.php
+++ b/htdocs/barcode/codeinit.php
@@ -287,7 +287,7 @@ if ($conf->product->enabled || $conf->product->service)
{
print $langs->trans("BarCodeNumberManager").": ";
$objproduct=new Product($db);
- print '<b>'.$modBarCodeProduct->nom.'</b> - '.$langs->trans("NextValue").': <b>'.$modBarCodeProduct->getNextValue($objproduct).'</b><br>';
+ print '<b>'.(isset($modBarCodeProduct->name)?$modBarCodeProduct->name:$modBarCodeProduct->nom).'</b> - '.$langs->trans("NextValue").': <b>'.$modBarCodeProduct->getNextValue($objproduct).'</b><br>';
$disabled=0;
}
else
diff --git a/htdocs/cashdesk/css/style.css b/htdocs/cashdesk/css/style.css
index 578d8fed6a248022a6d8ea31ed68e7913be17543..c71dd9b78bc07a54bc25e65774b506c0482a8159 100644
--- a/htdocs/cashdesk/css/style.css
+++ b/htdocs/cashdesk/css/style.css
@@ -215,11 +215,6 @@ p.titre {
border: 1px solid #6d3f6d;
}
-.bouton_login input {
- background: #fff;
- border: 1px solid #6d3f6d;
-}
-
.principal {
float: left;
margin: 0 15px;
@@ -331,29 +326,6 @@ p.titre {
}
/* -------------- Boutons --------------------- */
-.bouton_ajout_article,.bouton_mode_reglement,.bouton_validation {
- border: 1px solid #999;
- background: #f7f7f7;
-
-background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(80,80,80,.3)) );
-}
-
-.bouton_ajout_article:hover,.bouton_mode_reglement:hover,.bouton_validation:hover
-{
- background: #cccccc;
-background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(80,80,80,.3) 100%);
-background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(80,80,80,.3)) );
-}
-
.bouton_ajout_article {
margin-top: 10px;
width: 100%;
diff --git a/htdocs/cashdesk/index.php b/htdocs/cashdesk/index.php
index 8ea6063a5e41adf72151a19bcc6e524e0d6e2e1f..a2eb40f293246aa1cd8d9f9930cb6f26cef73510 100644
--- a/htdocs/cashdesk/index.php
+++ b/htdocs/cashdesk/index.php
@@ -152,7 +152,7 @@ print "</tr>\n";
</table>
<br>
-<div align="center"><span class="bouton_login"><input name="sbmtConnexion" type="submit" value=<?php echo $langs->trans("Connection"); ?> /></span></div>
+<div align="center"><span class="bouton_login"><input class="button" name="sbmtConnexion" type="submit" value=<?php echo $langs->trans("Connection"); ?> /></span></div>
</form>
</fieldset>
diff --git a/htdocs/cashdesk/tpl/facturation1.tpl.php b/htdocs/cashdesk/tpl/facturation1.tpl.php
index 27c153b37994cfd228963aeeb56266e0260d3972..1a009fcead092ed7ab7382a7320037a1d32c3ad3 100644
--- a/htdocs/cashdesk/tpl/facturation1.tpl.php
+++ b/htdocs/cashdesk/tpl/facturation1.tpl.php
@@ -144,7 +144,7 @@ $langs->load("cashdesk");
</tr>
</table>
- <input class="bouton_ajout_article" type="submit" id="sbmtEnvoyer" value="<?php echo $langs->trans("AddThisArticle"); ?>" />
+ <input class="button bouton_ajout_article" type="submit" id="sbmtEnvoyer" value="<?php echo $langs->trans("AddThisArticle"); ?>" />
</form>
</fieldset>
@@ -179,7 +179,7 @@ $langs->load("cashdesk");
$langs->load("errors");
print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cash").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
}
- else print '<input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
+ else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cash").'" onclick="javascript: verifClic(\'ESP\');" />';
print '</td>';
print '<td>';
if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CHEQUE'] < 0)
@@ -187,7 +187,7 @@ $langs->load("cashdesk");
$langs->load("errors");
print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
}
- else print '<input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
+ else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("CreditCard").'" onclick="javascript: verifClic(\'CB\');" />';
print '</td>';
print '<td>';
if (empty($_SESSION['CASHDESK_ID_BANKACCOUNT_CB']) || $_SESSION['CASHDESK_ID_BANKACCOUNT_CB'] < 0)
@@ -195,7 +195,7 @@ $langs->load("cashdesk");
$langs->load("errors");
print '<input class="bouton_mode_reglement_disabled" type="button" name="btnModeReglement" value="'.$langs->trans("Cheque").'" title="'.dol_escape_htmltag($langs->trans("ErrorModuleSetupNotComplete")).'" />';
}
- else print '<input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cheque").'" onclick="javascript: verifClic(\'CHQ\');" />';
+ else print '<input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="'.$langs->trans("Cheque").'" onclick="javascript: verifClic(\'CHQ\');" />';
print '</td>';
?>
</tr>
@@ -203,14 +203,11 @@ $langs->load("cashdesk");
<table>
<tr>
<td>
- <input class="bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Reported"); ?>" onclick="javascript: verifClic('DIF');" />
+ <input class="button bouton_mode_reglement" type="submit" name="btnModeReglement" value="<?php echo $langs->trans("Reported"); ?>" onclick="javascript: verifClic('DIF');" />
<?php
echo $langs->trans("DateEcheance").' :';
print $form->select_date(-1,'txtDatePaiement');
?>
-<!-- <input class="texte2" type="text" id="txtDatePaiement" name="txtDatePaiement" value="" />
- <input class="bouton_cal" type="image" src="img/calendrier.png" id="btnCalendrier" value="..." title="<?php echo $langs->trans("CalTip"); ?>" />
- -->
</td>
</tr>
diff --git a/htdocs/categories/card.php b/htdocs/categories/card.php
index 3b5fa5d3189f140bee4232a0e6189fb803669b15..f09a526b3274d8b2bf6fa5e0b5f5b216089c8a77 100644
--- a/htdocs/categories/card.php
+++ b/htdocs/categories/card.php
@@ -1,9 +1,9 @@
<?php
-/* Copyright (C) 2005 Matthieu Valleton <mv@seeschloss.org>
- * Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
- * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
+/* Copyright (C) 2005 Matthieu Valleton <mv@seeschloss.org>
+ * Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2007 Patrick Raguin <patrick.raguin@gmail.com>
+ * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
*
* 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
@@ -116,7 +116,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
}
}
-
+
$object->label = $label;
$object->description = dol_htmlcleanlastbr($description);
@@ -125,7 +125,7 @@ if ($action == 'add' && $user->rights->categorie->creer)
$object->type = $type;
if ($parent != "-1") $object->fk_parent = $parent;
-
+
$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
if (! $object->label)
@@ -243,6 +243,7 @@ if ($user->rights->categorie->creer)
print $form->select_all_categories($type, $catorigin);
print '</td></tr>';
+ $parameters=array();
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
if (empty($reshook))
{
diff --git a/htdocs/categories/categorie.php b/htdocs/categories/categorie.php
index 89e15b9ecdd3689d5a3b750ec9cafbf70421f966..c74eefdc43077ae70c841d4727d4efab17173213 100644
--- a/htdocs/categories/categorie.php
+++ b/htdocs/categories/categorie.php
@@ -93,7 +93,7 @@ if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user,$objecttype,$objectid,$dbtablename,'','',$fieldid);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('categorycard'));
+$hookmanager->initHooks(array('categorycard','globalcard'));
/*
diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php
index e92dacc5dc96dc98a5d1afa01c7b3a607f29abd5..e4c0fe78aa97b52cf7211a7fc81faf3b53778499 100644
--- a/htdocs/comm/action/card.php
+++ b/htdocs/comm/action/card.php
@@ -68,7 +68,7 @@ $result = restrictedArea($user, 'agenda', $id, 'actioncomm&societe', 'myactions|
if ($user->societe_id && $socid) $result = restrictedArea($user,'societe',$socid);
$error=GETPOST("error");
-$donotclearsession=0;
+$donotclearsession=GETPOST('donotclearsession')?GETPOST('donotclearsession'):0;
$cactioncomm = new CActionComm($db);
$object = new ActionComm($db);
@@ -81,7 +81,7 @@ $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
//var_dump($_POST);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('actioncard'));
+$hookmanager->initHooks(array('actioncard','globalcard'));
/*
@@ -89,14 +89,16 @@ $hookmanager->initHooks(array('actioncard'));
*/
// Remove user to assigned list
-if (! empty($_POST['removedassigned']))
+if (GETPOST('removedassigned') || GETPOST('removedassigned') == '0')
{
- $idtoremove=$_POST['removedassigned'];
+ $idtoremove=GETPOST('removedassigned');
+
if (! empty($_SESSION['assignedtouser'])) $tmpassigneduserids=dol_json_decode($_SESSION['assignedtouser'],1);
else $tmpassigneduserids=array();
+
foreach ($tmpassigneduserids as $key => $val)
{
- if ($val['id'] == $idtoremove) unset($tmpassigneduserids[$key]);
+ if ($val['id'] == $idtoremove || $val['id'] == -1) unset($tmpassigneduserids[$key]);
}
//var_dump($_POST['removedassigned']);exit;
$_SESSION['assignedtouser']=dol_json_encode($tmpassigneduserids);
@@ -168,7 +170,7 @@ if ($action == 'add')
}
// Initialisation objet cactioncomm
- if (! GETPOST('actioncode') > 0)
+ if (! GETPOST('actioncode') > 0) // actioncode is id
{
$error++; $donotclearsession=1;
$action = 'create';
@@ -176,62 +178,63 @@ if ($action == 'add')
}
else
{
- $result=$cactioncomm->fetch(GETPOST('actioncode'));
+ $object->type_code = GETPOST('actioncode');
}
- // Initialisation objet actioncomm
- $object->type_id = $cactioncomm->id;
- $object->type_code = $cactioncomm->code;
- $object->priority = GETPOST("priority")?GETPOST("priority"):0;
- $object->fulldayevent = (! empty($fulldayevent)?1:0);
- $object->location = GETPOST("location");
- $object->label = trim(GETPOST('label'));
- $object->fk_element = GETPOST("fk_element");
- $object->elementtype = GETPOST("elementtype");
- if (! GETPOST('label'))
+ if (! $error)
{
- if (GETPOST('actioncode') == 'AC_RDV' && $contact->getFullName($langs))
- {
- $object->label = $langs->transnoentitiesnoconv("TaskRDVWith",$contact->getFullName($langs));
- }
- else
+ // Initialisation objet actioncomm
+ $object->priority = GETPOST("priority")?GETPOST("priority"):0;
+ $object->fulldayevent = (! empty($fulldayevent)?1:0);
+ $object->location = GETPOST("location");
+ $object->label = trim(GETPOST('label'));
+ $object->fk_element = GETPOST("fk_element");
+ $object->elementtype = GETPOST("elementtype");
+ if (! GETPOST('label'))
{
- if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code)
+ if (GETPOST('actioncode') == 'AC_RDV' && $contact->getFullName($langs))
{
- $object->label = $langs->transnoentitiesnoconv("Action".$object->type_code)."\n";
+ $object->label = $langs->transnoentitiesnoconv("TaskRDVWith",$contact->getFullName($langs));
+ }
+ else
+ {
+ if ($langs->trans("Action".$object->type_code) != "Action".$object->type_code)
+ {
+ $object->label = $langs->transnoentitiesnoconv("Action".$object->type_code)."\n";
+ }
+ else $object->label = $cactioncomm->libelle;
}
- else $object->label = $cactioncomm->libelle;
}
- }
- $object->fk_project = isset($_POST["projectid"])?$_POST["projectid"]:0;
- $object->datep = $datep;
- $object->datef = $datef;
- $object->percentage = $percentage;
- $object->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60;
+ $object->fk_project = isset($_POST["projectid"])?$_POST["projectid"]:0;
+ $object->datep = $datep;
+ $object->datef = $datef;
+ $object->percentage = $percentage;
+ $object->duree=((float) (GETPOST('dureehour') * 60) + (float) GETPOST('dureemin')) * 60;
- $listofuserid=array();
- if (! empty($_SESSION['assignedtouser'])) $listofuserid=dol_json_decode($_SESSION['assignedtouser']);
- $i=0;
- foreach($listofuserid as $key => $value)
- {
- if ($i == 0) // First entry
+ $listofuserid=array();
+ if (! empty($_SESSION['assignedtouser'])) $listofuserid=dol_json_decode($_SESSION['assignedtouser']);
+ $i=0;
+ foreach($listofuserid as $key => $value)
{
- $usertodo=new User($db);
- if ($value['id'] > 0)
+ if ($i == 0) // First entry
{
- $usertodo->fetch($value['id']);
- $object->userownerid = $usertodo->id;
+ $usertodo=new User($db);
+ if ($value['id'] > 0)
+ {
+ $usertodo->fetch($value['id']);
+ $object->userownerid = $usertodo->id;
+ }
+ $object->usertodo = $usertodo;
+ $object->transparency = (GETPOST("transparency")=='on'?1:0);
}
- $object->usertodo = $usertodo;
- $object->transparency = (GETPOST("transparency")=='on'?1:0);
- }
- $object->userassigned[$value['id']]=array('id'=>$value['id'], 'transparency'=>(GETPOST("transparency")=='on'?1:0));
+ $object->userassigned[$value['id']]=array('id'=>$value['id'], 'transparency'=>(GETPOST("transparency")=='on'?1:0));
- $i++;
+ $i++;
+ }
}
- if (! empty($conf->global->AGENDA_ENABLE_DONEBY))
+ if (! $error && ! empty($conf->global->AGENDA_ENABLE_DONEBY))
{
$userdone=new User($db);
if ($_POST["doneby"] > 0)
@@ -248,10 +251,10 @@ if ($action == 'add')
if (GETPOST('socid','int') > 0)
{
- $societe = new Societe($db);
- $societe->fetch(GETPOST('socid','int'));
- $object->societe = $societe; // deprecated
- $object->thirdparty = $societe;
+ $object->socid=GETPOST('socid','int');
+ $object->fetch_thirdparty();
+
+ $object->societe = $object->thirdparty; // For backward compatibility
}
// Special for module webcal and phenix
@@ -357,23 +360,23 @@ if ($action == 'update')
$datep=dol_mktime($fulldayevent?'00':$aphour, $fulldayevent?'00':$apmin, 0, $_POST["apmonth"], $_POST["apday"], $_POST["apyear"]);
$datef=dol_mktime($fulldayevent?'23':$p2hour, $fulldayevent?'59':$p2min, $fulldayevent?'59':'0', $_POST["p2month"], $_POST["p2day"], $_POST["p2year"]);
- $object->fk_action = dol_getIdFromCode($db, $_POST["actioncode"], 'c_actioncomm');
- $object->label = $_POST["label"];
+ $object->fk_action = dol_getIdFromCode($db, GETPOST("actioncode"), 'c_actioncomm');
+ $object->label = GETPOST("label");
$object->datep = $datep;
$object->datef = $datef;
$object->percentage = $percentage;
- $object->priority = $_POST["priority"];
- $object->fulldayevent= $_POST["fullday"]?1:0;
+ $object->priority = GETPOST("priority");
+ $object->fulldayevent= GETPOST("fullday")?1:0;
$object->location = GETPOST('location');
- $object->socid = $_POST["socid"];
- $object->contactid = $_POST["contactid"];
+ $object->socid = GETPOST("socid");
+ $object->contactid = GETPOST("contactid",'int');
//$object->societe->id = $_POST["socid"]; // deprecated
//$object->contact->id = $_POST["contactid"]; // deprecated
- $object->fk_project = $_POST["projectid"];
- $object->note = $_POST["note"];
- $object->pnote = $_POST["note"];
- $object->fk_element = $_POST["fk_element"];
- $object->elementtype = $_POST["elementtype"];
+ $object->fk_project = GETPOST("projectid",'int');
+ $object->note = GETPOST("note");
+ $object->pnote = GETPOST("note");
+ $object->fk_element = GETPOST("fk_element");
+ $object->elementtype = GETPOST("elementtype");
if (! $datef && $percentage == 100)
{
@@ -394,7 +397,7 @@ if ($action == 'update')
$tmplist1=dol_json_decode($_SESSION['assignedtouser'], true); $tmplist2=array();
foreach($tmplist1 as $key => $val)
{
- if ($val['id'] && $val['id'] != $assignedtouser) $listofuserid[$val['id']]=$val;
+ if ($val['id'] > 0 && $val['id'] != $assignedtouser) $listofuserid[$val['id']]=$val;
}
}
@@ -603,21 +606,22 @@ if ($action == 'create')
print '<form name="formaction" action="'.$_SERVER['PHP_SELF'].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
+ print '<input type="hidden" name="donotclearsession" value="1">';
if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1' ? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
+ if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print '<input type="hidden" name="actioncode" value="'.dol_getIdFromCode($db, 'AC_OTH', 'c_actioncomm').'">';
if (GETPOST("actioncode") == 'AC_RDV') print_fiche_titre($langs->trans("AddActionRendezVous"));
else print_fiche_titre($langs->trans("AddAnAction"));
print '<table class="border" width="100%">';
- // Type d'action actifs
+ // Type of event
if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
{
print '<tr><td width="30%"><span class="fieldrequired">'.$langs->trans("Type").'</span></b></td><td>';
$formactions->select_type_actions(GETPOST("actioncode")?GETPOST("actioncode"):$object->type_code, "actioncode","systemauto");
print '</td></tr>';
}
- else print '<input type="hidden" name="actioncode" value="AC_OTH">';
// Title
print '<tr><td'.(empty($conf->global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").'</td><td><input type="text" id="label" name="label" size="60" value="'.GETPOST('label').'"></td></tr>';
@@ -676,8 +680,15 @@ if ($action == 'create')
if ($assignedtouser) $listofuserid[$assignedtouser]=array('id'=>$assignedtouser,'mandatory'=>0,'transparency'=>$object->transparency); // Owner first
$_SESSION['assignedtouser']=dol_json_encode($listofuserid);
}
+ else
+ {
+ if (!empty($_SESSION['assignedtouser']))
+ {
+ $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
+ }
+ }
print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1);
- print $langs->trans("MyAvailability").': <input id="transparency" type="checkbox" name="transparency"'.(((! isset($_GET['transparency']) && ! isset($_POST['transparency'])) || GETPOST('transparency'))?' checked="checked"':'').'> '.$langs->trans("Busy");
+ if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': <input id="transparency" type="checkbox" name="transparency"'.(((! isset($_GET['transparency']) && ! isset($_POST['transparency'])) || GETPOST('transparency'))?' checked="checked"':'').'> '.$langs->trans("Busy");
print '</td></tr>';
// Realised by
@@ -854,6 +865,7 @@ if ($id > 0)
print '<input type="hidden" name="id" value="'.$id.'">';
print '<input type="hidden" name="ref_ext" value="'.$object->ref_ext.'">';
if ($backtopage) print '<input type="hidden" name="backtopage" value="'.($backtopage != '1'? $backtopage : $_SERVER["HTTP_REFERER"]).'">';
+ if (empty($conf->global->AGENDA_USE_EVENT_TYPE)) print '<input type="hidden" name="actioncode" value="'.$object->type_code.'">';
dol_fiche_head($head, 'card', $langs->trans("Action"),0,'action');
@@ -862,7 +874,7 @@ if ($id > 0)
// Ref
print '<tr><td width="30%">'.$langs->trans("Ref").'</td><td colspan="3">'.$object->id.'</td></tr>';
- // Type
+ // Type of event
if (! empty($conf->global->AGENDA_USE_EVENT_TYPE))
{
print '<tr><td class="fieldrequired">'.$langs->trans("Type").'</td><td colspan="3">';
@@ -918,8 +930,15 @@ if ($id > 0)
}
$_SESSION['assignedtouser']=dol_json_encode($listofuserid);
}
+ else
+ {
+ if (!empty($_SESSION['assignedtouser']))
+ {
+ $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
+ }
+ }
print $form->select_dolusers_forevent(($action=='create'?'add':'update'),'assignedtouser',1);
- print $langs->trans("MyAvailability").': <input id="transparency" type="checkbox" name="transparency"'.($listofuserid[$user->id]['transparency']?' checked="checked"':'').'">'.$langs->trans("Busy");
+ if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': <input id="transparency" type="checkbox" name="transparency"'.($listofuserid[$user->id]['transparency']?' checked="checked"':'').'">'.$langs->trans("Busy");
print '</td></tr>';
// Realised by
@@ -1081,8 +1100,15 @@ if ($id > 0)
}
$_SESSION['assignedtouser']=dol_json_encode($listofuserid);
}
+ else
+ {
+ if (!empty($_SESSION['assignedtouser']))
+ {
+ $listofuserid=dol_json_decode($_SESSION['assignedtouser'], true);
+ }
+ }
print $form->select_dolusers_forevent('view','assignedtouser',1);
- print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available")); // We show nothing if event is assigned to nobody
+ if (in_array($user->id,array_keys($listofuserid))) print $langs->trans("MyAvailability").': '.(($object->userassigned[$user->id]['transparency'] > 0)?$langs->trans("Busy"):$langs->trans("Available")); // We show nothing if event is assigned to nobody
print ' </td></tr>';
// Done by
@@ -1225,7 +1251,7 @@ if ($id > 0)
// Link to agenda views
print '<div id="agendaviewbutton">';
- print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left">';
+ print '<form name="listactionsfiltermonth" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="show_month">';
print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
@@ -1234,7 +1260,7 @@ if ($id > 0)
//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
print img_picto($langs->trans("ViewCal"),'object_calendar','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">';
print '</form>'."\n";
- print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left">';
+ print '<form name="listactionsfilterweek" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="show_week">';
print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
@@ -1243,7 +1269,7 @@ if ($id > 0)
//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
print img_picto($langs->trans("ViewCal"),'object_calendarweek','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewweek" value="'.$langs->trans("ViewWeek").'">';
print '</form>'."\n";
- print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left">';
+ print '<form name="listactionsfilterday" action="'.DOL_URL_ROOT.'/comm/action/index.php" method="POST" style="float: left; padding-right: 10px;">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="show_day">';
print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
@@ -1252,7 +1278,7 @@ if ($id > 0)
//print '<input type="hidden" name="day" value="'.dol_print_date($object->datep,'%d').'">';
print img_picto($langs->trans("ViewCal"),'object_calendarday','class="hideonsmartphone"').' <input type="submit" style="min-width: 120px" class="button" name="viewday" value="'.$langs->trans("ViewDay").'">';
print '</form>'."\n";
- print '<form name="listactionsfilterperuser" action="'.DOL_URL_ROOT.'/comm/action/peruser.php" method="POST" style="float: left">';
+ print '<form name="listactionsfilterperuser" action="'.DOL_URL_ROOT.'/comm/action/peruser.php" method="POST" style="float: left; padding-right: 10px;">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="show_peruser">';
print '<input type="hidden" name="year" value="'.dol_print_date($object->datep,'%Y').'">';
diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php
index fc75488ee3da700013dff0ccaff8c929b39bdf17..1d99a8eec34f5ada736e32913e3bcf5dadb6c588 100644
--- a/htdocs/comm/action/class/actioncomm.class.php
+++ b/htdocs/comm/action/class/actioncomm.class.php
@@ -95,18 +95,21 @@ class ActionComm extends CommonObject
*/
function __construct($db)
{
+ global $langs;
+
$this->db = $db;
//$this->author = new stdClass();
//$this->usermod = new stdClass();
//$this->usertodo = new stdClass();
//$this->userdone = new stdClass();
- $this->societe = new stdClass();
- $this->contact = new stdClass();
+ $this->societe = new stdClass(); // deprecated
+ $this->contact = new stdClass(); // deprecated
}
/**
- * Add an action/event into database
+ * Add an action/event into database.
+ * $this->type_id OR $this->type_code must be set.
*
* @param User $user Object user making action
* @param int $notrigger 1 = disable triggers, 0 = enable triggers
@@ -142,24 +145,26 @@ class ActionComm extends CommonObject
$userownerid=isset($this->usertodo->id)?$this->usertodo->id:$this->userownerid; // For backward compatibility
$userdoneid=isset($this->userdone->id)?$this->userdone->id:$this->userdoneid; // For backward compatibility
- if (! $this->type_id && $this->type_code)
+ if (! $this->type_id || ! $this->type_code)
{
+ $key=empty($this->type_id)?$this->type_code:$this->type_id;
+
// Get id from code
$cactioncomm=new CActionComm($this->db);
- $result=$cactioncomm->fetch($this->type_code);
+ $result=$cactioncomm->fetch($key);
if ($result > 0)
{
$this->type_id=$cactioncomm->id;
- $this->code=$cactioncomm->code;
+ $this->type_code=$cactioncomm->code;
}
else if ($result == 0)
{
- $this->error='Failed to get record with code '.$this->type_code.' from dictionary "type of events"';
+ $this->error='Failed to get record with id '.$this->type_id.' code '.$this->type_code.' from dictionary "type of events"';
return -1;
}
else
- {
+ {
$this->error=$cactioncomm->error;
return -1;
}
@@ -199,7 +204,7 @@ class ActionComm extends CommonObject
$sql.= (strval($this->datef)!=''?"'".$this->db->idate($this->datef)."'":"null").",";
$sql.= (isset($this->durationp) && $this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null").","; // deprecated
$sql.= (isset($this->type_id)?$this->type_id:"null").",";
- $sql.= (isset($this->code)?" '".$this->code."'":"null").",";
+ $sql.= (isset($this->type_code)?" '".$this->type_code."'":"null").",";
$sql.= (isset($this->socid) && $this->socid > 0?" '".$this->socid."'":"null").",";
$sql.= (isset($this->fk_project) && $this->fk_project > 0?" '".$this->fk_project."'":"null").",";
$sql.= " '".$this->db->escape($this->note)."',";
@@ -415,7 +420,9 @@ class ActionComm extends CommonObject
while ($obj = $this->db->fetch_object($resql2))
{
$this->userassigned[$obj->fk_element]=array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency);
+ if (empty($this->userownerid)) $this->userownerid=$obj->fk_element; // If not defined (should not happened, we fix this)
}
+
return 1;
}
else
@@ -524,6 +531,11 @@ class ActionComm extends CommonObject
return -1;
}
+ $socid=($this->socid?$this->socid:((isset($this->societe->id) && $this->societe->id > 0) ? $this->societe->id : 0));
+ $contactid=($this->contactid?$this->contactid:((isset($this->contact->id) && $this->contact->id > 0) ? $this->contact->id : 0));
+ $userownerid=($this->userownerid?$this->userownerid:((isset($this->usertodo->id) && $this->usertodo->id > 0) ? $this->usertodo->id : 0));
+ $userdoneid=($this->userdoneid?$this->userdoneid:((isset($this->userdone->id) && $this->userdone->id > 0) ? $this->userdone->id : 0));
+
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."actioncomm ";
@@ -534,16 +546,16 @@ class ActionComm extends CommonObject
$sql.= ", datep2 = ".(strval($this->datef)!='' ? "'".$this->db->idate($this->datef)."'" : 'null');
$sql.= ", durationp = ".(isset($this->durationp) && $this->durationp >= 0 && $this->durationp != ''?"'".$this->durationp."'":"null"); // deprecated
$sql.= ", note = ".($this->note ? "'".$this->db->escape($this->note)."'":"null");
- $sql.= ", fk_soc =". ($this->societe->id > 0 ? "'".$this->societe->id."'":"null");
+ $sql.= ", fk_soc =". ($this->socid > 0 ? "'".$this->socid."'":"null");
$sql.= ", fk_project =". ($this->fk_project > 0 ? "'".$this->fk_project."'":"null");
- $sql.= ", fk_contact =". ($this->contact->id > 0 ? "'".$this->contact->id."'":"null");
+ $sql.= ", fk_contact =". ($contactid > 0 ? "'".$this->contactid."'":"null");
$sql.= ", priority = '".$this->priority."'";
$sql.= ", fulldayevent = '".$this->fulldayevent."'";
$sql.= ", location = ".($this->location ? "'".$this->db->escape($this->location)."'":"null");
$sql.= ", transparency = '".$this->transparency."'";
$sql.= ", fk_user_mod = '".$user->id."'";
- $sql.= ", fk_user_action=".($this->usertodo->id > 0 ? "'".$this->usertodo->id."'":"null");
- $sql.= ", fk_user_done=".($this->userdone->id > 0 ? "'".$this->userdone->id."'":"null");
+ $sql.= ", fk_user_action=".($userownerid > 0 ? "'".$userownerid."'":"null");
+ $sql.= ", fk_user_done=".($userdoneid > 0 ? "'".$userdoneid."'":"null");
if (! empty($this->fk_element)) $sql.= ", fk_element=".($this->fk_element?$this->fk_element:"null");
if (! empty($this->elementtype)) $sql.= ", elementtype=".($this->elementtype?"'".$this->elementtype."'":"null");
$sql.= " WHERE id=".$this->id;
diff --git a/htdocs/comm/action/class/ical.class.php b/htdocs/comm/action/class/ical.class.php
index 717d7269fa26943f55cdeafef6e68494982f280a..2dd6ea2b1253ef61077da478422adfcf7a626656 100644
--- a/htdocs/comm/action/class/ical.class.php
+++ b/htdocs/comm/action/class/ical.class.php
@@ -1,8 +1,8 @@
<?php
-/* Copyright (C) 2006 Roman Ozana <ozana@omdesign.cz>
- * Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2006 Roman Ozana <ozana@omdesign.cz>
+ * Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2013-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
*
* 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
@@ -261,6 +261,7 @@ class ICal
*/
function ical_rrule($value)
{
+ $result=aray();
$rrule = explode(';',$value);
foreach ($rrule as $line)
{
@@ -299,6 +300,7 @@ class ICal
*/
function ical_dt_date($key, $value)
{
+ $return_value=array();
$value = $this->ical_date_to_unix($value);
// Analyse TZID
@@ -309,8 +311,8 @@ class ICal
$value = str_replace('T', '', $value);
return array($key,$value);
}
- // adding $value and $tzid
- $key = $temp[0];
+
+ $key = $temp[0];
$temp = explode("=", $temp[1]);
$return_value[$temp[0]] = $temp[1];
$return_value['unixtime'] = $value;
@@ -330,8 +332,9 @@ class ICal
{
usort($temp, array(&$this, "ical_dtstart_compare"));
return $temp;
- } else
- {
+ }
+ else
+ {
return false;
}
}
diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php
index ad3bfddd2efa28045e80d4301e8ae008f4fed7f3..b4c0b4edbfa6e86c324befa017b75881e73dc3ea 100644
--- a/htdocs/comm/action/peruser.php
+++ b/htdocs/comm/action/peruser.php
@@ -320,7 +320,7 @@ $sql.= ' a.datea2,';
$sql.= ' a.percent,';
$sql.= ' a.fk_user_author,a.fk_user_action,a.fk_user_done,';
$sql.= ' a.transparency, a.priority, a.fulldayevent, a.location,';
-$sql.= ' a.fk_soc, a.fk_contact,';
+$sql.= ' a.fk_soc, a.fk_contact, a.fk_element, a.elementtype,';
$sql.= ' ca.code, ca.color';
$sql.= ' FROM '.MAIN_DB_PREFIX.'c_actioncomm as ca, '.MAIN_DB_PREFIX."actioncomm as a";
if (! $user->rights->societe->client->voir && ! $socid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
@@ -415,6 +415,9 @@ if ($resql)
//$event->societe->id=$obj->fk_soc; // deprecated
//$event->contact->id=$obj->fk_contact; // deprecated
+ $event->fk_element=$obj->fk_element;
+ $event->elementtype=$obj->elementtype;
+
// Defined date_start_in_calendar and date_end_in_calendar property
// They are date start and end of action but modified to not be outside calendar view.
if ($event->percentage <= 0)
@@ -598,8 +601,13 @@ else
}
// Load array of colors by type
-// TODO
$colorsbytype=array();
+$sql="SELECT code, color FROM ".MAIN_DB_PREFIX."c_actioncomm";
+$resql=$db->query($sql);
+while ($obj = $db->fetch_object($resql))
+{
+ $colorsbytype[$obj->code]=$obj->color;
+}
// Loop on each user to show calendar
$todayarray=dol_getdate($now,'fast');
@@ -704,14 +712,15 @@ $db->close();
* @param int $showinfo Add extended information (used by day view)
* @param int $minheight Minimum height for each event. 60px by default.
* @param boolean $showheader Show header
+ * @param array $colorsbytype Array with colors by type
* @return void
*/
-function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false)
+function show_day_events2($username, $day, $month, $year, $monthshown, $style, &$eventarray, $maxprint=0, $maxnbofchar=16, $newparam='', $showinfo=0, $minheight=60, $showheader=false, $colorsbytype=array())
{
global $db;
- global $user, $conf, $langs;
+ global $user, $conf, $langs, $hookmanager, $action;
global $filter, $filtera, $filtert, $filterd, $status, $actioncode; // Filters used into search form
- global $theme_datacolor;
+ global $theme_datacolor; // Array with a list of different we can use (come from theme)
global $cachethirdparties, $cachecontacts, $colorindexused;
global $begin_h, $end_h;
@@ -743,6 +752,10 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
if (! in_array($username->id,$keysofuserassigned)) continue; // We discard record if event is from another user than user we want to show
//if ($username->id != $event->userownerid) continue; // We discard record if event is from another user than user we want to show
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('formatEvent',$parameters,$event,$action); // Note that $action and $object may have been modified by some hooks
+ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+
$ponct=($event->date_start_in_calendar == $event->date_end_in_calendar);
// Define $color (Hex string like '0088FF') and $cssclass of event
@@ -750,12 +763,13 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
if (in_array($user->id, $keysofuserassigned))
{
$nummytasks++; $cssclass='family_mytasks';
- $color=$event->type_color;
+ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color;
}
else if ($event->type_code == 'ICALEVENT')
{
$numical++;
- if (! empty($event->icalname)) {
+ if (! empty($event->icalname))
+ {
if (! isset($numicals[dol_string_nospecial($event->icalname)])) {
$numicals[dol_string_nospecial($event->icalname)] = 0;
}
@@ -772,7 +786,9 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
else
{
$numother++; $cssclass='family_other';
+ if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) $color=$event->type_color;
}
+
if ($color < 0) // Color was not forced. Set color according to color index.
{
// Define color index if not yet defined
@@ -858,8 +874,8 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
$cases2[$h][$event->id]['string']=$event->label;
$cases1[$h][$event->id]['typecode']=$event->type_code;
$cases2[$h][$event->id]['typecode']=$event->type_code;
- $cases1[$h][$event->id]['color']='009900';
- $cases2[$h][$event->id]['color']='009900';
+ $cases1[$h][$event->id]['color']=$color;
+ $cases2[$h][$event->id]['color']=$color;
}
}
$i++;
@@ -877,7 +893,8 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
$title1='';$title2='';
if (isset($cases1[$h]) && $cases1[$h] != '')
{
- $title1=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+ //$title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+ if (count($cases1[$h]) > 1) $title1.=count($cases1[$h]).' '.(count($cases1[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
$string1=' ';
$style1='peruser_notbusy';
foreach($cases1[$h] as $id => $ev)
@@ -887,7 +904,8 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
}
if (isset($cases2[$h]) && $cases2[$h] != '')
{
- $title2=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+ //$title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
+ if (count($cases2[$h]) > 1) $title2.=count($cases2[$h]).' '.(count($cases2[$h])==1?$langs->trans("Event"):$langs->trans("Events"));
$string2=' ';
$style2='peruser_notbusy';
foreach($cases2[$h] as $id => $ev)
@@ -903,7 +921,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
{
$ids=array_keys($cases1[$h]);
$output = array_slice($cases1[$h], 0, 1);
- if ($output[0]['string']) $title1.=' - '.$output[0]['string'];
+ if ($output[0]['string']) $title1.=($title1?' - ':'').$output[0]['string'];
if ($output[0]['color']) $color1 = $output[0]['color'];
}
else if (count($cases1[$h]) > 1) $color1='222222';
@@ -912,7 +930,7 @@ function show_day_events2($username, $day, $month, $year, $monthshown, $style, &
{
$ids=array_keys($cases2[$h]);
$output = array_slice($cases2[$h], 0, 1);
- if ($output[0]['string']) $title2.=' - '.$output[0]['string'];
+ if ($output[0]['string']) $title2.=($title2?' - ':'').$output[0]['string'];
if ($output[0]['color']) $color2 = $output[0]['color'];
}
else if (count($cases2[$h]) > 1) $color2='222222';
diff --git a/htdocs/comm/card.php b/htdocs/comm/card.php
index f1d27b791e6932d8d4d8c006bc45e69b56db669d..d0dd842cd7c75f9a2bb2514bf62ca6c665412ed2 100644
--- a/htdocs/comm/card.php
+++ b/htdocs/comm/card.php
@@ -68,7 +68,7 @@ if (! $sortorder) $sortorder="ASC";
if (! $sortfield) $sortfield="nom";
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('commcard'));
+$hookmanager->initHooks(array('commcard','globalcard'));
$object = new Societe($db);
diff --git a/htdocs/comm/contact.php b/htdocs/comm/contact.php
index d4652b57353474986f3de89d60d49671c84ae543..a80796fe5746b3b4f206d49a2d15614ea9fa34d3 100644
--- a/htdocs/comm/contact.php
+++ b/htdocs/comm/contact.php
@@ -72,7 +72,7 @@ if ($type == "f")
*
*/
-$sql = "SELECT s.rowid, s.nom, st.libelle as stcomm";
+$sql = "SELECT s.rowid, s.nom as name, st.libelle as stcomm";
$sql.= ", p.rowid as cidp, p.name, p.firstname, p.email, p.phone";
$sql.= " FROM ".MAIN_DB_PREFIX."c_stcomm as st,";
if (! $user->rights->societe->client->voir && ! $socid) $sql .= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
@@ -159,7 +159,7 @@ if ($resql)
print "<td>$obj->firstname</TD>";
print '<td><a href="'.$_SERVER["PHP_SELF"].'?type='.$type.'&socid='.$obj->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").'</a> ';
- print "<a href=\"".$urlfiche."?socid=".$obj->rowid."\">$obj->nom</a></td>\n";
+ print "<a href=\"".$urlfiche."?socid=".$obj->rowid."\">$obj->name</a></td>\n";
print '<td>'.dol_print_phone($obj->email,$obj->cidp,$obj->rowid,'AC_EMAIL').'</td>';
diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php
index 22068860076bfef1a0f267bb9116932b57799810..c534724671982b458562683b16d475163c575c70 100644
--- a/htdocs/comm/index.php
+++ b/htdocs/comm/index.php
@@ -444,7 +444,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
{
$langs->load("propal");
- $sql = "SELECT s.nom, s.rowid, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
+ $sql = "SELECT s.nom as name, s.rowid, p.rowid as propalid, p.total as total_ttc, p.total_ht, p.ref, p.fk_statut, p.datep as dp, p.fin_validite as dfv";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."propal as p";
if (! $user->rights->societe->client->voir && ! $socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -497,7 +497,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire)
print "</td>";
- print '<td align="left"><a href="card.php?socid='.$obj->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,44).'</a></td>'."\n";
+ print '<td align="left"><a href="card.php?socid='.$obj->rowid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,44).'</a></td>'."\n";
print '<td align="right">';
print dol_print_date($db->jdate($obj->dp),'day').'</td>'."\n";
print '<td align="right">'.price($obj->total_ttc).'</td>';
diff --git a/htdocs/comm/mailing/card.php b/htdocs/comm/mailing/card.php
index efff271a08c326353b8eea4420bac80a0e91c032..678ea8f622deb4d7328faf49b09d7260ec22e953 100644
--- a/htdocs/comm/mailing/card.php
+++ b/htdocs/comm/mailing/card.php
@@ -52,7 +52,7 @@ $extrafields = new ExtraFields($db);
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('mailingcard'));
+$hookmanager->initHooks(array('mailingcard','globalcard'));
// Array of possible substitutions (See also file mailing-send.php that should manage same substitutions)
$object->substitutionarray=array(
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 19be47d5b5f40a45b897af870dfcc67db5b067b2..34adf5d5f6805d8ff2b7f919af6339d365813e3b 100644
--- a/htdocs/comm/propal.php
+++ b/htdocs/comm/propal.php
@@ -96,7 +96,7 @@ if ($id > 0 || ! empty($ref)) {
}
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('propalcard'));
+$hookmanager->initHooks(array('propalcard','globalcard'));
$permissionnote = $user->rights->propale->creer; // Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index 8c7f38ed60738b65b4f01c0deba6c17be44a2d0c..de51cf63104c66a42b678cd971382d338f5184d4 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -381,7 +381,7 @@ if (! empty($conf->propal->enabled) && $user->rights->propale->lire)
/*
if (! empty($conf->propal->enabled))
{
- $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom, s.rowid as socid";
+ $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as name, s.rowid as socid";
$sql.=" FROM ".MAIN_DB_PREFIX."propal as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -433,7 +433,7 @@ if (! empty($conf->propal->enabled))
print '</td>';
- print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).'</a></td>';
print '<td align="right">'.$propalstatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
@@ -453,7 +453,7 @@ if (! empty($conf->propal->enabled))
*/
/*if (! empty($conf->propal->enabled))
{
- $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid";
+ $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -505,7 +505,7 @@ if (! empty($conf->propal->enabled))
print '</td>';
- print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
print '<td align="right">'.$propalstatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
diff --git a/htdocs/comm/propal/list.php b/htdocs/comm/propal/list.php
index 51c07eaa5b2cdb8c5b8da958a0e73ba0fc73e21c..6522a592097946c2a8445cddabe905e2583c503d 100644
--- a/htdocs/comm/propal/list.php
+++ b/htdocs/comm/propal/list.php
@@ -142,7 +142,7 @@ if (! $sortorder) $sortorder='DESC';
$limit = $conf->liste_limit;
-$sql = 'SELECT s.rowid, s.nom, s.town, s.client, s.code_client,';
+$sql = 'SELECT s.rowid, s.nom as name, s.town, s.client, s.code_client,';
$sql.= ' p.rowid as propalid, p.note_private, p.total_ht, p.ref, p.ref_client, p.fk_statut, p.fk_user_author, p.datep as dp, p.fin_validite as dfv,';
if (! $user->rights->societe->client->voir && ! $socid) $sql .= " sc.fk_soc, sc.fk_user,";
$sql.= ' u.login';
@@ -246,7 +246,7 @@ if ($result)
if ($search_montant_ht) $param.='&search_montant_ht='.$search_montant_ht;
if ($search_author) $param.='&search_author='.$search_author;
if ($search_town) $param.='&search_town='.$search_town;
- print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->nom:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+ print_barre_liste($langs->trans('ListOfProposals').' '.($socid?'- '.$soc->name:''), $page, $_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
// Lignes des champs de filtre
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
@@ -375,7 +375,7 @@ if ($result)
// Company
$companystatic->id=$objp->rowid;
- $companystatic->nom=$objp->nom;
+ $companystatic->name=$objp->name;
$companystatic->client=$objp->client;
$companystatic->code_client=$objp->code_client;
print '<td>';
diff --git a/htdocs/comm/prospect/list.php b/htdocs/comm/prospect/list.php
index 7dada3e115f13f76a1b7c2f36674af34a180aadd..94286ee4c53e8b3612434bbaf3525e53d808bf74 100644
--- a/htdocs/comm/prospect/list.php
+++ b/htdocs/comm/prospect/list.php
@@ -178,7 +178,7 @@ if ($action == 'cstc')
$formother=new FormOther($db);
$form=new Form($db);
-$sql = "SELECT s.rowid, s.nom, s.zip, s.town, s.datec, s.status as status, s.code_client, s.client,";
+$sql = "SELECT s.rowid, s.nom as name, s.zip, s.town, s.datec, s.status as status, s.code_client, s.client,";
$sql.= " st.libelle as stcomm, s.prefix_comm, s.fk_stcomm, s.fk_prospectlevel,";
$sql.= " d.nom as departement";
if ((!$user->rights->societe->client->voir && !$socid) || $search_sale) $sql .= ", sc.fk_soc, sc.fk_user"; // We need these fields in order to filter by sale (including the case where the user can only see his prospects)
@@ -402,7 +402,7 @@ if ($resql)
print '<tr '.$bc[$var].'>';
print '<td>';
$prospectstatic->id=$obj->rowid;
- $prospectstatic->nom=$obj->nom;
+ $prospectstatic->name=$obj->name;
$prospectstatic->status=$obj->status;
$prospectstatic->code_client=$obj->code_client;
$prospectstatic->client=$obj->client;
diff --git a/htdocs/comm/prospect/recap-prospect.php b/htdocs/comm/prospect/recap-prospect.php
index 1eb30f02b5512520a28e6450a063835501715723..5d7358a806e38c96d4e81018ef876667c5b5aa2d 100644
--- a/htdocs/comm/prospect/recap-prospect.php
+++ b/htdocs/comm/prospect/recap-prospect.php
@@ -64,8 +64,8 @@ if ($socid > 0)
print '<table class="border" width="100%">';
- // Nom
- print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
+ // Name
+ print '<tr><td width="20%">'.$langs->trans("Thirdpary").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
// Prefix
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
diff --git a/htdocs/comm/recap-client.php b/htdocs/comm/recap-client.php
index bb079a34169b7f6dee2ddd609d31f01555cacd56..ec54e553bdb9911a626f8272043dc4c893dd5653 100644
--- a/htdocs/comm/recap-client.php
+++ b/htdocs/comm/recap-client.php
@@ -63,8 +63,8 @@ if ($socid > 0)
print '<table class="border" width="100%">';
- // Nom
- print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
+ // Name
+ print '<tr><td width="20%">'.$langs->trans("Thirdparty").'</td><td width="80%" colspan="3">'.$societe->getNomUrl(1).'</td></tr>';
// Prefix
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
diff --git a/htdocs/commande/apercu.php b/htdocs/commande/apercu.php
index 1257769b95411ead3457a6073620433d056ae6db..abb2be95076a197dd673303afefb55dc17d925b8 100644
--- a/htdocs/commande/apercu.php
+++ b/htdocs/commande/apercu.php
@@ -167,7 +167,7 @@ if ($id > 0 || ! empty($ref))
// Client
print "<tr><td>".$langs->trans("Customer")."</td>";
print '<td colspan="2">';
- print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$soc->id.'">'.$soc->nom.'</a>';
+ print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$soc->id.'">'.$soc->getNomUrl(1).'</a>';
print '</td>';
print '</tr>';
diff --git a/htdocs/commande/card.php b/htdocs/commande/card.php
index 6c8c54791bf7ca909c6b5c3122581ce981efa3b0..92fed5968191871dfea27594a570df4c246446b7 100644
--- a/htdocs/commande/card.php
+++ b/htdocs/commande/card.php
@@ -90,7 +90,7 @@ if ($id > 0 || ! empty($ref)) {
}
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('ordercard'));
+$hookmanager->initHooks(array('ordercard','globalcard'));
$permissionnote = $user->rights->commande->creer; // Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/commande/customer.php b/htdocs/commande/customer.php
index 29812903d12b1a927424440062fbd26193e78aa1..f40277ea34ab53335e0fbee1bae5a2021daf84c7 100644
--- a/htdocs/commande/customer.php
+++ b/htdocs/commande/customer.php
@@ -67,7 +67,7 @@ $thirdpartystatic=new Societe($db);
* Mode List
*/
-$sql = "SELECT s.rowid, s.nom, s.client, s.town, s.datec, s.datea";
+$sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea";
$sql.= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st, ".MAIN_DB_PREFIX."commande as c";
@@ -161,7 +161,7 @@ if ($resql)
$lien=$lienfin='';
$lien = '<a href="'.dol_buildpath('/commande/orderstoinvoice.php',1).'?socid='.$obj->rowid.'">';
$lienfin='</a>';
- $name=$obj->nom;
+ $name=$obj->name;
$result.=($lien.img_object($langs->trans("ShowCompany").': '.$name,'company').$lienfin);
$result.=$lien.(dol_trunc($name,$maxlen)).$lienfin;
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 705354d401bc8d1f8952e6b4be1d3763921b2d44..b7d9be0552970b9e152ecf624818e14181c9b874 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -166,7 +166,7 @@ else
*/
if (! empty($conf->commande->enabled))
{
- $sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid";
+ $sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -195,7 +195,7 @@ if (! empty($conf->commande->enabled))
print "<tr ".$bc[$var].">";
print '<td class="nowrap">';
print "<a href=\"card.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."</a></td>";
- print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'</a></td></tr>';
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).'</a></td></tr>';
$i++;
}
}
@@ -215,7 +215,7 @@ $max=5;
*/
$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, c.date_cloture as datec, c.tms as datem,";
-$sql.= " s.nom, s.rowid as socid";
+$sql.= " s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as c,";
$sql.= " ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -268,7 +268,7 @@ if ($resql)
print '</td>';
- print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
print '<td>'.dol_print_date($db->jdate($obj->datem),'day').'</td>';
print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
print '</tr>';
@@ -285,7 +285,7 @@ else dol_print_error($db);
*/
if (! empty($conf->commande->enabled))
{
- $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid";
+ $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
$sql.=" FROM ".MAIN_DB_PREFIX."commande as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -337,7 +337,7 @@ if (! empty($conf->commande->enabled))
print '</td>';
- print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).'</a></td>';
print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
@@ -356,7 +356,7 @@ if (! empty($conf->commande->enabled))
*/
if (! empty($conf->commande->enabled))
{
- $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom, s.rowid as socid";
+ $sql = "SELECT c.rowid, c.ref, c.fk_statut, c.facture, s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -408,7 +408,7 @@ if (! empty($conf->commande->enabled))
print '</td>';
- print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
diff --git a/htdocs/commande/list.php b/htdocs/commande/list.php
index daf73effed3ce17efa8b5c817ea294b76fba525c..bd31a438b057f45458a449fb91d7944955677164 100644
--- a/htdocs/commande/list.php
+++ b/htdocs/commande/list.php
@@ -112,7 +112,7 @@ $companystatic = new Societe($db);
$help_url="EN:Module_Customers_Orders|FR:Module_Commandes_Clients|ES:Módulo_Pedidos_de_clientes";
llxHeader('',$langs->trans("Orders"),$help_url);
-$sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,';
+$sql = 'SELECT s.nom as name, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_client,';
$sql.= ' c.date_valid, c.date_commande, c.note_private, c.date_livraison, c.fk_statut, c.facture as facturee';
$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
$sql.= ', '.MAIN_DB_PREFIX.'commande as c';
@@ -221,7 +221,7 @@ if ($resql)
{
$soc = new Societe($db);
$soc->fetch($socid);
- $title = $langs->trans('ListOfOrders') . ' - '.$soc->nom;
+ $title = $langs->trans('ListOfOrders') . ' - '.$soc->name;
}
else
{
@@ -367,7 +367,7 @@ if ($resql)
// Company
$companystatic->id=$objp->socid;
- $companystatic->nom=$objp->nom;
+ $companystatic->name=$objp->name;
$companystatic->client=$objp->client;
print '<td>';
print $companystatic->getNomUrl(1,'customer');
@@ -380,7 +380,7 @@ if ($resql)
if (($objp->fk_statut > 0 && $objp->fk_statut < 3) || ($objp->fk_statut == 3 && $objp->facturee == 0))
{
print ' <a href="'.DOL_URL_ROOT.'/commande/orderstoinvoice.php?socid='.$companystatic->id.'">';
- print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->nom, 'object_bill', 'hideonsmartphone').'</a>';
+ print img_picto($langs->trans("CreateInvoiceForThisCustomer").' : '.$companystatic->name, 'object_bill', 'hideonsmartphone').'</a>';
}
}
}
diff --git a/htdocs/commande/orderstoinvoice.php b/htdocs/commande/orderstoinvoice.php
index eb29889f1150423b034c3f6c430ff2fd68085210..49824a7f6cb3f9df715461d37e928743f42389e1 100644
--- a/htdocs/commande/orderstoinvoice.php
+++ b/htdocs/commande/orderstoinvoice.php
@@ -573,7 +573,7 @@ if (($action != 'create' && $action != 'add') || !$error)
{
// Company
$companystatic->id=$socid;
- $companystatic->nom=$soc->nom;
+ $companystatic->name=$soc->name;
print '<h3>'.$companystatic->getNomUrl(1,'customer').'</h3>';
}
diff --git a/htdocs/compta/bank/account.php b/htdocs/compta/bank/account.php
index 14b586c6d80cc9121b57a162f8c9623e2f8f3d7b..87b7d3e62c54a9ab8b97bff42dadc4e54de6c528 100644
--- a/htdocs/compta/bank/account.php
+++ b/htdocs/compta/bank/account.php
@@ -680,7 +680,7 @@ if ($id > 0 || ! empty($ref))
if ($links[$key]['type']=='company')
{
$societestatic->id=$links[$key]['url_id'];
- $societestatic->nom=$links[$key]['label'];
+ $societestatic->name=$links[$key]['label'];
print $societestatic->getNomUrl(1,'',16);
}
else if ($links[$key]['type']=='user')
diff --git a/htdocs/compta/bank/search.php b/htdocs/compta/bank/search.php
index d30c1519f10e6b6387b97d92a00dbfedd9d3c160..25b7d91a3ffa80a83629c29b0cb35f4d14f9228c 100644
--- a/htdocs/compta/bank/search.php
+++ b/htdocs/compta/bank/search.php
@@ -4,7 +4,7 @@
* Copyright (C) 2005-2010 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2012 Vinícius Nogueira <viniciusvgn@gmail.com>
* Copyright (C) 2014 Florian Henry <florian.henry@open-cooncept.pro>
- *
+ *
* 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 3 of the License, or
@@ -158,7 +158,7 @@ if ($resql)
if (GETPOST("bid"))
{
$result=$bankcateg->fetch(GETPOST("bid"));
- print_barre_liste($langs->trans("BankTransactionForCategory",$bankcateg->label).' '.($socid?' '.$soc->nom:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
+ print_barre_liste($langs->trans("BankTransactionForCategory",$bankcateg->label).' '.($socid?' '.$soc->name:''), $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder, '', $num);
}
else
{
@@ -166,18 +166,18 @@ if ($resql)
}
print '<form method="post" action="search.php" name="search_form">';
-
+
$moreforfilter .= $langs->trans('Period') . ' ' . $langs->trans('StartDate') . ': ';
$moreforfilter .= $form->select_date($search_dt_start, 'search_start_dt', 0, 0, 1, "search_form", 1, 1, 1);
$moreforfilter .= $langs->trans('EndDate') . ':' . $form->select_date($search_dt_end, 'search_end_dt', 0, 0, 1, "search_form", 1, 1, 1);
-
-
+
+
if ($moreforfilter) {
print '<div class="liste_titre">';
print $moreforfilter;
print '</div>';
}
-
+
print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
print_liste_field_titre($langs->trans('Ref'),$_SERVER['PHP_SELF'],'b.rowid','',$param,'',$sortfield,$sortorder);
@@ -278,7 +278,7 @@ if ($resql)
if ($objp->url_id)
{
$companystatic->id=$objp->url_id;
- $companystatic->nom=$objp->labelurl;
+ $companystatic->name=$objp->labelurl;
print $companystatic->getNomUrl(1);
}
else
diff --git a/htdocs/compta/bank/treso.php b/htdocs/compta/bank/treso.php
index 909770cf38c7d9858e345fd9ce2ffc1e76afc743..7ac510525befb7e764d542d526e95c1aeae8a6b5 100644
--- a/htdocs/compta/bank/treso.php
+++ b/htdocs/compta/bank/treso.php
@@ -148,7 +148,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
// Customer invoices
$sql = "SELECT 'invoice' as family, f.rowid as objid, f.facnumber as ref, f.total_ttc, f.type, f.date_lim_reglement as dlr,";
- $sql.= " s.rowid as socid, s.nom, s.fournisseur";
+ $sql.= " s.rowid as socid, s.nom as name, s.fournisseur";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON f.fk_soc = s.rowid";
$sql.= " WHERE f.entity = ".$conf->entity;
@@ -158,7 +158,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
// Supplier invoices
$sql2= " SELECT 'invoice_supplier' as family, ff.rowid as objid, ff.ref_supplier as ref, (-1*ff.total_ttc) as total_ttc, ff.type, ff.date_lim_reglement as dlr,";
- $sql2.= " s.rowid as socid, s.nom, s.fournisseur";
+ $sql2.= " s.rowid as socid, s.nom as name, s.fournisseur";
$sql2.= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff";
$sql2.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON ff.fk_soc = s.rowid";
$sql2.= " WHERE ff.entity = ".$conf->entity;
@@ -265,7 +265,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
$ref = $facturefournstatic->getNomUrl(1,'');
$societestatic->id = $obj->socid;
- $societestatic->nom = $obj->nom;
+ $societestatic->name = $obj->name;
$refcomp=$societestatic->getNomUrl(1,'',24);
$paiement = -1*$facturefournstatic->getSommePaiement(); // Payment already done
@@ -279,7 +279,7 @@ if ($_REQUEST["account"] || $_REQUEST["ref"])
$ref = $facturestatic->getNomUrl(1,'');
$societestatic->id = $obj->socid;
- $societestatic->nom = $obj->nom;
+ $societestatic->name = $obj->name;
$refcomp=$societestatic->getNomUrl(1,'',24);
$paiement = $facturestatic->getSommePaiement(); // Payment already done
diff --git a/htdocs/compta/clients.php b/htdocs/compta/clients.php
index dbdc8c7236844a0335c3128cec78d0613e2bcc3d..528ed14e84936cf38b2a5ea7b18e082844fb6f7b 100644
--- a/htdocs/compta/clients.php
+++ b/htdocs/compta/clients.php
@@ -73,7 +73,7 @@ if ($action == 'note')
if ($mode == 'search') {
if ($modesearch == 'soc') {
$sql = "SELECT s.rowid FROM ".MAIN_DB_PREFIX."societe as s ";
- $sql.= " WHERE lower(s.nom) LIKE '%".$db->escape(strtolower($socname))."%'";
+ $sql.= " WHERE s.nom LIKE '%".$db->escape(strtolower($socname))."%'";
$sql.= " AND s.entity IN (".getEntity('societe', 1).")";
}
@@ -93,7 +93,7 @@ if ($mode == 'search') {
* Mode List
*/
-$sql = "SELECT s.rowid, s.nom, s.client, s.town, s.datec, s.datea";
+$sql = "SELECT s.rowid, s.nom as name, s.client, s.town, s.datec, s.datea";
$sql.= ", st.libelle as stcomm, s.prefix_comm, s.code_client, s.code_compta ";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."c_stcomm as st";
@@ -107,13 +107,13 @@ if (dol_strlen($stcomm))
}
if ($socname)
{
- $sql.= " AND s.nom LIKE '%".$db->escape(strtolower($socname))."%'";
+ $sql.= " AND s.nom LIKE '%".$db->escape($socname)."%'";
$sortfield = "s.nom";
$sortorder = "ASC";
}
if ($_GET["search_nom"])
{
- $sql.= " AND s.nom LIKE '%".$db->escape(strtolower($_GET["search_nom"]))."%'";
+ $sql.= " AND s.nom LIKE '%".$db->escape($_GET["search_nom"])."%'";
}
if ($_GET["search_compta"])
{
@@ -141,7 +141,7 @@ if ($resql)
$i = 0;
$langs->load('commercial');
-
+
print_barre_liste($langs->trans("ListOfCustomers"), $page, $_SERVER["PHP_SELF"],"",$sortfield,$sortorder,'',$num);
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
@@ -188,7 +188,7 @@ if ($resql)
print "<tr ".$bc[$var].">";
print '<td>';
$thirdpartystatic->id=$obj->rowid;
- $thirdpartystatic->nom=$obj->nom;
+ $thirdpartystatic->name=$obj->name;
$thirdpartystatic->client=$obj->client;
print $thirdpartystatic->getNomUrl(1,'compta');
print '</td>';
diff --git a/htdocs/compta/deplacement/card.php b/htdocs/compta/deplacement/card.php
index 80d1858d1679a4e9ca34137a7c6665f89912b81b..20433118bbf2c842e961dfb5386c2e7218e0fbf2 100644
--- a/htdocs/compta/deplacement/card.php
+++ b/htdocs/compta/deplacement/card.php
@@ -47,7 +47,7 @@ $confirm = GETPOST('confirm','alpha');
$object = new Deplacement($db);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('tripsandexpensescard'));
+$hookmanager->initHooks(array('tripsandexpensescard','globalcard'));
$permissionnote=$user->rights->deplacement->creer; // Used by the include of actions_setnotes.inc.php
diff --git a/htdocs/compta/deplacement/class/deplacement.class.php b/htdocs/compta/deplacement/class/deplacement.class.php
index 48d8c05ff0c2e8107b1859727072111795c7666e..4eab354577aefffc329f46b8bac4295b824a45dc 100644
--- a/htdocs/compta/deplacement/class/deplacement.class.php
+++ b/htdocs/compta/deplacement/class/deplacement.class.php
@@ -231,7 +231,7 @@ class Deplacement extends CommonObject
$sql.= " FROM ".MAIN_DB_PREFIX."deplacement";
$sql.= " WHERE entity IN (".getEntity('deplacement').")";
if ($ref) $sql.= " AND ref ='".$this->db->escape($ref)."'";
- else $sql.= " AND id = ".$id;
+ else $sql.= " AND rowid = ".$id;
dol_syslog(get_class($this)."::fetch", LOG_DEBUG);
$result = $this->db->query($sql);
diff --git a/htdocs/compta/dons/card.php b/htdocs/compta/dons/card.php
index a9c8a42448b0a2d9dfe3855a074c9252052551e3..e453ef623c3244b5e7dd026fecd057756355f0c4 100644
--- a/htdocs/compta/dons/card.php
+++ b/htdocs/compta/dons/card.php
@@ -50,7 +50,7 @@ $donation_date=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOS
$result = restrictedArea($user, 'don', $id);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('doncard'));
+$hookmanager->initHooks(array('doncard','globalcard'));
/*
diff --git a/htdocs/compta/dons/class/don.class.php b/htdocs/compta/dons/class/don.class.php
index ab33bdbb43dedc9934c71bfe45137d8db8fa467f..61e1b9cd9264931210c328bde9add39079225c1c 100644
--- a/htdocs/compta/dons/class/don.class.php
+++ b/htdocs/compta/dons/class/don.class.php
@@ -202,7 +202,8 @@ class Don extends CommonObject
/**
- * Check params
+ * Check params and init ->errors array.
+ * TODO This function seems to not be used by core code.
*
* @param int $minimum Minimum
* @return int 0 if KO, >0 if OK
@@ -212,39 +213,40 @@ class Don extends CommonObject
global $langs;
$langs->load('main');
$langs->load('companies');
-
+
+ $error_string = array();
$err = 0;
if (dol_strlen(trim($this->societe)) == 0)
{
if ((dol_strlen(trim($this->lastname)) + dol_strlen(trim($this->firstname))) == 0)
{
- $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Company').'/'.$langs->trans('Firstname').'-'.$langs->trans('Lastname'));
+ $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Company').'/'.$langs->trans('Firstname').'-'.$langs->trans('Lastname'));
$err++;
}
}
if (dol_strlen(trim($this->address)) == 0)
{
- $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Address'));
+ $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Address'));
$err++;
}
if (dol_strlen(trim($this->zip)) == 0)
{
- $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Zip'));
+ $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Zip'));
$err++;
}
if (dol_strlen(trim($this->town)) == 0)
{
- $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Town'));
+ $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Town'));
$err++;
}
if (dol_strlen(trim($this->email)) == 0)
{
- $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('EMail'));
+ $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('EMail'));
$err++;
}
@@ -256,7 +258,7 @@ class Don extends CommonObject
{
if (!isset($map[substr($this->amount, $i, 1)] ))
{
- $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount'));
+ $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount'));
$err++;
$amount_invalid = 1;
break;
@@ -267,14 +269,14 @@ class Don extends CommonObject
{
if ($this->amount == 0)
{
- $error_string[$err] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount'));
+ $error_string[] = $langs->trans('ErrorFieldRequired',$langs->trans('Amount'));
$err++;
}
else
{
if ($this->amount < $minimum && $minimum > 0)
{
- $error_string[$err] = $langs->trans('MinimumAmount',$langs->trans('$minimum'));
+ $error_string[] = $langs->trans('MinimumAmount',$langs->trans('$minimum'));
$err++;
}
}
@@ -282,14 +284,13 @@ class Don extends CommonObject
if ($err)
{
- $this->error = $error_string;
+ $this->errors = $error_string;
return 0;
}
else
- {
+ {
return 1;
}
-
}
/**
@@ -311,7 +312,7 @@ class Don extends CommonObject
$this->country=($this->country?$this->country:$this->country);
$now=dol_now();
-
+
$this->db->begin();
$sql = "INSERT INTO ".MAIN_DB_PREFIX."don (";
@@ -368,7 +369,7 @@ class Don extends CommonObject
// Call trigger
$result=$this->call_trigger('DON_CREATE',$user);
- if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+ if ($result < 0) { $error++; $this->db->rollback(); return -1; }
// End call triggers
$this->db->commit();
@@ -398,7 +399,7 @@ class Don extends CommonObject
$this->country=($this->country?$this->country:$this->country);
$this->db->begin();
-
+
$sql = "UPDATE ".MAIN_DB_PREFIX."don SET ";
$sql .= "amount = " . price2num($this->amount);
$sql .= ",fk_paiement = ".($this->modepaiementid?$this->modepaiementid:"null");
@@ -426,9 +427,9 @@ class Don extends CommonObject
{
// Call trigger
$result=$this->call_trigger('DON_UPDATE',$user);
- if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+ if ($result < 0) { $error++; $this->db->rollback(); return -1; }
// End call triggers
-
+
$this->db->commit();
return 1;
}
@@ -448,7 +449,7 @@ class Don extends CommonObject
*/
function delete($rowid)
{
-
+
$this->db-begin();
$sql = "DELETE FROM ".MAIN_DB_PREFIX."don WHERE rowid = $rowid AND fk_statut = 0;";
@@ -460,9 +461,9 @@ class Don extends CommonObject
{
// Call trigger
$result=$this->call_trigger('DON_DELETE',$user);
- if ($result < 0) { $error++; $this->db->rollback(); return -1; }
+ if ($result < 0) { $error++; $this->db->rollback(); return -1; }
// End call triggers
-
+
$this->db->commit();
return 1;
}
diff --git a/htdocs/compta/facture.php b/htdocs/compta/facture.php
index 83587861f7ba4362dfc2025db7d88ce28d92a87c..a358598264e9bc81083b8afee6c4ad59ba79ba55 100644
--- a/htdocs/compta/facture.php
+++ b/htdocs/compta/facture.php
@@ -101,7 +101,7 @@ if ($id > 0 || ! empty($ref)) {
}
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('invoicecard'));
+$hookmanager->initHooks(array('invoicecard','globalcard'));
$permissionnote = $user->rights->facture->creer; // Used by the include of actions_setnotes.inc.php
@@ -865,7 +865,7 @@ else if ($action == 'add' && $user->rights->facture->creer)
$object->origin_id = $originid;
// Possibility to add external linked objects with hooks
- $object->linked_objects [$object->origin] = $object->origin_id;
+ $object->linked_objects[$object->origin] = $object->origin_id;
// link with order if it is a shipping invoice
if ($object->origin == 'shipping')
{
@@ -873,10 +873,11 @@ else if ($action == 'add' && $user->rights->facture->creer)
$exp = new Expedition($db);
$exp->fetch($object->origin_id);
$exp->fetchObjectLinked();
- if (count ($exp->linkedObjectsIds['commande']) > 0) $object->linked_objects['commande'] = $exp->linkedObjectsIds['commande'][0];
+ if (count($exp->linkedObjectsIds['commande']) > 0) $object->linked_objects['commande'] = $exp->linkedObjectsIds['commande'][0];
}
-
- if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects'])) {
+
+ if (is_array($_POST['other_linked_objects']) && ! empty($_POST['other_linked_objects']))
+ {
$object->linked_objects = array_merge($object->linked_objects, $_POST['other_linked_objects']);
}
diff --git a/htdocs/compta/facture/fiche-rec.php b/htdocs/compta/facture/fiche-rec.php
index c7514e96fbbe10a8f022e15d55a3c00e425783f2..02674b5974576af0039bc3e537cdd51f5dd45366 100644
--- a/htdocs/compta/facture/fiche-rec.php
+++ b/htdocs/compta/facture/fiche-rec.php
@@ -526,7 +526,7 @@ else
{
echo '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&socid='.$object->thirdparty->id.'&fac_rec='.$object->id.'">'.$langs->trans("CreateBill").'</a></div>';
}
-
+
if ($object->statut == 0 && $user->rights->facture->supprimer)
{
print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?action=delete&id='.$object->id.'">'.$langs->trans('Delete').'</a></div>';
@@ -544,7 +544,7 @@ else
/*
* List mode
*/
- $sql = "SELECT s.nom, s.rowid as socid, f.titre, f.total, f.rowid as facid";
+ $sql = "SELECT s.nom as name, s.rowid as socid, f.titre, f.total, f.rowid as facid";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture_rec as f";
$sql.= " WHERE f.fk_soc = s.rowid";
$sql.= " AND f.entity = ".$conf->entity;
@@ -584,13 +584,13 @@ else
print "</a></td>\n";
$companystatic->id=$objp->socid;
- $companystatic->name=$objp->nom;
+ $companystatic->name=$objp->name;
print '<td>'.$companystatic->getNomUrl(1,'customer').'</td>';
print '<td align="right">'.price($objp->total).'</td>'."\n";
echo '<td align="center">';
-
+
if ($user->rights->facture->creer)
{
echo '<a href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&socid='.$objp->socid.'&fac_rec='.$objp->facid.'">';
diff --git a/htdocs/compta/facture/impayees.php b/htdocs/compta/facture/impayees.php
index 4db7935e69cd1b208aa7bed0b12a4ea172addfe1..d3987bcbad8145ef2efdf5dbb08344430799813d 100644
--- a/htdocs/compta/facture/impayees.php
+++ b/htdocs/compta/facture/impayees.php
@@ -395,7 +395,7 @@ if (! $sortorder) $sortorder="ASC";
$limit = $conf->liste_limit;
-$sql = "SELECT s.nom, s.rowid as socid, s.email";
+$sql = "SELECT s.nom as name, s.rowid as socid, s.email";
$sql.= ", f.rowid as facid, f.facnumber, f.ref_client, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc, f.localtax1, f.localtax2, f.revenuestamp";
$sql.= ", f.datef as df, f.date_lim_reglement as datelimite";
$sql.= ", f.paye as paye, f.fk_statut, f.type, f.fk_mode_reglement";
@@ -462,7 +462,7 @@ if ($resql)
$urlsource=$_SERVER['PHP_SELF'].'?sortfield='.$sortfield.'&sortorder='.$sortorder;
$urlsource.=str_replace('&','&',$param);
- $titre=(! empty($socid)?$langs->trans("BillsCustomersUnpaidForCompany",$soc->nom):$langs->trans("BillsCustomersUnpaid"));
+ $titre=(! empty($socid)?$langs->trans("BillsCustomersUnpaidForCompany",$soc->name):$langs->trans("BillsCustomersUnpaid"));
if ($option == 'late') $titre.=' ('.$langs->trans("Late").')';
else $titre.=' ('.$langs->trans("All").')';
@@ -658,7 +658,7 @@ if ($resql)
print '<td>';
$thirdparty=new Societe($db);
$thirdparty->id=$objp->socid;
- $thirdparty->nom=$objp->nom;
+ $thirdparty->name=$objp->name;
$thirdparty->client=$objp->client;
$thirdparty->code_client=$objp->code_client;
print $thirdparty->getNomUrl(1,'customer');
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 07ebfa5ad7d24df7634a44b5c4d85aa9163b46e2..39dcc6b64270dba265a02b344099ed1ac19c561b 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -144,7 +144,7 @@ else $sql = 'SELECT DISTINCT';
$sql.= ' f.rowid as facid, f.facnumber, f.ref_client, f.type, f.note_private, f.increment, f.total as total_ht, f.tva as total_tva, f.total_ttc,';
$sql.= ' f.datef as df, f.date_lim_reglement as datelimite,';
$sql.= ' f.paye as paye, f.fk_statut,';
-$sql.= ' s.nom, s.rowid as socid, s.code_client, s.client ';
+$sql.= ' s.nom as name, s.rowid as socid, s.code_client, s.client ';
if (! $sall) $sql.= ', SUM(pf.amount) as am'; // To be able to sort on status
$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
$sql.= ', '.MAIN_DB_PREFIX.'facture as f';
@@ -265,7 +265,7 @@ if ($resql)
if ($search_user > 0) $param.='&search_user=' .$search_user;
if ($search_montant_ht) $param.='&search_montant_ht='.$search_montant_ht;
if ($search_montant_ttc) $param.='&search_montant_ttc='.$search_montant_ttc;
- print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->nom:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+ print_barre_liste($langs->trans('BillsCustomers').' '.($socid?' '.$soc->name:''),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
$i = 0;
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">'."\n";
@@ -400,7 +400,7 @@ if ($resql)
print '<td>';
$thirdparty=new Societe($db);
$thirdparty->id=$objp->socid;
- $thirdparty->nom=$objp->nom;
+ $thirdparty->name=$objp->name;
$thirdparty->client=$objp->client;
$thirdparty->code_client=$objp->code_client;
print $thirdparty->getNomUrl(1,'customer');
diff --git a/htdocs/compta/hrm.php b/htdocs/compta/hrm.php
index cd2d2b60f7ec731948ad5b6e04eb15de43f61882..dae4ce9aa7d5b1913dcee775690a5a759c7261fd 100644
--- a/htdocs/compta/hrm.php
+++ b/htdocs/compta/hrm.php
@@ -1,7 +1,7 @@
<?php
-/* Copyright (C) 2011 Dimitri Mouillard <dmouillard@teclib.com>
- * Copyright (C) 2013-2014 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2011 Dimitri Mouillard <dmouillard@teclib.com>
+ * Copyright (C) 2013-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2012-2014 Regis Houssin <regis.houssin@capnetworks.com>
*
* 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
@@ -38,6 +38,8 @@ $langs->load('users');
$langs->load('holidays');
$langs->load('trips');
+$socid=GETPOST("socid");
+
// Protection if external user
if ($user->societe_id > 0) accessforbidden();
@@ -117,7 +119,7 @@ if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAI
$sql.= " WHERE u.rowid = d.fk_user";
$sql.= " AND d.entity = ".$conf->entity;
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= " AND d.fk_soc = s. rowid AND s.rowid = sc.fk_soc AND sc.fk_user = " .$user->id;
-if ($socid) $sql.= " AND d.fk_soc = ".$socid;
+if (!empty($socid)) $sql.= " AND d.fk_soc = ".$socid;
$sql.= $db->order("d.tms","DESC");
$sql.= $db->plimit($max, 0);
diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php
index eecf5e757461944bc4b1cc8c803dd712d678f392..1908b0670ff9ae706da0a2fcb6b51cb80f3794de 100644
--- a/htdocs/compta/index.php
+++ b/htdocs/compta/index.php
@@ -145,7 +145,7 @@ if (! empty($conf->don->enabled) && $user->rights->don->lire)
if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
{
$sql = "SELECT f.facnumber, f.rowid, f.total_ttc, f.type,";
- $sql.= " s.nom, s.rowid as socid";
+ $sql.= " s.nom as name, s.rowid as socid";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f, ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -185,7 +185,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
print '</td>';
print '<td class="nowrap">';
$companystatic->id=$obj->socid;
- $companystatic->nom=$obj->nom;
+ $companystatic->name=$obj->name;
$companystatic->client=1;
print $companystatic->getNomUrl(1,'',16);
print '</td>';
@@ -219,7 +219,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
{
$sql = "SELECT f.ref, f.rowid, f.total_ttc, f.type,";
- $sql.= " s.nom, s.rowid as socid";
+ $sql.= " s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as f, ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.rowid = f.fk_soc AND f.fk_statut = 0";
@@ -254,7 +254,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
print '</td>';
print '<td>';
$companystatic->id=$obj->socid;
- $companystatic->nom=$obj->nom;
+ $companystatic->name=$obj->name;
$companystatic->client=1;
print $companystatic->getNomUrl(1,'',16);
print '</td>';
@@ -294,7 +294,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
$sql = "SELECT f.rowid, f.facnumber, f.fk_statut, f.type, f.total, f.total_ttc, f.paye, f.tms,";
$sql.= " f.date_lim_reglement as datelimite,";
- $sql.= " s.nom, s.rowid as socid,";
+ $sql.= " s.nom as name, s.rowid as socid,";
$sql.= " sum(pf.amount) as am";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
@@ -351,7 +351,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
print '</td>';
print '<td align="left">';
$thirdpartystatic->id=$obj->socid;
- $thirdpartystatic->nom=$obj->nom;
+ $thirdpartystatic->name=$obj->name;
$thirdpartystatic->client=1;
print $thirdpartystatic->getNomUrl(1,'customer',44);
print '</td>';
@@ -392,7 +392,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
$facstatic=new FactureFournisseur($db);
$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_ttc, ff.tms, ff.paye";
- $sql.= ", s.nom, s.rowid as socid";
+ $sql.= ", s.nom as name, s.rowid as socid";
$sql.= ", SUM(pf.amount) as am";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
@@ -432,7 +432,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
print '</td>';
print '<td>';
$thirdpartystatic->id=$obj->socid;
- $thirdpartystatic->nom=$obj->nom;
+ $thirdpartystatic->name=$obj->name;
$thirdpartystatic->fournisseur=1;
print $thirdpartystatic->getNomUrl(1,'supplier',44);
print '</td>';
@@ -613,7 +613,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
$langs->load("orders");
$sql = "SELECT sum(f.total) as tot_fht, sum(f.total_ttc) as tot_fttc,";
- $sql.= " s.nom, s.rowid as socid,";
+ $sql.= " s.nom as name, s.rowid as socid,";
$sql.= " c.rowid, c.ref, c.facture, c.fk_statut, c.total_ht, c.total_ttc";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -675,7 +675,7 @@ if (! empty($conf->facture->enabled) && ! empty($conf->commande->enabled) && $us
print '<td align="left">';
$societestatic->id=$obj->socid;
- $societestatic->nom=$obj->nom;
+ $societestatic->name=$obj->name;
$societestatic->client=1;
print $societestatic->getNomUrl(1,'customer',44);
print '</a></td>';
@@ -717,7 +717,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
$sql = "SELECT f.rowid, f.facnumber, f.fk_statut, f.datef, f.type, f.total, f.total_ttc, f.paye, f.tms,";
$sql.= " f.date_lim_reglement as datelimite,";
- $sql.= " s.nom, s.rowid as socid,";
+ $sql.= " s.nom as name, s.rowid as socid,";
$sql.= " sum(pf.amount) as am";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiement_facture as pf on f.rowid=pf.fk_facture";
@@ -774,7 +774,7 @@ if (! empty($conf->facture->enabled) && $user->rights->facture->lire)
print '</td>';
print '<td align="left">' ;
$societestatic->id=$obj->socid;
- $societestatic->nom=$obj->nom;
+ $societestatic->name=$obj->name;
$societestatic->client=1;
print $societestatic->getNomUrl(1,'customer',44);
print '</a></td>';
@@ -821,7 +821,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
$facstatic=new FactureFournisseur($db);
$sql = "SELECT ff.rowid, ff.ref, ff.fk_statut, ff.libelle, ff.total_ht, ff.total_ttc, ff.paye,";
- $sql.= " s.nom, s.rowid as socid,";
+ $sql.= " s.nom as name, s.rowid as socid,";
$sql.= " sum(pf.amount) as am";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."facture_fourn as ff";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."paiementfourn_facturefourn as pf on ff.rowid=pf.fk_facturefourn";
@@ -863,7 +863,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
print $facstatic->getNomUrl(1,'');
print '</td>';
$societestatic->id=$obj->socid;
- $societestatic->nom=$obj->nom;
+ $societestatic->name=$obj->name;
$societestatic->client=0;
print '<td>'.$societestatic->getNomUrl(1, 'supplier', 44).'</td>';
if (! empty($conf->global->MAIN_SHOW_HT_ON_SUMMARY)) print '<td align="right">'.price($obj->total_ht).'</td>';
diff --git a/htdocs/compta/localtax/clients.php b/htdocs/compta/localtax/clients.php
index b6c0a13f246be23fe2a9c54be43f56770883222b..7c34cec1ed45bbd295ad52afac52a3dbd9db3161 100644
--- a/htdocs/compta/localtax/clients.php
+++ b/htdocs/compta/localtax/clients.php
@@ -149,7 +149,8 @@ $vatcust=$langs->transcountry($local==1?"LT1":"LT2",$mysoc->country_code);
$vatsup=$langs->transcountry($local==1?"LT1":"LT2",$mysoc->country_code);
// IRPF that the customer has retained me
-if($conf->global->$calc ==0 || $conf->global->$calc == 2){
+if($conf->global->$calc ==0 || $conf->global->$calc == 2)
+{
print "<table class=\"noborder\" width=\"100%\">";
print "<tr class=\"liste_titre\">";
print '<td align="left">'.$langs->trans("Num")."</td>";
@@ -160,7 +161,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 2){
print "</tr>\n";
$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'sell');
-
+
$action = "tvaclient";
$object = &$coll_list;
$parameters["mode"] = $modetax;
@@ -170,7 +171,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 2){
// Initialize technical object to manage hooks of expenses. Note that conf->hooks_modules contains array array
$hookmanager->initHooks(array('externalbalance'));
$reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
-
+
if (is_array($coll_list))
{
$var=true;
@@ -196,7 +197,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 2){
print "<tr ".$bc[$var].">";
print '<td class="nowrap">'.$i."</td>";
$company_static->id=$coll->socid;
- $company_static->nom=$coll->nom;
+ $company_static->name=$coll->name;
print '<td class="nowrap">'.$company_static->getNomUrl(1).'</td>';
$find = array(' ','.');
$replace = array('','');
@@ -210,7 +211,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 2){
}
}
$x_coll_sum = $total;
-
+
print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
print '<td class="nowrap" align="right">'.price($total).'</td>';
@@ -240,7 +241,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 1){
print "</tr>\n";
$company_static=new Societe($db);
-
+
$coll_list = vat_by_thirdparty($db,0,$date_start,$date_end,$modetax,'buy');
$parameters["direction"] = 'buy';
$reshook=$hookmanager->executeHooks('addStatisticLine',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
@@ -269,7 +270,7 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 1){
print "<tr ".$bc[$var].">";
print '<td class="nowrap">'.$i."</td>";
$company_static->id=$coll->socid;
- $company_static->nom=$coll->nom;
+ $company_static->name=$coll->name;
print '<td class="nowrap">'.$company_static->getNomUrl(1).'</td>';
$find = array(' ','.');
$replace = array('','');
@@ -283,14 +284,14 @@ if($conf->global->$calc ==0 || $conf->global->$calc == 1){
}
}
$x_paye_sum = $total;
-
+
print '<tr class="liste_total"><td align="right" colspan="3">'.$langs->trans("Total").':</td>';
print '<td class="nowrap" align="right">'.price($totalamount).'</td>';
print '<td class="nowrap" align="right">'.price($total).'</td>';
print '</tr>';
-
+
print '</table>';
-
+
}
else
{
diff --git a/htdocs/compta/paiement.php b/htdocs/compta/paiement.php
index c7af3458fcb3a83e02ed3c8a678e5d9a5ce48dbb..21b2eb9e15496b149b2eddacf5d7b50af69d3b73 100644
--- a/htdocs/compta/paiement.php
+++ b/htdocs/compta/paiement.php
@@ -67,7 +67,7 @@ if ($facid > 0)
}
// Initialize technical object to manage hooks of paiements. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('paiementcard'));
+$hookmanager->initHooks(array('paiementcard','globalcard'));
$parameters=array('socid'=>$socid);
$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
diff --git a/htdocs/compta/paiement/card.php b/htdocs/compta/paiement/card.php
index 658e1992e9dab022c39bff0bfde2a9169547b720..d0e15307be50430e0ba969d969665a64378a3916 100644
--- a/htdocs/compta/paiement/card.php
+++ b/htdocs/compta/paiement/card.php
@@ -273,7 +273,7 @@ print '</table>';
*/
$disable_delete = 0;
-$sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.total_ttc, f.paye, f.fk_statut, pf.amount, s.nom, s.rowid as socid';
+$sql = 'SELECT f.rowid as facid, f.facnumber, f.type, f.total_ttc, f.paye, f.fk_statut, pf.amount, s.nom as name, s.rowid as socid';
$sql.= ' FROM '.MAIN_DB_PREFIX.'paiement_facture as pf,'.MAIN_DB_PREFIX.'facture as f,'.MAIN_DB_PREFIX.'societe as s';
$sql.= ' WHERE pf.fk_facture = f.rowid';
$sql.= ' AND f.fk_soc = s.rowid';
@@ -322,7 +322,7 @@ if ($resql)
// Third party
print '<td>';
$thirdpartystatic->id=$objp->socid;
- $thirdpartystatic->nom=$objp->nom;
+ $thirdpartystatic->name=$objp->name;
print $thirdpartystatic->getNomUrl(1);
print '</td>';
diff --git a/htdocs/compta/paiement/class/paiement.class.php b/htdocs/compta/paiement/class/paiement.class.php
index cd6ba5c59a2d1bb2ccf222e826534b969d9e35cc..95503db6ff97aeea6d5f3497b33ae83e8cc4524b 100644
--- a/htdocs/compta/paiement/class/paiement.class.php
+++ b/htdocs/compta/paiement/class/paiement.class.php
@@ -221,7 +221,7 @@ class Paiement extends CommonObject
if (!in_array($invoice->type, $affected_types)) dol_syslog("Invoice ".$facid." is not a standard, nor replacement invoice, nor credit note, nor deposit invoice. We do nothing more.");
else if ($remaintopay) dol_syslog("Remain to pay for invoice ".$facid." not null. We do nothing more.");
else if ($mustwait) dol_syslog("There is ".$mustwait." differed payment to process, we do nothing more.");
- else
+ else
{
$result=$invoice->set_paid($user,'','');
if ($result<0)
@@ -360,8 +360,8 @@ class Paiement extends CommonObject
{
// Appel des triggers
$result=$this->call_trigger('PAYMENT_DELETE', $user);
- if ($result < 0)
- {
+ if ($result < 0)
+ {
$this->db->rollback();
return -1;
}
@@ -483,7 +483,7 @@ class Paiement extends CommonObject
$bank_line_id,
$fac->thirdparty->id,
DOL_URL_ROOT.'/comm/card.php?socid=',
- $fac->thirdparty->nom,
+ $fac->thirdparty->name,
'company'
);
if ($result <= 0) dol_print_error($this->db);
@@ -501,7 +501,7 @@ class Paiement extends CommonObject
$bank_line_id,
$fac->thirdparty->id,
DOL_URL_ROOT.'/fourn/card.php?socid=',
- $fac->thirdparty->nom,
+ $fac->thirdparty->name,
'company'
);
if ($result <= 0) dol_print_error($this->db);
diff --git a/htdocs/compta/paiement/list.php b/htdocs/compta/paiement/list.php
index 46fa00df68c75c666f2b154d8c4fdcc72aa5bc98..da1f2bd28331d1deef6fbe7f09ab09a7dc3e8b52 100644
--- a/htdocs/compta/paiement/list.php
+++ b/htdocs/compta/paiement/list.php
@@ -85,7 +85,7 @@ else
//$sql.= " c.libelle as paiement_type,";
$sql.= " c.code as paiement_code,";
$sql.= " ba.rowid as bid, ba.label,";
- $sql.= " s.rowid as socid, s.nom";
+ $sql.= " s.rowid as socid, s.nom as name";
//$sql.= " f.facnumber";
$sql.= " FROM (".MAIN_DB_PREFIX."c_paiement as c, ".MAIN_DB_PREFIX."paiement as p)";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."bank as b ON p.fk_bank = b.rowid";
@@ -197,7 +197,7 @@ if ($resql)
if ($objp->socid)
{
$companystatic->id=$objp->socid;
- $companystatic->nom=$objp->nom;
+ $companystatic->name=$objp->name;
print $companystatic->getNomUrl(1,'',24);
}
else print ' ';
diff --git a/htdocs/compta/prelevement/class/bonprelevement.class.php b/htdocs/compta/prelevement/class/bonprelevement.class.php
index 527705e4ab02f601cb063419b14d37a27b9c0ad6..ed5b123d923007da89278d8672df078f6d073868 100644
--- a/htdocs/compta/prelevement/class/bonprelevement.class.php
+++ b/htdocs/compta/prelevement/class/bonprelevement.class.php
@@ -760,7 +760,7 @@ class BonPrelevement extends CommonObject
$sql = "SELECT f.rowid, pfd.rowid as pfdrowid, f.fk_soc";
$sql.= ", pfd.code_banque, pfd.code_guichet, pfd.number, pfd.cle_rib";
$sql.= ", pfd.amount";
- $sql.= ", s.nom";
+ $sql.= ", s.nom as name";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture_demande as pfd";
@@ -829,8 +829,8 @@ class BonPrelevement extends CommonObject
}
else
{
- dol_syslog("Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->nom, LOG_ERR);
- $facture_errors[$fac[0]]="Error on default bank number RIB/IBAN for thirdparty reported by function verif() ".$fact->socid." ".$soc->nom;
+ dol_syslog("Error on default bank number RIB/IBAN for thirdparty reported by verif() ".$fact->socid." ".$soc->name, LOG_ERR);
+ $facture_errors[$fac[0]]="Error on default bank number RIB/IBAN for thirdparty reported by function verif() ".$fact->socid." ".$soc->name;
}
}
else
@@ -1262,7 +1262,7 @@ class BonPrelevement extends CommonObject
* section Debiteur (sepa Debiteurs bloc lines)
*/
$sql = "SELECT soc.code_client as code, soc.address, soc.zip, soc.town, soc.datec, c.code as country_code,";
- $sql.= " pl.client_nom as nom, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
+ $sql.= " pl.client_nom as name, pl.code_banque as cb, pl.code_guichet as cg, pl.number as cc, pl.amount as somme,";
$sql.= " f.facnumber as fac, pf.fk_facture as idfac, rib.iban_prefix as iban, rib.bic as bic, rib.rowid as drum";
$sql.= " FROM";
$sql.= " ".MAIN_DB_PREFIX."prelevement_lignes as pl,";
@@ -1286,7 +1286,7 @@ class BonPrelevement extends CommonObject
while ($i < $num)
{
$obj = $this->db->fetch_object($resql);
- $fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->nom, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->facnumber, $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum);
+ $fileDebiteurSection .= $this->EnregDestinataireSEPA($obj->code, $obj->name, $obj->address, $obj->zip, $obj->town, $obj->country_code, $obj->cb, $obj->cg, $obj->cc, $obj->somme, $obj->facnumber, $obj->idfac, $obj->iban, $obj->bic, $obj->datec, $obj->drum);
$this->total = $this->total + $obj->somme;
$i++;
}
@@ -1490,7 +1490,7 @@ class BonPrelevement extends CommonObject
* Write recipient of request (customer)
*
* @param string $row_code_client soc.code_client as code,
- * @param string $row_nom pl.client_nom AS nom,
+ * @param string $row_nom pl.client_nom AS name,
* @param string $row_address soc.address AS adr,
* @param string $row_zip soc.zip
* @param string $row_town soc.town
diff --git a/htdocs/compta/prelevement/class/rejetprelevement.class.php b/htdocs/compta/prelevement/class/rejetprelevement.class.php
index 51f9a83ed3c7bce9be5d7209a1c0946d07e605ad..27ae87ca3b4319ee78c3fada6f1ebd3e6fad42a2 100644
--- a/htdocs/compta/prelevement/class/rejetprelevement.class.php
+++ b/htdocs/compta/prelevement/class/rejetprelevement.class.php
@@ -244,7 +244,7 @@ class RejetPrelevement
$arr_mime = array();
$arr_name = array();
$facref = $fac->ref;
- $socname = $soc->nom;
+ $socname = $soc->name;
$amount = price($fac->total_ttc);
$userinfo = $this->user->getFullName($langs);
diff --git a/htdocs/compta/prelevement/create.php b/htdocs/compta/prelevement/create.php
index a3f7ca2ace8afd9c21c5c06daa60ead89092315a..0326e4922f16167da7f126b0f495c84d23d68da3 100644
--- a/htdocs/compta/prelevement/create.php
+++ b/htdocs/compta/prelevement/create.php
@@ -156,7 +156,7 @@ print '<br>';
* Invoices waiting for withdraw
*/
-$sql = "SELECT f.facnumber, f.rowid, f.total_ttc, s.nom, s.rowid as socid,";
+$sql = "SELECT f.facnumber, f.rowid, f.total_ttc, s.nom as name, s.rowid as socid,";
$sql.= " pfd.date_demande";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f,";
$sql.= " ".MAIN_DB_PREFIX."societe as s,";
@@ -197,7 +197,7 @@ if ($resql)
print '</td>';
print '<td>';
$thirdpartystatic->id=$obj->socid;
- $thirdpartystatic->nom=$obj->nom;
+ $thirdpartystatic->name=$obj->name;
print $thirdpartystatic->getNomUrl(1,'customer');
print '</td>';
print '<td align="right">';
diff --git a/htdocs/compta/prelevement/demandes.php b/htdocs/compta/prelevement/demandes.php
index 4cd3098bfc39b870c6e31fda67441f8c9bcfbc24..9b58f1e44c033e22e633c2dfb12e148916e118e8 100644
--- a/htdocs/compta/prelevement/demandes.php
+++ b/htdocs/compta/prelevement/demandes.php
@@ -67,7 +67,7 @@ if (! $sortfield) $sortfield="f.facnumber";
*/
$sql= "SELECT f.facnumber, f.rowid, f.total_ttc,";
-$sql.= " s.nom, s.rowid as socid,";
+$sql.= " s.nom as name, s.rowid as socid,";
$sql.= " pfd.date_demande as date_demande,";
$sql.= " pfd.fk_user_demande";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f,";
@@ -137,7 +137,7 @@ if ($resql)
print '<td>';
$thirdpartystatic->id=$obj->socid;
- $thirdpartystatic->nom=$obj->nom;
+ $thirdpartystatic->name=$obj->name;
print $thirdpartystatic->getNomUrl(1,'customer');
print '</td>';
diff --git a/htdocs/compta/prelevement/factures.php b/htdocs/compta/prelevement/factures.php
index 3833a45215ad06eb206148c02cc5f16f1edaee3d..bf3e428cd0e5ad5478f0e530bd37461ff84375bf 100644
--- a/htdocs/compta/prelevement/factures.php
+++ b/htdocs/compta/prelevement/factures.php
@@ -63,17 +63,17 @@ if ($prev_id)
print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
-
+
// Status
print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
print '<td>'.$bon->getLibStatut(1).'</td>';
print '</tr>';
-
+
if($bon->date_trans <> 0)
{
$muser = new User($db);
$muser->fetch($bon->user_trans);
-
+
print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
print dol_print_date($bon->date_trans,'day');
print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
@@ -87,19 +87,19 @@ if ($prev_id)
print dol_print_date($bon->date_credit,'day');
print '</td></tr>';
}
-
+
print '</table>';
-
+
print '<br>';
-
+
print '<table class="border" width="100%"><tr><td width="20%">';
print $langs->trans("WithdrawalFile").'</td><td>';
$relativepath = 'receipts/'.$bon->ref;
print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&modulepart=prelevement&file='.urlencode($relativepath).'">'.$relativepath.'</a>';
print '</td></tr></table>';
-
+
dol_fiche_end();
-
+
}
else
{
@@ -114,7 +114,7 @@ $offset = $conf->liste_limit * $page ;
*/
$sql = "SELECT pf.rowid";
$sql.= ",f.rowid as facid, f.facnumber as ref, f.total_ttc";
-$sql.= ", s.rowid as socid, s.nom, pl.statut";
+$sql.= ", s.rowid as socid, s.nom as name, pl.statut";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
$sql.= ", ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql.= ", ".MAIN_DB_PREFIX."prelevement_facture as pf";
@@ -166,7 +166,7 @@ if ($result)
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->ref."</a></td>\n";
print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">';
- print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."</a></td>\n";
+ print img_object($langs->trans("ShowCompany"),"company"). ' '.$obj->name."</a></td>\n";
print '<td align="center">'.price($obj->total_ttc)."</td>\n";
diff --git a/htdocs/compta/prelevement/fiche-rejet.php b/htdocs/compta/prelevement/fiche-rejet.php
index e43ea95ae44f0811d79063db1e23910c077f6d68..161227aa1213dff1572e11f9eccc84b9622364df 100644
--- a/htdocs/compta/prelevement/fiche-rejet.php
+++ b/htdocs/compta/prelevement/fiche-rejet.php
@@ -62,17 +62,17 @@ if ($prev_id)
print '<tr><td width="20%">'.$langs->trans("Ref").'</td><td>'.$bon->getNomUrl(1).'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Date").'</td><td>'.dol_print_date($bon->datec,'day').'</td></tr>';
print '<tr><td width="20%">'.$langs->trans("Amount").'</td><td>'.price($bon->amount).'</td></tr>';
-
+
// Status
print '<tr><td width="20%">'.$langs->trans('Status').'</td>';
print '<td>'.$bon->getLibStatut(1).'</td>';
print '</tr>';
-
+
if($bon->date_trans <> 0)
{
$muser = new User($db);
$muser->fetch($bon->user_trans);
-
+
print '<tr><td width="20%">'.$langs->trans("TransData").'</td><td>';
print dol_print_date($bon->date_trans,'day');
print ' '.$langs->trans("By").' '.$muser->getFullName($langs).'</td></tr>';
@@ -86,19 +86,19 @@ if ($prev_id)
print dol_print_date($bon->date_credit,'day');
print '</td></tr>';
}
-
+
print '</table>';
-
+
print '<br>';
-
+
print '<table class="border" width="100%"><tr><td width="20%">';
print $langs->trans("WithdrawalFile").'</td><td>';
$relativepath = 'receipts/'.$bon->ref;
print '<a data-ajax="false" href="'.DOL_URL_ROOT.'/document.php?type=text/plain&modulepart=prelevement&file='.urlencode($relativepath).'">'.$relativepath.'</a>';
print '</td></tr></table>';
-
+
dol_fiche_end();
-
+
}
else
{
@@ -112,7 +112,7 @@ $rej = new RejetPrelevement($db, $user);
* Liste des factures
*/
$sql = "SELECT pl.rowid, pl.amount, pl.statut";
-$sql.= " , s.rowid as socid, s.nom";
+$sql.= " , s.rowid as socid, s.nom as name";
$sql.= " , pr.motif, pr.afacturer, pr.fk_facture";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
$sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
@@ -152,7 +152,7 @@ if ($resql)
print img_picto('', 'statut'.$obj->statut).' ';
print substr('000000'.$obj->rowid, -6);
print '</a></td>';
- print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name."</a></td>\n";
print '<td align="right">'.price($obj->amount)."</td>\n";
print '<td>'.$rej->motifs[$obj->motif].'</td>';
diff --git a/htdocs/compta/prelevement/index.php b/htdocs/compta/prelevement/index.php
index 911ffde6f999fd6af54a0a861f72686b38a5c4b7..1abc421cf461ea9370244fe47c635af4b649db04 100644
--- a/htdocs/compta/prelevement/index.php
+++ b/htdocs/compta/prelevement/index.php
@@ -96,7 +96,7 @@ print '</td></tr></table><br>';
*/
$sql = "SELECT f.facnumber, f.rowid, f.total_ttc, f.fk_statut, f.paye, f.type,";
$sql.= " pfd.date_demande,";
-$sql.= " s.nom, s.rowid as socid";
+$sql.= " s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."facture as f,";
$sql.= " ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -137,7 +137,7 @@ if ($resql)
print '<td>';
$thirdpartystatic->id=$obj->socid;
- $thirdpartystatic->nom=$obj->nom;
+ $thirdpartystatic->name=$obj->name;
print $thirdpartystatic->getNomUrl(1,'customer');
print '</td>';
diff --git a/htdocs/compta/prelevement/ligne.php b/htdocs/compta/prelevement/ligne.php
index 45bab4d69dcc79c54674b08c4e369919faf1a9b2..b3f9acb35709cffa2b8a0065197fa59e99d27a28 100644
--- a/htdocs/compta/prelevement/ligne.php
+++ b/htdocs/compta/prelevement/ligne.php
@@ -190,7 +190,7 @@ if ($id)
print '<td colspan="3">'.$langs->trans("WithdrawalRefused").'</td></tr>';
//Select yes/no
- print '<tr><td class="valid">'.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->nom.' ?</td>';
+ print '<tr><td class="valid">'.$langs->trans("WithdrawalRefusedConfirm").' '.$soc->name.' ?</td>';
print '<td colspan="2" class="valid">';
print $form->selectyesno("confirm",1,0);
print '</td></tr>';
@@ -257,7 +257,7 @@ if ($id)
*/
$sql = "SELECT pf.rowid";
$sql.= " ,f.rowid as facid, f.facnumber as ref, f.total_ttc";
- $sql.= " , s.rowid as socid, s.nom";
+ $sql.= " , s.rowid as socid, s.nom as name";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
$sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql.= " , ".MAIN_DB_PREFIX."prelevement_facture as pf";
@@ -308,7 +308,7 @@ if ($id)
print '<a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->ref."</a></td>\n";
print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">';
- print img_object($langs->trans("ShowCompany"),"company"). ' '.stripslashes($obj->nom)."</a></td>\n";
+ print img_object($langs->trans("ShowCompany"),"company"). ' '.$obj->name."</a></td>\n";
print '<td align="right">'.price($obj->total_ttc)."</td>\n";
diff --git a/htdocs/compta/prelevement/lignes.php b/htdocs/compta/prelevement/lignes.php
index ef884f50edfa2f44ac1c517baa5fe505e09c8cd1..1e96e9276d8596b84dd19e9ebef5dd093811de0a 100644
--- a/htdocs/compta/prelevement/lignes.php
+++ b/htdocs/compta/prelevement/lignes.php
@@ -106,7 +106,7 @@ if ($prev_id)
print '</td></tr></table>';
dol_fiche_end();
-
+
}
else
{
@@ -128,7 +128,7 @@ $pagenext = $page + 1;
*
*/
$sql = "SELECT pl.rowid, pl.statut, pl.amount";
-$sql.= ", s.rowid as socid, s.nom";
+$sql.= ", s.rowid as socid, s.nom as name";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_lignes as pl";
$sql.= ", ".MAIN_DB_PREFIX."prelevement_bons as pb";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -175,7 +175,7 @@ if ($result)
print substr('000000'.$obj->rowid, -6);
print '</a></td>';
- print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.stripslashes($obj->nom)."</a></td>\n";
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name."</a></td>\n";
print '<td align="center">'.price($obj->amount)."</td>\n";
diff --git a/htdocs/compta/prelevement/list.php b/htdocs/compta/prelevement/list.php
index 819d879b098882245f847b494a6ed47eb4a43cfe..7e0b818279fab282932558a441f5f76ef0d0b074 100644
--- a/htdocs/compta/prelevement/list.php
+++ b/htdocs/compta/prelevement/list.php
@@ -63,7 +63,7 @@ llxHeader('',$langs->trans("WithdrawalsLines"));
$sql = "SELECT p.rowid, p.ref, p.statut, p.datec";
$sql.= " ,f.rowid as facid, f.facnumber, f.total_ttc";
-$sql.= " , s.rowid as socid, s.nom, s.code_client";
+$sql.= " , s.rowid as socid, s.nom as name, s.code_client";
$sql.= " , pl.amount, pl.statut as statut_ligne, pl.rowid as rowid_ligne";
$sql.= " FROM ".MAIN_DB_PREFIX."prelevement_bons as p";
$sql.= " , ".MAIN_DB_PREFIX."prelevement_lignes as pl";
@@ -162,7 +162,7 @@ if ($result)
print ' <a href="'.DOL_URL_ROOT.'/compta/facture.php?facid='.$obj->facid.'">'.$obj->facnumber."</a></td>\n";
print '</a></td>';
- print '<td><a href="card.php?id='.$obj->rowid.'">'.$obj->nom."</a></td>\n";
+ print '<td><a href="card.php?id='.$obj->rowid.'">'.$obj->name."</a></td>\n";
print '<td align="center"><a href="card.php?id='.$obj->rowid.'">'.$obj->code_client."</a></td>\n";
diff --git a/htdocs/compta/recap-compta.php b/htdocs/compta/recap-compta.php
index f56652fc4b67178f21d9e09ee5194a18d6de3492..59599e93dc649b87f2b7ad3720b90b84449dcdeb 100644
--- a/htdocs/compta/recap-compta.php
+++ b/htdocs/compta/recap-compta.php
@@ -64,8 +64,8 @@ if ($socid > 0)
print '<table class="border" width="100%">';
- // Nom
- print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->nom.'</td></tr>';
+ // Name
+ print '<tr><td width="20%">'.$langs->trans("Name").'</td><td width="80%" colspan="3">'.$societe->name.'</td></tr>';
// Prefix
if (! empty($conf->global->SOCIETE_USEPREFIX)) // Old not used prefix field
diff --git a/htdocs/compta/resultat/clientfourn.php b/htdocs/compta/resultat/clientfourn.php
index 12fac084d552e0b79534255b69b8460c8e49966b..9122ece2ed9216cf205732f3c8dd303985b41296 100644
--- a/htdocs/compta/resultat/clientfourn.php
+++ b/htdocs/compta/resultat/clientfourn.php
@@ -120,7 +120,7 @@ $total_ttc=0;
// Affiche en-tete de rapport
if ($modecompta=="CREANCES-DETTES")
{
- $nom=$langs->trans("AnnualByCompaniesDueDebtMode");
+ $name=$langs->trans("AnnualByCompaniesDueDebtMode");
$calcmode=$langs->trans("CalcModeDebt");
$calcmode.='<br>('.$langs->trans("SeeReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.(GETPOST("month")>0?'&month='.GETPOST("month"):'').'&modecompta=RECETTES-DEPENSES">','</a>').')';
$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
@@ -132,7 +132,7 @@ if ($modecompta=="CREANCES-DETTES")
//$exportlink=$langs->trans("NotYetAvailable");
}
else {
- $nom=$langs->trans("AnnualByCompaniesInputOutputMode");
+ $name=$langs->trans("AnnualByCompaniesInputOutputMode");
$calcmode=$langs->trans("CalcModeEngagement");
$calcmode.='<br>('.$langs->trans("SeeReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year.(GETPOST("month")>0?'&month='.GETPOST("month"):'').'&modecompta=CREANCES-DETTES">','</a>').')';
//$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',1,1,0,'',1,0,1);
@@ -142,7 +142,7 @@ else {
$builddate=time();
//$exportlink=$langs->trans("NotYetAvailable");
}
-report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array('modecompta'=>$modecompta),$calcmode);
+report_header($name,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array('modecompta'=>$modecompta),$calcmode);
// Show report array
print '<table class="noborder" width="100%">';
@@ -160,7 +160,7 @@ print '<tr><td colspan="4">'.$langs->trans("CustomersInvoices").'</td></tr>';
if ($modecompta == 'CREANCES-DETTES')
{
- $sql = "SELECT s.nom, s.rowid as socid, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc";
+ $sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total) as amount_ht, sum(f.total_ttc) as amount_ttc";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."facture as f";
$sql.= " WHERE f.fk_soc = s.rowid";
@@ -178,7 +178,7 @@ else
* Liste des paiements (les anciens paiements ne sont pas vus par cette requete car, sur les
* vieilles versions, ils n'etaient pas lies via paiement_facture. On les ajoute plus loin)
*/
- $sql = "SELECT s.nom as nom, s.rowid as socid, sum(pf.amount) as amount_ttc";
+ $sql = "SELECT s.nom as name, s.rowid as socid, sum(pf.amount) as amount_ttc";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."facture as f";
$sql.= ", ".MAIN_DB_PREFIX."paiement_facture as pf";
@@ -206,7 +206,7 @@ if ($result) {
$var=!$var;
print "<tr ".$bc[$var]."><td> </td>";
- print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->nom."</td>\n";
+ print "<td>".$langs->trans("Bills").' <a href="'.DOL_URL_ROOT.'/compta/facture/list.php?socid='.$objp->socid.'">'.$objp->name."</td>\n";
if ($modecompta == 'CREANCES-DETTES')
print "<td align=\"right\">".price($objp->amount_ht)."</td>\n";
@@ -225,7 +225,7 @@ if ($result) {
// On ajoute les paiements clients anciennes version, non lie par paiement_facture
if ($modecompta != 'CREANCES-DETTES')
{
- $sql = "SELECT 'Autres' as nom, '0' as idp, sum(p.amount) as amount_ttc";
+ $sql = "SELECT 'Autres' as name, '0' as idp, sum(p.amount) as amount_ttc";
$sql.= " FROM ".MAIN_DB_PREFIX."bank as b";
$sql.= ", ".MAIN_DB_PREFIX."bank_account as ba";
$sql.= ", ".MAIN_DB_PREFIX."paiement as p";
@@ -236,8 +236,8 @@ if ($modecompta != 'CREANCES-DETTES')
$sql.= " AND ba.entity = ".$conf->entity;
if (! empty($date_start) && ! empty($date_end))
$sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
- $sql.= " GROUP BY nom, idp";
- $sql.= " ORDER BY nom";
+ $sql.= " GROUP BY name, idp";
+ $sql.= " ORDER BY name";
dol_syslog("get old customer payments not linked to invoices", LOG_DEBUG);
$result = $db->query($sql);
@@ -290,7 +290,7 @@ print '</tr>';
*/
if ($modecompta == 'CREANCES-DETTES')
{
- $sql = "SELECT s.nom, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc";
+ $sql = "SELECT s.nom as name, s.rowid as socid, sum(f.total_ht) as amount_ht, sum(f.total_ttc) as amount_ttc";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."facture_fourn as f";
$sql.= " WHERE f.fk_soc = s.rowid";
@@ -338,7 +338,7 @@ if ($result) {
$var=!$var;
print "<tr ".$bc[$var]."><td> </td>";
- print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->nom."</a></td>\n";
+ print "<td>".$langs->trans("Bills")." <a href=\"".DOL_URL_ROOT."/fourn/facture/list.php?socid=".$objp->socid."\">".$objp->name."</a></td>\n";
if ($modecompta == 'CREANCES-DETTES')
print "<td align=\"right\">".price(-$objp->amount_ht)."</td>\n";
@@ -381,7 +381,7 @@ print '<tr><td colspan="4">'.$langs->trans("SocialContributions").' ('.$langs->t
if ($modecompta == 'CREANCES-DETTES')
{
- $sql = "SELECT c.id, c.libelle as nom, sum(cs.amount) as amount";
+ $sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
$sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
$sql.= " WHERE cs.fk_type = c.id";
@@ -391,7 +391,7 @@ if ($modecompta == 'CREANCES-DETTES')
}
else
{
- $sql = "SELECT c.id, c.libelle as nom, sum(p.amount) as amount";
+ $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
$sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
$sql.= ", ".MAIN_DB_PREFIX."paiementcharge as p";
@@ -424,7 +424,7 @@ if ($result) {
$var = !$var;
print "<tr ".$bc[$var]."><td> </td>";
- print '<td>'.$obj->nom.'</td>';
+ print '<td>'.$obj->label.'</td>';
if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
print '<td align="right">'.price(-$obj->amount).'</td>';
print '</tr>';
@@ -455,7 +455,7 @@ print '<tr><td colspan="4">'.$langs->trans("SocialContributions").' ('.$langs->t
if ($modecompta == 'CREANCES-DETTES')
{
- $sql = "SELECT c.id, c.libelle as nom, sum(cs.amount) as amount";
+ $sql = "SELECT c.id, c.libelle as label, sum(cs.amount) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
$sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
$sql.= " WHERE cs.fk_type = c.id";
@@ -468,7 +468,7 @@ if ($modecompta == 'CREANCES-DETTES')
}
else
{
- $sql = "SELECT c.id, c.libelle as nom, sum(p.amount) as amount";
+ $sql = "SELECT c.id, c.libelle as label, sum(p.amount) as amount";
$sql.= " FROM ".MAIN_DB_PREFIX."c_chargesociales as c";
$sql.= ", ".MAIN_DB_PREFIX."chargesociales as cs";
$sql.= ", ".MAIN_DB_PREFIX."paiementcharge as p";
@@ -501,7 +501,7 @@ if ($result) {
$var = !$var;
print "<tr ".$bc[$var]."><td> </td>";
- print '<td>'.$obj->nom.'</td>';
+ print '<td>'.$obj->label.'</td>';
if ($modecompta == 'CREANCES-DETTES')
print '<td align="right">'.price(-$obj->amount).'</td>';
print '<td align="right">'.price(-$obj->amount).'</td>';
@@ -547,128 +547,135 @@ if ($mysoc->tva_assuj == 'franchise') // Non assujeti
* Salaries
*/
-print '<tr><td colspan="4">'.$langs->trans("Salaries").'</td></tr>';
-$sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as nom, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
-$sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
-$sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user";
-$sql.= " WHERE p.entity = ".$conf->entity;
-if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
-
-$sql.= " GROUP BY u.rowid, u.firstname, u.lastname, p.fk_user, p.label, dm";
-$sql.= " ORDER BY u.firstname";
-
-dol_syslog("get payment salaries");
-$result=$db->query($sql);
-$subtotal_ht = 0;
-$subtotal_ttc = 0;
-if ($result)
+if ($conf->salaries->enabled)
{
- $num = $db->num_rows($result);
- $var=true;
- $i = 0;
- if ($num)
- {
- while ($i < $num)
- {
- $obj = $db->fetch_object($result);
-
- $total_ht -= $obj->amount;
- $total_ttc -= $obj->amount;
- $subtotal_ht += $obj->amount;
- $subtotal_ttc += $obj->amount;
-
- $var = !$var;
- print "<tr ".$bc[$var]."><td> </td>";
-
- print "<td>".$langs->trans("Salaries")." <a href=\"".DOL_URL_ROOT."/compta/salaries/index.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
-
- if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
- print '<td align="right">'.price(-$obj->amount).'</td>';
- print '</tr>';
- $i++;
- }
- }
- else
- {
- $var = !$var;
- print "<tr ".$bc[$var]."><td> </td>";
- print '<td colspan="3">'.$langs->trans("None").'</td>';
- print '</tr>';
- }
-}
-else
-{
- dol_print_error($db);
+ print '<tr><td colspan="4">'.$langs->trans("Salaries").'</td></tr>';
+ $sql = "SELECT u.rowid, u.firstname, u.lastname, p.fk_user, p.label as label, date_format(p.datep,'%Y-%m') as dm, sum(p.amount) as amount";
+ $sql.= " FROM ".MAIN_DB_PREFIX."payment_salary as p";
+ $sql.= " INNER JOIN ".MAIN_DB_PREFIX."user as u ON u.rowid=p.fk_user";
+ $sql.= " WHERE p.entity = ".$conf->entity;
+ if (! empty($date_start) && ! empty($date_end))
+ $sql.= " AND p.datep >= '".$db->idate($date_start)."' AND p.datep <= '".$db->idate($date_end)."'";
+
+ $sql.= " GROUP BY u.rowid, u.firstname, u.lastname, p.fk_user, p.label, dm";
+ $sql.= " ORDER BY u.firstname";
+
+ dol_syslog("get payment salaries");
+ $result=$db->query($sql);
+ $subtotal_ht = 0;
+ $subtotal_ttc = 0;
+ if ($result)
+ {
+ $num = $db->num_rows($result);
+ $var=true;
+ $i = 0;
+ if ($num)
+ {
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($result);
+
+ $total_ht -= $obj->amount;
+ $total_ttc -= $obj->amount;
+ $subtotal_ht += $obj->amount;
+ $subtotal_ttc += $obj->amount;
+
+ $var = !$var;
+ print "<tr ".$bc[$var]."><td> </td>";
+
+ print "<td>".$langs->trans("Salaries")." <a href=\"".DOL_URL_ROOT."/compta/salaries/index.php?filtre=s.fk_user=".$obj->fk_user."\">".$obj->firstname." ".$obj->lastname."</a></td>\n";
+
+ if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price(-$obj->amount).'</td>';
+ print '<td align="right">'.price(-$obj->amount).'</td>';
+ print '</tr>';
+ $i++;
+ }
+ }
+ else
+ {
+ $var = !$var;
+ print "<tr ".$bc[$var]."><td> </td>";
+ print '<td colspan="3">'.$langs->trans("None").'</td>';
+ print '</tr>';
+ }
+ }
+ else
+ {
+ dol_print_error($db);
+ }
+ print '<tr class="liste_total">';
+ if ($modecompta == 'CREANCES-DETTES')
+ print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
+ print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
+ print '</tr>';
}
-print '<tr class="liste_total">';
-if ($modecompta == 'CREANCES-DETTES')
- print '<td colspan="3" align="right">'.price(-$subtotal_ht).'</td>';
-print '<td colspan="3" align="right">'.price(-$subtotal_ttc).'</td>';
-print '</tr>';
+
/*
- * Dunning
-*/
-
-print '<tr><td colspan="4">'.$langs->trans("Donation").'</td></tr>';
-$sql = "SELECT p.societe as nom, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
-$sql.= " FROM ".MAIN_DB_PREFIX."don as p";
-$sql.= " WHERE p.entity = ".$conf->entity;
-$sql.= " AND fk_statut=2";
-if (! empty($date_start) && ! empty($date_end))
- $sql.= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
-$sql.= " GROUP BY p.societe, p.firstname, p.lastname";
-$sql.= " ORDER BY p.societe, p.firstname, p.lastname";
-
-dol_syslog("get dunning");
-$result=$db->query($sql);
-$subtotal_ht = 0;
-$subtotal_ttc = 0;
-if ($result)
+ * Donation
+ */
+
+if ($conf->donation->enabled)
{
- $num = $db->num_rows($result);
- $var=true;
- $i = 0;
- if ($num)
+ print '<tr><td colspan="4">'.$langs->trans("Donation").'</td></tr>';
+ $sql = "SELECT p.societe as name, p.firstname, p.lastname, date_format(p.datedon,'%Y-%m') as dm, sum(p.amount) as amount";
+ $sql.= " FROM ".MAIN_DB_PREFIX."don as p";
+ $sql.= " WHERE p.entity = ".$conf->entity;
+ $sql.= " AND fk_statut=2";
+ if (! empty($date_start) && ! empty($date_end))
+ $sql.= " AND p.datedon >= '".$db->idate($date_start)."' AND p.datedon <= '".$db->idate($date_end)."'";
+ $sql.= " GROUP BY p.societe, p.firstname, p.lastname, dm";
+ $sql.= " ORDER BY p.societe, p.firstname, p.lastname, dm";
+
+ dol_syslog("get dunning");
+ $result=$db->query($sql);
+ $subtotal_ht = 0;
+ $subtotal_ttc = 0;
+ if ($result)
{
- while ($i < $num)
+ $num = $db->num_rows($result);
+ $var=true;
+ $i = 0;
+ if ($num)
{
- $obj = $db->fetch_object($result);
+ while ($i < $num)
+ {
+ $obj = $db->fetch_object($result);
- $total_ht += $obj->amount;
- $total_ttc += $obj->amount;
- $subtotal_ht += $obj->amount;
- $subtotal_ttc += $obj->amount;
+ $total_ht += $obj->amount;
+ $total_ttc += $obj->amount;
+ $subtotal_ht += $obj->amount;
+ $subtotal_ttc += $obj->amount;
- $var = !$var;
- print "<tr ".$bc[$var]."><td> </td>";
+ $var = !$var;
+ print "<tr ".$bc[$var]."><td> </td>";
- print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/compta/dons/list.php?search_company=".$obj->nom."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->nom. " ".$obj->firstname." ".$obj->lastname."</a></td>\n";
+ print "<td>".$langs->trans("Donation")." <a href=\"".DOL_URL_ROOT."/compta/dons/list.php?search_company=".$obj->name."&search_name=".$obj->firstname." ".$obj->lastname."\">".$obj->name. " ".$obj->firstname." ".$obj->lastname."</a></td>\n";
- if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price($obj->amount).'</td>';
- print '<td align="right">'.price($obj->amount).'</td>';
+ if ($modecompta == 'CREANCES-DETTES') print '<td align="right">'.price($obj->amount).'</td>';
+ print '<td align="right">'.price($obj->amount).'</td>';
+ print '</tr>';
+ $i++;
+ }
+ }
+ else
+ {
+ $var = !$var;
+ print "<tr ".$bc[$var]."><td> </td>";
+ print '<td colspan="3">'.$langs->trans("None").'</td>';
print '</tr>';
- $i++;
}
}
else
{
- $var = !$var;
- print "<tr ".$bc[$var]."><td> </td>";
- print '<td colspan="3">'.$langs->trans("None").'</td>';
- print '</tr>';
+ dol_print_error($db);
}
+ print '<tr class="liste_total">';
+ if ($modecompta == 'CREANCES-DETTES')
+ print '<td colspan="3" align="right">'.price($subtotal_ht).'</td>';
+ print '<td colspan="3" align="right">'.price($subtotal_ttc).'</td>';
+ print '</tr>';
}
-else
-{
- dol_print_error($db);
-}
-print '<tr class="liste_total">';
-if ($modecompta == 'CREANCES-DETTES')
- print '<td colspan="3" align="right">'.price($subtotal_ht).'</td>';
-print '<td colspan="3" align="right">'.price($subtotal_ttc).'</td>';
-print '</tr>';
/*
* VAT
diff --git a/htdocs/compta/salaries/card.php b/htdocs/compta/salaries/card.php
index 2cef32b136efa7ab3a19b7c61eb9de8a7b81722c..3ee796c61346228e47ce82a9a02aa96cb83cc9b7 100644
--- a/htdocs/compta/salaries/card.php
+++ b/htdocs/compta/salaries/card.php
@@ -44,7 +44,7 @@ $result = restrictedArea($user, 'salaries', '', '', '');
$sal = new PaymentSalary($db);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('salarycard'));
+$hookmanager->initHooks(array('salarycard','globalcard'));
diff --git a/htdocs/compta/sociales/charges.php b/htdocs/compta/sociales/charges.php
index 0ccd450e0cbb2fc6140ca25aae40163c3a464e09..af070901517f8d1e06f0817da3af7abcfa9b4fdf 100644
--- a/htdocs/compta/sociales/charges.php
+++ b/htdocs/compta/sociales/charges.php
@@ -153,60 +153,49 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->tax->charges->cr
if ($action == 'confirm_clone' && $confirm != 'yes') { $action=''; }
if ($action == 'confirm_clone' && $confirm == 'yes' && ($user->rights->tax->charges->creer))
{
-
- $db->begin();
-
- $originalId = $id;
-
- $object = new ChargeSociales($db);
- $object->fetch($id);
-
- if ($object->id > 0)
- {
- $object->paye = 0;
- $object->id = $object->ref = null;
-
- if(GETPOST('clone_for_next_month') != '') {
-
- $object->date_ech = strtotime('+1month', $object->date_ech);
- $object->periode = strtotime('+1month', $object->periode);
- }
-
- if ($object->check())
- {
- $id = $object->create($user);
- if ($id > 0)
- {
- $db->commit();
- $db->close();
-
- header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
- exit;
- }
- else
- {
- $id=$originalId;
- $db->rollback();
-
- if (count($object->errors))
- {
- setEventMessage($object->errors, 'errors');
- dol_print_error($db,$object->errors);
- }
- else
- {
- setEventMessage($langs->trans($object->error), 'errors');
- dol_print_error($db,$object->error);
- }
- }
- }
- }
- else
- {
- $db->rollback();
- dol_print_error($db,$object->error);
- }
-
+ $db->begin();
+
+ $originalId = $id;
+
+ $object = new ChargeSociales($db);
+ $object->fetch($id);
+
+ if ($object->id > 0)
+ {
+ $object->paye = 0;
+ $object->id = $object->ref = null;
+
+ if(GETPOST('clone_for_next_month') != '') {
+
+ $object->date_ech = strtotime('+1month', $object->date_ech);
+ $object->periode = strtotime('+1month', $object->periode);
+ }
+
+ if ($object->check())
+ {
+ $id = $object->create($user);
+ if ($id > 0)
+ {
+ $db->commit();
+ $db->close();
+
+ header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
+ exit;
+ }
+ else
+ {
+ $id=$originalId;
+ $db->rollback();
+
+ setEventMessages($object->error,$object->errors, 'errors');
+ }
+ }
+ }
+ else
+ {
+ $db->rollback();
+ dol_print_error($db,$object->error);
+ }
}
@@ -301,18 +290,18 @@ if ($id > 0)
$head=tax_prepare_head($object);
dol_fiche_head($head, 'card', $langs->trans("SocialContribution"),0,'bill');
-
+
// Clone confirmation
if ($action === 'clone')
{
$formclone=array(
array('type' => 'checkbox', 'name' => 'clone_for_next_month','label' => $langs->trans("CloneTaxForNextMonth"), 'value' => 1),
-
+
);
-
+
print $form->formconfirm($_SERVER["PHP_SELF"].'?id='.$object->id,$langs->trans('CloneTax'),$langs->trans('ConfirmCloneTax',$object->ref),'confirm_clone',$formclone,'yes');
}
-
+
// Confirmation de la suppression de la charge
if ($action == 'paid')
{
@@ -492,7 +481,7 @@ if ($id > 0)
{
print "<a class=\"butAction\" href=\"".DOL_URL_ROOT."/compta/sociales/charges.php?id=$object->id&action=paid\">".$langs->trans("ClassifyPaid")."</a>";
}
-
+
// Clone
if ($user->rights->tax->charges->creer)
{
diff --git a/htdocs/compta/sociales/class/chargesociales.class.php b/htdocs/compta/sociales/class/chargesociales.class.php
index 807466ef95fc0aadc5336eb60a3b1149c4a689de..44e62ad0f1074d560127f205ad95498ad3eb5328 100644
--- a/htdocs/compta/sociales/class/chargesociales.class.php
+++ b/htdocs/compta/sociales/class/chargesociales.class.php
@@ -106,22 +106,23 @@ class ChargeSociales extends CommonObject
return -1;
}
}
- /*
- * Check if a social contribution can be created into database
- *
- */
- function check() {
-
+
+ /**
+ * Check if a social contribution can be created into database
+ *
+ * @return boolean True or false
+ */
+ function check()
+ {
$newamount=price2num($this->amount,'MT');
// Validation parametres
if (! $newamount > 0 || empty($this->date_ech) || empty($this->periode))
{
-
return false;
}
-
-
+
+
return true;
}
@@ -138,7 +139,8 @@ class ChargeSociales extends CommonObject
// Nettoyage parametres
$newamount=price2num($this->amount,'MT');
- if(!$this->check()) {
+ if (!$this->check())
+ {
$this->error="ErrorBadParameter";
return -2;
}
@@ -357,7 +359,7 @@ class ChargeSociales extends CommonObject
global $langs;
$langs->load('customers');
$langs->load('bills');
-
+
if ($mode == 0)
{
if ($statut == 0) return $langs->trans("Unpaid");
diff --git a/htdocs/compta/tva/card.php b/htdocs/compta/tva/card.php
index c87530e65110ebebafd0f315f122b0032617d78b..268a1af8e6616cb9ff4fa26d0673f95f32b99e68 100644
--- a/htdocs/compta/tva/card.php
+++ b/htdocs/compta/tva/card.php
@@ -42,7 +42,7 @@ $result = restrictedArea($user, 'tax', '', '', 'charges');
$tva = new Tva($db);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('taxvatcard'));
+$hookmanager->initHooks(array('taxvatcard','globalcard'));
diff --git a/htdocs/compta/tva/clients.php b/htdocs/compta/tva/clients.php
index 422354ee7c33a8be391c99ceb63fbec1e70a9472..c2620fd34dfdebc2178918708f95a799fb76a6af 100644
--- a/htdocs/compta/tva/clients.php
+++ b/htdocs/compta/tva/clients.php
@@ -110,10 +110,10 @@ $fsearch.=' <input type="text" name="min" id="min" value="'.$min.'" size="6">';
// Affiche en-tete du rapport
if ($modetax==1) // Calculate on invoice for goods and services
{
- $nom=$langs->trans("VATReportByCustomersInDueDebtMode");
+ $name=$langs->trans("VATReportByCustomersInDueDebtMode");
$calcmode=$langs->trans("CalcModeVATDebt");
$calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
- //$nom.='<br>('.$langs->trans("SeeVATReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=0">','</a>').')';
+ //$name.='<br>('.$langs->trans("SeeVATReportInInputOutputMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=0">','</a>').')';
$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
$description=$langs->trans("RulesVATDueServices");
@@ -138,10 +138,10 @@ if ($modetax==1) // Calculate on invoice for goods and services
}
if ($modetax==0) // Invoice for goods, payment for services
{
- $nom=$langs->trans("VATReportByCustomersInInputOutputMode");
+ $name=$langs->trans("VATReportByCustomersInInputOutputMode");
$calcmode=$langs->trans("CalcModeVATEngagement");
$calcmode.='<br>('.$langs->trans("TaxModuleSetupToModifyRules",DOL_URL_ROOT.'/admin/taxes.php').')';
- //$nom.='<br>('.$langs->trans("SeeVATReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=1">','</a>').')';
+ //$name.='<br>('.$langs->trans("SeeVATReportInDueDebtMode",'<a href="'.$_SERVER["PHP_SELF"].'?year='.$year_start.'&modetax=1">','</a>').')';
$period=$form->select_date($date_start,'date_start',0,0,0,'',1,0,1).' - '.$form->select_date($date_end,'date_end',0,0,0,'',1,0,1);
//$periodlink=($year_start?"<a href='".$_SERVER["PHP_SELF"]."?year=".($year_start-1)."&modetax=".$modetax."'>".img_previous()."</a> <a href='".$_SERVER["PHP_SELF"]."?year=".($year_start+1)."&modetax=".$modetax."'>".img_next()."</a>":"");
$description=$langs->trans("RulesVATInServices");
@@ -165,7 +165,7 @@ if ($modetax==0) // Invoice for goods, payment for services
$amountsup=$langs->trans("AmountHT");
if ($mysoc->tva_assuj) $vatsup.=' ('.$langs->trans("ToGetBack").')';
}
-report_header($nom,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode);
+report_header($name,$nomlink,$period,$periodlink,$description,$builddate,$exportlink,array(),$calcmode);
$vatcust=$langs->trans("VATReceived");
$vatsup=$langs->trans("VATPaid");
@@ -223,7 +223,7 @@ if (is_array($coll_list))
print "<tr ".$bc[$var].">";
print '<td class="nowrap">'.$i."</td>";
$company_static->id=$coll->socid;
- $company_static->nom=$coll->nom;
+ $company_static->name=$coll->name;
$company_static->client=1;
print '<td class="nowrap">'.$company_static->getNomUrl(1,'customer').'</td>';
$find = array(' ','.');
@@ -304,7 +304,7 @@ if (is_array($coll_list))
print "<tr ".$bc[$var].">";
print '<td class="nowrap">'.$i."</td>";
$company_static->id=$coll->socid;
- $company_static->nom=$coll->nom;
+ $company_static->name=$coll->name;
$company_static->fournisseur=1;
print '<td class="nowrap">'.$company_static->getNomUrl(1,'supplier').'</td>';
$find = array(' ','.');
diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php
index 2df9986dba0d17d9dac322e84a9b07a3e1632885..f3abf9e2bfe6ccd736768003de90677614400ab4 100644
--- a/htdocs/contact/card.php
+++ b/htdocs/contact/card.php
@@ -74,7 +74,7 @@ if (! empty($canvas))
$result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', $objcanvas); // If we create a contact with no company (shared contacts), no check on write permission
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('contactcard'));
+$hookmanager->initHooks(array('contactcard','globalcard'));
/*
diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index 19ce91f9c8284a866df99a5ea2d3432730a15b4e..9e93523a654567f072d84b45843af9703476a66f 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -185,7 +185,7 @@ class Contact extends CommonObject
{
// Call trigger
$result=$this->call_trigger('CONTACT_CREATE',$user);
- if ($result < 0) { $error++; }
+ if ($result < 0) { $error++; }
// End call triggers
}
@@ -304,7 +304,7 @@ class Contact extends CommonObject
{
// Call trigger
$result=$this->call_trigger('CONTACT_MODIFY',$user);
- if ($result < 0) { $error++; }
+ if ($result < 0) { $error++; }
// End call triggers
}
@@ -374,7 +374,7 @@ class Contact extends CommonObject
$soc = new Societe($this->db);
$soc->fetch($this->socid);
- $info[$conf->global->LDAP_CONTACT_FIELD_COMPANY] = $soc->nom;
+ $info[$conf->global->LDAP_CONTACT_FIELD_COMPANY] = $soc->name;
if ($soc->client == 1) $info["businessCategory"] = "Customers";
if ($soc->client == 2) $info["businessCategory"] = "Prospects";
if ($soc->fournisseur == 1) $info["businessCategory"] = "Suppliers";
@@ -774,7 +774,7 @@ class Contact extends CommonObject
{
// Call trigger
$result=$this->call_trigger('CONTACT_DELETE',$user);
- if ($result < 0) { $error++; }
+ if ($result < 0) { $error++; }
// End call triggers
}
@@ -1060,7 +1060,7 @@ class Contact extends CommonObject
{
// Call trigger
$result=$this->call_trigger('CONTACT_ENABLEDISABLE',$user);
- if ($result < 0) { $error++; }
+ if ($result < 0) { $error++; }
// End call triggers
}
diff --git a/htdocs/contact/list.php b/htdocs/contact/list.php
index 11eb366e98c5155c423ac9f51d340605c11c693d..c65e9601e53b943e2b0595af804fadccbe9ce571 100644
--- a/htdocs/contact/list.php
+++ b/htdocs/contact/list.php
@@ -39,6 +39,7 @@ $contactid = GETPOST('id','int');
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'contact', $contactid,'');
+$search_firstlast_only=GETPOST("search_firstlast_only");
$search_lastname=GETPOST("search_lastname");
$search_firstname=GETPOST("search_firstname");
$search_societe=GETPOST("search_societe");
@@ -51,8 +52,8 @@ $search_fax=GETPOST("search_fax");
$search_email=GETPOST("search_email");
$search_skype=GETPOST("search_skype");
$search_priv=GETPOST("search_priv");
-$search_categ = GETPOST("search_categ",'int');
-$search_status = GETPOST("search_status",'int');
+$search_categ=GETPOST("search_categ",'int');
+$search_statu=GETPOST("search_status",'int');
if ($search_status=='') $search_status=1; // always display activ customer first
@@ -74,7 +75,12 @@ $offset = $limit * $page;
$langs->load("companies");
$titre = (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ListOfContacts") : $langs->trans("ListOfContactsAddresses"));
-if ($type == "c" || $type=="p")
+if ($type == "p")
+{
+ $titre.=' ('.$langs->trans("ThirdPartyProspects").')';
+ $urlfiche="card.php";
+}
+if ($type == "c")
{
$titre.=' ('.$langs->trans("ThirdPartyCustomers").')';
$urlfiche="card.php";
@@ -92,6 +98,7 @@ else if ($type == "o")
if (GETPOST('button_removefilter'))
{
+ $search_firstlast_only="";
$search_lastname="";
$search_firstname="";
$search_societe="";
@@ -154,6 +161,9 @@ else
if ($search_categ > 0) $sql.= " AND cs.fk_categorie = ".$search_categ;
if ($search_categ == -2) $sql.= " AND cs.fk_categorie IS NULL";
+if ($search_firstlast_only) {
+ $sql .= natural_search(array('p.lastname','p.firstname'), $search_firstlast_only);
+}
if ($search_lastname) { // filter on lastname
$sql .= natural_search('p.lastname', $search_lastname);
}
@@ -213,7 +223,7 @@ else if ($type == "p") // filtre sur type
}
if ($sall)
{
- $sql .= natural_search(array('p.lastname', 'p.firstname', 'p.email'), $sall);
+ $sql .= natural_search(array('p.lastname', 'p.firstname', 'p.email', 's.nom'), $sall);
}
if (! empty($socid))
{
@@ -277,9 +287,12 @@ if ($result)
if ($sall)
{
- print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname")." ".$langs->trans("or")." ".$langs->trans("EMail")."): ".$sall;
+ print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname").", ".$langs->trans("ThirdParty")." ".$langs->trans("or")." ".$langs->trans("EMail")."): ".$sall;
}
-
+ if ($search_firstlast_only)
+ {
+ print $langs->trans("Filter")." (".$langs->trans("Lastname").", ".$langs->trans("Firstname")."): ".$search_firstlast_only;
+ }
print '<table class="liste" width="100%">';
// Ligne des titres
diff --git a/htdocs/contact/vcard.php b/htdocs/contact/vcard.php
index e78c298c541c446c12798b349025b0840a1b40e3..77abf31ac89649f52ae36a02a86081fabbef4ff2 100644
--- a/htdocs/contact/vcard.php
+++ b/htdocs/contact/vcard.php
@@ -75,7 +75,7 @@ if ($company->id)
if (! $contact->zip) $v->setAddress("", "", $company->address, $company->town, "", $company->zip, $company->country_code, "WORK;POSTAL");
if ($company->email != $contact->email) $v->setEmail($company->email,'internet');
// Si contact lie a un tiers non de type "particulier"
- if ($contact->typent_code != 'TE_PRIVATE') $v->setOrg($company->nom);
+ if ($contact->typent_code != 'TE_PRIVATE') $v->setOrg($company->name);
}
// Personal informations
diff --git a/htdocs/contrat/card.php b/htdocs/contrat/card.php
index c4596c96a76109828e58342636ddbf6ebc48c738..1b47912fa41ac87341af7e0756ce46b471a21d92 100644
--- a/htdocs/contrat/card.php
+++ b/htdocs/contrat/card.php
@@ -29,18 +29,18 @@
*/
require ("../main.inc.php");
-require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/contract.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
-require_once DOL_DOCUMENT_ROOT . '/core/modules/contract/modules_contract.php';
-require_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/contract.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+require_once DOL_DOCUMENT_ROOT.'/core/modules/contract/modules_contract.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
-if (! empty($conf->produit->enabled) || ! empty($conf->service->enabled)) require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
-if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
+if (! empty($conf->produit->enabled) || ! empty($conf->service->enabled)) require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
+if (! empty($conf->propal->enabled)) require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
if (! empty($conf->projet->enabled)) {
- require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
- require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
+ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php';
}
require_once DOL_DOCUMENT_ROOT . '/core/class/extrafields.class.php';
@@ -66,7 +66,7 @@ $result=restrictedArea($user,'contrat',$id);
$usehm=(! empty($conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE)?$conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE:0);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('contractcard'));
+$hookmanager->initHooks(array('contractcard','globalcard'));
$object = new Contrat($db);
$extrafields = new ExtraFields($db);
@@ -215,7 +215,7 @@ if ($action == 'add' && $user->rights->contrat->creer)
$object->fk_project = GETPOST('projectid','int');
$object->remise_percent = GETPOST('remise_percent','alpha');
$object->ref = GETPOST('ref','alpha');
- $object->ref_customer = GETPOST('ref_customer','alpha');
+ $object->ref_supplier = GETPOST('ref_supplier','alpha');
// If creation from another object of another module (Example: origin=propal, originid=1)
if ($_POST['origin'] && $_POST['originid'])
@@ -718,13 +718,17 @@ else if ($action == 'confirm_move' && $confirm == 'yes' && $user->rights->contra
$action = 'edit_extras';
setEventMessage($object->error,'errors');
}
-} elseif ($action=='setref_customer') {
- $object->ref_customer=GETPOST('ref_customer','alpha');
+} elseif ($action=='setref_supplier') {
+ $result = $object->fetch($id);
+ if ($result < 0) {
+ setEventMessage($object->errors,'errors');
+ }
+ $object->ref_supplier=GETPOST('ref_supplier','alpha');
$result = $object->update($user);
if ($result < 0) {
setEventMessage($object->errors,'errors');
- $action='editref_customer';
+ $action='editref_supplier';
} else {
header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
@@ -934,7 +938,7 @@ if ($action == 'create')
// Ref Int
print '<tr><td>'.$langs->trans('RefCustomer').'</td>';
- print '<td colspan="2"><input type="text" siez="5" name="ref_customer" id="ref_customer" value="'.GETPOST('ref_customer','alpha').'"></td></tr>';
+ print '<td colspan="2"><input type="text" siez="5" name="ref_supplier" id="ref_supplier" value="'.GETPOST('ref_supplier','alpha').'"></td></tr>';
// Customer
print '<tr>';
@@ -1131,9 +1135,9 @@ else
print '<tr>';
print '<td width="20%">';
- print $form->editfieldkey("RefCustomer",'ref_customer',$object->ref_customer,$object,$user->rights->contrat->creer);
+ print $form->editfieldkey("RefCustomer",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer);
print '</td><td>';
- print $form->editfieldval("RefCustomer",'ref_customer',$object->ref_customer,$object,$user->rights->contrat->creer);
+ print $form->editfieldval("RefCustomer",'ref_supplier',$object->ref_supplier,$object,$user->rights->contrat->creer);
print '</td>';
print '</tr>';
@@ -1812,8 +1816,8 @@ else
/*
* Linked object block
- */
- $somethingshown = $object->showLinkedObjectBlock();
+ */
+ $somethingshown=$object->showLinkedObjectBlock();
print '</div><div class="fichehalfright"><div class="ficheaddleft">';
diff --git a/htdocs/contrat/class/contrat.class.php b/htdocs/contrat/class/contrat.class.php
index 0ddb1618f34176688bd04db81fd8a218eb068bdc..998ffada99320beaa3245dce6272c4abaaa3ed75 100644
--- a/htdocs/contrat/class/contrat.class.php
+++ b/htdocs/contrat/class/contrat.class.php
@@ -5,9 +5,9 @@
* Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
* Copyright (C) 2008 Raphael Bertrand <raphael.bertrand@resultic.fr>
* Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2013 Christophe Battarel <christophe.battarel@altairis.fr>
- * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
- * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
+ * Copyright (C) 2013 Christophe Battarel <christophe.battarel@altairis.fr>
+ * Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
+ * Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
*
* 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
@@ -29,9 +29,9 @@
* \brief File of class to manage contracts
*/
-require_once DOL_DOCUMENT_ROOT.'/core/class/commonobject.class.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/price.lib.php';
-require_once(DOL_DOCUMENT_ROOT ."/margin/lib/margins.lib.php");
+require_once DOL_DOCUMENT_ROOT . '/core/class/commonobject.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/price.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/margin/lib/margins.lib.php';
/**
* Class to manage contracts
@@ -42,11 +42,12 @@ class Contrat extends CommonObject
public $table_element='contrat';
public $table_element_line='contratdet';
public $fk_element='fk_contrat';
+ protected $ismultientitymanaged = 1; // 0=No test on entity, 1=Test with field entity, 2=Test with link by societe
var $id;
var $ref;
var $ref_ext;
- var $ref_customer;
+ var $ref_supplier;
var $socid;
var $societe; // Objet societe
var $statut=0; // 0=Draft,
@@ -403,7 +404,7 @@ class Contrat extends CommonObject
$sql.= " fk_projet,";
$sql.= " fk_commercial_signature, fk_commercial_suivi,";
$sql.= " note_private, note_public, model_pdf, extraparams";
- $sql.= " ,ref_customer";
+ $sql.= " ,ref_supplier";
$sql.= " ,ref_ext";
$sql.= " FROM ".MAIN_DB_PREFIX."contrat";
if ($ref)
@@ -423,7 +424,7 @@ class Contrat extends CommonObject
{
$this->id = $result["rowid"];
$this->ref = (!isset($result["ref"]) || !$result["ref"]) ? $result["rowid"] : $result["ref"];
- $this->ref_customer = $result["ref_customer"];
+ $this->ref_supplier = $result["ref_supplier"];
$this->ref_ext = $result["ref_ext"];
$this->statut = $result["statut"];
$this->mise_en_service = $this->db->jdate($result["datemise"]);
@@ -726,7 +727,7 @@ class Contrat extends CommonObject
// Insert contract
$sql = "INSERT INTO ".MAIN_DB_PREFIX."contrat (datec, fk_soc, fk_user_author, date_contrat,";
$sql.= " fk_commercial_signature, fk_commercial_suivi, fk_projet,";
- $sql.= " ref, entity, note_private, note_public, ref_customer, ref_ext)";
+ $sql.= " ref, entity, note_private, note_public, ref_supplier, ref_ext)";
$sql.= " VALUES ('".$this->db->idate($now)."',".$this->socid.",".$user->id;
$sql.= ", '".$this->db->idate($this->date_contrat)."'";
$sql.= ",".($this->commercial_signature_id>0?$this->commercial_signature_id:"NULL");
@@ -736,7 +737,7 @@ class Contrat extends CommonObject
$sql.= ", ".$conf->entity;
$sql.= ", ".(!empty($this->note_private)?("'".$this->db->escape($this->note_private)."'"):"NULL");
$sql.= ", ".(!empty($this->note_public)?("'".$this->db->escape($this->note_public)."'"):"NULL");
- $sql.= ", ".(!empty($this->ref_customer)?("'".$this->db->escape($this->ref_customer)."'"):"NULL");
+ $sql.= ", ".(!empty($this->ref_supplier)?("'".$this->db->escape($this->ref_supplier)."'"):"NULL");
$sql.= ", ".(!empty($this->ref_ext)?("'".$this->db->escape($this->ref_ext)."'"):"NULL");
$sql.= ")";
$resql=$this->db->query($sql);
@@ -988,7 +989,7 @@ class Contrat extends CommonObject
// Clean parameters
if (isset($this->ref)) $this->ref=trim($this->ref);
- if (isset($this->ref_customer)) $this->ref_customer=trim($this->ref_customer);
+ if (isset($this->ref_supplier)) $this->ref_supplier=trim($this->ref_supplier);
if (isset($this->ref_ext)) $this->ref_ext=trim($this->ref_ext);
if (isset($this->entity)) $this->entity=trim($this->entity);
if (isset($this->statut)) $this->statut=trim($this->statut);
@@ -1012,7 +1013,7 @@ class Contrat extends CommonObject
$sql = "UPDATE ".MAIN_DB_PREFIX."contrat SET";
$sql.= " ref=".(isset($this->ref)?"'".$this->db->escape($this->ref)."'":"null").",";
- $sql.= " ref_customer=".(isset($this->ref_customer)?"'".$this->db->escape($this->ref_customer)."'":"null").",";
+ $sql.= " ref_supplier=".(isset($this->ref_supplier)?"'".$this->db->escape($this->ref_supplier)."'":"null").",";
$sql.= " ref_ext=".(isset($this->ref_ext)?"'".$this->db->escape($this->ref_ext)."'":"null").",";
$sql.= " entity=".$conf->entity.",";
$sql.= " date_contrat=".(dol_strlen($this->date_contrat)!=0 ? "'".$this->db->idate($this->date_contrat)."'" : 'null').",";
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 400899993aeeea0cac7f125829dbad467be84215..02a580174c3288f24e4bad1d47c1dc994e92a7a3 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -227,7 +227,7 @@ print "</table><br>";
if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
{
$sql = "SELECT c.rowid as ref, c.rowid,";
- $sql.= " s.nom, s.rowid as socid";
+ $sql.= " s.nom as name, s.rowid as socid";
$sql .= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.rowid = c.fk_soc";
@@ -262,7 +262,7 @@ if (! empty($conf->contrat->enabled) && $user->rights->contrat->lire)
print '</td>';
print '<td>';
$companystatic->id=$obj->socid;
- $companystatic->nom=$obj->nom;
+ $companystatic->name=$obj->name;
$companystatic->client=1;
print $companystatic->getNomUrl(1,'',16);
print '</td>';
@@ -298,7 +298,7 @@ $sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.d
$sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now)."')",1,0).') as nb_expired,';
$sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND cd.date_fin_validite < '".$db->idate($now - $conf->contrat->services->expires->warning_delay)."')",1,0).') as nb_late,';
$sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
-$sql.= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom, s.rowid as socid";
+$sql.= " c.rowid as cid, c.ref, c.datec, c.tms, c.statut, s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s,";
if (!$user->rights->societe->client->voir && !$socid) $sql.= " ".MAIN_DB_PREFIX."societe_commerciaux as sc,";
$sql.= " ".MAIN_DB_PREFIX."contrat as c";
@@ -342,7 +342,7 @@ if ($result)
print '</td>';
print '<td>';
$staticcompany->id=$obj->socid;
- $staticcompany->nom=$obj->nom;
+ $staticcompany->name=$obj->name;
print $staticcompany->getNomUrl(1,'',20);
print '</td>';
print '<td align="center">'.dol_print_date($obj->tms,'dayhour').'</td>';
@@ -369,7 +369,7 @@ print '<br>';
// Last modified services
$sql = "SELECT c.ref, c.fk_soc, ";
$sql.= " cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat, cd.date_fin_validite,";
-$sql.= " s.nom,";
+$sql.= " s.nom as name,";
$sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype";
$sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -423,7 +423,7 @@ if ($resql)
print '</td>';
print '<td>';
$staticcompany->id=$obj->fk_soc;
- $staticcompany->nom=$obj->nom;
+ $staticcompany->name=$obj->name;
print $staticcompany->getNomUrl(1,'',20);
print '</td>';
print '<td class="nowrap" align="right"><a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
@@ -447,7 +447,7 @@ print '<br>';
// Not activated services
$sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,";
-$sql.= " s.nom,";
+$sql.= " s.nom as name,";
$sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype";
$sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -503,7 +503,7 @@ if ($resql)
print '</td>';
print '<td>';
$staticcompany->id=$obj->fk_soc;
- $staticcompany->nom=$obj->nom;
+ $staticcompany->name=$obj->name;
print $staticcompany->getNomUrl(1,'',20);
print '</td>';
print '<td width="16" align="right"><a href="ligne.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
@@ -526,7 +526,7 @@ print '<br>';
// Expired services
$sql = "SELECT c.ref, c.fk_soc, cd.rowid as cid, cd.statut, cd.label, cd.fk_product, cd.description as note, cd.fk_contrat,";
-$sql.= " s.nom,";
+$sql.= " s.nom as name,";
$sql.= " p.rowid as pid, p.ref as pref, p.label as plabel, p.fk_product_type as ptype";
$sql.= " FROM (".MAIN_DB_PREFIX."contrat as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
@@ -583,7 +583,7 @@ if ($resql)
print '</td>';
print '<td>';
$staticcompany->id=$obj->fk_soc;
- $staticcompany->nom=$obj->nom;
+ $staticcompany->name=$obj->name;
print $staticcompany->getNomUrl(1,'',20);
print '</td>';
print '<td width="16" align="right"><a href="ligne.php?id='.$obj->fk_contrat.'&ligne='.$obj->cid.'">';
diff --git a/htdocs/contrat/list.php b/htdocs/contrat/list.php
index 7970e80603c160d1064fccacfa8c77b5b420f0e3..d89c4c144c395fce922ad28d0c2858eed2150c1c 100644
--- a/htdocs/contrat/list.php
+++ b/htdocs/contrat/list.php
@@ -42,7 +42,7 @@ $offset = $limit * $page ;
$search_nom=GETPOST('search_nom');
$search_contract=GETPOST('search_contract');
-$search_ref_customer=GETPOST('search_ref_customer','alpha');
+$search_ref_supplier=GETPOST('search_ref_supplier','alpha');
$sall=GETPOST('sall');
$statut=GETPOST('statut')?GETPOST('statut'):1;
$socid=GETPOST('socid');
@@ -75,7 +75,7 @@ $sql.= ' SUM('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NOT NULL AND
$sql.= ' SUM('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
$sql.= " c.rowid as cid, c.ref, c.datec, c.date_contrat, c.statut,";
$sql.= " s.nom, s.rowid as socid";
-$sql.= " ,c.ref_customer";
+$sql.= " ,c.ref_supplier";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ", ".MAIN_DB_PREFIX."contrat as c";
@@ -90,15 +90,14 @@ if ($search_nom) {
if ($search_contract) {
$sql .= natural_search(array('c.rowid', 'c.ref'), $search_contract);
}
-if (!empty($search_ref_customer)) {
- $sql .= natural_search(array('c.ref_customer'), $search_ref_customer);
+if (!empty($search_ref_supplier)) {
+ $sql .= natural_search(array('c.ref_supplier'), $search_ref_supplier);
}
if ($sall) {
$sql .= natural_search(array('s.nom', 'cd.label', 'cd.description'), $sall);
}
-$sql.= " GROUP BY c.rowid, c.ref, c.datec, c.date_contrat, c.statut,";
-$sql.= " s.nom, s.rowid";
-$sql.= " ORDER BY $sortfield $sortorder";
+$sql.= " GROUP BY c.rowid, c.ref, c.datec, c.date_contrat, c.statut, s.nom, s.rowid";
+$sql.= $db->order($sortfield,$sortorder);
$sql.= $db->plimit($conf->liste_limit + 1, $offset);
$resql=$db->query($sql);
@@ -114,9 +113,9 @@ if ($resql)
print '<tr class="liste_titre">';
$param='&search_contract='.$search_contract;
$param.='&search_nom='.$search_nom;
- $param.='&search_ref_customer='.$search_ref_customer;
+ $param.='&search_ref_supplier='.$search_ref_supplier;
print_liste_field_titre($langs->trans("Ref"), $_SERVER["PHP_SELF"], "c.rowid","","$param",'',$sortfield,$sortorder);
- print_liste_field_titre($langs->trans("RefCustomer"), $_SERVER["PHP_SELF"], "c.ref_customer","","$param",'',$sortfield,$sortorder);
+ print_liste_field_titre($langs->trans("RefCustomer"), $_SERVER["PHP_SELF"], "c.ref_supplier","","$param",'',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("Company"), $_SERVER["PHP_SELF"], "s.nom","","$param",'',$sortfield,$sortorder);
//print_liste_field_titre($langs->trans("DateCreation"), $_SERVER["PHP_SELF"], "c.datec","","$param",'align="center"',$sortfield,$sortorder);
print_liste_field_titre($langs->trans("DateContract"), $_SERVER["PHP_SELF"], "c.date_contrat","","$param",'align="center"',$sortfield,$sortorder);
@@ -134,7 +133,7 @@ if ($resql)
print '<input type="text" class="flat" size="3" name="search_contract" value="'.$search_contract.'">';
print '</td>';
print '<td class="liste_titre">';
- print '<input type="text" class="flat" size="7" name="search_ref_customer value="'.$search_ref_customer.'">';
+ print '<input type="text" class="flat" size="7" name="search_ref_supplier value="'.$search_ref_supplier.'">';
print '</td>';
print '<td class="liste_titre">';
print '<input type="text" class="flat" size="24" name="search_nom" value="'.$search_nom.'">';
@@ -156,8 +155,8 @@ if ($resql)
print img_object($langs->trans("ShowContract"),"contract").' '.(isset($obj->ref) ? $obj->ref : $obj->cid) .'</a>';
if ($obj->nb_late) print img_warning($langs->trans("Late"));
print '</td>';
- print '<td>'.$obj->ref_customer.'</td>';
- print '<td><a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
+ print '<td>'.$obj->ref_supplier.'</td>';
+ print '<td><a href="../comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
//print '<td align="center">'.dol_print_date($obj->datec).'</td>';
print '<td align="center">'.dol_print_date($db->jdate($obj->date_contrat)).'</td>';
//print '<td align="center">'.$staticcontrat->LibStatut($obj->statut,3).'</td>';
diff --git a/htdocs/contrat/services.php b/htdocs/contrat/services.php
index 4318d81e9230a3cf0a4abebd220583704e49604b..77fc01554305ed000fd75eb0f55a9e28464abfdd 100644
--- a/htdocs/contrat/services.php
+++ b/htdocs/contrat/services.php
@@ -80,7 +80,7 @@ $form=new Form($db);
llxHeader();
$sql = "SELECT c.rowid as cid, c.ref, c.statut as cstatut,";
-$sql.= " s.rowid as socid, s.nom,";
+$sql.= " s.rowid as socid, s.nom as name,";
$sql.= " cd.rowid, cd.description, cd.statut,";
$sql.= " p.rowid as pid, p.ref as pref, p.label as label, p.fk_product_type as ptype,";
if (!$user->rights->societe->client->voir && !$socid) $sql .= " sc.fk_soc, sc.fk_user,";
@@ -225,7 +225,7 @@ if ($resql)
// Third party
print '<td>';
$companystatic->id=$obj->socid;
- $companystatic->nom=$obj->nom;
+ $companystatic->name=$obj->name;
$companystatic->client=1;
print $companystatic->getNomUrl(1,'customer',28);
print '</td>';
diff --git a/htdocs/core/boxes/box_actions.php b/htdocs/core/boxes/box_actions.php
index 8b88b6ff5578ec9e490dde0a543c21ebc120e8be..7d118932ba4705bd3b462fad4a381bbeaed7e33f 100644
--- a/htdocs/core/boxes/box_actions.php
+++ b/htdocs/core/boxes/box_actions.php
@@ -64,7 +64,7 @@ class box_actions extends ModeleBoxes
{
$sql = "SELECT a.id, a.label, a.datep as dp, a.percent as percentage,";
$sql.= " ta.code,";
- $sql.= " s.nom, s.rowid as socid";
+ $sql.= " s.nom as name, s.rowid as socid";
$sql.= " FROM (".MAIN_DB_PREFIX."c_actioncomm AS ta, ";
$sql.= MAIN_DB_PREFIX."actioncomm AS a)";
if (! $user->rights->societe->client->voir && ! $user->societe_id) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON a.fk_soc = sc.fk_soc";
@@ -112,7 +112,7 @@ class box_actions extends ModeleBoxes
'url' => ($objp->socid?DOL_URL_ROOT."/societe/soc.php?socid=".$objp->socid:''));
$this->info_box_contents[$i][3] = array('td' => 'align="left"',
- 'text' => dol_trunc($objp->nom,24),
+ 'text' => dol_trunc($objp->name,24),
'url' => DOL_URL_ROOT."/societe/soc.php?socid=".$objp->socid);
$this->info_box_contents[$i][4] = array('td' => 'align="left" class="nowrap"',
@@ -155,7 +155,7 @@ class box_actions extends ModeleBoxes
global $langs, $conf;
parent::showBox($this->info_box_head, $this->info_box_contents);
if ($conf->global->SHOW_DIALOG_HOMEPAGE)
- {
+ {
$actioncejour=false;
$contents=$this->info_box_contents;
$nblines=count($contents);
@@ -170,7 +170,7 @@ class box_actions extends ModeleBoxes
if (isset($contents[$i]))
{
// on affiche que les évènement du jours ou passé
- // qui ne sont pas à 100%
+ // qui ne sont pas à 100%
$actioncejour=true;
$var=!$var;
// TR
@@ -193,8 +193,8 @@ class box_actions extends ModeleBoxes
print '</tr>';
}
}
- print '</table>';
-
+ print '</table>';
+
}
print '</div>';
if ($actioncejour)
diff --git a/htdocs/core/boxes/box_clients.php b/htdocs/core/boxes/box_clients.php
index ae6b6b7ef1547702cbf183389f84641535dcd2f8..9e1706a5e6b107ddc5e68e0ceb65d842f0fa307e 100644
--- a/htdocs/core/boxes/box_clients.php
+++ b/htdocs/core/boxes/box_clients.php
@@ -63,7 +63,7 @@ class box_clients extends ModeleBoxes
if ($user->rights->societe->lire)
{
- $sql = "SELECT s.nom, s.rowid as socid, s.datec, s.tms, s.status";
+ $sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.client IN (1, 3)";
@@ -93,7 +93,7 @@ class box_clients extends ModeleBoxes
'url' => $url.$objp->socid);
$this->info_box_contents[$i][1] = array('td' => 'align="left"',
- 'text' => $objp->nom,
+ 'text' => $objp->name,
'url' => $url.$objp->socid);
$this->info_box_contents[$i][2] = array('td' => 'align="right"',
diff --git a/htdocs/core/boxes/box_commandes.php b/htdocs/core/boxes/box_commandes.php
index f88eaa939ac351452cc2bd4a5e915a1dc576f3eb..a89fca4acc07ade4d6ed7fd19beb4788dca1cf14 100644
--- a/htdocs/core/boxes/box_commandes.php
+++ b/htdocs/core/boxes/box_commandes.php
@@ -63,7 +63,7 @@ class box_commandes extends ModeleBoxes
if ($user->rights->commande->lire)
{
- $sql = "SELECT s.nom, s.rowid as socid,";
+ $sql = "SELECT s.nom as name, s.rowid as socid,";
$sql.= " c.ref, c.tms, c.rowid,";
$sql.= " c.fk_statut, c.facture";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -101,7 +101,7 @@ class box_commandes extends ModeleBoxes
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][3] = array('td' => 'align="left"',
- 'text' => $objp->nom,
+ 'text' => $objp->name,
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][4] = array('td' => 'align="right"',
diff --git a/htdocs/core/boxes/box_contracts.php b/htdocs/core/boxes/box_contracts.php
index 4297d4de46e4b572fc22607405db4ec2ae886d3d..dc0ff8e5382938f548c37696e47bfad66bcf47a6 100644
--- a/htdocs/core/boxes/box_contracts.php
+++ b/htdocs/core/boxes/box_contracts.php
@@ -60,7 +60,7 @@ class box_contracts extends ModeleBoxes
if ($user->rights->contrat->lire)
{
- $sql = "SELECT s.nom, s.rowid as socid,";
+ $sql = "SELECT s.nom as name, s.rowid as socid,";
$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat, c.datec, c.fin_validite, c.date_cloture";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."contrat as c";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -108,7 +108,7 @@ class box_contracts extends ModeleBoxes
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][3] = array('td' => 'align="left"',
- 'text' => dol_trunc($objp->nom,40),
+ 'text' => dol_trunc($objp->name,40),
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][4] = array('td' => 'align="right"',
diff --git a/htdocs/core/boxes/box_factures.php b/htdocs/core/boxes/box_factures.php
index 92af03f57add6fafce0c7cedd2fdef4bb4f5f99d..ee5326250b30193efda2587ee674e60dbf6fbed2 100644
--- a/htdocs/core/boxes/box_factures.php
+++ b/htdocs/core/boxes/box_factures.php
@@ -66,7 +66,7 @@ class box_factures extends ModeleBoxes
{
$sql = "SELECT f.rowid as facid, f.facnumber, f.type, f.amount, f.datef as df";
$sql.= ", f.paye, f.fk_statut, f.datec, f.tms";
- $sql.= ", s.nom, s.rowid as socid";
+ $sql.= ", s.nom as name, s.rowid as socid";
$sql.= ", f.date_lim_reglement as datelimite";
$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."facture as f";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -113,7 +113,7 @@ class box_factures extends ModeleBoxes
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][3] = array('td' => 'align="left"',
- 'text' => $objp->nom,
+ 'text' => $objp->name,
'maxlength'=>40,
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
diff --git a/htdocs/core/boxes/box_factures_fourn.php b/htdocs/core/boxes/box_factures_fourn.php
index 20d2a11bf9c982ab606d867a01b1e5f12a17cbc2..441c9f743fe23d22643488d89953e10ed5fa7500 100644
--- a/htdocs/core/boxes/box_factures_fourn.php
+++ b/htdocs/core/boxes/box_factures_fourn.php
@@ -63,7 +63,7 @@ class box_factures_fourn extends ModeleBoxes
if ($user->rights->fournisseur->facture->lire)
{
- $sql = "SELECT s.nom, s.rowid as socid,";
+ $sql = "SELECT s.nom as name, s.rowid as socid,";
$sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.amount,";
$sql.= " f.paye, f.fk_statut,";
$sql.= ' f.datef as df,';
@@ -115,7 +115,7 @@ class box_factures_fourn extends ModeleBoxes
'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][4] = array('td' => 'align="left"',
- 'text' => $objp->nom,
+ 'text' => $objp->name,
'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][5] = array('td' => 'align="right"',
diff --git a/htdocs/core/boxes/box_factures_fourn_imp.php b/htdocs/core/boxes/box_factures_fourn_imp.php
index dadfe58a27a8da522b56ea78cd4d9f847da114a5..aa217f1c436f79ca558973b7cee6f8d13c52d027 100644
--- a/htdocs/core/boxes/box_factures_fourn_imp.php
+++ b/htdocs/core/boxes/box_factures_fourn_imp.php
@@ -60,7 +60,7 @@ class box_factures_fourn_imp extends ModeleBoxes
if ($user->rights->fournisseur->facture->lire)
{
- $sql = "SELECT s.nom, s.rowid as socid,";
+ $sql = "SELECT s.nom as name, s.rowid as socid,";
$sql.= " f.rowid as facid, f.ref, f.ref_supplier, f.date_lim_reglement as datelimite,";
$sql.= " f.amount, f.datef as df,";
$sql.= " f.paye, f.fk_statut, f.type";
@@ -111,7 +111,7 @@ class box_factures_fourn_imp extends ModeleBoxes
'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][4] = array('td' => 'align="left"',
- 'text' => $objp->nom,
+ 'text' => $objp->name,
'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][5] = array('td' => 'align="right"',
diff --git a/htdocs/core/boxes/box_factures_imp.php b/htdocs/core/boxes/box_factures_imp.php
index 8aab8fa9b1520cb8ec51c883af8ec2cebb05a1dc..e6df1530f8df1cdd311aa66714c061d8d79fce28 100644
--- a/htdocs/core/boxes/box_factures_imp.php
+++ b/htdocs/core/boxes/box_factures_imp.php
@@ -63,7 +63,7 @@ class box_factures_imp extends ModeleBoxes
if ($user->rights->facture->lire)
{
- $sql = "SELECT s.nom, s.rowid as socid,";
+ $sql = "SELECT s.nom as name, s.rowid as socid,";
$sql.= " f.facnumber, f.date_lim_reglement as datelimite,";
$sql.= " f.amount, f.datef as df,";
$sql.= " f.paye, f.fk_statut, f.rowid as facid";
@@ -110,7 +110,7 @@ class box_factures_imp extends ModeleBoxes
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][3] = array('td' => 'align="left"',
- 'text' => $objp->nom,
+ 'text' => $objp->name,
'maxlength'=>44,
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
diff --git a/htdocs/core/boxes/box_ficheinter.php b/htdocs/core/boxes/box_ficheinter.php
index 118a18a007a1532b8af2c70cddf432aeb4f21782..fdebad2f38a2eedd2edb16f71f5fa54d4c72e942 100644
--- a/htdocs/core/boxes/box_ficheinter.php
+++ b/htdocs/core/boxes/box_ficheinter.php
@@ -65,7 +65,7 @@ class box_ficheinter extends ModeleBoxes
$sql.= " f.datec,";
$sql.= " f.date_valid as datev,";
$sql.= " f.tms as datem,";
- $sql.= " s.nom, s.rowid as socid, s.client";
+ $sql.= " s.nom as name, s.rowid as socid, s.client";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (! $user->rights->societe->client->voir)
$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -109,7 +109,7 @@ class box_ficheinter extends ModeleBoxes
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][3] = array('td' => 'align="left"',
- 'text' => dol_trunc($objp->nom,40),
+ 'text' => dol_trunc($objp->name,40),
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][4] = array('td' => 'align="right"',
diff --git a/htdocs/core/boxes/box_fournisseurs.php b/htdocs/core/boxes/box_fournisseurs.php
index 3423d8bee638edbbcd7ec14f48da55b435c16ba0..f233221ccaa13be2b4e036678c80e6597a643c6e 100644
--- a/htdocs/core/boxes/box_fournisseurs.php
+++ b/htdocs/core/boxes/box_fournisseurs.php
@@ -62,7 +62,7 @@ class box_fournisseurs extends ModeleBoxes
if ($user->rights->societe->lire)
{
- $sql = "SELECT s.nom, s.rowid as socid, s.datec, s.tms, s.status";
+ $sql = "SELECT s.nom as name, s.rowid as socid, s.datec, s.tms, s.status";
$sql .= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.fournisseur = 1";
@@ -89,7 +89,7 @@ class box_fournisseurs extends ModeleBoxes
'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][1] = array('td' => 'align="left"',
- 'text' => $objp->nom,
+ 'text' => $objp->name,
'url' => DOL_URL_ROOT."/fourn/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][2] = array('td' => 'align="right"',
diff --git a/htdocs/core/boxes/box_propales.php b/htdocs/core/boxes/box_propales.php
index 19c007bb2874b32c8cdd2802ae0e1297b95706b3..b548e90671bbf83fc41fc783549c9568f6f19768 100644
--- a/htdocs/core/boxes/box_propales.php
+++ b/htdocs/core/boxes/box_propales.php
@@ -62,7 +62,7 @@ class box_propales extends ModeleBoxes
if ($user->rights->propale->lire)
{
- $sql = "SELECT s.nom, s.rowid as socid,";
+ $sql = "SELECT s.nom as name, s.rowid as socid,";
$sql.= " p.rowid, p.ref, p.fk_statut, p.datep as dp, p.datec, p.fin_validite, p.date_cloture";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."propal as p";
@@ -106,7 +106,7 @@ class box_propales extends ModeleBoxes
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][3] = array('td' => 'align="left"',
- 'text' => dol_trunc($objp->nom,40),
+ 'text' => dol_trunc($objp->name,40),
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][4] = array('td' => 'align="right"',
diff --git a/htdocs/core/boxes/box_prospect.php b/htdocs/core/boxes/box_prospect.php
index 8c1a0afd28870fe1488f0ed65d01a6d20bc2cf2e..dd8682515c7b58902c51489035e449c460d48eec 100644
--- a/htdocs/core/boxes/box_prospect.php
+++ b/htdocs/core/boxes/box_prospect.php
@@ -63,7 +63,7 @@ class box_prospect extends ModeleBoxes
if ($user->rights->societe->lire)
{
- $sql = "SELECT s.nom, s.rowid as socid, s.fk_stcomm, s.datec, s.tms, s.status";
+ $sql = "SELECT s.nom as name, s.rowid as socid, s.fk_stcomm, s.datec, s.tms, s.status";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.client IN (2, 3)";
@@ -92,7 +92,7 @@ class box_prospect extends ModeleBoxes
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][1] = array('td' => 'align="left"',
- 'text' => $objp->nom,
+ 'text' => $objp->name,
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][2] = array('td' => 'align="right"',
diff --git a/htdocs/core/boxes/box_services_contracts.php b/htdocs/core/boxes/box_services_contracts.php
index d6e525e42d429df92a1219566ff92f456d943801..eb48fc83d2b754e4a8c092ced1ce77d63e826ec1 100644
--- a/htdocs/core/boxes/box_services_contracts.php
+++ b/htdocs/core/boxes/box_services_contracts.php
@@ -62,7 +62,7 @@ class box_services_contracts extends ModeleBoxes
if ($user->rights->service->lire && $user->rights->contrat->lire)
{
- $sql = "SELECT s.nom, s.rowid as socid,";
+ $sql = "SELECT s.nom as name, s.rowid as socid,";
$sql.= " c.rowid,";
$sql.= " cd.rowid as cdid, cd.tms as datem, cd.statut,";
$sql.= " p.rowid as pid, p.label, p.fk_product_type";
@@ -125,7 +125,7 @@ class box_services_contracts extends ModeleBoxes
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][3] = array('td' => 'align="left"',
- 'text' => $objp->nom,
+ 'text' => $objp->name,
'maxlength' => 28,
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
diff --git a/htdocs/core/boxes/box_services_expired.php b/htdocs/core/boxes/box_services_expired.php
index 8bfe57492156aec01ee4d08fb415f25da952c2f8..52f3777e2af86df56ce888f7c95002bc572ee0b0 100644
--- a/htdocs/core/boxes/box_services_expired.php
+++ b/htdocs/core/boxes/box_services_expired.php
@@ -63,7 +63,7 @@ class box_services_expired extends ModeleBoxes
// Select contracts with at least one expired service
$sql = "SELECT ";
$sql.= " c.rowid, c.ref, c.statut as fk_statut, c.date_contrat,";
- $sql.= " s.nom, s.rowid as socid,";
+ $sql.= " s.nom as name, s.rowid as socid,";
$sql.= " MIN(cd.date_fin_validite) as date_line, COUNT(cd.rowid) as nb_services";
$sql.= " FROM ".MAIN_DB_PREFIX."contrat as c, ".MAIN_DB_PREFIX."societe s, ".MAIN_DB_PREFIX."contratdet as cd";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -104,7 +104,7 @@ class box_services_expired extends ModeleBoxes
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][3] = array('td' => 'align="left"',
- 'text' => dol_trunc($objp->nom,40),
+ 'text' => dol_trunc($objp->name,40),
'url' => DOL_URL_ROOT."/comm/card.php?socid=".$objp->socid);
$this->info_box_contents[$i][4] = array('td' => 'align="center"',
diff --git a/htdocs/core/boxes/box_supplier_orders.php b/htdocs/core/boxes/box_supplier_orders.php
index 0634b1548a836d47e054dbeb6a3a992d615019ff..876b50c849fd954b7d600ff81b87f15f90658c9f 100644
--- a/htdocs/core/boxes/box_supplier_orders.php
+++ b/htdocs/core/boxes/box_supplier_orders.php
@@ -62,7 +62,7 @@ class box_supplier_orders extends ModeleBoxes
if ($user->rights->fournisseur->commande->lire)
{
- $sql = "SELECT s.nom, s.rowid as socid,";
+ $sql = "SELECT s.nom as name, s.rowid as socid,";
$sql.= " c.ref, c.tms, c.rowid,";
$sql.= " c.fk_statut";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -102,7 +102,7 @@ class box_supplier_orders extends ModeleBoxes
'url' => $urls);
$this->info_box_contents[$i][3] = array('td' => 'align="left"',
- 'text' => $objp->nom,
+ 'text' => $objp->name,
'url' => $urls);
$this->info_box_contents[$i][4] = array('td' => 'align="right"',
diff --git a/htdocs/core/class/hookmanager.class.php b/htdocs/core/class/hookmanager.class.php
index c402353e8d7d67ed2af8e275a83a3c668b9f1980..4f7044e3d1f2aaa1b66e3c166a3315d411672071 100644
--- a/htdocs/core/class/hookmanager.class.php
+++ b/htdocs/core/class/hookmanager.class.php
@@ -114,8 +114,8 @@ class HookManager
*
* @param string $method Name of method hooked ('doActions', 'printSearchForm', 'showInputField', ...)
* @param array $parameters Array of parameters
- * @param Object $object Object to use hooks on
- * @param string $action Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
+ * @param Object $object Object to use hooks on
+ * @param string $action Action code on calling page ('create', 'edit', 'view', 'add', 'update', 'delete'...)
* @return mixed For doActions,formObjectOptions,pdf_xxx: Return 0 if we want to keep standard actions, >0 if if want to stop standard actions, <0 means KO.
* For printSearchForm,printLeftBlock,printTopRightMenu,formAddObjectLine,...: Return HTML string. TODO Deprecated. Must always return an int and things to print into ->resprints.
* Can also return some values into an array ->results.
@@ -144,7 +144,8 @@ class HookManager
'moveUploadedFile',
'pdf_writelinedesc',
'paymentsupplierinvoices',
- 'printSearchForm'
+ 'printSearchForm',
+ 'formatEvent'
)
)) $hooktype='addreplace';
@@ -156,8 +157,6 @@ class HookManager
{
if (! empty($modules))
{
- $modulealreadyexecuted[$context]=array(); // Filter by context
-
foreach($modules as $module => $actionclassinstance)
{
//print "Before hook ".get_class($actionclassinstance)." method=".$method." hooktype=".$hooktype." results=".count($actionclassinstance->results)." resprints=".count($actionclassinstance->resprints)." resaction=".$resaction." result=".$result."<br>\n";
@@ -166,8 +165,8 @@ class HookManager
// jump to next class if method does not exists
if (! method_exists($actionclassinstance,$method)) continue;
// test to avoid to run twice a hook, when a module implements several active contexts
- if (in_array($module,$modulealreadyexecuted[$context])) continue;
- $modulealreadyexecuted[$context][$module]=$module; // Use the $currentcontext in method for avoid to run twice
+ if (in_array($module,$modulealreadyexecuted)) continue;
+ $modulealreadyexecuted[$module]=$module; // Use the $currentcontext in method for avoid to run twice
// Add current context for avoid method execution in bad context, you can add this test in your method : eg if($currentcontext != 'formfile') return;
$parameters['currentcontext'] = $context;
// Hooks that must return int (hooks with type 'addreplace')
diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php
index 33b1d42ca084c8685980e7f1611a5c6a4c4ad8ff..51b9c5eff4677f5fe098b31355e7d68144431da8 100644
--- a/htdocs/core/class/html.form.class.php
+++ b/htdocs/core/class/html.form.class.php
@@ -769,7 +769,7 @@ class Form
$outarray=array();
// On recherche les societes
- $sql = "SELECT s.rowid, s.nom, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
+ $sql = "SELECT s.rowid, s.nom as name, s.client, s.fournisseur, s.code_client, s.code_fournisseur";
$sql.= " FROM ".MAIN_DB_PREFIX ."societe as s";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
@@ -836,11 +836,11 @@ class Form
if (($obj->fournisseur) && (!empty($obj->code_fournisseur))) {
$label .= $obj->code_fournisseur. ' - ';
}
- $label.=' '.$obj->nom;
+ $label.=' '.$obj->name;
}
else
{
- $label=$obj->nom;
+ $label=$obj->name;
}
if ($showtype)
@@ -996,16 +996,12 @@ class Form
// On recherche les societes
$sql = "SELECT sp.rowid, sp.lastname, sp.statut, sp.firstname, sp.poste";
- if ($showsoc > 0) {
- $sql.= " , s.nom as company";
- }
+ if ($showsoc > 0) $sql.= " , s.nom as company";
$sql.= " FROM ".MAIN_DB_PREFIX ."socpeople as sp";
- if ($showsoc > 0) {
- $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX ."societe as s ON s.rowid=sp.fk_soc ";
- }
+ if ($showsoc > 0) $sql.= " LEFT OUTER JOIN ".MAIN_DB_PREFIX ."societe as s ON s.rowid=sp.fk_soc";
$sql.= " WHERE sp.entity IN (".getEntity('societe', 1).")";
if ($socid > 0) $sql.= " AND sp.fk_soc=".$socid;
- if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut<>0 ";
+ if (! empty($conf->global->CONTACT_HIDE_INACTIVE_IN_COMBOBOX)) $sql.= " AND sp.statut<>0";
$sql.= " ORDER BY sp.lastname ASC";
dol_syslog(get_class($this)."::select_contacts", LOG_DEBUG);
@@ -1839,7 +1835,7 @@ class Form
$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
$sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.remise_percent, pfp.remise, pfp.unitprice,";
- $sql.= " s.nom";
+ $sql.= " s.nom as name";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
if ($socid) $sql.= " AND pfp.fk_soc = ".$socid;
@@ -1951,8 +1947,8 @@ class Form
}
if (! $socid)
{
- $opt .= " - ".dol_trunc($objp->nom,8);
- $outval.=" - ".dol_trunc($objp->nom,8);
+ $opt .= " - ".dol_trunc($objp->name,8);
+ $outval.=" - ".dol_trunc($objp->name,8);
}
}
else
@@ -2007,7 +2003,7 @@ class Form
$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
$sql.= " pfp.ref_fourn, pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.quantity, pfp.unitprice,";
- $sql.= " s.nom";
+ $sql.= " s.nom as name";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as pfp ON p.rowid = pfp.fk_product";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON pfp.fk_soc = s.rowid";
@@ -2044,7 +2040,7 @@ class Form
if($num == 1) {
$opt .= ' selected="selected"';
}
- $opt.= '>'.$objp->nom.' - '.$objp->ref_fourn.' - ';
+ $opt.= '>'.$objp->name.' - '.$objp->ref_fourn.' - ';
if ($objp->quantity == 1)
{
@@ -4433,7 +4429,7 @@ class Form
$out='';
// On recherche les groupes
- $sql = "SELECT ug.rowid, ug.nom ";
+ $sql = "SELECT ug.rowid, ug.nom as name";
if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && $user->admin && ! $user->entity)
{
$sql.= ", e.label";
@@ -4478,7 +4474,7 @@ class Form
}
$out.= '>';
- $out.= $obj->nom;
+ $out.= $obj->name;
if (! empty($conf->multicompany->enabled) && empty($conf->multicompany->transverse_mode) && $conf->entity == 1)
{
$out.= " (".$obj->label.")";
diff --git a/htdocs/core/class/html.formcompany.class.php b/htdocs/core/class/html.formcompany.class.php
index f158a86f5da60b0174b4834f40dcd04c63bde2c9..ef58b6c7322275aa93c97f31cc9b8d212281943a 100644
--- a/htdocs/core/class/html.formcompany.class.php
+++ b/htdocs/core/class/html.formcompany.class.php
@@ -222,7 +222,7 @@ class FormCompany
$out='';
// On recherche les departements/cantons/province active d'une region et pays actif
- $sql = "SELECT d.rowid, d.code_departement as code , d.nom, d.active, c.label as country, c.code as country_code FROM";
+ $sql = "SELECT d.rowid, d.code_departement as code, d.nom as name, d.active, c.label as country, c.code as country_code FROM";
$sql .= " ".MAIN_DB_PREFIX ."c_departements as d, ".MAIN_DB_PREFIX."c_regions as r,".MAIN_DB_PREFIX."c_country as c";
$sql .= " WHERE d.fk_region=r.code_region and r.fk_pays=c.rowid";
$sql .= " AND d.active = 1 AND r.active = 1 AND c.active = 1";
@@ -270,7 +270,7 @@ class FormCompany
$out.= '<option value="'.$obj->rowid.'">';
}
// Si traduction existe, on l'utilise, sinon on prend le libelle par defaut
- $out.= $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->nom!='-'?$obj->nom:''));
+ $out.= $obj->code . ' - ' . ($langs->trans($obj->code)!=$obj->code?$langs->trans($obj->code):($obj->name!='-'?$obj->name:''));
$out.= '</option>';
}
$i++;
@@ -292,7 +292,7 @@ class FormCompany
* Retourne la liste deroulante des regions actives dont le pays est actif
* La cle de la liste est le code (il peut y avoir plusieurs entree pour
* un code donnee mais dans ce cas, le champ pays et lang differe).
- * Ainsi les liens avec les regions se font sur une region independemment de son nom.
+ * Ainsi les liens avec les regions se font sur une region independemment de son name.
*
* @param string $selected Preselected value
* @param string $htmlname Name of HTML select field
@@ -529,20 +529,20 @@ class FormCompany
global $conf, $langs;
// On recherche les societes
- $sql = "SELECT s.rowid, s.nom FROM";
+ $sql = "SELECT s.rowid, s.nom as name FROM";
$sql.= " ".MAIN_DB_PREFIX."societe as s";
$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
- if ($selected && $conf->use_javascript_ajax && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) $sql.= " AND rowid = ".$selected;
+ if ($selected && $conf->use_javascript_ajax && ! empty($conf->global->COMPANY_USE_SEARCH_TO_SELECT)) $sql.= " AND s.rowid = ".$selected;
else
{
// For ajax search we limit here. For combo list, we limit later
if ($conf->use_javascript_ajax && $conf->global->COMPANY_USE_SEARCH_TO_SELECT
&& is_array($limitto) && count($limitto))
{
- $sql.= " AND rowid IN (".join(',',$limitto).")";
+ $sql.= " AND s.rowid IN (".join(',',$limitto).")";
}
}
- $sql.= " ORDER BY nom ASC";
+ $sql.= " ORDER BY s.nom ASC";
$resql = $this->db->query($sql);
if ($resql)
@@ -620,7 +620,7 @@ class FormCompany
}
else
{
- print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$obj->nom.'" '.$htmloption.' />';
+ print '<input type="text" size="30" id="search_'.$htmlname.'" name="search_'.$htmlname.'" value="'.$obj->name.'" '.$htmloption.' />';
}
print ajax_autocompleter(($socid?$socid:-1),$htmlname,DOL_URL_ROOT.'/societe/ajaxcompanies.php','',$minLength);
//print '</td>';
@@ -653,14 +653,14 @@ class FormCompany
{
print '<option value="'.$obj->rowid.'"';
if ($disabled) print ' disabled="disabled"';
- print ' selected="selected">'.dol_trunc($obj->nom,24).'</option>';
+ print ' selected="selected">'.dol_trunc($obj->name,24).'</option>';
$firstCompany = $obj->rowid;
}
else
{
print '<option value="'.$obj->rowid.'"';
if ($disabled) print ' disabled="disabled"';
- print '>'.dol_trunc($obj->nom,24).'</option>';
+ print '>'.dol_trunc($obj->name,24).'</option>';
}
$i ++;
}
diff --git a/htdocs/core/class/infobox.class.php b/htdocs/core/class/infobox.class.php
index fdc2d6fbe4f45575b3e690deba26e00c61deab32..52d27f8252389986b5bbb1a7a18ee449cdac1794 100644
--- a/htdocs/core/class/infobox.class.php
+++ b/htdocs/core/class/infobox.class.php
@@ -202,7 +202,8 @@ class InfoBox
$db->begin();
- // Sauve parametre indiquant que le user a une config dediee
+ // Save parameters to say user has a dedicated setup
+ $tab=array();
$confuserzone='MAIN_BOXES_'.$zone;
$tab[$confuserzone]=1;
if (dol_set_user_param($db, $conf, $user, $tab) < 0)
diff --git a/htdocs/core/class/mobiledetect.class.php b/htdocs/core/class/mobiledetect.class.php
index 107a13f47e303ce4783f359e3b87e681f307d7c2..c39111d04be74540995446fdc7dbe3b7f1245adc 100644
--- a/htdocs/core/class/mobiledetect.class.php
+++ b/htdocs/core/class/mobiledetect.class.php
@@ -1073,39 +1073,37 @@ class MobileDetect
/**
* Check the version of the given property in the User-Agent.
- * Will return a float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
+ * Will return a string or float number. (eg. 2_0 will return 2.0, 4.3.1 will return 4.31)
*
- * @param string $propertyName The name of the property. See self::getProperties() array
- * keys for all possible properties.
- * @param string $type Either self::VERSION_TYPE_STRING to get a string value or
- * self::VERSION_TYPE_FLOAT indicating a float value. This parameter
- * is optional and defaults to self::VERSION_TYPE_STRING. Passing an
- * invalid parameter will default to the this type as well.
+ * @param string $propertyName The name of the property. See self::getProperties() array keys for all possible properties (Ex: 'iPad', 'Android', ...).
+ * @param string $type Either self::VERSION_TYPE_STRING to get a string value or
+ * self::VERSION_TYPE_FLOAT indicating a float value. This parameter
+ * is optional and defaults to self::VERSION_TYPE_STRING. Passing an
+ * invalid parameter will default to this type as well.
*
- * @return string|float The version of the property we are trying to extract.
+ * @return string|float|boolean The version of the property we are trying to extract.
*/
public function version($propertyName, $type = self::VERSION_TYPE_STRING)
{
- if (empty($propertyName)) {
- return false;
- }
+ if (empty($propertyName)) return false;
//set the $type to the default if we don't recognize the type
- if ($type != self::VERSION_TYPE_STRING && $type != self::VERSION_TYPE_FLOAT) {
+ if ($type != self::VERSION_TYPE_STRING && $type != self::VERSION_TYPE_FLOAT)
+ {
$type = self::VERSION_TYPE_STRING;
}
$properties = self::getProperties();
// Check if the property exists in the properties array.
- if (array_key_exists($propertyName, $properties)) {
-
+ if (array_key_exists($propertyName, $properties))
+ {
// Prepare the pattern to be matched.
// Make sure we always deal with an array (string is converted).
$properties[$propertyName] = (array) $properties[$propertyName];
- foreach ($properties[$propertyName] as $propertyMatchString) {
-
+ foreach ($properties[$propertyName] as $propertyMatchString)
+ {
$propertyPattern = str_replace('[VER]', self::VER, $propertyMatchString);
// Escape the special character which is the delimiter.
@@ -1114,14 +1112,13 @@ class MobileDetect
// Identify and extract the version.
preg_match('/'.$propertyPattern.'/is', $this->userAgent, $match);
- if (!empty($match[1])) {
+ if (!empty($match[1]))
+ {
$version = ( $type == self::VERSION_TYPE_FLOAT ? $this->prepareVersionNo($match[1]) : $match[1] );
return $version;
}
-
}
-
}
return false;
@@ -1130,7 +1127,7 @@ class MobileDetect
/**
* Retrieve the mobile grading, using self::MOBILE_GRADE_* constants.
*
- * @return string One of the self::MOBILE_GRADE_* constants.
+ * @return string One of the self::MOBILE_GRADE_* constants.
*/
public function mobileGrade()
{
@@ -1210,7 +1207,8 @@ class MobileDetect
// @reference: http://my.opera.com/community/openweb/idopera/
$this->version('Opera', self::VERSION_TYPE_FLOAT)>=10 && !$isMobile
- ){
+ )
+ {
return self::MOBILE_GRADE_A;
}
@@ -1231,7 +1229,8 @@ class MobileDetect
// @todo: report this (tested on Nokia N71)
$this->version('Opera Mobi', self::VERSION_TYPE_FLOAT)>=11 && $this->is('SymbianOS')
- ){
+ )
+ {
return self::MOBILE_GRADE_B;
}
@@ -1241,7 +1240,8 @@ class MobileDetect
// Windows Mobile - Tested on the HTC Leo (WinMo 5.2)
$this->match('MSIEMobile|Windows CE.*Mobile') || $this->version('Windows Mobile', self::VERSION_TYPE_FLOAT)<=5.2
- ){
+ )
+ {
return self::MOBILE_GRADE_C;
}
diff --git a/htdocs/core/db/DoliDB.class.php b/htdocs/core/db/DoliDB.class.php
index 59fee975e3852613a0298431910dce7ce3191079..dc4b127ffaaf8e0273f477d77ad38d2312546b22 100644
--- a/htdocs/core/db/DoliDB.class.php
+++ b/htdocs/core/db/DoliDB.class.php
@@ -137,8 +137,12 @@ abstract class DoliDB implements Database
{
$this->transaction_opened=0;
dol_syslog("COMMIT Transaction".($log?' '.$log:''),LOG_DEBUG);
+ return 1;
+ }
+ else
+ {
+ return 0;
}
- return $ret;
}
else
{
@@ -248,7 +252,7 @@ abstract class DoliDB implements Database
/**
* Return last error label
*
- * @return string lasterror
+ * @return string Last error
*/
function lasterror()
{
@@ -260,9 +264,9 @@ abstract class DoliDB implements Database
* 19700101020000 -> 3600 with TZ+1 and gmt=0
* 19700101020000 -> 7200 whaterver is TZ if gmt=1
*
- * @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
- * @param int $gm 1=Input informations are GMT values, otherwise local to server TZ
- * @return date Date TMS
+ * @param string $string Date in a string (YYYYMMDDHHMMSS, YYYYMMDD, YYYY-MM-DD HH:MM:SS)
+ * @param int $gm 1=Input informations are GMT values, otherwise local to server TZ
+ * @return timestamp|string Date TMS
*/
function jdate($string, $gm=false)
{
diff --git a/htdocs/core/db/mssql.class.php b/htdocs/core/db/mssql.class.php
index 09885257ef6948f5936f3a402bc2e538f2bda34f..c823fdafe49577b28b0b0c0a2736c9abc17224aa 100644
--- a/htdocs/core/db/mssql.class.php
+++ b/htdocs/core/db/mssql.class.php
@@ -255,8 +255,12 @@ class DoliDBMssql extends DoliDB
{
$this->transaction_opened=0;
dol_syslog("COMMIT Transaction",LOG_DEBUG);
+ return 1;
+ }
+ else
+ {
+ return 0;
}
- return $ret;
}
else
{
@@ -672,7 +676,7 @@ class DoliDBMssql extends DoliDB
*
* @param string $database Name of database
* @param string $table Nmae of table filter ('xxx%')
- * @return resource Resource
+ * @return array List of tables in an array
*/
function DDLListTables($database,$table='')
{
diff --git a/htdocs/core/db/mysql.class.php b/htdocs/core/db/mysql.class.php
index 5be76d6d5d77bdb89f236f3021a7b90f40e21932..a52283ef32e22efab3910d6754fd6eca8480376c 100644
--- a/htdocs/core/db/mysql.class.php
+++ b/htdocs/core/db/mysql.class.php
@@ -585,7 +585,7 @@ class DoliDBMysql extends DoliDB
*
* @param string $database Name of database
* @param string $table Nmae of table filter ('xxx%')
- * @return resource Resource
+ * @return array List of tables in an array
*/
function DDLListTables($database, $table='')
{
diff --git a/htdocs/core/db/mysqli.class.php b/htdocs/core/db/mysqli.class.php
index 31cad578ce8bb5b754d759aceb08883a345f7f79..4a2ded2d0224ce33da2819f9fa854c33aaffa62d 100644
--- a/htdocs/core/db/mysqli.class.php
+++ b/htdocs/core/db/mysqli.class.php
@@ -590,7 +590,7 @@ class DoliDBMysqli extends DoliDB
*
* @param string $database Name of database
* @param string $table Nmae of table filter ('xxx%')
- * @return resource Resource
+ * @return array List of tables in an array
*/
function DDLListTables($database, $table='')
{
diff --git a/htdocs/core/db/pgsql.class.php b/htdocs/core/db/pgsql.class.php
index 25263deee46437ebaaec5af9ec8c3c95a35d561a..81b80a9f724358015e1b751a4535030c06e54feb 100644
--- a/htdocs/core/db/pgsql.class.php
+++ b/htdocs/core/db/pgsql.class.php
@@ -846,8 +846,8 @@ class DoliDBPgsql extends DoliDB
* List tables into a database
*
* @param string $database Name of database
- * @param string $table Nmae of table filter ('xxx%')
- * @return resource Resource
+ * @param string $table Name of table filter ('xxx%')
+ * @return array List of tables in an array
*/
function DDLListTables($database, $table='')
{
@@ -860,7 +860,7 @@ class DoliDBPgsql extends DoliDB
{
$listtables[] = $row[0];
}
- return $listtables;
+ return $listtables;
}
/**
diff --git a/htdocs/core/db/sqlite.class.php b/htdocs/core/db/sqlite.class.php
index dd040a9b1994492bbdd686a90881bf418d5590f5..dc364081e2413762129f9c5dda57ace016898282 100644
--- a/htdocs/core/db/sqlite.class.php
+++ b/htdocs/core/db/sqlite.class.php
@@ -737,8 +737,8 @@ class DoliDBSqlite extends DoliDB
* List tables into a database
*
* @param string $database Name of database
- * @param string $table Nmae of table filter ('xxx%')
- * @return resource Resource
+ * @param string $table Name of table filter ('xxx%')
+ * @return array List of tables in an array
*/
function DDLListTables($database, $table='')
{
diff --git a/htdocs/core/lib/admin.lib.php b/htdocs/core/lib/admin.lib.php
index a3cf6acca32e9ec3e3ed88c7d5edeb8183dca900..39813b9e1913f1e56b637ba842c66c7fbc2ee3a6 100644
--- a/htdocs/core/lib/admin.lib.php
+++ b/htdocs/core/lib/admin.lib.php
@@ -70,7 +70,7 @@ function versioncompare($versionarray1,$versionarray2)
if ($operande1 < $operande2) { $ret = -$level; break; }
if ($operande1 > $operande2) { $ret = $level; break; }
}
- //print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret;
+ //print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret.'<br>'."\n";
return $ret;
}
@@ -712,7 +712,7 @@ function activateModule($value,$withdeps=1)
// Test if Dolibarr version ok
$verdol=versiondolibarrarray();
$vermin=isset($objMod->need_dolibarr_version)?$objMod->need_dolibarr_version:0;
- //print 'eee'.versioncompare($verdol,$vermin).join(',',$verdol).' - '.join(',',$vermin);exit;
+ //print 'eee '.versioncompare($verdol,$vermin).' - '.join(',',$verdol).' - '.join(',',$vermin);exit;
if (is_array($vermin) && versioncompare($verdol,$vermin) < 0)
{
return $langs->trans("ErrorModuleRequireDolibarrVersion",versiontostring($vermin));
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index d5bd9ae9198138d83a055a97ac847a33a9f62653..f85d1c8f4af617d288b5197aa1cf2d99fbce79ea 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -954,7 +954,7 @@ function dol_meta_create($object)
if (is_dir($dir))
{
$nblignes = count($object->lines);
- $client = $object->client->nom . " " . $object->client->address . " " . $object->client->zip . " " . $object->client->town;
+ $client = $object->client->name . " " . $object->client->address . " " . $object->client->zip . " " . $object->client->town;
$meta = "REFERENCE=\"" . $object->ref . "\"
DATE=\"" . dol_print_date($object->date,'') . "\"
NB_ITEMS=\"" . $nblignes . "\"
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ad87d0f2644ba3bad64d7f7f68d962e8c09dfdcf..e088f764040b1f6c6b24a23be90b996a56ecfbe1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -1026,7 +1026,7 @@ function dol_getdate($timestamp,$fast=false)
* @param int $year Year
* @param mixed $gm True or 1 or 'gmt'=Input informations are GMT values, False or 0 or 'server' = local to server TZ, 'user' = local to user TZ
* @param int $check 0=No check on parameters (Can use day 32, etc...)
- * @return int Date as a timestamp, '' if error
+ * @return timestamp|string Date as a timestamp, '' if error
* @see dol_print_date, dol_stringtotime, dol_getdate
*/
function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)
@@ -1075,6 +1075,7 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)
$dt->setDate($year,$month,$day);
$dt->setTime((int) $hour, (int) $minute, (int) $second);
$date=$dt->getTimestamp(); // should include daylight saving time
+ return $date;
}
else
{
@@ -1092,8 +1093,8 @@ function dol_mktime($hour,$minute,$second,$month,$day,$year,$gm=false,$check=1)
{
$date=mktime($hour,$minute,$second,$month,$day,$year);
}*/
+ return '';
}
- return $date;
}
@@ -1808,13 +1809,15 @@ function img_picto($titlealt, $picto, $options = '', $pictoisfullpath = false, $
}
else
{
- // By default, we search $url/theme/$theme/img/$picto
+ // We forge fullpathpicto for image to $path/img/$picto. By default, we take DOL_URL_ROOT/theme/$conf->theme/img/$picto
$url = DOL_URL_ROOT;
$theme = $conf->theme;
$path = 'theme/'.$theme;
- if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES;
- //if (! empty($conf->global->MAIN_FORCETHEMEDIR)) $path = preg_replace('/^\//', '', $conf->global->MAIN_FORCETHEMEDIR).'/'.$path; // TODO What if there is both FORCETHEMDIR and OVERWRITE_THEM_RES
+ if (! empty($conf->global->MAIN_OVERWRITE_THEME_PATH)) $path = $conf->global->MAIN_OVERWRITE_THEME_PATH.'/theme/'.$theme; // If the theme does not have the same name as the module
+ else if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) $path = $conf->global->MAIN_OVERWRITE_THEME_RES.'/theme/'.$conf->global->MAIN_OVERWRITE_THEME_RES; // To allow an external module to overwrite image resources whatever is activated theme
+ else if (! empty($conf->modules_parts['theme']) && array_key_exists($theme, $conf->modules_parts['theme'])) $path = $theme.'/theme/'.$theme; // If the theme have the same name as the module
+
// If we ask an image into $url/$mymodule/img (instead of default path)
if (preg_match('/^([^@]+)@([^@]+)$/i',$picto,$regs))
{
@@ -1824,10 +1827,10 @@ function img_picto($titlealt, $picto, $options = '', $pictoisfullpath = false, $
// Clean parameters
if (! preg_match('/(\.png|\.gif)$/i',$picto)) $picto .= '.png';
// If alt path are defined, define url where img file is, according to physical path
- foreach ($conf->file->dol_document_root as $type => $dirroot) // ex: array(["main"]=>"/home/maindir/htdocs", ["alt0"]=>"/home/moddir/htdocs", ...)
+ foreach ($conf->file->dol_document_root as $type => $dirroot) // ex: array(["main"]=>"/home/maindir/htdocs", ["alt0"]=>"/home/moddir0/htdocs", ...)
{
if ($type == 'main') continue;
- if (file_exists($dirroot.'/'.$path.'/img/'.$picto))
+ if (file_exists($dirroot.'/'.$path.'/img/'.$picto)) // This need a lot of time, that's why enabling alternative dir like "custom" dir is not recommanded
{
$url=DOL_URL_ROOT.$conf->file->dol_url_root[$type];
break;
@@ -4144,7 +4147,11 @@ function setEventMessages($mesg, $mesgs, $style='mesgs')
{
if (! in_array((string) $style, array('mesgs','warnings','errors'))) dol_print_error('','Bad parameter for setEventMessage');
if (empty($mesgs)) setEventMessage($mesg, $style);
- else setEventMessage($mesgs, $style);
+ else
+ {
+ if (! empty($mesg) && ! in_array($mesg, $mesgs)) setEventMessage($mesg, $style); // Add message string if not already into array
+ setEventMessage($mesgs, $style);
+ }
}
/**
diff --git a/htdocs/core/lib/functions2.lib.php b/htdocs/core/lib/functions2.lib.php
index 38ca67bc9b23a64df9f68b5f24966c117aa9b4af..746755b824c8091e3ab7b01ae1b8e57e846a2671 100644
--- a/htdocs/core/lib/functions2.lib.php
+++ b/htdocs/core/lib/functions2.lib.php
@@ -1143,8 +1143,8 @@ function weight_convert($weight,&$from_unit,$to_unit)
*
* @param DoliDB $db Handler database
* @param Conf $conf Object conf
- * @param User $user Object user
- * @param array $tab Tableau (cle=>valeur) des parametres a sauvegarder
+ * @param User $user Object user
+ * @param array $tab Array (key=>value) with all parameters to save
* @return int <0 if KO, >0 if OK
*
* @see dolibarr_get_const, dolibarr_set_const, dolibarr_del_const
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index ff0587c7612f58bfa63ebb703b8b204486ef47d9..5000e00b345e3334e9fc58ff5b7609107486c250 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/htdocs/core/lib/pdf.lib.php
@@ -682,7 +682,7 @@ function pdf_pagefoot(&$pdf,$outputlangs,$paramfreetext,$fromcompany,$marge_bass
{
// Make substitution
$substitutionarray=array(
- '__FROM_NAME__' => $fromcompany->nom,
+ '__FROM_NAME__' => $fromcompany->name,
'__FROM_EMAIL__' => $fromcompany->email,
'__TOTAL_TTC__' => $object->total_ttc,
'__TOTAL_HT__' => $object->total_ht,
diff --git a/htdocs/core/lib/security.lib.php b/htdocs/core/lib/security.lib.php
index c8cccefda7f45fa2bf354047ce92d0442ad7526c..87dfcf1367b873ee7946835813c16afe52a2a977 100644
--- a/htdocs/core/lib/security.lib.php
+++ b/htdocs/core/lib/security.lib.php
@@ -100,7 +100,7 @@ function dol_hash($chain,$type=0)
* @param string $features Features to check (it must be module name. Examples: 'societe', 'contact', 'produit&service', 'produit|service', ...)
* @param int $objectid Object ID if we want to check a particular record (optional) is linked to a owned thirdparty (optional).
* @param string $dbtablename 'TableName&SharedElement' with Tablename is table where object is stored. SharedElement is an optional key to define where to check entity. Not used if objectid is null (optional)
- * @param string $feature2 Feature to check, second level of permission (optional)
+ * @param string $feature2 Feature to check, second level of permission (optional). Can be or check with 'level1|level2'.
* @param string $dbt_keyfield Field name for socid foreign key if not fk_soc. Not used if objectid is null (optional)
* @param string $dbt_select Field name for select if not rowid. Not used if objectid is null (optional)
* @param Canvas $objcanvas Object canvas
@@ -140,7 +140,7 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature
// Check read permission from module
$readok=1; $nbko=0;
- foreach ($featuresarray as $feature)
+ foreach ($featuresarray as $feature) // first we check nb of test ko
{
if (! empty($user->societe_id) && ! empty($conf->global->MAIN_MODULES_FOR_EXTERNAL) && ! in_array($feature,$listofmodules)) // If limits on modules for external users, module must be into list of modules for external users
{
@@ -174,11 +174,17 @@ function restrictedArea($user, $features, $objectid=0, $dbtablename='', $feature
}
else if (! empty($feature2)) // This should be used for future changes
{
+ $tmpreadok=1;
foreach($feature2 as $subfeature)
{
- if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $readok=0; $nbko++; }
- else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $readok=0; $nbko++; }
- else { $readok=1; break; } // Break is to bypass second test if the first is ok
+ if (! empty($subfeature) && empty($user->rights->$feature->$subfeature->lire) && empty($user->rights->$feature->$subfeature->read)) { $tmpreadok=0; }
+ else if (empty($subfeature) && empty($user->rights->$feature->lire) && empty($user->rights->$feature->read)) { $tmpreadok=0; }
+ else { $tmpreadok=1; break; } // Break is to bypass second test if the first is ok
+ }
+ if (! $tmpreadok) // We found a test on feature that is ko
+ {
+ $readok=0; // All tests are ko (we manage here the and, the or will be managed later using $nbko).
+ $nbko++;
}
}
else if (! empty($feature) && ($feature!='user' && $feature!='usergroup')) // This is for old permissions
diff --git a/htdocs/core/lib/tax.lib.php b/htdocs/core/lib/tax.lib.php
index 62e46b7b9f73755a5755608547c9294af15dbc68..cc9478f5d6157fff7b8cecec4bba88503517f7de 100644
--- a/htdocs/core/lib/tax.lib.php
+++ b/htdocs/core/lib/tax.lib.php
@@ -124,7 +124,7 @@ function vat_by_thirdparty($db, $y, $date_start, $date_end, $modetax, $direction
}
if (! empty($conf->global->MAIN_MODULE_COMPTABILITE))
{
- $sql = "SELECT s.rowid as socid, s.nom as nom, s.siren as tva_intra, s.tva_assuj as assuj,";
+ $sql = "SELECT s.rowid as socid, s.nom as name, s.siren as tva_intra, s.tva_assuj as assuj,";
$sql.= " sum(fd.total_ht) as amount, sum(fd.".$total_tva.") as tva,";
$sql.= " sum(fd.".$total_localtax1.") as localtax1,";
$sql.= " sum(fd.".$total_localtax2.") as localtax2";
diff --git a/htdocs/core/menus/standard/eldy.lib.php b/htdocs/core/menus/standard/eldy.lib.php
index c703847128fdd645a38de4b12eaff500138198a9..91f10cae4a3bedac0a88f1b3b21a5769aa2a9935 100644
--- a/htdocs/core/menus/standard/eldy.lib.php
+++ b/htdocs/core/menus/standard/eldy.lib.php
@@ -624,7 +624,7 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
}
// Contacts
- $newmenu->add("/contact/list.php?leftmenu=contacts", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("Contacts") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts');
+ $newmenu->add("/societe/index.php?leftmenu=thirdparties", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("ThirdParty") : $langs->trans("ContactsAddresses")), 0, $user->rights->societe->contact->lire, '', $mainmenu, 'contacts');
$newmenu->add("/contact/card.php?leftmenu=contacts&action=create", (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) ? $langs->trans("NewContact") : $langs->trans("NewContactAddress")), 1, $user->rights->societe->contact->creer);
$newmenu->add("/contact/list.php?leftmenu=contacts", $langs->trans("List"), 1, $user->rights->societe->contact->lire);
if (empty($conf->global->SOCIETE_DISABLE_PROSPECTS)) $newmenu->add("/contact/list.php?leftmenu=contacts&type=p", $langs->trans("Prospects"), 2, $user->rights->societe->contact->lire);
@@ -790,6 +790,15 @@ function print_left_eldy_menu($db,$menu_array_before,$menu_array_after,&$tabMenu
if (! empty($conf->facture->enabled)) $newmenu->add("/commande/list.php?leftmenu=orders&viewstatut=-3", $langs->trans("MenuOrdersToBill2"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
// if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
}
+
+ // Supplier Orders
+ if (! empty($conf->fournisseur->enabled))
+ {
+ $langs->load("supplier");
+ $newmenu->add("/fourn/commande/list.php?leftmenu=orders&search_status=5", $langs->trans("MenuOrdersSupplierToBill"), 0, $user->rights->commande->lire, '', $mainmenu, 'orders');
+ // if (empty($leftmenu) || $leftmenu=="orders") $newmenu->add("/commande/", $langs->trans("StatusOrderToBill"), 1, $user->rights->commande->lire);
+ }
+
// Donations
if (! empty($conf->don->enabled))
diff --git a/htdocs/core/modules/barcode/mod_barcode_product_standard.php b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
index 28fa03ee4f3251ef57f9616cf36402ded6f16c60..0bd7a262a9c0c1994ed24f34d555c800425a3e60 100644
--- a/htdocs/core/modules/barcode/mod_barcode_product_standard.php
+++ b/htdocs/core/modules/barcode/mod_barcode_product_standard.php
@@ -33,7 +33,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/barcode/modules_barcode.class.php'
*/
class mod_barcode_product_standard extends ModeleNumRefBarCode
{
- var $nom='Standard'; // Model Name
+ var $name='Standard'; // Model Name
var $code_modifiable; // Editable code
var $code_modifiable_invalide; // Modified code if it is invalid
var $code_modifiable_null; // Modified code if it is null
diff --git a/htdocs/core/modules/barcode/modules_barcode.class.php b/htdocs/core/modules/barcode/modules_barcode.class.php
index 0f87306354a8d09677e9e90ce75e25953052d750..d03302f36b7d0693b47067706fec3790fd162a63 100644
--- a/htdocs/core/modules/barcode/modules_barcode.class.php
+++ b/htdocs/core/modules/barcode/modules_barcode.class.php
@@ -62,7 +62,7 @@ abstract class ModeleNumRefBarCode
$langs->load("bills");
return $langs->trans("NoDescription");
}
-
+
/** Return model name
*
* @param Translate $langs Object langs
@@ -70,10 +70,10 @@ abstract class ModeleNumRefBarCode
*/
function getNom($langs)
{
- return $this->nom;
+ return empty($this->name)?$this->nom:$this->name;
}
-
- /** Return a numbering example
+
+ /** Return a numbering example
*
* @param Translate $langs Object langs
* @return string Example
@@ -96,7 +96,7 @@ abstract class ModeleNumRefBarCode
global $langs;
return $langs->trans("Function_getNextValue_InModuleNotWorking");
}
-
+
/** Return version of module
*
* @return string Version
@@ -112,7 +112,7 @@ abstract class ModeleNumRefBarCode
if ($this->version) return $this->version;
return $langs->trans("NotAvailable");
}
-
+
/**
* Return description of module parameters
*
@@ -128,7 +128,7 @@ abstract class ModeleNumRefBarCode
$langs->load("admin");
$s='';
- $s.=$langs->trans("Name").': <b>'.$this->nom.'</b><br>';
+ $s.=$langs->trans("Name").': <b>'.$this->name.'</b><br>';
$s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
if ($type != -1) $s.=$langs->trans("ValidityControledByModule").': <b>'.$this->getNom($langs).'</b><br>';
$s.='<br>';
@@ -171,6 +171,6 @@ abstract class ModeleNumRefBarCode
return $s;
}
-
+
}
diff --git a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
index 895ad153fc8c27d99be9a6ae351967f27c479a27..e95d40e0908d9a69ce537f01822fcab5979ce580 100644
--- a/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
+++ b/htdocs/core/modules/commande/doc/doc_generic_order_odt.modules.php
@@ -277,7 +277,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
// Make substitution
$substitutionarray=array(
- '__FROM_NAME__' => $this->emetteur->nom,
+ '__FROM_NAME__' => $this->emetteur->name,
'__FROM_EMAIL__' => $this->emetteur->email,
'__TOTAL_TTC__' => $object->total_ttc,
'__TOTAL_HT__' => $object->total_ht,
@@ -483,7 +483,7 @@ class doc_generic_order_odt extends ModelePDFCommandes
}
$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
-
+
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));
diff --git a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
index 7c2b7e742a5e5a8a44579f331500044c5e17a856..3e7803af70afedafa78c7846d4d604e287e40600 100644
--- a/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_einstein.modules.php
@@ -1233,12 +1233,12 @@ class pdf_einstein extends ModelePDFCommandes
{
// On peut utiliser le nom de la societe du contact
if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
- else $socname = $object->client->nom;
+ else $socname = $object->client->name;
$carac_client_name=$outputlangs->convToOutputCharset($socname);
}
else
{
- $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+ $carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
}
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
diff --git a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
index 05dfadac4a7165393052e8fdf746d256cc28cff8..0216bd4163aac9aa16d5c622c92b82c686014d5a 100644
--- a/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
+++ b/htdocs/core/modules/commande/doc/pdf_proforma.modules.php
@@ -1190,12 +1190,12 @@ class pdf_proforma extends ModelePDFCommandes
{
// On peut utiliser le nom de la societe du contact
if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
- else $socname = $object->client->nom;
+ else $socname = $object->client->name;
$carac_client_name=$outputlangs->convToOutputCharset($socname);
}
else
{
- $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+ $carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
}
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
diff --git a/htdocs/core/modules/contract/doc/pdf_strato.modules.php b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
index d522a12eef2cd3cdb35213169e2eeb6405b3e9c5..bd4cc3337430d652a0737b1b8973de36d09c97c2 100644
--- a/htdocs/core/modules/contract/doc/pdf_strato.modules.php
+++ b/htdocs/core/modules/contract/doc/pdf_strato.modules.php
@@ -586,12 +586,12 @@ class pdf_strato extends ModelePDFContract
{
// On peut utiliser le nom de la societe du contact
if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
- else $socname = $object->client->nom;
+ else $socname = $object->client->name;
$this->recipient->name=$outputlangs->convToOutputCharset($socname);
}
else
{
- $this->recipient->name=$outputlangs->convToOutputCharset($object->client->nom);
+ $this->recipient->name=$outputlangs->convToOutputCharset($object->client->name);
}
$carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, (isset($object->contact)?$object->contact:''), $usecontact, 'target');
diff --git a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
index b4325139878bf9bd694c937e24c759325d484be0..aaddbc1d7484bee6016ddb2655c140c817f0e3b0 100644
--- a/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
+++ b/htdocs/core/modules/expedition/doc/doc_generic_shipment_odt.modules.php
@@ -277,7 +277,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
// Make substitution
$substitutionarray=array(
- '__FROM_NAME__' => $this->emetteur->nom,
+ '__FROM_NAME__' => $this->emetteur->name,
'__FROM_EMAIL__' => $this->emetteur->email,
'__TOTAL_TTC__' => $object->total_ttc,
'__TOTAL_HT__' => $object->total_ht,
@@ -483,7 +483,7 @@ class doc_generic_shipment_odt extends ModelePdfExpedition
}
$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
-
+
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));
diff --git a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
index 69286c7980da9249a36891546c8d0e07f4549e29..bdf61e3ea72da8d840cf019a8a35e7fd33a491e9 100644
--- a/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_merou.modules.php
@@ -617,12 +617,12 @@ class pdf_merou extends ModelePdfExpedition
{
// On peut utiliser le nom de la societe du contact
if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
- else $socname = $object->client->nom;
+ else $socname = $object->client->name;
$carac_client_name=$outputlangs->convToOutputCharset($socname);
}
else
{
- $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+ $carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
}
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,((!empty($object->contact))?$object->contact:null),$usecontact,'targetwithdetails');
diff --git a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
index bf4b738354a18a144d7cb372eafbd2186ec86e56..ccb4f93a611b37ab0844ca936c66b289761c6313 100644
--- a/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
+++ b/htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
@@ -631,12 +631,12 @@ class pdf_rouget extends ModelePdfExpedition
{
// On peut utiliser le nom de la societe du contact
if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
- else $socname = $object->client->nom;
+ else $socname = $object->client->name;
$carac_client_name=$outputlangs->convToOutputCharset($socname);
}
else
{
- $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+ $carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
}
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,(!empty($object->contact)?$object->contact:null),$usecontact,'targetwithdetails');
diff --git a/htdocs/core/modules/export/export_excel.modules.php b/htdocs/core/modules/export/export_excel.modules.php
index bab287ff3b6616c948c84cededab15c8655c7ee0..87923b4cb9c5492764ea01a78cfee9259f414f9d 100644
--- a/htdocs/core/modules/export/export_excel.modules.php
+++ b/htdocs/core/modules/export/export_excel.modules.php
@@ -190,6 +190,14 @@ class ExportExcel extends ModeleExports
return -1;
}
}
+
+ if (!empty($conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR)) {
+ $cacheMethod = PHPExcel_CachedObjectStorageFactory::cache_to_discISAM;
+ $cacheSettings = array (
+ 'dir' => $conf->global->MAIN_USE_FILECACHE_EXPORT_EXCEL_DIR
+ );
+ PHPExcel_Settings::setCacheStorageMethod($cacheMethod, $cacheSettings);
+ }
$this->workbook = new PHPExcel();
$this->workbook->getProperties()->setCreator($user->getFullName($outputlangs).' - Dolibarr '.DOL_VERSION);
diff --git a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
index 0084df11e72bc59c3a2321524ae8ea5f82195f05..023978d099926e7e8d30876b560a8c44bade3805 100644
--- a/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
+++ b/htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
@@ -285,7 +285,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
// Make substitution
$substitutionarray=array(
- '__FROM_NAME__' => $this->emetteur->nom,
+ '__FROM_NAME__' => $this->emetteur->name,
'__FROM_EMAIL__' => $this->emetteur->email,
'__TOTAL_TTC__' => $object->total_ttc,
'__TOTAL_HT__' => $object->total_ht,
@@ -440,7 +440,7 @@ class doc_generic_invoice_odt extends ModelePDFFactures
}
$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
-
+
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));
diff --git a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
index 6b337ac4ad3f41d1d4aa9499876b5fbff40d00a2..35a0ff47aa076419863b97ed3b62eef71aa16694 100644
--- a/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
+++ b/htdocs/core/modules/facture/doc/pdf_crabe.modules.php
@@ -182,7 +182,7 @@ class pdf_crabe extends ModelePDFFactures
}
}
if (count($realpatharray) == 0) $this->posxpicture=$this->posxtva;
-
+
if ($conf->facture->dir_output)
{
$object->fetch_thirdparty();
@@ -369,7 +369,7 @@ class pdf_crabe extends ModelePDFFactures
// $pdf->Image does not increase value return by getY, so we save it manually
$posYAfterImage=$curY+$imglinesize['height'];
}
-
+
// Description of product line
$curX = $this->posxdesc-1;
@@ -407,7 +407,7 @@ class pdf_crabe extends ModelePDFFactures
$pdf->commitTransaction();
}
$posYAfterDescription=$pdf->GetY();
-
+
$nexY = $pdf->GetY();
$pageposafter=$pdf->getPage();
$pdf->setPage($pageposbefore);
@@ -487,7 +487,7 @@ class pdf_crabe extends ModelePDFFactures
$this->tva[$vatrate] += $tvaligne;
if ($posYAfterImage > $posYAfterDescription) $nexY=$posYAfterImage;
-
+
// Add line
if (! empty($conf->global->MAIN_PDF_DASH_BETWEEN_LINES) && $i < ($nblignes - 1))
{
@@ -1241,7 +1241,7 @@ class pdf_crabe extends ModelePDFFactures
//$pdf->MultiCell($this->posxtva-$this->posxpicture-1,2, $outputlangs->transnoentities("Photo"),'','C');
}
}
-
+
if (empty($conf->global->MAIN_GENERATE_DOCUMENTS_WITHOUT_VAT))
{
$pdf->line($this->posxtva-1, $tab_top, $this->posxtva-1, $tab_top + $tab_height);
@@ -1479,12 +1479,12 @@ class pdf_crabe extends ModelePDFFactures
{
// On peut utiliser le nom de la societe du contact
if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
- else $socname = $object->client->nom;
+ else $socname = $object->client->name;
$carac_client_name=$outputlangs->convToOutputCharset($socname);
}
else
{
- $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+ $carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
}
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
diff --git a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
index 7a697817eb3ba77dcd9c751d490430493c2f6536..0d09aa7ce6cde028e7ebbd190780c2e670867501 100644
--- a/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
+++ b/htdocs/core/modules/fichinter/doc/pdf_soleil.modules.php
@@ -565,12 +565,12 @@ class pdf_soleil extends ModelePDFFicheinter
{
// On peut utiliser le nom de la societe du contact
if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
- else $socname = $object->client->nom;
+ else $socname = $object->client->name;
$carac_client_name=$outputlangs->convToOutputCharset($socname);
}
else
{
- $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+ $carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
}
$carac_client=pdf_build_address($outputlangs, $this->emetteur, $object->client, (isset($object->contact)?$object->contact:''), $usecontact, 'target');
diff --git a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
index bb9f1d155ffd658c326dc4fe24b15622f096648b..e3e9be994117b26dd3e9de405bbc04eb7ddb08d8 100644
--- a/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
+++ b/htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
@@ -100,8 +100,8 @@ class pdf_typhon extends ModelePDFDeliveryOrder
$this->posxcomm=112;
//$this->posxtva=112;
//$this->posxup=126;
- $this->posxqty=174;
- $this->posxremainingqty=165;
+ $this->posxqty=165;
+ $this->posxremainingqty=185;
//$this->posxdiscount=162;
//$this->postotalht=174;
if ($this->page_largeur < 210) // To work with US executive format
@@ -825,12 +825,12 @@ class pdf_typhon extends ModelePDFDeliveryOrder
{
// On peut utiliser le nom de la societe du contact
if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
- else $socname = $object->client->nom;
+ else $socname = $object->client->name;
$carac_client_name=$outputlangs->convToOutputCharset($socname);
}
else
{
- $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+ $carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
}
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
diff --git a/htdocs/core/modules/mailings/framboise.modules.php b/htdocs/core/modules/mailings/framboise.modules.php
index d8f88ef766cd83dc443ebb3958291beb38fa0ccf..c647466e79649bdf1710ad11cf3473e7f31442da 100644
--- a/htdocs/core/modules/mailings/framboise.modules.php
+++ b/htdocs/core/modules/mailings/framboise.modules.php
@@ -59,7 +59,7 @@ class mailing_framboise extends MailingTargets
global $conf, $langs;
$langs->load("members");
$langs->load("companies");
-
+
$cibles = array();
// Select the members from category
@@ -229,10 +229,6 @@ class mailing_framboise extends MailingTargets
*/
function url($id)
{
- //$companystatic=new Societe($this->db);
- //$companystatic->id=$id;
- //$companystatic->nom='';
- //return $companystatic->getNomUrl(1); // Url too long
return '<a href="'.DOL_URL_ROOT.'/adherents/card.php?rowid='.$id.'">'.img_object('',"user").'</a>';
}
diff --git a/htdocs/core/modules/mailings/thirdparties.modules.php b/htdocs/core/modules/mailings/thirdparties.modules.php
index 9d7fb16aaaba5deaaebb8f7cee5fd4c3cc239542..df8ec79f9885826c45980f8eb5db674f20b736a6 100644
--- a/htdocs/core/modules/mailings/thirdparties.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties.modules.php
@@ -240,10 +240,6 @@ class mailing_thirdparties extends MailingTargets
*/
function url($id)
{
- //$companystatic=new Societe($this->db);
- //$companystatic->id=$id;
- //$companystatic->nom='';
- //return $companystatic->getNomUrl(1); // Url too long
return '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$id.'">'.img_object('',"company").'</a>';
}
diff --git a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
index a907ad0ec3f0ed8a3fb59517abb5655c9bb6a811..5837329a476e5067abe69a763c64678a8249e0c9 100644
--- a/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
+++ b/htdocs/core/modules/mailings/thirdparties_services_expired.modules.php
@@ -40,7 +40,7 @@ class mailing_thirdparties_services_expired extends MailingTargets
function __construct($db)
{
global $conf;
-
+
$this->db=$db;
$this->arrayofproducts=array();
@@ -233,10 +233,6 @@ class mailing_thirdparties_services_expired extends MailingTargets
*/
function url($id)
{
- //$companystatic=new Societe($this->db);
- //$companystatic->id=$id;
- //$companystatic->nom='';
- //return $companystatic->getNomUrl(1); // Url too long
return '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$id.'">'.img_object('',"company").'</a>';
}
diff --git a/htdocs/core/modules/modProduct.class.php b/htdocs/core/modules/modProduct.class.php
index 87dbc3e6ddee50ad3dd5c90760f6c2e7f0980fc8..a23fc59a2d0b50e921d41f99660c94fa1f0f3d9f 100644
--- a/htdocs/core/modules/modProduct.class.php
+++ b/htdocs/core/modules/modProduct.class.php
@@ -198,7 +198,7 @@ class modProduct extends DolibarrModules
$this->export_entities_array[$r][$fieldname]='product';
}
}
- // End add axtra fields
+ // End add extra fields
$this->export_sql_start[$r]='SELECT DISTINCT ';
$this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'product as p';
@@ -210,14 +210,14 @@ class modProduct extends DolibarrModules
{
// Exports product multiprice
$r++;
- $this->export_code[$r]=$this->rights_class.'_'.$key;
+ $this->export_code[$r]=$this->rights_class.'_'.$r;
$this->export_label[$r]="ProductsMultiPrice"; // Translation key (used only if key ExportDataset_xxx_z not found)
$this->export_permission[$r]=array(array("produit","export"));
$this->export_fields_array[$r]=array('p.rowid'=>"Id",'p.ref'=>"Ref",
- 'pr.price_base_type'=>"PriceBase",'pr.price_level'=>"PriceLevel",
- 'pr.price'=>"HT",'pr.price_ttc'=>"TTC",
- 'pr.price_min'=>"MinPriceHT",'pr.price_min_ttc'=>"MinPriceTTC",
- 'pr.tva_tx'=>'VATRate',
+ 'pr.price_base_type'=>"PriceLevelPriceBase",'pr.price_level'=>"PriceLevel",
+ 'pr.price'=>"PriceLevelUnitPriceHT",'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
+ 'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
+ 'pr.tva_tx'=>'PriceLevelVATRate',
'pr.date_price'=>'DateCreation');
//$this->export_TypeFields_array[$r]=array('p.ref'=>"Text",'p.label'=>"Text",'p.description'=>"Text",'p.url'=>"Text",'p.accountancy_code_sell'=>"Text",'p.accountancy_code_buy'=>"Text",'p.note'=>"Text",'p.length'=>"Number",'p.surface'=>"Number",'p.volume'=>"Number",'p.weight'=>"Number",'p.customcode'=>'Text','p.price_base_type'=>"Text",'p.price'=>"Number",'p.price_ttc'=>"Number",'p.tva_tx'=>'Number','p.tosell'=>"Boolean",'p.tobuy'=>"Boolean",'p.datec'=>'Date','p.tms'=>'Date');
$this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",
@@ -304,11 +304,11 @@ class modProduct extends DolibarrModules
$this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon
$this->import_tables_array[$r]=array('pr'=>MAIN_DB_PREFIX.'product_price');
$this->import_tables_creator_array[$r]=array('pr'=>'fk_user_author'); // Fields to store import user id
- $this->import_fields_array[$r]=array('pr.fk_product'=>"Id*",
- 'pr.price_base_type'=>"PriceBase",'pr.price_level'=>"PriceLevel",
- 'pr.price'=>"HT",'pr.price_ttc'=>"TTC",
- 'pr.price_min'=>"MinPriceHT",'pr.price_min_ttc'=>"MinPriceTTC",
- 'pr.tva_tx'=>'VATRate',
+ $this->import_fields_array[$r]=array('pr.fk_product'=>"ProductRowid*",
+ 'pr.price_base_type'=>"PriceLevelPriceBase",'pr.price_level'=>"PriceLevel",
+ 'pr.price'=>"PriceLevelUnitPriceHT",'pr.price_ttc'=>"PriceLevelUnitPriceTTC",
+ 'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
+ 'pr.tva_tx'=>'PriceLevelVATRate',
'pr.date_price'=>'DateCreation*');
$this->import_regex_array[$r]=array('pr.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
$this->import_examplevalues_array[$r]=array('pr.fk_product'=>"1",
@@ -332,7 +332,6 @@ class modProduct extends DolibarrModules
*/
function init($options='')
{
- // Permissions
$this->remove($options);
$sql = array();
diff --git a/htdocs/core/modules/modService.class.php b/htdocs/core/modules/modService.class.php
index 363fcaf6467e54116c0b89062a920e72751c1ceb..839d50709c77aa60b21b1a162314b9b884157f9c 100644
--- a/htdocs/core/modules/modService.class.php
+++ b/htdocs/core/modules/modService.class.php
@@ -60,7 +60,7 @@ class modService extends DolibarrModules
$this->picto='service';
// Data directories to create when module is enabled
- $this->dirs = array("/produit/temp");
+ $this->dirs = array("/product/temp");
// Dependancies
$this->depends = array();
@@ -147,7 +147,7 @@ class modService extends DolibarrModules
if (! empty($conf->stock->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.stock'=>'service'));
if (! empty($conf->barcode->enabled)) $this->export_entities_array[$r]=array_merge($this->export_entities_array[$r],array('p.barcode'=>'service'));
// Add extra fields
- $sql="SELECT name, label FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product'";
+ $sql="SELECT name, label, type FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product'";
$resql=$this->db->query($sql);
if ($resql) // This can fail when class is used on old database (during migration for example)
{
@@ -155,8 +155,28 @@ class modService extends DolibarrModules
{
$fieldname='extra.'.$obj->name;
$fieldlabel=ucfirst($obj->label);
- $this->export_fields_array[$r][$fieldname]=$fieldlabel;
- $this->export_entities_array[$r][$fieldname]='product';
+ $typeFilter="Text";
+ switch($obj->type)
+ {
+ case 'int':
+ case 'double':
+ case 'price':
+ $typeFilter="Numeric";
+ break;
+ case 'date':
+ case 'datetime':
+ $typeFilter="Date";
+ break;
+ case 'boolean':
+ $typeFilter="Boolean";
+ break;
+ case 'sellist':
+ $typeFilter="List:".$obj->param;
+ break;
+ }
+ $this->export_fields_array[$r][$fieldname]=$fieldlabel;
+ $this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
+ $this->export_entities_array[$r][$fieldname]='product';
}
}
// End add extra fields
@@ -164,7 +184,8 @@ class modService extends DolibarrModules
$this->export_sql_start[$r]='SELECT DISTINCT ';
$this->export_sql_end[$r] =' FROM '.MAIN_DB_PREFIX.'product as p';
$this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_extrafields as extra ON p.rowid = extra.fk_object';
- $this->export_sql_end[$r] .=' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity("product", 1).')';
+ if (! empty($conf->fournisseur->enabled)) $this->export_sql_end[$r] .=' LEFT JOIN '.MAIN_DB_PREFIX.'product_fournisseur_price as pf ON pf.fk_product = p.rowid LEFT JOIN '.MAIN_DB_PREFIX.'societe s ON s.rowid = pf.fk_soc';
+ $this->export_sql_end[$r] .=' WHERE p.fk_product_type = 1 AND p.entity IN ('.getEntity("product", 1).')';
if (empty($conf->product->enabled)) // We enable next import templates only if module product not already enabled (to avoid duplicate entries)
@@ -186,7 +207,7 @@ class modService extends DolibarrModules
$this->export_entities_array[$r]=array('p.rowid'=>"product",'p.ref'=>"product",
'pr.price_base_type'=>"product",'pr.price_level'=>"product",'pr.price'=>"product",
'pr.price_ttc'=>"product",
- 'pr.price_min'=>"MinPriceLevelUnitPriceHT",'pr.price_min_ttc'=>"MinPriceLevelUnitPriceTTC",
+ 'pr.price_min'=>"product",'pr.price_min_ttc'=>"product",
'pr.tva_tx'=>'product',
'pr.date_price'=>"product");
$this->export_sql_start[$r]='SELECT DISTINCT ';
@@ -208,10 +229,10 @@ class modService extends DolibarrModules
$this->import_entities_array[$r]=array(); // We define here only fields that use another icon that the one defined into import_icon
$this->import_tables_array[$r]=array('p'=>MAIN_DB_PREFIX.'product','extra'=>MAIN_DB_PREFIX.'product_extrafields');
$this->import_tables_creator_array[$r]=array('p'=>'fk_user_author'); // Fields to store import user id
- $this->import_fields_array[$r]=array('p.ref'=>"Ref*",'p.label'=>"Label*",'p.description'=>"Description",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.duration'=>"Duration",'p.customcode'=>'CustomCode','p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell*",'p.tobuy'=>"OnBuy*",'p.fk_product_type'=>"Type*",'p.finished'=>'Nature','p.datec'=>'DateCreation*');
+ $this->import_fields_array[$r]=array('p.ref'=>"Ref*",'p.label'=>"Label*",'p.description'=>"Description",'p.url'=>"PublicUrl",'p.accountancy_code_sell'=>"ProductAccountancySellCode",'p.accountancy_code_buy'=>"ProductAccountancyBuyCode",'p.note'=>"Note",'p.length'=>"Length",'p.surface'=>"Surface",'p.volume'=>"Volume",'p.weight'=>"Weight",'p.duration'=>"Duration",'p.customcode'=>'CustomCode','p.price'=>"SellingPriceHT",'p.price_ttc'=>"SellingPriceTTC",'p.tva_tx'=>'VAT','p.tosell'=>"OnSell*",'p.tobuy'=>"OnBuy*",'p.fk_product_type'=>"Type*",'p.finished'=>'Nature','p.datec'=>'DateCreation*');
if (! empty($conf->barcode->enabled)) $this->import_fields_array[$r]=array_merge($this->import_fields_array[$r],array('p.barcode'=>'BarCode'));
// Add extra fields
- $sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product'";
+ $sql="SELECT name, label, fieldrequired FROM ".MAIN_DB_PREFIX."extrafields WHERE elementtype = 'product' AND entity = ".$conf->entity;
$resql=$this->db->query($sql);
if ($resql) // This can fail when class is used on old database (during migration for example)
{
@@ -225,7 +246,7 @@ class modService extends DolibarrModules
// End add extra fields
$this->import_fieldshidden_array[$r]=array('extra.fk_object'=>'lastrowid-'.MAIN_DB_PREFIX.'product'); // aliastable.field => ('user->id' or 'lastrowid-'.tableparent)
$this->import_regex_array[$r]=array('p.ref'=>'[^ ]','p.tosell'=>'^[0|1]$','p.tobuy'=>'^[0|1]$','p.fk_product_type'=>'^[0|1]$','p.datec'=>'^[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]$');
- $this->import_examplevalues_array[$r]=array('p.ref'=>"PR123456",'p.label'=>"My product",'p.description'=>"This is a description example for record",'p.note'=>"Some note",'p.price'=>"100",'p.price_ttc'=>"110",'p.tva_tx'=>'10','p.tosell'=>"0 or 1",'p.tobuy'=>"0 or 1",'p.fk_product_type'=>"0 for product/1 for service",'p.finished'=>'','p.duration'=>"1y",'p.datec'=>'2008-12-31');
+ $this->import_examplevalues_array[$r]=array('p.ref'=>"PREF123456",'p.label'=>"My product",'p.description'=>"This is a description example for record",'p.note'=>"Some note",'p.price'=>"100",'p.price_ttc'=>"110",'p.tva_tx'=>'10','p.tosell'=>"0 or 1",'p.tobuy'=>"0 or 1",'p.fk_product_type'=>"0 for product/1 for service",'p.finished'=>'','p.duration'=>"1y",'p.datec'=>'2008-12-31');
if (empty($conf->product->enabled)) // We enable next import templates only if module product not already enabled (to avoid duplicate entries)
@@ -297,7 +318,6 @@ class modService extends DolibarrModules
*/
function init($options='')
{
- // Permissions et valeurs par defaut
$this->remove($options);
$sql = array();
diff --git a/htdocs/core/modules/product/mod_codeproduct_elephant.php b/htdocs/core/modules/product/mod_codeproduct_elephant.php
index 37383474c2d01a70b77058e5965358e8919162e8..5a041fd31ce00cd06f988d67e8b1077143d0db1a 100644
--- a/htdocs/core/modules/product/mod_codeproduct_elephant.php
+++ b/htdocs/core/modules/product/mod_codeproduct_elephant.php
@@ -35,6 +35,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/product/modules_product.class.php'
class mod_codeproduct_elephant extends ModeleProductCode
{
var $nom='Elephant'; // Nom du modele
+ var $name='Elephant'; // Nom du modele
var $code_modifiable; // Code modifiable
var $code_modifiable_invalide; // Code modifiable si il est invalide
var $code_modifiable_null; // Code modifiables si il est null
diff --git a/htdocs/core/modules/product/mod_codeproduct_leopard.php b/htdocs/core/modules/product/mod_codeproduct_leopard.php
index a3df52f682ffcd8acebb2b665a1d9a4080c6e475..3b850e1ba91503beb30c40f56a294f9d49619954 100644
--- a/htdocs/core/modules/product/mod_codeproduct_leopard.php
+++ b/htdocs/core/modules/product/mod_codeproduct_leopard.php
@@ -40,6 +40,7 @@ class mod_codeproduct_leopard extends ModeleProductCode
*/
var $nom='Leopard'; // Nom du modele
+ var $name='Leopard'; // Nom du modele
var $code_modifiable; // Code modifiable
var $code_modifiable_invalide; // Code modifiable si il est invalide
var $code_modifiable_null; // Code modifiables si il est null
diff --git a/htdocs/core/modules/product/modules_product.class.php b/htdocs/core/modules/product/modules_product.class.php
index 66affcf256a0b815735c54cbab205c08bee0aab7..0bfd3f8f03ef5931f829e88ed9432d4725d7d0dd 100644
--- a/htdocs/core/modules/product/modules_product.class.php
+++ b/htdocs/core/modules/product/modules_product.class.php
@@ -46,7 +46,7 @@ abstract class ModeleProductCode
*/
function getNom($langs)
{
- return $this->nom;
+ return empty($this->name)?$this->nom:$this->name;
}
@@ -147,7 +147,7 @@ abstract class ModeleProductCode
$langs->load("admin");
$s='';
- if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->nom.'</b><br>';
+ if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
if ($type == 0) $s.=$langs->trans("ProductCodeDesc").'<br>';
if ($type == 1) $s.=$langs->trans("ServiceCodeDesc").'<br>';
diff --git a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
index fc18f1068cebf74dd7940e2f331ec12ce5c4b93a..97e571c29727072b8a57845ca04dd8eb76689a7b 100644
--- a/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
+++ b/htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
@@ -339,7 +339,7 @@ class doc_generic_project_odt extends ModelePDFProjects
$texte.= '</div><div style="display: inline-block; vertical-align: middle;">';
$texte.= '<input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button">';
$texte.= '<br></div></div>';
-
+
// Scan directories
if (count($listofdir)) $texte.=$langs->trans("NumberOfModelFilesFound").': <b>'.count($listoffiles).'</b>';
@@ -452,7 +452,7 @@ class doc_generic_project_odt extends ModelePDFProjects
// Make substitution
$substitutionarray=array(
- '__FROM_NAME__' => $this->emetteur->nom,
+ '__FROM_NAME__' => $this->emetteur->name,
'__FROM_EMAIL__' => $this->emetteur->email,
);
complete_substitutions_array($substitutionarray, $langs, $object);
@@ -1020,7 +1020,7 @@ class doc_generic_project_odt extends ModelePDFProjects
}
$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
-
+
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));
diff --git a/htdocs/core/modules/project/mod_project_simple.php b/htdocs/core/modules/project/mod_project_simple.php
index 17ae9f29ddf5646cd0a8e5c7abee50f3e7ac96d2..49e4586d07b5dcf811b32f35788e1d2722ef0eea 100644
--- a/htdocs/core/modules/project/mod_project_simple.php
+++ b/htdocs/core/modules/project/mod_project_simple.php
@@ -35,11 +35,12 @@ class mod_project_simple extends ModeleNumRefProjects
var $prefix='PJ';
var $error='';
var $nom = "Simple";
+ var $name = "Simple";
- /**
+ /**
* Return description of numbering module
- *
+ *
* @return string Text with description
*/
function info()
@@ -49,9 +50,9 @@ class mod_project_simple extends ModeleNumRefProjects
}
- /**
+ /**
* Return an example of numbering module values
- *
+ *
* @return string Example
*/
function getExample()
@@ -62,7 +63,7 @@ class mod_project_simple extends ModeleNumRefProjects
/** Test si les numeros deja en vigueur dans la base ne provoquent pas de
* de conflits qui empechera cette numerotation de fonctionner.
- *
+ *
* @return boolean false si conflit, true si ok
*/
function canBeActivated()
@@ -97,7 +98,7 @@ class mod_project_simple extends ModeleNumRefProjects
/**
* Return next value
- *
+ *
* @param Societe $objsoc Object third party
* @param Project $project Object project
* @return string Value if OK, 0 if KO
@@ -130,7 +131,7 @@ class mod_project_simple extends ModeleNumRefProjects
//$yymm = strftime("%y%m",time());
$yymm = strftime("%y%m",$date);
-
+
if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
else $num = sprintf("%04s",$max+1);
@@ -139,9 +140,9 @@ class mod_project_simple extends ModeleNumRefProjects
}
- /**
+ /**
* Return next reference not yet used as a reference
- *
+ *
* @param Societe $objsoc Object third party
* @param Project $project Object project
* @return string Next not used reference
diff --git a/htdocs/core/modules/project/mod_project_universal.php b/htdocs/core/modules/project/mod_project_universal.php
index 5633a61f8ac1e7328d72d7ec6fd35a6d72405c0f..e76ed349b46ca9fff152a6be6420c871d8f5a3c7 100644
--- a/htdocs/core/modules/project/mod_project_universal.php
+++ b/htdocs/core/modules/project/mod_project_universal.php
@@ -33,11 +33,12 @@ class mod_project_universal extends ModeleNumRefProjects
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $error = '';
var $nom = 'Universal';
+ var $name = 'Universal';
/**
* Renvoi la description du modele de numerotation
- *
+ *
* @return string Texte descripif
*/
function info()
@@ -78,7 +79,7 @@ class mod_project_universal extends ModeleNumRefProjects
/**
* Renvoi un exemple de numerotation
- *
+ *
* @return string Example
*/
function getExample()
@@ -99,7 +100,7 @@ class mod_project_universal extends ModeleNumRefProjects
/**
* Return next value
- *
+ *
* @param Societe $objsoc Object third party
* @param Project $project Object project
* @return string Value if OK, 0 if KO
@@ -126,9 +127,9 @@ class mod_project_universal extends ModeleNumRefProjects
}
- /**
+ /**
* Return next reference not yet used as a reference
- *
+ *
* @param Societe $objsoc Object third party
* @param Project $project Object project
* @return string Next not used reference
diff --git a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
index dd70a49f3e125c5dd1265e2022346a2cb956498e..28b458732abe8f74030091f9b6941de6e84c6696 100644
--- a/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
+++ b/htdocs/core/modules/project/task/doc/doc_generic_task_odt.modules.php
@@ -438,7 +438,7 @@ class doc_generic_task_odt extends ModelePDFTask
// Make substitution
$substitutionarray=array(
- '__FROM_NAME__' => $this->emetteur->nom,
+ '__FROM_NAME__' => $this->emetteur->name,
'__FROM_EMAIL__' => $this->emetteur->email,
);
complete_substitutions_array($substitutionarray, $langs, $object);
diff --git a/htdocs/core/modules/project/task/mod_task_simple.php b/htdocs/core/modules/project/task/mod_task_simple.php
index eb8928d3b8fb409a175096f45288e2c1f2cd4052..0e7b416d72ee21d92d60c85d85573f2bced8aca3 100644
--- a/htdocs/core/modules/project/task/mod_task_simple.php
+++ b/htdocs/core/modules/project/task/mod_task_simple.php
@@ -35,11 +35,12 @@ class mod_task_simple extends ModeleNumRefTask
var $prefix='TK';
var $error='';
var $nom = "Simple";
+ var $name = "Simple";
- /**
+ /**
* Return description of numbering module
- *
+ *
* @return string Text with description
*/
function info()
@@ -49,9 +50,9 @@ class mod_task_simple extends ModeleNumRefTask
}
- /**
+ /**
* Return an example of numbering module values
- *
+ *
* @return string Example
*/
function getExample()
@@ -62,7 +63,7 @@ class mod_task_simple extends ModeleNumRefTask
/** Test si les numeros deja en vigueur dans la base ne provoquent pas de
* de conflits qui empechera cette numerotation de fonctionner.
- *
+ *
* @return boolean false si conflit, true si ok
*/
function canBeActivated()
@@ -98,7 +99,7 @@ class mod_task_simple extends ModeleNumRefTask
/**
* Return next value
- *
+ *
* @param Societe $objsoc Object third party
* @param Task $task Object Task
* @return string Value if OK, 0 if KO
@@ -130,7 +131,7 @@ class mod_task_simple extends ModeleNumRefTask
//$yymm = strftime("%y%m",time());
$yymm = strftime("%y%m",$date);
-
+
if ($max >= (pow(10, 4) - 1)) $num=$max+1; // If counter > 9999, we do not format on 4 chars, we take number as it is
else $num = sprintf("%04s",$max+1);
@@ -139,9 +140,9 @@ class mod_task_simple extends ModeleNumRefTask
}
- /**
+ /**
* Return next reference not yet used as a reference
- *
+ *
* @param Societe $objsoc Object third party
* @param Task $task Object task
* @return string Next not used reference
diff --git a/htdocs/core/modules/project/task/mod_task_universal.php b/htdocs/core/modules/project/task/mod_task_universal.php
index 1e99f90411693c507345e582f5c409e09e0bc28c..529814079c1c945c6b3822f7950dac3d028a89da 100644
--- a/htdocs/core/modules/project/task/mod_task_universal.php
+++ b/htdocs/core/modules/project/task/mod_task_universal.php
@@ -33,11 +33,12 @@ class mod_task_universal extends ModeleNumRefTask
var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $error = '';
var $nom = 'Universal';
+ var $name = 'Universal';
/**
* Renvoi la description du modele de numerotation
- *
+ *
* @return string Texte descripif
*/
function info()
@@ -78,7 +79,7 @@ class mod_task_universal extends ModeleNumRefTask
/**
* Renvoi un exemple de numerotation
- *
+ *
* @return string Example
*/
function getExample()
@@ -99,7 +100,7 @@ class mod_task_universal extends ModeleNumRefTask
/**
* Return next value
- *
+ *
* @param Societe $objsoc Object third party
* @param Project $project Object project
* @return string Value if OK, 0 if KO
@@ -126,9 +127,9 @@ class mod_task_universal extends ModeleNumRefTask
}
- /**
+ /**
* Return next reference not yet used as a reference
- *
+ *
* @param Societe $objsoc Object third party
* @param Project $project Object project
* @return string Next not used reference
diff --git a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
index f216d69a0fdb96d716ac164b80fddf693f8d463a..4b662e19564875512a086a43b2ed1058e55ecb5a 100644
--- a/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
+++ b/htdocs/core/modules/propale/doc/doc_generic_proposal_odt.modules.php
@@ -311,7 +311,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
// Make substitution
$substitutionarray=array(
- '__FROM_NAME__' => $this->emetteur->nom,
+ '__FROM_NAME__' => $this->emetteur->name,
'__FROM_EMAIL__' => $this->emetteur->email,
'__TOTAL_TTC__' => $object->total_ttc,
'__TOTAL_HT__' => $object->total_ht,
@@ -518,7 +518,7 @@ class doc_generic_proposal_odt extends ModelePDFPropales
}
$reshook=$hookmanager->executeHooks('afterODTCreation',$parameters,$this,$action); // Note that $action and $object may have been modified by some hooks
-
+
if (! empty($conf->global->MAIN_UMASK))
@chmod($file, octdec($conf->global->MAIN_UMASK));
diff --git a/htdocs/core/modules/propale/doc/pdf_azur.modules.php b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
index 1b042f3a0d6508069916e4db97614969d2cc879f..1cafa394e667bda997de96fe5e5008ca1a9cd220 100644
--- a/htdocs/core/modules/propale/doc/pdf_azur.modules.php
+++ b/htdocs/core/modules/propale/doc/pdf_azur.modules.php
@@ -730,7 +730,7 @@ class pdf_azur extends ModelePDFPropales
if (! empty($conf->global->FACTURE_CHQ_NUMBER))
{
$diffsizetitle=(empty($conf->global->PDF_DIFFSIZE_TITLE)?3:$conf->global->PDF_DIFFSIZE_TITLE);
-
+
if ($conf->global->FACTURE_CHQ_NUMBER > 0)
{
$account = new Account($this->db);
@@ -1328,12 +1328,12 @@ class pdf_azur extends ModelePDFPropales
{
// On peut utiliser le nom de la societe du contact
if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
- else $socname = $object->client->nom;
+ else $socname = $object->client->name;
$carac_client_name=$outputlangs->convToOutputCharset($socname);
}
else
{
- $carac_client_name=$outputlangs->convToOutputCharset($object->client->nom);
+ $carac_client_name=$outputlangs->convToOutputCharset($object->client->name);
}
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$object->client,($usecontact?$object->contact:''),$usecontact,'target');
diff --git a/htdocs/core/modules/societe/mod_codeclient_elephant.php b/htdocs/core/modules/societe/mod_codeclient_elephant.php
index 88b6e65bf0107c618c4a4620ee517359283df418..c24070c2e23e08a9137ac6663576594058bacd67 100644
--- a/htdocs/core/modules/societe/mod_codeclient_elephant.php
+++ b/htdocs/core/modules/societe/mod_codeclient_elephant.php
@@ -30,12 +30,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'
/**
- * \class mod_codeclient_elephant
- * \brief Class to manage third party code with elephant rule
+ * Class to manage third party code with elephant rule
*/
class mod_codeclient_elephant extends ModeleThirdPartyCode
{
var $nom='Elephant'; // Nom du modele
+ var $name='Elephant'; // Nom du modele
var $code_modifiable; // Code modifiable
var $code_modifiable_invalide; // Code modifiable si il est invalide
var $code_modifiable_null; // Code modifiables si il est null
diff --git a/htdocs/core/modules/societe/mod_codeclient_leopard.php b/htdocs/core/modules/societe/mod_codeclient_leopard.php
index 27155847bf01c9273dd45ec2a6c5346fa4c26b58..94c9c04d2e285dd6792ffc9308528ad24ae7b157 100644
--- a/htdocs/core/modules/societe/mod_codeclient_leopard.php
+++ b/htdocs/core/modules/societe/mod_codeclient_leopard.php
@@ -39,6 +39,7 @@ class mod_codeclient_leopard extends ModeleThirdPartyCode
*/
var $nom='Leopard'; // Nom du modele
+ var $name='Leopard'; // Nom du modele
var $code_modifiable; // Code modifiable
var $code_modifiable_invalide; // Code modifiable si il est invalide
var $code_modifiable_null; // Code modifiables si il est null
diff --git a/htdocs/core/modules/societe/mod_codeclient_monkey.php b/htdocs/core/modules/societe/mod_codeclient_monkey.php
index 4c735930820540d76cc8cd4d70a2a70eefd3d993..88ec1a6e8db3c498838b22cc19e8dc0815dfe10c 100644
--- a/htdocs/core/modules/societe/mod_codeclient_monkey.php
+++ b/htdocs/core/modules/societe/mod_codeclient_monkey.php
@@ -28,12 +28,12 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'
/**
- * \class mod_codeclient_monkey
- * \brief Classe permettant la gestion monkey des codes tiers
+ * Classe permettant la gestion monkey des codes tiers
*/
class mod_codeclient_monkey extends ModeleThirdPartyCode
{
var $nom='Monkey'; // Nom du modele
+ var $name='Monkey'; // Nom du modele
var $code_modifiable; // Code modifiable
var $code_modifiable_invalide; // Code modifiable si il est invalide
var $code_modifiable_null; // Code modifiables si il est null
@@ -52,6 +52,7 @@ class mod_codeclient_monkey extends ModeleThirdPartyCode
function __construct()
{
$this->nom = "Monkey";
+ $this->name = "Monkey";
$this->version = "dolibarr";
$this->code_null = 1;
$this->code_modifiable = 1;
diff --git a/htdocs/core/modules/societe/mod_codecompta_aquarium.php b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
index 57d8f0c20a6f7bb3b5751b76b0edcc7c9cd82eb6..1efc062ab2cc3c20e99a1038ae5055d240af0e8d 100644
--- a/htdocs/core/modules/societe/mod_codecompta_aquarium.php
+++ b/htdocs/core/modules/societe/mod_codecompta_aquarium.php
@@ -32,7 +32,8 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'
class mod_codecompta_aquarium extends ModeleAccountancyCode
{
var $nom='Aquarium';
- var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
+ var $name='Aquarium';
+ var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
var $prefixcustomeraccountancycode;
var $prefixsupplieraccountancycode;
@@ -73,7 +74,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
$texte.= '<table class="nobordernopadding" width="100%">';
$s1= $form->textwithpicto('<input type="text" class="flat" size="4" name="value1" value="'.$conf->global->COMPANY_AQUARIUM_MASK_SUPPLIER.'">',$tooltip,1,1);
$s2= $form->textwithpicto('<input type="text" class="flat" size="4" name="value2" value="'.$conf->global->COMPANY_AQUARIUM_MASK_CUSTOMER.'">',$tooltip,1,1);
- $texte.= '<tr><td>'.$langs->trans("ModuleCompanyCode".$this->nom,$s1,$s2)."<br>\n";
+ $texte.= '<tr><td>'.$langs->trans("ModuleCompanyCode".$this->name,$s1,$s2)."<br>\n";
$texte.= '</td>';
$texte.= '<td align="left"> <input type="submit" class="button" value="'.$langs->trans("Modify").'" name="Button"></td>';
$texte.= '</tr></table>';
@@ -109,7 +110,7 @@ class mod_codecompta_aquarium extends ModeleAccountancyCode
$i = 0;
$this->db = $db;
- dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->nom)?$societe->nom:''));
+ dol_syslog("mod_codecompta_aquarium::get_code search code for type=".$type." company=".(! empty($societe->name)?$societe->name:''));
// Regle gestion compte compta
$codetouse='';
diff --git a/htdocs/core/modules/societe/mod_codecompta_panicum.php b/htdocs/core/modules/societe/mod_codecompta_panicum.php
index b2240f7a9fc0a0cf43c188ccd9b0e39ff48222e5..15099eb0538f742da96ac6f97c39d5d607ea8817 100644
--- a/htdocs/core/modules/societe/mod_codecompta_panicum.php
+++ b/htdocs/core/modules/societe/mod_codecompta_panicum.php
@@ -26,13 +26,13 @@ require_once DOL_DOCUMENT_ROOT.'/core/modules/societe/modules_societe.class.php'
/**
- * \class mod_codecompta_panicum
- * \brief Class to manage accountancy code of thirdparties with Panicum rules
+ * Class to manage accountancy code of thirdparties with Panicum rules
*/
class mod_codecompta_panicum extends ModeleAccountancyCode
{
var $nom='Panicum';
- var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
+ var $name='Panicum';
+ var $version='dolibarr'; // 'development', 'experimental', 'dolibarr'
/**
@@ -51,7 +51,7 @@ class mod_codecompta_panicum extends ModeleAccountancyCode
*/
function info($langs)
{
- return $langs->trans("ModuleCompanyCode".$this->nom);
+ return $langs->trans("ModuleCompanyCode".$this->name);
}
/**
diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php
index 9a117ac8435f5aace0797e369810b402fea404bb..f1fc05d29db45a5bf29ae95b2f7a5d0ade1265cc 100644
--- a/htdocs/core/modules/societe/modules_societe.class.php
+++ b/htdocs/core/modules/societe/modules_societe.class.php
@@ -184,7 +184,7 @@ abstract class ModeleThirdPartyCode
$langs->load("admin");
$s='';
- if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->nom.'</b><br>';
+ if ($type == -1) $s.=$langs->trans("Name").': <b>'.$this->getNom($langs).'</b><br>';
if ($type == -1) $s.=$langs->trans("Version").': <b>'.$this->getVersion().'</b><br>';
if ($type == 0) $s.=$langs->trans("CustomerCodeDesc").'<br>';
if ($type == 1) $s.=$langs->trans("SupplierCodeDesc").'<br>';
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 54ae66186df82353e8a4473e4602015ca0a89ed8..5865d431132346c4b4af8e151d99ce9693389f1c 100644
--- a/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
+++ b/htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
@@ -1015,12 +1015,12 @@ class pdf_canelle extends ModelePDFSuppliersInvoices
{
// On peut utiliser le nom de la societe du contact
if (! empty($conf->global->MAIN_USE_COMPANY_NAME_OF_CONTACT)) $socname = $object->contact->socname;
- else $socname = $mysoc->nom;
+ else $socname = $mysoc->name;
$carac_client_name=$outputlangs->convToOutputCharset($socname);
}
else
{
- $carac_client_name=$outputlangs->convToOutputCharset($mysoc->nom);
+ $carac_client_name=$outputlangs->convToOutputCharset($mysoc->name);
}
$carac_client=pdf_build_address($outputlangs,$this->emetteur,$mysoc,((!empty($object->contact))?$object->contact:null),$usecontact,'target');
diff --git a/htdocs/core/modules/syslog/mod_syslog_file.php b/htdocs/core/modules/syslog/mod_syslog_file.php
index ddb30df4e45360602a07464485d62ad1fa0122ce..331b7331194fbafcb5399e832d0b85763d1fea0d 100644
--- a/htdocs/core/modules/syslog/mod_syslog_file.php
+++ b/htdocs/core/modules/syslog/mod_syslog_file.php
@@ -49,7 +49,7 @@ class mod_syslog_file extends LogHandler implements LogHandlerInterface
*/
public function isActive()
{
- return 1;
+ return true;
}
/**
diff --git a/htdocs/core/modules/syslog/mod_syslog_firephp.php b/htdocs/core/modules/syslog/mod_syslog_firephp.php
index 8ff2a52fa056c085f618b451fa92caf6b84f5035..31a3fb13431b2696073d59cec1529be248206cdd 100644
--- a/htdocs/core/modules/syslog/mod_syslog_firephp.php
+++ b/htdocs/core/modules/syslog/mod_syslog_firephp.php
@@ -53,7 +53,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface
restore_include_path();
if ($res)
{
- return 1;
+ return true;
}
}
catch(Exception $e)
@@ -61,7 +61,7 @@ class mod_syslog_firephp extends LogHandler implements LogHandlerInterface
print '<!-- FirePHP not available into PHP -->'."\n";
}
- return -1;
+ return false;
}
///**
diff --git a/htdocs/core/modules/syslog/mod_syslog_syslog.php b/htdocs/core/modules/syslog/mod_syslog_syslog.php
index 9b0d854e2e81fee4fd2f4673481c229357698599..58ac241695cf183342edff6d5471bc2ddd91c863 100644
--- a/htdocs/core/modules/syslog/mod_syslog_syslog.php
+++ b/htdocs/core/modules/syslog/mod_syslog_syslog.php
@@ -47,12 +47,9 @@ class mod_syslog_syslog extends LogHandler implements LogHandlerInterface
public function isActive()
{
// This function does not exists on some ISP (Ex: Free in France)
- if (!function_exists('openlog'))
- {
- return 0;
- }
+ if (!function_exists('openlog')) return false;
- return 1;
+ return true;
}
/**
diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php
index fda7aa00832d9c66cffd344212f405ad176d6b8e..acc0cd6b502ac24b193b7af845f5e919dd4d6fd3 100644
--- a/htdocs/core/tpl/contacts.tpl.php
+++ b/htdocs/core/tpl/contacts.tpl.php
@@ -1,6 +1,6 @@
<?php
-/* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2013 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2012 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2013-2014 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
@@ -209,7 +209,7 @@ $userstatic=new User($db);
?>
<?php if ($object->statut >= 0) echo '</a>'; ?>
</div>
- <div class="tagtd nowrap" align="center">
+ <div class="tagtd nowrap" align="right">
<?php if ($permission) { ?>
<a href="<?php echo $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=deletecontact&lineid='.$tab[$i]['rowid']; ?>"><?php echo img_delete(); ?></a>
<?php } ?>
diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php
index dd50e24c8e6e470274c09992064b9e6abedbc176..c4f9ff2b2062f7f8f5aa3dedad063a7342a171cf 100644
--- a/htdocs/core/tpl/login.tpl.php
+++ b/htdocs/core/tpl/login.tpl.php
@@ -47,6 +47,8 @@ $(document).ready(function () {
<?php } ?>
<center>
+<div class="login_vertical_align">
+
<form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>" />
@@ -197,7 +199,7 @@ if (isset($conf->file->main_authentication) && preg_match('/openid/',$conf->file
<?php if (! empty($_SESSION['dol_loginmesg']))
{
?>
- <div class="center" style="max-width: 500px; margin-left: 10px; margin-right: 10px;"><div class="error">
+ <div class="center login_main_message" style="max-width: 500px; margin-left: 10px; margin-right: 10px;"><div class="error">
<?php echo $_SESSION['dol_loginmesg']; ?>
</div></div>
<?php
@@ -268,8 +270,11 @@ if (! empty($conf->google->enabled) && ! empty($conf->global->MAIN_GOOGLE_AD_CLI
}
?>
+
+</div>
</center> <!-- end of center -->
+
</body>
</html>
<!-- END PHP TEMPLATE -->
diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php
index 7331a81ead0d2ee652785a0ac36f7de4ad6fc6b0..61c0bbe6cfc5b0703b5f90176074c624707198d3 100644
--- a/htdocs/core/tpl/passwordforgotten.tpl.php
+++ b/htdocs/core/tpl/passwordforgotten.tpl.php
@@ -43,7 +43,10 @@ $(document).ready(function () {
</script>
<?php } ?>
+
<center>
+<div class="login_vertical_align">
+
<form id="login" name="login" method="post" action="<?php echo $php_self; ?>">
<input type="hidden" name="token" value="<?php echo $_SESSION['newtoken']; ?>">
@@ -132,7 +135,7 @@ if (! empty($hookmanager->resArray['options'])) {
</form>
-<div class="center" style="max-width: 680px; margin-left: 10px; margin-right: 10px;">
+<div class="center login_main_home" style="max-width: 680px; margin-left: 10px; margin-right: 10px;">
<?php if ($mode == 'dolibarr' || ! $disabled) { ?>
<font style="font-size: 12px;">
<?php echo $langs->trans('SendNewPasswordDesc'); ?>
@@ -148,16 +151,16 @@ if (! empty($hookmanager->resArray['options'])) {
<br>
<?php if ($message) { ?>
- <div class="center" style="max-width: 680px; margin-left: 10px; margin-right: 10px;">
+ <div class="center login_main_message" style="max-width: 680px; margin-left: 10px; margin-right: 10px;">
<?php echo dol_htmloutput_mesg($message,'','',1); ?>
</div>
<?php } ?>
+
+</div>
</center> <!-- end of center -->
-<br>
</body>
</html>
-
<!-- END PHP TEMPLATE -->
diff --git a/htdocs/core/triggers/interface_20_all_Logevents.class.php b/htdocs/core/triggers/interface_20_all_Logevents.class.php
index 0770af5452054b45ae00324b317c62a58d45bf06..1b094790195701dbb2884dfdd8000f4177dda7df 100644
--- a/htdocs/core/triggers/interface_20_all_Logevents.class.php
+++ b/htdocs/core/triggers/interface_20_all_Logevents.class.php
@@ -140,24 +140,24 @@ class InterfaceLogevents extends DolibarrTriggers
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc)
- $text=$langs->transnoentities("NewGroupCreated",$object->nom);
- $desc=$langs->transnoentities("NewGroupCreated",$object->nom);
+ $text=$langs->transnoentities("NewGroupCreated",$object->name);
+ $desc=$langs->transnoentities("NewGroupCreated",$object->name);
}
elseif ($action == 'GROUP_MODIFY')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc)
- $text=$langs->transnoentities("GroupModified",$object->nom);
- $desc=$langs->transnoentities("GroupModified",$object->nom);
+ $text=$langs->transnoentities("GroupModified",$object->name);
+ $desc=$langs->transnoentities("GroupModified",$object->name);
}
elseif ($action == 'GROUP_DELETE')
{
dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
$langs->load("users");
// Initialisation donnees (date,duree,texte,desc)
- $text=$langs->transnoentities("GroupDeleted",$object->nom);
- $desc=$langs->transnoentities("GroupDeleted",$object->nom);
+ $text=$langs->transnoentities("GroupDeleted",$object->name);
+ $desc=$langs->transnoentities("GroupDeleted",$object->name);
}
// If not found
diff --git a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
index 4d2888d8aff5fb102767458cc321c113fcd83db0..43ea3357a7daee54308e8629df22fcbaf14fef1c 100644
--- a/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
+++ b/htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
@@ -79,8 +79,8 @@ class InterfaceActionsAuto extends DolibarrTriggers
$langs->load("other");
$object->actiontypecode='AC_OTH_AUTO';
- if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->nom);
- $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->nom);
+ if (empty($object->actionmsg2)) $object->actionmsg2=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
+ $object->actionmsg=$langs->transnoentities("NewCompanyToDolibarr",$object->name);
if (! empty($object->prefix)) $object->actionmsg.=" (".$object->prefix.")";
$object->actionmsg.="\n".$langs->transnoentities("Author").': '.$user->login;
diff --git a/htdocs/ecm/docother.php b/htdocs/ecm/docother.php
index f219e352c64e2780a306623afc0e80a9af6e502f..d1fda6b793a7c8753405689dfb39fdd5e3ca1e2b 100644
--- a/htdocs/ecm/docother.php
+++ b/htdocs/ecm/docother.php
@@ -104,8 +104,6 @@ print_fiche_titre($langs->trans("ECMAutoOrg"));
//$head = societe_prepare_head($societe);
-//dol_fiche_head($head, 'document', $societe->nom);
-
/*
* Confirmation de la suppression d'une ligne produit
@@ -113,7 +111,7 @@ print_fiche_titre($langs->trans("ECMAutoOrg"));
if ($_GET['action'] == 'delete_file')
{
print $form->formconfirm($_SERVER["PHP_SELF"].'?socid='.$socid.'&urlfile='.urldecode($_GET["urlfile"]), $langs->trans('DeleteFile'), $langs->trans('ConfirmDeleteFile'), 'confirm_deletefile');
-
+
}
// Construit liste des fichiers
diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index ade0014708d986136fa163b42ecbc29cf02dfd44..c2649e5f8df85a7b41460089a3e143e8b5cc3a65 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -7,6 +7,7 @@
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2013 Marcos García <marcosgdf@gmail.com>
* Copyright (C) 2014 Cedric GROSS <c.gross@kreiz-it.fr>
+ * Copyright (C) 2014 Francis Appels <francis.appels@yahoo.com>
*
* 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
@@ -81,7 +82,7 @@ if ($id > 0 || ! empty($ref))
}
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('expeditioncard'));
+$hookmanager->initHooks(array('expeditioncard','globalcard'));
/*
* Actions
@@ -1433,6 +1434,18 @@ else if ($id || $ref)
$entrepot = new Entrepot($db);
$entrepot->fetch($lines[$i]->entrepot_id);
print $entrepot->getNomUrl(1);
+ }
+ else if (count($lines[$i]->details_entrepot) > 1)
+ {
+ $detail = '';
+ foreach ($lines[$i]->details_entrepot as $detail_entrepot) {
+ if ($detail_entrepot->entrepot_id > 0) {
+ $entrepot = new Entrepot($db);
+ $entrepot->fetch($detail_entrepot->entrepot_id);
+ $detail.= $langs->trans("DetailWarehouseFormat",$entrepot->libelle,$detail_entrepot->qty_shipped).'<br/>';
+ }
+ }
+ print $form->textwithtooltip($langs->trans("DetailWarehouseNumber"),$detail);
}
print '</td>';
}
@@ -1440,6 +1453,7 @@ else if ($id || $ref)
// Batch number managment
if (! empty($conf->productbatch->enabled)) {
if (isset($lines[$i]->detail_batch) ) {
+ $flagBatch = true;
print '<td align="center">';
$detail = '';
foreach ($lines[$i]->detail_batch as $dbatch) {
@@ -1526,10 +1540,17 @@ else if ($id || $ref)
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=classifybilled">'.$langs->trans($label).'</a>';
}
}
-
+
if ($user->rights->expedition->supprimer)
{
- print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
+ if (empty($conf->productbatch->enabled) || (!empty($conf->productbatch->enabled) && !$conf->global->STOCK_CALCULATE_ON_SHIPMENT) || !isset($flagBatch))
+ {
+ print '<a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
+ }
+ else
+ {
+ print '<a class="butActionRefused" href="#">'.$langs->trans('Delete').'</a>';
+ }
}
print '</div>';
diff --git a/htdocs/expedition/class/expedition.class.php b/htdocs/expedition/class/expedition.class.php
index d929dd067efedaa00f0c43ffd876b5e88dce89ad..019ef22f769f9a5c98a1f82711ffa63d0a3ba23a 100644
--- a/htdocs/expedition/class/expedition.class.php
+++ b/htdocs/expedition/class/expedition.class.php
@@ -7,6 +7,7 @@
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Cedric GROSS <c.gross@kreiz-it.fr>
* Copyright (C) 2014 Marcos García <marcosgdf@gmail.com>
+ * Copyright (C) 2014 Francis Appels <francis.appels@yahoo.com>
*
* 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
@@ -1068,7 +1069,7 @@ class Expedition extends CommonObject
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
$sql.= " WHERE ed.fk_expedition = ".$this->id;
$sql.= " AND ed.fk_origin_line = cd.rowid";
- $sql.= " ORDER BY cd.rang";
+ $sql.= " ORDER BY cd.rang, ed.fk_origin_line";
dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
$resql = $this->db->query($sql);
@@ -1078,6 +1079,8 @@ class Expedition extends CommonObject
$num = $this->db->num_rows($resql);
$i = 0;
+ $lineindex = 0;
+ $originline = 0;
$this->total_ht = 0;
$this->total_tva = 0;
@@ -1087,13 +1090,25 @@ class Expedition extends CommonObject
while ($i < $num)
{
- $line = new ExpeditionLigne($this->db);
- $obj = $this->db->fetch_object($resql);
-
+ $obj = $this->db->fetch_object($resql);
+
+ if ($originline == $obj->fk_origin_line) {
+ $line->entrepot_id = 0; // entrepod_id in details_entrepot
+ $line->qty_shipped += $obj->qty_shipped;
+ } else {
+ $line = new ExpeditionLigne($this->db);
+ $line->entrepot_id = $obj->fk_entrepot;
+ $line->qty_shipped = $obj->qty_shipped;
+ }
+
+ $detail_entrepot = new stdClass;
+ $detail_entrepot->entrepot_id = $obj->fk_entrepot;
+ $detail_entrepot->qty_shipped = $obj->qty_shipped;
+ $line->details_entrepot[] = $detail_entrepot;
+
$line->line_id = $obj->line_id;
$line->fk_origin_line = $obj->fk_origin_line;
$line->origin_line_id = $obj->fk_origin_line; // TODO deprecated
- $line->entrepot_id = $obj->fk_entrepot;
$line->fk_product = $obj->fk_product;
$line->fk_product_type = $obj->fk_product_type;
$line->ref = $obj->product_ref; // TODO deprecated
@@ -1103,7 +1118,6 @@ class Expedition extends CommonObject
$line->label = $obj->custom_label;
$line->description = $obj->description;
$line->qty_asked = $obj->qty_asked;
- $line->qty_shipped = $obj->qty_shipped;
$line->weight = $obj->weight;
$line->weight_units = $obj->weight_units;
$line->length = $obj->length;
@@ -1116,7 +1130,7 @@ class Expedition extends CommonObject
// For invoicing
$tabprice = calcul_price_total($obj->qty_shipped, $obj->subprice, $obj->remise_percent, $obj->tva_tx, $obj->localtax1_tx, $obj->localtax2_tx, 0, 'HT', $obj->info_bits, $obj->fk_product_type); // We force type to 0
$line->desc = $obj->description; // We need ->desc because some code into CommonObject use desc (property defined for other elements)
- $line->qty = $obj->qty_shipped;
+ $line->qty = $line->qty_shipped;
$line->total_ht = $tabprice[0];
$line->total_localtax1 = $tabprice[9];
$line->total_localtax2 = $tabprice[10];
@@ -1141,11 +1155,25 @@ class Expedition extends CommonObject
* May be conf is not well initialized for dark reason
*/
require_once DOL_DOCUMENT_ROOT.'/expedition/class/expeditionbatch.class.php';
- $line->detail_batch=ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id);
+ if ($originline != $obj->fk_origin_line) {
+ $line->detail_batch = ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id);
+ } else {
+ $line->detail_batch = array_merge($line->detail_batch,ExpeditionLigneBatch::FetchAll($this->db,$obj->line_id));
+ }
+ }
+ if ($originline != $obj->fk_origin_line) {
+ $this->lines[$lineindex] = $line;
+ $lineindex++;
+ } else {
+ $line->total_ht += $tabprice[0];
+ $line->total_localtax1 += $tabprice[9];
+ $line->total_localtax2 += $tabprice[10];
+ $line->total_ttc += $tabprice[2];
+ $line->total_tva += $tabprice[1];
}
- $this->lines[$i] = $line;
$i++;
+ $originline = $obj->fk_origin_line;
}
$this->db->free($resql);
return 1;
diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php
index 188127f0304b224dbb736f1f02bb0ea69174464d..e3cb8305562f49ccdf3bd7ae0ffe0b50ee8d97ac 100644
--- a/htdocs/expedition/index.php
+++ b/htdocs/expedition/index.php
@@ -44,8 +44,6 @@ llxHeader('',$langs->trans("Shipment"),$helpurl);
print_fiche_titre($langs->trans("SendingsArea"));
-//print '<table class="notopnoleftnoright" width="100%">';
-//print '<tr><td valign="top" width="30%" class="notopnoleft">';
print '<div class="fichecenter"><div class="fichethirdleft">';
@@ -64,7 +62,7 @@ print "</form></table><br>\n";
$clause = " WHERE ";
$sql = "SELECT e.rowid, e.ref";
-$sql.= ", s.nom, s.rowid as socid";
+$sql.= ", s.nom as name, s.rowid as socid";
$sql.= ", c.ref as commande_ref, c.rowid as commande_id";
$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping'";
@@ -101,7 +99,7 @@ if ($resql)
print $shipment->getNomUrl(1);
print "</td>";
print '<td>';
- print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->nom.'</a>';
+ print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.$obj->name.'</a>';
print '</td>';
print '<td>';
if ($obj->commande_id) print '<a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$obj->commande_id.'">'.$obj->commande_ref.'</a>';
@@ -116,7 +114,7 @@ if ($resql)
/*
* Commandes a traiter
*/
-$sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid";
+$sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -151,7 +149,7 @@ if ($resql)
print $orderstatic->getNomUrl(1);
print '</td>';
print '<td>';
- $companystatic->nom=$obj->nom;
+ $companystatic->name=$obj->name;
$companystatic->id=$obj->socid;
print $companystatic->getNomUrl(1,'customer',32);
print '</td></tr>';
@@ -169,7 +167,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
/*
* Commandes en traitement
*/
-$sql = "SELECT c.rowid, c.ref, c.fk_statut as status, c.facture as billed, s.nom, s.rowid as socid";
+$sql = "SELECT c.rowid, c.ref, c.fk_statut as status, c.facture as billed, s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."commande as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -202,7 +200,7 @@ if ( $resql )
print $orderstatic->getNomUrl(1);
print '</td>';
print '<td>';
- $companystatic->nom=$obj->nom;
+ $companystatic->name=$obj->name;
$companystatic->id=$obj->socid;
print $companystatic->getNomUrl(1,'customer');
print '</td>';
@@ -224,7 +222,7 @@ else dol_print_error($db);
* Last shipments
*/
$sql = "SELECT e.rowid, e.ref";
-$sql.= ", s.nom, s.rowid as socid";
+$sql.= ", s.nom as name, s.rowid as socid";
$sql.= ", c.ref as commande_ref, c.rowid as commande_id";
$sql.= " FROM ".MAIN_DB_PREFIX."expedition as e";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as el ON e.rowid = el.fk_target AND el.targettype = 'shipping' AND el.sourcetype IN ('commande')";
@@ -255,7 +253,7 @@ if ($resql)
$obj = $db->fetch_object($resql);
print '<tr '.$bc[$var].'><td width="20%"><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowSending"),"sending").' ';
print $obj->ref.'</a></td>';
- print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
print '<td>';
if ($obj->commande_id)
{
@@ -274,7 +272,6 @@ if ($resql)
else dol_print_error($db);
-//print '</td></tr></table>';
print '</div></div></div>';
diff --git a/htdocs/expedition/list.php b/htdocs/expedition/list.php
index 4e1adf7221e3ff1c5e2f68f4362df47f4980b607..4cd622495450167f0aa01b253a205ec78e356961 100644
--- a/htdocs/expedition/list.php
+++ b/htdocs/expedition/list.php
@@ -125,7 +125,7 @@ if ($resql)
}
print_liste_field_titre($langs->trans("Status"),"ship2bill.php","e.fk_statut","",$param,'align="right"',$sortfield,$sortorder);
print "</tr>\n";
-
+
// Lignes des champs de filtre
print '<tr class="liste_titre">';
print '<td class="liste_titre">';
@@ -151,9 +151,9 @@ if ($resql)
print '<td class="liste_titre" align="center">';
print '<a href="#" id="checkall">'.$langs->trans("All").'</a> / <a href="#" id="checknone">'.$langs->trans("None").'</a>';
print '</td>';
-
+
print "</tr>\n";
-
+
$var=True;
while ($i < min($num,$limit))
@@ -171,7 +171,7 @@ if ($resql)
print '<td>';
$companystatic->id=$objp->socid;
$companystatic->ref=$objp->socname;
- $companystatic->nom=$objp->socname;
+ $companystatic->name=$objp->socname;
print $companystatic->getNomUrl(1);
print '</td>';
// Date delivery planed
diff --git a/htdocs/fichinter/apercu.php b/htdocs/fichinter/apercu.php
index 70d2745ab4cad14fad06510dec684d46764f28f6..4edd52809df7e67a15b6537aa0576f20014badc5 100644
--- a/htdocs/fichinter/apercu.php
+++ b/htdocs/fichinter/apercu.php
@@ -139,7 +139,7 @@ if ($id > 0 || ! empty($ref))
// Client
print "<tr><td>".$langs->trans("Customer")."</td>";
print '<td colspan="2">';
- print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$soc->id.'">'.$soc->nom.'</a>';
+ print '<a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$soc->id.'">'.$soc->name.'</a>';
print '</td>';
print '</tr>';
diff --git a/htdocs/fichinter/card.php b/htdocs/fichinter/card.php
index bcc50d32aca908d2c0f01618659e412ce07a29b8..70d425d04a119bf80d82aeb3f1378542db111ee5 100644
--- a/htdocs/fichinter/card.php
+++ b/htdocs/fichinter/card.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2002-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011-2013 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
@@ -77,7 +77,7 @@ if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'ficheinter', $id, 'fichinter');
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('interventioncard'));
+$hookmanager->initHooks(array('interventioncard','globalcard'));
$object = new Fichinter($db);
$extrafields = new ExtraFields($db);
@@ -1692,8 +1692,8 @@ else if ($id > 0 || ! empty($ref))
$langs->load("bills");
if ($object->statut < 2)
{
- if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("CreateBill").'</a></div>';
- else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("CreateBill").'</a></div>';
+ if ($user->rights->facture->creer) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/compta/facture.php?action=create&origin='.$object->element.'&originid='.$object->id.'&socid='.$object->socid.'">'.$langs->trans("AddBill").'</a></div>';
+ else print '<div class="inline-block divButAction"><a class="butActionRefused" href="#" title="'.$langs->trans("NotEnoughPermissions").'">'.$langs->trans("AddBill").'</a></div>';
}
if (! empty($conf->global->FICHINTER_CLASSIFY_BILLED))
diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php
index 4dfb8489c9c4c62042008ccd1e0de87615181c20..b3858c5f4aa8969aa581214d5c14167d70356610 100644
--- a/htdocs/fichinter/list.php
+++ b/htdocs/fichinter/list.php
@@ -71,7 +71,7 @@ llxHeader('', $langs->trans("Intervention"));
$sql = "SELECT";
$sql.= " f.ref, f.rowid as fichid, f.fk_statut, f.description,";
$sql.= " fd.description as descriptiondetail, fd.date as dp, fd.duree,";
-$sql.= " s.nom, s.rowid as socid, s.client";
+$sql.= " s.nom as name, s.rowid as socid, s.client";
$sql.= " FROM (".MAIN_DB_PREFIX."societe as s";
if (! $user->rights->societe->client->voir && empty($socid))
$sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -160,7 +160,7 @@ if ($result)
print $interventionstatic->getNomUrl(1);
print "</td>\n";
print '<td>';
- $companystatic->nom=$objp->nom;
+ $companystatic->name=$objp->name;
$companystatic->id=$objp->socid;
$companystatic->client=$objp->client;
print $companystatic->getNomUrl(1,'',44);
diff --git a/htdocs/fourn/ajax/getSupplierPrices.php b/htdocs/fourn/ajax/getSupplierPrices.php
index fc891af53a305c7022e33b273a18ed4637ae3c07..a6695dc694df84ed4efd3df97bd1ade173df57f2 100644
--- a/htdocs/fourn/ajax/getSupplierPrices.php
+++ b/htdocs/fourn/ajax/getSupplierPrices.php
@@ -13,7 +13,6 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
*/
/**
@@ -49,7 +48,7 @@ if (! empty($idprod))
$sql = "SELECT p.rowid, p.label, p.ref, p.price, p.duration,";
$sql.= " pfp.ref_fourn,";
$sql.= " pfp.rowid as idprodfournprice, pfp.price as fprice, pfp.remise_percent, pfp.quantity, pfp.unitprice, pfp.charges, pfp.unitcharges,";
- $sql.= " s.nom";
+ $sql.= " s.nom as name";
$sql.= " FROM ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = pfp.fk_product";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON s.rowid = pfp.fk_soc";
@@ -75,7 +74,7 @@ if (! empty($idprod))
$price = $objp->fprice * (1 - $objp->remise_percent / 100);
$unitprice = $objp->unitprice * (1 - $objp->remise_percent / 100);
- $title = $objp->nom.' - '.$objp->ref_fourn.' - ';
+ $title = $objp->name.' - '.$objp->ref_fourn.' - ';
if ($objp->quantity == 1)
{
diff --git a/htdocs/fourn/card.php b/htdocs/fourn/card.php
index cbfa35f4c1121847b6f30d8aa40e0214376bee78..9bbc27ca51cd0155913c687dda95fedd9ed0f12f 100644
--- a/htdocs/fourn/card.php
+++ b/htdocs/fourn/card.php
@@ -50,7 +50,7 @@ $result = restrictedArea($user, 'societe&fournisseur', $id, '&societe');
$object = new Fournisseur($db);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('suppliercard'));
+$hookmanager->initHooks(array('suppliercard','globalcard'));
/*
* Action
@@ -304,6 +304,28 @@ if ($object->fetch($id))
if ($user->rights->fournisseur->commande->lire)
{
+
+
+ // TODO move to DAO class
+ // Check if there are supplier orders billable
+ $sql2 = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,';
+ $sql2.= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut';
+ $sql2.= ' FROM '.MAIN_DB_PREFIX.'societe as s';
+ $sql2.= ', '.MAIN_DB_PREFIX.'commande_fournisseur as c';
+ $sql2.= ' WHERE c.fk_soc = s.rowid';
+ $sql2.= ' AND s.rowid = '.$object->id;
+ // Show orders with status validated, shipping started and delivered (well any order we can bill)
+ $sql2.= " AND c.fk_statut IN (5)";
+ // Find order that are not already invoiced
+ $sql2 .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')";
+ $resql2=$db->query($sql2);
+ if ($resql2) {
+ $orders2invoice = $db->num_rows($resql2);
+ $db->free($resql2);
+ } else {
+ setEventMessage($db->lasterror(),'errors');
+ }
+
// TODO move to DAO class
$sql = "SELECT p.rowid,p.ref, p.date_commande as dc, p.fk_statut";
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as p ";
@@ -436,60 +458,66 @@ if ($object->fetch($id))
if (empty($reshook))
{
- print '<div class="tabsAction">';
-
- if ($user->rights->fournisseur->commande->creer)
- {
- $langs->load("orders");
- print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
- }
+ print '<div class="tabsAction">';
+
+ if ($user->rights->fournisseur->commande->creer)
+ {
+ $langs->load("orders");
+ print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddOrder").'</a>';
+ }
- if ($user->rights->fournisseur->facture->creer)
- {
- $langs->load("bills");
- print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
- }
+ if ($user->rights->fournisseur->facture->creer)
+ {
+ $langs->load("bills");
+ print '<a class="butAction" href="'.DOL_URL_ROOT.'/fourn/facture/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddBill").'</a>';
+ }
+
+ if ($user->rights->fournisseur->facture->creer)
+ {
+ if (! empty($orders2invoice) && $orders2invoice > 0) print '<div class="inline-block divButAction"><a class="butAction" href="'.DOL_URL_ROOT.'/fourn/commande/orderstoinvoice.php?socid='.$object->id.'">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+ else print '<div class="inline-block divButAction"><a class="butActionRefused" title="'.dol_escape_js($langs->trans("NoOrdersToInvoice")).'" href="#">'.$langs->trans("CreateInvoiceForThisCustomer").'</a></div>';
+ }
- // Add action
- if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
- {
- if ($user->rights->agenda->myactions->create)
- {
- print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
- }
- else
- {
- print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
- }
- }
+ // Add action
+ if (! empty($conf->agenda->enabled) && ! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+ {
+ if ($user->rights->agenda->myactions->create)
+ {
+ print '<a class="butAction" href="'.DOL_URL_ROOT.'/comm/action/card.php?action=create&socid='.$object->id.'">'.$langs->trans("AddAction").'</a>';
+ }
+ else
+ {
+ print '<a class="butAction" title="'.dol_escape_js($langs->trans("NotAllowed")).'" href="#">'.$langs->trans("AddAction").'</a>';
+ }
+ }
- print '</div>';
- print '<br>';
+ print '</div>';
+ print '<br>';
- if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
- {
- print '<br>';
- // List of contacts
- show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
- }
+ if (! empty($conf->global->MAIN_REPEATCONTACTONEACHTAB))
+ {
+ print '<br>';
+ // List of contacts
+ show_contacts($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+ }
- // Addresses list
- if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
- {
- $result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
- }
+ // Addresses list
+ if (! empty($conf->global->SOCIETE_ADDRESSES_MANAGEMENT) && ! empty($conf->global->MAIN_REPEATADDRESSONEACHTAB))
+ {
+ $result=show_addresses($conf,$langs,$db,$object,$_SERVER["PHP_SELF"].'?socid='.$object->id);
+ }
- if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
- {
- print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
+ if (! empty($conf->global->MAIN_REPEATTASKONEACHTAB))
+ {
+ print load_fiche_titre($langs->trans("ActionsOnCompany"),'','');
- // List of todo actions
- show_actions_todo($conf,$langs,$db,$object);
+ // List of todo actions
+ show_actions_todo($conf,$langs,$db,$object);
- // List of done actions
- show_actions_done($conf,$langs,$db,$object);
- }
- }
+ // List of done actions
+ show_actions_done($conf,$langs,$db,$object);
+ }
+}
}
else
{
diff --git a/htdocs/fourn/class/fournisseur.class.php b/htdocs/fourn/class/fournisseur.class.php
index 71942a27f9730597dd11acc42056318aa54bdc0f..35620bf91fbed0951523ccf0359851af7b11ea6e 100644
--- a/htdocs/fourn/class/fournisseur.class.php
+++ b/htdocs/fourn/class/fournisseur.class.php
@@ -184,7 +184,7 @@ class Fournisseur extends Societe
$arr = array();
- $sql = "SELECT s.rowid, s.nom";
+ $sql = "SELECT s.rowid, s.nom as name";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$user->societe_id) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= " WHERE s.fournisseur = 1";
@@ -196,16 +196,14 @@ class Fournisseur extends Societe
if ($resql)
{
while ($obj=$this->db->fetch_object($resql))
- {
- $arr[$obj->rowid] = stripslashes($obj->nom);
- }
-
+ {
+ $arr[$obj->rowid] = $obj->name;
+ }
}
else
{
dol_print_error($this->db);
- $this->error=$this->db->error();
-
+ $this->error=$this->db->lasterror();
}
return $arr;
}
diff --git a/htdocs/fourn/class/fournisseur.product.class.php b/htdocs/fourn/class/fournisseur.product.class.php
index bbb6dbdb33ac64c289df690159d8b6148d35c9e1..eff9e7e4275ced9a6a5750347d03a1c6ba4a095f 100644
--- a/htdocs/fourn/class/fournisseur.product.class.php
+++ b/htdocs/fourn/class/fournisseur.product.class.php
@@ -1,9 +1,9 @@
<?php
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2006-2011 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2009-2012 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2009-2014 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011 Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
+ * Copyright (C) 2012 Christophe Battarel <christophe.battarel@altairis.fr>
*
* 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
@@ -205,7 +205,7 @@ class ProductFournisseur extends Product
{
// Call trigger
$result=$this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_UPDATE',$user);
- if ($result < 0) $error++;
+ if ($result < 0) $error++;
// End call triggers
if (empty($error))
@@ -281,13 +281,13 @@ class ProductFournisseur extends Product
$error++;
}
}
-
+
if (! $error)
{
// Call trigger
$result=$this->call_trigger('SUPPLIER_PRODUCT_BUYPRICE_CREATE',$user);
- if ($result < 0) $error++;
+ if ($result < 0) $error++;
// End call triggers
if (empty($error))
@@ -468,6 +468,7 @@ class ProductFournisseur extends Product
$sql = "SELECT s.nom as supplier_name, s.rowid as fourn_id,";
$sql.= " pfp.rowid as product_fourn_price_id, pfp.ref_fourn,";
$sql.= " pfp.price, pfp.quantity, pfp.unitprice, pfp.tva_tx, pfp.charges, pfp.unitcharges";
+ $sql.= " pfp.remise, pfp.remise_percent";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s, ".MAIN_DB_PREFIX."product_fournisseur_price as pfp";
$sql.= " WHERE s.entity IN (".getEntity('societe', 1).")";
$sql.= " AND pfp.fk_product = ".$prodid;
diff --git a/htdocs/fourn/commande/card.php b/htdocs/fourn/commande/card.php
index 1c699b21711688504240f7a8a10717b356b5818c..d6be5491f542ad29546928b6aa0fa544ac8e8b4e 100644
--- a/htdocs/fourn/commande/card.php
+++ b/htdocs/fourn/commande/card.php
@@ -72,7 +72,7 @@ if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'fournisseur', $id, '', 'commande');
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('ordersuppliercard'));
+$hookmanager->initHooks(array('ordersuppliercard','globalcard'));
$object = new CommandeFournisseur($db);
$extrafields = new ExtraFields($db);
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index fd430ba45082e821651e6a169f6f496fd73deea5..0f04ee91eaafa3f2c11ad51e16bbc776409985b2 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -204,7 +204,7 @@ else
if (! empty($conf->fournisseur->enabled))
{
- $sql = "SELECT c.rowid, c.ref, s.nom, s.rowid as socid";
+ $sql = "SELECT c.rowid, c.ref, s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -233,7 +233,7 @@ if (! empty($conf->fournisseur->enabled))
print "<tr ".$bc[$var].">";
print '<td class="nowrap">';
print "<a href=\"card.php?id=".$obj->rowid."\">".img_object($langs->trans("ShowOrder"),"order").' '.$obj->ref."</a></td>";
- print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'</a></td></tr>';
+ print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).'</a></td></tr>';
$i++;
}
}
@@ -300,7 +300,7 @@ print '</td><td width="70%" valign="top" class="notopnoleftnoright">';
*/
$max=5;
-$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.tms, s.nom, s.rowid as socid";
+$sql = "SELECT c.rowid, c.ref, c.fk_statut, c.tms, s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -353,7 +353,7 @@ if ($resql)
print '</td>';
- print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->nom.'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.$obj->name.'</a></td>';
print '<td>'.dol_print_date($db->jdate($obj->tms),'day').'</td>';
print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,5).'</td>';
print '</tr>';
@@ -369,7 +369,7 @@ else dol_print_error($db);
* Orders to process
*/
/*
- $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom, s.rowid as socid";
+ $sql = "SELECT c.rowid, c.ref, c.fk_statut, s.nom as name, s.rowid as socid";
$sql.=" FROM ".MAIN_DB_PREFIX."commande_fournisseur as c";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
@@ -421,7 +421,7 @@ print '</td></tr></table>';
print '</td>';
-print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->nom,24).'</a></td>';
+print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($obj->name,24).'</a></td>';
print '<td align="right">'.$commandestatic->LibStatut($obj->fk_statut,$obj->facture,5).'</td>';
diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php
index 37f2384b4b1eefbf64be53d3a246658ba31aacee..58abe4578313113d6e614f3863accc726987eae0 100644
--- a/htdocs/fourn/commande/list.php
+++ b/htdocs/fourn/commande/list.php
@@ -51,6 +51,8 @@ $socid = GETPOST('socid','int');
$sortorder = GETPOST('sortorder','alpha');
$sortfield = GETPOST('sortfield','alpha');
+$viewstatut=GETPOST('viewstatut');
+
// Security check
$orderid = GETPOST('orderid');
if ($user->societe_id) $socid=$user->societe_id;
@@ -66,7 +68,7 @@ if ($socid > 0)
{
$fourn = new Fournisseur($db);
$fourn->fetch($socid);
- $title .= ' ('.$fourn->nom.')';
+ $title .= ' ('.$fourn->name.')';
}
llxHeader('',$title);
@@ -85,7 +87,7 @@ $offset = $conf->liste_limit * $page ;
* Mode Liste
*/
-$sql = "SELECT s.rowid as socid, s.nom, cf.date_commande as dc,";
+$sql = "SELECT s.rowid as socid, s.nom as name, cf.date_commande as dc,";
$sql.= " cf.rowid,cf.ref, cf.ref_supplier, cf.fk_statut, cf.total_ttc, cf.fk_user_author,cf.date_livraison,";
$sql.= " u.login";
$sql.= " FROM (".MAIN_DB_PREFIX."societe as s,";
@@ -216,7 +218,7 @@ if ($resql)
// Company
print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' ';
- print $obj->nom.'</a></td>'."\n";
+ print $obj->name.'</a></td>'."\n";
// Author
$userstatic->id=$obj->fk_user_author;
@@ -255,6 +257,8 @@ if ($resql)
}
print "</table>\n";
print "</form>\n";
+
+ print '<br>'.img_help(1,'').' '.$langs->trans("ToBillSeveralOrderSelectCustomer", $langs->transnoentitiesnoconv("CreateInvoiceForThisCustomer")).'<br>';
$db->free($resql);
}
diff --git a/htdocs/fourn/commande/orderstoinvoice.php b/htdocs/fourn/commande/orderstoinvoice.php
new file mode 100644
index 0000000000000000000000000000000000000000..6c5ce8aa11c19b5ba11bdf2eb1b463a37e311cf5
--- /dev/null
+++ b/htdocs/fourn/commande/orderstoinvoice.php
@@ -0,0 +1,594 @@
+<?php
+/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005 Marc Barilley / Ocebo <marc@ocebo.com>
+ * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012 Andreu Bisquerra Gaya <jove@bisquerra.com>
+ * Copyright (C) 2012 David Rodriguez Martinez <davidrm146@gmail.com>
+ * Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2014 Florian Henry <florian.henry@open-concept.pro>
+ *
+ * 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 3 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 <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file htdocs/fourn/commande/orderstoinvoice.php
+ * \ingroup commande
+ * \brief Page to invoice multiple supplier orders
+ */
+require '../../main.inc.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.commande.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formfile.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/class/html.formother.class.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/lib/report.lib.php';
+require_once DOL_DOCUMENT_ROOT . '/core/modules/supplier_invoice/modules_facturefournisseur.php';
+if (! empty($conf->projet->enabled)) {
+ require_once DOL_DOCUMENT_ROOT . '/core/class/html.formprojet.class.php';
+}
+
+$langs->load('orders');
+$langs->load('deliveries');
+$langs->load('companies');
+
+if (! $user->rights->facture->creer)
+ accessforbidden();
+
+$id = (GETPOST('id') ? GETPOST('id', 'int') : GETPOST("facid")); // For backward compatibility
+$ref = GETPOST('ref', 'alpha');
+$action = GETPOST('action', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
+$sref = GETPOST('sref');
+$sref_client = GETPOST('sref_client');
+$sall = GETPOST('sall');
+$socid = GETPOST('socid', 'int');
+$selected = GETPOST('orders_to_invoice');
+$sortfield = GETPOST("sortfield", 'alpha');
+$sortorder = GETPOST("sortorder", 'alpha');
+$viewstatut = GETPOST('viewstatut');
+
+if (! $sortfield)
+ $sortfield = 'c.rowid';
+if (! $sortorder)
+ $sortorder = 'DESC';
+
+$now = dol_now();
+$date_start = dol_mktime(0, 0, 0, $_REQUEST["date_startmonth"], $_REQUEST["date_startday"], $_REQUEST["date_startyear"]); // Date for local PHP server
+$date_end = dol_mktime(23, 59, 59, $_REQUEST["date_endmonth"], $_REQUEST["date_endday"], $_REQUEST["date_endyear"]);
+$date_starty = dol_mktime(0, 0, 0, $_REQUEST["date_start_delymonth"], $_REQUEST["date_start_delyday"], $_REQUEST["date_start_delyyear"]); // Date for local PHP server
+$date_endy = dol_mktime(23, 59, 59, $_REQUEST["date_end_delymonth"], $_REQUEST["date_end_delyday"], $_REQUEST["date_end_delyyear"]);
+
+if ($action == 'create') {
+ if (is_array($selected) == false) {
+ $mesgs = array (
+ '<div class="error">' . $langs->trans('Error_OrderNotChecked') . '</div>'
+ );
+ } else {
+ $origin = GETPOST('origin');
+ $originid = GETPOST('originid');
+ }
+}
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+include_once DOL_DOCUMENT_ROOT . '/core/class/hookmanager.class.php';
+$hookmanager = new HookManager($db);
+$hookmanager->initHooks(array('orderstoinvoicesupplier'));
+
+/*
+ * Actions
+ */
+
+if (($action == 'create' || $action == 'add') && empty($mesgs)) {
+
+ require_once DOL_DOCUMENT_ROOT . '/core/lib/fourn.lib.php';
+ if (! empty($conf->projet->enabled))
+ require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+
+ $langs->load('bills');
+ $langs->load('products');
+ $langs->load('main');
+ if (isset($_GET['orders_to_invoice'])) {
+ $orders_id = $_GET['orders_to_invoice'];
+ $n = count($orders_id);
+ $i = 0;
+
+ $originid = $orders_id[0];
+ $_GET['originid'] = $orders_id[0];
+ }
+ if (isset($_POST['orders_to_invoice'])) {
+ $orders_id = $_POST['orders_to_invoice'];
+ $nn = count($orders_id);
+ $ii = 0;
+
+ $originid = $orders_id[0];
+ $_POST['originid'] = $orders_id[0];
+ }
+
+ $projectid = GETPOST('projectid', 'int') ? GETPOST('projectid', 'int') : 0;
+ $lineid = GETPOST('lineid', 'int');
+ $userid = GETPOST('userid', 'int');
+ $search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref') : GETPOST('search_ref');
+
+ // Security check
+ if ($user->societe_id)
+ $socid = $user->societe_id;
+ $result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
+
+ $usehm = $conf->global->MAIN_USE_HOURMIN_IN_DATE_RANGE;
+ $object = new FactureFournisseur($db);
+
+ // Insert new invoice in database
+ if ($action == 'add' && $user->rights->fournisseur->facture->creer) {
+ $object->socid = GETPOST('socid');
+ $db->begin();
+ $error = 0;
+
+ // Standard or deposit or proforma invoice
+ $datefacture = dol_mktime(12, 0, 0, $_POST['remonth'], $_POST['reday'], $_POST['reyear']);
+ if (empty($datefacture)) {
+ $datefacture = dol_mktime(date("h"), date("M"), 0, date("m"), date("d"), date("Y"));
+ }
+ if (! $error) {
+ $object->ref = $_POST['ref'];
+ $object->ref_supplier = $_POST['ref_supplier'];
+ $object->socid = $_POST['socid'];
+ $object->libelle = $_POST['libelle'];
+ $object->date = $datefacture;
+ $object->date_echeance = $datedue;
+ $object->note_public = GETPOST('note_public');
+ $object->note_private = GETPOST('note_private');
+ $object->cond_reglement_id = GETPOST('cond_reglement_id');
+ $object->mode_reglement_id = GETPOST('mode_reglement_id');
+ $projectid = GETPOST('projectid');
+ if ($projectid > 0)
+ $object->fk_project = $projectid;
+
+ // Auto calculation of date due if not filled by user
+ if (empty($object->date_echeance))
+ $object->date_echeance = $object->calculate_date_lim_reglement();
+
+ if ($_POST['origin'] && $_POST['originid']) {
+ $object->origin = $_POST['origin'];
+ $object->origin_id = $orders_id[$ii];
+ $object->linked_objects = $orders_id;
+ $id = $object->create($user);
+
+ if ($id > 0) {
+ foreach ( $orders_id as $origin => $origin_id ) {
+ $origin_id = (! empty($origin_id) ? $origin_id : $object->origin_id);
+ $db->begin();
+ $sql = "INSERT INTO " . MAIN_DB_PREFIX . "element_element (";
+ $sql .= "fk_source";
+ $sql .= ", sourcetype";
+ $sql .= ", fk_target";
+ $sql .= ", targettype";
+ $sql .= ") VALUES (";
+ $sql .= $origin_id;
+ $sql .= ", '" . $object->origin . "'";
+ $sql .= ", " . $id;
+ $sql .= ", '" . $object->element . "'";
+ $sql .= ")";
+
+ if ($db->query($sql)) {
+ $db->commit();
+ } else {
+ $db->rollback();
+ }
+ }
+
+ while ( $ii < $nn ) {
+ $objectsrc = new CommandeFournisseur($db);
+ dol_syslog("Try to find source object origin=" . $object->origin . " originid=" . $object->origin_id . " to add lines");
+ $result = $objectsrc->fetch($orders_id[$ii]);
+ if ($result > 0) {
+ $lines = $objectsrc->lines;
+ if (empty($lines) && method_exists($objectsrc, 'fetch_lines')) {
+ $objectsrc->fetch_lines();
+ $lines = $objectsrc->lines;
+ }
+ $fk_parent_line = 0;
+ $num = count($lines);
+ for($i = 0; $i < $num; $i ++) {
+ $desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
+
+ $desc = ($lines[$i]->desc ? $lines[$i]->desc : $lines[$i]->libelle);
+ $product_type = ($lines[$i]->product_type ? $lines[$i]->product_type : 0);
+
+ // Dates
+ // TODO mutualiser
+ $date_start = $lines[$i]->date_debut_prevue;
+ if ($lines[$i]->date_debut_reel)
+ $date_start = $lines[$i]->date_debut_reel;
+ if ($lines[$i]->date_start)
+ $date_start = $lines[$i]->date_start;
+ $date_end = $lines[$i]->date_fin_prevue;
+ if ($lines[$i]->date_fin_reel)
+ $date_end = $lines[$i]->date_fin_reel;
+ if ($lines[$i]->date_end)
+ $date_end = $lines[$i]->date_end;
+
+ // Reset fk_parent_line for no child products and special product
+ if (($lines[$i]->product_type != 9 && empty($lines[$i]->fk_parent_line)) || $lines[$i]->product_type == 9) {
+ $fk_parent_line = 0;
+ }
+ // FIXME Missing $lines[$i]->ref_supplier and $lines[$i]->label into addline and updateline methods. They are filled when coming from order for example.
+ $result = $object->addline($desc, $lines[$i]->subprice, $lines[$i]->tva_tx, $lines[$i]->localtax1_tx, $lines[$i]->localtax2_tx, $lines[$i]->qty, $lines[$i]->fk_product, $lines[$i]->remise_percent, $date_start, $date_end, 0, $lines[$i]->info_bits, 'HT', $product_type);
+
+ if ($result > 0) {
+ $lineid = $result;
+ } else {
+ $lineid = 0;
+ $error ++;
+ break;
+ }
+ // Defined the new fk_parent_line
+ if ($result > 0 && $lines[$i]->product_type == 9) {
+ $fk_parent_line = $result;
+ }
+ }
+ } else {
+ $mesgs[] = $objectsrc->error;
+ $error ++;
+ }
+ $ii ++;
+ }
+ } else {
+ $mesgs[] = $object->error;
+ $error ++;
+ }
+ }
+ }
+
+ // End of object creation, we show it
+ if ($id > 0 && ! $error) {
+ $db->commit();
+ header('Location: ' . DOL_URL_ROOT . '/fourn/facture/fiche.php?facid=' . $id);
+ exit();
+ } else {
+ $db->rollback();
+ $action = 'create';
+ $_GET["origin"] = $_POST["origin"];
+ $_GET["originid"] = $_POST["originid"];
+ $mesgs[] = '<div class="error">' . $object->error . '</div>';
+ }
+ }
+}
+
+/*
+ * View
+ */
+
+$html = new Form($db);
+$htmlother = new FormOther($db);
+$formfile = new FormFile($db);
+$companystatic = new Societe($db);
+
+// Mode creation
+if ($action == 'create' && empty($mesgs)) {
+
+ llxHeader();
+ print_fiche_titre($langs->trans('NewBill'));
+
+ $soc = new Societe($db);
+ if ($socid)
+ $res = $soc->fetch($socid);
+ if ($res) {
+ $cond_reglement_id = $soc->cond_reglement_id;
+ $mode_reglement_id = $soc->mode_reglement_id;
+ }
+ $dateinvoice = empty($conf->global->MAIN_AUTOFILL_DATE) ? - 1 : '';
+
+ print '<form name="add" action="' . $_SERVER["PHP_SELF"] . '" method="POST">';
+ print '<input type="hidden" name="token" value="' . $_SESSION['newtoken'] . '">';
+ print '<input type="hidden" name="action" value="add">';
+ print '<input type="hidden" name="socid" value="' . $soc->id . '">' . "\n";
+ print '<input name="facnumber" type="hidden" value="provisoire">';
+ print '<input name="ref_client" type="hidden" value="' . $ref_client . '">';
+ print '<input name="ref_int" type="hidden" value="' . $ref_int . '">';
+ print '<input type="hidden" name="origin" value="' . GETPOST('origin') . '">';
+ print '<input type="hidden" name="originid" value="' . GETPOST('originid') . '">';
+ print '<table class="border" width="100%">';
+
+ // Ref
+ print '<tr><td class="fieldrequired">' . $langs->trans('Ref') . '</td><td colspan="2">' . $langs->trans('Draft') . '</td></tr>';
+
+ // Ref supplier
+ print '<tr><td class="fieldrequired">' . $langs->trans('RefSupplier') . '</td><td><input name="ref_supplier" value="' . (isset($_POST['ref_supplier']) ? $_POST['ref_supplier'] : '') . '" type="text"></td>';
+ print '</tr>';
+
+ // Third party
+ print '<tr><td class="fieldrequired">' . $langs->trans('Customer') . '</td><td colspan="2">';
+ print $soc->getNomUrl(1);
+ print '<input type="hidden" name="socid" value="' . $soc->id . '">';
+ print '</td>';
+ print '</tr>' . "\n";
+
+ // Date invoice
+ print '<tr><td class="fieldrequired">' . $langs->trans('Date') . '</td><td colspan="2">';
+ $html->select_date('', '', '', '', '', "add", 1, 1);
+ print '</td></tr>';
+ // Payment term
+ print '<tr><td class="nowrap">' . $langs->trans('PaymentConditionsShort') . '</td><td colspan="2">';
+ $html->select_conditions_paiements(isset($_POST['cond_reglement_id']) ? $_POST['cond_reglement_id'] : $cond_reglement_id, 'cond_reglement_id');
+ print '</td></tr>';
+ // Payment mode
+ print '<tr><td>' . $langs->trans('PaymentMode') . '</td><td colspan="2">';
+ $html->select_types_paiements(isset($_POST['mode_reglement_id']) ? $_POST['mode_reglement_id'] : $mode_reglement_id, 'mode_reglement_id');
+ print '</td></tr>';
+ // Project
+ if (! empty($conf->projet->enabled)) {
+ $formproject = new FormProjets($db);
+
+ $langs->load('projects');
+ print '<tr><td>' . $langs->trans('Project') . '</td><td colspan="2">';
+ $formproject->select_projects($soc->id, $projectid, 'projectid');
+ print '</td></tr>';
+ }
+
+ $objectsrc = new CommandeFournisseur($db);
+ $listoforders = array ();
+ foreach ( $selected as $sel ) {
+ $result = $objectsrc->fetch($sel);
+ if ($result > 0) {
+ $listoforders[] = $objectsrc->ref;
+ }
+ }
+
+ // Other attributes
+ $parameters = array (
+ 'objectsrc' => $objectsrc,
+ 'idsrc' => $listoforders,
+ 'colspan' => ' colspan="3"'
+ );
+ $reshook = $hookmanager->executeHooks('formObjectOptions', $parameters, $object, $action); // Note that $action and $object may have been modified by hook
+
+ // Modele PDF
+ print '<tr><td>' . $langs->trans('Model') . '</td>';
+ print '<td>';
+ $liste = ModelePDFSuppliersInvoices::liste_modeles($db);
+ print $html->selectarray('model', $liste, $conf->global->INVOICE_SUPPLIER_ADDON_PDF);
+ print "</td></tr>";
+
+ // Public note
+ print '<tr>';
+ print '<td class="border" valign="top">' . $langs->trans('NotePublic') . '</td>';
+ print '<td valign="top" colspan="2">';
+ print '<textarea name="note_public" wrap="soft" cols="70" rows="' . ROWS_3 . '">';
+
+ print $langs->trans("Orders") . ": " . implode(', ', $listoforders);
+
+ print '</textarea></td></tr>';
+ // Private note
+ if (empty($user->societe_id)) {
+ print '<tr>';
+ print '<td class="border" valign="top">' . $langs->trans('NotePrivate') . '</td>';
+ print '<td valign="top" colspan="2">';
+ print '<textarea name="note" wrap="soft" cols="70" rows="' . ROWS_3 . '">';
+
+ print '</textarea></td></tr>';
+ }
+
+ print '</table>';
+
+ while ( $i < $n ) {
+ print '<input type="hidden" name="orders_to_invoice[]" value="' . $orders_id[$i] . '">';
+
+ $i ++;
+ }
+
+ // Button "Create Draft"
+ print '<br><center><input type="submit" class="button" name="bouton" value="' . $langs->trans('CreateDraft') . '" /></center>';
+ print "</form>\n";
+
+ print '</td></tr>';
+ print "</table>\n";
+}
+
+// Mode liste
+if (($action != 'create' && $action != 'add') || ! empty($mesgs)) {
+ llxHeader();
+ ?>
+<script type="text/javascript">
+ jQuery(document).ready(function() {
+ jQuery("#checkall").click(function() {
+ jQuery(".checkformerge").attr('checked', true);
+ });
+ jQuery("#checknone").click(function() {
+ jQuery(".checkformerge").attr('checked', false);
+ });
+ });
+ </script>
+<?php
+
+ $sql = 'SELECT s.nom, s.rowid as socid, s.client, c.rowid, c.ref, c.total_ht, c.ref_supplier,';
+ $sql .= ' c.date_valid, c.date_commande, c.date_livraison, c.fk_statut';
+ $sql .= ' FROM ' . MAIN_DB_PREFIX . 'societe as s';
+ $sql .= ', ' . MAIN_DB_PREFIX . 'commande_fournisseur as c';
+ if (! $user->rights->societe->client->voir && ! $socid)
+ $sql .= ", " . MAIN_DB_PREFIX . "societe_commerciaux as sc";
+ $sql .= ' WHERE c.entity = ' . $conf->entity;
+ $sql .= ' AND c.fk_soc = s.rowid';
+
+ // Show orders with status validated, shipping started and delivered (well any order we can bill)
+ $sql .= " AND c.fk_statut IN (5)";
+
+ // Find order that are not already invoiced
+ $sql .= " AND c.rowid NOT IN (SELECT fk_source FROM " . MAIN_DB_PREFIX . "element_element WHERE targettype='invoice_supplier')";
+
+ if ($socid)
+ $sql .= ' AND s.rowid = ' . $socid;
+ if (! $user->rights->societe->client->voir && ! $socid)
+ $sql .= " AND s.rowid = sc.fk_soc AND sc.fk_user = " . $user->id;
+ if ($sref) {
+ $sql .= " AND c.ref LIKE '%" . $db->escape($sref) . "%'";
+ }
+ if ($sall) {
+ $sql .= " AND (c.ref LIKE '%" . $db->escape($sall) . "%' OR c.note LIKE '%" . $db->escape($sall) . "%')";
+ }
+
+ // Date filter
+ if ($date_start && $date_end)
+ $sql .= " AND c.date_commande >= '" . $db->idate($date_start) . "' AND c.date_commande <= '" . $db->idate($date_end) . "'";
+ if ($date_starty && $date_endy)
+ $sql .= " AND c.date_livraison >= '" . $db->idate($date_starty) . "' AND c.date_livraison <= '" . $db->idate($date_endy) . "'";
+
+ if (! empty($sref_client)) {
+ $sql .= ' AND c.ref_supplier LIKE \'%' . $db->escape($sref_client) . '%\'';
+ }
+ $sql .= ' ORDER BY ' . $sortfield . ' ' . $sortorder;
+ dol_syslog('fourn/commande/ordertoinvoice.php sql=' . $sql);
+ $resql = $db->query($sql);
+
+ if ($resql) {
+ if ($socid) {
+ $soc = new Societe($db);
+ $soc->fetch($socid);
+ }
+ $title = $langs->trans('ListOfSupplierOrders');
+ $title .= ' - ' . $langs->trans('StatusOrderReceivedAllShort');
+ $num = $db->num_rows($resql);
+ print_fiche_titre($title);
+ $i = 0;
+ $period = $html->select_date($date_start, 'date_start', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_end, 'date_end', 0, 0, 1, '', 1, 0, 1);
+ $periodely = $html->select_date($date_starty, 'date_start_dely', 0, 0, 1, '', 1, 0, 1) . ' - ' . $html->select_date($date_endy, 'date_end_dely', 0, 0, 1, '', 1, 0, 1);
+
+ if (! empty($socid)) {
+ // Company
+ $companystatic->id = $socid;
+ $companystatic->nom = $soc->nom;
+ print '<h3>' . $companystatic->getNomUrl(1, 'customer') . '</h3>';
+ }
+
+ print '<table class="noborder" width="100%">';
+ print '<tr class="liste_titre">';
+ print_liste_field_titre($langs->trans('Ref'), 'orderstoinvoice.php', 'c.ref', '', '&socid=' . $socid, '', $sortfield, $sortorder);
+ print_liste_field_titre($langs->trans('RefSupplier'), 'orderstoinvoice.php', 'c.ref_supplier', '', '&socid=' . $socid, '', $sortfield, $sortorder);
+ print_liste_field_titre($langs->trans('OrderDate'), 'orderstoinvoice.php', 'c.date_commande', '', '&socid=' . $socid, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre($langs->trans('DeliveryDate'), 'orderstoinvoice.php', 'c.date_livraison', '', '&socid=' . $socid, 'align="center"', $sortfield, $sortorder);
+ print_liste_field_titre($langs->trans('Status'), '', '', '', '', 'align="right"');
+ print_liste_field_titre($langs->trans('GenerateBill'), '', '', '', '', 'align="center"');
+ print '</tr>';
+
+ // Lignes des champs de filtre
+ print '<form method="get" action="orderstoinvoice.php">';
+ print '<input type="hidden" name="socid" value="' . $socid . '">';
+ print '<tr class="liste_titre">';
+ print '<td class="liste_titre">';
+ // REF
+ print '<input class="flat" size="10" type="text" name="sref" value="' . $sref . '">';
+ print '</td>';
+ // print '<td class="liste_titre">';
+ print '<td class="liste_titre" align="left">';
+ print '<input class="flat" type="text" size="10" name="sref_client" value="' . $sref_client . '">';
+
+ // DATE ORDER
+ print '<td class="liste_titre" align="center">';
+ print $period;
+ print '</td>';
+
+ // DATE DELIVERY
+ print '<td class="liste_titre" align="center">';
+ print $periodely;
+ print '</td>';
+
+ // SEARCH BUTTON
+ print '</td><td align="right" class="liste_titre">';
+ print '<input type="image" class="liste_titre" name="button_search" src="' . img_picto($langs->trans("Search"), 'search.png', '', '', 1) . '" value="' . dol_escape_htmltag($langs->trans("Search")) . '" title="' . dol_escape_htmltag($langs->trans("Search")) . '">';
+
+ // ALL/NONE
+ print '<td class="liste_titre" align="center">';
+ if ($conf->use_javascript_ajax)
+ print '<a href="#" id="checkall">' . $langs->trans("All") . '</a> / <a href="#" id="checknone">' . $langs->trans("None") . '</a>';
+ print '</td>';
+
+ print '</td></tr>';
+ print '</form>';
+
+ print '<form name="orders2invoice" action="orderstoinvoice.php" method="GET">';
+ $var = True;
+ $generic_commande = new CommandeFournisseur($db);
+
+ while ( $i < $num ) {
+ $objp = $db->fetch_object($resql);
+ $var = ! $var;
+ print '<tr ' . $bc[$var] . '>';
+ print '<td class="nowrap">';
+
+ $generic_commande->id = $objp->rowid;
+ $generic_commande->ref = $objp->ref;
+
+ print '<table class="nobordernopadding"><tr class="nocellnopadd">';
+ print '<td class="nobordernopadding nowrap">';
+ print $generic_commande->getNomUrl(1, $objp->fk_statut);
+ print '</td>';
+
+ print '<td width="16" align="right" class="nobordernopadding hideonsmartphone">';
+ $filename = dol_sanitizeFileName($objp->ref);
+ $filedir = $conf->fournisseur->commande->dir_output . '/' . dol_sanitizeFileName($objp->ref);
+ $urlsource = $_SERVER['PHP_SELF'] . '?id=' . $objp->rowid;
+ print $formfile->getDocumentsLink($generic_commande->element, $filename, $filedir);
+ print '</td></tr></table>';
+ print '</td>';
+
+ print '<td>' . $objp->ref_supplier . '</td>';
+
+ // Order date
+ print '<td align="center" nowrap>';
+ print dol_print_date($db->jdate($objp->date_commande), 'day');
+ print '</td>';
+
+ // Delivery date
+ print '<td align="center" nowrap>';
+ print dol_print_date($db->jdate($objp->date_livraison), 'day');
+ print '</td>';
+
+ // Statut
+ print '<td align="right" class="nowrap">' . $generic_commande->LibStatut($objp->fk_statut, 5) . '</td>';
+
+ // Checkbox
+ print '<td align="center">';
+ print '<input class="flat checkformerge" type="checkbox" name="orders_to_invoice[]" value="' . $objp->rowid . '">';
+ print '</td>';
+
+ print '</tr>';
+
+ $total = $total + $objp->price;
+ $subtotal = $subtotal + $objp->price;
+ $i ++;
+ }
+ print '</table>';
+
+ /*
+ * Boutons actions
+ */
+ print '<center>';
+ print '<div align="right">';
+ print '<input type="hidden" name="socid" value="' . $socid . '">';
+ print '<input type="hidden" name="action" value="create">';
+ print '<input type="hidden" name="origin" value="commande"><br>';
+ // print '<a class="butAction" href="index.php">'.$langs->trans("GoBack").'</a>';
+ print '<input type="submit" class="butAction" value="' . $langs->trans("GenerateBill") . '">';
+ print '</div>';
+ print '</form>';
+ $db->free($resql);
+ } else {
+ print dol_print_error($db);
+ }
+}
+
+dol_htmloutput_mesg($mesg, $mesgs);
+
+llxFooter();
+$db->close();
diff --git a/htdocs/fourn/facture/card.php b/htdocs/fourn/facture/card.php
index c9926cd59dd854ceaadddc6d2f00fbe6219c47c3..b58c17dcf6297bd016cb6a5613ce12ca643911e8 100644
--- a/htdocs/fourn/facture/card.php
+++ b/htdocs/fourn/facture/card.php
@@ -69,7 +69,7 @@ if (! empty($user->societe_id)) $socid=$user->societe_id;
$result = restrictedArea($user, 'fournisseur', $id, 'facture_fourn', 'facture');
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('invoicesuppliercard'));
+$hookmanager->initHooks(array('invoicesuppliercard','globalcard'));
$object=new FactureFournisseur($db);
diff --git a/htdocs/fourn/facture/impayees.php b/htdocs/fourn/facture/impayees.php
index 4b2c61c02a57d468d5acd4295d1fc36f28c49596..a80cb00f2d33d071dedeb3a12656afb79e8f6e34 100644
--- a/htdocs/fourn/facture/impayees.php
+++ b/htdocs/fourn/facture/impayees.php
@@ -88,7 +88,7 @@ if (! $sortorder) $sortorder="ASC";
if ($user->rights->fournisseur->facture->lire)
{
- $sql = "SELECT s.rowid as socid, s.nom,";
+ $sql = "SELECT s.rowid as socid, s.nom as name,";
$sql.= " f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc,";
$sql.= " f.datef as df, f.date_lim_reglement as datelimite, ";
$sql.= " f.paye as paye, f.rowid as facid, f.fk_statut";
@@ -144,7 +144,7 @@ if ($user->rights->fournisseur->facture->lire)
$sql .= " AND f.ref_supplier LIKE '%".GETPOST('sf_re')."%'";
}
- $sql.= " GROUP BY s.rowid, s.nom, f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef, f.date_lim_reglement, f.paye, f.fk_statut, s.rowid, s.nom";
+ $sql.= " GROUP BY s.rowid, s.nom, f.rowid, f.ref, f.ref_supplier, f.total_ht, f.total_ttc, f.datef, f.date_lim_reglement, f.paye, f.fk_statut";
if (! $user->rights->societe->client->voir && ! $socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.=$db->order($sortfield,$sortorder);
if (! in_array("f.ref_supplier",explode(',',$sortfield))) $sql.= ", f.ref_supplier DESC";
@@ -173,7 +173,7 @@ if ($user->rights->fournisseur->facture->lire)
if (! empty($late)) $param.='&late='.urlencode($late);
$urlsource=str_replace('&','&',$param);
- $titre=($socid?$langs->trans("BillsSuppliersUnpaidForCompany",$soc->nom):$langs->trans("BillsSuppliersUnpaid"));
+ $titre=($socid?$langs->trans("BillsSuppliersUnpaidForCompany",$soc->name):$langs->trans("BillsSuppliersUnpaid"));
if ($option == 'late') $titre.=' ('.$langs->trans("Late").')';
else $titre.=' ('.$langs->trans("All").')';
@@ -250,7 +250,7 @@ if ($user->rights->fournisseur->facture->lire)
print '<td>';
$companystatic->id=$objp->socid;
- $companystatic->nom=$objp->nom;
+ $companystatic->name=$objp->name;
print $companystatic->getNomUrl(1,'supplier',32);
print '</td>';
diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 673ac3fea6f33f6777e5aac46950f054176a2c93..e490c727a30d04ec7f8df03cf0dafb6a04f135c8 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -106,7 +106,7 @@ $formfile = new FormFile($db);
llxHeader('',$langs->trans("SuppliersInvoices"),'EN:Suppliers_Invoices|FR:FactureFournisseur|ES:Facturas_de_proveedores');
-$sql = "SELECT s.rowid as socid, s.nom, ";
+$sql = "SELECT s.rowid as socid, s.nom as name, ";
$sql.= " fac.rowid as facid, fac.ref, fac.ref_supplier, fac.datef, fac.date_lim_reglement as date_echeance,";
$sql.= " fac.total_ht, fac.total_ttc, fac.paye as paye, fac.fk_statut as fk_statut, fac.libelle";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
@@ -202,7 +202,7 @@ if ($resql)
if (GETPOST("search_montant_ttc")) $param.='&search_montant_ttc='.urlencode(GETPOST("search_montant_ttc"));
if (GETPOST("filtre") && GETPOST('filtre') != -1) $param.='&filtre='.urlencode(GETPOST("filtre"));
- print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->nom":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
+ print_barre_liste($langs->trans("BillsSuppliers").($socid?" $soc->name.":""),$page,$_SERVER["PHP_SELF"],$param,$sortfield,$sortorder,'',$num,$nbtotalofrecords);
print '<form method="GET" action="'.$_SERVER["PHP_SELF"].'">';
print '<table class="liste" width="100%">';
print '<tr class="liste_titre">';
@@ -279,7 +279,7 @@ if ($resql)
print '<td>'.dol_trunc($obj->libelle,36).'</td>';
print '<td>';
$supplierstatic->id=$obj->socid;
- $supplierstatic->nom=$obj->nom;
+ $supplierstatic->name=$obj->name;
print $supplierstatic->getNomUrl(1,'',12);
print '<td align="right">'.price($obj->total_ht).'</td>';
print '<td align="right">'.price($obj->total_ttc).'</td>';
diff --git a/htdocs/fourn/facture/paiement.php b/htdocs/fourn/facture/paiement.php
index 302570330b73ca88ca24e3095f66b6617df99890..831749b19043f89986bd3b3970c6674120959fca 100644
--- a/htdocs/fourn/facture/paiement.php
+++ b/htdocs/fourn/facture/paiement.php
@@ -249,7 +249,7 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
$datefacture=dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
$dateinvoice=($datefacture==''?(empty($conf->global->MAIN_AUTOFILL_DATE)?-1:''):$datefacture);
- $sql = 'SELECT s.nom, s.rowid as socid,';
+ $sql = 'SELECT s.nom as name, s.rowid as socid,';
$sql.= ' f.rowid, f.ref, f.ref_supplier, f.amount, f.total_ttc as total';
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'facture_fourn as f';
@@ -274,14 +274,14 @@ if ($action == 'create' || $action == 'confirm_paiement' || $action == 'add_paie
print '<input type="hidden" name="facid" value="'.$facid.'">';
print '<input type="hidden" name="ref_supplier" value="'.$obj->ref_supplier.'">';
print '<input type="hidden" name="socid" value="'.$obj->socid.'">';
- print '<input type="hidden" name="societe" value="'.$obj->nom.'">';
+ print '<input type="hidden" name="societe" value="'.$obj->name.'">';
print '<table class="border" width="100%">';
print '<tr class="liste_titre"><td colspan="3">'.$langs->trans('Payment').'</td>';
print '<tr><td>'.$langs->trans('Company').'</td><td colspan="2">';
$supplierstatic->id=$obj->socid;
- $supplierstatic->name=$obj->nom;
+ $supplierstatic->name=$obj->name;
print $supplierstatic->getNomUrl(1,'supplier');
print '</td></tr>';
print '<tr><td class="fieldrequired">'.$langs->trans('Date').'</td><td>';
@@ -460,7 +460,7 @@ if (empty($action))
$search_company=GETPOST('search_company');
$sql = 'SELECT p.rowid as pid, p.datep as dp, p.amount as pamount, p.num_paiement,';
- $sql.= ' s.rowid as socid, s.nom,';
+ $sql.= ' s.rowid as socid, s.nom as name,';
$sql.= ' c.libelle as paiement_type,';
$sql.= ' ba.rowid as bid, ba.label,';
if (!$user->rights->societe->client->voir) $sql .= ' sc.fk_soc, sc.fk_user,';
@@ -565,7 +565,7 @@ if (empty($action))
print '<td class="nowrap" align="center">'.dol_print_date($db->jdate($objp->dp),'day')."</td>\n";
print '<td>';
- if ($objp->socid) print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'),'company').' '.dol_trunc($objp->nom,32).'</a>';
+ if ($objp->socid) print '<a href="'.DOL_URL_ROOT.'/societe/soc.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'),'company').' '.dol_trunc($objp->name,32).'</a>';
else print ' ';
print '</td>';
diff --git a/htdocs/fourn/index.php b/htdocs/fourn/index.php
index f0f825d3ff74c4239db0141279e207722fda64ee..9da282817795d845edc968a2f9497e4fc694a90e 100644
--- a/htdocs/fourn/index.php
+++ b/htdocs/fourn/index.php
@@ -106,8 +106,8 @@ if (! empty($conf->fournisseur->enabled))
{
$langs->load("orders");
- $sql = "SELECT cf.rowid, cf.ref, cf.total_ttc";
- $sql.= ", s.nom, s.rowid as socid";
+ $sql = "SELECT cf.rowid, cf.ref, cf.total_ttc,";
+ $sql.= " s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."commande_fournisseur as cf";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
@@ -141,7 +141,7 @@ if (! empty($conf->fournisseur->enabled))
print '</td>';
print '<td class="nowrap">';
$companystatic->id=$obj->socid;
- $companystatic->nom=$obj->nom;
+ $companystatic->name=$obj->name;
$companystatic->client=0;
print $companystatic->getNomUrl(1,'',16);
print '</td>';
@@ -164,7 +164,7 @@ if (! empty($conf->fournisseur->enabled))
if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture->lire)
{
$sql = "SELECT ff.ref_supplier, ff.rowid, ff.total_ttc, ff.type";
- $sql.= ", s.nom, s.rowid as socid";
+ $sql.= ", s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."facture_fourn as ff";
$sql.= ", ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe_commerciaux as sc ON s.rowid = sc.fk_soc";
@@ -199,7 +199,7 @@ if (! empty($conf->fournisseur->enabled) && $user->rights->fournisseur->facture-
print '</td>';
print '<td class="nowrap">';
$companystatic->id=$obj->socid;
- $companystatic->nom=$obj->nom;
+ $companystatic->name=$obj->name;
$companystatic->client=0;
print $companystatic->getNomUrl(1,'',16);
print '</td>';
@@ -233,7 +233,7 @@ print '</div><div class="fichetwothirdright"><div class="ficheaddleft">';
* List last modified supliers
*/
$max=10;
-$sql = "SELECT s.rowid as socid, s.nom, s.town, s.datec, s.tms, s.prefix_comm, s.code_fournisseur, s.code_compta_fournisseur";
+$sql = "SELECT s.rowid as socid, s.nom as name, s.town, s.datec, s.tms, s.prefix_comm, s.code_fournisseur, s.code_compta_fournisseur";
$sql.= ", st.libelle as stcomm";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= ", ".MAIN_DB_PREFIX."c_stcomm as st";
@@ -267,7 +267,7 @@ if ($resql)
print "<tr ".$bc[$var].">";
print '<td><a href="card.php?socid='.$obj->socid.'">'.img_object($langs->trans("ShowSupplier"),"company").'</a>';
- print " <a href=\"card.php?socid=".$obj->socid."\">".$obj->nom."</a></td>\n";
+ print " <a href=\"card.php?socid=".$obj->socid."\">".$obj->name."</a></td>\n";
print '<td align="left">'.$obj->code_fournisseur.' </td>';
print '<td align="right">'.dol_print_date($db->jdate($obj->tms),'day').'</td>';
print "</tr>\n";
diff --git a/htdocs/fourn/list.php b/htdocs/fourn/list.php
index e3c7effebbfaf8eeefdb712406e0fd929fbece9f..d3f7e55c19976e1723970ceb87cc2fb0b9144e8e 100644
--- a/htdocs/fourn/list.php
+++ b/htdocs/fourn/list.php
@@ -79,7 +79,7 @@ $thirdpartystatic=new Societe($db);
$help_url='EN:Module_Third_Parties|FR:Module_Tiers|ES:Empresas';
llxHeader('',$langs->trans("ThirdParty"),$help_url);
-$sql = "SELECT s.rowid as socid, s.nom, s.zip, s.town, s.datec, st.libelle as stcomm, s.prefix_comm, s.status as status, ";
+$sql = "SELECT s.rowid as socid, s.nom as name, s.zip, s.town, s.datec, st.libelle as stcomm, s.prefix_comm, s.status as status, ";
$sql.= "code_fournisseur, code_compta_fournisseur";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -199,7 +199,7 @@ if ($resql)
$var=!$var;
$thirdpartystatic->id=$obj->socid;
- $thirdpartystatic->nom=$obj->nom;
+ $thirdpartystatic->name=$obj->name;
$thirdpartystatic->status=$obj->status;
print "<tr ".$bc[$var].">";
diff --git a/htdocs/fourn/paiement/card.php b/htdocs/fourn/paiement/card.php
index 684985ed26105e210566732ab4bad6d2b48e21ab..824919400a21f513b2a0db426d37801c36a82908 100644
--- a/htdocs/fourn/paiement/card.php
+++ b/htdocs/fourn/paiement/card.php
@@ -234,7 +234,7 @@ if ($result > 0)
* Liste des factures
*/
$allow_delete = 1 ;
- $sql = 'SELECT f.rowid, f.ref, f.ref_supplier, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom, s.rowid as socid';
+ $sql = 'SELECT f.rowid, f.ref, f.ref_supplier, f.total_ttc, pf.amount, f.rowid as facid, f.paye, f.fk_statut, s.nom as name, s.rowid as socid';
$sql .= ' FROM '.MAIN_DB_PREFIX.'paiementfourn_facturefourn as pf,'.MAIN_DB_PREFIX.'facture_fourn as f,'.MAIN_DB_PREFIX.'societe as s';
$sql .= ' WHERE pf.fk_facturefourn = f.rowid AND f.fk_soc = s.rowid';
$sql .= ' AND pf.fk_paiementfourn = '.$object->id;
@@ -274,7 +274,7 @@ if ($result > 0)
// Ref supplier
print '<td>'.$objp->ref_supplier."</td>\n";
// Third party
- print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'),'company').' '.$objp->nom.'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$objp->socid.'">'.img_object($langs->trans('ShowCompany'),'company').' '.$objp->name.'</a></td>';
// Expected to pay
print '<td align="right">'.price($objp->total_ttc).'</td>';
// Status
diff --git a/htdocs/fourn/product/list.php b/htdocs/fourn/product/list.php
index 89c3928f13470aef36d77b819af5a786eb0d0b56..a7ab0d0576fed3f7c1ca7ed1c7919bf12524b1f6 100644
--- a/htdocs/fourn/product/list.php
+++ b/htdocs/fourn/product/list.php
@@ -88,7 +88,7 @@ if ($fourn_id)
$sql = "SELECT p.rowid, p.label, p.ref, p.fk_product_type,";
$sql.= " ppf.fk_soc, ppf.ref_fourn, ppf.price as price, ppf.quantity as qty, ppf.unitprice,";
-$sql.= " s.rowid as socid, s.nom";
+$sql.= " s.rowid as socid, s.nom as name";
$sql.= " FROM ".MAIN_DB_PREFIX."product as p";
if ($catid) $sql.= " LEFT JOIN ".MAIN_DB_PREFIX."categorie_product as cp ON cp.fk_product = p.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product_fournisseur_price as ppf ON p.rowid = ppf.fk_product";
@@ -108,7 +108,7 @@ if ($sref)
}
if ($snom)
{
- $sql .= natural_search('p.label', $snom);
+ $sql .= natural_search('s.nom', $snom);
}
if($catid)
{
@@ -136,7 +136,7 @@ if ($resql)
exit;
}
- if (! empty($supplier->id)) $texte = $langs->trans("ListOfSupplierProductForSupplier",$supplier->nom);
+ if (! empty($supplier->id)) $texte = $langs->trans("ListOfSupplierProductForSupplier",$supplier->name);
else $texte = $langs->trans("List");
llxHeader("","",$texte);
@@ -212,7 +212,7 @@ if ($resql)
print '<td>'.$objp->label.'</td>'."\n";
- $companystatic->nom=$objp->nom;
+ $companystatic->name=$objp->name;
$companystatic->id=$objp->socid;
print '<td>';
if ($companystatic->id > 0) print $companystatic->getNomUrl(1,'supplier');
diff --git a/htdocs/holiday/class/holiday.class.php b/htdocs/holiday/class/holiday.class.php
index 119a4980a78634c190f6195f017bf483c85f94cf..5ff23b45ec02e37d4caa9fa131f078da49fd502f 100644
--- a/htdocs/holiday/class/holiday.class.php
+++ b/htdocs/holiday/class/holiday.class.php
@@ -780,7 +780,7 @@ class Holiday extends CommonObject
$groupe = $objet->value;
// On liste les groupes de Dolibarr
- $sql = "SELECT u.rowid, u.nom";
+ $sql = "SELECT u.rowid, u.nom as name";
$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as u";
$sql.= " ORDER BY u.rowid";
@@ -798,9 +798,9 @@ class Holiday extends CommonObject
while ($obj = $this->db->fetch_object($result))
{
if($groupe==$obj->rowid) {
- $selectGroup.= '<option value="'.$obj->rowid.'" selected="selected">'.$obj->nom.'</option>'."\n";
+ $selectGroup.= '<option value="'.$obj->rowid.'" selected="selected">'.$obj->name.'</option>'."\n";
} else {
- $selectGroup.= '<option value="'.$obj->rowid.'">'.$obj->nom.'</option>'."\n";
+ $selectGroup.= '<option value="'.$obj->rowid.'">'.$obj->name.'</option>'."\n";
}
}
$selectGroup.= '</select>'."\n";
@@ -820,7 +820,7 @@ class Holiday extends CommonObject
/**
* Met à jour une option du module Holiday Payés
*
- * @param string $name nom du paramètre de configuration
+ * @param string $name name du paramètre de configuration
* @param string $value vrai si mise à jour OK sinon faux
* @return boolean ok or ko
*/
@@ -842,7 +842,7 @@ class Holiday extends CommonObject
/**
* Retourne la valeur d'un paramètre de configuration
*
- * @param string $name nom du paramètre de configuration
+ * @param string $name name du paramètre de configuration
* @return string retourne la valeur du paramètre
*/
function getConfCP($name)
@@ -955,7 +955,7 @@ class Holiday extends CommonObject
/**
* Retourne un checked si vrai
*
- * @param string $name nom du paramètre de configuration
+ * @param string $name name du paramètre de configuration
* @return string retourne checked si > 0
*/
function getCheckOption($name) {
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 7ba1a9b136bc347dbf460f74aa2147f992289f03..6be69acd912bb91a172ee3e498db7450f5137bdd 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -180,7 +180,7 @@ margin-top: 10px;
font-size:16px;
font-weight: normal;
color: #4965B3;
-text-shadow: 2px 1px 2px #c0c0c0;
+text-shadow: 1px 1px 1px #c0c0c0;
}
tr.bg1 {
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index 778b3f2b9ff3bed97543c51b80f65457b0f989c8..487ebfce7f8a5984baab9f59f320117d25fe01cd 100644
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -47,9 +47,9 @@ ALTER TABLE llx_user ADD COLUMN fk_user_modif integer AFTER fk_user_creat;
-- Add module accounting Expert
ALTER TABLE llx_bookkeeping RENAME TO llx_accounting_bookkeeping; -- To update old user of module Accounting Expert
-
-CREATE TABLE llx_accounting_bookkeeping
+
+CREATE TABLE llx_accounting_bookkeeping
(
rowid integer NOT NULL AUTO_INCREMENT PRIMARY KEY,
doc_date date NOT NULL,
@@ -74,12 +74,12 @@ ALTER TABLE llx_c_paiement ADD COLUMN accountancy_code varchar(32) DEFAULT NULL
ALTER TABLE llx_bank_account ADD COLUMN accountancy_journal varchar(3) DEFAULT NULL AFTER account_number;
ALTER TABLE llx_accountingaccount add column entity integer DEFAULT 1 NOT NULL AFTER rowid;
-ALTER TABLE llx_accountingaccount add column datec datetime NOT NULL AFTER entity;
+ALTER TABLE llx_accountingaccount add column datec datetime AFTER entity;
ALTER TABLE llx_accountingaccount add column tms timestamp AFTER datec;
ALTER TABLE llx_accountingaccount add column fk_user_author integer DEFAULT NULL AFTER label;
ALTER TABLE llx_accountingaccount add column fk_user_modif integer DEFAULT NULL AFTER fk_user_author;
--- Qual
+-- Qual
UPDATE llx_const SET name = 'ACCOUNTING_MODE' WHERE name = 'COMPTA_MODE';
UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_CUSTOMER' WHERE name = 'COMPTA_ACCOUNT_CUSTOMER';
UPDATE llx_const SET name = 'ACCOUNTING_ACCOUNT_SUPPLIER' WHERE name = 'COMPTA_ACCOUNT_SUPPLIER';
@@ -204,7 +204,7 @@ create table llx_accounting_fiscalyear
)ENGINE=innodb;
ALTER TABLE llx_contrat ADD COLUMN ref_ext varchar(30) after ref;
-ALTER TABLE llx_contrat ADD COLUMN ref_customer varchar(30) after ref_ext;
+ALTER TABLE llx_contrat ADD COLUMN ref_supplier varchar(30) after ref_ext;
ALTER TABLE llx_propal ADD COLUMN fk_shipping_method integer AFTER date_livraison;
ALTER TABLE llx_commande ADD COLUMN fk_shipping_method integer AFTER date_livraison;
diff --git a/htdocs/langs/ar_SA/accountancy.lang b/htdocs/langs/ar_SA/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/ar_SA/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/bg_BG/accountancy.lang b/htdocs/langs/bg_BG/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/bg_BG/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/bs_BA/accountancy.lang b/htdocs/langs/bs_BA/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/bs_BA/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/ca_ES/accountancy.lang b/htdocs/langs/ca_ES/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/ca_ES/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/cs_CZ/accountancy.lang b/htdocs/langs/cs_CZ/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/cs_CZ/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/da_DK/accountancy.lang b/htdocs/langs/da_DK/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/da_DK/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/de_DE/accountancy.lang b/htdocs/langs/de_DE/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f7b40ac7301b6b9c5dc6ab2a1da6e5069dc41301
--- /dev/null
+++ b/htdocs/langs/de_DE/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Buchhaltung
+Globalparameters=Globale Parameter
+Chartofaccounts=Kontenplan
+Fiscalyear=Fiskalische Jahre
+Menuaccount=Buchhaltung Konten
+Menuthirdpartyaccount=Partner Konten
+MenuTools=Werkzeuge
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journale
+JournalFinancial=Finanz-Journale
+Exports=Exports
+Modelcsv=Exportmodell
+Selectmodelcsv=Wählen Sie ein Exportmodell
+Modelcsv_normal=Klassischer Export
+Modelcsv_CEGID=Export zu CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Rückkehr
+
+Definechartofaccounts=Kontenplan definieren
+Selectchartofaccounts=Kontenplan wählen
+Validate=Freigeben
+Addanaccount=Fügen Sie ein Buchhaltungskonto hinzu
+AccountAccounting=Buchhaltungs Konto
+Ventilation=Erörterung
+ToDispatch=Zu versenden
+Dispatched=Versendet
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Handelsspanne
+Reports=Berichte
+ByCustomerInvoice=Nach Kundenrechnungen
+ByMonth=Nach Monat
+NewAccount=Neues Buchhaltungskonto
+Update=Aktualisieren
+List=Liste
+Create=Erstelle
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=Hauptbuch
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Zeile
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=erörtern
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Gewählte Zeilen
+Lineofinvoice=Rechnungszeile
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Verkaufsjournal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Einkaufsjournal
+ACCOUNTINGEX_BANK_JOURNAL=Bankauszug
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Dokumententyp
+Docdate=Datum
+Docref=Referenz
+Numerocompte=Konto
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Soll
+Credit=Haben
+Amount=Betrag
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Verkaufsjournal
+PurchasesJournal=Einkaufsjournal
+DescSellsJournal=Verkaufsjournal
+DescPurchasesJournal=Einkaufsjournal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Barzahlung
+
+SupplierInvoicePayment=Rechnungszahlung (Lieferant)
+CustomerInvoicePayment=Rechnungszahlung (Kunde)
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=Neue Änderung
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Soll und Haben können nicht gleichzeitig eingegeben werden
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version des Plans
+Pcgtype=Kontenklasse
+Pcgsubtype=Unterkontenklasse
+Accountparent=Root of the account
+Active=Auszug
+
+NewFiscalYear=Neues fiskalisches Jahr
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Gesamt-Spanne
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Automatisch geltend machen
+
+ErrorAccountancyCodeIsAlreadyUse=Fehler, Sie können dieses Buchaltungskonto nicht löschen, da es benutzt wird.
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/de_DE/banks.lang b/htdocs/langs/de_DE/banks.lang
index 876edebae309c04634e9f011f430178724857485..dc64c7dc8465d97cbb2598eaa13f4c397caed3bf 100644
--- a/htdocs/langs/de_DE/banks.lang
+++ b/htdocs/langs/de_DE/banks.lang
@@ -133,7 +133,7 @@ CashBudget=Bargeldbestand
PlannedTransactions=Geplante Transaktionen
Graph=Grafiken
ExportDataset_banque_1=Bankbewegungen und Kontoauszug
-ExportDataset_banque_2=Deposit slip
+ExportDataset_banque_2=Einzahlungsbeleg
TransactionOnTheOtherAccount=Transaktion auf dem anderem Konto
TransactionWithOtherAccount=Konto Transaktion
PaymentNumberUpdateSucceeded=Zahlungsnummer erfolgreich aktualisiert
diff --git a/htdocs/langs/de_DE/bills.lang b/htdocs/langs/de_DE/bills.lang
index bccbd86b0cd1b2cf7483a9f9cfcb34934b7526d0..6f566b36e0fa2bd37b7c1bbabf2775e44d633bf9 100644
--- a/htdocs/langs/de_DE/bills.lang
+++ b/htdocs/langs/de_DE/bills.lang
@@ -85,7 +85,7 @@ ClassifyPaid=Als 'bezahlt' markieren
ClassifyPaidPartially=Als 'teilweise bezahlt' markieren
ClassifyCanceled=Als 'storniert' markieren
ClassifyClosed=Als 'geschlossen' markieren
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Als "nicht verrechnet" markieren
CreateBill=Erstelle Rechnung
AddBill=Rechnung/Gutschrift erstellen
AddToDraftInvoices=Zu Rechnungsentwurf hinzufügen
@@ -198,8 +198,8 @@ Rest=Ausstehend
AmountExpected=Höhe der Forderung
ExcessReceived=Erhaltener Überschuss
EscompteOffered=Rabatt angeboten (Skonto)
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
+SendBillRef=Einreichung der Rechnung %s
+SendReminderBillRef=Einreichung von Rechnung %s (Erinnerung)
StandingOrders=Daueraufträge
StandingOrder=Dauerauftrag
NoDraftBills=Keine Rechnungsentwürfe
@@ -398,7 +398,7 @@ ToMakePayment=Bezahlen
ToMakePaymentBack=Rückzahlung
ListOfYourUnpaidInvoices=Liste aller unbezahlten Rechnungen
NoteListOfYourUnpaidInvoices=Bitte beachten: Diese Liste enthält nur Rechnungen an Partner, bei denen Sie als Vertreter angegeben sind.
-RevenueStamp=Revenue stamp
+RevenueStamp=Steuermarke
YouMustCreateInvoiceFromThird=Diese Option steht nur zur Verfügung, wenn eine Rechnung vom Reiter "Kunde" eines Partners aus erstellt wird
PDFCrabeDescription=Rechnungs-Modell Crabe. Eine vollständige Rechnung (Empfohlene Vorlage)
TerreNumRefModelDesc1=Liefert eine Nummer mit dem Format %syymm-nnnn für Standard-Rechnungen und %syymm-nnnn für Gutschriften, wobei yy=Jahr, mm=Monat und nnnn eine lückenlose Folge ohne Überlauf auf 0 ist
diff --git a/htdocs/langs/de_DE/companies.lang b/htdocs/langs/de_DE/companies.lang
index 13ff957914d0ef4509f61312a77ba83bb3fd4f73..9312970a60ca3d28facd15b49ed7b7fb8c4fe67f 100644
--- a/htdocs/langs/de_DE/companies.lang
+++ b/htdocs/langs/de_DE/companies.lang
@@ -93,7 +93,7 @@ LocalTax1ES=RE
LocalTax2ES=IRPF
TypeLocaltax1ES=RE Type
TypeLocaltax2ES=IRPF Type
-TypeES=Type
+TypeES=Typ
ThirdPartyEMail=%s
WrongCustomerCode=Kunden-Code ungültig
WrongSupplierCode=Lieferanten-Code ungültig
diff --git a/htdocs/langs/de_DE/compta.lang b/htdocs/langs/de_DE/compta.lang
index 53d8dba6d00a0d253df7aa79038b96c030e8895c..4d19a00c89e6d3bfa638345cb3ff2f4e8829e5da 100644
--- a/htdocs/langs/de_DE/compta.lang
+++ b/htdocs/langs/de_DE/compta.lang
@@ -19,7 +19,7 @@ AmountToBeCharged=Zu zahlender Gesamtbetrag:
AccountsGeneral=Konten
Account=Konto
Accounts=Konten
-Accountparent=Account parent
+Accountparent=Kontohalter
Accountsparent=Accounts parent
BillsForSuppliers=Lieferantenrechnungen
Income=Einnahmen
@@ -182,7 +182,7 @@ Pcg_version=Pcg version
Pcg_type=Pcg type
Pcg_subtype=Pcg subtype
InvoiceLinesToDispatch=Invoice lines to dispatch
-InvoiceDispatched=Dispatched invoices
+InvoiceDispatched=Versandte Rechnungen
AccountancyDashboard=Accountancy summary
ByProductsAndServices=Nach Produkten und Services
RefExt=Externe Referenz
@@ -196,11 +196,11 @@ CalculationRuleDescSupplier=Wählen Sie die geeignete Methode, um zum gleichen E
TurnoverPerProductInCommitmentAccountingNotRelevant=Turnover report per product, when using a <b>cash accountancy</b> mode is not relevant. This report is only available when using <b>engagement accountancy</b> mode (see setup of accountancy module).
CalculationMode=Berechnungsmodus
AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Services zu kaufen
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Services zu verkaufen
-ACCOUNTING_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt zu einzuziehen
-ACCOUNTING_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen
-ACCOUNTING_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
-ACCOUNTING_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
+COMPTA_PRODUCT_BUY_ACCOUNT=Standard-Aufwandskonto, um Produkte zu kaufen
+COMPTA_PRODUCT_SOLD_ACCOUNT=Standard-Erlöskonto, um Produkte zu verkaufen
+COMPTA_SERVICE_BUY_ACCOUNT=Standard-Aufwandskonto, um Services zu kaufen
+COMPTA_SERVICE_SOLD_ACCOUNT=Standard-Erlöskonto, um Services zu verkaufen
+COMPTA_VAT_ACCOUNT=Standard-Erlöskonto, um MwSt zu einzuziehen
+COMPTA_VAT_BUY_ACCOUNT=Standard-Aufwandskonto, um MwSt zu bezahlen
+COMPTA_ACCOUNT_CUSTOMER=Accountancy code by default for customer thirdparties
+COMPTA_ACCOUNT_SUPPLIER=Accountancy code by default for supplier thirdparties
diff --git a/htdocs/langs/de_DE/contracts.lang b/htdocs/langs/de_DE/contracts.lang
index 17d09551e738e1e342258a124934776f1b99e67e..1e4e9eb888802a147c709e3b37f94864fe9001a5 100644
--- a/htdocs/langs/de_DE/contracts.lang
+++ b/htdocs/langs/de_DE/contracts.lang
@@ -88,9 +88,9 @@ NoExpiredServices=Keine abgelaufen aktiven Dienste
ListOfServicesToExpireWithDuration=Liste der Leistungen die in %s Tagen ablaufen
ListOfServicesToExpireWithDurationNeg=Liste der Services die seit mehr als %s Tagen abgelaufen sind
ListOfServicesToExpire=Liste der Services die ablaufen
-NoteListOfYourExpiredServices=This list contains only services of contracts for third parties you are linked to as a sale representative.
-StandardContractsTemplate=Standard contracts template
-ContactNameAndSignature=For %s, name and signature:
+NoteListOfYourExpiredServices=Diese Liste enthält nur Dienstleistungen an Partner, bei denen Sie als Vertreter Angegeben sind.
+StandardContractsTemplate=Standard Vertragsschablone
+ContactNameAndSignature=Für %s, Name und Unterschrift
##### Types de contacts #####
TypeContact_contrat_internal_SALESREPSIGN=Vertragsunterzeichnung durch Vertreter
diff --git a/htdocs/langs/de_DE/errors.lang b/htdocs/langs/de_DE/errors.lang
index 68595d0d9014b9c4b9dbb3cc099ba330e0f1425d..60ae84a7a05fb073023bb89105ba3d6d2cf29371 100644
--- a/htdocs/langs/de_DE/errors.lang
+++ b/htdocs/langs/de_DE/errors.lang
@@ -1,11 +1,11 @@
# Dolibarr language file - Source file is en_US - errors
# No errors
-NoErrorCommitIsDone=No error, we commit
+NoErrorCommitIsDone=Kein Fehler, wir führen fort
# Errors
Error=Fehler
Errors=Fehler
-ErrorButCommitIsDone=Errors found but we validate despite this
+ErrorButCommitIsDone=Fehler aufgetreten, Freigabe erfolgt dennoch
ErrorBadEMail=E-Mail %s ist nicht korrekt
ErrorBadUrl=URL %s ist nicht korrekt
ErrorLoginAlreadyExists=Login %s existiert bereits.
@@ -63,7 +63,7 @@ ErrorSizeTooLongForVarcharType=Die Größe überschreitet das Maximum für den T
ErrorNoValueForSelectType=Bitte Wert für Auswahlliste eingeben
ErrorNoValueForCheckBoxType=Bitte Wert für Checkbox-Liste eingeben
ErrorNoValueForRadioType=Bitte Wert für Radiobutton-Liste eingeben
-ErrorBadFormatValueList=The list value cannot have more than one come : <u>%s</u>, but need at least one: llave,valores
+ErrorBadFormatValueList=Die Liste darf nicht mehr als ein <u>%s</u> enthalten, muss aber mindestens eines aus "llave,valores" beinhalten
ErrorFieldCanNotContainSpecialCharacters=Das Feld <b>%s</b> darf keine Sonderzeichen enthalten.
ErrorFieldCanNotContainSpecialNorUpperCharacters=Das Feld <b>%s</b> darf weder Sonderzeichen noch Großbuchstaben enthalten.
ErrorNoAccountancyModuleLoaded=Kein Buchhaltungsmodul aktiviert
@@ -134,8 +134,10 @@ ErrorOpenIDSetupNotComplete=Sie haben im Dolibarr Konfigurationsfile eingestellt
ErrorWarehouseMustDiffers=Quell- und Ziel-Lager müssen unterschiedlich sein
ErrorBadFormat=Falsches Format!
ErrorPaymentDateLowerThanInvoiceDate=Zahlungsdatum (%s) darf nicht vor Rechnungsdatum (%s) liegen für Rechnung %s.
-ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Error, this member is not yet linked to any thirdparty. Link member to an existing third party or create a new thirdparty before creating subscription with invoice.
+ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Fehler: Dieses Mitglied ist noch nicht mit einem Partner verbunden. Verknüpfen Sie das Mitglied zuerst mit einem vorhandenen Partner oder legen Sie einen neuen an, bevor Sie ein Abonnement mit Rechnung erstellen.
ErrorThereIsSomeDeliveries=Fehler: Lieferung(en) zu dieser Sendung vorhanden. Löschen nicht möglich.
+ErrorCantDeletePaymentReconciliated=Eine Zahlung, deren Bank-Transaktion schon abgeglichen wurde, kann nicht gelöscht werden
+ErrorCantDeletePaymentSharedWithPayedInvoice=Eine Zahlung, die zu mindestens einer als bezahlt markierten Rechnung gehört, kann nicht entfernt werden
# Warnings
WarningMandatorySetupNotComplete=Zwingend notwendige Parameter sind noch nicht definiert
@@ -149,8 +151,8 @@ WarningsOnXLines=Warnhinweise in <b>%s</b> Quellzeilen
WarningNoDocumentModelActivated=Für das Erstellen von Dokumenten ist keine Vorlage gewählt. Eine Vorlage wird standardmäßig ausgewählt, bis Sie die Moduleinstellungen angepasst haben.
WarningLockFileDoesNotExists=Warnung, wenn Setup abgeschlossen ist, müssen Sie die Installations- und Migration-Tools deaktivieren. Dazu fügen Sie die Datei <b>install.lock</b> dem Verzeichnis <b> %s</b> hinzu. Das fehlend dieser Datei stelle eine Sicherheitslücke dar.
WarningUntilDirRemoved=Diese Warnung bleibt so lange bestehen, bis die Sicherheitslücke geschlossen wurde (nur für Administratoren sichtbar).
-WarningCloseAlways=Warning, closing is done even if amount differs between source and target elements. Enable this feature with caution.
+WarningCloseAlways=Achtung: es wird auch dann geschlossen, wenn der Betrag zwischen Quelle und Ziel unterschiedlich ist. Aktivieren Sie dieses Feature mit Bedacht.
WarningUsingThisBoxSlowDown=Warnung: Der Einsatz dieser Box verlangsamt sämtliche Seiten mit dieser Box spürbar.
WarningClickToDialUserSetupNotComplete=Die ClickToDial-Informationen für Ihren Benutzer sind nicht vollständig (siehe Registerkarte ClickToDial auf Ihrer Benutzerkarte).
-WarningNotRelevant=Irrelevant operation for this dataset
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningNotRelevant=Operation für dieses Daten-Set nicht relevant
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Funktion deaktiviert, wenn die Bildschirm-Ausgabe für Blinde oder Text-Browser optimiert ist.
diff --git a/htdocs/langs/de_DE/help.lang b/htdocs/langs/de_DE/help.lang
index b2c338165c30c29d49b49c54296563f5dfe428cb..1ab43a1a734e25c5af43f4dacfcca2316d8fd9a2 100644
--- a/htdocs/langs/de_DE/help.lang
+++ b/htdocs/langs/de_DE/help.lang
@@ -25,4 +25,4 @@ LinkToGoldMember=Sie können einen, vom System für Ihre Sprache (%s) automatisc
PossibleLanguages=Unterstützte Sprachen
MakeADonation=Unterstützen Sie das Projekt über eine Spende
SubscribeToFoundation=Helfen auch Sie dem Dolibarr Projekt und unterstützen uns mit einer Abo-Spende.
-# SeeOfficalSupport=For official Dolibarr support in your language: <br><b><a href="%s" target="_blank">%s</a></b>
+SeeOfficalSupport=Für offizielle Dolibarr Unterstützung in Ihrer Sprache: br><b><a href="%s" target="_blank">%s</a></b>
diff --git a/htdocs/langs/de_DE/holiday.lang b/htdocs/langs/de_DE/holiday.lang
index 820bace2c78c207d8fc1c62458a559693335a4fa..5384a3403acb79744a738dc539217221a29c6fc1 100644
--- a/htdocs/langs/de_DE/holiday.lang
+++ b/htdocs/langs/de_DE/holiday.lang
@@ -1,40 +1,40 @@
# Dolibarr language file - Source file is en_US - holiday
HRM=Mitarbeiter
-Holidays=Ferien
-CPTitreMenu=Ferien
+Holidays=Urlaub
+CPTitreMenu=Urlaub
MenuReportMonth=Monatsauszug
-MenuAddCP=Ferienantrag
-NotActiveModCP=Sie müssen das Ferien-Modul aktivieren um diese Seite zu sehen.
+MenuAddCP=Urlaubsantrag
+NotActiveModCP=Sie müssen das Urlaubs-Modul aktivieren um diese Seite zu sehen.
NotConfigModCP=Sie müssen das Ferien-Modul konfigurieren um diese Seite zu sehen. Dazu <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> klicken Sie hier </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Ferienantrag
-Employe=Angestellter
-DateDebCP=Ferienbeginn
-DateFinCP=Ferienende
+NoCPforUser=Sie haben keinen Anspruch auf Urlaub
+AddCP=Urlaubsantrag
+Employe=Mitarbeiter
+DateDebCP=Urlaubsbeginn
+DateFinCP=Urlaubsende
DateCreateCP=Erstellungsdatum
DraftCP=Entwurf
ToReviewCP=Wartet auf Genehmigung
ApprovedCP=Genehmigt
-CancelCP=Storno
+CancelCP=Zurückgezogen
RefuseCP=Abgelehnt
ValidatorCP=genehmigt durch
-ListeCP=Ferienliste
+ListeCP=Urlaubsliste
ReviewedByCP=Wird geprüft von
DescCP=Beschreibung
-SendRequestCP=Ferienantrag stellen
-DelayToRequestCP=Anträge für Ferien müssen mindestens <b>%s Tage</b> im voraus gestellt werden.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Ferien aktualisieren
-SoldeCPUser=Feriensaldo ist <b>%s</b> Tage.
+SendRequestCP=Urlaubsantrag erstellen
+DelayToRequestCP=Urlaubsanträge müssen mindestens <b>%s Tage</b> im voraus gestellt werden.
+MenuConfCP=Bearbeiten Sie die Urlaubsliste
+UpdateAllCP=Urlaub aktualisieren
+SoldeCPUser=Urlaubssaldo ist <b>%s</b> Tage.
ErrorEndDateCP=Sie müssen ein End-Datum wählen, dass nach dem Start-Datum liegt.
ErrorSQLCreateCP=Ein SQL Fehler trat auf bei der Eerstellung von:
ErrorIDFicheCP=Ein Fehler trat auf, der Antrag auf Ferien existiert nicht.
ReturnCP=Zurück zur vorherigen Seite
-ErrorUserViewCP=Sie sind nicht berechtigt diese Ferien-Anträge zu lesen.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=Sie sind nicht berechtigt diese Urlaubsanträge zu lesen.
+InfosCP=Information über den Urlaubsantrag
InfosWorkflowCP=Information Workflow
RequestByCP=Beantragt von
-TitreRequestCP=Sheet of holidays
+TitreRequestCP=Urlaubstabelle
NbUseDaysCP=Anzahl Ferientage bezogen
EditCP=Bearbeiten
DeleteCP=Lösche Gruppe
@@ -47,15 +47,15 @@ TitleDeleteCP=Antrag auf Ferien löschen
ConfirmDeleteCP=Löschung dieses Ferienantrags bestätigen?
ErrorCantDeleteCP=Fehler, Sie haben nicht die Berechtigung diesen Ferien-Antrag zu löschen.
CantCreateCP=Sie haben nicht die Berechtigung Ferien zu beantragen.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
+InvalidValidatorCP=Sie müssen einen Vorgesetzten haben der Ihre Urlaubsanfrage genehmigt.
UpdateButtonCP=Aktualisieren
-CantUpdate=You cannot update this request of holidays.
+CantUpdate=Sie können diesen Urlaubsantrag nicht aktualisieren
NoDateDebut=Sie müssen ein Startdatum wählen.
NoDateFin=Sie müssen ein Enddatum wählen.
ErrorDureeCP=Ihr Antrag auf Ferien enthält keine Werktage.
-TitleValidCP=Approve the request holidays
+TitleValidCP=Urlaubsantrag genehmigen
ConfirmValidCP=Möchten Sie diesen Ferienantrag wirklich genehmigen?
-DateValidCP=Date approved
+DateValidCP=Datum genehmigt
TitleToValidCP=Ferienantrag senden
ConfirmToValidCP=Möchten Sie diesen Ferienantrag wirklich senden?
TitleRefuseCP=Ferienantrag ablehnen
@@ -65,14 +65,14 @@ TitleCancelCP=Ferienantrag abbrechen
ConfirmCancelCP=Möchten Sie diesen Ferienantrag wirklich abbrechen?
DetailRefusCP=Ablehnungsgrund
DateRefusCP=Datum der Ablehnung
-DateCancelCP=Date of cancellation
+DateCancelCP=Datum der Absage
DefineEventUserCP=Assign an exceptional leave for a user
addEventToUserCP=Assign leave
MotifCP=Grund
UserCP=Benutzer
ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
+MenuLogCP=Urlaubsliste ansehen
LogCP=Liste von neuen Ferieneinträgen
ActionByCP=Ausgeführt von
UserUpdateCP=Für den Benutzer
@@ -85,7 +85,7 @@ FirstDayOfHoliday=Erster Ferientag
LastDayOfHoliday=Letzter Ferientag
HolidaysMonthlyUpdate=Monatliches Update
ManualUpdate=Manuelles Update
-HolidaysCancelation=Holidays cancelation
+HolidaysCancelation=Urlaubsstornierung
## Configuration du Module ##
ConfCP=Konfiguration des Ferienmoduls
@@ -125,7 +125,7 @@ TitleUpdateEventCP=Edit or delete a exceptional leave
DeleteEventOptionCP=Lösche Gruppe
UpdateEventOptionCP=Aktualisieren
ErrorMailNotSend=Ein Fehler ist beim EMail-Senden aufgetreten:
-NoCPforMonth=No leave this month.
+NoCPforMonth=Kein Urlaub diesen Monat
nbJours=Anzahl der Tage
TitleAdminCP=Konfiguration der Ferien
#Messages
diff --git a/htdocs/langs/de_DE/interventions.lang b/htdocs/langs/de_DE/interventions.lang
index 62f5943aea21f5f27491f295ec5edae55acbd16c..a4fbef992364e941d1aeeefa6cd3ee3c40523d00 100644
--- a/htdocs/langs/de_DE/interventions.lang
+++ b/htdocs/langs/de_DE/interventions.lang
@@ -25,9 +25,11 @@ NameAndSignatureOfExternalContact=Name und Unterschrift des Kunden:
DocumentModelStandard=Standard-Dokumentvorlage für Eingriffe
InterventionCardsAndInterventionLines=Eingriffe und Eingriffszeilen
ClassifyBilled=Eingegordnet "Angekündigt"
+ClassifyUnBilled=als "nicht verrechnet" markieren
StatusInterInvoiced=Angekündigt
RelatedInterventions=Verbundene Eingriffe
ShowIntervention=Zeige Eingriffe
+SendInterventionRef=Einreichung von Eingriffen %s
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Eingriffsnachverfolgung durch Vertreter
TypeContact_fichinter_internal_INTERVENING=Eingriff läuft
@@ -39,4 +41,4 @@ ArcticNumRefModelError=Fehler beim aktivieren
PacificNumRefModelDesc1=Liefere Nummer im Format %syymm-nnnn zurück, wobei yy das Jahr, mm das Monat und nnnn eine Zahlensequenz ohne Nullwert oder Leerzeichen ist
PacificNumRefModelError=Eine Interventionskarte beginnend mit $syymm existiert bereits und ist nicht mir dieser Numerierungssequenz kompatibel. Bitte löschen oder umbenennen.
PrintProductsOnFichinter=Drucke Produkte auf Eingriffskarte
-# PrintProductsOnFichinterDetails=forinterventions generated from orders
+PrintProductsOnFichinterDetails=forinterventions generated from orders
diff --git a/htdocs/langs/de_DE/link.lang b/htdocs/langs/de_DE/link.lang
index 8b1efb75ef372daf24c660017c22d0cda43189b8..759caca087651b52460c8f847d69e8df721d7570 100644
--- a/htdocs/langs/de_DE/link.lang
+++ b/htdocs/langs/de_DE/link.lang
@@ -1,8 +1,8 @@
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
-ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+LinkANewFile=Verknüpfen Sie ein neues Dokument/Datei
+LinkedFiles=Verknüpfte Dateien und Dokumente
+NoLinkFound=Keine eingetragenen Verknüpfungen
+LinkComplete=Die Datei wurde erfolgreich verknüpft
+ErrorFileNotLinked=Die Datei konnte nicht Verknüpft werden
+LinkRemoved=Die Verknüpfung %s wurde entfernt
+ErrorFailedToDeleteLink= Fehler beim Löschen des Links '<b>%s</b>'
+ErrorFailedToUpdateLink= Fehler beim Aktualisieren der Verknüpfung '<b>%s</b>'
diff --git a/htdocs/langs/de_DE/mailmanspip.lang b/htdocs/langs/de_DE/mailmanspip.lang
index 8d117d47e23dbe1d9c9d44c8baddd3e1696408dc..443e785f10ad1fe4e4f599dc7d88c6f14b5837e7 100644
--- a/htdocs/langs/de_DE/mailmanspip.lang
+++ b/htdocs/langs/de_DE/mailmanspip.lang
@@ -1,27 +1,27 @@
# Dolibarr language file - Source file is en_US - mailmanspip
MailmanSpipSetup=Konfiguration Mailman und SPIP Modul
-# MailmanTitle=Mailman mailing list system
-# TestSubscribe=To test subscription to Mailman lists
-# TestUnSubscribe=To test unsubscribe from Mailman lists
-# MailmanCreationSuccess=Subscription test was executed succesfully
-# MailmanDeletionSuccess=Unsubscription test was executed succesfully
-# SynchroMailManEnabled=A Mailman update will be performed
-# SynchroSpipEnabled=A Spip update will be performed
-# DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
-# DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
-# DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
-# DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
+MailmanTitle=Mailman mailing list system
+TestSubscribe=To test subscription to Mailman lists
+TestUnSubscribe=To test unsubscribe from Mailman lists
+MailmanCreationSuccess=Subscription test was executed succesfully
+MailmanDeletionSuccess=Unsubscription test was executed succesfully
+SynchroMailManEnabled=A Mailman update will be performed
+SynchroSpipEnabled=A Spip update will be performed
+DescADHERENT_MAILMAN_ADMINPW=Mailman administrator password
+DescADHERENT_MAILMAN_URL=URL for Mailman subscriptions
+DescADHERENT_MAILMAN_UNSUB_URL=URL for Mailman unsubscriptions
+DescADHERENT_MAILMAN_LISTS=List(s) for automatic inscription of new members (separated by a comma)
SPIPTitle=SPIP Content Management System
DescADHERENT_SPIP_SERVEUR=SPIP-Server
DescADHERENT_SPIP_DB=SPIP-Datenbankname
DescADHERENT_SPIP_USER=SPIP-Datenbankkennung
DescADHERENT_SPIP_PASS=SPIP-Datenbankpasswort
-# AddIntoSpip=Add into SPIP
-# AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
-# AddIntoSpipError=Failed to add the user in SPIP
-# DeleteIntoSpip=Remove from SPIP
-# DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
-# DeleteIntoSpipError=Failed to suppress the user from SPIP
-# SPIPConnectionFailed=Failed to connect to SPIP
-# SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done
-# SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done
+AddIntoSpip=Add into SPIP
+AddIntoSpipConfirmation=Are you sure you want to add this member into SPIP?
+AddIntoSpipError=Failed to add the user in SPIP
+DeleteIntoSpip=Von SPIP entfernen
+DeleteIntoSpipConfirmation=Are you sure you want to remove this member from SPIP?
+DeleteIntoSpipError=Failed to suppress the user from SPIP
+SPIPConnectionFailed=Failed to connect to SPIP
+SuccessToAddToMailmanList=Add of %s to mailman list %s or SPIP database done
+SuccessToRemoveToMailmanList=Removal of %s from mailman list %s or SPIP database done
diff --git a/htdocs/langs/de_DE/margins.lang b/htdocs/langs/de_DE/margins.lang
index 773da6f87644859ecd4e1d73c11e303987149d34..58dcdc96f801ba5073ad13d815302813576d61a1 100644
--- a/htdocs/langs/de_DE/margins.lang
+++ b/htdocs/langs/de_DE/margins.lang
@@ -5,9 +5,9 @@ Margins=Gewinnspannen
TotalMargin=Gesamt-Spanne
MarginOnProducts=Gewinnspanne / Produkte
MarginOnServices=Gewinnspanne / Services
-MarginRate=Margin rate
+MarginRate=Gewinnspannen-Rate
MarkRate=Mark rate
-DisplayMarginRates=Display margin rates
+DisplayMarginRates=Zeige Gewinnspannen-Raten an
DisplayMarkRates=Display mark rates
InputPrice=Eingabe Preis
margin=Profit margins management
diff --git a/htdocs/langs/de_DE/orders.lang b/htdocs/langs/de_DE/orders.lang
index fda7c03a005b885731804159f78aea1c411585ec..8d4ea51c343ccaf91be2e27bf12394b8ec5ff048 100644
--- a/htdocs/langs/de_DE/orders.lang
+++ b/htdocs/langs/de_DE/orders.lang
@@ -55,7 +55,7 @@ DraftOrWaitingShipped=Entwurf oder bestätigt, noch nicht versandt
MenuOrdersToBill=Bestellverrechnung
MenuOrdersToBill2=Zu verrechnende Bestellungen
SearchOrder=Suche Bestellung
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Kundenauftrag suchen
ShipProduct=Produkt versenden
Discount=Rabatt
CreateOrder=Erzeuge Bestellung
@@ -101,7 +101,6 @@ RelatedOrders=Verknüpfte Bestellungen
OnProcessOrders=Bestellungen in Bearbeitung
RefOrder=Bestell-Nr.
RefCustomerOrder=Kunden-Bestellung-Nr.
-CustomerOrder=Kundenbestellung
RefCustomerOrderShort=Kunden-BestellNr.
SendOrderByMail=Bestellung per Post versenden
ActionsOnOrder=Maßnahmen zu dieser Bestellung
@@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Konstante COMMANDE_ADDON nicht definiert
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Fehler beim Laden der Moduldatei '%s'
Error_FailedToLoad_COMMANDE_ADDON_File=Fehler beim Laden der Moduldatei '%s'
Error_OrderNotChecked=Keine zu verrechnende Bestellungen ausgewählt
-
-
# Sources
OrderSource0=Angebot
OrderSource1=Internet
@@ -144,7 +141,6 @@ OrderSource5=Vertrieb
OrderSource6=Andere
QtyOrdered=Bestellmenge
AddDeliveryCostLine=Fügen Sie eine Versandkostenzeile zur Erfassung des Bestellgewichts ein
-
# Documents models
PDFEinsteinDescription=Eine vollständige Bestellvorlage (Logo, uwm.)
PDFEdisonDescription=Eine einfache Bestellungsvorlage
@@ -155,14 +151,13 @@ OrderByFax=Fax
OrderByEMail=E-Mail
OrderByWWW=Online
OrderByPhone=Telefon
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=Keine Bestellungen Rechnungsfähig
CloseProcessedOrdersAutomatically=Markiere alle ausgewählten Bestellungen als "verarbeitet".
MenuOrdersToBill2=Zu verrechnende Bestellungen
-# OrderCreation=Order creation
+OrderCreation=Erstellen einer Bestellung
Ordered=Bestellt
OrderCreated=Ihre Bestellungen wurden erstellt
OrderFail=Ein Fehler trat beim Erstellen der Bestellungen auf
CreateOrders=Erzeuge Bestellungen
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+ToBillSeveralOrderSelectCustomer=Um eine Rechnung für verschiedene Bestellungen zu erstellen, klicken Sie erst auf Kunde und dann wählen Sie "%s".
diff --git a/htdocs/langs/de_DE/paypal.lang b/htdocs/langs/de_DE/paypal.lang
index 4664f3ea94c652af788d1ee3795e51fb681f3b8e..0ee356b52f749790f8ec08f1e718d3e7a78a5de6 100644
--- a/htdocs/langs/de_DE/paypal.lang
+++ b/htdocs/langs/de_DE/paypal.lang
@@ -20,6 +20,6 @@ YouAreCurrentlyInSandboxMode=Sie befinden sich im "Sandbox"-Modus
NewPaypalPaymentReceived=Neue PayPal-Zahlung erhalten
NewPaypalPaymentFailed=Neue Paypal-Zahlung probiert, aber fehlgeschlagen
PAYPAL_PAYONLINE_SENDEMAIL=Status-Email nach einer Zahlung (erfolgreich oder nicht)
-ReturnURLAfterPayment=Return URL after payment
-ValidationOfPaypalPaymentFailed=Validation of Paypal payment failed
-PaypalConfirmPaymentPageWasCalledButFailed=Payment confirmation page for Paypal was called by Paypal but confirmation failed
+ReturnURLAfterPayment=Rückkehr-URL nach Zahlung
+ValidationOfPaypalPaymentFailed=Validierung der Paypal-Zahlung gescheitert
+PaypalConfirmPaymentPageWasCalledButFailed=Zahlungsbestätigungsseite für Paypal wurde von Paypal aufgerufen, aber Bestätigung fehlgeschlagen
diff --git a/htdocs/langs/de_DE/products.lang b/htdocs/langs/de_DE/products.lang
index 1284d010bc28d9cd40607f02b3c742e6c54cd76c..3d82f643187a49bc485d407b8df61fbff1f5915a 100644
--- a/htdocs/langs/de_DE/products.lang
+++ b/htdocs/langs/de_DE/products.lang
@@ -1,46 +1,46 @@
# Dolibarr language file - Source file is en_US - products
ProductRef=Produktreferenz
ProductLabel=Produkt-Beschriftung
-ProductServiceCard=Produkt-/Services-Karte
+ProductServiceCard=Produkt-/Dienstleistungs-Karte
Products=Produkte
-Services=Services
+Services=Dienstleistungen
Product=Produkt
-Service=Service
-ProductId=Produkt/Service ID
+Service=Dienstleistung
+ProductId=Produkt/Dienstleistungs ID
Create=Erstelle
Reference=Referenz
NewProduct=Neues Produkt
-NewService=Neuer Service
+NewService=Neue Dienstleistung
ProductCode=Produkt-Code
-ServiceCode=Service-Code
+ServiceCode=Dienstleistungs-Code
ProductVatMassChange=MwSt-Massenänderung
-ProductVatMassChangeDesc=Mit dieser Seite kann ein Steuersatz für Produkte oder Services von einem Wert auf einen anderen geändert werden. Achtung: Diese Änderung erfolgt über die gesamte Datenbank!
+ProductVatMassChangeDesc=Mit dieser Seite kann ein Steuersatz für Produkte oder Dienstleistungen von einem Wert auf einen anderen geändert werden. Achtung: Diese Änderung erfolgt über die gesamte Datenbank!
MassBarcodeInit=Mass barcode init
MassBarcodeInitDesc=Hier können Objekte mit einem Barcode initialisiert werden, die noch keinen haben. Stellen Sie vor Benutzung sicher, dass die Einstellungen des Barcode-Moduls vollständig sind!
ProductAccountancyBuyCode=Buchhaltung - Aufwandskonto
ProductAccountancySellCode=Buchhaltung - Erlöskonto
-ProductOrService=Produkt oder Service
-ProductsAndServices=Produkte und Services
-ProductsOrServices=Produkte oder Services
-ProductsAndServicesOnSell=Verfügbare Produkte und Services
-ProductsAndServicesNotOnSell=Aufgelassene Produkte und Services
-ProductsAndServicesStatistics=Produkt- und Service-Statistik
+ProductOrService=Produkt oder Dienstleistung
+ProductsAndServices=Produkte und Dienstleistungen
+ProductsOrServices=Produkte oder Dienstleistungen
+ProductsAndServicesOnSell=Verfügbare Produkte und Dienstleistungen
+ProductsAndServicesNotOnSell=Aufgelassene Produkte und Dienstleistungen
+ProductsAndServicesStatistics=Produkt- und Dienstleistungs-Statistik
ProductsStatistics=Produktstatistik
ProductsOnSell=Verfügbare Produkte
ProductsNotOnSell=Aufgelassene Produkte
ProductsOnSellAndOnBuy=Produkte weder für Ein- noch Verkauf
-ServicesOnSell=Verfügbare Services
-ServicesNotOnSell=Aufgelassene Services
-ServicesOnSellAndOnBuy=Services weder für Ein- noch Verkauf
+ServicesOnSell=Verfügbare Dienstleistungen
+ServicesNotOnSell=Aufgelassene Dienstleistungen
+ServicesOnSellAndOnBuy=Dienstleistungen weder für Ein- noch Verkauf
InternalRef=Interne Referenz
-LastRecorded=Zuletzt erfasste, verfügbare Produkte/Services
-LastRecordedProductsAndServices=%s zuletzt erfasste Produkte/Services
-LastModifiedProductsAndServices=%s zuletzt bearbeitete Produkte/Services
+LastRecorded=Zuletzt erfasste, verfügbare Produkte/Dienstleistungen
+LastRecordedProductsAndServices=%s zuletzt erfasste Produkte/Dienstleistungen
+LastModifiedProductsAndServices=%s zuletzt bearbeitete Produkte/Dienstleistungen
LastRecordedProducts=%s zuletzt erfasste Produkte
-LastRecordedServices=%s zuletzt erfasste Services
+LastRecordedServices=%s zuletzt erfasste Dienstleistungen
LastProducts=Neueste Produkte
CardProduct0=Produkt-Karte
-CardProduct1=Service-Karte
+CardProduct1=Dienstleistungs-Karte
CardContract=Auftrags-Karte
Warehouse=Warenlager
Warehouses=Warenlager
@@ -74,25 +74,25 @@ NewPrice=Neuer Preis
MinPrice=Mindestverkaufspreis
MinPriceHT=Mindest-Verkaufspreis (ohne MwSt.)
MinPriceTTC=Mindest-Verkaufspreis (inkl. MwSt.)
-CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne MwSt.) nicht unterschreiten. Diese Meldung kann auch angezeigt, wenn Sie einen zu hohen Rabatt geben.
+CantBeLessThanMinPrice=Der Verkaufspreis darf den Mindestpreis für dieses Produkt (%s ohne MwSt.) nicht unterschreiten. Diese Meldung kann auch angezeigt werden, wenn Sie einen zu hohen Rabatt geben.
ContractStatus=Vertragsstatus
ContractStatusClosed=Geschlossen
ContractStatusRunning=In Arbeit
ContractStatusExpired=Abgelaufen
ContractStatusOnHold=Nicht in Arbeit
-ContractStatusToRun=To get running
+ContractStatusToRun=zu bearbeiten
ContractNotRunning=Dieser Vertrag wird nicht bearbeitet
ErrorProductAlreadyExists=Ein Produkt mit Artikel Nr. %s existiert bereits.
ErrorProductBadRefOrLabel=Für Artikel Nr. oder Bezeichnung wurde ein ungültiger Wert eingegeben.
-ErrorProductClone=Beim Duplizieren des Produkts oder Service ist ein Problem aufgetreten
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorProductClone=Beim Duplizieren des Produkts oder der Dienstleistung ist ein Problem aufgetreten
+ErrorPriceCantBeLowerThanMinPrice=Fehler - Preis darf nicht unter dem Minimalpreis liegen.
Suppliers=Lieferanten
SupplierRef=Lieferanten-Artikelnummer
ShowProduct=Produkt anzeigen
-ShowService=Zeige Service
-ProductsAndServicesArea=Produkt-und Services-Übersicht
+ShowService=Dienstleistung anzeigen
+ProductsAndServicesArea=Produkt-und Dienstleistungs-Übersicht
ProductsArea=Produktübersicht
-ServicesArea=Services-Übersicht
+ServicesArea=Dienstleistungs-Übersicht
AddToMyProposals=Zu meinen Angebote hinzufügen
AddToOtherProposals=Zu Angeboten Anderer hinzufügen
AddToMyBills=Zu meinen Rechnungen hinzufügen
@@ -113,9 +113,9 @@ SetDefaultBarcodeType=Wählen Sie den standardmäßigen Barcode-Typ
BarcodeValue=Barcode-Wert
NoteNotVisibleOnBill=Anmerkung (nicht sichtbar auf Rechnungen, Angeboten,...)
CreateCopy=Kopie erstellen
-ServiceLimitedDuration=Ist die Leistungserbringung eines Service zeitlich beschränkt:
-MultiPricesAbility=Mehrere Preisstufen pro Produkt/Service
-MultiPricesNumPrices=Preisnummer
+ServiceLimitedDuration=Ist die Erringung einer Dienstleistung zeitlich beschränkt:
+MultiPricesAbility=Mehrere Preisstufen pro Produkt/Dienstleistung
+MultiPricesNumPrices=Anzahl Preise
MultiPriceLevelsName=Preiskategorien
AssociatedProductsAbility=Untergeordnete Produkte aktivieren
AssociatedProducts=Unterprodukte
@@ -159,14 +159,14 @@ DiscountQtyMin=Standard-Rabatt für die Menge
NoPriceDefinedForThisSupplier=Einkaufskonditionen für diesen Hersteller noch nicht definiert
NoSupplierPriceDefinedForThisProduct=Einkaufskonditionen für dieses Produkt noch nicht definiert
RecordedProducts=Erfasste Produkte
-RecordedServices=Erfasste Services
+RecordedServices=Erfasste Dienstleistungen
RecordedProductsAndServices=Erfasste Produkte/Leistungen
PredefinedProductsToSell=Vordefinierte Verkaufs-Produkte
-PredefinedServicesToSell=Vordefinierte Services zum Verkauf
-PredefinedProductsAndServicesToSell=Vordefinierte Verkaufs-Produkte/-Services
+PredefinedServicesToSell=Vordefinierte Dienstleistungen zum Verkauf
+PredefinedProductsAndServicesToSell=Vordefinierte Verkaufs-Produkte/-Dienstleistungen
PredefinedProductsToPurchase=Vordefinierte Einkaufs-Produkte
-PredefinedServicesToPurchase=Vordefinierte Services zum Einkauf
-PredefinedProductsAndServicesToPurchase=Vordefinierte Einkaufs-Produkte/-Services
+PredefinedServicesToPurchase=Vordefinierte Dienstleistungen zum Einkauf
+PredefinedProductsAndServicesToPurchase=Vordefinierte Einkaufs-Produkte/-Dienstleistungen
GenerateThumb=Erzeuge Vorschaubild
ProductCanvasAbility=Verwende spezielle "canvas" Add-Ons
ServiceNb=Leistung #%s
@@ -176,31 +176,31 @@ ListServiceByPopularity=Liste der Leistungen nach Beliebtheit
Finished=Eigenproduktion
RowMaterial=Rohmaterial
CloneProduct=Produkt/Leistung duplizieren
-ConfirmCloneProduct=Möchten Sie <b>%s</b> wirklich duplizieren?
+ConfirmCloneProduct=Möchten Sie die Leistung <b>%s</b> wirklich duplizieren?
CloneContentProduct=Allgemeine Informationen des Produkts/Leistungen duplizieren
ClonePricesProduct=Allgemeine Informationen und Preise duplizieren
-CloneCompositionProduct=Unterprodukt/-Service duplizieren
+CloneCompositionProduct=Unterprodukt/-Dienstleistung duplizieren
ProductIsUsed=Produkt in Verwendung
NewRefForClone=Artikel-Nr. des neuen Produkts/Leistungen
CustomerPrices=Kundenpreise
SuppliersPrices=Lieferantenpreise
-SuppliersPricesOfProductsOrServices=Lieferanten-Preise (für Produkte oder Services)
+SuppliersPricesOfProductsOrServices=Lieferanten-Preise (für Produkte oder Dienstleistungen)
CustomCode=Interner Code
CountryOrigin=Urspungsland
HiddenIntoCombo=In ausgewählten Listen nicht anzeigen
Nature=Art
ProductCodeModel=Vorlage für Produktreferenz
-ServiceCodeModel=Vorlage für Service-Referenz
+ServiceCodeModel=Vorlage für Dienstleistungs-Referenz
AddThisProductCard=Produktkarte erstellen
HelpAddThisProductCard=Dies gibt ihnen die Möglichkeit, ein Produkt zu erstellen oder zu duplizieren wenn es noch nicht existiert.
-AddThisServiceCard=Service-Karte erstellen
-HelpAddThisServiceCard=Dies gibt ihnen die Möglichkeit, einen Service zu erstellen oder zu duplizieren wenn er noch nicht existiert.
+AddThisServiceCard=Dienstleistungs-Karte erstellen
+HelpAddThisServiceCard=Dies gibt ihnen die Möglichkeit, eine Dienstleistung zu erstellen oder zu duplizieren wenn sie noch nicht existiert.
CurrentProductPrice=Aktueller Preis
-AlwaysUseNewPrice=Immer aktuellen Preis des Produkts/Service nutzen
+AlwaysUseNewPrice=Immer aktuellen Preis des Produkts/Dienstleistung nutzen
AlwaysUseFixedPrice=Festen Preis nutzen
PriceByQuantity=Preis nach Menge
PriceByQuantityRange=Bereich der Menge
-ProductsDashboard=Produkt-und Services-Zusammenfassung
+ProductsDashboard=Produkt- und Dienstleistungs-Zusammenfassung
UpdateOriginalProductLabel=Ursprüngliches Label verändern
HelpUpdateOriginalProductLabel=Gibt die Möglichkeit, den Namen des Produkts zu bearbeiten
### composition fabrication
@@ -214,7 +214,7 @@ CostPmpHT=Net total VWAP
ProductUsedForBuild=Automatisch für Produktion verbraucht
ProductBuilded=Produktion fertiggestellt
ProductsMultiPrice=Produkt Multi-Preis
-ProductsOrServiceMultiPrice=Kunden-Preise (für Produkte oder Services, Multi-Preise)
+ProductsOrServiceMultiPrice=Kunden-Preise (für Produkte oder Dienstleistungen, Multi-Preise)
ProductSellByQuarterHT=Products turnover quarterly VWAP
ServiceSellByQuarterHT=Services turnover quarterly VWAP
Quarter1=1. Quartal
@@ -234,11 +234,11 @@ DefinitionOfBarCodeForThirdpartyNotComplete=Barcode-Typ oder -Wert bei Partner
BarCodeDataForProduct=Barcode-Information von Produkt %s:
BarCodeDataForThirdparty=Barcode-Information von Partner %s:
ResetBarcodeForAllRecords=Define barcode value for all records (this will also reset barcode value already defined with new values)
-PriceByCustomer=Price by customer
-PriceCatalogue=Unique price per product/service
+PriceByCustomer=Preis des Kunden
+PriceCatalogue=Einzigartiger Preis pro Produkt/Dienstleistung
PricingRule=Preisregeln
AddCustomerPrice=Add price by customers
ForceUpdateChildPriceSoc=Lege den gleichen Preis für Kunden-Tochtergesellschaften fest
PriceByCustomerLog=Price by customer log
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
+MinimumPriceLimit=Minimaler Preis kann nicht kleiner als %s sein
+MinimumRecommendedPrice=Minimaler empfohlener Preis: %s
diff --git a/htdocs/langs/de_DE/projects.lang b/htdocs/langs/de_DE/projects.lang
index 009c36d1a7c14350283f068d33499b98571c43d4..907b21ce10c0eb9c4314bb5306dd41c1c25dbbc4 100644
--- a/htdocs/langs/de_DE/projects.lang
+++ b/htdocs/langs/de_DE/projects.lang
@@ -124,7 +124,7 @@ AddElement=Mit Element verknüpfen
DocumentModelBaleine=Eine vollständige Projektberichtsvorlage (Logo, uwm.)
PlannedWorkload = Geplante Auslastung
WorkloadOccupation= Beeinflussung der Auslastung
-ProjectReferers=Refering objects
-SearchAProject=Search a project
+ProjectReferers=Bezugnahmen
+SearchAProject=Suchen Sie ein Projekt
ProjectMustBeValidatedFirst=Project must be validated first
ProjectDraft=Draft projects
diff --git a/htdocs/langs/de_DE/propal.lang b/htdocs/langs/de_DE/propal.lang
index 0fbf941d77757727dc9d6ada70c27a965df2d124..dd29ee21783907d34a38d108521c22feb8abaf61 100644
--- a/htdocs/langs/de_DE/propal.lang
+++ b/htdocs/langs/de_DE/propal.lang
@@ -98,5 +98,5 @@ TypeContact_propal_external_CUSTOMER=Partnerkontakt für Angebot
DocModelAzurDescription=Eine vollständige Angebotsvorlage (Logo, uwm.)
DocModelJauneDescription=Angebotsvorlage <Jaune>
DefaultModelPropalCreate=Erstellung Standardvorlage
-# DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
-# DefaultModelPropalClosed=Default template when closing a business proposal (unbilled)
+DefaultModelPropalToBill=Default template when closing a business proposal (to be invoiced)
+DefaultModelPropalClosed=Standard Schablone wenn sie ein Geschäftsangebot schließen wollen. (ohne Rechnung)
diff --git a/htdocs/langs/de_DE/salaries.lang b/htdocs/langs/de_DE/salaries.lang
index 8748f77ee64902e05bd6c54e38558176890e862c..b1477807c4ed3fd0eed63d494fc146d9f4e075fe 100644
--- a/htdocs/langs/de_DE/salaries.lang
+++ b/htdocs/langs/de_DE/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Buchhaltungscode für Bezahlung der Gehälter
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Accountancy code for financial charge
Salary=Lohn
Salaries=Löhne
Employee=Angestellter
@@ -6,3 +8,5 @@ NewSalaryPayment=Neue Lohnzahlung
SalaryPayment=Lohnzahlung
SalariesPayments=Lohnzahlungen
ShowSalaryPayment=Zeige Lohnzahlung
+THM=Durchschnittlicher Stundenpreis
+TJM=Durchschnittlicher Tagespreis
diff --git a/htdocs/langs/de_DE/stocks.lang b/htdocs/langs/de_DE/stocks.lang
index 02cdb4098ed3e5ead0f47ed58fe854eecce17a53..2b7376cb62e2befe9d8db32363f0bec61c2c7012 100644
--- a/htdocs/langs/de_DE/stocks.lang
+++ b/htdocs/langs/de_DE/stocks.lang
@@ -88,7 +88,7 @@ PersonalStock=Persönlicher Warenbestand %s
ThisWarehouseIsPersonalStock=Dieses Lager bezeichnet den persönlichen Bestand von %s %s
SelectWarehouseForStockDecrease=Wählen Sie das Lager für die Entnahme
SelectWarehouseForStockIncrease=Wählen Sie das Lager für den Wareneingang
-NoStockAction=No stock action
+NoStockAction=Keine Vorratsänderung
LastWaitingSupplierOrders=Bestellungen warten auf Wareneingang
DesiredStock=gewünschter Lagerbestand
StockToBuy=zu bestellen
@@ -109,10 +109,10 @@ WarehouseForStockIncrease=Das Lager <b>%s</b> wird für Wareneingang verwendet
ForThisWarehouse=Für dieses Lager
ReplenishmentStatusDesc=Dies ist eine Liste aller Produkte, deren Lagerbestand unter dem Sollbestand liegt (bzw. unter der Alarmschwelle, wenn die Auswahlbox "Nur Alarm" gewählt ist) , die Ihnen Vorschläge für Lieferantenbestellungen liefert, um die Differenzen auszugleichen.
ReplenishmentOrdersDesc=Dies ist die Liste aller offenen Lieferantenbestellungen
-Replenishments=Replenishments
+Replenishments=Nachschub
NbOfProductBeforePeriod=Menge des Produkts %s im Lager vor der gewählten Periode (< %s)
NbOfProductAfterPeriod=Menge des Produkts %s im Lager nach der gewählten Periode (> %s)
-MassMovement=Mass movement
+MassMovement=Massenbewegung
MassStockMovement=Massen-Umlagerung
SelectProductInAndOutWareHouse=Wählen Sie ein Produkt, eine Menge, ein Quellen- und ein Ziel-Lager und klicken Sie dann auf "%s". Sobald Sie dies für alle erforderlichen Bewegungen getan haben, klicken Sie auf "%s".
RecordMovement=Record transfert
diff --git a/htdocs/langs/de_DE/users.lang b/htdocs/langs/de_DE/users.lang
index 221b0f125b6b117eaf139f6f791413ec6c6f1f60..94507c0c5726e738df1b089bebf27f21405800d9 100644
--- a/htdocs/langs/de_DE/users.lang
+++ b/htdocs/langs/de_DE/users.lang
@@ -114,8 +114,9 @@ YourRole=Ihre Rolle
YourQuotaOfUsersIsReached=Ihr Kontingent aktiver Benutzer ist erreicht
NbOfUsers=Anzahl der Benutzer
DontDowngradeSuperAdmin=Nur ein SuperAdmin kann einen SuperAdmin downgraden
-HierarchicalResponsible=In der Hierarchie verantwortlich
+HierarchicalResponsible=Aufseher
HierarchicView=Hierarchische Ansicht
UseTypeFieldToChange=Nutzen sie das Feld "Typ" zum ändern
OpenIDURL=OpenID URL
LoginUsingOpenID=Verwende OpenID für Anmeldung
+WeeklyHours=Wochenstunden
diff --git a/htdocs/langs/de_DE/withdrawals.lang b/htdocs/langs/de_DE/withdrawals.lang
index fef59beb67fd3d4050134a1f69bddbcad5a3d17e..139f35c108518282655bcef6f9c188e934053c3e 100644
--- a/htdocs/langs/de_DE/withdrawals.lang
+++ b/htdocs/langs/de_DE/withdrawals.lang
@@ -56,7 +56,7 @@ StatusCredited=Eingelöst
StatusRefused=Abgelehnt
StatusMotif0=Nicht spezifiziert
StatusMotif1=Unzureichende Deckung
-StatusMotif2=Request contested
+StatusMotif2=Anfrage bestritten
StatusMotif3=Kein Abbuchungsauftrag
StatusMotif4=Kundenanfrage
StatusMotif5=nicht nutzbare Kontodaten
diff --git a/htdocs/langs/el_GR/accountancy.lang b/htdocs/langs/el_GR/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..9ab9b3946822054cadd196a8f12ca88d851d9017
--- /dev/null
+++ b/htdocs/langs/el_GR/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Λογιστική
+Globalparameters=Global parameters
+Chartofaccounts=Διάγραμμα των λογαριασμών
+Fiscalyear=Οικονομικά έτη
+Menuaccount=Λογαριασμοί Λογιστικής
+Menuthirdpartyaccount=Λογαριασμοί Πελ./Προμ.
+MenuTools=Εργαλεία
+
+ConfigAccountingExpert=Διαμόρφωση της μονάδας λογιστικής expert
+Journaux=Ημερολόγια
+JournalFinancial=Financial journals
+Exports=Εξαγωγές
+Modelcsv=Πρότυπο εξαγωγής
+Selectmodelcsv=Επιλέξτε ένα πρότυπο από την εξαγωγή
+Modelcsv_normal=Κλασική εξαγωγή
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Επιστροφή στο διάγραμμα των λογαριασμών
+Back=Επιστροφή
+
+Definechartofaccounts=Ορίστε ένα διάγραμμα των λογαριασμών
+Selectchartofaccounts=Επιλέξτε ένα διάγραμμα των λογαριασμών
+Validate=Επικύρωση
+Addanaccount=Προσθέστε ένα λογιστικό λογαριασμό
+AccountAccounting=Λογιστική λογαριασμού
+Ventilation=Ventilation
+ToDispatch=Για την αποστολή
+Dispatched=Αποστέλλονται
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Εμπορικό Περιθώριο
+Reports=Αναφορές
+ByCustomerInvoice=Με τιμολόγια πελατών
+ByMonth=Μέχρι το μήνα
+NewAccount=Νέος λογιστικός λογαριασμός
+Update=Ενημέρωση
+List=Λίστα
+Create=Δημιουργία
+UpdateAccount=Τροποποίηση του λογιστικού λογαριασμού
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=Γενικό Καθολικό
+AccountBalanceByMonth=Το υπόλοιπο του λογαριασμού ανά μήνα
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Γραμμή
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Επεξεργασία
+EndProcessing=Τέλος της επεξεργασίας
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Επιλεγμένες γραμμές
+Lineofinvoice=Γραμμή τιμολογίου
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Διαχωριστικό CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Λογαριασμός μεταφοράς
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Λογαριασμός σε αναμονή
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Τύπος εγγράφου
+Docdate=Ημερομηνία
+Docref=Παραπομπή
+Numerocompte=Λογαριασμός
+Code_tiers=Πελ./Προμ.
+Labelcompte=Ετικέτα λογαριασμού
+Debit=Χρέωση
+Credit=Πίστωση
+Amount=Σύνολο
+Sens=Sens
+Codejournal=Ημερολόγιο
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index dd793c7bfdd32b69bc6bc6e9b281a74ccc6561a6..cb19170dab370c7a6acbaee0f6c257ef1e5f8b54 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -88,5 +88,5 @@ ExtSiteUrlAgenda=URL to access .ical file
ExtSiteNoLabel=No Description
WorkingTimeRange=Working time range
WorkingDaysRange=Working days range
-AddEvent=Create event
-MyAvailability=Ma disponibilité
\ No newline at end of file
+AddEvent=Add event
+MyAvailability=My availability
\ No newline at end of file
diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang
index 1b2ea17215ba9fb30b90041256d12bdc1a5f047d..06c350039a34226926c1dd5e320a98932e35d3dd 100644
--- a/htdocs/langs/en_US/companies.lang
+++ b/htdocs/langs/en_US/companies.lang
@@ -397,7 +397,7 @@ YouMustCreateContactFirst=You must create emails contacts for third party first
ListSuppliersShort=List of suppliers
ListProspectsShort=List of prospects
ListCustomersShort=List of customers
-ThirdPartiesArea=Third parties area
+ThirdPartiesArea=Third parties and contact area
LastModifiedThirdParties=Last %s modified third parties
UniqueThirdParties=Total of unique third parties
InActivity=Open
@@ -410,3 +410,5 @@ OutstandingBillReached=Reached max. for outstanding bill
MonkeyNumRefModelDesc=Return numero with format %syymm-nnnn for customer code and %syymm-nnnn for supplier code where yy is year, mm is month and nnnn is a sequence with no break and no return to 0.
LeopardNumRefModelDesc=The code is free. This code can be modified at any time.
ManagingDirectors=Manager(s) name (CEO, director, president...)
+SearchThirdparty=Search thirdparty
+SearchContact=Search contact
\ No newline at end of file
diff --git a/htdocs/langs/en_US/holiday.lang b/htdocs/langs/en_US/holiday.lang
index da03299e0da952d9b5298983f7a185c4329a55b6..c25abf6449ca2cc97d5dba6340d1530b5ea9c675 100644
--- a/htdocs/langs/en_US/holiday.lang
+++ b/htdocs/langs/en_US/holiday.lang
@@ -1,13 +1,13 @@
# Dolibarr language file - Source file is en_US - holiday
HRM=HRM
-Holidays=Holidays
-CPTitreMenu=Holidays
+Holidays=Leaves
+CPTitreMenu=Leaves
MenuReportMonth=Monthly statement
-MenuAddCP=Apply for holidays
-NotActiveModCP=You must enable the module holidays to view this page.
-NotConfigModCP=You must configure the module holidays to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
-NoCPforUser=You don't have a demand for holidays.
-AddCP=Apply for holidays
+MenuAddCP=Make a leave request
+NotActiveModCP=You must enable the module Leaves to view this page.
+NotConfigModCP=You must configure the module Leaves to view this page. To do this, <a href="./admin/holiday.php?leftmenu=setup&mainmenu=home" style="font-weight: normal; color: red; text-decoration: underline;"> click here </ a>.
+NoCPforUser=You don't have any available day.
+AddCP=Make a leave request
Employe=Employee
DateDebCP=Start date
DateFinCP=End date
@@ -18,24 +18,24 @@ ApprovedCP=Approved
CancelCP=Canceled
RefuseCP=Refused
ValidatorCP=Approbator
-ListeCP=List of holidays
+ListeCP=List of leaves
ReviewedByCP=Will be reviewed by
DescCP=Description
-SendRequestCP=Creating demand for holidays
-DelayToRequestCP=Applications for holidays must be made at least <b>%s day(s)</b> before them.
-MenuConfCP=Edit balance of holidays
-UpdateAllCP=Update the holidays
-SoldeCPUser=Holidays balance is <b>%s</b> days.
+SendRequestCP=Create leave request
+DelayToRequestCP=Leave requests must be made at least <b>%s day(s)</b> before them.
+MenuConfCP=Edit balance of leaves
+UpdateAllCP=Update the leaves
+SoldeCPUser=Leaves balance is <b>%s</b> days.
ErrorEndDateCP=You must select an end date greater than the start date.
ErrorSQLCreateCP=An SQL error occurred during the creation:
-ErrorIDFicheCP=An error has occurred, the request for holidays does not exist.
+ErrorIDFicheCP=An error has occurred, the leave request does not exist.
ReturnCP=Return to previous page
-ErrorUserViewCP=You are not authorized to read this request for holidays.
-InfosCP=Information of the demand of holidays
+ErrorUserViewCP=You are not authorized to read this leave request.
+InfosCP=Information of the leave request
InfosWorkflowCP=Information Workflow
RequestByCP=Requested by
-TitreRequestCP=Sheet of holidays
-NbUseDaysCP=Number of days of holidays consumed
+TitreRequestCP=Leave request
+NbUseDaysCP=Number of days of vacation consumed
EditCP=Edit
DeleteCP=Delete
ActionValidCP=Validate
@@ -43,26 +43,26 @@ ActionRefuseCP=Refuse
ActionCancelCP=Cancel
StatutCP=Status
SendToValidationCP=Send to validation
-TitleDeleteCP=Delete the request of holidays
-ConfirmDeleteCP=Confirm the deletion of this request for holidays?
-ErrorCantDeleteCP=Error you don't have the right to delete this holiday request.
-CantCreateCP=You don't have the right to apply for holidays.
-InvalidValidatorCP=You must choose an approbator to your holiday request.
+TitleDeleteCP=Delete the leave request
+ConfirmDeleteCP=Confirm the deletion of this leave request?
+ErrorCantDeleteCP=Error you don't have the right to delete this leave request.
+CantCreateCP=You don't have the right to make leave requests.
+InvalidValidatorCP=You must choose an approbator to your leave request.
UpdateButtonCP=Update
-CantUpdate=You cannot update this request of holidays.
+CantUpdate=You cannot update this leave request.
NoDateDebut=You must select a start date.
NoDateFin=You must select an end date.
ErrorDureeCP=Your request for holidays does not contain working day.
TitleValidCP=Approve the request holidays
-ConfirmValidCP=Are you sure you want to approve the holiday request?
+ConfirmValidCP=Are you sure you want to approve the leave request?
DateValidCP=Date approved
-TitleToValidCP=Send request holidays
-ConfirmToValidCP=Are you sure you want to send the request of holidays?
+TitleToValidCP=Send leave request
+ConfirmToValidCP=Are you sure you want to send the leave request?
TitleRefuseCP=Refuse the request holidays
-ConfirmRefuseCP=Are you sure you want to refuse the request of holidays?
+ConfirmRefuseCP=Are you sure you want to refuse the leave request?
NoMotifRefuseCP=You must choose a reason for refusing the request.
TitleCancelCP=Cancel the request holidays
-ConfirmCancelCP=Are you sure you want to cancel the request of holidays?
+ConfirmCancelCP=Are you sure you want to cancel the leave request?
DetailRefusCP=Reason for refusal
DateRefusCP=Date of refusal
DateCancelCP=Date of cancellation
@@ -72,8 +72,8 @@ MotifCP=Reason
UserCP=User
ErrorAddEventToUserCP=An error occurred while adding the exceptional leave.
AddEventToUserOkCP=The addition of the exceptional leave has been completed.
-MenuLogCP=View logs of holidays
-LogCP=Log of updates of holidays
+MenuLogCP=View logs of leave requests
+LogCP=Log of updates of available vacation days
ActionByCP=Performed by
UserUpdateCP=For the user
PrevSoldeCP=Previous Balance
@@ -81,33 +81,33 @@ NewSoldeCP=New Balance
alreadyCPexist=A request for holidays has already been done on this period.
UserName=Name
Employee=Employee
-FirstDayOfHoliday=First day of holiday
-LastDayOfHoliday=Last day of holiday
+FirstDayOfHoliday=First day of vacation
+LastDayOfHoliday=Last day of vacation
HolidaysMonthlyUpdate=Monthly update
ManualUpdate=Manual update
-HolidaysCancelation=Holidays cancelation
+HolidaysCancelation=Leave request cancelation
## Configuration du Module ##
ConfCP=Configuration of holidays module
DescOptionCP=Description of the option
ValueOptionCP=Value
-GroupToValidateCP=Group with the ability to approve holidays
+GroupToValidateCP=Group with the ability to approve vacation
ConfirmConfigCP=Validate the configuration
-LastUpdateCP=Last updated automatically of holidays
+LastUpdateCP=Last automatic update of vacation
UpdateConfCPOK=Updated successfully.
ErrorUpdateConfCP=An error occurred during the update, please try again.
AddCPforUsers=Please add the balance of holidays of users by <a href="../define_holiday.php" style="font-weight: normal; color: red; text-decoration: underline;">clicking here</a>.
DelayForSubmitCP=Deadline to apply for holidays
AlertapprobatortorDelayCP=Prevent the approbator if the holiday request does not match the deadline
-AlertValidatorDelayCP=Préevent the approbator if the holiday request exceed delay
-AlertValidorSoldeCP=Prevent the approbator if the holiday request exceed the balance
-nbUserCP=Number of users supported in the module holidays
-nbHolidayDeductedCP=Number of holidays to be deducted per day of holiday taken
-nbHolidayEveryMonthCP=Number of holidays added every month
-Module27130Name= Management of holidays
-Module27130Desc= Management of holidays
-TitleOptionMainCP=Main settings of holidays
-TitleOptionEventCP=Settings of holidays related to events
+AlertValidatorDelayCP=Préevent the approbator if the leave request exceed delay
+AlertValidorSoldeCP=Prevent the approbator if the leave request exceed the balance
+nbUserCP=Number of users supported in the module Leaves
+nbHolidayDeductedCP=Number of holidays to be deducted per day of vacation taken
+nbHolidayEveryMonthCP=Number of vacation days added every month
+Module27130Name= Management of leave requests
+Module27130Desc= Management of leave requests
+TitleOptionMainCP=Main settings of Leave request
+TitleOptionEventCP=Settings of leave requets for events
ValidEventCP=Validate
UpdateEventCP=Update events
CreateEventCP=Create
@@ -127,23 +127,23 @@ UpdateEventOptionCP=Update
ErrorMailNotSend=An error occurred while sending email:
NoCPforMonth=No leave this month.
nbJours=Number days
-TitleAdminCP=Configuration of Holidays
+TitleAdminCP=Configuration of Leaves
#Messages
Hello=Hello
-HolidaysToValidate=Validate holidays
-HolidaysToValidateBody=Below is a request for holidays to validate
-HolidaysToValidateDelay=This request for holidays will take place within a period of less than %s days.
-HolidaysToValidateAlertSolde=The user who made this request for holidays do not have enough available days.
-HolidaysValidated=Validated holidays
-HolidaysValidatedBody=Your request for holidays for %s to %s has been validated.
-HolidaysRefused=Denied holidays
-HolidaysRefusedBody=Your request for holidays for %s to %s has been denied for the following reason :
-HolidaysCanceled=Canceled holidays
-HolidaysCanceledBody=Your request for holidays for %s to %s has been canceled.
-Permission20000=Read you own holidays
-Permission20001=Create/modify your holidays
-Permission20002=Create/modify holidays for everybody
-Permission20003=Delete holidays requests
-Permission20004=Setup users holidays
-Permission20005=Review log of modified holidays
-Permission20006=Read holidays monthly report
+HolidaysToValidate=Validate leave requests
+HolidaysToValidateBody=Below is a leave request to validate
+HolidaysToValidateDelay=This leave request will take place within a period of less than %s days.
+HolidaysToValidateAlertSolde=The user who made this leave reques do not have enough available days.
+HolidaysValidated=Validated leave requests
+HolidaysValidatedBody=Your leave request for %s to %s has been validated.
+HolidaysRefused=Request denied
+HolidaysRefusedBody=Your leave request for %s to %s has been denied for the following reason :
+HolidaysCanceled=Canceled leaved request
+HolidaysCanceledBody=Your leave request for %s to %s has been canceled.
+Permission20000=Read you own leave requests
+Permission20001=Create/modify your leave requests
+Permission20002=Create/modify leave requests for everybody
+Permission20003=Delete leave requests
+Permission20004=Setup users available vacation days
+Permission20005=Review log of modified leave requests
+Permission20006=Read leaves monthly report
diff --git a/htdocs/langs/en_US/projects.lang b/htdocs/langs/en_US/projects.lang
index 75bc4a29f5a8f12fb60668f0a0d26bbd727cb4a5..3e1ecea0be4852f316b62ea9a08aa556b9c9b65e 100644
--- a/htdocs/langs/en_US/projects.lang
+++ b/htdocs/langs/en_US/projects.lang
@@ -85,13 +85,13 @@ ActionsOnProject=Events on project
YouAreNotContactOfProject=You are not a contact of this private project
DeleteATimeSpent=Delete time spent
ConfirmDeleteATimeSpent=Are you sure you want to delete this time spent ?
-DoNotShowMyTasksOnly=See also tasks not allocated to me
-ShowMyTasksOnly=View only tasks allocated to me
+DoNotShowMyTasksOnly=See also tasks not assigned to me
+ShowMyTasksOnly=View only tasks assigned to me
TaskRessourceLinks=Ressources
ProjectsDedicatedToThisThirdParty=Projects dedicated to this third party
NoTasks=No tasks for this project
LinkedToAnotherCompany=Linked to other third party
-TaskIsNotAffectedToYou=Task not allocated to you
+TaskIsNotAffectedToYou=Task not assigned to you
ErrorTimeSpentIsEmpty=Time spent is empty
ThisWillAlsoRemoveTasks=This action will also delete all tasks of project (<b>%s</b> tasks at the moment) and all inputs of time spent.
IfNeedToUseOhterObjectKeepEmpty=If some objects (invoice, order, ...), belonging to another third party, must be linked to the project to create, keep this empty to have the project being multi third parties.
diff --git a/htdocs/langs/en_US/sendings.lang b/htdocs/langs/en_US/sendings.lang
index 170f5984c4dee8c0aa7ee82b63bb7959b3f6e426..2ae43f3976607147c1e8fc3a41898f572cee9868 100644
--- a/htdocs/langs/en_US/sendings.lang
+++ b/htdocs/langs/en_US/sendings.lang
@@ -72,3 +72,7 @@ DocumentModelTyphon=More complete document model for delivery receipts (logo...)
Error_EXPEDITION_ADDON_NUMBER_NotDefined=Constant EXPEDITION_ADDON_NUMBER not defined
SumOfProductVolumes=Sum of product volumes
SumOfProductWeights=Sum of product weights
+
+# warehouse details
+DetailWarehouseNumber= Warehouse details
+DetailWarehouseFormat= W:%s (Qty : %d)
diff --git a/htdocs/langs/en_US/suppliers.lang b/htdocs/langs/en_US/suppliers.lang
index fdc0787646a9061bcad63e87cf623881247addba..50502c15c7e2dceaece0c6a637b48a4608bbcf32 100644
--- a/htdocs/langs/en_US/suppliers.lang
+++ b/htdocs/langs/en_US/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Create supplier invoice
ListOfSupplierProductForSupplier=List of products and prices for supplier <b>%s</b>
NoneOrBatchFileNeverRan=None or batch <b>%s</b> not ran recently
SentToSuppliers=Sent to suppliers
+ListOfSupplierOrders=List of supplier orders
+MenuOrdersSupplierToBill=Supplier orders to invoice
\ No newline at end of file
diff --git a/htdocs/langs/et_EE/accountancy.lang b/htdocs/langs/et_EE/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/et_EE/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/eu_ES/accountancy.lang b/htdocs/langs/eu_ES/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/eu_ES/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/fa_IR/accountancy.lang b/htdocs/langs/fa_IR/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/fa_IR/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/fi_FI/accountancy.lang b/htdocs/langs/fi_FI/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/fi_FI/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/fr_FR/accountancy.lang b/htdocs/langs/fr_FR/accountancy.lang
index 352b39020964c9bb361ae1abbc5f93b47d699a39..939a3fde7d5e82dddd7857068e5ae78f4d6e79c8 100644
--- a/htdocs/langs/fr_FR/accountancy.lang
+++ b/htdocs/langs/fr_FR/accountancy.lang
@@ -1,33 +1,33 @@
-# Dolibarr language file - fr_FR - Accountancy
+# Dolibarr language file - en_US - Accounting Expert
CHARSET=UTF-8
Accounting=Comptabilité
-Globalparameters=Paramètres globaux
+Globalparameters=Paramètres globals
Chartofaccounts=Plan comptable
-Fiscalyear=Exercices fiscaux
+Fiscalyear=Années fiscales
Menuaccount=Comptes comptables
-Menuthirdpartyaccount=Comptes tiers
+Menuthirdpartyaccount=Comptes de tiers
MenuTools=Outils
ConfigAccountingExpert=Configuration du module comptabilité expert
Journaux=Journaux
-JournalFinancial=Journaux de trésorerie
+JournalFinancial=Journaux financiers
Exports=Exports
Modelcsv=Modèle d'export
-Selectmodelcsv=Sélectionnez un modèle d'export
-Modelcsv_normal=Export classique
+Selectmodelcsv=Sélectionner un modèle d'export
+Modelcsv_normal=Export standard
Modelcsv_CEGID=Export vers CEGID Expert
-BackToChartofaccounts=Retour plan comptable
-Back=Retour
+BackToChartofaccounts=Return chart of accounts
+Back=Return
Definechartofaccounts=Définir un plan comptable
-Selectchartofaccounts=Sélectionnez un plan comptable
+Selectchartofaccounts=Sélectionner un plan comptable
Validate=Valider
Addanaccount=Ajouter un compte comptable
AccountAccounting=Compte comptable
Ventilation=Ventilation
-ToDispatch=A effectuer
-Dispatched=Effectuée
+ToDispatch=A ventiler
+Dispatched=Ventilés
CustomersVentilation=Ventilation clients
SuppliersVentilation=Ventilation fournisseurs
@@ -36,123 +36,123 @@ Reports=Rapports
ByCustomerInvoice=Par factures clients
ByMonth=Par mois
NewAccount=Nouveau compte comptable
-Update=Mettre à jour
+Update=Modifier
List=Liste
Create=Créer
-UpdateAccount=Modification d'un compte
-UpdateMvts=Modification d'un mouvement
-WriteBookKeeping=Comptabiliser les écritures dans le grand livre
-Bookkeeping=Grand livre
-AccountBalanceByMonth=Balance mensuelle
+UpdateAccount=Modification de compte comptable
+UpdateMvts=Modification de mouvements
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Solde par mois
AccountingVentilation=Ventilation comptable
-AccountingVentilationSupplier=Ventilation comptable fournisseur
-AccountingVentilationCustomer=Ventilation comptable client
+AccountingVentilationSupplier=Ventilation comptable client
+AccountingVentilationCustomer=Ventilation comptable fournisseur
Line=Ligne
-CAHTF=Total achat fournisseur HT
-InvoiceLines=Lignes de facture à ventiler
-InvoiceLinesDone=Lignes de facture ventilées
-IntoAccount=Dans le compte comptable
+CAHTF=Total achats fournisseur HT
+InvoiceLines=Lignes de factures à ventiler
+InvoiceLinesDone=Lignes de factures ventilées
+IntoAccount=In the accounting account
-Ventilate=Ventiler
-VentilationAuto=Ventilation automatique
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
-Processing=Traitement en cours
-EndProcessing=Fin de traitement
-AnyLineVentilate=Aucune ligne à ventiler
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
SelectedLines=Lignes sélectionnées
-Lineofinvoice=Ligne de facture
-VentilatedinAccount=Ventilée avec succès dans le compte comptable
-NotVentilatedinAccount=Non ventilée dans le compte comptable
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
-ACCOUNTING_SEPARATORCSV=Séparateur CSV
+ACCOUNTINGEX_SEPARATORCSV=Séparateur de champ
-ACCOUNTING_LIMIT_LIST_VENTILATION=Nombre d'éléments à ventiler affichés par page (maximum conseillé : 50)
-ACCOUNTING_LIST_SORT_VENTILATION_TODO=Commencer le tri des pages de ventilation "A ventiler" par les éléments les plus récents
-ACCOUNTING_LIST_SORT_VENTILATION_DONE=Commencer le tri des pages de ventilation "Ventilées" par les éléments les plus récents
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
-AccountLength=Longueur des comptes comptables affichés dans Dolibarr
-AccountLengthDesc=Fonction permettant de simuler une longueur de compte comptable en remplaçant les espaces par le chiffre zéro. Cette fonction touche uniquement à l'affichage, elle ne modifie pas les comptes comptables enregistrés dans Dolibarr. Pour l'export, cette fonction est nécessaire pour être compatible avec certains logiciels.
-ACCOUNTING_LENGTH_GACCOUNT=Longueur des comptes généraux
-ACCOUNTING_LENGTH_AACCOUNT=Longueur des comptes tiers
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
-ACCOUNTING_SELL_JOURNAL=Journal des Ventes
-ACCOUNTING_PURCHASE_JOURNAL=Journal des Achats
-ACCOUNTING_BANK_JOURNAL=Journal de Banque
-ACCOUNTING_CASH_JOURNAL=Journal de Caisse
-ACCOUNTING_MISCELLANEOUS_JOURNAL=Journal des Opérations Diverses
-ACCOUNTING_SOCIAL_JOURNAL=Journal Social
+ACCOUNTINGEX_SELL_JOURNAL=Journal des ventes
+ACCOUNTINGEX_PURCHASE_JOURNAL=Journal des achats
+ACCOUNTINGEX_BANK_JOURNAL=Journal de banque
+ACCOUNTINGEX_CASH_JOURNAL=Journal de compte caisse
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Journal divers
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
-ACCOUNTING_ACCOUNT_TRANSFER_CASH=Compte de transfert espèce
-ACCOUNTING_ACCOUNT_SUSPENSE=Compte d'attente
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Compte de transfert
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Compte d'attente
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Compte comptable par défaut pour les produits achetés (si non défini dans la fiche produit)
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Compte comptable par défaut pour les produits vendus (si non défini dans la fiche produit)
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Compte comptable par défaut pour les services achetés (si non défini dans la fiche service)
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Compte comptable par défaut pour les services vendus (si non défini dans la fiche service)
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
-Doctype=Type de document
+Doctype=Type de documents
Docdate=Date
-Docref=Référence
+Docref=Reference
Numerocompte=Compte
Code_tiers=Tiers
-Labelcompte=Libellé compte
+Labelcompte=Label account
Debit=Débit
Credit=Crédit
Amount=Montant
Sens=Sens
Codejournal=Journal
-DelBookKeeping=Supprimer les écritures du grand livre
+DelBookKeeping=Delete the records of the general ledger
SellsJournal=Journal des ventes
PurchasesJournal=Journal des achats
DescSellsJournal=Journal des ventes
DescPurchasesJournal=Journal des achats
-BankJournal=Journal de banque
-DescBankJournal=Journal de banque comprenant tous les types de règlements autres que espèce
-CashJournal=Journal de caisse
-DescCashJournal=Journal de caisse comprenant le type de règlement "espèce"
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
-CashPayment=Règlement espèce
+CashPayment=Cash Payment
-SupplierInvoicePayment=Règlement de facture fournisseur
-CustomerInvoicePayment=Règlement de facture client
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
-ThirdPartyAccount=Compte tiers
+ThirdPartyAccount=Thirdparty account
-NewAccountingMvt=Nouveau mouvement
-NumMvts=Numéro de mouvement
-ListeMvts=Liste du mouvement
-ErrorDebitCredit=Debit et Credit ne peuvent avoir une valeur en même temps
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=Liste des mouvements
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
-ReportThirdParty=Liste compte tiers
-DescThirdPartyReport=Consultez ici la liste des tiers clients et fournisseurs et leurs codes comptables
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
-ListAccounts=Liste des comptes comptables
+ListAccounts=List of the accounting accounts
Pcgversion=Version du plan
Pcgtype=Classe de compte
-Pcgsubtype=Sous classe de compte
-Accountparent=Racine du compte
-Active=État
-
-NewFiscalYear=Nouvel exercice fiscal
-
-DescVentilCustomer=Consultez ici la ventilation comptable annuelle de vos factures clients
-TotalVente=Total chiffre affaires HT
-TotalMarge=Total marge commerciale
-DescVentilDoneCustomer=Consultez ici la liste des lignes de factures clients et leur compte comptable
-DescVentilTodoCustomer=Ventilez vos lignes de facture client avec un compte comptable
-ChangeAccount=Changer le compte comptable pour les lignes sélectionnées par le compte :
+Pcgsubtype=Under class of account
+Accountparent=Racine des comptes
+Active=Relevé
+
+NewFiscalYear=Nouvelle année fiscale
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
Vide=-
-DescVentilSupplier=Consultez ici la ventilation comptable annuelle de vos factures fournisseurs
-DescVentilTodoSupplier=Ventilez vos lignes de facture fournisseur avec un compte comptable
-DescVentilDoneSupplier=Consultez ici la liste des lignes de factures fournisseur et leur compte comptable
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
-ValidateHistory=Valider Automatiquement
+ValidateHistory=Validate Automatically
-ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas supprimer ce compte comptable car il est utilisé
+ErrorAccountancyCodeIsAlreadyUse=Erreur, vous ne pouvez pas détruire de compte comptable car il est utilisé
-FicheVentilation=Fiche ventilation
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/fr_FR/admin.lang b/htdocs/langs/fr_FR/admin.lang
index 0ea2d9d51f49b1c04faffbc39e3bc924311f1d6b..9f8cb56896e6fd3eccfae20050591eb3f430bc4e 100644
--- a/htdocs/langs/fr_FR/admin.lang
+++ b/htdocs/langs/fr_FR/admin.lang
@@ -45,8 +45,8 @@ ErrorModuleRequireDolibarrVersion=Erreur, ce module requiert une version %s ou s
ErrorDecimalLargerThanAreForbidden=Erreur, les précisions supérieures à <b>%s</b> ne sont pas prises en charge.
DictionarySetup=Dictionnaires
Dictionary=Dictionnaires
-Chartofaccounts=Chart of accounts
-Fiscalyear=Fiscal years
+Chartofaccounts=Plan comptable
+Fiscalyear=Année fiscale
ErrorReservedTypeSystemSystemAuto=Erreur, les valeurs 'system' et 'systemauto' sont réservées. Vous pouvez utiliser la valeur 'user' pour ajouter vos propres enregistrements
ErrorCodeCantContainZero=Erreur, le code ne peut contenir la valeur 0
DisableJavascript=Désactive les fonctions Javascript et Ajax (Recommandé pour les personnes aveugles ou navigateurs text).
@@ -584,6 +584,9 @@ Permission92=Créer/modifier les charges et la TVA
Permission93=Supprimer les charges et la TVA
Permission94=Exporter les charges
Permission95=Consulter CA, bilans et résultats
+Permission96=Paramétrer la ventilation
+Permission97=Lire les lignes de factures
+Permission98=Ventiler les lignes de factures
Permission101=Consulter les expéditions
Permission102=Créer/modifier les expéditions
Permission104=Valider les expéditions
diff --git a/htdocs/langs/fr_FR/orders.lang b/htdocs/langs/fr_FR/orders.lang
index 5811bf3d940f607e243e73ff9240bfe4ee3a8018..a94bd8fff720e892a0207b83f8f0d8c3fcdd0b1e 100644
--- a/htdocs/langs/fr_FR/orders.lang
+++ b/htdocs/langs/fr_FR/orders.lang
@@ -55,7 +55,7 @@ DraftOrWaitingShipped=Brouillon ou validée pas encore expédiée
MenuOrdersToBill=Commandes délivrées
MenuOrdersToBill2=Commandes à facturer
SearchOrder=Rechercher une commande
-SearchACustomerOrder=Rechercher code client
+SearchACustomerOrder=Rechercher une commande client
ShipProduct=Expédier produit
Discount=Remise
CreateOrder=Créer Commande
@@ -101,7 +101,6 @@ RelatedOrders=Commandes rattachées
OnProcessOrders=Commandes en cours de traitement
RefOrder=Réf. commande
RefCustomerOrder=Réf. commande client
-CustomerOrder=Commande client
RefCustomerOrderShort=Réf. com. client
SendOrderByMail=Envoyer commande par mail
ActionsOnOrder=Événements sur la commande
@@ -132,8 +131,6 @@ Error_COMMANDE_ADDON_NotDefined=Constante COMMANDE_ADDON non définie
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Échec chargement du fichier module '%s'
Error_FailedToLoad_COMMANDE_ADDON_File=Échec chargement du fichier module '%s'
Error_OrderNotChecked=Pas de commandes à facturer sélectionnées
-
-
# Sources
OrderSource0=Proposition commerciale
OrderSource1=Internet
@@ -144,7 +141,6 @@ OrderSource5=Commercial
OrderSource6=Magasin
QtyOrdered=Qté commandée
AddDeliveryCostLine=Ajouter une ligne de frais port indiquant le poids de la commande
-
# Documents models
PDFEinsteinDescription=Modèle de commande complet (logo…)
PDFEdisonDescription=Modèle de commande simple
@@ -155,7 +151,6 @@ OrderByFax=Fax
OrderByEMail=Email
OrderByWWW=En ligne
OrderByPhone=Téléphone
-
CreateInvoiceForThisCustomer=Facturer commandes
NoOrdersToInvoice=Pas de commandes facturables
CloseProcessedOrdersAutomatically=Classer automatiquement à "Traitées" les commandes sélectionnées.
diff --git a/htdocs/langs/fr_FR/suppliers.lang b/htdocs/langs/fr_FR/suppliers.lang
index 8e0f3475db48ddfe7ab769b55f32c13c256d1c83..f558b0779ea84e5f0285f0502216197512055fdf 100644
--- a/htdocs/langs/fr_FR/suppliers.lang
+++ b/htdocs/langs/fr_FR/suppliers.lang
@@ -40,3 +40,5 @@ AddSupplierInvoice=Créer facture fournisseur
ListOfSupplierProductForSupplier=Liste des produits et prix du fournisseurs <b>%s</b>
NoneOrBatchFileNeverRan=Aucun ou traitement par lot <b>%s</b> non exécuté récemment
SentToSuppliers=Envoyés aux fournisseurs
+ListOfSupplierOrders=Liste des commandes fournisseur
+MenuOrdersSupplierToBill=Commandes fournisseur à facturer
\ No newline at end of file
diff --git a/htdocs/langs/he_IL/accountancy.lang b/htdocs/langs/he_IL/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/he_IL/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/hr_HR/accountancy.lang b/htdocs/langs/hr_HR/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/hr_HR/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/hr_HR/bills.lang b/htdocs/langs/hr_HR/bills.lang
index c2ee988b96e7baf4077b3205ad2ad4546cfb18f5..521638dc63277986f3e4446ee63e2df5889d91c4 100644
--- a/htdocs/langs/hr_HR/bills.lang
+++ b/htdocs/langs/hr_HR/bills.lang
@@ -85,7 +85,7 @@ ClassifyPaid=Označi kao plaćeno
ClassifyPaidPartially=Označi kao djelomično plaćeno
ClassifyCanceled=Označi kao napušteno
ClassifyClosed=Označi kao zatvoreno
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Klasificirati 'nefakturirano'
CreateBill=Izradi račun
AddBill=Dodaj račun ili bonifikaciju
AddToDraftInvoices=Dodati u skice računa
@@ -163,7 +163,7 @@ ConfirmClassifyPaidPartiallyReasonBadCustomer=Loš kupac
ConfirmClassifyPaidPartiallyReasonProductReturned=Proizvod djelomično vraćen
ConfirmClassifyPaidPartiallyReasonOther=Iznos otpisan iz drugih razloga
ConfirmClassifyPaidPartiallyReasonDiscountNoVatDesc=This choice is possible if your invoice have been provided with suitable comment. (Example «Only the tax corresponding to the price that have been actually paid gives rights to deduction»)
-ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=In some countries, this choice might be possible only if your invoice contains correct note.
+ConfirmClassifyPaidPartiallyReasonDiscountVatDesc=U nekim zemljama, taj izbor može biti moguć samo ako vaš račun sadrži ispravne bilješke.
ConfirmClassifyPaidPartiallyReasonAvoirDesc=Koristi ovaj izbor ako ni jedan drugi nije odgovarajući
ConfirmClassifyPaidPartiallyReasonBadCustomerDesc=<b>Loš kupac</b> je kupac koji odbija platit svoj dug.
ConfirmClassifyPaidPartiallyReasonProductReturnedDesc=Ovaj izbor se koristi kada plaćanje nije kompletno zato jer je neki od proizvoda vraćen.
@@ -198,8 +198,8 @@ Rest=U toku
AmountExpected=Utvrđen iznos
ExcessReceived=Previše primljeno
EscompteOffered=Ponuđen je popust (za plaćanje prije dospijeća)
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
+SendBillRef=Podnošenje računa %s
+SendReminderBillRef=Podnošenje Računa %s (podsjetnik)
StandingOrders=Otvorene narudžbe
StandingOrder=Otvorene narudžbe
NoDraftBills=Nema skica računa
@@ -232,7 +232,7 @@ Repeatables=Predložak
ChangeIntoRepeatableInvoice=Pretvori u predložak
CreateRepeatableInvoice=Izradi predložak računa
CreateFromRepeatableInvoice=Izradi iz predloška računa
-CustomersInvoicesAndInvoiceLines=Customer invoices and invoice's lines
+CustomersInvoicesAndInvoiceLines=Računi klijenata i redovi računa
CustomersInvoicesAndPayments=Računi i plaćanja kupca
ExportDataset_invoice_1=Računi kupca i popis računa
ExportDataset_invoice_2=Računi i plaćanja kupca
@@ -369,7 +369,7 @@ LawApplicationPart4=njihove cijene.
LimitedLiabilityCompanyCapital=SARL with Capital of
UseLine=Primjeni
UseDiscount=Iskoriti popust
-UseCredit=Use credit
+UseCredit=Koristite kredit
UseCreditNoteInInvoicePayment=Reduce amount to pay with this credit
MenuChequeDeposits=Checks deposits
MenuCheques=Čekovi
diff --git a/htdocs/langs/hr_HR/boxes.lang b/htdocs/langs/hr_HR/boxes.lang
index 0596d677c46adab8e5dc814db12a408394f9bc5c..d67c219ddc91ebb2c83b744b283b2420f3febc6e 100644
--- a/htdocs/langs/hr_HR/boxes.lang
+++ b/htdocs/langs/hr_HR/boxes.lang
@@ -1,91 +1,91 @@
# Dolibarr language file - Source file is en_US - boxes
-# BoxLastRssInfos=Rss information
-# BoxLastProducts=Last %s products/services
-# BoxProductsAlertStock=Products in stock alert
-# BoxLastProductsInContract=Last %s contracted products/services
-# BoxLastSupplierBills=Last supplier's invoices
-# BoxLastCustomerBills=Last customer's invoices
-# BoxOldestUnpaidCustomerBills=Oldest unpaid customer's invoices
-# BoxOldestUnpaidSupplierBills=Oldest unpaid supplier's invoices
-# BoxLastProposals=Last commercial proposals
-# BoxLastProspects=Last modified prospects
-# BoxLastCustomers=Last modified customers
-# BoxLastSuppliers=Last modified suppliers
-# BoxLastCustomerOrders=Last customer orders
-# BoxLastBooks=Last books
-# BoxLastActions=Last actions
-# BoxLastContracts=Last contracts
-# BoxLastContacts=Last contacts/addresses
-# BoxLastMembers=Last members
-# BoxFicheInter=Last interventions
-# BoxCurrentAccounts=Opened accounts balance
-# BoxSalesTurnover=Sales turnover
-# BoxTotalUnpaidCustomerBills=Total unpaid customer's invoices
-# BoxTotalUnpaidSuppliersBills=Total unpaid supplier's invoices
-# BoxTitleLastBooks=Last %s recorded books
-# BoxTitleNbOfCustomers=Number of clients
-# BoxTitleLastRssInfos=Last %s news from %s
-# BoxTitleLastProducts=Last %s modified products/services
-# BoxTitleProductsAlertStock=Products in stock alert
-# BoxTitleLastCustomerOrders=Last %s modified customer orders
-# BoxTitleLastSuppliers=Last %s recorded suppliers
-# BoxTitleLastCustomers=Last %s recorded customers
-# BoxTitleLastModifiedSuppliers=Last %s modified suppliers
-# BoxTitleLastModifiedCustomers=Last %s modified customers
-# BoxTitleLastCustomersOrProspects=Last %s modified customers or prospects
-# BoxTitleLastPropals=Last %s recorded proposals
-# BoxTitleLastCustomerBills=Last %s customer's invoices
-# BoxTitleLastSupplierBills=Last %s supplier's invoices
-# BoxTitleLastProspects=Last %s recorded prospects
-# BoxTitleLastModifiedProspects=Last %s modified prospects
-# BoxTitleLastProductsInContract=Last %s products/services in a contract
-# BoxTitleLastModifiedMembers=Last %s modified members
-# BoxTitleLastFicheInter=Last %s modified intervention
-# BoxTitleOldestUnpaidCustomerBills=Oldest %s unpaid customer's invoices
-# BoxTitleOldestUnpaidSupplierBills=Oldest %s unpaid supplier's invoices
-# BoxTitleCurrentAccounts=Opened account's balances
-# BoxTitleSalesTurnover=Sales turnover
-# 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
-# BoxGlobalActivity=Global activity (invoices, proposals, orders)
-# 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
-# NoActionsToDo=No actions to do
-# NoRecordedOrders=No recorded customer's orders
-# NoRecordedProposals=No recorded proposals
-# NoRecordedInvoices=No recorded customer's invoices
-# NoUnpaidCustomerBills=No unpaid customer's invoices
-# NoRecordedSupplierInvoices=No recorded supplier's invoices
-# NoUnpaidSupplierBills=No unpaid supplier's invoices
-# NoModifiedSupplierBills=No recorded supplier's invoices
-# NoRecordedProducts=No recorded products/services
-# NoRecordedProspects=No recorded prospects
-# NoContractedProducts=No products/services contracted
-# NoRecordedContracts=No recorded contracts
-# NoRecordedInterventions=No recorded interventions
-# BoxLatestSupplierOrders=Latest supplier orders
-# BoxTitleLatestSupplierOrders=%s latest supplier orders
-# NoSupplierOrder=No recorded supplier order
-# BoxCustomersInvoicesPerMonth=Customer invoices per month
-# BoxSuppliersInvoicesPerMonth=Supplier invoices per month
-# BoxCustomersOrdersPerMonth=Customer orders per month
-# BoxSuppliersOrdersPerMonth=Supplier orders per month
-# BoxProposalsPerMonth=Proposals per month
-# NoTooLowStockProducts=No product under the low stock limit
-# BoxProductDistribution=Products/Services distribution
-# BoxProductDistributionFor=Distribution of %s for %s
-# ForCustomersInvoices=Customers invoices
-# ForCustomersOrders=Customers orders
-# ForProposals=Proposals
+BoxLastRssInfos=RSS Informacije
+BoxLastProducts=Zadnjih %s proizvoda / usluga
+BoxProductsAlertStock=Proizvodi u skaldištu - uzbuna
+BoxLastProductsInContract=Zadnjih %s ugovorenih proizvoda / usluga
+BoxLastSupplierBills=Posljednji računi od dobavljača
+BoxLastCustomerBills=Posljednji računi od kupaca
+BoxOldestUnpaidCustomerBills=Najstariji neplaćeni računi kupaca
+BoxOldestUnpaidSupplierBills=Najstariji neplaćeni računi dobavljača
+BoxLastProposals=Najnovije ponude
+BoxLastProspects=Posljednji izmijenjeni potencijalni kupci
+BoxLastCustomers=Posljednji izmijenjeni kupci
+BoxLastSuppliers=Posljednji izmijenjeni dobavljači
+BoxLastCustomerOrders=Najnovije narudžbe kupaca
+BoxLastBooks=Najnovije knjige
+BoxLastActions=Najnovije aktivnosti
+BoxLastContracts=Najnoviji ugovori
+BoxLastContacts=Najnoviji kontakti / Adrese
+BoxLastMembers=Najnoviji članovi
+BoxFicheInter=Najnovije intervencije
+BoxCurrentAccounts=Stanje otvorenih računa
+BoxSalesTurnover=Promet
+BoxTotalUnpaidCustomerBills=Ukupni neplaćeni računi kupaca
+BoxTotalUnpaidSuppliersBills=Ukupni neplaćeni računi dobavljača
+BoxTitleLastBooks=Posljednjih %s spremljenih knjige
+BoxTitleNbOfCustomers=Broj klijenata
+BoxTitleLastRssInfos=Posljednjih %s vijesti iz %s
+BoxTitleLastProducts=Posljednjih %s izmijenjenih proizvoda / usluga
+BoxTitleProductsAlertStock=Proizvodi u skladištu - uzbuna
+BoxTitleLastCustomerOrders=Posljdnjih %s izmijenjenih narudžba kupaca
+BoxTitleLastSuppliers=Prošlogodišnjih %s spremljenih dobavljača
+BoxTitleLastCustomers=Posljednjih %s spremljenih kupaca
+BoxTitleLastModifiedSuppliers=Posljednjih %s izmijenjenih dobavljača
+BoxTitleLastModifiedCustomers=Posljednjih %s izmijenjenih kupaca
+BoxTitleLastCustomersOrProspects=Posljednjih %s izmijenjenih kupaca ili potencijalnih kupaca
+BoxTitleLastPropals=Posljednjih %s spremljenih ponuda
+BoxTitleLastCustomerBills=Posljednjih %s računi kupaca
+BoxTitleLastSupplierBills=Posljednjih %s računi dobavljača
+BoxTitleLastProspects=Posljednjih %s spremljenih potencijalnih kupaca
+BoxTitleLastModifiedProspects=Posljednjih %s izmijenjenih potencijalnih kupaca
+BoxTitleLastProductsInContract=Posljednjih %s proizvoda / usluga u ugovorima
+BoxTitleLastModifiedMembers=Prošlogodišnji% s modificirani članovi
+BoxTitleLastFicheInter=Prošlogodišnji% s modificirani intervencija
+BoxTitleOldestUnpaidCustomerBills=Najstariji% s neplaćene račune kupca
+BoxTitleOldestUnpaidSupplierBills=Najstariji% s neplaćene račune dobavljača
+BoxTitleCurrentAccounts=Stanja otvorila korisničkog računa
+BoxTitleSalesTurnover=Promet
+BoxTitleTotalUnpaidCustomerBills=Neplaćeni računi kupca
+BoxTitleTotalUnpaidSuppliersBills=Neplaćeni računi dobavljača
+BoxTitleLastModifiedContacts=Prošlogodišnji% s modificirani kontakti / Adrese
+BoxMyLastBookmarks=Moja posljednja% s oznake
+BoxOldestExpiredServices=Najstariji aktivni istekli usluge
+BoxLastExpiredServices=Prošlogodišnji% s Najstariji kontakti s aktivnim istekao usluge
+BoxTitleLastActionsToDo=Prošlogodišnji% s akcije učiniti
+BoxTitleLastContracts=Prošlogodišnji% s ugovorima
+BoxTitleLastModifiedDonations=Prošlogodišnji% s modificirani donacije
+BoxTitleLastModifiedExpenses=Prošlogodišnji% s modificirani rashodi
+BoxGlobalActivity=Globalna aktivnost (računi, prijedlozi, nalozi)
+FailedToRefreshDataInfoNotUpToDate=Nisam uspio osvježiti RSS tok. Zadnja uspješna datum osvježavanja:% s
+LastRefreshDate=Posljednji dan osvježavanja
+NoRecordedBookmarks=Nema oznaka definirana.
+ClickToAdd=Kliknite ovdje za dodavanje.
+NoRecordedCustomers=Nema snimljene kupci
+NoRecordedContacts=Nema snimljene kontakti
+NoActionsToDo=Nema akcije učiniti
+NoRecordedOrders=Nema zabilježenih kupca narudžbe
+NoRecordedProposals=Nema snimljene prijedlozi
+NoRecordedInvoices=Nema zabilježenih kupca račune
+NoUnpaidCustomerBills=Ne neplaćene račune kupca
+NoRecordedSupplierInvoices=Nema zabilježenih dobavljača računi
+NoUnpaidSupplierBills=Ne neplaćene račune dobavljača
+NoModifiedSupplierBills=Nema zabilježenih dobavljača računi
+NoRecordedProducts=Nema zabilježenih proizvodi / usluge
+NoRecordedProspects=Nema snimljene perspektive
+NoContractedProducts=Nema proizvoda / usluge ugovorene
+NoRecordedContracts=Nema snimljene ugovori
+NoRecordedInterventions=Nema zabilježenih intervencija
+BoxLatestSupplierOrders=Najnoviji dobavljač narudžbe
+BoxTitleLatestSupplierOrders=% s najnovijim narudžbe dobavljačima
+NoSupplierOrder=Ne bilježi dobavljač bi
+BoxCustomersInvoicesPerMonth=Korisnički računi mjesečno
+BoxSuppliersInvoicesPerMonth=Dobavljač računi mjesečno
+BoxCustomersOrdersPerMonth=Korisnički nalozi mjesečno
+BoxSuppliersOrdersPerMonth=Dobavljač naloga mjesečno
+BoxProposalsPerMonth=Prijedlozi mjesečno
+NoTooLowStockProducts=Nema proizvoda pod niskim granice dionica
+BoxProductDistribution=Proizvodi / usluge distribucije
+BoxProductDistributionFor=Raspodjela% s za% s
+ForCustomersInvoices=Kupci računi
+ForCustomersOrders=Kupci narudžbe
+ForProposals=Prijedlozi
diff --git a/htdocs/langs/hr_HR/companies.lang b/htdocs/langs/hr_HR/companies.lang
index ffb3fc0f52283a17b3be4af723de1db9e3530c0f..de79a067d153acb52f5d100391d029ee58fdb718 100644
--- a/htdocs/langs/hr_HR/companies.lang
+++ b/htdocs/langs/hr_HR/companies.lang
@@ -26,7 +26,7 @@ IdCompany=Id kompanije
IdContact=Id kontakta
Contacts=Kontakti/Adrese
ThirdPartyContacts=Kontakti treće stranke
-ThirdPartyContact=Third party contact/address
+ThirdPartyContact=Stranka kontakt / adresa
StatusContactValidated=Status of contact/address
Company=Kompanija
CompanyName=Ime kompanije
diff --git a/htdocs/langs/hr_HR/languages.lang b/htdocs/langs/hr_HR/languages.lang
index 685db01debc9717568c44030a299e98e89b99b57..7c63d8971c4b55a89c6f66fb45ea5bec30b66dc0 100644
--- a/htdocs/langs/hr_HR/languages.lang
+++ b/htdocs/langs/hr_HR/languages.lang
@@ -10,7 +10,7 @@ Language_da_DA=Danski
Language_da_DK=Danski
Language_de_DE=Njemački
Language_de_AT=Njemački (Austrija)
-Language_de_CH=German (Switzerland)
+Language_de_CH=Njemački (Švicarska)
Language_el_GR=Grčki
Language_en_AU=Engleski (Australija)
Language_en_GB=Engleski (United Kingdom)
@@ -20,7 +20,7 @@ Language_en_SA=Engleski (Saudijska Arabija)
Language_en_US=Engleski (United States)
Language_en_ZA=Engleski (Južna Afrika)
Language_es_ES=Španjolski
-Language_es_DO=Spanish (Dominican Republic)
+Language_es_DO=Španjolski (Dominikanska Republika)
Language_es_AR=Španjolski (Argentina)
Language_es_CL=Španjolski (Čile)
Language_es_HN=Španjolski (Honduras)
@@ -40,7 +40,7 @@ Language_fr_NC=Francuski (Nova Kaledonija)
Language_he_IL=Hebrew
Language_hr_HR=Hrvatski
Language_hu_HU=Mađarski
-Language_id_ID=Indonesian
+Language_id_ID=Indonezijski
Language_is_IS=Islandski
Language_it_IT=Talijanski
Language_ja_JP=Japanski
diff --git a/htdocs/langs/hu_HU/accountancy.lang b/htdocs/langs/hu_HU/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/hu_HU/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/id_ID/accountancy.lang b/htdocs/langs/id_ID/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/id_ID/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/is_IS/accountancy.lang b/htdocs/langs/is_IS/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/is_IS/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/it_IT/accountancy.lang b/htdocs/langs/it_IT/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..3c1337696d8a131d4b299458704012397457e6e6
--- /dev/null
+++ b/htdocs/langs/it_IT/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Contabilità avanzata
+Globalparameters=Parametri globali
+Chartofaccounts=Lista degli account
+Fiscalyear=Anni fiscali
+Menuaccount=Account contabilità
+Menuthirdpartyaccount=Account terze parti
+MenuTools=Strumenti
+
+ConfigAccountingExpert=Configurazione del modulo contabilità esperta
+Journaux=Giornali
+JournalFinancial=Giornali finanziari
+Exports=Esportazioni
+Modelcsv=Modello di esportazione
+Selectmodelcsv=Seleziona un modello di esportazione
+Modelcsv_normal=Esportazione classica
+Modelcsv_CEGID=Esporta tramite CEGID Esperto
+BackToChartofaccounts=Ritorna alla lista dell'account
+Back=Indietro
+
+Definechartofaccounts=Definisci una lista degli account
+Selectchartofaccounts=Seleziona una lista degli account
+Validate=Convalida
+Addanaccount=Aggiungi un account di contabilità
+AccountAccounting=Account di contabilità
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Report
+ByCustomerInvoice=Per fatture clienti
+ByMonth=Per mese
+NewAccount=Nuovo account di contabilità
+Update=Aggiorna
+List=Elenco
+Create=Crea
+UpdateAccount=Modifica di un account di contabilità
+UpdateMvts=Modifica di un movimento
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Data
+Docref=Riferimento
+Numerocompte=Account
+Code_tiers=Terza parte
+Labelcompte=Etichetta account
+Debit=Debito
+Credit=Credito
+Amount=Importo
+Sens=Sens
+Codejournal=Giornale
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Giornale di vendita
+PurchasesJournal=Giornale acquisti
+DescSellsJournal=Giornale di vendita
+DescPurchasesJournal=Giornale acquisti
+BankJournal=Giornale bancario
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/ja_JP/accountancy.lang b/htdocs/langs/ja_JP/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/ja_JP/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/ko_KR/accountancy.lang b/htdocs/langs/ko_KR/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/ko_KR/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/lt_LT/accountancy.lang b/htdocs/langs/lt_LT/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/lt_LT/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/lv_LV/accountancy.lang b/htdocs/langs/lv_LV/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..cbe133b742f7b180162485f354107e9ce937a2d9
--- /dev/null
+++ b/htdocs/langs/lv_LV/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Globālie iestatījumi
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiskālie gadi
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Trešo personu komti
+MenuTools=Rīki
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Žurnāli
+JournalFinancial=Financial journals
+Exports=Eksports
+Modelcsv=Eksporta modulis
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Klasiskais eksports
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=Jānosūta
+Dispatched=Nosūtīts
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Atskaites
+ByCustomerInvoice=By invoices customers
+ByMonth=Šķirot pēc mēneša
+NewAccount=New accounting account
+Update=Atjaunot
+List=Saraksts
+Create=Izveidot
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=Virsgrāmata
+AccountBalanceByMonth=Konta bilance pa mēnešiem
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Apstrādā
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Pārdošanas žurnāls
+ACCOUNTINGEX_PURCHASE_JOURNAL=Pirkumu žurnāls
+ACCOUNTINGEX_BANK_JOURNAL=Bankas žurnāls
+ACCOUNTINGEX_CASH_JOURNAL=Skaidras naudas žurnāls
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Dokumenta veids
+Docdate=Datums
+Docref=Atsauce
+Numerocompte=Konts
+Code_tiers=Trešās personas
+Labelcompte=Konta nosaukums
+Debit=Debets
+Credit=Kredīts
+Amount=Apjoms
+Sens=Sens
+Codejournal=Žurnāls
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Pārdošanas žurnāls
+PurchasesJournal=Iepirkumu žurnāls
+DescSellsJournal=Pārdošanas žurnāls
+DescPurchasesJournal=Pirkumu žurnāls
+BankJournal=Bankas žurnāls
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Skaidras naudas žurnāls
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Trešās personas konts
+
+NewAccountingMvt=Jauna pārvietošana
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Plāna versija
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=Jaauns fiskālais gads
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/lv_LV/admin.lang b/htdocs/langs/lv_LV/admin.lang
index c839e869079ceda1708f81295bbb3a5067d14e6c..16c4d2dd35b514d4ddab66179d3bab84d638d253 100644
--- a/htdocs/langs/lv_LV/admin.lang
+++ b/htdocs/langs/lv_LV/admin.lang
@@ -3,7 +3,7 @@ Foundation=Organizācija
Version=Versija
VersionProgram=Programmas versija
VersionLastInstall=Sākotnējā instalētā versija
-VersionLastUpgrade=Jaunākajai jauninājums
+VersionLastUpgrade=Pēdējo reizi versija atjaunijnāta
VersionExperimental=Eksperimentāls
VersionDevelopment=Attīstība
VersionUnknown=Nezināms
@@ -35,7 +35,7 @@ ExternalUsers=Ārējie lietotāji
GlobalSetup=Globālie iestatījumi
GUISetup=Attēlojums
SetupArea=Iestatījumi
-FormToTestFileUploadForm=Veidlapa, lai pārbaudītu failu augšupielādes (pēc uzstādīšanas)
+FormToTestFileUploadForm=Forma, lai pārbaudītu failu augšupielādi (pēc uiestatītajiem parametriem)
IfModuleEnabled=Piezīme: jā, ir efektīva tikai tad, ja modulis <b>%s</b> ir iespējots
RemoveLock=Dzēst failu <b>%s</b>, ja tāds ir, lai varētu izmantošanu atjaunināšanas rīku.
RestoreLock=Atjaunot failu <b>%s</b> ar lasīšanas tiesībām tikai, lai bloķētu atjaunošanas rīka izmantošanu.
@@ -45,6 +45,8 @@ ErrorModuleRequireDolibarrVersion=Kļūda, šim modulim nepieciešama Dolibarr v
ErrorDecimalLargerThanAreForbidden=Kļūda, precizitāte augstāka nekā <b>%s</b> netiek atbalstīta.
DictionarySetup=Vārdnīcas iestatījumi
Dictionary=Vārdnīcas
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiskālais gads
ErrorReservedTypeSystemSystemAuto=Vērtību "sistēma" un "systemauto" veida tiek aizsargātas. Jūs varat izmantot "lietotājs", kā vērtība, lai pievienotu savu ierakstu
ErrorCodeCantContainZero=Kods nevar saturēt 0 vērtību
DisableJavascript=Disable JavaScript and Ajax functions (Recommended for blind person or text browsers)
@@ -354,7 +356,7 @@ HideDetailsOnPDF=Paslēpt produktu līnijas informāciju izveidotajā PDF
Library=Bibliotēka
UrlGenerationParameters=Parametri, lai nodrošinātu drošas saites
SecurityTokenIsUnique=Izmantojiet unikālu securekey parametrs katram URL
-EnterRefToBuildUrl=Ievadiet atsauce objektu %s
+EnterRefToBuildUrl=Ievadiet atsauci objektam %s
GetSecuredUrl=Saņemt aprēķināto URL
ButtonHideUnauthorized=Slēpt pogas, lai neatļautu rīcību, nevis rāda invalīdu pogas
OldVATRates=Vecā PVN likme
@@ -405,7 +407,7 @@ NoRecordWithoutBarcodeDefined=No record with no barcode value defined.
Module0Name=Lietotāji un grupas
Module0Desc=Lietotāju un grupu vadība
Module1Name=Trešās personas
-Module1Desc=Uzņēmumi un kontaktinformācija vadība (klientu, perspektīvas ...)
+Module1Desc=Uzņēmumu un kontaktinformācijas vadība (klientu, perspektīvu ...)
Module2Name=Tirdzniecība
Module2Desc=Komerciālā pārvaldība
Module10Name=Grāmatvedība
@@ -534,7 +536,7 @@ Module55000Desc=Module to make online polls (like Doodle, Studs, Rdvz, ...)
Module59000Name=Malas
Module59000Desc=Moduli, lai pārvaldītu peļņu
Module60000Name=Komisijas
-Module60000Desc=Moduli, lai pārvaldītu komisijas
+Module60000Desc=Modulis lai pārvaldītu komisijas
Module150010Name=Batch number, eat-by date and sell-by date
Module150010Desc=batch number, eat-by date and sell-by date management for product
Permission11=Lasīt klientu rēķinus
@@ -582,6 +584,9 @@ Permission92=Izveidot/labot sociālās iemaksas un PVN
Permission93=Dzēst sociālās iemaksas un PVN
Permission94=Eksportēt sociālās iemaksas
Permission95=Lasīt atskaites
+Permission96=Nosūtīšanas iestatīšana
+Permission97=Lasīt rēķina grāmatvedību nosūtīšana
+Permission98=Nosūtīšanas rēķinu grāmatvedības līnijas
Permission101=Lasīt sūtījumus
Permission102=Izveidot/mainīt sūtījumus
Permission104=Apstiprināt sūtījumus
@@ -672,7 +677,7 @@ Permission300=Lasīt svītrkodus
Permission301=Izveidot / mainīt svītrkodus
Permission302=Dzēst svītrkodus
Permission311=Lasīt pakalpojumus
-Permission312=Piešķirt pakalpojumu līgumu
+Permission312=Piešķirt pakalpojumu līgumam
Permission331=Lasīt grāmatzīmes
Permission332=Izveidot/mainīt grāmatzīmes
Permission333=Dzēst grāmatzīmes
@@ -718,7 +723,7 @@ Permission1185=Apstiprināt piegādātājq pasūtījumus
Permission1186=Pasūtīt piegādātāja pasūtījumus
Permission1187=Saņemšanu piegādātāju pasūtījumu
Permission1188=Dzēst piegādātāju pasūtījumus
-Permission1201=Saņemt rezultātu eksportu
+Permission1201=Saņemt eksportēšanas rezultātu
Permission1202=Izveidot/Modificēt eksportu
Permission1231=Lasīt piegādātāja rēķinus
Permission1232=Izveidot/mainīt piegādātāja rēķinus
@@ -730,11 +735,11 @@ Permission1237=Eksporta piegādātāju pasūtījumus un to detaļas
Permission1251=Palaist masveida importu ārējiem datiem datu bāzē (datu ielāde)
Permission1321=Eksporta klientu rēķinus, atribūti un maksājumus
Permission1421=Eksporta klientu pasūtījumus un atribūti
-Permission23001 = Lasīt Plānotais uzdevumu
-Permission23002 = Izveidot / atjaunināt Plānotais uzdevumu
+Permission23001 = Skatīt plānoto uzdevumu
+Permission23002 = Izveidot/atjaunināt plānoto uzdevumu
Permission23003 = Dzēst plānoto uzdevumu
Permission23004 = Izpildīt plānoto uzdevumu
-Permission2401=Lasīt darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu
+Permission2401=SKatīt darbības (pasākumi vai uzdevumi), kas saistīti ar kontu
Permission2402=Izveidot / mainīt darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu
Permission2403=Dzēst darbības (pasākumi vai uzdevumi), kas saistīti ar viņa kontu
Permission2411=Lasīt darbības (pasākumi vai uzdevumi) par citiem
@@ -785,7 +790,7 @@ BackToDictionaryList=Atpakaļ uz vārdnīcu sarakstu
VATReceivedOnly=Īpaša likme nav jāmaksā
VATManagement=PVN Vadība
VATIsUsedDesc=PVN likme pēc noklusējuma, veidojot izredzes, rēķini, rīkojumi uc sekot aktīvo standarta noteikums: <br> Ja pārdevējs nav pakļauta PVN, tad PVN pēc noklusējuma = 0. Beigas varu. <br> Ja (pārdošanas valstij = pērkot valsti), tad pēc noklusējuma PVN = PVN no produkta pārdošanas valstī. Beigas varu. <br> Ja pārdevējs un pircējs Eiropas Kopienā, un preces ir transporta līdzekļi (auto, kuģis, lidmašīna), noklusējuma PVN = 0 (PVN būtu jāmaksā pircējam pie customoffice savas valsts, nevis pārdevējs). Beigas varu. <br> Ja pārdevējs un pircējs Eiropas Kopienas un pircējs nav uzņēmums, tad PVN pēc noklusējuma = PVN no pārdotā produkta. Beigas varu. <br> Ja pārdevējs un pircējs Eiropas Kopienas un pircējs ir uzņēmums, tad PVN pēc noklusējuma = 0. Beigas varu. <br> Else ierosinātā noklusējuma PVN = 0. Beigas varu.
-VATIsNotUsedDesc=Pēc noklusējuma piedāvātais PVN ir 0, ko var izmantot gadījumos, piemēram, asociācijām, cilvēki ou mazos uzņēmumus.
+VATIsNotUsedDesc=Pēc noklusējuma piedāvātais PVN ir 0, ko var izmantot gadījumos, piemēram, asociācijās, idnividuālie komersanti.
VATIsUsedExampleFR=Francijā, tas nozīmē, uzņēmumiem vai organizācijām, kas reāli fiskālo sistēmu (Vienkāršota reālu vai normāla īsto). Sistēma, kurā PVN ir deklarēta.
VATIsNotUsedExampleFR=Francijā, tas ir asociācijas, kas nav PVN deklarētas vai uzņēmumi, organizācijas vai brīvo profesiju, kas ir izvēlējušies mikrouzņēmumu nodokļu sistēmu (PVN ar franšīzes), un tā maksā franšīzes PVN bez PVN deklarācijas. Šī izvēle būs redzams atskaites "Nav piemērojams PVN - art-293B CGI" rēķinā.
##### Local Taxes #####
@@ -1538,4 +1543,4 @@ Opened=Atvērts
Closed=Slēgts
Format=Formāts
-TypePaymentDesc=0:Customer payment type, 1:Supplier payment type, 2:Both customers and suppliers payment type
+TypePaymentDesc=0:Klienta maksāšanas veids, 1:Piegādātāja maksāšanas veids, 2:Abi klientu un piegādātāju maksāšanas veids
diff --git a/htdocs/langs/lv_LV/bills.lang b/htdocs/langs/lv_LV/bills.lang
index 399ae58ab4af4ea15bcaafc2480c075cfefe833c..acb2aba457045c5e24949e7c660cc2be2ac5ce1d 100644
--- a/htdocs/langs/lv_LV/bills.lang
+++ b/htdocs/langs/lv_LV/bills.lang
@@ -25,7 +25,7 @@ InvoiceReplacement=Nomaiņa rēķins
InvoiceReplacementAsk=Nomaiņa rēķins par rēķinu
InvoiceReplacementDesc=<b>Replacement invoice</b> is used to cancel and replace completely an invoice with no payment already received.<br><br>Note: Only invoices with no payment on it can be replaced. If the invoice you replace is not yet closed, it will be automatically closed to 'abandoned'.
InvoiceAvoir=Kredīta piezīme
-InvoiceAvoirAsk=Kredītu piezīmi, lai koriģētu rēķinu
+InvoiceAvoirAsk=Kredīta piezīme, lai koriģētu rēķinu
InvoiceAvoirDesc=<b>Kredīts piezīme</b> ir negatīvs rēķins izmantot, lai atrisinātu to, ka rēķins ir summa, kas atšķiras par summu, patiesībā maksā (jo klients maksā pārāk daudz kļūdas dēļ, vai arī nav samaksāta pilnībā, jo viņš atgriezās dažus produktus, piemēram).
invoiceAvoirWithLines=Create Credit Note with lines from the origin invoice
invoiceAvoirWithPaymentRestAmount=Create Credit Note with the amount of origin invoice payment's lake
diff --git a/htdocs/langs/lv_LV/orders.lang b/htdocs/langs/lv_LV/orders.lang
index 36f2a166d77333b1eb2dc7098156f728ea38c854..5069f05eab487816a58abfe5ae08e7f135d5488b 100644
--- a/htdocs/langs/lv_LV/orders.lang
+++ b/htdocs/langs/lv_LV/orders.lang
@@ -1,7 +1,7 @@
# Dolibarr language file - Source file is en_US - orders
OrdersArea=Klienti pasūtījumu sadaļa
SuppliersOrdersArea=Piegādātāji pasūtījumi platība
-OrderCard=Lai karte
+OrderCard=Pasūtījumu kartiņa
OrderId=Pasūtījuma ID
Order=Rīkojums
Orders=Pasūtījumi
@@ -9,25 +9,25 @@ OrderLine=Lai līnija
OrderFollow=Sekojiet līdzi
OrderDate=Pasūtīt datumu
OrderToProcess=Pasūtījums, kas jāapstrādā
-NewOrder=Jauns rīkojums
+NewOrder=Jauns pasūtījums
ToOrder=Veicot pasūtījumu
MakeOrder=Veicot pasūtījumu
SupplierOrder=Piegādātājs rīkojums
SuppliersOrders=Piegādātāji pasūtījumi
SuppliersOrdersRunning=Pašreizējie piegādātāju pasūtījumi
CustomerOrder=Klienta rīkojums
-CustomersOrders=Klienta-u pasūtījumi
+CustomersOrders=Klientu pasūtījumi
CustomersOrdersRunning=Pašreizējie klienta/u pasūtījumi
CustomersOrdersAndOrdersLines=Klientu pasūtījumus un ordeņa līnijas
OrdersToValid=Klienta pasūtījumu apstiprināšanai,
-OrdersToBill=Klienta rīkojumi piegādāts
-OrdersInProcess=Klienta rīkojumus procesā
-OrdersToProcess=Klienta rīkojumi apstrādāt
+OrdersToBill=Klienta pasūtījumi piegādāti
+OrdersInProcess=Klienta pasūtījumi procesā
+OrdersToProcess=Klienta pasūtījumi kas jāapstrādā
SuppliersOrdersToProcess=Piegādātāja rīkojumi apstrādāt
StatusOrderCanceledShort=Atcelts
StatusOrderDraftShort=Projekts
-StatusOrderValidatedShort=Validēta
-StatusOrderSentShort=Šajā procesā
+StatusOrderValidatedShort=Apstiprināts
+StatusOrderSentShort=Procesā
StatusOrderSent=Sūtījuma procesā
StatusOrderOnProcessShort=Reģistratūra
StatusOrderProcessedShort=Apstrādāti
@@ -40,7 +40,7 @@ StatusOrderReceivedPartiallyShort=Daļēji saņemti
StatusOrderReceivedAllShort=Viss saņemts
StatusOrderCanceled=Atcelts
StatusOrderDraft=Projekts (ir jāapstiprina)
-StatusOrderValidated=Validēta
+StatusOrderValidated=Apstiprināts
StatusOrderOnProcess=Gaida, lai saņemtu
StatusOrderProcessed=Apstrādāts
StatusOrderToBill=Piegādāts
@@ -81,9 +81,9 @@ AllOrders=Visi pasūtījumi
NbOfOrders=Pasūtījumu skaits
OrdersStatistics=Pasūtījuma-u statistika
OrdersStatisticsSuppliers=Piegādātāj pasūtījuma/u statistika
-NumberOfOrdersByMonth=Pasutījumu skaits pa mēnešiem
-AmountOfOrdersByMonthHT=Summa rīkojumus mēnesī (neto pēc nodokļiem)
-ListOfOrders=Saraksts pasūtījumu
+NumberOfOrdersByMonth=Pasūtījumu skaits pa mēnešiem
+AmountOfOrdersByMonthHT=Summa pasūtījumi mēnesī (bez nodokļiem)
+ListOfOrders=Pasūtījumu saraksts
CloseOrder=Aizvērt kārtība
ConfirmCloseOrder=Vai jūs tiešām vēlaties, lai uzstādītu šo rīkojumu deliverd? Pēc tam, kad pasūtījums tiek piegādāts, to var iestatīt, lai jāmaksā.
ConfirmCloseOrderIfSending=Vai jūs tiešām vēlaties, lai aizvērtu šo pasūtījumu? Jums jāslēdz rīkojumu tikai tad, kad visi kuģniecības tiek darīts.
@@ -95,7 +95,7 @@ ConfirmMakeOrder=Vai jūs tiešām vēlaties, lai apstiprinātu veicāt šo rīk
GenerateBill=Izveidot rēķinu
ClassifyShipped=Klasificēt piegādāts
ClassifyBilled=Klasificēt rēķins
-ComptaCard=Grāmatvedība karte
+ComptaCard=Grāmatvedības kartiņa
DraftOrders=Projekts pasūtījumi
RelatedOrders=Saistītie pasūtījumi
OnProcessOrders=Pasūtījumi procesā
diff --git a/htdocs/langs/lv_LV/stocks.lang b/htdocs/langs/lv_LV/stocks.lang
index 511331310fe1cf2874d49ee097f053b094b55065..b2b6cfc6e25401cdcba2f1ec51f5365f12b8669d 100644
--- a/htdocs/langs/lv_LV/stocks.lang
+++ b/htdocs/langs/lv_LV/stocks.lang
@@ -1,5 +1,5 @@
# Dolibarr language file - Source file is en_US - stocks
-WarehouseCard=Noliktava karte
+WarehouseCard=Noliktava kartiņa
Warehouse=Noliktava
Warehouses=Noliktavas
NewWarehouse=Jauns noliktavu / Noliktavas platība
@@ -35,7 +35,7 @@ Unit=Vienība
StockCorrection=Labot krājumus
StockTransfer=Krājumu pārvietošana
StockMovement=Pārvietot
-StockMovements=Krājumu pārvieošanas
+StockMovements=Krājumu pārvietošanas
LabelMovement=Kustību nosaukums
NumberOfUnit=Vienību skaits
UnitPurchaseValue=Vienības iepirkuma cena
@@ -73,7 +73,7 @@ MininumStockShort=Krājumu min
StockUpShort=Krājumi
IdWarehouse=Id noliktava
DescWareHouse=Apraksts noliktava
-LieuWareHouse=Lokalizācija noliktava
+LieuWareHouse=Lokālā noliktava
WarehousesAndProducts=Noliktavas un produkti
AverageUnitPricePMPShort=Vidējais svērtais ieejas cena
AverageUnitPricePMP=Vidējais svērtais ieejas cena
diff --git a/htdocs/langs/mk_MK/accountancy.lang b/htdocs/langs/mk_MK/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/mk_MK/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/nb_NO/accountancy.lang b/htdocs/langs/nb_NO/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/nb_NO/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/nl_NL/accountancy.lang b/htdocs/langs/nl_NL/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/nl_NL/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/pl_PL/accountancy.lang b/htdocs/langs/pl_PL/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/pl_PL/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/pt_PT/accountancy.lang b/htdocs/langs/pt_PT/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/pt_PT/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/ro_RO/accountancy.lang b/htdocs/langs/ro_RO/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/ro_RO/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/ru_RU/accountancy.lang b/htdocs/langs/ru_RU/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/ru_RU/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/ru_RU/orders.lang b/htdocs/langs/ru_RU/orders.lang
index 4ff75fca9fee35b0401ed6cd93bf35fa0fb7c5f6..c5f655e4781894415f4680e6c876851b67990105 100644
--- a/htdocs/langs/ru_RU/orders.lang
+++ b/htdocs/langs/ru_RU/orders.lang
@@ -1,10 +1,10 @@
# Dolibarr language file - Source file is en_US - orders
-OrdersArea=Клиенты заказы области
-SuppliersOrdersArea=Поставщики заказы области
-OrderCard=Заказать карту
-# OrderId=Order Id
+OrdersArea=Раздел заказов клиентов
+SuppliersOrdersArea=Раздел заказов поставщиков
+OrderCard=Карточка заказа
+OrderId=Идентификатор заказа
Order=Заказ
-Orders=Приказы
+Orders=Заказы
OrderLine=Заказ линии
OrderFollow=Последующие меры
OrderDate=Дата заказа
@@ -28,7 +28,7 @@ StatusOrderCanceledShort=Отменен
StatusOrderDraftShort=Черновик
StatusOrderValidatedShort=Подтвержденные
StatusOrderSentShort=В процессе
-# StatusOrderSent=Shipment in process
+StatusOrderSent=Shipment in process
StatusOrderOnProcessShort=В процессе
StatusOrderProcessedShort=Обработано
StatusOrderToBillShort=В законопроекте
@@ -53,9 +53,9 @@ ShippingExist=Отгрузки существует
DraftOrWaitingApproved=Проект или утверждены еще не заказал
DraftOrWaitingShipped=Проект или подтверждены не отгружен
MenuOrdersToBill=Заказы на законопроект
-# MenuOrdersToBill2=Orders to bill
+MenuOrdersToBill2=Orders to bill
SearchOrder=Поиск тем
-# SearchACustomerOrder=Search a customer order
+SearchACustomerOrder=Search a customer order
ShipProduct=Судно продукта
Discount=Скидка
CreateOrder=Создать заказ
@@ -68,11 +68,11 @@ CancelOrder=Отмена порядка
AddOrder=Добавить тему
AddToMyOrders=Добавить в мои заказы
AddToOtherOrders=Добавить в других заказов
-# AddToDraftOrders=Add to draft order
+AddToDraftOrders=Add to draft order
ShowOrder=Показать порядок
NoOpenedOrders=Нет открыл заказов
NoOtherOpenedOrders=Никакие другие открыли заказов
-# NoDraftOrders=No draft orders
+NoDraftOrders=No draft orders
OtherOrders=Другие заказы
LastOrders=Последнее %s заказов
LastModifiedOrders=Последнее% с измененными заказов
@@ -82,7 +82,7 @@ NbOfOrders=Количество заказов
OrdersStatistics=Приказы Статистика
OrdersStatisticsSuppliers=Поставщик заказов статистика
NumberOfOrdersByMonth=Количество заказов в месяц
-# AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
+AmountOfOrdersByMonthHT=Amount of orders by month (net of tax)
ListOfOrders=Список заказов
CloseOrder=Закрыть тему
ConfirmCloseOrder=Вы уверены, что хотите, чтобы закрыть эту тему? После того, как заказ является закрытым, он может быть выставлен счет.
@@ -93,7 +93,7 @@ ConfirmUnvalidateOrder=Вы уверены, что хотите, чтобы во
ConfirmCancelOrder=Вы уверены, что хотите отменить этот заказ?
ConfirmMakeOrder=Вы уверены, что хотите, чтобы подтвердить вы сделали этот заказ <b>на %s?</b>
GenerateBill=Создать счет-фактуру
-# ClassifyShipped=Classify delivered
+ClassifyShipped=Classify delivered
ClassifyBilled=Классифицировать "Billed"
ComptaCard=Бухгалтерия карту
DraftOrders=Проект распоряжения
@@ -101,7 +101,6 @@ RelatedOrders=Похожие заказов
OnProcessOrders=В процессе заказов
RefOrder=Ref. заказ
RefCustomerOrder=Ref. Для клиента
-CustomerOrder=Для клиентов
RefCustomerOrderShort=Ref. CUST. заказ
SendOrderByMail=Отправить заказ по почте
ActionsOnOrder=Меры по заказу
@@ -131,9 +130,7 @@ Error_COMMANDE_SUPPLIER_ADDON_NotDefined=Постоянная COMMANDE_SUPPLIER_
Error_COMMANDE_ADDON_NotDefined=Постоянная COMMANDE_ADDON не определена
Error_FailedToLoad_COMMANDE_SUPPLIER_ADDON_File=Не удалось загрузить модуль файл ' %s'
Error_FailedToLoad_COMMANDE_ADDON_File=Не удалось загрузить модуль файл ' %s'
-# Error_OrderNotChecked=No orders to invoice selected
-
-
+Error_OrderNotChecked=No orders to invoice selected
# Sources
OrderSource0=Коммерческое предложение
OrderSource1=Интернет
@@ -144,25 +141,23 @@ OrderSource5=Коммерческие
OrderSource6=Склад
QtyOrdered=Количество заказанных
AddDeliveryCostLine=Добавить доставки Стоимость линии с указанием веса заказа
-
# Documents models
PDFEinsteinDescription=Для полной модели (logo. ..)
PDFEdisonDescription=Простая модель для
-# PDFProformaDescription=A complete proforma invoice (logo…)
+PDFProformaDescription=A complete proforma invoice (logo…)
# Orders modes
OrderByMail=Почта
OrderByFax=Факс
OrderByEMail=EMail
OrderByWWW=Интернет
OrderByPhone=Телефон
-
-# CreateInvoiceForThisCustomer=Bill orders
-# NoOrdersToInvoice=No orders billable
-# CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
-# MenuOrdersToBill2=Orders to bill
-# OrderCreation=Order creation
-# Ordered=Ordered
-# OrderCreated=Your orders have been created
-# OrderFail=An error happened during your orders creation
-# CreateOrders=Create orders
-# ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
+CreateInvoiceForThisCustomer=Bill orders
+NoOrdersToInvoice=No orders billable
+CloseProcessedOrdersAutomatically=Classify "Processed" all selected orders.
+MenuOrdersToBill2=Orders to bill
+OrderCreation=Order creation
+Ordered=Ordered
+OrderCreated=Your orders have been created
+OrderFail=An error happened during your orders creation
+CreateOrders=Create orders
+ToBillSeveralOrderSelectCustomer=To create an invoice for several orders, click first onto customer, then choose "%s".
diff --git a/htdocs/langs/sk_SK/accountancy.lang b/htdocs/langs/sk_SK/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/sk_SK/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/sl_SI/accountancy.lang b/htdocs/langs/sl_SI/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/sl_SI/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/sq_AL/accountancy.lang b/htdocs/langs/sq_AL/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/sq_AL/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/sv_SE/accountancy.lang b/htdocs/langs/sv_SE/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/sv_SE/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/th_TH/accountancy.lang b/htdocs/langs/th_TH/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/th_TH/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/tr_TR/accountancy.lang b/htdocs/langs/tr_TR/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..5ea1eb674787544110c19e29d5211de6f5eb0246
--- /dev/null
+++ b/htdocs/langs/tr_TR/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Muhasebe
+Globalparameters=Genel parametreler
+Chartofaccounts=Hesap planı
+Fiscalyear=Mali yıllar
+Menuaccount=Muhasebe hesapları
+Menuthirdpartyaccount=Üçüncü parti hesapları
+MenuTools=Araçlar
+
+ConfigAccountingExpert=Hesap uzmanı modülü yapılandırması
+Journaux=Günlükler
+JournalFinancial=Mali günlükler
+Exports=Dışaaktarımlar
+Modelcsv=Dışaaktarım modeli
+Selectmodelcsv=Bir dışaaktarım modeli seç
+Modelcsv_normal=Klasik dışaaktarım
+Modelcsv_CEGID=CEGID Uzmanına yönelik dışaaktarım
+BackToChartofaccounts=Hesap planı geliri
+Back=Gelir
+
+Definechartofaccounts=Hesap planı tanımla
+Selectchartofaccounts=Hesap planı seç
+Validate=Doğrula
+Addanaccount=Muhasebe hesabı ekle
+AccountAccounting=Muhasebe hesabı
+Ventilation=Ventilation
+ToDispatch=Gönderilecek
+Dispatched=Gönderilmiş
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Ticaret marjı
+Reports=Raporlar
+ByCustomerInvoice=Müşteri faturalarına göre
+ByMonth=Aya göre
+NewAccount=Yeni muhasebe hesabı
+Update=Güncelle
+List=Liste
+Create=Oluştur
+UpdateAccount=Bir muhasebe hesabının değiştirilmesi
+UpdateMvts=Bir hareketin değiştirilmesi
+WriteBookKeeping=Büyük defter hesap kayıtları
+Bookkeeping=Büyük Defter
+AccountBalanceByMonth=Aylık hesap bakiyesi
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Satır
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=Muhasebe hesabında
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=İşleme
+EndProcessing=İşleme sonu
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Seçilen satırlar
+Lineofinvoice=Fatura satırı
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=CSV ayırıcısı
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Dolibarr'da gösterilen muhasebe hesapları uzunluğu
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Genel hesapların uzunluğu
+ACCOUNTINGEX_LENGTH_AACCOUNT=Üçüncü parti hesapları uzunluğu
+
+ACCOUNTINGEX_SELL_JOURNAL=Satış günlüğü
+ACCOUNTINGEX_PURCHASE_JOURNAL=Satınalma günlüğü
+ACCOUNTINGEX_BANK_JOURNAL=Banka günlüğü
+ACCOUNTINGEX_CASH_JOURNAL=Kasa günlüğü
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Çeşitli günlük
+ACCOUNTINGEX_SOCIAL_JOURNAL=Sosyal günlük
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Aktarım hesabı
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Bekleme hesabı
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Belge türü
+Docdate=Tarih
+Docref=Referans
+Numerocompte=Hesap
+Code_tiers=Üçüncü parti
+Labelcompte=Hesap etiketi
+Debit=Borç
+Credit=Alacak
+Amount=Tutar
+Sens=Sens (borsa haberleri yayınlama günlüğü)
+Codejournal=Günlük
+
+DelBookKeeping=Büyük defter kayıtlarını sil
+
+SellsJournal=Satış günlüğü
+PurchasesJournal=Satınalma günlüğü
+DescSellsJournal=Satış günlüğü
+DescPurchasesJournal=Satınalma günlüğü
+BankJournal=Banka günlüğü
+DescBankJournal=Nakitten dışında her türlü ödemeyi içeren banka günlüğü
+CashJournal=Kasa günlüğü
+DescCashJournal=Nakit ödeme türünü içeren kasa günlüğü
+
+CashPayment=Nakit ödeme
+
+SupplierInvoicePayment=Tedarikçi faturası ödemesi
+CustomerInvoicePayment=Müşteri faturası ödemesi
+
+ThirdPartyAccount=Üçüncü parti hesabı
+
+NewAccountingMvt=Yeni hareket
+NumMvts=Hareket sayısı
+ListeMvts=Hareket listesi
+ErrorDebitCredit=Borç ve Alacak aynı anda bir değere sahip olamaz
+
+ReportThirdParty=Üçüncü parti hesabını listele
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=Muhasebe hesapları listesi
+
+Pcgversion=Plan sürümü
+Pcgtype=Hesap sınıfı
+Pcgsubtype=Hesap sınıfı altında
+Accountparent=Hesabın kökü
+Active=Hesap özeti
+
+NewFiscalYear=Yeni mali yıl
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Toplam ciro HT
+TotalMarge=Toplam satışlar oranı
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Burada tedarikçi faturaları ve muhasebe hesapları satırları listesine başvurun
+
+ValidateHistory=Otomatikman doğrula
+
+ErrorAccountancyCodeIsAlreadyUse=Hata, kullanıldığı için bu muhasebe hesabını silemezsiniz
+
+FicheVentilation=Havalandırma kartı
diff --git a/htdocs/langs/tr_TR/agenda.lang b/htdocs/langs/tr_TR/agenda.lang
index f47bdc774cc6c4b4f8d155a8eccf43b91d472bc3..d3421d8d336695003dbdfb60991de65b41ccf6c9 100644
--- a/htdocs/langs/tr_TR/agenda.lang
+++ b/htdocs/langs/tr_TR/agenda.lang
@@ -2,14 +2,14 @@
IdAgenda=Kimlik etkinliği
Actions=Eylemler
ActionsArea=Eylem alanı (Olaylar ve görevler)
-Agenda= Gündem
-Agendas= Gündemler
-Calendar= Takvim
-Calendars= Takvimler
-LocalAgenda=Yerel takvim
+Agenda=Gündem
+Agendas=Gündemler
+Calendar=Takvim
+Calendars=Takvimler
+LocalAgenda=İç takvim
AffectedTo=Etkilenen
DoneBy=Yapan
-Event=Event
+Event=Etkinlik
Events=Etkinlikler
EventsNb=Etkinlik sayısı
MyEvents=Etkinliklerim
@@ -22,7 +22,7 @@ MenuToDoActions=Tüm sonlanmayan eylemler
MenuDoneActions=Tüm sonlanan eylemler
MenuToDoMyActions=Sonlanmayan eylemlerim
MenuDoneMyActions=Sonlanan eylemlerim
-ListOfEvents=Dolibarr eylem listesi
+ListOfEvents=Etkinlik listesi (iç takvim)
ActionsAskedBy=Eylemi bildiren
ActionsToDoBy=Eylemden etkilenen
ActionsDoneBy=Eylemi yapan
@@ -34,7 +34,7 @@ ViewList=Liste görünümü
ViewCal=Ay görünümü
ViewDay=Gün görünümü
ViewWeek=Hafta görünümü
-ViewPerUser=Per user view
+ViewPerUser=Kullanıcı görünümü başına
ViewWithPredefinedFilters= Öntanımlı süzgeçler ile görünüm
AutoActions= Gündemin otomatik doldurulması
AgendaAutoActionDesc= Burada Dolibarr'ın otomatik olarak gündemde oluşturmasını istediğiniz olayları tanımlayın. İşaretli bir şey yoksa (varsayılan olarak) sadece el ile girilen eylemler gündeme dahil edilecektir.
@@ -51,7 +51,7 @@ OrderRefusedInDolibarr=Reddedilen teklif %s
OrderBackToDraftInDolibarr=%s Siparişini taslak durumuna geri götür
OrderCanceledInDolibarr=%s Siparişi iptal edildi
InterventionValidatedInDolibarr=%s Müdahalesi doğrulandı
-ProposalSentByEMail=%s Ticari teklifi Eposta ile gönderildi
+ProposalSentByEMail=%s Teklifi Eposta ile gönderildi
OrderSentByEMail=%s Müşteri siparişi Eposta ile gönderildi
InvoiceSentByEMail=%s Müşteri faturası Eposta ile gönderildi
SupplierOrderSentByEMail=%s Tedarikçi siparişi Eposta ile gönderildi
@@ -76,15 +76,16 @@ AgendaShowBirthdayEvents=Kişilerin doğum günlerini göster
AgendaHideBirthdayEvents=Kişilerin doğum günlerini gizle
Busy=Meşgul
ExportDataset_event1=Gündem etkinlikleri listesi
-DefaultWorkingDays=Default working days range in week (Example: 1-5, 1-6)
-DefaultWorkingHours=Default working hours in day (Example: 9-18)
+DefaultWorkingDays=Varsayılan haftalık çalışma günleri aralığı (Örnek: 1-5, 1-6)
+DefaultWorkingHours=Varsayılan günlük çalışma saatleri (Örnek: 9-18)
# External Sites ical
ExportCal=Takvim ver
ExtSites=Dış takvimleri içeaktar
-ExtSitesEnableThisTool=Show external calendars (defined into global setup) into agenda. Does not affect external calendars defined by users.
+ExtSitesEnableThisTool=Gündemde dış takvimleri (genel ayarlarda tanımlanan) göster. Kullanıcılar tarafından tanımlanan dış takvimleri etkilemez.
ExtSitesNbOfAgenda=Takvimlerin sayısı
AgendaExtNb=Takvim sayısı %s
ExtSiteUrlAgenda=.ical dosyasına erişmek için URL
ExtSiteNoLabel=Tanımlama yok
-WorkingTimeRange=Working time range
-WorkingDaysRange=Working days range
+WorkingTimeRange=Çalışma saati aralığı
+WorkingDaysRange=Çalışma günleri aralığı
+AddEvent=Etkinlik oluştur
diff --git a/htdocs/langs/tr_TR/bills.lang b/htdocs/langs/tr_TR/bills.lang
index 49416317dac1439b8a11646928f9af299afb9b99..27493dd1327b3955e20f3c8c535927ed33698fa4 100644
--- a/htdocs/langs/tr_TR/bills.lang
+++ b/htdocs/langs/tr_TR/bills.lang
@@ -85,7 +85,7 @@ ClassifyPaid=‘Ödendi’ olarak sınıflandır
ClassifyPaidPartially=‘Kısmen ödendi’ olarak sınıflandır
ClassifyCanceled=’Terkedildi’ olarak sınıflandır
ClassifyClosed=‘Kapalı’ olarak sınıflandır
-ClassifyUnBilled=Classify 'Unbilled'
+ClassifyUnBilled=Sınıflandırma 'Faturalanmadı'
CreateBill=Fatura oluştur
AddBill=Fatura ya da alacak dekontu ekle
AddToDraftInvoices=Taslak fatura ekle
@@ -198,8 +198,8 @@ Rest=Bekleyen
AmountExpected=İstenen tutar
ExcessReceived=Fazla alınan
EscompteOffered=Teklif edilen indirim (vadeden önce ödemede)
-SendBillRef=Submission of invoice %s
-SendReminderBillRef=Submission of invoice %s (reminder)
+SendBillRef=%s faturasının gönderilmesi
+SendReminderBillRef=%s faturasının gönderilmesi (anımsatma)
StandingOrders=Ödeme talimatları
StandingOrder=Ödeme talimatı
NoDraftBills=Hiç taslak fatura yok
@@ -224,7 +224,7 @@ DispenseMontantLettres=Mekanografik olarak tasarlanan fatura harf sırasının d
NonPercuRecuperable=Kurtarılamaz
SetConditions=Ödeme koşullarını ayarla
SetMode=Ödeme biçimini ayarla
-Billed=Faturalandı
+Billed=Faturalanmış
RepeatableInvoice=Ön tanımlı fatura
RepeatableInvoices=Ön tanımlı faturalar
Repeatable=Ön tanımlı
@@ -296,8 +296,8 @@ TotalOfTwoDiscountMustEqualsOriginal=İki yeni indirimin toplamı orijinal indir
ConfirmRemoveDiscount=Bu indirimi kaldırmak istediğinizden emin misiniz?
RelatedBill=İlgili fatura
RelatedBills=İlgili faturalar
-LatestRelatedBill=Latest related invoice
-WarningBillExist=Warning, one or more invoice already exist
+LatestRelatedBill=Son ilgili fatura
+WarningBillExist=Uyarı, bir yada çok fatura zaten var
# PaymentConditions
PaymentConditionShortRECEP=Derhal
diff --git a/htdocs/langs/tr_TR/boxes.lang b/htdocs/langs/tr_TR/boxes.lang
index 3407f90d6dc228612ff5c39c966cb84b0c26d315..7a402a41cb9134d25b09ae7d94d878950df219b4 100644
--- a/htdocs/langs/tr_TR/boxes.lang
+++ b/htdocs/langs/tr_TR/boxes.lang
@@ -7,7 +7,7 @@ BoxLastSupplierBills=Son tedarikçi faturaları
BoxLastCustomerBills=Son müşteri faturaları
BoxOldestUnpaidCustomerBills=En eski ödenmemiş müşteri faturaları
BoxOldestUnpaidSupplierBills=En eski ödenmemiş tedarikçi faturaları
-BoxLastProposals=Son ticari teklifler
+BoxLastProposals=Son teklifler
BoxLastProspects=Son adaylar
BoxLastCustomers=Son değiştirilen müşteriler
BoxLastSuppliers=Son değiştirilen tedarikçiler
diff --git a/htdocs/langs/tr_TR/commercial.lang b/htdocs/langs/tr_TR/commercial.lang
index 144c82d0f298942ea646783fbd59c383df40717d..d17d38c2055eb7e559ada039af11aef8be7372f0 100644
--- a/htdocs/langs/tr_TR/commercial.lang
+++ b/htdocs/langs/tr_TR/commercial.lang
@@ -44,8 +44,8 @@ DoneActions=Tamamlanan etkinlikler
DoneActionsFor=%s için tamamlanan etkinlikler
ToDoActions=Tamamlanmamış etkinlikler
ToDoActionsFor=%s için tamalanmamış etkinlikler
-SendPropalRef=%s teklifini gönder
-SendOrderRef=% siparişini gönder
+SendPropalRef=%s Teklifinin sunulması
+SendOrderRef=%s Teklifinin sunulması
StatusNotApplicable=Uygulanamaz
StatusActionToDo=Yapılacaklar
StatusActionDone=Tamamla
@@ -62,7 +62,7 @@ LastProspectContactDone=Görüşme yapıldı
DateActionPlanned=Planlanan etkinlik tarihi
DateActionDone=Etkinliğin yapıldığı tarih
ActionAskedBy=Etkinliği sunan
-ActionAffectedTo=Etkinlikten etkilenen
+ActionAffectedTo=Etkinlik sahibi
ActionDoneBy=Etkinliği yapan
ActionUserAsk=Raporlayan
ErrorStatusCantBeZeroIfStarted=Eğer <b>Yapıldığı tarih</b> alanı doluysa, etkinlik başlamıştır (veya bitmiştir), bu durumda '<b>Durum</b>' alanı 0%% olamaz.
diff --git a/htdocs/langs/tr_TR/companies.lang b/htdocs/langs/tr_TR/companies.lang
index 584486a23e7e2028282074b478e36332df963039..86ff28e3e8ec3a4f6817440c871ab77689de8ede 100644
--- a/htdocs/langs/tr_TR/companies.lang
+++ b/htdocs/langs/tr_TR/companies.lang
@@ -76,7 +76,7 @@ PhoneMobile=Mobil
No_Email=Toplu e-posta gönderme
Fax=Faks
Zip=Posta Kodu
-Town=Şehir
+Town=ilçesi
Web=Web
Poste= Durumu
DefaultLang=Varsayılan dili
@@ -91,8 +91,8 @@ LocalTax2IsUsedES= IRPF kullanılır
LocalTax2IsNotUsedES= IRPF kullanılmaz
LocalTax1ES=RE
LocalTax2ES=IRPF
-TypeLocaltax1ES=RE Type
-TypeLocaltax2ES=IRPF Type
+TypeLocaltax1ES=RE Türü
+TypeLocaltax2ES=IRPF Türü
TypeES=Türü
ThirdPartyEMail=%s
WrongCustomerCode=Müşteri kodu geçersiz
@@ -270,7 +270,7 @@ NoContactDefined=Bu üçüncü parti için kişi tanımlanmamış
DefaultContact=Varsayılan kişi
AddCompany=Firma ekle
AddThirdParty=Üçüncü parti ekle
-DeleteACompany=Bir firma sil
+DeleteACompany=Firma sil
PersonalInformations=Kişisel bilgiler
AccountancyCode=Muhasebe kodu
CustomerCode=Müşteri kodu
@@ -302,7 +302,7 @@ ContactForProposals=Teklif yetkilisi
ContactForContracts=Sözleşme yetkilisi
ContactForInvoices=Fatura yetkilisi
NoContactForAnyOrder=Bu kişi herhangi bir siparişin yetkilisi değildir
-NoContactForAnyProposal=Bu kişi herhangi bir ticari teklifin yetkilisi değildir
+NoContactForAnyProposal=Bu kişi herhangi bir teklifin yetkilisi değildir
NoContactForAnyContract=Bu kişi herhangi bir sözleşmenin yetkilisi değildir
NoContactForAnyInvoice=Bu kişi herhangi bir faturanın yetkilisi değildir
NewContact=Yeni kişi
@@ -311,7 +311,7 @@ LastContacts=Son kişiler
MyContacts=Kişilerim
Phones=Telefonlar
Capital=Sermaye
-CapitalOf=%s nin sermayesi
+CapitalOf=%s firmasının sermayesi
EditCompany=Firma düzenle
EditDeliveryAddress=Teslimat adresi düzenle
ThisUserIsNot=Bu kullanıcı bir aday, müşteri veya tedarikçi değildir
@@ -386,9 +386,9 @@ SupplierCategory=Tedarikçi kategorisi
JuridicalStatus200=Bağımsız
DeleteFile=Dosya sil
ConfirmDeleteFile=Bu dosyayı silmek istediğinizden emin misiniz?
-AllocateCommercial=Bir ticari tahsis et
-SelectCountry=Bir ülke seçin
-SelectCompany=Bir üçüncü parti seçin
+AllocateCommercial=Satış temsilcisine atanmış
+SelectCountry=Bir ülke seç
+SelectCompany=Bir üçüncü parti seç
Organization=Kuruluş
AutomaticallyGenerated=Otomatikman oluşturulur
FiscalYearInformation=Mali yıla ait bilgi
@@ -403,7 +403,7 @@ UniqueThirdParties=Toplam eşsiz üçüncü parti
InActivity=Açık
ActivityCeased=Kapalı
ActivityStateFilter=Etkinlik durumu
-ProductsIntoElements=Ürünleri %s 'li listele
+ProductsIntoElements=Ürünleri %s te listele
CurrentOutstandingBill=Geçerli bekleyen fatura
OutstandingBill=Ödenmemiş fatura için ençok tutar
OutstandingBillReached=En yüksek ödenmemiş fatura tutarına ulaşıldı
diff --git a/htdocs/langs/tr_TR/compta.lang b/htdocs/langs/tr_TR/compta.lang
index 2cdba02cd1b455ff73a83cf0783e81e4adb96a0b..13c10ed06eb7d9a742314c2df24787413252ca6f 100644
--- a/htdocs/langs/tr_TR/compta.lang
+++ b/htdocs/langs/tr_TR/compta.lang
@@ -123,7 +123,7 @@ CalcModeVATDebt=Mod <b>%sKDV, taahhüt hesabı%s için</b>.
CalcModeVATEngagement=Mod <b>%sKDV, gelirler-giderler%s için</b>.
CalcModeDebt=Mod <b>%sAlacaklar-Borçlar, taahhüt hesabı%s için</b>.
CalcModeEngagement=Mod <b>%sAlacaklar-Borçlar, kasa hesabı%s için</b>.
-CalcModeLT1= Mode <b>%sRE on customer invoices - suppliers invoices%s</b>
+CalcModeLT1= Müşteri faturaları için mod <b>%sRE tedrikçi faturaları için mod %s</b>
CalcModeLT1Debt=Mode <b>%sRE on customer invoices%s</b>
CalcModeLT1Rec= Mode <b>%sRE on suppliers invoices%s</b>
CalcModeLT2= Mode <b>%sIRPF on customer invoices - suppliers invoices%s</b>
@@ -195,12 +195,12 @@ CalculationRuleDesc=Toplam KDV hesabı için 2 yöntem vardır:<br>Yöntem 1, he
CalculationRuleDescSupplier=tedarikçiye göre, aynı hesaplama kuralını kullanmak üzere uygun yöntemi seçin ve tedarikçiyle aynı sonucu alın.
TurnoverPerProductInCommitmentAccountingNotRelevant=Ürüne göre ciro raporu, <b>nakit muhasebesi</b>modu için uygun değildir. Bu rapor yalnızca, <b>tahakkuk muhasebesi</b> modu için uygundur (muhasebe modülü ayarlarına bakın).
CalculationMode=Hesaplama modu
-AccountancyJournal=Accountancy code journal
-ACCOUNTING_PRODUCT_BUY_ACCOUNT=Alınacak ürünler için varsayılan hesap kodu
-ACCOUNTING_PRODUCT_SOLD_ACCOUNT=Satılacak ürünler için varsayılan hesap kodu
-ACCOUNTING_SERVICE_BUY_ACCOUNT=Alınacak hizmetler için varsayılan hesap kodu
-ACCOUNTING_SERVICE_SOLD_ACCOUNT=Satılacak hizmetler için varsayılan hesap kodu
-ACCOUNTING_VAT_ACCOUNT=Alınacak KDV için varsayılan hesap kodu
-ACCOUNTING_VAT_BUY_ACCOUNT=Ödenecek KDV için varsayılan hesap kodu
-ACCOUNTING_ACCOUNT_CUSTOMER=Müşteri üçüncü partler için varsayılan muhasebe kodu
-ACCOUNTING_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partler için varsayılan muhasebe kodu
+AccountancyJournal=Muhasebe kodu günlüğü
+COMPTA_PRODUCT_BUY_ACCOUNT=Alınacak ürünler için varsayılan hesap kodu
+COMPTA_PRODUCT_SOLD_ACCOUNT=Satılacak ürünler için varsayılan hesap kodu
+COMPTA_SERVICE_BUY_ACCOUNT=Alınacak hizmetler için varsayılan hesap kodu
+COMPTA_SERVICE_SOLD_ACCOUNT=Satılacak hizmetler için varsayılan hesap kodu
+COMPTA_VAT_ACCOUNT=Alınacak KDV için varsayılan hesap kodu
+COMPTA_VAT_BUY_ACCOUNT=Ödenecek KDV için varsayılan hesap kodu
+COMPTA_ACCOUNT_CUSTOMER=Müşteri üçüncü partler için varsayılan muhasebe kodu
+COMPTA_ACCOUNT_SUPPLIER=Tedarikçi üçüncü partler için varsayılan muhasebe kodu
diff --git a/htdocs/langs/tr_TR/dict.lang b/htdocs/langs/tr_TR/dict.lang
index beb78b2a16a129d55137c6da4b01ad27f16a76a1..5ed9a0a2d67ff4d674552c7c5d3e2ff5e4730d58 100644
--- a/htdocs/langs/tr_TR/dict.lang
+++ b/htdocs/langs/tr_TR/dict.lang
@@ -248,11 +248,11 @@ CountryBL=Saint Barthelemy
CountryMF=Saint Martin
##### Civilities #####
-CivilityMME=Mrs.
-CivilityMR=Mr.
-CivilityMLE=Ms.
+CivilityMME=Bn.
+CivilityMR=Bay
+CivilityMLE=Bn.
CivilityMTRE=Master
-CivilityDR=Doctor
+CivilityDR=Doktor
##### Currencies #####
Currencyeuros=Euro
CurrencyAUD=AU Doları
@@ -290,6 +290,8 @@ CurrencySingXOF=CFA Frangı BCEAO
CurrencyXPF=CFP Frangı
CurrencySingXPF=CFP Frangı
CurrencyCentSingEUR=cent
+CurrencyCentINR=paisa
+CurrencyCentSingINR=paise
CurrencyThousandthSingTND=thousandth
#### Input reasons #####
DemandReasonTypeSRC_INTE=Internet
@@ -297,7 +299,7 @@ DemandReasonTypeSRC_CAMP_MAIL=Posta kampanyası
DemandReasonTypeSRC_CAMP_EMAIL=Eposta kampanyası
DemandReasonTypeSRC_CAMP_PHO=Telefon kampanyası
DemandReasonTypeSRC_CAMP_FAX=Faks kampanyası
-DemandReasonTypeSRC_COMM=Ticari görüşme
+DemandReasonTypeSRC_COMM=Ticari ilgili
DemandReasonTypeSRC_SHOP=İş yerinde görüşme
DemandReasonTypeSRC_WOM=Başkasından duyarak
DemandReasonTypeSRC_PARTNER=İş Ortağı
diff --git a/htdocs/langs/tr_TR/errors.lang b/htdocs/langs/tr_TR/errors.lang
index c34c5299c29ff2173a1fdf64fb0c06c55c6551a6..67077b69d64d20ae1be14d1b17d9c1aba0574f88 100644
--- a/htdocs/langs/tr_TR/errors.lang
+++ b/htdocs/langs/tr_TR/errors.lang
@@ -136,6 +136,8 @@ ErrorBadFormat=Hatalı biçim!
ErrorPaymentDateLowerThanInvoiceDate=Ödeme tarihi (%s) fatura tarihinden (%s) önce bu faturada %s olamaz.
ErrorMemberNotLinkedToAThirpartyLinkOrCreateFirst=Hata, bu üye henüz bir üçüncü partiye bağlanmamıştır. Üyeyi varolan bir üçüncü partiye bağlayın ya da faturayla abonelik oluşturmadan önce yeni bir üçüncü parti oluşturun.
ErrorThereIsSomeDeliveries=Hata, bu sevkiyata bağlı bazı teslimatlar var. Silme işlemi reddedildi.
+ErrorCantDeletePaymentReconciliated=Uzlaştırılmış bir banka işlemi oluşturulmuş bir ödeme silinemez
+ErrorCantDeletePaymentSharedWithPayedInvoice=Ödendi durumunda olan en az bir faturayla paylaşılan bir ödeme silinemez
# Warnings
WarningMandatorySetupNotComplete=Zorunlu kurulum parametreleri henüz tanımlanmamış
@@ -153,4 +155,4 @@ WarningCloseAlways=Uyarı, kaynak ve hedef öğeleri arasında tutar farklı da
WarningUsingThisBoxSlowDown=Uyarı, bu kutuyu kullanmak kutuyu gösteren tüm sayfaları ciddi olarak yavaşlatır.
WarningClickToDialUserSetupNotComplete=Kullanıcınızın ClickToDial bilgileri ayarı tamamlanmamış (kullanıcı kartınızdaki ClickToDial tabına bakın)
WarningNotRelevant=Bu veri kümesi için alakasız işlem
-WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Feature disabled when display setup is optimized for blind person or text browsers.
+WarningFeatureDisabledWithDisplayOptimizedForBlindNoJs=Bu özellik, ekran görme engelliler için ya da metin tarayıcılar için ayarlandığında devre dışı kalır.
diff --git a/htdocs/langs/tr_TR/exports.lang b/htdocs/langs/tr_TR/exports.lang
index 420f5082d826b9617071ecd09601f96b781b500a..e6c8d770ad0a9327c0b942311115c1477372e986 100644
--- a/htdocs/langs/tr_TR/exports.lang
+++ b/htdocs/langs/tr_TR/exports.lang
@@ -125,8 +125,8 @@ BankAccountNumber=Hesap numarası
BankAccountNumberKey=Anahtar
SpecialCode=Özel kod
ExportStringFilter=%% metinde bir ya da fazla karakterin değiştirilmesine izin verir
-ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : filters by one year/month/day<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : filters over a range of years/months/days<br> > YYYY, > YYYYMM, > YYYYMMDD : filters on all following years/months/days<br> < YYYY, < YYYYMM, < YYYYMMDD : filters on all previous years/months/days
-ExportNumericFilter='NNNNN' filters by one value<br>'NNNNN+NNNNN' filters over a range of values<br>'>NNNNN' filters by lower values<br>'>NNNNN' filters by higher values
+ExportDateFilter=YYYY, YYYYMM, YYYYMMDD : bir yıılık yıl/ay/gün süzgeçi<br>YYYY+YYYY, YYYYMM+YYYYMM, YYYYMMDD+YYYYMMDD : yıllar arası yıllar/aylar/günler süzgeçi<br> > YYYY, > YYYYMM, > YYYYMMDD : izleyen tüm yıllar için yıılar/aylar/günler süzgeçi<br> < YYYY, < YYYYMM, < YYYYMMDD : bütün önceki yıllar/aylar/günler süzgeçi
+ExportNumericFilter='NNNNN' bir değere göre süzgeç<br>'NNNNN+NNNNN' bir değerler aralığı süzgeçi<br>'>NNNNN' düşük değerlere göre süzgeç<br>'>NNNNN' yüksek değerlere göre süzgeç
## filters
SelectFilterFields=Süzmek istediğiniz değerleri buraya yazın.
FilterableFields=Süzülebilir Champs
diff --git a/htdocs/langs/tr_TR/interventions.lang b/htdocs/langs/tr_TR/interventions.lang
index bbf1322546ba7e03b9b26022400ae165f1858bfe..1f05331ba2addf8af636c829e87a0ee671d15e57 100644
--- a/htdocs/langs/tr_TR/interventions.lang
+++ b/htdocs/langs/tr_TR/interventions.lang
@@ -24,10 +24,12 @@ NameAndSignatureOfInternalContact=Müdahilin adı ve imzası :
NameAndSignatureOfExternalContact=Müşterinin adı ve imzası :
DocumentModelStandard=Müdahaleler için standart belge modeli
InterventionCardsAndInterventionLines=Müdahalelere ait müdahaleler ve satırları
-ClassifyBilled="Faturalandırıldı"
-StatusInterInvoiced=Faturalandırılmış
+ClassifyBilled=Sınıflandırma "Faturalanmış"
+ClassifyUnBilled=Sınıflandırma "Faturalanmadı"
+StatusInterInvoiced=Faturalanmış
RelatedInterventions=İlgili müdahaleler
ShowIntervention=Müdahale göster
+SendInterventionRef=%s müdahalesinin sunulması
##### Types de contacts #####
TypeContact_fichinter_internal_INTERREPFOLL=Müdahale izleme temsilcisi
TypeContact_fichinter_internal_INTERVENING=Müdahalede
diff --git a/htdocs/langs/tr_TR/link.lang b/htdocs/langs/tr_TR/link.lang
index 8b1efb75ef372daf24c660017c22d0cda43189b8..fbc4b921387b3921c69dc805d8876c742486b89c 100644
--- a/htdocs/langs/tr_TR/link.lang
+++ b/htdocs/langs/tr_TR/link.lang
@@ -1,8 +1,8 @@
-LinkANewFile=Link a new file/document
-LinkedFiles=Linked files and documents
-NoLinkFound=No registered links
-LinkComplete=The file has been linked successfully
+LinkANewFile=Yeni bir dosya/belge bağlantıla
+LinkedFiles=Bağlantılı dosyalar ve belgeler
+NoLinkFound=Kayıtlı bağlantı yok
+LinkComplete=Dosya bağlantısı başarılı
ErrorFileNotLinked=The file could not be linked
-LinkRemoved=The link %s has been removed
-ErrorFailedToDeleteLink= Failed to remove link '<b>%s</b>'
-ErrorFailedToUpdateLink= Failed to update link '<b>%s</b>'
+LinkRemoved=Bağlantı %s kaldırıldı
+ErrorFailedToDeleteLink= Bu bağlantı kaldırılamadı '<b>%s</b>'
+ErrorFailedToUpdateLink= Bu bağlantı güncellemesi yapılamadı '<b>%s</b>'
diff --git a/htdocs/langs/tr_TR/main.lang b/htdocs/langs/tr_TR/main.lang
index 5982b0f04dacf8782f7def4582a551fcb5778be7..622075d57f988e29537fe13ac5e1d7821ff3dbd8 100644
--- a/htdocs/langs/tr_TR/main.lang
+++ b/htdocs/langs/tr_TR/main.lang
@@ -345,8 +345,8 @@ Ref=Ref.
RefSupplier=Ref. tedarikçi
RefPayment=Ref. ödeme
CommercialProposalsShort=Teklifler
-Comment=Yorum
-Comments=Yorumlar
+Comment=Açıklama
+Comments=Açıklamalar
ActionsToDo=Yapılacak eylemler
ActionsDone=Biten eylemler
ActionsToDoShort=Yapılacaklar
@@ -645,6 +645,7 @@ OptionalFieldsSetup=Ekstra öznitelik ayarları
URLPhoto=Fotoğraf/logo İnternet adresi
SetLinkToThirdParty=Başka bir üçüncü parti bağlantısı
CreateDraft=Taslak oluştur
+SetToDraft=Taslağa geri dön
ClickToEdit=Düzenlemek için tıklayın
ObjectDeleted=Nesne %s silindi
ByCountry=Ülkeye göre
@@ -672,12 +673,12 @@ HelpCopyToClipboard=Panoya kopyalamak için Crtl+C
SaveUploadedFileWithMask=Dosyayı sunucuya "<strong>%s</strong>" (aksi durumda "%s") adıyla kaydedin
OriginFileName=Özgün dosya adı
SetDemandReason=Kaynağı ayarlayın
-SetBankAccount=Define Bank Account
-AccountCurrency=Account Currency
+SetBankAccount=Banka Hesabı Tanımla
+AccountCurrency=Hesap Para Birimi
ViewPrivateNote=Notları izle
XMoreLines=%s gizli satır(lar)
PublicUrl=Genel URL
-AddBox=Add box
+AddBox=Kutu ekle
# Week day
Monday=Pazartesi
diff --git a/htdocs/langs/tr_TR/orders.lang b/htdocs/langs/tr_TR/orders.lang
index a982292a7a8d3a58a1e1c775c675af5d1f883e57..2085c26d3d15243dd0ae11937ca1842e66f804c1 100644
--- a/htdocs/langs/tr_TR/orders.lang
+++ b/htdocs/langs/tr_TR/orders.lang
@@ -94,7 +94,7 @@ ConfirmCancelOrder=Bu siparişi iptal etmek istediğinizden emin misiniz?
ConfirmMakeOrder=Bu siparişi <b>%s</b> üzerine yaptığınızı onaylamak istediğinizden emin misiniz?
GenerateBill=Fatura oluştur
ClassifyShipped=Teslim edildi sınıflandır
-ClassifyBilled=Faturalandı sınıflandır
+ClassifyBilled=Faturalı olarak sınıflandır
ComptaCard=Muhasebe kartı
DraftOrders=Taslak sipariş
RelatedOrders=İlgili siparişler
@@ -137,7 +137,7 @@ OrderSource1=Internet
OrderSource2=Posta kampanyası
OrderSource3=Telefon kampanyası
OrderSource4=Faks kampanyası
-OrderSource5=Reklam
+OrderSource5=Ticari
OrderSource6=Mağaza
QtyOrdered=Sipariş miktarı
AddDeliveryCostLine=Siparişin ağırlığını belirten bir teslimat satırı ekleyin
diff --git a/htdocs/langs/tr_TR/other.lang b/htdocs/langs/tr_TR/other.lang
index ac878191a7faa8d16fafef68a01d5a7ea63ac825..d0d2a5d3b2c5f7266afb18944d4ec62dd9a797fc 100644
--- a/htdocs/langs/tr_TR/other.lang
+++ b/htdocs/langs/tr_TR/other.lang
@@ -59,12 +59,12 @@ PredefinedMailTest=Bu bir deneme postasıdır.\nİki satır enter tuşu ile ayr
PredefinedMailTestHtml=Bu bir <b>deneme</b> postası (deneme sözcüğü koyu olmalı).<br>İki satır enter tuşu ile ayrılmıştır.
PredefinedMailContentSendInvoice=__CONTACTCIVNAME__\n\nFaturanız buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendInvoiceReminder=__CONTACTCIVNAME__\n\nSize faturanız __FACREF__ için ödeme yapılmamış göründüğünü belirtmek isteriz. Anımsatma amacıyla ilgili fatura ekte sunulmuştur.\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
-PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz buradadır __PROPREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
+PredefinedMailContentSendProposal=__CONTACTCIVNAME__\n\nTeklifiniz bilgilerinize sunulmuştur __PROPREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
PredefinedMailContentSendOrder=__CONTACTCIVNAME__\n\nSiparişiniz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendSupplierOrder=__CONTACTCIVNAME__\n\nSiparişimiz buradadır __ORDERREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
PredefinedMailContentSendSupplierInvoice=__CONTACTCIVNAME__\n\nFatura buradadır __FACREF__\n\n__PERSONALIZED__Saygılar\n\n__SIGNATURE__
-PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nYou will find here the shipping __SHIPPINGREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
-PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the intervention __FICHINTERREF__\n\n__PERSONALIZED__Sincerely\n\n__SIGNATURE__
+PredefinedMailContentSendShipping=__CONTACTCIVNAME__\n\nSevkiyatınız bilgilerinize sunulmuştur __SHIPPINGREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
+PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nMüdahale bilgilerinize sunulmuştur __FICHINTERREF__\n\n__PERSONALIZED__Saygılarımızla\n\n__SIGNATURE__
PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n__PERSONALIZED__\n__SIGNATURE__
DemoDesc=Dolibarr birçok fonksiyonel modülden oluşan derlitoplu bir ERP/CRM programıdır. Bu durumda tüm modülleri içeren bir demo asla hiçbir şey demek değildir. Yani, birçok demo profili vardır.
ChooseYourDemoProfil=İşlemlerinize uyan demo profilini seçin...
@@ -80,6 +80,16 @@ ModifiedBy=%s tarafından düzenlendi
ValidatedBy=%s tarafından onaylandı
CanceledBy=%s tarafından iptal edildi
ClosedBy=%s tarafından kapatıldı
+CreatedById=Oluşturanın kullanıcı kimliği
+ModifiedById=Son değişikliği yapan kullanıcı kimliği
+ValidatedById=Doğrulayanın kullanıcı kimliği
+CanceledById=İptal edenin kullanıcı kimliği
+ClosedById=Kapatanın kullanıcı kimliği
+CreatedByLogin=Oluşturanın kullanıcı adı
+ModifiedByLogin=Son değişikliği yapanın kullanıcı adı
+ValidatedByLogin=Doğrulayanın kullanıcı adı
+CanceledByLogin=İptal edenin kullanıcı adı
+ClosedByLogin=Kapatanın kullanıcı adı
FileWasRemoved=%s dosyası kaldırıldı
DirWasRemoved=%s dizini kaldırıldı
FeatureNotYetAvailableShort=Gelecek sürümde olacaktır
diff --git a/htdocs/langs/tr_TR/products.lang b/htdocs/langs/tr_TR/products.lang
index 446eee8aba2e9deee248c2ee3f6e03a81ea05ece..a16fca7fd9e01692234e1b2f80eb94d30e904987 100644
--- a/htdocs/langs/tr_TR/products.lang
+++ b/htdocs/langs/tr_TR/products.lang
@@ -80,12 +80,12 @@ ContractStatusClosed=Kapalı
ContractStatusRunning=Yürürlükte
ContractStatusExpired=süresi doldu
ContractStatusOnHold=Yürürlükte değil
-ContractStatusToRun=To get running
+ContractStatusToRun=Yürülüğe alınacak
ContractNotRunning=Bu sözleşme çalışmıyor
ErrorProductAlreadyExists=%s Referanslı bir ürün zaten var var.
ErrorProductBadRefOrLabel=Referans veya etiket için yanlış değer.
ErrorProductClone=Ürün ya da hizmetin klonlanmasına çalışılırken bir sorun oluştu.
-ErrorPriceCantBeLowerThanMinPrice=Error Price Can't Be Lower Than Minimum Price.
+ErrorPriceCantBeLowerThanMinPrice=Hata! Fiyat Enaz Fiyattan düşük olamaz
Suppliers=Tedarikçiler
SupplierRef=Tedarikçi ürün ref.
ShowProduct=Ürün Göster
@@ -238,7 +238,7 @@ PriceByCustomer=Müşteri fiyatı
PriceCatalogue=Ürün/Servis için birim fiyat
PricingRule=Fiyatlandırma yetkileri
AddCustomerPrice=Müşteriler için fiyat ekle
-ForceUpdateChildPriceSoc=Set same price on customer subsidiaries
+ForceUpdateChildPriceSoc=Müşterinin ortaklılarına aynı fiyatı uygula
PriceByCustomerLog=Müşteri fiyat günlüğü
-MinimumPriceLimit=Minimum price can't be lower that %s
-MinimumRecommendedPrice=Minimum recommended price is : %s
+MinimumPriceLimit=Enaz fiyat bundan düşük olamaz %s
+MinimumRecommendedPrice=Önerilen enaz fiyat: %s
diff --git a/htdocs/langs/tr_TR/propal.lang b/htdocs/langs/tr_TR/propal.lang
index 8682cdc2452aad10108d497e1dd9e01bf8bd5426..d06f3c3525bf17a54a0eadedee2cb0172b7d0c35 100644
--- a/htdocs/langs/tr_TR/propal.lang
+++ b/htdocs/langs/tr_TR/propal.lang
@@ -37,7 +37,7 @@ PropalStatusDraft=Taslak (doğrulanması gerekir)
PropalStatusValidated=Onaylı (teklif açık)
PropalStatusOpened=Onaylı (teklif açık)
PropalStatusClosed=Kapalı
-PropalStatusSigned=İmzalanmış(faturalanması gerekiyor)
+PropalStatusSigned=İmzalı(faturalanacak)
PropalStatusNotSigned=İmzalanmamış (kapalı)
PropalStatusBilled=Faturalanmış
PropalStatusDraftShort=Taslak
@@ -48,7 +48,7 @@ PropalStatusSignedShort=İmzalı
PropalStatusNotSignedShort=İmzalanmamış
PropalStatusBilledShort=Faturalanmış
PropalsToClose=Kapatılacak teklifler
-PropalsToBill=Faturalandırılacak imzalı teklifler
+PropalsToBill=Faturalanacak imzalı teklifler
ListOfProposals=Teklif listesi
ActionsOnPropal=Tekliler için yapılan eylemler
NoOpenedPropals=Açık teklif yok
diff --git a/htdocs/langs/tr_TR/salaries.lang b/htdocs/langs/tr_TR/salaries.lang
index 848deb6d15047a1b6df7ef8811c785263193fa03..61c1db446e8e4b6a40fae7bcc26c731e66d393c7 100644
--- a/htdocs/langs/tr_TR/salaries.lang
+++ b/htdocs/langs/tr_TR/salaries.lang
@@ -1,4 +1,6 @@
# Dolibarr language file - Source file is en_US - users
+SALARIES_ACCOUNTING_ACCOUNT_PAYMENT=Ücret ödemeleri muhasebe kodu
+SALARIES_ACCOUNTING_ACCOUNT_CHARGE=Mali yükümlülük için muhasebe kodu
Salary=Ücret
Salaries=Ücretler
Employee=Çalışan
@@ -6,3 +8,5 @@ NewSalaryPayment=Yeni ücret ödemesi
SalaryPayment=Ücret ödemesi
SalariesPayments=Ücret ödemeleri
ShowSalaryPayment=Ücret ödemesi göster
+THM=Ortalama saat ücreti
+TJM=Ortalama günlük ücret
diff --git a/htdocs/langs/tr_TR/sendings.lang b/htdocs/langs/tr_TR/sendings.lang
index 4398ed922132ed64ea1aa097b2ecfe13215e2bfc..4c883321878bb5349716ffd3d260a51a0b3e9a07 100644
--- a/htdocs/langs/tr_TR/sendings.lang
+++ b/htdocs/langs/tr_TR/sendings.lang
@@ -54,7 +54,7 @@ StatsOnShipmentsOnlyValidated=İstatistikler yalnızca doğrulanmış sevkiyatla
DateDeliveryPlanned=Planlanan teslim tarihi
DateReceived=Teslim alınan tarih
SendShippingByEMail=Sevkiyatı EPostayla gönder
-SendShippingRef=%s sevkiyatını gönder
+SendShippingRef=% Nakliyatının yapılması
ActionsOnShipping=Sevkiyat eylemleri
LinkToTrackYourPackage=Paketinizi izleyeceğiniz bağlantı
ShipmentCreationIsDoneFromOrder=Şu an için, yeni bir sevkiyatın oluşturulması sipariş kartından yapılmıştır.
diff --git a/htdocs/langs/tr_TR/stocks.lang b/htdocs/langs/tr_TR/stocks.lang
index 85fccc85f8474b7b95f302b409c5de4447c8b870..74cba2a10c67e5133366e25f4226b34121748eec 100644
--- a/htdocs/langs/tr_TR/stocks.lang
+++ b/htdocs/langs/tr_TR/stocks.lang
@@ -62,8 +62,8 @@ OrderStatusNotReadyToDispatch=Sipariş henüz yoksa veya stok deposundan gönder
StockDiffPhysicTeoric=Fiziksel ve teorik stok arasındaki stok farkı
NoPredefinedProductToDispatch=Bu nesne için önceden tanımlanmış ürünlenyok. Yani stoktan sevk gerekli değildir.
DispatchVerb=Dağıtım
-StockLimitShort=Limit for alert
-StockLimit=Stock limit for alert
+StockLimitShort=Uyarı sınırı
+StockLimit=Stok sınırı uyarısı
PhysicalStock=Fiziksel stok
RealStock=Gerçek Stok
VirtualStock=Sanal stok
diff --git a/htdocs/langs/tr_TR/trips.lang b/htdocs/langs/tr_TR/trips.lang
index 8904b0aa553a7d338e0355a36b4c6de60e6abd6a..bd709af9859003f245fbf3aafc54ab2c9ce3c812 100644
--- a/htdocs/langs/tr_TR/trips.lang
+++ b/htdocs/langs/tr_TR/trips.lang
@@ -19,4 +19,4 @@ TF_TRIP=Gezi
ListTripsAndExpenses=Geziler ve giderler listesi
ExpensesArea=Geziler ve giderler alanı
SearchATripAndExpense=Bir gezi ve gider ara
-ClassifyRefunded=Classify 'Refunded'
+ClassifyRefunded=Sınıflandırma 'İade edildi'
diff --git a/htdocs/langs/tr_TR/users.lang b/htdocs/langs/tr_TR/users.lang
index 2c38dcba787aebd7579b7180ebe14b328160e375..50ee7de07b3ce713383d5961e33abd5badf8953f 100644
--- a/htdocs/langs/tr_TR/users.lang
+++ b/htdocs/langs/tr_TR/users.lang
@@ -15,7 +15,7 @@ AvailableRights=Varolan izinler
OwnedRights=Sahip olunan izinler
GroupRights=Grup izinleri
UserRights=Kullanıcı izinleri
-UserGUISetup=Kullanıcı ekranı kurulumu
+UserGUISetup=Kullanıcı ekranı ayarları
DisableUser=Engelle
DisableAUser=Bir kullanıcıyı engelle
DeleteUser=Sil
@@ -87,7 +87,7 @@ MyInformations=Verilerim
ExportDataset_user_1=Dolibarr kullanıcıları ve özellikleri
DomainUser=Etki alanı kullanıcısı %s
Reactivate=Yeniden etkinleştir
-CreateInternalUserDesc=This form allows you to create an user internal to your company/foundation. To create an external user (customer, supplier, ...), use the button 'Create Dolibarr user' from third party's contact card.
+CreateInternalUserDesc=Bu form firmanız/kurumunuz içinde kullanıcı oluşturmanızı sağlar. Dış kullanıcı (müşteri, tedarikçi,...) oluşturmak için üçüncü parti kişi kartlarından 'Dolibarr Kullanıcısı Oluştur' dğmesini kullan.
InternalExternalDesc=Bir <b>iç</b> kullanıcı firmanızın/derneğinizin bir parçasıdır. <br>Bir<b>dış</b> kullanıcı bir müşteri, tedarikçi veya bir başkasıdır.<br><br>Her iki durumda da, izinler Dolibarr’daki hakları tanımlar, aynı zamanda dış kullanıcı iç kullanıcıdan farklı bir menü yöeticisine sahiptir (Giriş->Kurulum->Görünüm’e bakın)
PermissionInheritedFromAGroup=İzin hak tanındı çünkü bir kullanıcının grubundan intikal etti.
Inherited=İntikal eden
@@ -114,8 +114,9 @@ YourRole=Sizin rolünüz
YourQuotaOfUsersIsReached=Aktif kullanıcı kotanıza ulaşıldı!
NbOfUsers=Kullanıcı sayısı
DontDowngradeSuperAdmin=Yalnızca bir SuperAdmin, bir SuperAdmin’inin derecesini düşürebilir
-HierarchicalResponsible=Sorumlu sıradüzeni
+HierarchicalResponsible=Yönetici
HierarchicView=Sıradüzeni görünümü
UseTypeFieldToChange=Değiştirmek için Alan türünü kullan
OpenIDURL=OpenID URL
LoginUsingOpenID=Giriş için OpenID kullan
+WeeklyHours=Haftalık saatler
diff --git a/htdocs/langs/uk_UA/accountancy.lang b/htdocs/langs/uk_UA/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/uk_UA/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/vi_VN/accountancy.lang b/htdocs/langs/vi_VN/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/vi_VN/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/langs/zh_CN/accountancy.lang b/htdocs/langs/zh_CN/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..27a516d5a4ffaec312cd8fed04bb71982b503e58
--- /dev/null
+++ b/htdocs/langs/zh_CN/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=会计
+Globalparameters=全局参数
+Chartofaccounts=科目表
+Fiscalyear=财年
+Menuaccount=会计账目
+Menuthirdpartyaccount=第三方帐户
+MenuTools=工具
+
+ConfigAccountingExpert=配置"会计专家模块"
+Journaux=日记帐
+JournalFinancial=财经杂志
+Exports=出口
+Modelcsv=出口型号
+Selectmodelcsv=选择一个“导出模型”
+Modelcsv_normal=典型的导出
+Modelcsv_CEGID=出口对Cegid的专家
+BackToChartofaccounts=返回科目表
+Back=返回
+
+Definechartofaccounts=定义会计科目表
+Selectchartofaccounts=选择会计科目表
+Validate=验证
+Addanaccount=添加一个会计帐户
+AccountAccounting=会计账户
+Ventilation=通风
+ToDispatch=派遣
+Dispatched=调度
+
+CustomersVentilation=通风客户
+SuppliersVentilation=通风系统供应商
+TradeMargin=贸易保证金
+Reports=报告
+ByCustomerInvoice=依据”发票“的客户
+ByMonth=按月份
+NewAccount=”新建“会计账户
+Update=更新
+List=名单
+Create=创建
+UpdateAccount=修改”会计帐户“
+UpdateMvts=对一个”活动“进行修改
+WriteBookKeeping=在”总账“中的”账户记录“
+Bookkeeping=总帐
+AccountBalanceByMonth=”账户余额“按月份
+
+AccountingVentilation=会计通风
+AccountingVentilationSupplier=会计通风的供应商
+AccountingVentilationCustomer=会计通风客户
+Line=线
+
+CAHTF=总采购供应商HT
+InvoiceLines=发票行进行通风
+InvoiceLinesDone=发票通风线
+IntoAccount=在会计帐户
+
+Ventilate=通风
+VentilationAuto=自动通风
+
+Processing=处理
+EndProcessing=处理的结束
+AnyLineVentilate=任何行通风
+SelectedLines=选系
+Lineofinvoice=发票行
+VentilatedinAccount=在会计账户成功通风
+NotVentilatedinAccount=不通风的会计账户
+
+ACCOUNTINGEX_SEPARATORCSV=CSV的”分隔符“
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=待显示的一个页面的元素个数（最大推荐：50）
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=由最近的元素开始通气“有通风”页面的排序
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=由最近的元素开始的通风“通风”的页面排序
+
+AccountLength=会计长度账户显示在的Dolibarr
+AccountLengthDesc=功能允许由零的数字代替空格假装会计账户的长度。这个函数只接触了显示屏，它不修改的Dolibarr登记的会计科目。为出口，这个功能是必要的，以与特定的软件兼容。
+ACCOUNTINGEX_LENGTH_GACCOUNT=一般账户的长度
+ACCOUNTINGEX_LENGTH_AACCOUNT=第三方账户的长度
+
+ACCOUNTINGEX_SELL_JOURNAL=卖杂志
+ACCOUNTINGEX_PURCHASE_JOURNAL=购买杂志
+ACCOUNTINGEX_BANK_JOURNAL=银行的”日记账“
+ACCOUNTINGEX_CASH_JOURNAL=现金的”日记账“
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=其他的”日记帐“
+ACCOUNTINGEX_SOCIAL_JOURNAL=社交的”日记帐“
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=转让帐户
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=等待的帐户
+
+COMPTA_PRODUCT_BUY_ACCOUNT=会计帐户默认情况下，购买的产品（如果在产品表没有定义）
+COMPTA_PRODUCT_SOLD_ACCOUNT=会计帐户默认为销售的产品（如果在产品表没有定义）
+COMPTA_SERVICE_BUY_ACCOUNT=会计帐户默认情况下，该买的服务（如果服务表没有定义）
+COMPTA_SERVICE_SOLD_ACCOUNT=会计帐户默认为卖服务（如果服务表没有定义）
+
+Doctype=文件类型
+Docdate=日期
+Docref=参考
+Numerocompte=帐户
+Code_tiers=第三方
+Labelcompte=标签帐户
+Debit=借记卡
+Credit=信用
+Amount=金额
+Sens=SENS
+Codejournal=日记帐
+
+DelBookKeeping=删除总帐的记录
+
+SellsJournal=出售的”日记帐“
+PurchasesJournal=购买的”日记帐“
+DescSellsJournal=出售的”日记帐“
+DescPurchasesJournal=购买的”日记帐“
+BankJournal=银行日记账
+DescBankJournal=银行日记账，包括支付现金以外的所有类型
+CashJournal=现金日记账
+DescCashJournal=现金日记账，包括支付现金的类型
+
+CashPayment=现金付款
+
+SupplierInvoicePayment=付款发票的供应商
+CustomerInvoicePayment=付款发票的客户
+
+ThirdPartyAccount=第三方账户
+
+NewAccountingMvt=创建新的活动
+NumMvts=移动号码
+ListeMvts=”活动“的列表
+ErrorDebitCredit=借记卡和信用卡在同一时间不能有一个值
+
+ReportThirdParty=列出第三方账户
+DescThirdPartyReport=在这里请教第三方客户及供应商，其会计账目清单
+
+ListAccounts=会计账目清单
+
+Pcgversion=该计划的版本
+Pcgtype=账户类
+Pcgsubtype=在类账户
+Accountparent=该帐户的根
+Active=声明
+
+NewFiscalYear=新财年
+
+DescVentilCustomer=在这里，请咨询您的发票客户的年度会计通风
+TotalVente=总成交量HT
+TotalMarge=总销售利润率
+DescVentilDoneCustomer=这里查阅发票的客户的行和其会计帐户的列表
+DescVentilTodoCustomer=与会计帐户通风客户发票行
+ChangeAccount=变化的账户选择行会计帐户：
+Vide=-
+DescVentilSupplier=在这里，请咨询您的发票供应商的年度会计通风
+DescVentilTodoSupplier=与会计帐户通风发票的供应商的线路
+DescVentilDoneSupplier=在这里请教发票的供应商的线条和其会计帐户列表
+
+ValidateHistory=自动验证
+
+ErrorAccountancyCodeIsAlreadyUse=错误，你不能删除这个会计帐户，因为它是用来
+
+FicheVentilation=通风卡
diff --git a/htdocs/langs/zh_TW/accountancy.lang b/htdocs/langs/zh_TW/accountancy.lang
new file mode 100644
index 0000000000000000000000000000000000000000..f103efef589d611e6e9ed07a13bde2a01f131dd3
--- /dev/null
+++ b/htdocs/langs/zh_TW/accountancy.lang
@@ -0,0 +1,158 @@
+# Dolibarr language file - en_US - Accounting Expert
+CHARSET=UTF-8
+
+Accounting=Accounting
+Globalparameters=Global parameters
+Chartofaccounts=Chart of accounts
+Fiscalyear=Fiscal years
+Menuaccount=Accounting accounts
+Menuthirdpartyaccount=Thirdparty accounts
+MenuTools=Tools
+
+ConfigAccountingExpert=Configuration of the module accounting expert
+Journaux=Journals
+JournalFinancial=Financial journals
+Exports=Exports
+Modelcsv=Model of export
+Selectmodelcsv=Select a model of export
+Modelcsv_normal=Classic export
+Modelcsv_CEGID=Export towards CEGID Expert
+BackToChartofaccounts=Return chart of accounts
+Back=Return
+
+Definechartofaccounts=Define a chart of accounts
+Selectchartofaccounts=Select a chart of accounts
+Validate=Validate
+Addanaccount=Add an accounting account
+AccountAccounting=Accounting account
+Ventilation=Ventilation
+ToDispatch=To dispatch
+Dispatched=Dispatched
+
+CustomersVentilation=Ventilation customers
+SuppliersVentilation=Ventilation suppliers
+TradeMargin=Trade margin
+Reports=Reports
+ByCustomerInvoice=By invoices customers
+ByMonth=By Month
+NewAccount=New accounting account
+Update=Update
+List=List
+Create=Create
+UpdateAccount=Modification of an accounting account
+UpdateMvts=Modification of a movement
+WriteBookKeeping=Record accounts in general ledger
+Bookkeeping=General ledger
+AccountBalanceByMonth=Account balance by month
+
+AccountingVentilation=Accounting ventilation
+AccountingVentilationSupplier=Accounting ventilation supplier
+AccountingVentilationCustomer=Accounting ventilation customer
+Line=Line
+
+CAHTF=Total purchase supplier HT
+InvoiceLines=Lines of invoice to be ventilated
+InvoiceLinesDone=Ventilated lines of invoice
+IntoAccount=In the accounting account
+
+Ventilate=Ventilate
+VentilationAuto=Automatic ventilation
+
+Processing=Processing
+EndProcessing=The end of processing
+AnyLineVentilate=Any lines to ventilate
+SelectedLines=Selected lines
+Lineofinvoice=Line of invoice
+VentilatedinAccount=Ventilated successfully in the accounting account
+NotVentilatedinAccount=Not ventilated in the accounting account
+
+ACCOUNTINGEX_SEPARATORCSV=Separator CSV
+
+ACCOUNTINGEX_LIMIT_LIST_VENTILATION=Number of elements to be ventilated shown by page (maximum recommended : 50)
+ACCOUNTINGEX_LIST_SORT_VENTILATION_TODO=Begin the sorting of the pages of ventilation "Has to ventilate" by the most recent elements
+ACCOUNTINGEX_LIST_SORT_VENTILATION_DONE=Begin the sorting of the pages of ventilation "Ventilated" by the most recent elements
+
+AccountLength=Length of the accounting accounts shown in Dolibarr
+AccountLengthDesc=Function allowing to feign a length of accounting account by replacing spaces by the zero figure. This function touches only the display, it does not modify the accounting accounts registered in Dolibarr. For the export, this function is necessary to be compatible with certain software.
+ACCOUNTINGEX_LENGTH_GACCOUNT=Length of the general accounts
+ACCOUNTINGEX_LENGTH_AACCOUNT=Length of the third party accounts
+
+ACCOUNTINGEX_SELL_JOURNAL=Sell journal
+ACCOUNTINGEX_PURCHASE_JOURNAL=Purchase journal
+ACCOUNTINGEX_BANK_JOURNAL=Bank journal
+ACCOUNTINGEX_CASH_JOURNAL=Cash journal
+ACCOUNTINGEX_MISCELLANEOUS_JOURNAL=Miscellaneous journal
+ACCOUNTINGEX_SOCIAL_JOURNAL=Social journal
+
+ACCOUNTINGEX_ACCOUNT_TRANSFER_CASH=Account of transfer
+ACCOUNTINGEX_ACCOUNT_SUSPENSE=Account of wait
+
+COMPTA_PRODUCT_BUY_ACCOUNT=Accounting account by default for bought products (if not defined in the product sheet)
+COMPTA_PRODUCT_SOLD_ACCOUNT=Accounting account by default for the sold products (if not defined in the product sheet)
+COMPTA_SERVICE_BUY_ACCOUNT=Accounting account by default for the bought services (if not defined in the service sheet)
+COMPTA_SERVICE_SOLD_ACCOUNT=Accounting account by default for the sold services (if not defined in the service sheet)
+
+Doctype=Type of document
+Docdate=Date
+Docref=Reference
+Numerocompte=Account
+Code_tiers=Thirdparty
+Labelcompte=Label account
+Debit=Debit
+Credit=Credit
+Amount=Amount
+Sens=Sens
+Codejournal=Journal
+
+DelBookKeeping=Delete the records of the general ledger
+
+SellsJournal=Sells journal
+PurchasesJournal=Purchases journal
+DescSellsJournal=Sells journal
+DescPurchasesJournal=Purchases journal
+BankJournal=Bank journal
+DescBankJournal=Bank journal including all the types of payments other than cash
+CashJournal=Cash journal
+DescCashJournal=Cash journal including the type of payment cash
+
+CashPayment=Cash Payment
+
+SupplierInvoicePayment=Payment of invoice supplier
+CustomerInvoicePayment=Payment of invoice customer
+
+ThirdPartyAccount=Thirdparty account
+
+NewAccountingMvt=New movement
+NumMvts=Number of movement
+ListeMvts=List of the movement
+ErrorDebitCredit=Debit and Credit cannot have a value at the same time
+
+ReportThirdParty=List thirdparty account
+DescThirdPartyReport=Consult here the list of the thirdparty customers and the suppliers and their accounting accounts
+
+ListAccounts=List of the accounting accounts
+
+Pcgversion=Version of the plan
+Pcgtype=Class of account
+Pcgsubtype=Under class of account
+Accountparent=Root of the account
+Active=Statement
+
+NewFiscalYear=New fiscal year
+
+DescVentilCustomer=Consult here the annual accounting ventilation of your invoices customers
+TotalVente=Total turnover HT
+TotalMarge=Total sales margin
+DescVentilDoneCustomer=Consult here the list of the lines of invoices customers and their accounting account
+DescVentilTodoCustomer=Ventilate your lines of customer invoice with an accounting account
+ChangeAccount=Change the accounting account for lines selected by the account:
+Vide=-
+DescVentilSupplier=Consult here the annual accounting ventilation of your invoices suppliers
+DescVentilTodoSupplier=Ventilate your lines of invoice supplier with an accounting account
+DescVentilDoneSupplier=Consult here the list of the lines of invoices supplier and their accounting account
+
+ValidateHistory=Validate Automatically
+
+ErrorAccountancyCodeIsAlreadyUse=Error, you cannot delete this accounting account because it is used
+
+FicheVentilation=Ventilation card
diff --git a/htdocs/livraison/card.php b/htdocs/livraison/card.php
index 34380c8843cacd6d653543657c7032630c0e6127..98f08803af4746b907f261b7f28d887047cccf8f 100644
--- a/htdocs/livraison/card.php
+++ b/htdocs/livraison/card.php
@@ -2,7 +2,7 @@
/* Copyright (C) 2003-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2010 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005 Simon TOSSER <simon@kornog-computing.com>
- * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2007 Franky Van Liedekerke <franky.van.liedekerke@telenet.be>
* Copyright (C) 2013 Florian Henry <florian.henry@open-concept.pro>
*
@@ -53,22 +53,33 @@ $id = GETPOST('id', 'int');
if ($user->societe_id) $socid=$user->societe_id;
$result=restrictedArea($user,'expedition',$id,'livraison','livraison');
+$object = new Livraison($db);
+// Load object
+if ($id > 0 || ! empty($ref)) {
+ $ret = $object->fetch($id, $ref);
+ if ($ret > 0)
+ $ret = $object->fetch_thirdparty();
+ if ($ret < 0)
+ dol_print_error('', $object->error);
+}
+
+// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
+$hookmanager->initHooks(array('deliverycard','globalcard'));
/*
* Actions
*/
+$parameters=array();
+$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
if ($action == 'add')
{
$db->begin();
- // Creation de l'objet livraison
- $delivery = new Livraison($db);
-
- $delivery->date_livraison = time();
- $delivery->note = $_POST["note"];
- $delivery->commande_id = $_POST["commande_id"];
+ $object->date_livraison = time();
+ $object->note = $_POST["note"];
+ $object->commande_id = $_POST["commande_id"];
if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled))
{
@@ -78,7 +89,7 @@ if ($action == 'add')
// On boucle sur chaque ligne de commande pour completer objet livraison
// avec qte a livrer
$commande = new Commande($db);
- $commande->fetch($delivery->commande_id);
+ $commande->fetch($object->commande_id);
$commande->fetch_lines();
$num=count($commande->lines);
for ($i = 0; $i < $num; $i++)
@@ -87,20 +98,20 @@ if ($action == 'add')
$idl = "idl".$i;
if ($_POST[$qty] > 0)
{
- $delivery->addline($_POST[$idl],$_POST[$qty]);
+ $object->addline($_POST[$idl],$_POST[$qty]);
}
}
- $ret=$delivery->create($user);
+ $ret=$object->create($user);
if ($ret > 0)
{
$db->commit();
- header("Location: ".$_SERVER['PHP_SELF']."?id=".$delivery->id);
+ header("Location: ".$_SERVER['PHP_SELF']."?id=".$object->id);
exit;
}
else
{
- setEventMessage($delivery->error, 'errors');
+ setEventMessage($object->error, 'errors');
$db->rollback();
$_GET["commande_id"]=$_POST["commande_id"];
@@ -110,10 +121,6 @@ if ($action == 'add')
else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->expedition->livraison->valider)
{
- $object = new Livraison($db);
- $object->fetch($id);
- $object->fetch_thirdparty();
-
$result = $object->valid($user);
// Define output language
@@ -140,10 +147,6 @@ else if ($action == 'confirm_valid' && $confirm == 'yes' && $user->rights->exped
if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expedition->livraison->supprimer)
{
- $object = new Livraison($db);
- $object->fetch($id);
- $object->fetch_thirdparty();
-
$db->begin();
$result=$object->delete();
@@ -162,14 +165,7 @@ if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->expeditio
if ($action == 'setdate_livraison' && $user->rights->expedition->livraison->creer)
{
- $object = new Livraison($db);
- $object->fetch($id);
- $object->fetch_thirdparty();
-
- //print "x ".$_POST['liv_month'].", ".$_POST['liv_day'].", ".$_POST['liv_year'];
$datedelivery=dol_mktime(GETPOST('liv_hour','int'), GETPOST('liv_min','int'), 0, GETPOST('liv_month','int'), GETPOST('liv_day','int'), GETPOST('liv_year','int'));
-
- $object->fetch($id);
$result=$object->set_date_livraison($user,$datedelivery);
if ($result < 0)
{
@@ -182,10 +178,6 @@ if ($action == 'setdate_livraison' && $user->rights->expedition->livraison->cree
*/
if ($action == 'builddoc') // En get ou en post
{
- $object = new Livraison($db);
- $object->fetch($id);
- $object->fetch_thirdparty();
-
// Save last template used to generate document
if (GETPOST('model')) $object->setDocModel($user, GETPOST('model','alpha'));
@@ -216,16 +208,11 @@ elseif ($action == 'remove_file')
{
require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
- $object = new Livraison($db);
- if ($object->fetch($id))
- {
- $object->fetch_thirdparty();
- $upload_dir = $conf->expedition->dir_output . "/receipt";
- $file = $upload_dir . '/' . GETPOST('file');
- $ret=dol_delete_file($file,0,0,0,$object);
- if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
- else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
- }
+ $upload_dir = $conf->expedition->dir_output . "/receipt";
+ $file = $upload_dir . '/' . GETPOST('file');
+ $ret=dol_delete_file($file,0,0,0,$object);
+ if ($ret) setEventMessage($langs->trans("FileWasRemoved", GETPOST('urlfile')));
+ else setEventMessage($langs->trans("ErrorFailToDeleteFile", GETPOST('urlfile')), 'errors');
}
@@ -256,7 +243,7 @@ if ($action == 'create')
$commande = new Commande($db);
$commande->livraison_array();
- if ($commande->fetch($_GET["commande_id"]))
+ if ($commande->fetch(GETPOST("commande_id")))
{
$soc = new Societe($db);
$soc->fetch($commande->socid);
@@ -271,7 +258,7 @@ if ($action == 'create')
/*
* Commande
*/
- print '<form action="card.php" method="post">';
+ print '<form action="'.$_SERVER['PHP_SELF'].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
print '<input type="hidden" name="commande_id" value="'.$commande->id.'">';
@@ -281,7 +268,7 @@ if ($action == 'create')
}
print '<table class="border" width="100%">';
print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
- print '<td width="30%"><b><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$soc->id.'">'.$soc->nom.'</a></b></td>';
+ print '<td width="30%"><b><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$soc->id.'">'.$soc->name.'</a></b></td>';
print '<td width="50%" colspan="2">';
@@ -461,29 +448,29 @@ else
/* */
/* *************************************************************************** */
{
- if ($id > 0)
+ if ($object->id > 0)
{
- $delivery = new Livraison($db);
- $result = $delivery->fetch($id);
- $delivery->fetch_thirdparty();
-
// Origin of a 'livraison' (delivery) is ALWAYS 'expedition' (shipment).
// However, origin of shipment in future may differs (commande, proposal, ...)
+ // TODO REGIS:
+ // Je ne suis pas d'accord, beaucoup entreprises n'utilisent pas les bons d'expéditions car ces derniers sont gérés par le transporteur,
+ // donc les bons de livraisons peuvent avoir une origine différente de 'expedition'
+ // les bons de livraisons et d'expéditions devraient être considérés comme des objets à part entière, voir des modules différents comme une propal ou autres.
$expedition=new Expedition($db);
- $result = $expedition->fetch($delivery->origin_id);
+ $result = $expedition->fetch($object->origin_id);
$typeobject = $expedition->origin; // example: commande
- if ($delivery->origin_id > 0)
+ if ($object->origin_id > 0)
{
- $delivery->fetch_origin();
+ $object->fetch_origin();
}
- if ($delivery->id > 0)
+ if ($object->id > 0)
{
$soc = new Societe($db);
- $soc->fetch($delivery->socid);
+ $soc->fetch($object->socid);
- $head=delivery_prepare_head($delivery);
+ $head=delivery_prepare_head($object);
dol_fiche_head($head, 'delivery', $langs->trans("Shipment"), 0, 'sending');
/*
@@ -493,7 +480,7 @@ else
if ($action == 'delete')
{
$expedition_id = GETPOST("expid");
- print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$delivery->id.'&expid='.$expedition_id.'&backtopage='.urlencode($backtopage),$langs->trans("DeleteDeliveryReceipt"),$langs->trans("DeleteDeliveryReceiptConfirm",$delivery->ref),'confirm_delete','','',1);
+ print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id.'&expid='.$expedition_id.'&backtopage='.urlencode($backtopage),$langs->trans("DeleteDeliveryReceipt"),$langs->trans("DeleteDeliveryReceiptConfirm",$object->ref),'confirm_delete','','',1);
}
@@ -502,7 +489,7 @@ else
*/
if ($action == 'valid')
{
- print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$delivery->id,$langs->trans("ValidateDeliveryReceipt"),$langs->trans("ValidateDeliveryReceiptConfirm",$delivery->ref),'confirm_valid','','',1);
+ print $form->formconfirm($_SERVER['PHP_SELF'].'?id='.$object->id,$langs->trans("ValidateDeliveryReceipt"),$langs->trans("ValidateDeliveryReceiptConfirm",$object->ref),'confirm_valid','','',1);
}
@@ -513,7 +500,7 @@ else
print '<table class="border" width="100%">';
// Shipment
- if (($delivery->origin == 'shipment' || $delivery->origin == 'expedition') && $delivery->origin_id > 0)
+ if (($object->origin == 'shipment' || $object->origin == 'expedition') && $object->origin_id > 0)
{
$linkback = '<a href="'.DOL_URL_ROOT.'/expedition/list.php">'.$langs->trans("BackToList").'</a>';
@@ -528,7 +515,7 @@ else
// Ref
print '<tr><td width="20%">'.$langs->trans("Ref").'</td>';
- print '<td colspan="3">'.$delivery->ref.'</td></tr>';
+ print '<td colspan="3">'.$object->ref.'</td></tr>';
// Client
print '<tr><td width="20%">'.$langs->trans("Customer").'</td>';
@@ -559,12 +546,12 @@ else
// Ref client
print '<tr><td>'.$langs->trans("RefCustomer").'</td>';
- print '<td colspan="3">'.$delivery->ref_customer."</a></td>\n";
+ print '<td colspan="3">'.$object->ref_customer."</a></td>\n";
print '</tr>';
// Date
print '<tr><td>'.$langs->trans("DateCreation").'</td>';
- print '<td colspan="3">'.dol_print_date($delivery->date_creation,'daytext')."</td>\n";
+ print '<td colspan="3">'.dol_print_date($object->date_creation,'daytext')."</td>\n";
print '</tr>';
// Date delivery real / Received
@@ -573,21 +560,21 @@ else
print $langs->trans('DateReceived');
print '</td>';
- if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&id='.$delivery->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
+ if ($action != 'editdate_livraison') print '<td align="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editdate_livraison&id='.$object->id.'">'.img_edit($langs->trans('SetDeliveryDate'),1).'</a></td>';
print '</tr></table>';
print '</td><td colspan="2">';
if ($action == 'editdate_livraison')
{
- print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$delivery->id.'" method="post">';
+ print '<form name="setdate_livraison" action="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="setdate_livraison">';
- $form->select_date($delivery->date_delivery?$delivery->date_delivery:-1,'liv_',1,1,'',"setdate_livraison");
+ $form->select_date($object->date_delivery?$object->date_delivery:-1,'liv_',1,1,'',"setdate_livraison");
print '<input type="submit" class="button" value="'.$langs->trans('Modify').'">';
print '</form>';
}
else
{
- print $delivery->date_delivery ? dol_print_date($delivery->date_delivery,'dayhourtext') : ' ';
+ print $object->date_delivery ? dol_print_date($object->date_delivery,'dayhourtext') : ' ';
}
print '</td>';
print '</tr>';
@@ -595,7 +582,7 @@ else
// Note Public
print '<tr><td>'.$langs->trans("NotePublic").'</td>';
print '<td colspan="3">';
- print nl2br($delivery->note_public);
+ print nl2br($object->note_public);
/*$doleditor = new DolEditor('note_public', $object->note_public, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1);*/
print "</td></tr>";
@@ -603,7 +590,7 @@ else
// Note Private
print '<tr><td>'.$langs->trans("NotePrivate").'</td>';
print '<td colspan="3">';
- print nl2br($delivery->note_private);
+ print nl2br($object->note_private);
/*$doleditor = new DolEditor('note_pprivate', $object->note_private, '', 80, 'dolibarr_notes', 'In', 0, false, true, ROWS_3, 70);
print $doleditor->Create(1);*/
print "</td></tr>";
@@ -611,14 +598,14 @@ else
// Statut
print '<tr><td>'.$langs->trans("Status").'</td>';
- print '<td colspan="3">'.$delivery->getLibStatut(4)."</td>\n";
+ print '<td colspan="3">'.$object->getLibStatut(4)."</td>\n";
print '</tr>';
if (!$conf->expedition_bon->enabled && ! empty($conf->stock->enabled))
{
// Entrepot
$entrepot = new Entrepot($db);
- $entrepot->fetch($delivery->entrepot_id);
+ $entrepot->fetch($object->entrepot_id);
print '<tr><td width="20%">'.$langs->trans("Warehouse").'</td>';
print '<td colspan="3"><a href="'.DOL_URL_ROOT.'/product/stock/card.php?id='.$entrepot->id.'">'.$entrepot->libelle.'</a></td>';
print '</tr>';
@@ -630,7 +617,7 @@ else
* Lignes produits
*/
- $num_prod = count($delivery->lines);
+ $num_prod = count($object->lines);
$i = 0; $total = 0;
print '<table class="noborder" width="100%">';
@@ -651,66 +638,65 @@ else
$var=!$var;
print "<tr ".$bc[$var].">";
- if ($delivery->lines[$i]->fk_product > 0)
+ if ($object->lines[$i]->fk_product > 0)
{
$product = new Product($db);
- $product->fetch($delivery->lines[$i]->fk_product);
+ $product->fetch($object->lines[$i]->fk_product);
// Define output language
if (! empty($conf->global->MAIN_MULTILANGS) && ! empty($conf->global->PRODUIT_TEXTS_IN_THIRDPARTY_LANGUAGE))
{
- $delivery->fetch_thirdparty();
$outputlangs = $langs;
$newlang='';
if (empty($newlang) && ! empty($_REQUEST['lang_id'])) $newlang=$_REQUEST['lang_id'];
- if (empty($newlang)) $newlang=$delivery->client->default_lang;
+ if (empty($newlang)) $newlang=$object->client->default_lang;
if (! empty($newlang))
{
$outputlangs = new Translate("",$conf);
$outputlangs->setDefaultLang($newlang);
}
- $label = (! empty($product->multilangs[$outputlangs->defaultlang]["label"])) ? $product->multilangs[$outputlangs->defaultlang]["label"] : $delivery->lines[$i]->product_label;
+ $label = (! empty($product->multilangs[$outputlangs->defaultlang]["label"])) ? $product->multilangs[$outputlangs->defaultlang]["label"] : $object->lines[$i]->product_label;
}
else
- $label = ( ! empty($delivery->lines[$i]->label)?$delivery->lines[$i]->label:$delivery->lines[$i]->product_label);
+ $label = ( ! empty($object->lines[$i]->label)?$object->lines[$i]->label:$object->lines[$i]->product_label);
print '<td>';
// Affiche ligne produit
- $text = '<a href="'.DOL_URL_ROOT.'/product/card.php?id='.$delivery->lines[$i]->fk_product.'">';
- if ($delivery->lines[$i]->fk_product_type==1) $text.= img_object($langs->trans('ShowService'),'service');
+ $text = '<a href="'.DOL_URL_ROOT.'/product/card.php?id='.$object->lines[$i]->fk_product.'">';
+ if ($object->lines[$i]->fk_product_type==1) $text.= img_object($langs->trans('ShowService'),'service');
else $text.= img_object($langs->trans('ShowProduct'),'product');
- $text.= ' '.$delivery->lines[$i]->product_ref.'</a>';
+ $text.= ' '.$object->lines[$i]->product_ref.'</a>';
$text.= ' - '.$label;
- $description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($delivery->lines[$i]->description));
+ $description=(! empty($conf->global->PRODUIT_DESC_IN_FORM)?'':dol_htmlentitiesbr($object->lines[$i]->description));
//print $description;
print $form->textwithtooltip($text,$description,3,'','',$i);
- print_date_range($delivery->lines[$i]->date_start,$delivery->lines[$i]->date_end);
+ print_date_range($object->lines[$i]->date_start,$object->lines[$i]->date_end);
if (! empty($conf->global->PRODUIT_DESC_IN_FORM))
{
- print (! empty($delivery->lines[$i]->description) && $delivery->lines[$i]->description!=$delivery->lines[$i]->product_label)?'<br>'.dol_htmlentitiesbr($delivery->lines[$i]->description):'';
+ print (! empty($object->lines[$i]->description) && $object->lines[$i]->description!=$object->lines[$i]->product_label)?'<br>'.dol_htmlentitiesbr($object->lines[$i]->description):'';
}
}
else
{
print "<td>";
- if ($delivery->lines[$i]->fk_product_type==1) $text = img_object($langs->trans('Service'),'service');
+ if ($object->lines[$i]->fk_product_type==1) $text = img_object($langs->trans('Service'),'service');
else $text = img_object($langs->trans('Product'),'product');
- if (! empty($delivery->lines[$i]->label)) {
- $text.= ' <strong>'.$delivery->lines[$i]->label.'</strong>';
- print $form->textwithtooltip($text,$delivery->lines[$i]->description,3,'','',$i);
+ if (! empty($object->lines[$i]->label)) {
+ $text.= ' <strong>'.$object->lines[$i]->label.'</strong>';
+ print $form->textwithtooltip($text,$object->lines[$i]->description,3,'','',$i);
} else {
- print $text.' '.nl2br($delivery->lines[$i]->description);
+ print $text.' '.nl2br($object->lines[$i]->description);
}
print_date_range($objp->date_start,$objp->date_end);
print "</td>\n";
}
- print '<td align="center">'.$delivery->lines[$i]->qty_asked.'</td>';
- print '<td align="center">'.$delivery->lines[$i]->qty_shipped.'</td>';
+ print '<td align="center">'.$object->lines[$i]->qty_asked.'</td>';
+ print '<td align="center">'.$object->lines[$i]->qty_shipped.'</td>';
print "</tr>";
@@ -730,20 +716,20 @@ else
{
print '<div class="tabsAction">';
- if ($delivery->statut == 0 && $user->rights->expedition->livraison->valider && $num_prod > 0)
+ if ($object->statut == 0 && $user->rights->expedition->livraison->valider && $num_prod > 0)
{
- print '<a class="butAction" href="card.php?id='.$delivery->id.'&action=valid">'.$langs->trans("Validate").'</a>';
+ print '<a class="butAction" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=valid">'.$langs->trans("Validate").'</a>';
}
if ($user->rights->expedition->livraison->supprimer)
{
if ($conf->expedition_bon->enabled)
{
- print '<a class="butActionDelete" href="card.php?id='.$delivery->id.'&expid='.$delivery->origin_id.'&action=delete&backtopage='.urlencode(DOL_URL_ROOT.'/expedition/card.php?id='.$delivery->origin_id).'">'.$langs->trans("Delete").'</a>';
+ print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&expid='.$object->origin_id.'&action=delete&backtopage='.urlencode(DOL_URL_ROOT.'/expedition/card.php?id='.$object->origin_id).'">'.$langs->trans("Delete").'</a>';
}
else
{
- print '<a class="butActionDelete" href="card.php?id='.$delivery->id.'&action=delete">'.$langs->trans("Delete").'</a>';
+ print '<a class="butActionDelete" href="'.$_SERVER['PHP_SELF'].'?id='.$object->id.'&action=delete">'.$langs->trans("Delete").'</a>';
}
}
@@ -757,22 +743,22 @@ else
* Documents generated
*/
- $deliveryref = dol_sanitizeFileName($delivery->ref);
- $filedir = $conf->expedition->dir_output . "/receipt/" . $deliveryref;
- $urlsource = $_SERVER["PHP_SELF"]."?id=".$delivery->id;
+ $objectref = dol_sanitizeFileName($object->ref);
+ $filedir = $conf->expedition->dir_output . "/receipt/" . $objectref;
+ $urlsource = $_SERVER["PHP_SELF"]."?id=".$object->id;
$genallowed=$user->rights->expedition->livraison->creer;
$delallowed=$user->rights->expedition->livraison->supprimer;
- $somethingshown=$formfile->show_documents('livraison',$deliveryref,$filedir,$urlsource,$genallowed,$delallowed,$delivery->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
+ $somethingshown=$formfile->show_documents('livraison',$objectref,$filedir,$urlsource,$genallowed,$delallowed,$object->modelpdf,1,0,0,28,0,'','','',$soc->default_lang);
/*
* Linked object block (of linked shipment)
*/
- if ($delivery->origin == 'expedition')
+ if ($object->origin == 'expedition')
{
$shipment = new Expedition($db);
- $shipment->fetch($delivery->origin_id);
+ $shipment->fetch($object->origin_id);
$somethingshown=$shipment->showLinkedObjectBlock();
}
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 98e0a48aa501a0863b0d5898783b7e1de2a79102..b20d94164d67fc4e2b3e1e96319eb9aee1109605 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1821,7 +1821,7 @@ function printSearchForm($urlaction,$urlobject,$title,$htmlmodesearch,$htmlinput
if (! empty($conf->global->MAIN_HTML5_PLACEHOLDER)) $ret.=' placeholder="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
else $ret.=' title="'.$langs->trans("SearchOf").''.strip_tags($title).'"';
$ret.=' name="'.$htmlinputname.'" id="'.$htmlinputname.'" size="10" />';
- $ret.='<input type="submit" class="button" value="'.$langs->trans("Go").'">';
+ $ret.='<input type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px" value="'.$langs->trans("Go").'">';
$ret.="</form>\n";
return $ret;
}
diff --git a/htdocs/margin/agentMargins.php b/htdocs/margin/agentMargins.php
index df43f39ff2e8ccf4da8dbbc1f248637c5eaffd79..3dd0fcd0b49d3ed982b988237cdb01726a27f143 100644
--- a/htdocs/margin/agentMargins.php
+++ b/htdocs/margin/agentMargins.php
@@ -106,7 +106,7 @@ print "</table>";
print '</form>';
$sql = "SELECT";
-if ($agentid > 0) $sql.= " s.rowid as socid, s.nom, s.code_client, s.client,";
+if ($agentid > 0) $sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
$sql.= " u.rowid as agent, u.login, u.lastname, u.firstname,";
$sql.= " sum(d.total_ht) as selling_price,";
$sql.= " sum(".$db->ifsql('d.total_ht <=0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,";
@@ -201,7 +201,7 @@ if ($result)
print "<tr ".$bc[$var].">";
if ($agentid > 0) {
$companystatic->id=$objp->socid;
- $companystatic->nom=$objp->nom;
+ $companystatic->name=$objp->name;
$companystatic->client=$objp->client;
print "<td>".$companystatic->getNomUrl(1,'customer')."</td>\n";
}
diff --git a/htdocs/margin/customerMargins.php b/htdocs/margin/customerMargins.php
index c0f7e41b97e6afbc21cc565483e86ac2976f2a87..fbc947a7cc9d093bdc2fc0af7ccc0a45e4ef2636 100644
--- a/htdocs/margin/customerMargins.php
+++ b/htdocs/margin/customerMargins.php
@@ -161,7 +161,7 @@ print "</table>";
print '</form>';
$sql = "SELECT";
-$sql.= " s.rowid as socid, s.nom, s.code_client, s.client,";
+$sql.= " s.rowid as socid, s.nom as name, s.code_client, s.client,";
if ($client) $sql.= " f.rowid as facid, f.facnumber, f.total as total_ht, f.datef, f.paye, f.fk_statut as statut,";
$sql.= " sum(d.total_ht) as selling_price,";
$sql.= " sum(".$db->ifsql('d.total_ht <=0','d.qty * d.buy_price_ht * -1','d.qty * d.buy_price_ht').") as buying_price,";
@@ -258,7 +258,7 @@ if ($result)
}
else {
$companystatic->id=$objp->socid;
- $companystatic->nom=$objp->nom;
+ $companystatic->name=$objp->name;
$companystatic->client=$objp->client;
print "<td>".$companystatic->getNomUrl(1,'customer')."</td>\n";
}
diff --git a/htdocs/margin/tabs/productMargins.php b/htdocs/margin/tabs/productMargins.php
index 0e6734c0916cf11bd13e4497c64bf133c34f8186..46cf4245b60c00a4505ab14d61474b6f6a194afa 100644
--- a/htdocs/margin/tabs/productMargins.php
+++ b/htdocs/margin/tabs/productMargins.php
@@ -129,7 +129,7 @@ if ($id > 0 || ! empty($ref))
if ($user->rights->facture->lire) {
- $sql = "SELECT s.nom, s.rowid as socid, s.code_client,";
+ $sql = "SELECT s.nom as name, s.rowid as socid, s.code_client,";
$sql.= " f.rowid as facid, f.facnumber, f.total as total_ht,";
$sql.= " f.datef, f.paye, f.fk_statut as statut,";
if (!$user->rights->societe->client->voir && !$socid) $sql.= " sc.fk_soc, sc.fk_user,";
@@ -206,7 +206,7 @@ if ($id > 0 || ! empty($ref))
$invoicestatic->ref=$objp->facnumber;
print $invoicestatic->getNomUrl(1);
print "</td>\n";
- print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
print "<td>".$objp->code_client."</td>\n";
print "<td align=\"center\">";
print dol_print_date($db->jdate($objp->datef),'day')."</td>";
diff --git a/htdocs/opensurvey/class/opensurveysondage.class.php b/htdocs/opensurvey/class/opensurveysondage.class.php
index c1ceb4faa8ea89b687c697fa3b97748ad846e3e1..bcc1146c71440e9f18e18e060fc820ab43d3960a 100644
--- a/htdocs/opensurvey/class/opensurveysondage.class.php
+++ b/htdocs/opensurvey/class/opensurveysondage.class.php
@@ -392,7 +392,7 @@ class Opensurveysondage extends CommonObject
function fetch_lines()
{
$ret=array();
- $sql = "SELECT id_users, nom, reponses FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
+ $sql = "SELECT id_users, nom as name, reponses FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
$sql.= " WHERE id_sondage = '".$this->db->escape($this->id_sondage)."'";
$resql=$this->db->query($sql);
@@ -403,7 +403,7 @@ class Opensurveysondage extends CommonObject
while ($i < $num)
{
$obj=$this->db->fetch_object($resql);
- $tmp=array('id_users'=>$obj->id_users, 'nom'=>$obj->nom, 'reponses'=>$obj->reponses);
+ $tmp=array('id_users'=>$obj->id_users, 'nom'=>$obj->name, 'reponses'=>$obj->reponses);
$ret[]=$tmp;
$i++;
diff --git a/htdocs/opensurvey/exportcsv.php b/htdocs/opensurvey/exportcsv.php
index fec8174a7efb7c95f241804cf07a0222bdee78e0..7096ae7ad99745048d98d50678a2d7dc37849198 100644
--- a/htdocs/opensurvey/exportcsv.php
+++ b/htdocs/opensurvey/exportcsv.php
@@ -82,7 +82,7 @@ if (strpos($object->sujet,'@') !== false)
}
-$sql ='SELECT nom, reponses';
+$sql ='SELECT nom as name, reponses';
$sql.=' FROM '.MAIN_DB_PREFIX."opensurvey_user_studs";
$sql.=" WHERE id_sondage='" . $db->escape($numsondage) . "'";
$sql.=" ORDER BY id_users";
@@ -95,8 +95,8 @@ if ($resql)
{
$obj=$db->fetch_object($resql);
- // Le nom de l'utilisateur
- $nombase=str_replace("°","'",$obj->nom);
+ // Le name de l'utilisateur
+ $nombase=str_replace("°","'",$obj->name);
$input.=$nombase.';';
//affichage des resultats
diff --git a/htdocs/opensurvey/public/studs.php b/htdocs/opensurvey/public/studs.php
index 9b9f2e9ef8cd7ca70f5675fe5ded20700c03bdc9..1b39391b67c6a26a52352cd889c29014f8d70cc4 100644
--- a/htdocs/opensurvey/public/studs.php
+++ b/htdocs/opensurvey/public/studs.php
@@ -113,7 +113,9 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // bout
$nom=substr(GETPOST("nom"),0,64);
// Check if vote already exists
- $sql = 'SELECT id_users, nom FROM '.MAIN_DB_PREFIX."opensurvey_user_studs WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."' ORDER BY id_users";
+ $sql = 'SELECT id_users, nom as name';
+ $sql.= ' FROM '.MAIN_DB_PREFIX."opensurvey_user_studs';
+ $sql.= ' WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."' ORDER BY id_users";
$resql = $db->query($sql);
$num_rows = $db->num_rows($resql);
if ($num_rows > 0)
@@ -389,7 +391,7 @@ else
$sumfor = array();
$sumagainst = array();
$compteur = 0;
-$sql ="SELECT id_users, nom, id_sondage, reponses";
+$sql ="SELECT id_users, nom as name, id_sondage, reponses";
$sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
$sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'";
$resql=$db->query($sql);
@@ -406,7 +408,7 @@ while ($compteur < $num)
$ensemblereponses = $obj->reponses;
// ligne d'un usager pré-authentifié
- $mod_ok = (in_array($obj->nom, $listofvoters));
+ $mod_ok = (in_array($obj->name, $listofvoters));
if (!$mod_ok && !$object->allow_spy) {
$compteur++;
@@ -416,7 +418,7 @@ while ($compteur < $num)
print '<tr>'."\n";
// Name
- print '<td class="nom">'.dol_htmlentities($obj->nom).'</td>'."\n";
+ print '<td class="nom">'.dol_htmlentities($obj->name).'</td>'."\n";
// si la ligne n'est pas a changer, on affiche les données
if (! $testligneamodifier)
diff --git a/htdocs/opensurvey/results.php b/htdocs/opensurvey/results.php
index 3bfd3209343d12209c10cc8a3032987f742c7b80..226bc0c0465c9ce315250bcfbf06ed7609c677a1 100644
--- a/htdocs/opensurvey/results.php
+++ b/htdocs/opensurvey/results.php
@@ -83,7 +83,7 @@ if (GETPOST("boutonp") || GETPOST("boutonp.x") || GETPOST("boutonp_x")) // bout
$nom=substr(GETPOST("nom"),0,64);
// Check if vote already exists
- $sql = 'SELECT id_users, nom';
+ $sql = 'SELECT id_users, nom as name';
$sql.= ' FROM '.MAIN_DB_PREFIX.'opensurvey_user_studs';
$sql.= " WHERE id_sondage='".$db->escape($numsondage)."' AND nom = '".$db->escape($nom)."'";
$sql.= ' ORDER BY id_users';
@@ -283,7 +283,7 @@ for ($i = 0; $i < $nblignes; $i++)
// Loop on each answer
$compteur = 0;
- $sql ="SELECT id_users, nom, id_sondage, reponses";
+ $sql ="SELECT id_users, nom as name, id_sondage, reponses";
$sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
$sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'";
$resql=$db->query($sql);
@@ -341,7 +341,7 @@ for ($i = 0; $i < $nbcolonnes; $i++)
// Clean current answer to remove deleted columns
$compteur = 0;
- $sql ="SELECT id_users, nom, id_sondage, reponses";
+ $sql ="SELECT id_users, nom as name, id_sondage, reponses";
$sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
$sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'";
dol_syslog('sql='.$sql);
@@ -756,7 +756,7 @@ else
$sumfor = array();
$sumagainst = array();
$compteur = 0;
-$sql ="SELECT id_users, nom, id_sondage, reponses";
+$sql ="SELECT id_users, nom as name, id_sondage, reponses";
$sql.=" FROM ".MAIN_DB_PREFIX."opensurvey_user_studs";
$sql.=" WHERE id_sondage = '".$db->escape($numsondage)."'";
dol_syslog('sql='.$sql);
@@ -780,7 +780,7 @@ while ($compteur < $num)
}
// Name
- print '</td><td class="nom">'.dol_htmlentities($obj->nom).'</td>'."\n";
+ print '</td><td class="nom">'.dol_htmlentities($obj->name).'</td>'."\n";
// si la ligne n'est pas a changer, on affiche les données
if (! $testligneamodifier)
diff --git a/htdocs/paybox/lib/paybox.lib.php b/htdocs/paybox/lib/paybox.lib.php
index 09bacc3764ff62e120ce97fb81462d788c19decb..78c500c75513a761c88ca5939b2be1ed8a52fc2a 100644
--- a/htdocs/paybox/lib/paybox.lib.php
+++ b/htdocs/paybox/lib/paybox.lib.php
@@ -281,7 +281,7 @@ function html_print_paybox_footer($fromcompany,$langs)
print '<br><br><hr>'."\n";
print '<center><font style="font-size: 10px;">'."\n";
- print $fromcompany->nom.'<br>';
+ print $fromcompany->name.'<br>';
print $line1.'<br>';
print $line2;
print '</font></center>'."\n";
diff --git a/htdocs/paypal/lib/paypal.lib.php b/htdocs/paypal/lib/paypal.lib.php
index cc678fce01175301b4d1a641d80c0d60065e273f..c1440d80245f42a617f7f21b502c2662979a15d2 100644
--- a/htdocs/paypal/lib/paypal.lib.php
+++ b/htdocs/paypal/lib/paypal.lib.php
@@ -154,7 +154,7 @@ function html_print_paypal_footer($fromcompany,$langs)
print '<br><br><hr>'."\n";
print '<center><font style="font-size: 10px;">'."\n";
- print $fromcompany->nom.'<br>';
+ print $fromcompany->name.'<br>';
print $line1.'<br>';
print $line2;
print '</font></center>'."\n";
diff --git a/htdocs/product/admin/product.php b/htdocs/product/admin/product.php
index e79ffcf13c68ece79b1a09002d3ef6ad66593144..7ecc390516d427cd01190ca202661dd17d80a54b 100644
--- a/htdocs/product/admin/product.php
+++ b/htdocs/product/admin/product.php
@@ -48,7 +48,7 @@ $select_pricing_rules=array(
'PRODUIT_MULTIPRICES'=>$langs->trans('MultiPricesAbility'), // Several prices according to a customer level
'PRODUIT_CUSTOMER_PRICES'=>$langs->trans('PriceByCustomer') // Different price for each customer
);
-if ($conf->global->MAIN_FEATURES_LEVEL==2)
+if ($conf->global->MAIN_FEATURES_LEVEL==2)
{
$select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY'] = $langs->trans('PriceByQuantity');
$select_pricing_rules['PRODUIT_CUSTOMER_PRICES_BY_QTY&PRODUIT_MULTIPRICES'] = $langs->trans('MultiPricesAbility') . '+' . $langs->trans('PriceByQuantity');
@@ -125,7 +125,7 @@ if ($action == 'pricingrule')
else
{
$multirule=explode('&',$princingrules);
- foreach($multirule as $rulesselected)
+ foreach($multirule as $rulesselected)
{
$res = dolibarr_set_const($db, $rulesselected, 1, 'chaine', 0, '', $conf->entity);
}
@@ -137,8 +137,8 @@ if ($action == 'pricingrule')
$res = dolibarr_set_const($db, $rule, 0, 'chaine', 0, '', $conf->entity);
}
}
-
- }
+
+ }
}
else if ($action == 'sousproduits')
{
@@ -262,7 +262,7 @@ foreach ($dirproduct as $dirroot)
$var = !$var;
print '<tr '.$bc[$var].'>'."\n";
- print '<td width="140">'.$modCodeProduct->nom.'</td>'."\n";
+ print '<td width="140">'.$modCodeProduct->name.'</td>'."\n";
print '<td>'.$modCodeProduct->info($langs).'</td>'."\n";
print '<td class="nowrap">'.$modCodeProduct->getExample($langs).'</td>'."\n";
diff --git a/htdocs/product/card.php b/htdocs/product/card.php
index 28b0db5efe956ad47a29d8a9cadc1454f9eb1485..a9f533ba40b4da4b90f7d687c7ed1e0e880f51dd 100644
--- a/htdocs/product/card.php
+++ b/htdocs/product/card.php
@@ -1,16 +1,16 @@
<?php
-/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
- * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
- * Copyright (C) 2006 Auguria SARL <info@auguria.org>
- * Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2013-2014 Marcos García <marcosgdf@gmail.com>
- * Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
- * Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
- * Copyright (C) 2014 Cédric Gross <c.gross@kreiz-it.fr>
- * Copyright (C) 2014 Ferran Marcet <fmarcet@2byte.es>
+/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005 Eric Seigne <eric.seigne@ryxeo.com>
+ * Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
+ * Copyright (C) 2006 Auguria SARL <info@auguria.org>
+ * Copyright (C) 2010-2014 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2013-2014 Marcos García <marcosgdf@gmail.com>
+ * Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014 Cédric Gross <c.gross@kreiz-it.fr>
+ * Copyright (C) 2014 Ferran Marcet <fmarcet@2byte.es>
*
* 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
@@ -48,7 +48,7 @@ $langs->load("products");
$langs->load("other");
if (! empty($conf->stock->enabled)) $langs->load("stocks");
if (! empty($conf->facture->enabled)) $langs->load("bills");
-if ($conf->productbatch->enabled) $langs->load("productbatch");
+if (! empty($conf->productbatch->enabled)) $langs->load("productbatch");
$mesg=''; $error=0; $errors=array(); $_error=0;
@@ -88,7 +88,7 @@ $fieldtype = (! empty($ref) ? 'ref' : 'rowid');
$result=restrictedArea($user,'produit|service',$fieldvalue,'product&product','','',$fieldtype,$objcanvas);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('productcard'));
+$hookmanager->initHooks(array('productcard','globalcard'));
@@ -863,7 +863,7 @@ else
print '</td></tr>';
// Batch number management
- if ($conf->productbatch->enabled)
+ if (! empty($conf->productbatch->enabled))
{
print '<tr><td class="fieldrequired">'.$langs->trans("Status").' ('.$langs->trans("Batch").')</td><td colspan="3">';
$statutarray=array('0' => $langs->trans("ProductStatusNotOnBatch"), '1' => $langs->trans("ProductStatusOnBatch"));
diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php
index 13a6d1dfa417b26cc8cda773cad04b3152094ae2..e78daeba6313fbfa3c8fb78e367b0b16f6fa7d4e 100644
--- a/htdocs/product/class/product.class.php
+++ b/htdocs/product/class/product.class.php
@@ -1,15 +1,15 @@
<?php
-/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2013 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
- * Copyright (C) 2007-2011 Jean Heimburger <jean@tiaris.info>
- * Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
- * Copyright (C) 2013-2014 Cedric GROSS <c.gross@kreiz-it.fr>
- * Copyright (C) 2013-2014 Marcos García <marcosgdf@gmail.com>
- * Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
- * Copyright (C) 2014 Henry Florian <florian.henry@open-concept.pro>
- * Copyright (C) 2014 Philippe Grand <philippe.grand@atoo-net.com>
+/* Copyright (C) 2001-2007 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2006 Andre Cianfarani <acianfa@free.fr>
+ * Copyright (C) 2007-2011 Jean Heimburger <jean@tiaris.info>
+ * Copyright (C) 2010-2013 Juanjo Menent <jmenent@2byte.es>
+ * Copyright (C) 2013-2014 Cedric GROSS <c.gross@kreiz-it.fr>
+ * Copyright (C) 2013-2014 Marcos García <marcosgdf@gmail.com>
+ * Copyright (C) 2011-2014 Alexandre Spangaro <alexandre.spangaro@gmail.com>
+ * Copyright (C) 2014 Henry Florian <florian.henry@open-concept.pro>
+ * Copyright (C) 2014 Philippe Grand <philippe.grand@atoo-net.com>
*
* 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
@@ -2856,7 +2856,7 @@ class Product extends CommonObject
{
global $langs;
$langs->load('products');
- if ($conf->productbatch->enabled) $langs->load("productbatch");
+ if (!empty($conf->productbatch->enabled)) $langs->load("productbatch");
if ($type == 2)
{
diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php
index efe03b0b024d4f4b4c047da69c94a5dacd910cb8..8c71f29581b06d6dc6a121665743ba94ac0ee878 100644
--- a/htdocs/product/composition/card.php
+++ b/htdocs/product/composition/card.php
@@ -295,7 +295,7 @@ if ($id > 0 || ! empty($ref))
}
else
{
- print price($object->price).' '.$langs->trans($object->price_base_type);
+ print price($object->price).' '.$langs->trans($object->price_base_type?$object->price_base_type:'HT');
}
print '</td></tr>';
@@ -307,7 +307,7 @@ if ($id > 0 || ! empty($ref))
}
else
{
- print price($object->price_min).' '.$langs->trans($object->price_base_type);
+ print price($object->price_min).' '.$langs->trans($object->price_base_type?$object->price_base_type:'HT');
}
print '</td></tr>';
}
diff --git a/htdocs/product/fournisseurs.php b/htdocs/product/fournisseurs.php
index 8720c9cf8926a82b570d402d0ab9923e2bfda11e..9832e57eb6d06e287471cb8013223dfc5e219913 100644
--- a/htdocs/product/fournisseurs.php
+++ b/htdocs/product/fournisseurs.php
@@ -60,7 +60,7 @@ if ($user->societe_id) $socid=$user->societe_id;
$result=restrictedArea($user,'produit|service&fournisseur',$fieldvalue,'product&product','','',$fieldtype);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('pricesuppliercard'));
+$hookmanager->initHooks(array('pricesuppliercard','globalcard'));
$product = new ProductFournisseur($db);
$product->fetch($id,$ref);
diff --git a/htdocs/product/index.php b/htdocs/product/index.php
index fb2830e9e579111ea490c9a02fc062c74014f47d..3e18cc5d042a8f5e65b019dedbad542f307800c4 100644
--- a/htdocs/product/index.php
+++ b/htdocs/product/index.php
@@ -1,8 +1,8 @@
<?php
-/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2014 Charles-Fr BENKE <charles.fr@benke.fr>
+/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2014 Charles-Fr BENKE <charles.fr@benke.fr>
*
* 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
@@ -367,7 +367,8 @@ function activitytrim($product_type)
$result = $db->query($sql);
if ($result)
{
- $tmpyear=$beginyear;
+ //$tmpyear=$beginyear; // FIXME $beginyear is not defined
+ $tmpyear=0;
$trim1=0;
$trim2=0;
$trim3=0;
diff --git a/htdocs/product/stats/commande.php b/htdocs/product/stats/commande.php
index bf96d63459e3abf8a83d0f05a66c057e78d5b6d6..472b9ce4a4549bac4817402cb870cf55937d1a52 100644
--- a/htdocs/product/stats/commande.php
+++ b/htdocs/product/stats/commande.php
@@ -118,7 +118,7 @@ if ($id > 0 || ! empty($ref))
print '</div>';
- $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client, c.rowid, c.total_ht as total_ht, c.ref,";
+ $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client, c.rowid, c.total_ht as total_ht, c.ref,";
$sql.= " c.date_commande, c.fk_statut as statut, c.facture, c.rowid as commandeid, d.qty";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -168,7 +168,7 @@ if ($id > 0 || ! empty($ref))
print '<td><a href="'.DOL_URL_ROOT.'/commande/card.php?id='.$objp->commandeid.'">'.img_object($langs->trans("ShowOrder"),"order").' ';
print $objp->ref;
print "</a></td>\n";
- print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
print "<td>".$objp->code_client."</td>\n";
print "<td align=\"center\">";
print dol_print_date($db->jdate($objp->date_commande))."</td>";
diff --git a/htdocs/product/stats/commande_fournisseur.php b/htdocs/product/stats/commande_fournisseur.php
index 93c880695d322b488bec7226a0277ebd0737945b..73de0374ebe61c353f954bedc51e1cf0dc4d378b 100644
--- a/htdocs/product/stats/commande_fournisseur.php
+++ b/htdocs/product/stats/commande_fournisseur.php
@@ -110,7 +110,7 @@ if ($id > 0 || ! empty($ref))
print "</table>";
print '</div>';
- $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
+ $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client,";
$sql.= " c.rowid, c.total_ht as total_ht, c.ref,";
$sql.= " c.date_commande, c.fk_statut as statut, c.rowid as commandeid, d.qty";
if (!$user->rights->societe->client->voir && !$socid) $sql .= ", sc.fk_soc, sc.fk_user ";
@@ -164,7 +164,7 @@ if ($id > 0 || ! empty($ref))
print "<tr ".$bc[$var].">";
print '<td>'.$commandestatic->getNomUrl(1)."</td>\n";
print "</a></td>\n";
- print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
print "<td>".$objp->code_client."</td>\n";
print '<td align="center">'.dol_print_date($db->jdate($objp->date_commande))."</td>";
print "<td align=\"center\">".$objp->qty."</td>\n";
diff --git a/htdocs/product/stats/contrat.php b/htdocs/product/stats/contrat.php
index 6c73d0183faa837faaf3feaf1b99479734b25487..189ead2eaa2736bf8344fd367002e3a7fb616f44 100644
--- a/htdocs/product/stats/contrat.php
+++ b/htdocs/product/stats/contrat.php
@@ -124,7 +124,7 @@ if ($id > 0 || ! empty($ref))
$sql.= ' sum('.$db->ifsql("cd.statut=4 AND (cd.date_fin_validite IS NULL OR cd.date_fin_validite <= '".$db->idate($now)."')",1,0).') as nb_late,';
$sql.= ' sum('.$db->ifsql("cd.statut=5",1,0).') as nb_closed,';
$sql.= " c.rowid as rowid, c.date_contrat, c.statut as statut,";
- $sql.= " s.nom, s.rowid as socid, s.code_client";
+ $sql.= " s.nom as name, s.rowid as socid, s.code_client";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
$sql.= ", ".MAIN_DB_PREFIX."contrat as c";
@@ -174,7 +174,7 @@ if ($id > 0 || ! empty($ref))
print '<td><a href="'.DOL_URL_ROOT.'/contrat/card.php?id='.$objp->rowid.'">'.img_object($langs->trans("ShowContract"),"contract").' ';
print $objp->rowid;
print "</a></td>\n";
- print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
print "<td>".$objp->code_client."</td>\n";
print "<td align=\"center\">";
print dol_print_date($db->jdate($objp->date_contrat))."</td>";
diff --git a/htdocs/product/stats/facture.php b/htdocs/product/stats/facture.php
index 1959d53035e44da0cfeb30bdac98645da2228b1a..39768262f1080d3c98dd5cf556847511ab66f2ab 100644
--- a/htdocs/product/stats/facture.php
+++ b/htdocs/product/stats/facture.php
@@ -123,7 +123,7 @@ if ($id > 0 || ! empty($ref))
if ($user->rights->facture->lire) {
- $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client,";
+ $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client,";
$sql.= " f.facnumber, f.total as total_ht,";
$sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, d.qty";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
@@ -171,7 +171,7 @@ if ($id > 0 || ! empty($ref))
$invoicestatic->ref=$objp->facnumber;
print $invoicestatic->getNomUrl(1);
print "</td>\n";
- print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
print "<td>".$objp->code_client."</td>\n";
print '<td align="center">';
print dol_print_date($db->jdate($objp->datef),'day')."</td>";
diff --git a/htdocs/product/stats/facture_fournisseur.php b/htdocs/product/stats/facture_fournisseur.php
index 1b07ce3d1ba593d2ef984577effed79bee9d1453..d8e30bdae6ae34253bc76cfa060b2bb77a299eb4 100644
--- a/htdocs/product/stats/facture_fournisseur.php
+++ b/htdocs/product/stats/facture_fournisseur.php
@@ -122,7 +122,7 @@ if ($id > 0 || ! empty($ref))
print '</div>';
- $sql = "SELECT distinct s.nom, s.rowid as socid, s.code_client, f.ref, f.total_ht as total_ht,";
+ $sql = "SELECT distinct s.nom as name, s.rowid as socid, s.code_client, f.ref, f.total_ht as total_ht,";
$sql.= " f.datef, f.paye, f.fk_statut as statut, f.rowid as facid, d.qty";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -172,7 +172,7 @@ if ($id > 0 || ! empty($ref))
$supplierinvoicestatic->ref=$objp->facnumber;
print $supplierinvoicestatic->getNomUrl(1);
print "</td>\n";
- print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/fourn/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
print "<td>".$objp->code_client."</td>\n";
print "<td align=\"center\">";
print dol_print_date($db->jdate($objp->datef))."</td>";
diff --git a/htdocs/product/stats/propal.php b/htdocs/product/stats/propal.php
index 3368efa2b565a852c3dc7e76d231c523491c92b6..566961d9c5f37b0329356833e6dda524542844c8 100644
--- a/htdocs/product/stats/propal.php
+++ b/htdocs/product/stats/propal.php
@@ -113,7 +113,7 @@ if ($id > 0 || ! empty($ref))
print '</div>';
- $sql = "SELECT DISTINCT s.nom, s.rowid as socid, p.rowid as propalid, p.ref, p.total_ht as amount,";
+ $sql = "SELECT DISTINCT s.nom as name, s.rowid as socid, p.rowid as propalid, p.ref, p.total_ht as amount,";
$sql.= "p.datep, p.fk_statut as statut, d.qty";
if (!$user->rights->societe->client->voir && !$socid) $sql.= ", sc.fk_soc, sc.fk_user ";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
@@ -161,7 +161,7 @@ if ($id > 0 || ! empty($ref))
print '<td><a href="'.DOL_URL_ROOT.'/comm/propal.php?id='.$objp->propalid.'">'.img_object($langs->trans("ShowPropal"),"propal").' ';
print $objp->ref;
print '</a></td>'."\n";
- print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->nom,44).'</a></td>';
+ print '<td><a href="'.DOL_URL_ROOT.'/comm/card.php?socid='.$objp->socid.'">'.img_object($langs->trans("ShowCompany"),"company").' '.dol_trunc($objp->name,44).'</a></td>';
print '<td align="center">';
print dol_print_date($db->jdate($objp->datep))."</td>";
print "<td align=\"center\">".$objp->qty."</td>\n";
diff --git a/htdocs/product/stock/card.php b/htdocs/product/stock/card.php
index 01d5516a48026b82f1ea6a5f4b7e774065810268..051a0575aaa1e88451b6dcee011581d7c3f4208b 100644
--- a/htdocs/product/stock/card.php
+++ b/htdocs/product/stock/card.php
@@ -1,8 +1,8 @@
<?php
-/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2005 Simon Tosser <simon@kornog-computing.com>
- * Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2003-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005 Simon Tosser <simon@kornog-computing.com>
+ * Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
*
* 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
@@ -36,6 +36,8 @@ $langs->load("stocks");
$langs->load("companies");
$action=GETPOST('action');
+$cancel=GETPOST('cancel');
+$confirm=GETPOST('confirm');
$sortfield = GETPOST("sortfield",'alpha');
$sortorder = GETPOST("sortorder",'alpha');
@@ -47,7 +49,7 @@ if (! $sortorder) $sortorder="DESC";
$result=restrictedArea($user,'stock');
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('warehousecard'));
+$hookmanager->initHooks(array('warehousecard','globalcard'));
/*
@@ -59,17 +61,17 @@ if ($action == 'add' && $user->rights->stock->creer)
{
$object = new Entrepot($db);
- $object->ref = $_POST["ref"];
- $object->libelle = $_POST["libelle"];
- $object->description = $_POST["desc"];
- $object->statut = $_POST["statut"];
- $object->lieu = $_POST["lieu"];
- $object->address = $_POST["address"];
- $object->zip = $_POST["zipcode"];
- $object->town = $_POST["town"];
- $object->country_id = $_POST["country_id"];
-
- if ($object->libelle) {
+ $object->ref = GETPOST("ref");
+ $object->libelle = GETPOST("libelle");
+ $object->description = GETPOST("desc");
+ $object->statut = GETPOST("statut");
+ $object->lieu = GETPOST("lieu");
+ $object->address = GETPOST("address");
+ $object->zip = GETPOST("zipcode");
+ $object->town = GETPOST("town");
+ $object->country_id = GETPOST("country_id");
+
+ if (! empty($object->libelle)) {
$id = $object->create($user);
if ($id > 0)
{
@@ -87,7 +89,7 @@ if ($action == 'add' && $user->rights->stock->creer)
}
// Delete warehouse
-if ($action == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' && $user->rights->stock->supprimer)
+if ($action == 'confirm_delete' && $confirm == 'yes' && $user->rights->stock->supprimer)
{
$object = new Entrepot($db);
$object->fetch($_REQUEST["id"]);
@@ -105,19 +107,19 @@ if ($action == 'confirm_delete' && $_REQUEST["confirm"] == 'yes' && $user->right
}
// Modification entrepot
-if ($action == 'update' && $_POST["cancel"] <> $langs->trans("Cancel"))
+if ($action == 'update' && $cancel <> $langs->trans("Cancel"))
{
$object = new Entrepot($db);
if ($object->fetch($id))
{
- $object->libelle = $_POST["libelle"];
- $object->description = $_POST["desc"];
- $object->statut = $_POST["statut"];
- $object->lieu = $_POST["lieu"];
- $object->address = $_POST["address"];
- $object->zip = $_POST["zipcode"];
- $object->town = $_POST["town"];
- $object->country_id = $_POST["country_id"];
+ $object->libelle = GETPOST("libelle");
+ $object->description = GETPOST("desc");
+ $object->statut = GETPOST("statut");
+ $object->lieu = GETPOST("lieu");
+ $object->address = GETPOST("address");
+ $object->zip = GETPOST("zipcode");
+ $object->town = GETPOST("town");
+ $object->country_id = GETPOST("country_id");
if ( $object->update($id, $user) > 0)
{
@@ -136,7 +138,7 @@ if ($action == 'update' && $_POST["cancel"] <> $langs->trans("Cancel"))
}
}
-if ($_POST["cancel"] == $langs->trans("Cancel"))
+if ($cancel == $langs->trans("Cancel"))
{
$action = '';
}
@@ -162,37 +164,36 @@ if ($action == 'create')
print "<form action=\"card.php\" method=\"post\">\n";
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="add">';
- print '<input type="hidden" name="type" value="'.$type.'">'."\n";
print '<table class="border" width="100%">';
// Ref
print '<tr><td width="25%" class="fieldrequired">'.$langs->trans("Ref").'</td><td colspan="3"><input name="libelle" size="20" value=""></td></tr>';
- print '<tr><td >'.$langs->trans("LocationSummary").'</td><td colspan="3"><input name="lieu" size="40" value="'.$object->lieu.'"></td></tr>';
+ print '<tr><td >'.$langs->trans("LocationSummary").'</td><td colspan="3"><input name="lieu" size="40" value="'.(!empty($object->lieu)?$object->lieu:'').'"></td></tr>';
// Description
print '<tr><td valign="top">'.$langs->trans("Description").'</td><td colspan="3">';
// Editeur wysiwyg
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
- $doleditor=new DolEditor('desc',$object->description,'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70);
+ $doleditor=new DolEditor('desc',(!empty($object->description)?$object->description:''),'',180,'dolibarr_notes','In',false,true,$conf->fckeditor->enabled,5,70);
$doleditor->Create();
print '</td></tr>';
print '<tr><td>'.$langs->trans('Address').'</td><td colspan="3"><textarea name="address" cols="60" rows="3" wrap="soft">';
- print $object->address;
+ print (!empty($object->address)?$object->address:'');
print '</textarea></td></tr>';
// Zip / Town
print '<tr><td>'.$langs->trans('Zip').'</td><td>';
- print $formcompany->select_ziptown($object->zip,'zipcode',array('town','selectcountry_id','state_id'),6);
+ print $formcompany->select_ziptown((!empty($object->zip)?$object->zip:''),'zipcode',array('town','selectcountry_id','state_id'),6);
print '</td><td>'.$langs->trans('Town').'</td><td>';
- print $formcompany->select_ziptown($object->town,'town',array('zipcode','selectcountry_id','state_id'));
+ print $formcompany->select_ziptown((!empty($object->town)?$object->town:''),'town',array('zipcode','selectcountry_id','state_id'));
print '</td></tr>';
// Country
print '<tr><td width="25%">'.$langs->trans('Country').'</td><td colspan="3">';
- print $form->select_country($object->country_id?$object->country_id:$mysoc->country_code,'country_id');
+ print $form->select_country((!empty($object->country_id)?$object->country_id:$mysoc->country_code),'country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionarySetup"),1);
print '</td></tr>';
diff --git a/htdocs/product/stock/list.php b/htdocs/product/stock/list.php
index 0d7b3c60c23ef286279ac3443f2ebdef7ff39eae..85fb7c1896db4449e71cd6559c7f0cda2b68f961 100644
--- a/htdocs/product/stock/list.php
+++ b/htdocs/product/stock/list.php
@@ -1,7 +1,7 @@
<?php
-/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2001-2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
*
* 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
@@ -39,7 +39,7 @@ $sortfield = GETPOST("sortfield");
$sortorder = GETPOST("sortorder");
if (! $sortfield) $sortfield="e.label";
if (! $sortorder) $sortorder="ASC";
-$page = $_GET["page"];
+$page = GETPOST("page");
if ($page < 0) $page = 0;
$limit = $conf->liste_limit;
$offset = $limit * $page;
diff --git a/htdocs/product/stock/massstockmove.php b/htdocs/product/stock/massstockmove.php
index 87fec698274259ac0e315787845c63fc0b688836..8a0b7297e2f9c145ed61fe48a62b8e841f833357 100644
--- a/htdocs/product/stock/massstockmove.php
+++ b/htdocs/product/stock/massstockmove.php
@@ -1,5 +1,6 @@
<?php
-/* Copyright (C) 2013 Laurent Destaileur <ely@users.sourceforge.net>
+/* Copyright (C) 2013 Laurent Destaileur <ely@users.sourceforge.net>
+ * Copyright (C) 2014 Regis Houssin <regis.houssin@capnetworks.com>
*
* 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
@@ -228,7 +229,7 @@ $warehousestatict = new Entrepot($db);
$title = $langs->trans('MassMovement');
-llxHeader('', $title, $helpurl, '');
+llxHeader('', $title);
print_fiche_titre($langs->trans("MassStockMovement")).'<br><br>';
@@ -249,6 +250,8 @@ print '<input type="hidden" name="action" value="addline">';
print '<table class="liste" width="100%">';
//print '<div class="tagtable centpercent">';
+$param='';
+
print '<tr class="liste_titre">';
print getTitleFieldOfList($langs->trans('ProductRef'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder);
print getTitleFieldOfList($langs->trans('WarehouseSource'),0,$_SERVER["PHP_SELF"],'',$param,'','class="tagtd"',$sortfield,$sortorder);
diff --git a/htdocs/product/stock/mouvement.php b/htdocs/product/stock/mouvement.php
index 2feeee7aa2d0ca051878af6b305506ae40662762..50b46c7003f4d7273f7cce4d895193530e85e105 100644
--- a/htdocs/product/stock/mouvement.php
+++ b/htdocs/product/stock/mouvement.php
@@ -1,7 +1,7 @@
<?php
-/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
- * Copyright (C) 2005-2009 Regis Houssin <regis.houssin@capnetworks.com>
+/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
+ * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2005-2014 Regis Houssin <regis.houssin@capnetworks.com>
*
* 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
@@ -406,8 +406,8 @@ if ($resql)
if ($search_product_ref) $param.='&search_product_ref='.urlencode($search_product_ref);
if ($search_product) $param.='&search_product='.urlencode($search_product);
if ($search_warehouse) $param.='&search_warehouse='.urlencode($search_warehouse);
- if ($sref) $param.='&sref='.urlencode($sref);
- if ($snom) $param.='&snom='.urlencode($snom);
+ if (!empty($sref)) $param.='&sref='.urlencode($sref); // FIXME $sref is not defined
+ if (!empty($snom)) $param.='&snom='.urlencode($snom); // FIXME $snom is not defined
if ($search_user) $param.='&search_user='.urlencode($search_user);
if ($idproduct > 0) $param.='&idproduct='.$idproduct;
if ($id) print_barre_liste($texte, $page, $_SERVER["PHP_SELF"], $param, $sortfield, $sortorder,'',$num,0,'');
diff --git a/htdocs/product/stock/replenish.php b/htdocs/product/stock/replenish.php
index 04a1cf32e6009725f055005fe798cc23865e5b49..35835709ab8c540366b209467509d0649724c6d1 100644
--- a/htdocs/product/stock/replenish.php
+++ b/htdocs/product/stock/replenish.php
@@ -1,6 +1,7 @@
<?php
-/* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
- * Copyright (C) 2013-2014 Laurent Destaileur <ely@users.sourceforge.net>
+/* Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2013-2014 Laurent Destaileur <ely@users.sourceforge.net>
+ * Copyright (C) 2014 Regis Houssin <regis.houssin@capnetworks.com>
*
* 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
@@ -50,6 +51,9 @@ $tobuy = GETPOST('tobuy', 'int');
$salert = GETPOST('salert', 'alpha');
$mode = GETPOST('mode','alpha');
+$fourn_id = GETPOST('fourn_id','int');
+$texte = '';
+
$sortfield = GETPOST('sortfield','alpha');
$sortorder = GETPOST('sortorder','alpha');
$page = GETPOST('page','int');
@@ -197,7 +201,7 @@ if (! empty($conf->global->STOCK_CALCULATE_ON_SHIPMENT) || ! empty($conf->global
$usevirtualstock=-1;
if ($virtualdiffersfromphysical)
{
- $usevirtualstock=($conf->global->STOCK_USE_VIRTUAL_STOCK?1:0);
+ $usevirtualstock=(! empty($conf->global->STOCK_USE_VIRTUAL_STOCK)?1:0);
if ($mode=='virtual') $usevirtualstock=1;
if ($mode=='physical') $usevirtualstock=0;
}
@@ -426,7 +430,7 @@ print '<tr class="liste_titre">'.
if (!empty($conf->service->enabled) && $type == 1) print '<td class="liste_titre"> </td>';
print '<td class="liste_titre"> </td>'.
'<td class="liste_titre" align="right"> </td>'.
- '<td class="liste_titre" align="right">' . $langs->trans('AlertOnly') . ' <input type="checkbox" id="salert" name="salert" ' . $alertchecked . '></td>'.
+ '<td class="liste_titre" align="right">' . $langs->trans('AlertOnly') . ' <input type="checkbox" id="salert" name="salert" ' . (!empty($alertchecked)?$alertchecked:'') . '></td>'.
'<td class="liste_titre" align="right"> </td>'.
'<td class="liste_titre"> </td>'.
'<td class="liste_titre" align="right">'.
diff --git a/htdocs/product/stock/replenishorders.php b/htdocs/product/stock/replenishorders.php
index d0b0d5d4f53299b7ff7975122a0f8d3849253c7d..71fe1407a2d48297c232d7407141fb0d406616c9 100644
--- a/htdocs/product/stock/replenishorders.php
+++ b/htdocs/product/stock/replenishorders.php
@@ -1,6 +1,7 @@
<?php
/*
- * Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2013 Cédric Salvador <csalvador@gpcsolutions.fr>
+ * Copyright (C) 2014 Regis Houssin <regis.houssin@capnetworks.com>
*
* 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
@@ -44,8 +45,7 @@ $result=restrictedArea($user,'produit|service');
* View
*/
-$helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|';
-$helpurl .= 'ES:Módulo_Stocks';
+$helpurl = 'EN:Module_Stocks_En|FR:Module_Stock|ES:Módulo_Stocks';
$texte = $langs->trans('ReplenishmentOrders');
llxHeader('', $texte, $helpurl, '');
@@ -77,7 +77,7 @@ if (!$sortfield) $sortfield = 'cf.date_creation';
$offset = $conf->liste_limit * $page ;
-$sql = 'SELECT s.rowid as socid, s.nom, cf.date_creation as dc,';
+$sql = 'SELECT s.rowid as socid, s.nom as name, cf.date_creation as dc,';
$sql.= ' cf.rowid, cf.ref, cf.fk_statut, cf.total_ttc, cf.fk_user_author,';
$sql.= ' u.login';
$sql.= ' FROM '.MAIN_DB_PREFIX.'societe as s, '.MAIN_DB_PREFIX.'commande_fournisseur as cf';
@@ -132,7 +132,7 @@ if ($sall) {
$sql .= ' AND (cf.ref LIKE "%' . $db->escape($sall) . '%" ';
$sql .= 'OR cf.note LIKE "%' . $db->escape($sall) . '%")';
}
-if ($socid) {
+if (!empty($socid)) {
$sql .= ' AND s.rowid = ' . $socid;
}
@@ -273,7 +273,7 @@ if ($resql)
print '<td>'.
'<a href="' . $href .'">'.
img_object($langs->trans('ShowCompany'), 'company'). ' '.
- $obj->nom . '</a></td>';
+ $obj->name . '</a></td>';
// Author
$userstatic->id = $obj->fk_user_author;
diff --git a/htdocs/projet/admin/project.php b/htdocs/projet/admin/project.php
index bf9951129ad88224e15e10819a21ecb4f61d8183..915d4ef69ef8feb2c64464ac49268235ed212ab3 100644
--- a/htdocs/projet/admin/project.php
+++ b/htdocs/projet/admin/project.php
@@ -349,7 +349,7 @@ foreach ($dirmodels as $reldir)
if ($module->isEnabled())
{
$var=!$var;
- print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+ print '<tr '.$bc[$var].'><td>'.$module->name."</td><td>\n";
print $module->info();
print '</td>';
@@ -450,7 +450,7 @@ foreach ($dirmodels as $reldir)
if ($module->isEnabled())
{
$var=!$var;
- print '<tr '.$bc[$var].'><td>'.$module->nom."</td><td>\n";
+ print '<tr '.$bc[$var].'><td>'.$module->name."</td><td>\n";
print $module->info();
print '</td>';
diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php
index 273784faf9245b146127f1d850fb503476eea220..df67d9d8fa16abd4c5043f2d8f7b4bebf79edc6d 100644
--- a/htdocs/projet/card.php
+++ b/htdocs/projet/card.php
@@ -45,7 +45,7 @@ $mine = GETPOST('mode')=='mine' ? 1 : 0;
//if (! $user->rights->projet->all->lire) $mine=1; // Special for projects
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('projectcard'));
+$hookmanager->initHooks(array('projectcard','globalcard'));
$object = new Project($db);
$extrafields = new ExtraFields($db);
diff --git a/htdocs/projet/class/task.class.php b/htdocs/projet/class/task.class.php
index 13360110310c9b00626704f0ee21740e4d672e5f..62052ebaa29ff235e77fd142d838fff4efd95e8b 100644
--- a/htdocs/projet/class/task.class.php
+++ b/htdocs/projet/class/task.class.php
@@ -285,8 +285,8 @@ class Task extends CommonObject
$sql.= " description=".(isset($this->description)?"'".$this->db->escape($this->description)."'":"null").",";
$sql.= " duration_effective=".(isset($this->duration_effective)?$this->duration_effective:"null").",";
$sql.= " planned_workload=".(isset($this->planned_workload)?$this->planned_workload:"0").",";
- $sql.= " dateo=".($this->date_start!=''?$this->db->idate($this->date_start):'null').",";
- $sql.= " datee=".($this->date_end!=''?$this->db->idate($this->date_end):'null').",";
+ $sql.= " dateo=".($this->date_start!=''?"'".$this->db->idate($this->date_start)."'":'null').",";
+ $sql.= " datee=".($this->date_end!=''?"'".$this->db->idate($this->date_end)."'":'null').",";
$sql.= " progress=".$this->progress.",";
$sql.= " rang=".((!empty($this->rang))?$this->rang:"0");
$sql.= " WHERE rowid=".$this->id;
diff --git a/htdocs/projet/contact.php b/htdocs/projet/contact.php
index b570d5720d9566440013983f2a1c723e574037eb..bc8f5b3098c5995e2fc1463a9eee25754f6ab887 100644
--- a/htdocs/projet/contact.php
+++ b/htdocs/projet/contact.php
@@ -1,6 +1,6 @@
<?php
-/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com>
- * Copyright (C) 2012 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2010 Regis Houssin <regis.houssin@capnetworks.com>
+ * Copyright (C) 2012-2014 Laurent Destailleur <eldy@users.sourceforge.net>
*
* 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
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 7e324841af2fa41d3602111a6ff945e94e840f1f..d9fb4b4dce93660274bd86363221db737c7d5a68 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -103,7 +103,7 @@ print_liste_field_titre($langs->trans("NbOfProjects"),"","","","",'align="right"
print "</tr>\n";
$sql = "SELECT count(p.rowid) as nb";
-$sql.= ", s.nom, s.rowid as socid";
+$sql.= ", s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
$sql.= " WHERE p.entity = ".$conf->entity;
@@ -127,7 +127,7 @@ if ( $resql )
if ($obj->socid)
{
$socstatic->id=$obj->socid;
- $socstatic->nom=$obj->nom;
+ $socstatic->name=$obj->name;
print $socstatic->getNomUrl(1);
}
else
diff --git a/htdocs/projet/list.php b/htdocs/projet/list.php
index 2a427558eb43b9255c0827b6e0d0e5ccd75c26f9..b4260e8ea91a57c015edb19023fbb25daea6ab70 100644
--- a/htdocs/projet/list.php
+++ b/htdocs/projet/list.php
@@ -39,7 +39,7 @@ if ($socid > 0)
{
$soc = new Societe($db);
$soc->fetch($socid);
- $title .= ' (<a href="list.php">'.$soc->nom.'</a>)';
+ $title .= ' (<a href="list.php">'.$soc->name.'</a>)';
}
if (!$user->rights->projet->lire) accessforbidden();
@@ -78,7 +78,7 @@ $projectsListId = $projectstatic->getProjectsAuthorizedForUser($user,($mine?$min
$sql = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_statut, p.public, p.fk_user_creat";
$sql.= ", p.datec as date_create, p.dateo as date_start, p.datee as date_end";
-$sql.= ", s.nom, s.rowid as socid";
+$sql.= ", s.nom as name, s.rowid as socid";
$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
$sql.= " WHERE p.entity = ".$conf->entity;
@@ -181,7 +181,7 @@ if ($resql)
if ($objp->socid)
{
$socstatic->id=$objp->socid;
- $socstatic->nom=$objp->nom;
+ $socstatic->name=$objp->name;
print $socstatic->getNomUrl(1);
}
else
diff --git a/htdocs/projet/tasks.php b/htdocs/projet/tasks.php
index 6b5cc453cbf0f368093a90a44cb3c8dcc97920b0..7aea9314e5adb3379bb49b0f488c18b43d47aa16 100644
--- a/htdocs/projet/tasks.php
+++ b/htdocs/projet/tasks.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2013 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
*
* This program is free software; you can redistribute it and/or modify
@@ -64,7 +64,7 @@ if ($user->societe_id > 0) $socid = $user->societe_id;
$result = restrictedArea($user, 'projet', $id);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('projecttaskcard'));
+$hookmanager->initHooks(array('projecttaskcard','globalcard'));
$progress=GETPOST('progress', 'int');
$label=GETPOST('label', 'alpha');
diff --git a/htdocs/projet/tasks/task.php b/htdocs/projet/tasks/task.php
index c8f60cde7a11694e34e58a8fe2b6234d99b41e9f..da200d565b6f30ed12eb73f60d78052c6ce26bfb 100644
--- a/htdocs/projet/tasks/task.php
+++ b/htdocs/projet/tasks/task.php
@@ -50,7 +50,7 @@ if ($user->societe_id > 0) $socid = $user->societe_id;
if (! $user->rights->projet->lire) accessforbidden();
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('projecttaskcard'));
+$hookmanager->initHooks(array('projecttaskcard','globalcard'));
$object = new Task($db);
$extrafields = new ExtraFields($db);
@@ -58,9 +58,11 @@ $projectstatic = new Project($db);
// fetch optionals attributes and labels
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
+
+
/*
* Actions
-*/
+ */
if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
{
@@ -91,11 +93,10 @@ if ($action == 'update' && ! $_POST["cancel"] && $user->rights->projet->creer)
$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
$result=$object->update($user);
-
+
if ($result < 0)
{
- setEventMessage($object->error,'errors');
- setEventMessage($object->errors,'errors');
+ setEventMessages($object->error,$object->errors,'errors');
}
}
else
@@ -121,8 +122,7 @@ if ($action == 'confirm_delete' && $confirm == "yes" && $user->rights->projet->s
}
else
{
- $langs->load("errors");
- setEventMessage($langs->trans($object->error), 'errors');
+ setEventMessages($object->error,$object->errors,'errors');
$action='';
}
}
diff --git a/htdocs/resource/card.php b/htdocs/resource/card.php
index ed48f7e1b04298e19f4e7827b618f6702167bc6c..b2ee3ae181477f2880a99db972bf6a77570d850f 100755
--- a/htdocs/resource/card.php
+++ b/htdocs/resource/card.php
@@ -57,7 +57,7 @@ if( ! $user->rights->resource->read)
$object = new Resource($db);
-$hookmanager->initHooks(array('resource_card'));
+$hookmanager->initHooks(array('resource_card','globalcard'));
$parameters=array('resource_id'=>$id);
$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
diff --git a/htdocs/societe/admin/societe.php b/htdocs/societe/admin/societe.php
index b1680d2803ec99f5cad582bd1f259f058fe69c67..f17a9d9f298d7c0790e6055ca5b55e5434c656e2 100644
--- a/htdocs/societe/admin/societe.php
+++ b/htdocs/societe/admin/societe.php
@@ -84,7 +84,7 @@ if ($action == 'updateoptions')
setEventMessage($langs->trans("Error"), 'errors');
}
}
-
+
if (GETPOST('CONTACT_USE_SEARCH_TO_SELECT'))
{
$contactsearch = GETPOST('activate_CONTACT_USE_SEARCH_TO_SELECT','alpha');
@@ -344,7 +344,7 @@ foreach ($dirsociete as $dirroot)
$var = !$var;
print '<tr '.$bc[$var].'>'."\n";
- print '<td width="140">'.$modCodeTiers->nom.'</td>'."\n";
+ print '<td width="140">'.$modCodeTiers->name.'</td>'."\n";
print '<td>'.$modCodeTiers->info($langs).'</td>'."\n";
print '<td class="nowrap">'.$modCodeTiers->getExample($langs).'</td>'."\n";
@@ -420,7 +420,7 @@ foreach ($dirsociete as $dirroot)
$var = !$var;
print '<tr '.$bc[$var].'>';
- print '<td>'.$modCodeCompta->nom."</td><td>\n";
+ print '<td>'.$modCodeCompta->name."</td><td>\n";
print $modCodeCompta->info($langs);
print '</td>';
print '<td class="nowrap">'.$modCodeCompta->getExample($langs)."</td>\n";
@@ -569,7 +569,7 @@ foreach ($dirsociete as $dirroot)
}
$htmltooltip.='<br><br><u>'.$langs->trans("FeaturesSupported").':</u>';
$htmltooltip.='<br>'.$langs->trans("WatermarkOnDraft").': '.yn((! empty($module->option_draft_watermark)?$module->option_draft_watermark:''), 1, 1);
-
+
print '<td align="center" class="nowrap">';
print $form->textwithpicto('',$htmltooltip,1,0);
print '</td>';
@@ -632,19 +632,19 @@ while ($i < $nbofloop)
if ($profid[$i][1]!='-')
{
$var = !$var;
-
+
print '<tr '.$bc[$var].'>';
print '<td>'.$profid[$i][0]."</td><td>\n";
print $profid[$i][1];
print '</td>';
-
+
$idprof_unique ='SOCIETE_IDPROF'.($i+1).'_UNIQUE';
$idprof_mandatory ='SOCIETE_IDPROF'.($i+1).'_MANDATORY';
$idprof_invoice_mandatory ='SOCIETE_IDPROF'.($i+1).'_INVOICE_MANDATORY';
$verif=(empty($conf->global->$idprof_unique)?false:true);
$mandatory=(empty($conf->global->$idprof_mandatory)?false:true);
$invoice_mandatory=(empty($conf->global->$idprof_invoice_mandatory)?false:true);
-
+
if ($verif)
{
print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setprofid&value='.($i+1).'&status=0">';
@@ -657,7 +657,7 @@ while ($i < $nbofloop)
print img_picto($langs->trans("Disabled"),'switch_off');
print '</a></td>';
}
-
+
if ($mandatory)
{
print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setprofidmandatory&value='.($i+1).'&status=0">';
@@ -670,7 +670,7 @@ while ($i < $nbofloop)
print img_picto($langs->trans("Disabled"),'switch_off');
print '</a></td>';
}
-
+
if ($invoice_mandatory)
{
print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setprofidinvoicemandatory&value='.($i+1).'&status=0">';
@@ -683,7 +683,7 @@ while ($i < $nbofloop)
print img_picto($langs->trans("Disabled"),'switch_off');
print '</a></td>';
}
-
+
print "</tr>\n";
}
$i++;
diff --git a/htdocs/societe/canvas/actions_card_common.class.php b/htdocs/societe/canvas/actions_card_common.class.php
index 63f5214b319fd735bb33cfd92b3a8dfd3bd842c7..b94262bbb527b8e5896787162bf0f3a03296d124 100644
--- a/htdocs/societe/canvas/actions_card_common.class.php
+++ b/htdocs/societe/canvas/actions_card_common.class.php
@@ -305,7 +305,7 @@ abstract class ActionsCardCommon
if ($result >= 0)
{
- header("Location: ".DOL_URL_ROOT."/societe/societe.php?delsoc=".$this->object->nom."");
+ header("Location: ".DOL_URL_ROOT."/societe/societe.php?delsoc=".$this->object->name."");
exit;
}
else
diff --git a/htdocs/societe/class/address.class.php b/htdocs/societe/class/address.class.php
index ec16128fb8a87bbb95f986a571a1555b3ee018a8..f08a4a2455cf42efe6311e476712a6bfaed97004 100644
--- a/htdocs/societe/class/address.class.php
+++ b/htdocs/societe/class/address.class.php
@@ -112,7 +112,7 @@ class Address
if ($this->db->errno() == 'DB_ERROR_RECORD_ALREADY_EXISTS')
{
- $this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->nom);
+ $this->error=$langs->trans("ErrorCompanyNameAlreadyExists",$this->name);
}
$this->db->rollback();
@@ -176,7 +176,7 @@ class Address
$this->fax = preg_replace("/\./","",$this->fax);
$this->note = trim($this->note);
- $result = $this->verify(); // Verifie que nom et label obligatoire
+ $result = $this->verify(); // Verifie que name et label obligatoire
if ($result >= 0)
{
@@ -236,7 +236,7 @@ class Address
{
global $langs, $conf;
- $sql = 'SELECT rowid, nom, client, fournisseur';
+ $sql = 'SELECT rowid, nom as name, client, fournisseur';
$sql .= ' FROM '.MAIN_DB_PREFIX.'societe';
$sql .= ' WHERE rowid = '.$socid;
@@ -247,7 +247,7 @@ class Address
{
$obj = $this->db->fetch_object($resqlsoc);
- $this->socname = $obj->nom;
+ $this->socname = $obj->name;
$this->socid = $obj->rowid;
$this->id = $obj->rowid;
$this->client = $obj->client;
@@ -440,7 +440,7 @@ class Address
*/
function info($id)
{
- $sql = "SELECT s.rowid, s.nom, datec as date_creation, tms as date_modification,";
+ $sql = "SELECT s.rowid, s.nom as name, datec as date_creation, tms as date_modification,";
$sql.= " fk_user_creat, fk_user_modif";
$sql.= " FROM ".MAIN_DB_PREFIX."societe as s";
$sql.= " WHERE s.rowid = ".$id;
@@ -465,7 +465,7 @@ class Address
$muser->fetch($obj->fk_user_modif);
$this->user_modification = $muser;
}
- $this->ref = $obj->nom;
+ $this->ref = $obj->name;
$this->date_creation = $this->db->jdate($obj->date_creation);
$this->date_modification = $this->db->jdate($obj->date_modification);
}
diff --git a/htdocs/societe/class/societe.class.php b/htdocs/societe/class/societe.class.php
index e446d5a9e7609f9520464fc912ef2e0ed524b5c5..6d80189c7beaedd1b2354e781ab1c9e6b5f90742 100644
--- a/htdocs/societe/class/societe.class.php
+++ b/htdocs/societe/class/societe.class.php
@@ -624,7 +624,7 @@ class Societe extends CommonObject
// Clean parameters
$this->id = $id;
$this->name = $this->name?trim($this->name):trim($this->nom);
- $this->nom = trim($this->nom); // TODO obsolete
+ $this->nom = $this->name; // For backward compatibility
$this->ref_ext = trim($this->ref_ext);
$this->address = $this->address?trim($this->address):trim($this->address);
$this->zip = $this->zip?trim($this->zip):trim($this->zip);
diff --git a/htdocs/societe/commerciaux.php b/htdocs/societe/commerciaux.php
index 5436e03274bff1d57efd80fe3e5537699a0f70c1..498257ea49610c78de8af26a242cc03696380c60 100644
--- a/htdocs/societe/commerciaux.php
+++ b/htdocs/societe/commerciaux.php
@@ -37,7 +37,7 @@ $socid = isset($_GET["socid"])?$_GET["socid"]:'';
if ($user->societe_id) $socid=$user->societe_id;
$result = restrictedArea($user, 'societe','','');
-$hookmanager->initHooks(array('salesrepresentativescard'));
+$hookmanager->initHooks(array('salesrepresentativescard','globalcard'));
/*
* Actions
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index e6a251a2d7830757778689c2acfe3a3e715f1d57..740a615780962d2a19f7f3aad34e4666b49256ce 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
- * Copyright (C) 2004-2011 Laurent Destailleur <eldy@users.sourceforge.net>
+ * Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2014 Charles-Fr Benke <charles.fr@benke.fr>
*
@@ -64,7 +64,7 @@ print '<form method="post" action="'.DOL_URL_ROOT.'/societe/societe.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre">';
-print '<th colspan="3">'.$langs->trans("Search").'</th></tr>';
+print '<th colspan="3">'.$langs->trans("SearchThirdparty").'</th></tr>';
print "<tr ".$bc[false]."><td>";
print '<label for="search_nom_only">'.$langs->trans("Name").'</label>:</td><td><input class="flat" type="text" size="14" name="search_nom_only" id="search_nom_only"></td>';
print '<td rowspan="'.$rowspan.'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
@@ -79,9 +79,26 @@ print "<tr ".$bc[false]."><td ".$bc[false].">";
print '<label for="search_all">'.$langs->trans("Other").'</label>:</td><td '.$bc[false].'><input class="flat" type="text" size="14" name="search_all" id="search_all"></td>';
//print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
print '</tr>';
-
print "</table></form><br>";
+/*
+ * Search contact
+ */
+$rowspan=2;
+if (! empty($conf->barcode->enabled)) $rowspan++;
+print '<form method="post" action="'.DOL_URL_ROOT.'/contact/list.php">';
+print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
+print '<table class="noborder nohover" width="100%">';
+print '<tr class="liste_titre">';
+print '<th colspan="3">'.$langs->trans("SearchContact").'</th></tr>';
+print "<tr ".$bc[false]."><td>";
+print '<label for="search_nom_only">'.$langs->trans("Name").'</label>:</td><td><input class="flat" type="text" size="14" name="search_firstlast_only" id="search_firstlast_only"></td>';
+print '<td rowspan="'.$rowspan.'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
+print "<tr ".$bc[false]."><td ".$bc[false].">";
+print '<label for="search_all">'.$langs->trans("Other").'</label>:</td><td '.$bc[false].'><input class="flat" type="text" size="14" name="contactname" id="contactname"></td>';
+//print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
+print '</tr>';
+print "</table></form><br>";
/*
* Statistics area
@@ -121,7 +138,7 @@ print '<table class="noborder" width="100%">';
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
if (! empty($conf->use_javascript_ajax) && ((round($third['prospect'])?1:0)+(round($third['customer'])?1:0)+(round($third['supplier'])?1:0)+(round($third['other'])?1:0) >= 2))
{
- print '<tr><td align="center" colspan="2">';
+ print '<tr '.$bc[0].'><td align="center" colspan="2">';
$dataseries=array();
if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) $dataseries[]=array('label'=>$langs->trans("Prospects"),'data'=>round($third['prospect']));
if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Customers"),'data'=>round($third['customer']));
@@ -135,19 +152,19 @@ else
{
if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS))
{
- $statstring = "<tr $bc[0]>";
+ $statstring = "<tr ".$bc[0].">";
$statstring.= '<td><a href="'.DOL_URL_ROOT.'/comm/prospect/list.php">'.$langs->trans("Prospects").'</a></td><td align="right">'.round($third['prospect']).'</td>';
$statstring.= "</tr>";
}
if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS))
{
- $statstring.= "<tr $bc[1]>";
+ $statstring.= "<tr ".$bc[1].">";
$statstring.= '<td><a href="'.DOL_URL_ROOT.'/comm/list.php">'.$langs->trans("Customers").'</a></td><td align="right">'.round($third['customer']).'</td>';
$statstring.= "</tr>";
}
if (! empty($conf->fournisseur->enabled) && empty($conf->global->SOCIETE_DISABLE_SUPPLIERS_STATS))
{
- $statstring2 = "<tr $bc[0]>";
+ $statstring2 = "<tr ".$bc[0].">";
$statstring2.= '<td><a href="'.DOL_URL_ROOT.'/fourn/list.php">'.$langs->trans("Suppliers").'</a></td><td align="right">'.round($third['supplier']).'</td>';
$statstring2.= "</tr>";
}
diff --git a/htdocs/societe/notify/index.php b/htdocs/societe/notify/index.php
index 1832e7851ea42bfbe2e798bce61f4bea89bae954..a1042087fafaf24ba22779a2ecf35b0d2d60cbf6 100644
--- a/htdocs/societe/notify/index.php
+++ b/htdocs/societe/notify/index.php
@@ -51,13 +51,12 @@ $pagenext = $page + 1;
/*
- * Mode Liste
- *
+ * View
*/
llxHeader();
-$sql = "SELECT s.nom, s.rowid as socid, c.lastname, c.firstname, a.label, n.rowid";
+$sql = "SELECT s.nom as name, s.rowid as socid, c.lastname, c.firstname, a.label, n.rowid";
$sql.= " FROM ".MAIN_DB_PREFIX."socpeople as c,";
$sql.= " ".MAIN_DB_PREFIX."c_action_trigger as a,";
$sql.= " ".MAIN_DB_PREFIX."notify_def as n,";
@@ -94,7 +93,7 @@ if ($result)
$var=!$var;
print "<tr ".$bc[$var].">";
- print "<td><a href=\"card.php?socid=".$obj->socid."\">".$obj->nom."</a></td>\n";
+ print "<td><a href=\"card.php?socid=".$obj->socid."\">".$obj->name."</a></td>\n";
print "<td>".dolGetFirstLastname($obj->firstname, $obj->lastname)."</td>\n";
print "<td>".$obj->titre."</td>\n";
print "</tr>\n";
diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php
index e45ce6eee7bdc9efab1924098758962cf915c480..c6909aa7cae7c5ab54be55b93d7fd84338d2e5d6 100644
--- a/htdocs/societe/soc.php
+++ b/htdocs/societe/soc.php
@@ -77,7 +77,7 @@ if (! empty($canvas))
$result = restrictedArea($user, 'societe', $socid, '&societe', '', 'fk_soc', 'rowid', $objcanvas);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('thirdpartycard'));
+$hookmanager->initHooks(array('thirdpartycard','globalcard'));
/*
diff --git a/htdocs/support/default.css b/htdocs/support/default.css
index d535ab0ea705e3058ac4b3a6e8a75359473e6397..14454a1924513c1d4d323175153d4b48d2045c3f 100644
--- a/htdocs/support/default.css
+++ b/htdocs/support/default.css
@@ -18,7 +18,7 @@
body {
font-size:12px;
font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat;
+background: #f9f9f9;
/* background-color: #F4F4F4; */
margin: 5px 10px;
}
diff --git a/htdocs/support/dolibarr_logo2.png b/htdocs/support/dolibarr_logo2.png
deleted file mode 100644
index 7abd0ae84942e7aef5b7872793c1602c0a3d4d6b..0000000000000000000000000000000000000000
Binary files a/htdocs/support/dolibarr_logo2.png and /dev/null differ
diff --git a/htdocs/support/headbg.jpg b/htdocs/support/headbg.jpg
deleted file mode 100644
index 5491c6e4acbc576eb5397d1091fdd7ea7e03de00..0000000000000000000000000000000000000000
Binary files a/htdocs/support/headbg.jpg and /dev/null differ
diff --git a/htdocs/theme/amarok/img/object_resource.png b/htdocs/theme/amarok/img/object_resource.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cda1f3f2202f020c2aa7f0438b72e06f559c83e
Binary files /dev/null and b/htdocs/theme/amarok/img/object_resource.png differ
diff --git a/htdocs/theme/auguria/img/object_resource.png b/htdocs/theme/auguria/img/object_resource.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cda1f3f2202f020c2aa7f0438b72e06f559c83e
Binary files /dev/null and b/htdocs/theme/auguria/img/object_resource.png differ
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 1159e40ff0a79445e24d3f29481b6522d83fd33e..9a47c431fc790509f61202d2fba1f17714d411a2 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -64,7 +64,7 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
// Define image path files and other constants
$fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif';
$img_liste_titre=dol_buildpath($path.'/theme/'.$theme.'/img/menus/trtitle.png',1);
-$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
+$img_head='';
$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
$dol_hide_topmenu=$conf->dol_hide_topmenu;
$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
@@ -108,7 +108,7 @@ body {
<?php if (GETPOST("optioncss") == 'print') { ?>
background-color: #FFFFFF;
<?php } else { ?>
- background: #ffffff url(<?php echo $img_head; ?>) 0 0 no-repeat;
+ background-color: #FCFCFC;
<?php } ?>
color: #101010;
font-size: <?php print $fontsize ?>px;
@@ -184,14 +184,6 @@ legend { margin-bottom: 8px; }
padding: 0px 2px 0px 2px;
margin: 0px 0px 0px 0px;
}
-.buttonajax {
- font-family: <?php print $fontlist ?>;
- border: 0px;
- background-image: url(<?php echo $img_button ?>);
- background-position: bottom;
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
-}
form {
padding: 0em 0em 0em 0em;
margin: 0em 0em 0em 0em;
diff --git a/htdocs/theme/bureau2crea/img/object_resource.png b/htdocs/theme/bureau2crea/img/object_resource.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cda1f3f2202f020c2aa7f0438b72e06f559c83e
Binary files /dev/null and b/htdocs/theme/bureau2crea/img/object_resource.png differ
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 950b2ce0001714409e57c5ab7f7e05c3f8a4e06c..0c7fa823f3ea28c35498241b6f581180f75f4c75 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -209,14 +209,6 @@ legend { margin-bottom: 8px; }
padding: 0px 2px 0px 2px;
margin: 0px 0px 0px 0px;
}
-.buttonajax {
- font-family: <?php print $fontlist ?>;
- border: 0px;
- background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>);
- background-position: bottom;
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
-}
form {
padding: 0em 0em 0em 0em;
margin: 0em 0em 0em 0em;
diff --git a/htdocs/theme/cameleo/img/object_resource.png b/htdocs/theme/cameleo/img/object_resource.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cda1f3f2202f020c2aa7f0438b72e06f559c83e
Binary files /dev/null and b/htdocs/theme/cameleo/img/object_resource.png differ
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index bfb64ab09a08a29b14e077f82343055c4ed6c8a7..b39bb7de5051ee8a60d7856e96aec9c63186d018 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -85,7 +85,7 @@ body {
<?php if (GETPOST("optioncss") == 'print') { ?>
background-color: #FFFFFF;
<?php } else { ?>
- /*background: #ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); ?>) 0 0 no-repeat;*/
+ background-color: #FCFCFC;
<?php } ?>
color: #101010;
font-size: <?php print $fontsize ?>px;
@@ -185,14 +185,6 @@ legend { margin-bottom: 8px; }
padding: 0px 2px 0px 2px;
margin: 0px 0px 0px 0px;
}
-.buttonajax {
- font-family: <?php print $fontlist ?>;
- border: 0px;
- background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1); ?>);
- background-position: bottom;
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
-}
form {
padding: 0em 0em 0em 0em;
margin: 0em 0em 0em 0em;
diff --git a/htdocs/theme/eldy/img/object_resource.png b/htdocs/theme/eldy/img/object_resource.png
new file mode 100644
index 0000000000000000000000000000000000000000..8cda1f3f2202f020c2aa7f0438b72e06f559c83e
Binary files /dev/null and b/htdocs/theme/eldy/img/object_resource.png differ
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 3eef3bd840e997b801bddaf54d7af6c67b97f32f..a7e60a6cdcd52b71400d5d61f8af698e2e166f23 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -64,7 +64,7 @@ if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global-
// Define image path files and other constants
$fontlist='arial,tahoma,verdana,helvetica'; //$fontlist='Verdana,Helvetica,Arial,sans-serif';
-$img_head=dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1);
+$img_head='';
$img_button=dol_buildpath($path.'/theme/'.$theme.'/img/button_bg.png',1);
$dol_hide_topmenu=$conf->dol_hide_topmenu;
$dol_hide_leftmenu=$conf->dol_hide_leftmenu;
@@ -105,7 +105,7 @@ $colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+roun
$colorbacklinepair1='255,255,255'; // line pair
$colorbacklinepair2='255,255,255'; // line pair
$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));
-$colorbackbody='#fcfcfc';
+$colorbackbody='#f9f9f9';
$colortext='40,40,40';
$fontsize='12';
$fontsizesmaller='11';
@@ -123,8 +123,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_BACKTABCARD2='210,210,210'; // card
$conf->global->THEME_ELDY_BACKTABCARD1='234,234,234';
$conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
- //$conf->global->THEME_ELDY_BACKBODY='#ffffff url('.$img_head.') 0 0 no-repeat;';
- $conf->global->THEME_ELDY_BACKBODY='#fcfcfc;';
+ $conf->global->THEME_ELDY_BACKBODY='#f9f9f9;';
$conf->global->THEME_ELDY_LINEPAIR1='242,242,242';
$conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
$conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
@@ -308,46 +307,54 @@ legend { margin-bottom: 8px; }
fieldset { border: 1px solid #AAAAAA !important; box-shadow: 2px 2px 3px #DDD; }
-.button {
+.button, sbmtConnexion {
font-family: <?php print $fontlist ?>;
- background-image: url(<?php echo $img_button ?>);
- background-position: bottom;
- border: 1px solid #C0C0C0;
- padding: 0.1em 0.7em;
- margin: 0em 0.5em;
- -moz-border-radius:0px 5px 0px 5px;
- -webkit-border-radius:0px 5px 0px 5px;
- border-radius:0px 5px 0px 5px;
- -moz-box-shadow: 2px 2px 3px #DDD;
- -webkit-box-shadow: 2px 2px 3px #DDD;
- box-shadow: 2px 2px 3px #DDD;
+ border-color: #c5c5c5;
+ border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
+ display: inline-block;
+ padding: 4px 14px;
+ margin-bottom: 0;
+ text-align: center;
+ cursor: pointer;
+ color: #333333;
+ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+ background-color: #f5f5f5;
+ background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+ background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+ border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ border: 1px solid #bbbbbb;
+ border-bottom-color: #a2a2a2;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
}
.button:focus {
- font-family: <?php print $fontlist ?>;
- color: #222244;
- background-image: url(<?php echo $img_button ?>);
- background-position: bottom;
- border: 1px solid #C0C0C0;
+ -moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
+ -webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
+ box-shadow: 0px 0px 6px 1px rgba(0, 0, 60, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
}
.button:hover {
- background: #dee7ec;
+ -moz-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
+ -webkit-box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
+ box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
}
.button:disabled {
- background: #ddd;
-}
-.buttonajax {
- font-family: <?php print $fontlist ?>;
- border: 0px;
- background-image: url(<?php echo $img_button ?>);
- background-position: bottom;
- padding: 0.1em 0.7em;
- margin: 0em 0.5em;
- -moz-border-radius:0px 5px 0px 5px;
- -webkit-border-radius:0px 5px 0px 5px;
- border-radius:0px 5px 0px 5px;
- -moz-box-shadow: 3px 3px 4px #DDD;
- -webkit-box-shadow: 3px 3px 4px #DDD;
- box-shadow: 3px 3px 4px #DDD;
+ opacity: 0.4;
+ filter: alpha(opacity=40); /* For IE8 and earlier */
+ box-shadow: none;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ cursor: auto;
}
form {
padding:0px;
@@ -812,7 +819,10 @@ foreach($mainmenuusedarray as $val)
.bodylogin
{
- background: #ffffff url(<?php echo $img_head; ?>) 0 0 no-repeat;
+ background: #f0f0f0;
+}
+.login_vertical_align {
+ padding: 10px;
}
form#login {
margin-top: <?php echo $dol_optimize_smallscreen?'30':'60' ?>px;
@@ -836,22 +846,17 @@ form#login {
padding-top:12px;
padding-bottom:12px;
max-width: 540px;
- border: 1px solid #C0C0C0;
- background-color: #E0E0E0;
-
- -moz-box-shadow: 3px 3px 4px #DDD;
- -webkit-box-shadow: 3px 3px 4px #DDD;
- box-shadow: 3px 3px 4px #DDD;
+ border: 1px solid #A0A0A0;
border-radius: 8px;
- border:solid 1px rgba(168,168,168,.4);
- border-top:solid 1px f8f8f8;
- background-color: #f8f8f8;
- background-image: -o-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
- background-image: -moz-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
- background-image: -webkit-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
- background-image: -ms-linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
- background-image: linear-gradient(top, rgba(250,250,250,.6) 0%, rgba(192,192,192,.3) 100%);
+ border:solid 1px rgba(90,90,90,.4);
+ -moz-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
+ -webkit-box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
+ box-shadow: 0 4px 23px 5px rgba(0, 0, 0, 0.2), 0 2px 6px rgba(60,60,60,0.15);
+
+ background-color: #FFFFFF;
+ background: -webkit-gradient(linear, center top, center bottom, color-stop(0%, #fff), color-stop(100%, #f8f8f8));
+ background: -moz-linear-gradient(top, #fff, #f8f8f8);
}
div#login_left, div#login_right {
display: inline-block;
@@ -983,10 +988,10 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks
background-position:top;
background-repeat:repeat-x;
<?php } ?>
- border-left: 1px solid #CCCCCC;
- border-right: 1px solid #D0D0D0;
- border-bottom: 1px solid #DDDDDD;
- border-top: 1px solid #DDDDDD;
+ border-left: 1px solid #AAA;
+ border-right: 1px solid #CCC;
+ border-bottom: 1px solid #CCC;
+ border-top: 1px solid #CCC;
border-radius: 5px;
-moz-border-radius: 5px;
-moz-box-shadow: 3px 3px 4px #DDD;
@@ -1015,10 +1020,10 @@ div.blockvmenusearch
background-image: linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
<?php } ?>
- border-left: 1px solid #DDDDDD;
- border-right: 1px solid #CCCCCC;
- border-bottom: 1px solid #CCCCCC;
- border-top: 1px solid #E8E8E8;
+ border-left: 1px solid #AAA;
+ border-right: 1px solid #CCC;
+ border-bottom: 1px solid #CCC;
+ border-top: 1px solid #CCC;
border-radius: 5px;
-moz-border-radius: 5px;
-moz-box-shadow: 3px 3px 4px #DDD;
@@ -1026,39 +1031,6 @@ div.blockvmenusearch
box-shadow: 3px 3px 4px #DDD;
}
-div.blockvmenubookmarksold
-{
- border-right: 1px solid #555555;
- border-bottom: 1px solid #555555;
- font-family: <?php print $fontlist ?>;
- color: #000000;
- text-align: <?php print $left; ?>;
- text-decoration: none;
- padding-left: 5px;
- padding-right: 1px;
- padding-top: 3px;
- padding-bottom: 3px;
- margin: 6px 0px 8px 2px;
- background: #E3E6E8;
-
-<?php if ($usecss3) { ?>
- background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
- background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
- background-image: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
- background-image: -ms-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
- background-image: linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1b; ?>) 90%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
-<?php } ?>
-
- border-left: 1px solid #CCCCCC;
- border-right: 1px solid #BBBBBB;
- border-bottom: 1px solid #BBBBBB;
- border-radius: 5px;
- -moz-border-radius: 5px;
- -moz-box-shadow: 3px 3px 4px #DDD;
- -webkit-box-shadow: 3px 3px 4px #DDD;
- box-shadow: 3px 3px 4px #DDD;
-}
-
div.blockvmenuhelp
{
<?php if (empty($conf->dol_optimize_smallscreen)) { ?>
@@ -1501,15 +1473,16 @@ span.tabspan {
div.divButAction { margin-bottom: 1.4em; }
.butAction, .butAction:link, .butAction:visited, .butAction:hover, .butAction:active, .butActionDelete, .butActionDelete:link, .butActionDelete:visited, .butActionDelete:hover, .butActionDelete:active {
+ text-decoration: none;
+ white-space: nowrap;
+ padding: 0.4em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
+ margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
font-family: <?php print $fontlist ?>;
+
font-weight: bold;
background: white;
border: 1px solid #8CACBB;
color: #434956;
- text-decoration: none;
- white-space: nowrap;
- padding: 0.4em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
- margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
-moz-border-radius:0px 5px 0px 5px;
-webkit-border-radius:0px 5px 0px 5px;
border-radius:0px 5px 0px 5px;
@@ -1531,16 +1504,17 @@ div.divButAction { margin-bottom: 1.4em; }
}
.butActionRefused {
- font-family: <?php print $fontlist ?> !important;
+ text-decoration: none !important;
+ white-space: nowrap !important;
+ cursor: not-allowed;
+ padding: 0.4em <?php echo ($dol_optimize_smallscreen?'0.4':'0.7'); ?>em;
+ margin: 0em <?php echo ($dol_optimize_smallscreen?'0.7':'0.9'); ?>em;
+ font-family: <?php print $fontlist ?> !important;
+
font-weight: bold !important;
background: white !important;
border: 1px solid #AAAAAA !important;
color: #AAAAAA !important;
- text-decoration: none !important;
- white-space: nowrap !important;
- cursor: not-allowed;
- padding: 0.4em 0.7em;
- margin: 0em 0.7em;
-moz-border-radius:0px 5px 0px 5px;
-webkit-border-radius:0px 5px 0px 5px;
border-radius:0px 5px 0px 5px;
@@ -1559,6 +1533,77 @@ span.butAction, span.butActionDelete {
cursor: pointer;
}
+/* Preapre for bootstrap look
+.butAction, .butActionDelete, .butActionRefused {
+ border-color: #c5c5c5;
+ border-color: rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.15) rgba(0, 0, 0, 0.25);
+ display: inline-block;
+ padding: 4px 14px;
+ margin-bottom: 0;
+ line-height: 20px;
+ text-align: center;
+ vertical-align: middle;
+ cursor: pointer;
+ color: #333333;
+ text-shadow: 0 1px 1px rgba(255, 255, 255, 0.75);
+ background-color: #f5f5f5;
+ background-image: -moz-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));
+ background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: -o-linear-gradient(top, #ffffff, #e6e6e6);
+ background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+ border-color: #e6e6e6 #e6e6e6 #bfbfbf;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+ border: 1px solid #bbbbbb;
+ border-bottom-color: #a2a2a2;
+ -webkit-border-radius: 4px;
+ -moz-border-radius: 4px;
+ border-radius: 4px;
+ -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+ box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
+}
+
+.butAction {
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ background-color: #006dcc;
+ background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
+ background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
+ background-image: -o-linear-gradient(top, #0088cc, #0044cc);
+ background-image: linear-gradient(to bottom, #0088cc, #0044cc);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0044cc', GradientType=0);
+ border-color: #0044cc #0044cc #002a80;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+
+.butActionDelete {
+ color: #ffffff;
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
+ background-color: #cc6d00;
+ background-image: -moz-linear-gradient(top, #cc8800, #cc4400);
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#cc8800), to(#cc4400));
+ background-image: -webkit-linear-gradient(top, #cc8800, #cc4400);
+ background-image: -o-linear-gradient(top, #cc8800, #cc4400);
+ background-image: linear-gradient(to bottom, #cc8800, #cc4400);
+ background-repeat: repeat-x;
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffcc8800', endColorstr='#ffcc4400', GradientType=0);
+ border-color: #cc4400 #cc4400 #802a00;
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
+a.butAction:link, a.butAction:visited, a.butAction:hover, a.butAction:active {
+ color: #FFFFFF;
+}
+End bootstrap */
+
+
/* ============================================================================== */
/* Tables */
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 996d7e7440d0e310faad5d89dedfa25d40f16075..01b6ec32f521c935d87c8f2cad880fc5396db098 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -89,7 +89,7 @@ $extrafields = new ExtraFields($db);
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
// Initialize technical object to manage hooks of thirdparties. Note that conf->hooks_modules contains array array
-$hookmanager->initHooks(array('usercard'));
+$hookmanager->initHooks(array('usercard','globalcard'));
diff --git a/htdocs/user/class/usergroup.class.php b/htdocs/user/class/usergroup.class.php
index 3b6be065879630c3ed7fe72811103b44a2cebd42..e096f8fc470a947edddc0606aedb26699b6482f8 100644
--- a/htdocs/user/class/usergroup.class.php
+++ b/htdocs/user/class/usergroup.class.php
@@ -5,7 +5,7 @@
* Copyright (C) 2012 Florian Henry <florian.henry@open-concept.pro>
* Copyright (C) 2014 Juanjo Menent <jmenent@2byte.es>
* Copyright (C) 2014 Alexis Algoud <alexis@atm-consulting.fr>
- *
+ *
* 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 3 of the License, or
@@ -41,6 +41,7 @@ class UserGroup extends CommonObject
var $id; // Group id
var $entity; // Entity of group
var $nom; // Name of group
+ var $name; // Name of group // deprecated
var $globalgroup; // Global group
var $note; // Note on group
var $datec; // Creation date of group
@@ -69,7 +70,7 @@ class UserGroup extends CommonObject
* Charge un objet group avec toutes ces caracteristiques (excpet ->members array)
*
* @param int $id id du groupe a charger
- * @param string $groupname nom du groupe a charger
+ * @param string $groupname name du groupe a charger
* @return int <0 if KO, >0 if OK
*/
function fetch($id='', $groupname='')
@@ -99,7 +100,7 @@ class UserGroup extends CommonObject
$this->ref = $obj->rowid;
$this->entity = $obj->entity;
$this->name = $obj->name;
- $this->nom = $obj->name; //Deprecated
+ $this->nom = $obj->name; // Deprecated
$this->note = $obj->note;
$this->datec = $obj->datec;
$this->datem = $obj->datem;
@@ -113,8 +114,8 @@ class UserGroup extends CommonObject
$extrafields=new ExtraFields($this->db);
$extralabels=$extrafields->fetch_name_optionals_label($this->table_element,true);
$this->fetch_optionals($this->id,$extralabels);
-
-
+
+
// Sav current LDAP Current DN
//$this->ldap_dn = $this->_load_ldap_dn($this->_load_ldap_info(),0);
}
@@ -626,8 +627,8 @@ class UserGroup extends CommonObject
if ($result < 0) { $error++; $this->db->rollback(); return -1; }
// End call triggers
}
-
-
+
+
// Actions on extra fields (by external module or standard code)
$hookmanager->initHooks(array('groupdao'));
$parameters=array();
@@ -644,10 +645,10 @@ class UserGroup extends CommonObject
}
}
else if ($reshook < 0) $error++;
-
+
if ($error > 0) { $error++; $this->db->rollback(); return -1; }
else $this->db->commit();
-
+
return $this->id;
}
else
@@ -679,7 +680,7 @@ class UserGroup extends CommonObject
$this->db->begin();
$sql = "UPDATE ".MAIN_DB_PREFIX."usergroup SET ";
- $sql.= " nom = '" . $this->db->escape($this->nom) . "'";
+ $sql.= " nom = '" . $this->db->escape($this->name) . "'";
$sql.= ", entity = " . $this->db->escape($entity);
$sql.= ", note = '" . $this->db->escape($this->note) . "'";
$sql.= " WHERE rowid = " . $this->id;
@@ -695,7 +696,7 @@ class UserGroup extends CommonObject
if ($result < 0) { $error++; }
// End call triggers
}
-
+
// Actions on extra fields (by external module or standard code)
$hookmanager->initHooks(array('groupdao'));
$parameters=array();
@@ -712,7 +713,7 @@ class UserGroup extends CommonObject
}
}
else if ($reshook < 0) $error++;
-
+
if (! $error)
{
$this->db->commit();
@@ -767,8 +768,8 @@ class UserGroup extends CommonObject
$info["objectclass"]=explode(',',$conf->global->LDAP_GROUP_OBJECT_CLASS);
// Champs
- if ($this->nom && ! empty($conf->global->LDAP_GROUP_FIELD_FULLNAME)) $info[$conf->global->LDAP_GROUP_FIELD_FULLNAME] = $this->nom;
- //if ($this->nom && ! empty($conf->global->LDAP_GROUP_FIELD_NAME)) $info[$conf->global->LDAP_GROUP_FIELD_NAME] = $this->nom;
+ if ($this->name && ! empty($conf->global->LDAP_GROUP_FIELD_FULLNAME)) $info[$conf->global->LDAP_GROUP_FIELD_FULLNAME] = $this->name;
+ //if ($this->name && ! empty($conf->global->LDAP_GROUP_FIELD_NAME)) $info[$conf->global->LDAP_GROUP_FIELD_NAME] = $this->name;
if ($this->note && ! empty($conf->global->LDAP_GROUP_FIELD_DESCRIPTION)) $info[$conf->global->LDAP_GROUP_FIELD_DESCRIPTION] = $this->note;
if (! empty($conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS))
{
@@ -805,7 +806,7 @@ class UserGroup extends CommonObject
$this->ref = 'SPECIMEN';
$this->specimen=1;
- $this->nom='DOLIBARR GROUP SPECIMEN';
+ $this->name='DOLIBARR GROUP SPECIMEN';
$this->note='This is a note';
$this->datec=time();
$this->datem=time();
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 4bf4cb35ad98a95ed17163b7de5d0bde97aa02ce..a1930f7c027eac8362a01d32892df51d03e1b3ea 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -95,12 +95,13 @@ if ($action == 'add')
setEventMessage($langs->trans("NameNotDefined"), 'errors');
$action="create"; // Go back to create page
} else {
- $object->nom = trim($_POST["nom"]);
+ $object->nom = trim($_POST["nom"]); // For backward compatibility
+ $object->name = trim($_POST["nom"]);
$object->note = trim($_POST["note"]);
// Fill array 'array_options' with data from add form
$ret = $extrafields->setOptionalsFromPost($extralabels,$object);
-
+
if (! empty($conf->multicompany->enabled) && ! empty($conf->multicompany->transverse_mode)) $object->entity = 0;
else $object->entity = $_POST["entity"];
@@ -120,7 +121,7 @@ if ($action == 'add')
$db->rollback();
$langs->load("errors");
- setEventMessage($langs->trans("ErrorGroupAlreadyExists",$object->nom), 'errors');
+ setEventMessage($langs->trans("ErrorGroupAlreadyExists",$object->name), 'errors');
$action="create"; // Go back to create page
}
}
@@ -176,7 +177,8 @@ if ($action == 'update')
$object->oldcopy=dol_clone($object);
- $object->nom = trim($_POST["group"]);
+ $object->name = trim($_POST["group"]);
+ $object->nom = $this->name; // For backward compatibility
$object->note = dol_htmlcleanlastbr($_POST["note"]);
// Fill array 'array_options' with data from add form
@@ -251,7 +253,7 @@ if ($action == 'create')
$doleditor=new DolEditor('note','','',240,'dolibarr_notes','',false,true,$conf->global->FCKEDITOR_ENABLE_SOCIETE,ROWS_8,90);
$doleditor->Create();
print "</td></tr>\n";
-
+
// Other attributes
$parameters=array('object' => $object, 'colspan' => ' colspan="2"');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
@@ -259,7 +261,7 @@ if ($action == 'create')
{
print $object->showOptionals($extrafields,'edit');
}
-
+
print "</table>\n";
print '<center><br><input class="button" value="'.$langs->trans("CreateGroup").'" type="submit"></center>';
@@ -331,7 +333,7 @@ else
print '<tr><td width="25%" valign="top">'.$langs->trans("Note").'</td>';
print '<td class="valeur">'.dol_htmlentitiesbr($object->note).' </td>';
print "</tr>\n";
-
+
// Other attributes
$parameters=array('colspan' => ' colspan="2"');
$reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
@@ -339,7 +341,7 @@ else
{
print $object->showOptionals($extrafields);
}
-
+
print "</table>\n";
print '</div>';
@@ -531,7 +533,7 @@ else
{
print $object->showOptionals($extrafields,'edit');
}
-
+
print "</table>\n";
print '<center><br><input class="button" value="'.$langs->trans("Save").'" type="submit"></center>';
diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php
index 547a89d3451201f1cb886a189361e816bbd29075..00af5b0e6d24744569aa7dd4eb9dda91e5c88d6a 100644
--- a/htdocs/user/group/index.php
+++ b/htdocs/user/group/index.php
@@ -57,7 +57,7 @@ llxHeader();
print_fiche_titre($langs->trans("ListOfGroups"));
-$sql = "SELECT g.rowid, g.nom, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
+$sql = "SELECT g.rowid, g.nom as name, g.entity, g.datec, COUNT(DISTINCT ugu.fk_user) as nb";
$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."usergroup_user as ugu ON ugu.fk_usergroup = g.rowid";
if (! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity)))
@@ -101,7 +101,7 @@ if ($resql)
$var=!$var;
print "<tr ".$bc[$var].">";
- print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.'</a>';
+ print '<td><a href="card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->name.'</a>';
if (! $obj->entity)
{
print img_picto($langs->trans("GlobalGroup"),'redstar');
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index c3e147620c2389df14c63ca98cabe5bdb2f2e271..eaee979e802fa3f6c75cc0e995b681da030ba027 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -104,7 +104,7 @@ print '</tr>';
// Name
print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
-print '<td width="75%" class="valeur">'.$fgroup->nom;
+print '<td width="75%" class="valeur">'.$fgroup->name;
if (!$fgroup->entity)
{
print img_picto($langs->trans("GlobalGroup"),'redstar');
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 5c52fa80a50f8225ebe2e2ccac211ea24e3e4157..a910753c643decd1c30209c63f12282303aae08a 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -199,7 +199,7 @@ if ($id)
// Nom
print '<tr><td width="25%" valign="top">'.$langs->trans("Name").'</td>';
- print '<td colspan="2">'.$fgroup->nom.'';
+ print '<td colspan="2">'.$fgroup->name.'';
if (! $fgroup->entity)
{
print img_picto($langs->trans("GlobalGroup"),'redstar');
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index c888dcdf63298c46cac9f4f67dda43d0ba5f55e3..c9b3693f1ac510c25cac66b96b03dd08c081c4a0 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -200,7 +200,7 @@ if ($canreadperms)
{
$max=5;
- $sql = "SELECT g.rowid, g.nom, g.note, g.entity, g.datec";
+ $sql = "SELECT g.rowid, g.nom as name, g.note, g.entity, g.datec";
$sql.= " FROM ".MAIN_DB_PREFIX."usergroup as g";
if(! empty($conf->multicompany->enabled) && $conf->entity == 1 && ($conf->multicompany->transverse_mode || ($user->admin && ! $user->entity)))
{
@@ -230,7 +230,7 @@ if ($canreadperms)
$var=!$var;
print "<tr ".$bc[$var].">";
- print '<td><a href="'.DOL_URL_ROOT.'/user/group/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->nom.'</a>';
+ print '<td><a href="'.DOL_URL_ROOT.'/user/group/card.php?id='.$obj->rowid.'">'.img_object($langs->trans("ShowGroup"),"group").' '.$obj->name.'</a>';
if (! $obj->entity)
{
print img_picto($langs->trans("GlobalGroup"),'redstar');
diff --git a/htdocs/user/index.php b/htdocs/user/index.php
index 30b0c9b3a8e2f8e382a1ce19ad446480dea125d0..ac1ebc9e1c57ef129b3939b615d34cc87d4692a1 100644
--- a/htdocs/user/index.php
+++ b/htdocs/user/index.php
@@ -73,7 +73,7 @@ $sql.= " u.tms as datem,";
$sql.= " u.datelastlogin,";
$sql.= " u.ldap_sid, u.statut, u.entity,";
$sql.= " u2.login as login2, u2.firstname as firstname2, u2.lastname as lastname2,";
-$sql.= " s.nom, s.canvas";
+$sql.= " s.nom as name, s.canvas";
$sql.= " FROM ".MAIN_DB_PREFIX."user as u";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s ON u.fk_societe = s.rowid";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."user as u2 ON u.fk_user = u2.rowid";
@@ -161,7 +161,7 @@ if ($result)
if ($obj->fk_societe)
{
$companystatic->id=$obj->fk_societe;
- $companystatic->nom=$obj->nom;
+ $companystatic->name=$obj->name;
$companystatic->canvas=$obj->canvas;
print $companystatic->getNomUrl(1);
}
diff --git a/htdocs/webservices/server_thirdparty.php b/htdocs/webservices/server_thirdparty.php
index 301511e01151efea60415cfe3816e879c377db57..2d104eb96a1f01d78aeb61e1233f5fd3fb8b9586 100644
--- a/htdocs/webservices/server_thirdparty.php
+++ b/htdocs/webservices/server_thirdparty.php
@@ -629,7 +629,7 @@ function updateThirdParty($authentication,$thirdparty)
* getListOfThirdParties
*
* @param array $authentication Array of authentication information
- * @param array $filterthirdparty Filter fields
+ * @param array $filterthirdparty Filter fields (key=>value to filer on. For example 'client'=>2, 'supplier'=>1, 'category'=>idcateg, 'name'=>'searchstring', ...)
* @return array Array result
*/
function getListOfThirdParties($authentication,$filterthirdparty)
@@ -661,9 +661,10 @@ function getListOfThirdParties($authentication,$filterthirdparty)
$sql.=" WHERE entity=".$conf->entity;
foreach($filterthirdparty as $key => $val)
{
- if ($key == 'client' && $val != '') $sql.=" AND s.client = ".$db->escape($val);
+ if ($key == 'name' && $val != '') $sql.=" AND s.name LIKE '%".$db->escape($val)."%'";
+ if ($key == 'client' && $val != '') $sql.=" AND s.client = ".$db->escape($val);
if ($key == 'supplier' && $val != '') $sql.=" AND s.fournisseur = ".$db->escape($val);
- if ($key == 'category' && $val != '') $sql.=" AND s.rowid IN (SELECT fk_societe FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
+ if ($key == 'category' && $val != '') $sql.=" AND s.rowid IN (SELECT fk_societe FROM ".MAIN_DB_PREFIX."categorie_societe WHERE fk_categorie=".$db->escape($val).") ";
}
dol_syslog("Function: getListOfThirdParties", LOG_DEBUG);
diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php
index c6bed990c1475c74cca494d8db0dd372f00f1a96..93406276eadeb474da27911d04a3f37d3e7c6ed4 100755
--- a/scripts/user/sync_groups_ldap2dolibarr.php
+++ b/scripts/user/sync_groups_ldap2dolibarr.php
@@ -136,19 +136,20 @@ if ($result >= 0)
{
$group = new UserGroup($db);
$group->fetch('', $ldapgroup[$conf->global->LDAP_KEY_GROUPS]);
- $group->nom = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_FULLNAME];
+ $group->name = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_FULLNAME];
+ $group->nom = $group->name; // For backward compatibility
$group->note = $ldapgroup[$conf->global->LDAP_GROUP_FIELD_DESCRIPTION];
$group->entity = $conf->entity;
//print_r($ldapgroup);
if($group->id > 0) { // Group update
- print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->nom;
+ print $langs->transnoentities("GroupUpdate").' # '.$key.': name='.$group->name;
$res=$group->update();
if ($res > 0)
{
- print ' --> Updated group id='.$group->id.' name='.$group->nom;
+ print ' --> Updated group id='.$group->id.' name='.$group->name;
}
else
{
@@ -157,12 +158,12 @@ if ($result >= 0)
}
print "\n";
} else { // Group creation
- print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->nom;
+ print $langs->transnoentities("GroupCreate").' # '.$key.': name='.$group->name;
$res=$group->create();
if ($res > 0)
{
- print ' --> Created group id='.$group->id.' name='.$group->nom;
+ print ' --> Created group id='.$group->id.' name='.$group->name;
}
else
{
diff --git a/test/phpunit/AdherentTest.php b/test/phpunit/AdherentTest.php
index f9db37ab79e3d9f8c2835ca5e8dc252e9317e05c..b43b9d230b3c06354afae26fde0053306416696b 100644
--- a/test/phpunit/AdherentTest.php
+++ b/test/phpunit/AdherentTest.php
@@ -530,7 +530,33 @@ class AdherentTest extends PHPUnit_Framework_TestCase
print __METHOD__." id=".$localobject->id." result=".$result."\n";
$this->assertLessThan($result, 0);
- return $result;
+ return $localobject;
}
+
+ /**
+ * testAdherentTypeDelete
+ *
+ * @param Adherent $localobject Member instance
+ * @return void
+ *
+ * @depends testAdherentDelete
+ * The depends says test is run only if previous is ok
+ */
+ public function testAdherentTypeDelete($localobject)
+ {
+ global $conf,$user,$langs,$db;
+ $conf=$this->savconf;
+ $user=$this->savuser;
+ $langs=$this->savlangs;
+ $db=$this->savdb;
+
+ $localobjectat=new AdherentType($this->savdb);
+ $result=$localobjectat->fetch($localobject->typeid);
+ $result=$localobjectat->delete();
+ print __METHOD__." result=".$result."\n";
+ $this->assertLessThan($result, 0);
+
+ return $localobject->id;
+ }
}